facebook · captbaritone · Apr 24, 2025
diff --git a/...elay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_resolver.expected b/...elay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_resolver.expected
@@ -30,7 +30,7 @@ type Query {
 ==================================== OUTPUT ===================================
 //- __generated__/barMutation.graphql.js
 /**
- * <auto-generated> SignedSource<<7f1de50339842bab9cecc72c6fbc076f>>
+ * <auto-generated> SignedSource<<c9045b1c950e83cede402f0b4626a7c8>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -45,7 +45,7 @@ import type { ClientRequest, Mutation } from 'relay-runtime';
 import {foo_mutation as mutationFooMutationResolverType} from "../foo.js";
 // Type assertion validating that `mutationFooMutationResolverType` resolver is correctly implemented.
 // A type error here indicates that the type signature of the resolver module is incorrect.
-(mutationFooMutationResolverType: () => ?boolean);
+(mutationFooMutationResolverType: () => boolean | null);
 export type barMutation$variables = {||};
 export type barMutation$data = {|
   +foo_mutation: ?boolean,

diff --git a/...lay_compiler_integration/fixtures/client_mutation_resolver_different_mutation_ok.expected b/...lay_compiler_integration/fixtures/client_mutation_resolver_different_mutation_ok.expected
@@ -104,7 +104,7 @@ export default node;
 
 //- __generated__/barMutation.graphql.js
 /**
- * <auto-generated> SignedSource<<6f79ca8d7718498c480388c5b22a5130>>
+ * <auto-generated> SignedSource<<31cc6cb3ca0668ffe6884f2da3893466>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -119,7 +119,7 @@ import type { ClientRequest, Mutation } from 'relay-runtime';
 import {baz_mutation as notCalledMutationBazMutationResolverType} from "../foo.js";
 // Type assertion validating that `notCalledMutationBazMutationResolverType` resolver is correctly implemented.
 // A type error here indicates that the type signature of the resolver module is incorrect.
-(notCalledMutationBazMutationResolverType: () => ?boolean);
+(notCalledMutationBazMutationResolverType: () => boolean | null);
 export type barMutation$variables = {||};
 export type barMutation$data = {|
   +baz_mutation: ?boolean,

diff --git a/...mpiler_integration/fixtures/client_schema_extension_interface_uses_resolver_type.expected b/...mpiler_integration/fixtures/client_schema_extension_interface_uses_resolver_type.expected
@@ -176,7 +176,7 @@ export default ((node/*: any*/)/*: Fragment<
 
 //- __generated__/PersonComponentQuery.graphql.js
 /**
- * <auto-generated> SignedSource<<6c11d65c79f10f8cbe664d4735a1fb15>>
+ * <auto-generated> SignedSource<<f9584e3f61d57da807edbde8546b4278>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -195,15 +195,15 @@ import {admin as adminAdminResolverType} from "Admin";
 // A type error here indicates that the type signature of the resolver module is incorrect.
 (adminAdminResolverType: (
   __relay_model_instance: Admin____relay_model_instance$data['__relay_model_instance'],
-) => ?{|
+) => {|
   +id: DataID,
-|});
+|} | null);
 import {boss as queryBossResolverType} from "Admin";
 // Type assertion validating that `queryBossResolverType` resolver is correctly implemented.
 // A type error here indicates that the type signature of the resolver module is incorrect.
-(queryBossResolverType: () => ?{|
+(queryBossResolverType: () => {|
   +id: DataID,
-|});
+|} | null);
 export type PersonComponentQuery$variables = {||};
 export type PersonComponentQuery$data = {|
   +boss: ?{|

diff --git a/...relay-compiler/tests/relay_compiler_integration/fixtures/error_handling_fragment.expected b/...relay-compiler/tests/relay_compiler_integration/fixtures/error_handling_fragment.expected
@@ -17,7 +17,7 @@ type User { name: String }
 ==================================== OUTPUT ===================================
 //- __generated__/foo.graphql.js
 /**
- * <auto-generated> SignedSource<<aa8a9fd716975ca122b77708a6fca791>>
+ * <auto-generated> SignedSource<<70a7a244e5796d4e6e9f2fbcd76c50f0>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -32,7 +32,7 @@ import type { Fragment, ReaderFragment } from 'relay-runtime';
 import type { FragmentType } from "relay-runtime";
 declare export opaque type foo$fragmentType: FragmentType;
 export type foo$data = {|
-  +name: ?string,
+  +name: string | null,
   +$fragmentType: foo$fragmentType,
 |};
 export type foo$key = {

diff --git a/...es/relay-compiler/tests/relay_compiler_integration/fixtures/error_handling_query.expected b/...es/relay-compiler/tests/relay_compiler_integration/fixtures/error_handling_query.expected
@@ -19,7 +19,7 @@ type User { name: String }
 ==================================== OUTPUT ===================================
 //- __generated__/fooQuery.graphql.js
 /**
- * <auto-generated> SignedSource<<9b5cf0134e02913bc0d65df99f7ff0c3>>
+ * <auto-generated> SignedSource<<2850659094fb71d3762177cc38cd028d>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -33,9 +33,9 @@ type User { name: String }
 import type { ConcreteRequest, Query } from 'relay-runtime';
 export type fooQuery$variables = {||};
 export type fooQuery$data = {|
-  +me: ?{|
-    +name: ?string,
-  |},
+  +me: {|
+    +name: string | null,
+  |} | null,
 |};
 export type fooQuery = {|
   response: fooQuery$data,

diff --git a/.../relay_compiler_integration/fixtures/exec_resolvers_directive_with_root_fragment.expected b/.../relay_compiler_integration/fixtures/exec_resolvers_directive_with_root_fragment.expected
@@ -116,7 +116,7 @@ export default node;
 
 //- __generated__/UserFooFragment.graphql.js
 /**
- * <auto-generated> SignedSource<<843aee583dbf963998562b8559b43846>>
+ * <auto-generated> SignedSource<<c6276bdf3c443a503812bf90a2089b08>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -132,7 +132,7 @@ import type { FragmentType } from "relay-runtime";
 import {bar as userBarResolverType} from "User_bar";
 // Type assertion validating that `userBarResolverType` resolver is correctly implemented.
 // A type error here indicates that the type signature of the resolver module is incorrect.
-(userBarResolverType: () => ?mixed);
+(userBarResolverType: () => mixed | null);
 declare export opaque type UserFooFragment$fragmentType: FragmentType;
 export type UserFooFragment$data = {|
   +bar: ?ReturnType<typeof userBarResolverType>,

diff --git a/...er_integration/fixtures/multiple_resolvers_on_interface_of_all_strong_model_type.expected b/...er_integration/fixtures/multiple_resolvers_on_interface_of_all_strong_model_type.expected
@@ -183,7 +183,7 @@ export default ((node/*: any*/)/*: Fragment<
 
 //- __generated__/PersonComponentQuery.graphql.js
 /**
- * <auto-generated> SignedSource<<e0022cdfb92fda66bd256d91ed716cdc>>
+ * <auto-generated> SignedSource<<63481a634199f0ea7757f9e303b9a3c8>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -202,13 +202,13 @@ import {description as iActorDescriptionResolverType} from "IActorResolvers";
 // A type error here indicates that the type signature of the resolver module is incorrect.
 (iActorDescriptionResolverType: (
   model: Admin____relay_model_instance$data['__relay_model_instance'] | User____relay_model_instance$data['__relay_model_instance'],
-) => ?string);
+) => string | null);
 import {name as iPersonNameResolverType} from "IPersonResolvers";
 // Type assertion validating that `iPersonNameResolverType` resolver is correctly implemented.
 // A type error here indicates that the type signature of the resolver module is incorrect.
 (iPersonNameResolverType: (
   model: Admin____relay_model_instance$data['__relay_model_instance'] | User____relay_model_instance$data['__relay_model_instance'],
-) => ?string);
+) => string | null);
 export type PersonComponentQuery$variables = {||};
 export type PersonComponentQuery$data = {|
   +actor: ?{|

diff --git a/...ests/relay_compiler_integration/fixtures/relay_resolvers_in_throw_on_field_error.expected b/...ests/relay_compiler_integration/fixtures/relay_resolvers_in_throw_on_field_error.expected
@@ -164,7 +164,7 @@ export default ((node/*: any*/)/*: Fragment<
 
 //- __generated__/fooQuery.graphql.js
 /**
- * <auto-generated> SignedSource<<3313eddbfdd22f715c9f61877c3934fc>>
+ * <auto-generated> SignedSource<<31bc07f2b00ed403e2ce86668617d4b8>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -180,14 +180,14 @@ import type { DataID } from "relay-runtime";
 import {clientUser as queryClientUserResolverType} from "foo";
 // Type assertion validating that `queryClientUserResolverType` resolver is correctly implemented.
 // A type error here indicates that the type signature of the resolver module is incorrect.
-(queryClientUserResolverType: () => ?{|
+(queryClientUserResolverType: () => {|
   +id: DataID,
-|});
+|} | null);
 export type fooQuery$variables = {||};
 export type fooQuery$data = {|
-  +clientUser: ?{|
+  +clientUser: {|
     +id: string,
-  |},
+  |} | null,
 |};
 export type fooQuery = {|
   response: fooQuery$data,

diff --git a/...lay_compiler_integration/fixtures/resolver_on_interface_of_all_strong_model_type.expected b/...lay_compiler_integration/fixtures/resolver_on_interface_of_all_strong_model_type.expected
@@ -168,7 +168,7 @@ export default ((node/*: any*/)/*: Fragment<
 
 //- __generated__/PersonComponentFragment.graphql.js
 /**
- * <auto-generated> SignedSource<<fa447cade5f346d21f24221645ca4842>>
+ * <auto-generated> SignedSource<<6ae25904008fca5dd338ee1e53ed18d2>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -188,7 +188,7 @@ import {name as iPersonNameResolverType} from "IPersonResolvers";
 // A type error here indicates that the type signature of the resolver module is incorrect.
 (iPersonNameResolverType: (
   model: Admin____relay_model_instance$data['__relay_model_instance'] | User____relay_model_instance$data['__relay_model_instance'],
-) => ?string);
+) => string | null);
 declare export opaque type PersonComponentFragment$fragmentType: FragmentType;
 export type PersonComponentFragment$data = {|
   +name: ?string,

diff --git a/...ntegration/fixtures/resolver_on_interface_of_all_strong_model_type_including_cse.expected b/...ntegration/fixtures/resolver_on_interface_of_all_strong_model_type_including_cse.expected
@@ -173,7 +173,7 @@ export default ((node/*: any*/)/*: Fragment<
 
 //- __generated__/PersonComponentFragment.graphql.js
 /**
- * <auto-generated> SignedSource<<ff024ab8938010ee748b9b92881c35c4>>
+ * <auto-generated> SignedSource<<f8340424d128087ea7c608c7e5e24f14>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -193,7 +193,7 @@ import {name as iPersonNameResolverType} from "IPersonResolvers";
 // A type error here indicates that the type signature of the resolver module is incorrect.
 (iPersonNameResolverType: (
   model: Admin____relay_model_instance$data['__relay_model_instance'] | User____relay_model_instance$data['__relay_model_instance'],
-) => ?string);
+) => string | null);
 declare export opaque type PersonComponentFragment$fragmentType: FragmentType;
 export type PersonComponentFragment$data = {|
   +name: ?string,

diff --git a/...ation/fixtures/resolver_on_interface_of_all_strong_model_type_with_root_fragment.expected b/...ation/fixtures/resolver_on_interface_of_all_strong_model_type_with_root_fragment.expected
@@ -171,7 +171,7 @@ export default ((node/*: any*/)/*: Fragment<
 
 //- __generated__/IPersonResolversFragment.graphql.js
 /**
- * <auto-generated> SignedSource<<a8e223129204a517e8ac13f1a97bff8e>>
+ * <auto-generated> SignedSource<<3039ac5c36d275852823d4328779d54d>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -189,7 +189,7 @@ import {name as iPersonNameResolverType} from "IPersonResolvers";
 // A type error here indicates that the type signature of the resolver module is incorrect.
 (iPersonNameResolverType: (
   rootKey: IPersonResolversFragment$key,
-) => ?string);
+) => string | null);
 declare export opaque type IPersonResolversFragment$fragmentType: FragmentType;
 export type IPersonResolversFragment$data = {|
   +name: ?string,

diff --git a/...relay_compiler_integration/fixtures/resolver_on_interface_of_all_weak_model_type.expected b/...relay_compiler_integration/fixtures/resolver_on_interface_of_all_weak_model_type.expected
@@ -102,7 +102,7 @@ export default ((node/*: any*/)/*: Fragment<
 
 //- __generated__/PersonComponentFragment.graphql.js
 /**
- * <auto-generated> SignedSource<<fa447cade5f346d21f24221645ca4842>>
+ * <auto-generated> SignedSource<<6ae25904008fca5dd338ee1e53ed18d2>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -122,7 +122,7 @@ import {name as iPersonNameResolverType} from "IPersonResolvers";
 // A type error here indicates that the type signature of the resolver module is incorrect.
 (iPersonNameResolverType: (
   model: Admin____relay_model_instance$data['__relay_model_instance'] | User____relay_model_instance$data['__relay_model_instance'],
-) => ?string);
+) => string | null);
 declare export opaque type PersonComponentFragment$fragmentType: FragmentType;
 export type PersonComponentFragment$data = {|
   +name: ?string,

diff --git a/...elay_compiler_integration/fixtures/resolver_returns_client_schema_extension_enum.expected b/...elay_compiler_integration/fixtures/resolver_returns_client_schema_extension_enum.expected
@@ -45,7 +45,7 @@ enum Status {
 ==================================== OUTPUT ===================================
 //- __generated__/SomeComponentFragment.graphql.js
 /**
- * <auto-generated> SignedSource<<ba8106a4f59c87af82497d36f2d48470>>
+ * <auto-generated> SignedSource<<b800d4461e6cc7083332e61bd4bbf503>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -65,7 +65,7 @@ import {status as userStatusResolverType} from "UserTypeResolvers";
 // A type error here indicates that the type signature of the resolver module is incorrect.
 (userStatusResolverType: (
   __relay_model_instance: User____relay_model_instance$data['__relay_model_instance'],
-) => ?Status);
+) => Status | null);
 declare export opaque type SomeComponentFragment$fragmentType: FragmentType;
 export type SomeComponentFragment$data = {|
   +status: ?Status,

diff --git a/...tests/relay_compiler_integration/fixtures/resolver_returns_enum_with_enum_suffix.expected b/...tests/relay_compiler_integration/fixtures/resolver_returns_enum_with_enum_suffix.expected
@@ -46,7 +46,7 @@ enum Status {
 ==================================== OUTPUT ===================================
 //- __generated__/SomeComponentFragment.graphql.js
 /**
- * <auto-generated> SignedSource<<ba8106a4f59c87af82497d36f2d48470>>
+ * <auto-generated> SignedSource<<b800d4461e6cc7083332e61bd4bbf503>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -66,7 +66,7 @@ import {status as userStatusResolverType} from "UserTypeResolvers";
 // A type error here indicates that the type signature of the resolver module is incorrect.
 (userStatusResolverType: (
   __relay_model_instance: User____relay_model_instance$data['__relay_model_instance'],
-) => ?Status);
+) => Status | null);
 declare export opaque type SomeComponentFragment$fragmentType: FragmentType;
 export type SomeComponentFragment$data = {|
   +status: ?Status,

diff --git a/..._compiler_integration/fixtures/resolver_returns_interface_of_all_live_model_type.expected b/..._compiler_integration/fixtures/resolver_returns_interface_of_all_live_model_type.expected
@@ -179,7 +179,7 @@ export default ((node/*: any*/)/*: Fragment<
 
 //- __generated__/QueryComponentQuery.graphql.js
 /**
- * <auto-generated> SignedSource<<039b56847e2dfd47111f7874367eec4c>>
+ * <auto-generated> SignedSource<<a4143f18505c4ac8a21d41a42f95aad1>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -195,10 +195,10 @@ import type { DataID } from "relay-runtime";
 import {person as queryPersonResolverType} from "QueryResolvers";
 // Type assertion validating that `queryPersonResolverType` resolver is correctly implemented.
 // A type error here indicates that the type signature of the resolver module is incorrect.
-(queryPersonResolverType: () => ?{|
+(queryPersonResolverType: () => {|
   +__typename: "Admin" | "User",
   +id: DataID,
-|});
+|} | null);
 export type QueryComponentQuery$variables = {||};
 export type QueryComponentQuery$data = {|
   +person: ?{|

diff --git a/...ompiler_integration/fixtures/resolver_returns_interface_of_all_strong_model_type.expected b/...ompiler_integration/fixtures/resolver_returns_interface_of_all_strong_model_type.expected
@@ -177,7 +177,7 @@ export default ((node/*: any*/)/*: Fragment<
 
 //- __generated__/PersonComponentQuery.graphql.js
 /**
- * <auto-generated> SignedSource<<82abcf281482a29fac0483ffd358760a>>
+ * <auto-generated> SignedSource<<f7a0b2ed2db4475c2995d88ddceb7de4>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -193,10 +193,10 @@ import type { DataID } from "relay-runtime";
 import {person as queryPersonResolverType} from "QueryResolvers";
 // Type assertion validating that `queryPersonResolverType` resolver is correctly implemented.
 // A type error here indicates that the type signature of the resolver module is incorrect.
-(queryPersonResolverType: () => ?{|
+(queryPersonResolverType: () => {|
   +__typename: "Admin" | "User",
   +id: DataID,
-|});
+|} | null);
 export type PersonComponentQuery$variables = {||};
 export type PersonComponentQuery$data = {|
   +person: ?{|

diff --git a/...ation/fixtures/resolver_returns_interface_of_all_strong_model_type_including_cse.expected b/...ation/fixtures/resolver_returns_interface_of_all_strong_model_type_including_cse.expected
@@ -182,7 +182,7 @@ export default ((node/*: any*/)/*: Fragment<
 
 //- __generated__/PersonComponentQuery.graphql.js
 /**
- * <auto-generated> SignedSource<<2250f9a6d065f577c499160ece6f071f>>
+ * <auto-generated> SignedSource<<e648cd6b4864dbebd6f925a6141c619e>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -198,10 +198,10 @@ import type { DataID } from "relay-runtime";
 import {person as queryPersonResolverType} from "QueryResolvers";
 // Type assertion validating that `queryPersonResolverType` resolver is correctly implemented.
 // A type error here indicates that the type signature of the resolver module is incorrect.
-(queryPersonResolverType: () => ?{|
+(queryPersonResolverType: () => {|
   +__typename: "Admin" | "User" | "Visitor",
   +id: DataID,
-|});
+|} | null);
 export type PersonComponentQuery$variables = {||};
 export type PersonComponentQuery$data = {|
   +person: ?{|

diff --git a/..._compiler_integration/fixtures/resolver_returns_interface_of_all_weak_model_type.expected b/..._compiler_integration/fixtures/resolver_returns_interface_of_all_weak_model_type.expected
@@ -113,7 +113,7 @@ export default ((node/*: any*/)/*: Fragment<
 
 //- __generated__/QueryComponentQuery.graphql.js
 /**
- * <auto-generated> SignedSource<<1e557ef442e027c83b6204650e80e65f>>
+ * <auto-generated> SignedSource<<39a6f90dac3aa0fee8284f8358435b25>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -128,7 +128,7 @@ import type { ClientRequest, ClientQuery } from 'relay-runtime';
 import {person as queryPersonResolverType} from "QueryResolvers";
 // Type assertion validating that `queryPersonResolverType` resolver is correctly implemented.
 // A type error here indicates that the type signature of the resolver module is incorrect.
-(queryPersonResolverType: () => ?Query__person$normalization);
+(queryPersonResolverType: () => Query__person$normalization | null);
 import type { Query__person$normalization } from "Query__person$normalization.graphql";
 export type QueryComponentQuery$variables = {||};
 export type QueryComponentQuery$data = {|

diff --git a/...ation/fixtures/resolver_returns_interface_of_live_and_non_live_strong_model_type.expected b/...ation/fixtures/resolver_returns_interface_of_live_and_non_live_strong_model_type.expected
@@ -178,7 +178,7 @@ export default ((node/*: any*/)/*: Fragment<
 
 //- __generated__/QueryComponentQuery.graphql.js
 /**
- * <auto-generated> SignedSource<<5b3a040936e731b1c6d0976643c9fbe8>>
+ * <auto-generated> SignedSource<<712c7fb44362dac9f0978c3f085aeaef>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -194,10 +194,10 @@ import type { DataID } from "relay-runtime";
 import {person as queryPersonResolverType} from "QueryResolvers";
 // Type assertion validating that `queryPersonResolverType` resolver is correctly implemented.
 // A type error here indicates that the type signature of the resolver module is incorrect.
-(queryPersonResolverType: () => ?{|
+(queryPersonResolverType: () => {|
   +__typename: "Admin" | "User",
   +id: DataID,
-|});
+|} | null);
 export type QueryComponentQuery$variables = {||};
 export type QueryComponentQuery$data = {|
   +person: ?{|