Fix result type generic for Error to not double-nest

Reviewed By: captbaritone Differential Revision: D64405588 fbshipit-source-id: 7fbe96cd4b4b7e4a34d46419ebb0e6d4747784d9
facebook · Oct 15, 2024 · 9571d80 · 9571d80
1 parent af35418
commit 9571d80
Show file tree

Hide file tree

Showing 35 changed files with 49 additions and 49 deletions.
diff --git a/compiler/crates/relay-typegen/src/visit.rs b/compiler/crates/relay-typegen/src/visit.rs
@@ -1805,7 +1805,7 @@ fn make_result_type(typegen_context: &'_ TypegenContext<'_>, value: AST) -> AST
 
     AST::GenericType {
         outer: *RESULT_TYPE_NAME,
-        inner: vec![value, AST::ReadOnlyArray(Box::new(error_type))],
+        inner: vec![value, error_type],
     }
 }
 

diff --git a/...relay-typegen/tests/generate_flow/fixtures/catch-no-arg-nested-custom-error-type.expected b/...relay-typegen/tests/generate_flow/fixtures/catch-no-arg-nested-custom-error-type.expected
@@ -13,7 +13,7 @@ import type { AComedyOfErrors } from "/all/the/worlds/a/stage";
 export type FooQuery$variables = {||};
 export type FooQuery$data = {|
   +me: ?{|
-    +firstName: Result<?string, $ReadOnlyArray<AComedyOfErrors>>,
+    +firstName: Result<?string, AComedyOfErrors>,
     +lastName: ?string,
   |},
 |};

diff --git a/...ler/crates/relay-typegen/tests/generate_flow/fixtures/catch-no-arg-nested-linked.expected b/...ler/crates/relay-typegen/tests/generate_flow/fixtures/catch-no-arg-nested-linked.expected
@@ -12,7 +12,7 @@ export type FooQuery$data = {|
   +me: Result<?{|
     +firstName: ?string,
     +lastName: ?string,
-  |}, $ReadOnlyArray<mixed>>,
+  |}, mixed>,
 |};
 export type FooQuery = {|
   response: FooQuery$data,

diff --git a/...tests/generate_flow/fixtures/catch-no-arg-nested-raw-fragments-catch-in-fragment.expected b/...tests/generate_flow/fixtures/catch-no-arg-nested-raw-fragments-catch-in-fragment.expected
@@ -42,7 +42,7 @@ import type { FragmentType, Result } from "relay-runtime";
 declare export opaque type AnotherFragment$fragmentType: FragmentType;
 export type AnotherFragment$data = {|
   +profilePicture: ?{|
-    +uri: Result<?string, $ReadOnlyArray<mixed>>,
+    +uri: Result<?string, mixed>,
   |},
   +$fragmentType: AnotherFragment$fragmentType,
 |};

diff --git a/...tes/relay-typegen/tests/generate_flow/fixtures/catch-no-arg-nested-raw-fragments.expected b/...tes/relay-typegen/tests/generate_flow/fixtures/catch-no-arg-nested-raw-fragments.expected
@@ -19,7 +19,7 @@ import type { AnotherFragment$fragmentType } from "AnotherFragment.graphql";
 export type MyQuery$variables = {||};
 export type MyQuery$data = {|
   +me: ?{|
-    +id: Result<string, $ReadOnlyArray<mixed>>,
+    +id: Result<string, mixed>,
     +name: ?string,
     +$fragmentSpreads: AnotherFragment$fragmentType,
   |},

diff --git a/...tests/generate_flow/fixtures/catch-no-arg-nested-raw-multiple-queries-and-fields.expected b/...tests/generate_flow/fixtures/catch-no-arg-nested-raw-multiple-queries-and-fields.expected
@@ -21,7 +21,7 @@ import type { Result } from "relay-runtime";
 export type AnotherQuery$variables = {||};
 export type AnotherQuery$data = {|
   +me: ?{|
-    +id: Result<string, $ReadOnlyArray<mixed>>,
+    +id: Result<string, mixed>,
     +name: ?string,
   |},
 |};
@@ -34,7 +34,7 @@ import type { Result } from "relay-runtime";
 export type MyQuery$variables = {||};
 export type MyQuery$data = {|
   +me: ?{|
-    +id: Result<string, $ReadOnlyArray<mixed>>,
+    +id: Result<string, mixed>,
     +name: ?string,
     +profilePicture: ?{|
       +uri: ?string,

diff --git a/compiler/crates/relay-typegen/tests/generate_flow/fixtures/catch-no-arg-nested-raw.expected b/compiler/crates/relay-typegen/tests/generate_flow/fixtures/catch-no-arg-nested-raw.expected
@@ -10,7 +10,7 @@ import type { Result } from "relay-runtime";
 export type MyQuery$variables = {||};
 export type MyQuery$data = {|
   +me: ?{|
-    +id: Result<string, $ReadOnlyArray<mixed>>,
+    +id: Result<string, mixed>,
     +name: ?string,
   |},
 |};

diff --git a/compiler/crates/relay-typegen/tests/generate_flow/fixtures/catch-no-arg-nested.expected b/compiler/crates/relay-typegen/tests/generate_flow/fixtures/catch-no-arg-nested.expected
@@ -10,7 +10,7 @@ import type { Result } from "relay-runtime";
 export type FooQuery$variables = {||};
 export type FooQuery$data = {|
   +me: ?{|
-    +firstName: Result<?string, $ReadOnlyArray<mixed>>,
+    +firstName: Result<?string, mixed>,
     +lastName: ?string,
   |},
 |};

diff --git a/compiler/crates/relay-typegen/tests/generate_flow/fixtures/catch-on-root.expected b/compiler/crates/relay-typegen/tests/generate_flow/fixtures/catch-on-root.expected
@@ -12,7 +12,7 @@ export type MyQuery$data = {|
   +me: Result<?{|
     +id: string,
     +name: ?string,
-  |}, $ReadOnlyArray<mixed>>,
+  |}, mixed>,
 |};
 export type MyQuery = {|
   response: MyQuery$data,

diff --git a/...y-typegen/tests/generate_flow/fixtures/catch-semantic-non-null-with-catch-no-arg.expected b/...y-typegen/tests/generate_flow/fixtures/catch-semantic-non-null-with-catch-no-arg.expected
@@ -12,7 +12,7 @@ type ClientUser {
 import type { FragmentType, Result } from "relay-runtime";
 declare export opaque type MyFragment$fragmentType: FragmentType;
 export type MyFragment$data = {|
-  +name: Result<string, $ReadOnlyArray<mixed>>,
+  +name: Result<string, mixed>,
   +$fragmentType: MyFragment$fragmentType,
 |};
 export type MyFragment$key = {

diff --git a/compiler/crates/relay-typegen/tests/generate_flow/fixtures/catch-to-result-nested.expected b/compiler/crates/relay-typegen/tests/generate_flow/fixtures/catch-to-result-nested.expected
@@ -11,7 +11,7 @@ export type FooQuery$variables = {||};
 export type FooQuery$data = {|
   +me: ?{|
     +firstName: ?string,
-    +lastName: Result<?string, $ReadOnlyArray<mixed>>,
+    +lastName: Result<?string, mixed>,
   |},
 |};
 export type FooQuery = {|

diff --git a/...s/relay-typegen/tests/generate_flow/fixtures/semantic_non_null_scalar_with_catch.expected b/...s/relay-typegen/tests/generate_flow/fixtures/semantic_non_null_scalar_with_catch.expected
@@ -12,7 +12,7 @@ type ClientUser {
 import type { FragmentType, Result } from "relay-runtime";
 declare export opaque type MyFragment$fragmentType: FragmentType;
 export type MyFragment$data = {|
-  +name: Result<string, $ReadOnlyArray<mixed>>,
+  +name: Result<string, mixed>,
   +$fragmentType: MyFragment$fragmentType,
 |};
 export type MyFragment$key = {

diff --git a/...typegen/tests/generate_typescript/fixtures/catch-no-arg-nested-custom-error-type.expected b/...typegen/tests/generate_typescript/fixtures/catch-no-arg-nested-custom-error-type.expected
@@ -13,7 +13,7 @@ import { AComedyOfErrors } from "/all/the/worlds/a/stage";
 export type FooQuery$variables = Record<PropertyKey, never>;
 export type FooQuery$data = {
   readonly me: {
-    readonly firstName: Result<string | null | undefined, ReadonlyArray<AComedyOfErrors>>;
+    readonly firstName: Result<string | null | undefined, AComedyOfErrors>;
     readonly lastName: string | null | undefined;
   } | null | undefined;
 };

diff --git a/...ates/relay-typegen/tests/generate_typescript/fixtures/catch-no-arg-nested-linked.expected b/...ates/relay-typegen/tests/generate_typescript/fixtures/catch-no-arg-nested-linked.expected
@@ -12,7 +12,7 @@ export type FooQuery$data = {
   readonly me: Result<{
     readonly firstName: string | null | undefined;
     readonly lastName: string | null | undefined;
-  } | null | undefined, ReadonlyArray<unknown>>;
+  } | null | undefined, unknown>;
 };
 export type FooQuery = {
   response: FooQuery$data;

diff --git a/.../crates/relay-typegen/tests/generate_typescript/fixtures/catch-no-arg-nested-raw.expected b/.../crates/relay-typegen/tests/generate_typescript/fixtures/catch-no-arg-nested-raw.expected
@@ -10,7 +10,7 @@ import { Result } from "relay-runtime";
 export type MyQuery$variables = Record<PropertyKey, never>;
 export type MyQuery$data = {
   readonly me: {
-    readonly id: Result<string, ReadonlyArray<unknown>>;
+    readonly id: Result<string, unknown>;
     readonly name: string | null | undefined;
   } | null | undefined;
 };

diff --git a/...iler/crates/relay-typegen/tests/generate_typescript/fixtures/catch-no-arg-nested.expected b/...iler/crates/relay-typegen/tests/generate_typescript/fixtures/catch-no-arg-nested.expected
@@ -11,7 +11,7 @@ export type FooQuery$variables = Record<PropertyKey, never>;
 export type FooQuery$data = {
   readonly me: {
     readonly firstName: string | null | undefined;
-    readonly lastName: Result<string | null | undefined, ReadonlyArray<unknown>>;
+    readonly lastName: Result<string | null | undefined, unknown>;
   } | null | undefined;
 };
 export type FooQuery = {

diff --git a/...gen/tests/generate_typescript/fixtures/catch-semantic-non-null-with-catch-no-arg.expected b/...gen/tests/generate_typescript/fixtures/catch-semantic-non-null-with-catch-no-arg.expected
@@ -11,7 +11,7 @@ type ClientUser {
 ==================================== OUTPUT ===================================
 import { FragmentRefs, Result } from "relay-runtime";
 export type MyFragment$data = {
-  readonly name: Result<string, ReadonlyArray<unknown>>;
+  readonly name: Result<string, unknown>;
   readonly " $fragmentType": "MyFragment";
 };
 export type MyFragment$key = {

diff --git a/...gen/tests/generate_typescript/fixtures/catch-to-result-nested-raw-with-fragments.expected b/...gen/tests/generate_typescript/fixtures/catch-to-result-nested-raw-with-fragments.expected
@@ -20,7 +20,7 @@ export type TestEnums = "mark" | "zuck" | "%future added value";
 export type FooQuery$variables = Record<PropertyKey, never>;
 export type FooQuery$data = {
   readonly me: {
-    readonly firstName: Result<string | null | undefined, ReadonlyArray<unknown>>;
+    readonly firstName: Result<string | null | undefined, unknown>;
     readonly " $fragmentSpreads": FragmentRefs<"FriendFragment">;
   } | null | undefined;
 };
@@ -44,7 +44,7 @@ export type FooQuery = {
 export type TestEnums = "mark" | "zuck" | "%future added value";
 import { FragmentRefs, Result } from "relay-runtime";
 export type FriendFragment$data = {
-  readonly lastName: Result<string | null | undefined, ReadonlyArray<unknown>>;
+  readonly lastName: Result<string | null | undefined, unknown>;
   readonly name: string | null | undefined;
   readonly profilePicture2: {
     readonly test_enums: TestEnums | null | undefined;

diff --git a/...ates/relay-typegen/tests/generate_typescript/fixtures/catch-to-result-nested-raw.expected b/...ates/relay-typegen/tests/generate_typescript/fixtures/catch-to-result-nested-raw.expected
@@ -11,7 +11,7 @@ export type FooQuery$variables = Record<PropertyKey, never>;
 export type FooQuery$data = {
   readonly me: {
     readonly firstName: string | null | undefined;
-    readonly lastName: Result<string | null | undefined, ReadonlyArray<unknown>>;
+    readonly lastName: Result<string | null | undefined, unknown>;
   } | null | undefined;
 };
 export type FooQuery$rawResponse = {

diff --git a/...r/crates/relay-typegen/tests/generate_typescript/fixtures/catch-to-result-nested.expected b/...r/crates/relay-typegen/tests/generate_typescript/fixtures/catch-to-result-nested.expected
@@ -11,7 +11,7 @@ export type FooQuery$variables = Record<PropertyKey, never>;
 export type FooQuery$data = {
   readonly me: {
     readonly firstName: string | null | undefined;
-    readonly lastName: Result<string | null | undefined, ReadonlyArray<unknown>>;
+    readonly lastName: Result<string | null | undefined, unknown>;
   } | null | undefined;
 };
 export type FooQuery = {

diff --git a/...y-typegen/tests/generate_typescript/fixtures/linked-semantic-non-null-with-catch.expected b/...y-typegen/tests/generate_typescript/fixtures/linked-semantic-non-null-with-catch.expected
@@ -16,7 +16,7 @@ import { FragmentRefs, Result } from "relay-runtime";
 export type MyFragment$data = {
   readonly my_user: Result<{
     readonly name: string | null | undefined;
-  }, ReadonlyArray<unknown>>;
+  }, unknown>;
   readonly " $fragmentType": "MyFragment";
 };
 export type MyFragment$key = {

diff --git a/...y-typegen/tests/generate_typescript/fixtures/scalar-semantic-non-null-with-catch.expected b/...y-typegen/tests/generate_typescript/fixtures/scalar-semantic-non-null-with-catch.expected
@@ -12,7 +12,7 @@ extend type Query {
 ==================================== OUTPUT ===================================
 import { FragmentRefs, Result } from "relay-runtime";
 export type MyFragment$data = {
-  readonly my_string: Result<string, ReadonlyArray<unknown>>;
+  readonly my_string: Result<string, unknown>;
   readonly " $fragmentType": "MyFragment";
 };
 export type MyFragment$key = {

diff --git a/...y-typegen/tests/generate_typescript/fixtures/semantic_non_null_scalar_with_catch.expected b/...y-typegen/tests/generate_typescript/fixtures/semantic_non_null_scalar_with_catch.expected
@@ -11,7 +11,7 @@ type ClientUser {
 ==================================== OUTPUT ===================================
 import { FragmentRefs, Result } from "relay-runtime";
 export type MyFragment$data = {
-  readonly name: Result<string, ReadonlyArray<unknown>>;
+  readonly name: Result<string, unknown>;
   readonly " $fragmentType": "MyFragment";
 };
 export type MyFragment$key = {

diff --git a/packages/react-relay/__tests__/__generated__/CatchTest1Query.graphql.js b/packages/react-relay/__tests__/__generated__/CatchTest1Query.graphql.js
diff --git a/packages/react-relay/__tests__/__generated__/CatchTestRequiredThrowQuery.graphql.js b/packages/react-relay/__tests__/__generated__/CatchTestRequiredThrowQuery.graphql.js
diff --git a/packages/react-relay/__tests__/__generated__/CatchTestResolverErrorThrowQuery.graphql.js b/packages/react-relay/__tests__/__generated__/CatchTestResolverErrorThrowQuery.graphql.js
diff --git a/...relay-runtime/store/__tests__/__generated__/RelayReaderCatchFieldsTest010Query.graphql.js b/...relay-runtime/store/__tests__/__generated__/RelayReaderCatchFieldsTest010Query.graphql.js
diff --git a/.../relay-runtime/store/__tests__/__generated__/RelayReaderCatchFieldsTest01Query.graphql.js b/.../relay-runtime/store/__tests__/__generated__/RelayReaderCatchFieldsTest01Query.graphql.js
diff --git a/.../relay-runtime/store/__tests__/__generated__/RelayReaderCatchFieldsTest02Query.graphql.js b/.../relay-runtime/store/__tests__/__generated__/RelayReaderCatchFieldsTest02Query.graphql.js
diff --git a/.../relay-runtime/store/__tests__/__generated__/RelayReaderCatchFieldsTest07Query.graphql.js b/.../relay-runtime/store/__tests__/__generated__/RelayReaderCatchFieldsTest07Query.graphql.js
diff --git a/.../relay-runtime/store/__tests__/__generated__/RelayReaderCatchFieldsTest09Query.graphql.js b/.../relay-runtime/store/__tests__/__generated__/RelayReaderCatchFieldsTest09Query.graphql.js
diff --git a/...time/store/__tests__/__generated__/RelayReaderCatchFieldsTestSiblingErrorQuery.graphql.js b/...time/store/__tests__/__generated__/RelayReaderCatchFieldsTestSiblingErrorQuery.graphql.js