Better handle array types when unmasking (#12150)

apollographql · Nov 20, 2024 · 9ed1e1e · 9ed1e1e
1 parent 78137ec
commit 9ed1e1e
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 14 deletions.
diff --git a/.api-reports/api-report-cache.api.md b/.api-reports/api-report-cache.api.md
@@ -1052,7 +1052,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.api-reports/api-report-core.api.md b/.api-reports/api-report-core.api.md
@@ -2349,7 +2349,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.api-reports/api-report-masking.api.md b/.api-reports/api-report-masking.api.md
@@ -80,7 +80,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.api-reports/api-report-react.api.md b/.api-reports/api-report-react.api.md
@@ -2145,7 +2145,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.api-reports/api-report-react_components.api.md b/.api-reports/api-report-react_components.api.md
@@ -1878,7 +1878,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.api-reports/api-report-react_context.api.md b/.api-reports/api-report-react_context.api.md
@@ -1798,7 +1798,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.api-reports/api-report-react_hoc.api.md b/.api-reports/api-report-react_hoc.api.md
@@ -1802,7 +1802,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.api-reports/api-report-react_hooks.api.md b/.api-reports/api-report-react_hooks.api.md
@@ -1968,7 +1968,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.api-reports/api-report-react_internal.api.md b/.api-reports/api-report-react_internal.api.md
@@ -2020,7 +2020,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.api-reports/api-report-react_ssr.api.md b/.api-reports/api-report-react_ssr.api.md
@@ -1783,7 +1783,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.api-reports/api-report-testing.api.md b/.api-reports/api-report-testing.api.md
@@ -1834,7 +1834,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.api-reports/api-report-testing_core.api.md b/.api-reports/api-report-testing_core.api.md
@@ -1791,7 +1791,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.api-reports/api-report-utilities.api.md b/.api-reports/api-report-utilities.api.md
@@ -2709,7 +2709,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.api-reports/api-report.api.md b/.api-reports/api-report.api.md
@@ -2814,7 +2814,7 @@ type UnwrapFragmentRefs<TData> = TData extends any ? string extends keyof NonNul
     " $fragmentRefs"?: infer FragmentRefs extends object;
 } ? Prettify<{
     [K in keyof TData as K extends " $fragmentRefs" ? never : K]: UnwrapFragmentRefs<TData[K]>;
-} & CombineFragmentRefs<FragmentRefs>> : never : TData extends object ? {
+} & CombineFragmentRefs<FragmentRefs>> : never : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>> : TData extends object ? {
     [K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
 } : TData : never;
 

diff --git a/.changeset/clean-turkeys-kick.md b/.changeset/clean-turkeys-kick.md
@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix issue when using `Unmasked` with older versions of TypeScript when used with array fields.
diff --git a/src/masking/internal/types.ts b/src/masking/internal/types.ts
@@ -13,6 +13,7 @@ export type UnwrapFragmentRefs<TData> =
           } & CombineFragmentRefs<FragmentRefs>
         >
       : never
+    : TData extends Array<infer TItem> ? Array<UnwrapFragmentRefs<TItem>>
     : TData extends object ?
       { [K in keyof TData]: UnwrapFragmentRefs<TData[K]> }
     : TData