[Data masking] Ensure null is retained when unmasking nullable objects

[jerelmiller]

The Unmasked helper has a bug where unmasking a nullable object would return the object as a non-null type. This PR ensures the null is retained in the type.

[svc-apollo-docs]

✅ Docs Preview Ready

No new or changed pages found.

[changeset-bot]

🦋 Changeset detected

Latest commit: 07b38d5

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package

Name	Type
@apollo/client	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

[pkg-pr-new]

npm i https://pkg.pr.new/@apollo/client@12133

commit: 07b38d5

[phryneas]

It doesn't let me apply a suggestion here, but as an alternative, you could also distribute over TData:

This is the change to the original type:

export type UnwrapFragmentRefs<TData> =
+  TData extends any ?
    // Leave TData alone if it is Record<string, any> and not a specific shape
    string extends keyof NonNullable<TData> ? TData
    : " $fragmentRefs" extends keyof NonNullable<TData> ?
      TData extends { " $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 ?
      { [K in keyof TData]: UnwrapFragmentRefs<TData[K]> }
    : TData
+  : never;

[jerelmiller]

Ah yes I like that much better! Updated in ba2cb2c

[phryneas]

Either way, this fixes a real bug - approved :)

[github-actions]

size-limit report 📦

Path	Size
dist/apollo-client.min.cjs	40.63 KB (0%)
import { ApolloClient, InMemoryCache, HttpLink } from "dist/main.cjs"	51.03 KB (0%)
import { ApolloClient, InMemoryCache, HttpLink } from "dist/main.cjs" (production)	47.58 KB (0%)
import { ApolloClient, InMemoryCache, HttpLink } from "dist/index.js"	36.32 KB (0%)
import { ApolloClient, InMemoryCache, HttpLink } from "dist/index.js" (production)	33.55 KB (0%)
import { ApolloProvider } from "dist/react/index.js"	1.26 KB (0%)
import { ApolloProvider } from "dist/react/index.js" (production)	1.24 KB (0%)
import { useQuery } from "dist/react/index.js"	5.21 KB (0%)
import { useQuery } from "dist/react/index.js" (production)	4.3 KB (0%)
import { useLazyQuery } from "dist/react/index.js"	5.71 KB (0%)
import { useLazyQuery } from "dist/react/index.js" (production)	4.78 KB (0%)
import { useMutation } from "dist/react/index.js"	3.62 KB (0%)
import { useMutation } from "dist/react/index.js" (production)	2.85 KB (0%)
import { useSubscription } from "dist/react/index.js"	4.43 KB (0%)
import { useSubscription } from "dist/react/index.js" (production)	3.48 KB (0%)
import { useSuspenseQuery } from "dist/react/index.js"	5.51 KB (0%)
import { useSuspenseQuery } from "dist/react/index.js" (production)	4.17 KB (0%)
import { useBackgroundQuery } from "dist/react/index.js"	5.01 KB (0%)
import { useBackgroundQuery } from "dist/react/index.js" (production)	3.66 KB (0%)
import { useLoadableQuery } from "dist/react/index.js"	5.09 KB (0%)
import { useLoadableQuery } from "dist/react/index.js" (production)	3.74 KB (0%)
import { useReadQuery } from "dist/react/index.js"	3.42 KB (0%)
import { useReadQuery } from "dist/react/index.js" (production)	3.36 KB (0%)
import { useFragment } from "dist/react/index.js"	2.37 KB (0%)
import { useFragment } from "dist/react/index.js" (production)	2.31 KB (0%)