Replace $Call with ReturnType in flow typegen

Reviewed By: voideanvalue Differential Revision: D46860867 fbshipit-source-id: 660d1578a065de238a7819f4776c78a926c6a743
facebook · Jun 22, 2023 · eb29556 · eb29556
1 parent 99ce43f
commit eb29556
Show file tree

Hide file tree

Showing 112 changed files with 221 additions and 225 deletions.
diff --git a/compiler/crates/relay-typegen/src/flow.rs b/compiler/crates/relay-typegen/src/flow.rs
@@ -312,19 +312,15 @@ impl FlowPrinter {
     }
 
     fn write_return_type_of_function_with_name(&mut self, function_name: StringKey) -> FmtResult {
-        write!(
-            &mut self.result,
-            "$Call<<R>((...empty[]) => R) => R, typeof {}>",
-            function_name
-        )
+        write!(&mut self.result, "ReturnType<typeof {}>", function_name)
     }
 
     fn write_return_type_of_method_call(
         &mut self,
         object: &AST,
         method_name: StringKey,
     ) -> FmtResult {
-        write!(&mut self.result, "$Call<")?;
+        write!(&mut self.result, "ReturnType<")?;
         self.write(object)?;
         write!(&mut self.result, "[\"{}\"]>", method_name)
     }
@@ -616,7 +612,7 @@ mod tests {
     fn function_return_type() {
         assert_eq!(
             print_type(&AST::ReturnTypeOfFunctionWithName("someFunc".intern())),
-            "$Call<<R>((...empty[]) => R) => R, typeof someFunc>".to_string()
+            "ReturnType<typeof someFunc>".to_string()
         );
     }
 }
diff --git a/...rates/relay-typegen/tests/generate_flow/fixtures/relay-live-resolver-no-fragment.expected b/...rates/relay-typegen/tests/generate_flow/fixtures/relay-live-resolver-no-fragment.expected
@@ -23,7 +23,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 export type relayResolver_Query$variables = {||};
 export type relayResolver_Query$data = {|
   +me: ?{|
-    +pop_star_name: ?$Call<$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>["read"]>,
+    +pop_star_name: ?ReturnType<ReturnType<typeof userPopStarNameResolverType>["read"]>,
   |},
 |};
 export type relayResolver_Query = {|

diff --git a/...gen/tests/generate_flow/fixtures/relay-live-resolver-with-field-args-no-fragment.expected b/...gen/tests/generate_flow/fixtures/relay-live-resolver-with-field-args-no-fragment.expected
@@ -32,7 +32,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 export type relayResolver_Query$variables = {||};
 export type relayResolver_Query$data = {|
   +me: ?{|
-    +pop_star_name: ?$Call<$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>["read"]>,
+    +pop_star_name: ?ReturnType<ReturnType<typeof userPopStarNameResolverType>["read"]>,
   |},
 |};
 export type relayResolver_Query = {|

diff --git a/...s/relay-typegen/tests/generate_flow/fixtures/relay-live-resolver-with-field-args.expected b/...s/relay-typegen/tests/generate_flow/fixtures/relay-live-resolver-with-field-args.expected
@@ -35,7 +35,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 export type relayResolver_Query$variables = {||};
 export type relayResolver_Query$data = {|
   +me: ?{|
-    +pop_star_name: ?$Call<$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>["read"]>,
+    +pop_star_name: ?ReturnType<ReturnType<typeof userPopStarNameResolverType>["read"]>,
   |},
 |};
 export type relayResolver_Query = {|

diff --git a/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-live-resolver.expected b/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-live-resolver.expected
@@ -31,7 +31,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 export type relayResolver_Query$variables = {||};
 export type relayResolver_Query$data = {|
   +me: ?{|
-    +pop_star_name: ?$Call<$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>["read"]>,
+    +pop_star_name: ?ReturnType<ReturnType<typeof userPopStarNameResolverType>["read"]>,
   |},
 |};
 export type relayResolver_Query = {|

diff --git a/...ler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-in-fragment.expected b/...ler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-in-fragment.expected
@@ -39,7 +39,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 ) => ?mixed);
 declare export opaque type relayResolver_consumer$fragmentType: FragmentType;
 export type relayResolver_consumer$data = {|
-  +pop_star_name: ?$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>,
+  +pop_star_name: ?ReturnType<typeof userPopStarNameResolverType>,
   +$fragmentType: relayResolver_consumer$fragmentType,
 |};
 export type relayResolver_consumer$key = {

diff --git a/...s/relay-typegen/tests/generate_flow/fixtures/relay-resolver-inject-fragment-data.expected b/...s/relay-typegen/tests/generate_flow/fixtures/relay-resolver-inject-fragment-data.expected
@@ -25,7 +25,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 export type relayResolver_Query$variables = {||};
 export type relayResolver_Query$data = {|
   +me: ?{|
-    +pop_star_name: ?$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>,
+    +pop_star_name: ?ReturnType<typeof userPopStarNameResolverType>,
   |},
 |};
 export type relayResolver_Query = {|

diff --git a/...tes/relay-typegen/tests/generate_flow/fixtures/relay-resolver-multiple-consumers.expected b/...tes/relay-typegen/tests/generate_flow/fixtures/relay-resolver-multiple-consumers.expected
@@ -33,9 +33,9 @@ export type relayResolver_Query$variables = {||};
 export type relayResolver_Query$data = {|
   +me: ?{|
     +parents: $ReadOnlyArray<{|
-      +pop_star_name: ?$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>,
+      +pop_star_name: ?ReturnType<typeof userPopStarNameResolverType>,
     |}>,
-    +pop_star_name: ?$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>,
+    +pop_star_name: ?ReturnType<typeof userPopStarNameResolverType>,
   |},
 |};
 export type relayResolver_Query = {|

diff --git a/...er/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-named-import.expected b/...er/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-named-import.expected
@@ -30,7 +30,7 @@ import {pop_star_name as userPopStarNameResolverType} from "PopStarNameResolver"
 export type relayResolverNamedImport_Query$variables = {||};
 export type relayResolverNamedImport_Query$data = {|
   +me: ?{|
-    +pop_star_name: ?$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>,
+    +pop_star_name: ?ReturnType<typeof userPopStarNameResolverType>,
   |},
 |};
 export type relayResolverNamedImport_Query = {|

diff --git a/...er/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-raw-response.expected b/...er/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-raw-response.expected
@@ -66,7 +66,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 ) => ?mixed);
 declare export opaque type relayResolver_user$fragmentType: FragmentType;
 export type relayResolver_user$data = {|
-  +pop_star_name: ?$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>,
+  +pop_star_name: ?ReturnType<typeof userPopStarNameResolverType>,
   +$fragmentType: relayResolver_user$fragmentType,
 |};
 export type relayResolver_user$key = {

diff --git a/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-required.expected b/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-required.expected
@@ -29,7 +29,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 export type relayResolver_Query$variables = {||};
 export type relayResolver_Query$data = {|
   +me: ?{|
-    +pop_star_name: $NonMaybeType<$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>>,
+    +pop_star_name: $NonMaybeType<ReturnType<typeof userPopStarNameResolverType>>,
   |},
 |};
 export type relayResolver_Query = {|

diff --git a/...r/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-scalar-plural.expected b/...r/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-scalar-plural.expected
@@ -29,7 +29,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 export type relayResolver_Query$variables = {||};
 export type relayResolver_Query$data = {|
   +me: ?{|
-    +pop_star_name: ?$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>,
+    +pop_star_name: ?ReturnType<typeof userPopStarNameResolverType>,
   |},
 |};
 export type relayResolver_Query = {|

diff --git a/...nerate_flow/fixtures/relay-resolver-with-output-type-relay-resolver-value-plural.expected b/...nerate_flow/fixtures/relay-resolver-with-output-type-relay-resolver-value-plural.expected
@@ -34,7 +34,7 @@ import userPopStarNamesResolverType from "PopStarNameResolver";
 ) => ?$ReadOnlyArray<?mixed>);
 declare export opaque type Foo_user$fragmentType: FragmentType;
 export type Foo_user$data = {|
-  +poppy: ?$Call<<R>((...empty[]) => R) => R, typeof userPopStarNamesResolverType>,
+  +poppy: ?ReturnType<typeof userPopStarNamesResolverType>,
   +$fragmentType: Foo_user$fragmentType,
 |};
 export type Foo_user$key = {

diff --git a/...rate_flow/fixtures/relay-resolver-with-output-type-relay-resolver-value-required.expected b/...rate_flow/fixtures/relay-resolver-with-output-type-relay-resolver-value-required.expected
@@ -29,7 +29,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 ) => ?mixed);
 declare export opaque type Foo_user$fragmentType: FragmentType;
 export type Foo_user$data = {|
-  +poppy: $NonMaybeType<$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>>,
+  +poppy: $NonMaybeType<ReturnType<typeof userPopStarNameResolverType>>,
   +$fragmentType: Foo_user$fragmentType,
 |};
 export type Foo_user$key = {

diff --git a/...ests/generate_flow/fixtures/relay-resolver-with-output-type-relay-resolver-value.expected b/...ests/generate_flow/fixtures/relay-resolver-with-output-type-relay-resolver-value.expected
@@ -29,7 +29,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 ) => ?mixed);
 declare export opaque type Foo_user$fragmentType: FragmentType;
 export type Foo_user$data = {|
-  +poppy: ?$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>,
+  +poppy: ?ReturnType<typeof userPopStarNameResolverType>,
   +$fragmentType: Foo_user$fragmentType,
 |};
 export type Foo_user$key = {

diff --git a/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver.expected b/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver.expected
@@ -29,7 +29,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 export type relayResolver_Query$variables = {||};
 export type relayResolver_Query$data = {|
   +me: ?{|
-    +pop_star_name: ?$Call<<R>((...empty[]) => R) => R, typeof userPopStarNameResolverType>,
+    +pop_star_name: ?ReturnType<typeof userPopStarNameResolverType>,
   |},
 |};
 export type relayResolver_Query = {|

diff --git a/packages/react-relay/__tests__/__generated__/ClientOnlyQueriesTest2Query.graphql.js b/packages/react-relay/__tests__/__generated__/ClientOnlyQueriesTest2Query.graphql.js
diff --git a/packages/react-relay/__tests__/__generated__/LiveResolversTest10Query.graphql.js b/packages/react-relay/__tests__/__generated__/LiveResolversTest10Query.graphql.js
diff --git a/packages/react-relay/__tests__/__generated__/LiveResolversTest11Query.graphql.js b/packages/react-relay/__tests__/__generated__/LiveResolversTest11Query.graphql.js
diff --git a/packages/react-relay/__tests__/__generated__/LiveResolversTest12Query.graphql.js b/packages/react-relay/__tests__/__generated__/LiveResolversTest12Query.graphql.js
diff --git a/packages/react-relay/__tests__/__generated__/LiveResolversTest14Query.graphql.js b/packages/react-relay/__tests__/__generated__/LiveResolversTest14Query.graphql.js
diff --git a/packages/react-relay/__tests__/__generated__/LiveResolversTest16Query.graphql.js b/packages/react-relay/__tests__/__generated__/LiveResolversTest16Query.graphql.js
diff --git a/packages/react-relay/__tests__/__generated__/LiveResolversTest17Query.graphql.js b/packages/react-relay/__tests__/__generated__/LiveResolversTest17Query.graphql.js
diff --git a/packages/react-relay/__tests__/__generated__/LiveResolversTest18Query.graphql.js b/packages/react-relay/__tests__/__generated__/LiveResolversTest18Query.graphql.js
diff --git a/packages/react-relay/__tests__/__generated__/LiveResolversTest19Query.graphql.js b/packages/react-relay/__tests__/__generated__/LiveResolversTest19Query.graphql.js
diff --git a/packages/react-relay/__tests__/__generated__/LiveResolversTest1Query.graphql.js b/packages/react-relay/__tests__/__generated__/LiveResolversTest1Query.graphql.js
diff --git a/packages/react-relay/__tests__/__generated__/LiveResolversTest2Query.graphql.js b/packages/react-relay/__tests__/__generated__/LiveResolversTest2Query.graphql.js
diff --git a/packages/react-relay/__tests__/__generated__/LiveResolversTest3Query.graphql.js b/packages/react-relay/__tests__/__generated__/LiveResolversTest3Query.graphql.js