diff --git a/compiler/crates/relay-codegen/src/build_ast.rs b/compiler/crates/relay-codegen/src/build_ast.rs index f1ecafa20c2f1..9b53dc729aa46 100644 --- a/compiler/crates/relay-codegen/src/build_ast.rs +++ b/compiler/crates/relay-codegen/src/build_ast.rs @@ -219,6 +219,12 @@ impl<'schema, 'builder> CodegenBuilder<'schema, 'builder> { if plural { metadata.push((CODEGEN_CONSTANTS.plural, Primitive::Bool(true))) } + let concrete_type = if self.schema.is_abstract_type(fragment.type_condition) { + Primitive::Null + } else { + Primitive::String(self.schema.get_type_name(fragment.type_condition)) + }; + // TODO: refetch metadata let object = vec![ @@ -250,10 +256,7 @@ impl<'schema, 'builder> CodegenBuilder<'schema, 'builder> { CODEGEN_CONSTANTS.selections, self.build_selections(&fragment.selections), ), - ( - CODEGEN_CONSTANTS.type_, - Primitive::String(self.schema.get_type_name(fragment.type_condition)), - ), + (CODEGEN_CONSTANTS.concrete_type, concrete_type), ]; self.object(object) } diff --git a/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-conditions.expected b/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-conditions.expected index 260d68db7d334..a21076e2349ba 100644 --- a/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-conditions.expected +++ b/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-conditions.expected @@ -214,7 +214,7 @@ interface ClientNamed { ] } ], - "type": "User" + "concreteType": "User" } { diff --git a/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-fields-in-inline-fragments.expected b/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-fields-in-inline-fragments.expected index 6f941c1899d7e..1a605bbde54e2 100644 --- a/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-fields-in-inline-fragments.expected +++ b/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-fields-in-inline-fragments.expected @@ -108,7 +108,7 @@ extend type Page { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { diff --git a/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-fields-on-roots.expected b/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-fields-on-roots.expected index 9c403166d60f3..0d26d160f797d 100644 --- a/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-fields-on-roots.expected +++ b/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-fields-on-roots.expected @@ -133,7 +133,7 @@ type ClientUser { ] } ], - "type": "ClientUser" + "concreteType": "ClientUser" } { diff --git a/compiler/crates/relay-codegen/tests/client_extensions/fixtures/sibling-client-selections.expected b/compiler/crates/relay-codegen/tests/client_extensions/fixtures/sibling-client-selections.expected index 5bf710cb8231c..3ef02162fdecf 100644 --- a/compiler/crates/relay-codegen/tests/client_extensions/fixtures/sibling-client-selections.expected +++ b/compiler/crates/relay-codegen/tests/client_extensions/fixtures/sibling-client-selections.expected @@ -80,7 +80,7 @@ interface ClientNamed { ] } ], - "type": "ClientType" + "concreteType": "ClientType" } { @@ -221,7 +221,7 @@ interface ClientNamed { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-directions.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-directions.expected index a1e3f8c67619a..9a3d62ff8ddca 100644 --- a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-directions.expected +++ b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-directions.expected @@ -328,7 +328,7 @@ return { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-empty-filters.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-empty-filters.expected index 065e5dcbc0363..ae37541f1c378 100644 --- a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-empty-filters.expected +++ b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-empty-filters.expected @@ -210,7 +210,7 @@ return { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-filters.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-filters.expected index c5736bfb7f454..e64687e2bc7fe 100644 --- a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-filters.expected +++ b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-filters.expected @@ -284,7 +284,7 @@ return { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-generate-filters.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-generate-filters.expected index 545066dac9eed..8997941f6f5dd 100644 --- a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-generate-filters.expected +++ b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-generate-filters.expected @@ -301,7 +301,7 @@ return { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-aliased-edges-page-info.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-aliased-edges-page-info.expected index 99a03fe20d4d1..58c132e2ca853 100644 --- a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-aliased-edges-page-info.expected +++ b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-aliased-edges-page-info.expected @@ -172,7 +172,7 @@ return { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-custom-handler.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-custom-handler.expected index 6e6dd4efba1b4..9e6f1bf44aeb8 100644 --- a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-custom-handler.expected +++ b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-custom-handler.expected @@ -273,7 +273,7 @@ return { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-page-info.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-page-info.expected index f0ecd97f3215e..39587900603e6 100644 --- a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-page-info.expected +++ b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-page-info.expected @@ -182,6 +182,6 @@ return { "storageKey": null } ], - "type": "User" + "concreteType": "User" }; })() diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-variables.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-variables.expected index dae11d2a878f9..d7769447acd40 100644 --- a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-variables.expected +++ b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-variables.expected @@ -176,5 +176,5 @@ fragment Example on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection.expected index 128970ad74765..b34886d4a9a9c 100644 --- a/compiler/crates/relay-codegen/tests/connections/fixtures/connection.expected +++ b/compiler/crates/relay-codegen/tests/connections/fixtures/connection.expected @@ -268,7 +268,7 @@ return { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-codegen/tests/deduped_json_codegen/fixtures/kitchen-sink.expected b/compiler/crates/relay-codegen/tests/deduped_json_codegen/fixtures/kitchen-sink.expected index 33d1253fda13a..dfce7875f7aaf 100644 --- a/compiler/crates/relay-codegen/tests/deduped_json_codegen/fixtures/kitchen-sink.expected +++ b/compiler/crates/relay-codegen/tests/deduped_json_codegen/fixtures/kitchen-sink.expected @@ -331,6 +331,6 @@ return { "storageKey": null } ], - "type": "User" + "concreteType": "User" }; })() diff --git a/compiler/crates/relay-codegen/tests/defer_stream/fixtures/fragment-with-defer-default-label.expected b/compiler/crates/relay-codegen/tests/defer_stream/fixtures/fragment-with-defer-default-label.expected index be4d9941b0d87..6ce824cdb416e 100644 --- a/compiler/crates/relay-codegen/tests/defer_stream/fixtures/fragment-with-defer-default-label.expected +++ b/compiler/crates/relay-codegen/tests/defer_stream/fixtures/fragment-with-defer-default-label.expected @@ -38,7 +38,7 @@ fragment DeferredFragment on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -72,7 +72,7 @@ fragment DeferredFragment on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { diff --git a/compiler/crates/relay-codegen/tests/defer_stream/fixtures/fragment-with-stream-default-label.expected b/compiler/crates/relay-codegen/tests/defer_stream/fixtures/fragment-with-stream-default-label.expected index fcebda061a71d..7da1337deac7b 100644 --- a/compiler/crates/relay-codegen/tests/defer_stream/fixtures/fragment-with-stream-default-label.expected +++ b/compiler/crates/relay-codegen/tests/defer_stream/fixtures/fragment-with-stream-default-label.expected @@ -94,5 +94,5 @@ fragment FeedbackFragment on Feedback { "storageKey": null } ], - "type": "Feedback" + "concreteType": "Feedback" } diff --git a/compiler/crates/relay-codegen/tests/json_codegen/fixtures/kitchen-sink.expected b/compiler/crates/relay-codegen/tests/json_codegen/fixtures/kitchen-sink.expected index 4c786da6a56f4..6c6ee1ebb9351 100644 --- a/compiler/crates/relay-codegen/tests/json_codegen/fixtures/kitchen-sink.expected +++ b/compiler/crates/relay-codegen/tests/json_codegen/fixtures/kitchen-sink.expected @@ -370,5 +370,5 @@ fragment UserFragment on User "storageKey": null } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-conditions.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-conditions.expected index da3e9fdd41791..ecc0b160540c4 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-conditions.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-conditions.expected @@ -177,5 +177,5 @@ interface ClientNamed { ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-in-inline-fragments.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-in-inline-fragments.expected index 7e8868d7b68b0..0963e5f2db427 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-in-inline-fragments.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-in-inline-fragments.expected @@ -97,5 +97,5 @@ extend type Page { ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-of-client-type.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-of-client-type.expected index 1ed277d91023b..75ba3fbe540dd 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-of-client-type.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-of-client-type.expected @@ -82,5 +82,5 @@ type Foo { ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-on-roots.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-on-roots.expected index 3d354bea764a4..b883ab34a3c7a 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-on-roots.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-on-roots.expected @@ -86,7 +86,7 @@ extend type Subscription { ] } ], - "type": "Mutation" + "concreteType": "Mutation" }, "kind": "Request", "operation": { @@ -210,7 +210,7 @@ mutation FooMutation( ] } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -342,7 +342,7 @@ query FooQuery( ] } ], - "type": "Subscription" + "concreteType": "Subscription" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fragment-spreads-in-query.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fragment-spreads-in-query.expected index 4aeec1ab6d25e..a847b46b488b7 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fragment-spreads-in-query.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fragment-spreads-in-query.expected @@ -63,7 +63,7 @@ type ClientType { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -185,7 +185,7 @@ fragment Foo_user on User { ] } ], - "type": "ClientType" + "concreteType": "ClientType" } { @@ -223,5 +223,5 @@ fragment Foo_user on User { ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fragment-spreads.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fragment-spreads.expected index 80483c9e3bc29..97d86efc6f055 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fragment-spreads.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fragment-spreads.expected @@ -39,7 +39,7 @@ type ClientType { ] } ], - "type": "ClientType" + "concreteType": "ClientType" } { @@ -77,5 +77,5 @@ type ClientType { ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-inline-fragments-in-query.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-inline-fragments-in-query.expected index 8f5562cdecba7..f5c6eea0e9b7e 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-inline-fragments-in-query.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-inline-fragments-in-query.expected @@ -61,7 +61,7 @@ interface ClientNamed { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -208,5 +208,5 @@ fragment Foo_user on User { ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-inline-fragments.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-inline-fragments.expected index c35084ffae062..f349f9b450747 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-inline-fragments.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-inline-fragments.expected @@ -55,5 +55,5 @@ interface ClientNamed { ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-linked-fields.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-linked-fields.expected index acf8d0bb8164f..fea5aeee4d9ec 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-linked-fields.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-linked-fields.expected @@ -109,5 +109,5 @@ extend type FriendsEdge { ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-scalar-fields.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-scalar-fields.expected index 45fd2f190fb0a..8412124f211db 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-scalar-fields.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-scalar-fields.expected @@ -75,5 +75,5 @@ extend type FriendsConnection { ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments-in-list.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments-in-list.expected index c8743571182ba..a963e50a43f8a 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments-in-list.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments-in-list.expected @@ -106,7 +106,7 @@ query CheckinSearchQuery( "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments-with-mutliple-variables.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments-with-mutliple-variables.expected index 49e690db0d08d..bfe1dd51ac304 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments-with-mutliple-variables.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments-with-mutliple-variables.expected @@ -105,7 +105,7 @@ query TestQueryWithLiteral($latArg: String, $lonArg: String) { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments.expected index df02a495bf320..c0a531f876872 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments.expected @@ -50,7 +50,7 @@ query TestQuery($date: String) { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection-with-aliased-edges-page_info.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection-with-aliased-edges-page_info.expected index 70754808d50f5..f34bdbd36ebe8 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection-with-aliased-edges-page_info.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection-with-aliased-edges-page_info.expected @@ -148,7 +148,7 @@ query NodeQuery($id: ID!) { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection-with-dynamic-key.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection-with-dynamic-key.expected index a76832f129724..6a5d75cb53340 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection-with-dynamic-key.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection-with-dynamic-key.expected @@ -79,7 +79,7 @@ fragment FeedbackFragment on Feedback "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -362,7 +362,7 @@ fragment FeedbackFragment on Feedback { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -736,5 +736,5 @@ fragment FeedbackFragment_1G22uz on Feedback { "storageKey": null } ], - "type": "Feedback" + "concreteType": "Feedback" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection.expected index 17276cded6101..0c5fa742e6c72 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection.expected @@ -255,7 +255,7 @@ query NodeQuery($id: ID!) { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/defer-multiple-fragments-same-parent.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/defer-multiple-fragments-same-parent.expected index 7066d76e5756b..a3e69b3d214c6 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/defer-multiple-fragments-same-parent.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/defer-multiple-fragments-same-parent.expected @@ -85,7 +85,7 @@ fragment FeedbackText_feedback on Feedback { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -334,7 +334,7 @@ fragment FeedbackText_feedback on Feedback { "storageKey": "comments(first:10)" } ], - "type": "Feedback" + "concreteType": "Feedback" } { @@ -362,5 +362,5 @@ fragment FeedbackText_feedback on Feedback { "storageKey": null } ], - "type": "Feedback" + "concreteType": "Feedback" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/explicit-null-argument.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/explicit-null-argument.expected index 7ef1ef9f91278..3bd49554a1a0b 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/explicit-null-argument.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/explicit-null-argument.expected @@ -32,7 +32,7 @@ query Test { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/false-positive-circular-fragment-reference-regression.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/false-positive-circular-fragment-reference-regression.expected index 8a0706f48bebf..e4ad9f4114990 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/false-positive-circular-fragment-reference-regression.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/false-positive-circular-fragment-reference-regression.expected @@ -69,7 +69,7 @@ fragment MyNestedViewer on Viewer "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -172,7 +172,7 @@ query TestQuery { ] } ], - "type": "Viewer" + "concreteType": "Viewer" } { @@ -187,7 +187,7 @@ query TestQuery { "name": "MyNestedViewer" } ], - "type": "Viewer" + "concreteType": "Viewer" } { @@ -202,5 +202,5 @@ query TestQuery { "name": "MyNestedViewer" } ], - "type": "Viewer" + "concreteType": "Viewer" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-node-interface.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-node-interface.expected index b9964f2a8850d..42c0077897d02 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-node-interface.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-node-interface.expected @@ -51,7 +51,7 @@ fragment ProfilePicture on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -86,5 +86,5 @@ fragment ProfilePicture on User { "type": "User" } ], - "type": "Node" + "concreteType": null } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-object-implementing-node-interface.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-object-implementing-node-interface.expected index 4f75d08033f8c..b2374e9133df5 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-object-implementing-node-interface.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-object-implementing-node-interface.expected @@ -49,7 +49,7 @@ fragment ProfilePicture on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -78,5 +78,5 @@ fragment ProfilePicture on User { "name": "ProfilePicture" } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-query.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-query.expected index 9799ee7db63b3..dfa115dfd2c11 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-query.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-query.expected @@ -54,7 +54,7 @@ fragment ProfilePicture on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -113,5 +113,5 @@ fragment ProfilePicture on User { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-viewer.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-viewer.expected index 1f6576fe5fa60..f1a88d2e99d77 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-viewer.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-viewer.expected @@ -51,7 +51,7 @@ fragment ProfilePicture on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -91,5 +91,5 @@ fragment ProfilePicture on User { "storageKey": null } ], - "type": "Viewer" + "concreteType": "Viewer" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-defer-arguments-without-label.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-defer-arguments-without-label.expected index 0faca33658ae3..0e5632a75e608 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-defer-arguments-without-label.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-defer-arguments-without-label.expected @@ -52,7 +52,7 @@ fragment DeferredFragment on User @argumentDefinitions(scale: {type: "Float"}) { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -212,7 +212,7 @@ fragment UserFragment on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -268,5 +268,5 @@ fragment UserFragment on User { ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-defer-arguments.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-defer-arguments.expected index 038147fad054a..4e5fcff1eb6d0 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-defer-arguments.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-defer-arguments.expected @@ -53,7 +53,7 @@ fragment DeferredFragment on User @argumentDefinitions(scale: {type: "Float"}) { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -204,7 +204,7 @@ fragment UserFragment on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -244,5 +244,5 @@ fragment UserFragment on User { ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-defer-on-abstract-type.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-defer-on-abstract-type.expected index 382a041c29dbb..c54581d4c6d09 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-defer-on-abstract-type.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-defer-on-abstract-type.expected @@ -50,7 +50,7 @@ fragment NodeFragment on Node { "storageKey": "node(id:\"my-id\")" } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -187,5 +187,5 @@ fragment NodeFragment on Node { "type": "Page" } ], - "type": "Node" + "concreteType": null } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-match-directive.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-match-directive.expected index 4011770406c2b..967a5aa16bd46 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-match-directive.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-match-directive.expected @@ -138,7 +138,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "MarkdownUserNameRenderer" + "concreteType": "MarkdownUserNameRenderer" } { @@ -199,7 +199,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": "nameRenderer(supported:[\"PlainUserNameRenderer\",\"MarkdownUserNameRenderer\"])" } ], - "type": "User" + "concreteType": "User" } { @@ -234,5 +234,5 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "PlainUserNameRenderer" + "concreteType": "PlainUserNameRenderer" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-stream.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-stream.expected index ceaade5b0c892..6f5188cfe6245 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-stream.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-with-stream.expected @@ -57,7 +57,7 @@ fragment FeedbackFragment on Feedback { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -220,5 +220,5 @@ fragment FeedbackFragment on Feedback { ] } ], - "type": "Feedback" + "concreteType": "Feedback" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/inline-data-fragment.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/inline-data-fragment.expected index 285760a653ca7..53530024d5e6e 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/inline-data-fragment.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/inline-data-fragment.expected @@ -39,7 +39,7 @@ fragment Profile on User @inline { "name": "ParentFragment" } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -288,7 +288,7 @@ fragment Profile on User { "storageKey": "username(name:\"test\")" } ], - "type": "Query" + "concreteType": "Query" } { @@ -329,5 +329,5 @@ fragment Profile on User { "storageKey": "profilePicture(size:100)" } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/kitchen-sink.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/kitchen-sink.expected index 33cab19e3d504..43a635ee7cf1a 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/kitchen-sink.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/kitchen-sink.expected @@ -119,7 +119,7 @@ fragment UserFragment on User "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -571,5 +571,5 @@ fragment UserFragment_3M2EvT on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/match-on-child-of-plural.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/match-on-child-of-plural.expected index 56a5c4b7fb830..efb8045489050 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/match-on-child-of-plural.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/match-on-child-of-plural.expected @@ -177,7 +177,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "Node" + "concreteType": null } { @@ -212,7 +212,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "MarkdownUserNameRenderer" + "concreteType": "MarkdownUserNameRenderer" } { @@ -247,5 +247,5 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "PlainUserNameRenderer" + "concreteType": "PlainUserNameRenderer" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/module-overlap-across-documents.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/module-overlap-across-documents.expected index 025dd67ea3b65..32d822fa59360 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/module-overlap-across-documents.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/module-overlap-across-documents.expected @@ -81,7 +81,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -243,7 +243,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -508,7 +508,7 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -560,7 +560,7 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -595,7 +595,7 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "MarkdownUserNameRenderer" + "concreteType": "MarkdownUserNameRenderer" } { @@ -630,5 +630,5 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "PlainUserNameRenderer" + "concreteType": "PlainUserNameRenderer" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/multiple-modules-same-selections.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/multiple-modules-same-selections.expected index 8e317caf67949..a872ef9738456 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/multiple-modules-same-selections.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/multiple-modules-same-selections.expected @@ -142,7 +142,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": "node(id:\"\")" } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -292,5 +292,5 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "MarkdownUserNameRenderer" + "concreteType": "MarkdownUserNameRenderer" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/multiple-modules-with-key.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/multiple-modules-with-key.expected index 21c7649f49104..15807b9839ace 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/multiple-modules-with-key.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/multiple-modules-with-key.expected @@ -157,7 +157,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": "node(id:\"\")" } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -401,7 +401,7 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "MarkdownUserNameRenderer" + "concreteType": "MarkdownUserNameRenderer" } { @@ -436,5 +436,5 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "PlainUserNameRenderer" + "concreteType": "PlainUserNameRenderer" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/nested_conditions.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/nested_conditions.expected index 86d8172a5ab64..e9d37eeb68ffd 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/nested_conditions.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/nested_conditions.expected @@ -140,7 +140,7 @@ fragment QueryFragment2 on Query { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" } { @@ -216,5 +216,5 @@ fragment QueryFragment2 on Query { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/original-client-fields-test.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/original-client-fields-test.expected index 11f9e279344bc..13da745e57746 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/original-client-fields-test.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/original-client-fields-test.expected @@ -97,7 +97,7 @@ type Foo implements Named { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -374,7 +374,7 @@ fragment OnlyClientFields on User ] } ], - "type": "User" + "concreteType": "User" } { @@ -396,7 +396,7 @@ fragment OnlyClientFields on User ] } ], - "type": "Foo" + "concreteType": "Foo" } { @@ -413,7 +413,7 @@ fragment OnlyClientFields on User "storageKey": null } ], - "type": "Node" + "concreteType": null } { @@ -446,5 +446,5 @@ fragment OnlyClientFields on User ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/plural-fragment.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/plural-fragment.expected index ac16b2b0cf880..f4be0de6efc54 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/plural-fragment.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/plural-fragment.expected @@ -19,5 +19,5 @@ fragment PluralFragment on User @relay(plural: true) { "storageKey": null } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-conditional-module.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-conditional-module.expected index 4867c5268e1bf..860f661242509 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-conditional-module.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-conditional-module.expected @@ -107,7 +107,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -279,7 +279,7 @@ fragment NameRendererFragment on User { "storageKey": null } ], - "type": "MarkdownUserNameRenderer" + "concreteType": "MarkdownUserNameRenderer" } { @@ -332,5 +332,5 @@ fragment NameRendererFragment on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-fragment-variables.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-fragment-variables.expected index b131aa6341d49..a0dd5e5955f40 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-fragment-variables.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-fragment-variables.expected @@ -99,7 +99,7 @@ fragment Profile on User @argumentDefinitions(pictureSize: {type: "[Int]"}) { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -354,7 +354,7 @@ fragment Profile_4CNNX6 on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -420,5 +420,5 @@ fragment Profile_4CNNX6 on User { "storageKey": "friends(first:10)" } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive-no-inline-experimental.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive-no-inline-experimental.expected index 5b4faa3bd1063..66f3ab6998f42 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive-no-inline-experimental.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive-no-inline-experimental.expected @@ -107,7 +107,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -341,7 +341,7 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "MarkdownUserNameRenderer" + "concreteType": "MarkdownUserNameRenderer" } { @@ -402,7 +402,7 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": "nameRenderer(supported:[\"PlainUserNameRenderer\",\"MarkdownUserNameRenderer\"])" } ], - "type": "User" + "concreteType": "User" } { @@ -437,5 +437,5 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "PlainUserNameRenderer" + "concreteType": "PlainUserNameRenderer" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive-with-extra-argument.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive-with-extra-argument.expected index 8a4dfd1b5fa76..24771b71fcbca 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive-with-extra-argument.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive-with-extra-argument.expected @@ -107,7 +107,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -346,7 +346,7 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "MarkdownUserNameRenderer" + "concreteType": "MarkdownUserNameRenderer" } { @@ -412,7 +412,7 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": "nameRendererForContext(context:\"HEADER\",supported:[\"PlainUserNameRenderer\",\"MarkdownUserNameRenderer\"])" } ], - "type": "User" + "concreteType": "User" } { @@ -447,5 +447,5 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "PlainUserNameRenderer" + "concreteType": "PlainUserNameRenderer" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive-with-typename.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive-with-typename.expected index 717d294c55fb4..272abb3ee4fca 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive-with-typename.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive-with-typename.expected @@ -108,7 +108,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -342,7 +342,7 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "MarkdownUserNameRenderer" + "concreteType": "MarkdownUserNameRenderer" } { @@ -410,7 +410,7 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": "nameRenderer(supported:[\"PlainUserNameRenderer\",\"MarkdownUserNameRenderer\"])" } ], - "type": "User" + "concreteType": "User" } { @@ -445,5 +445,5 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "PlainUserNameRenderer" + "concreteType": "PlainUserNameRenderer" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive.expected index 5b4faa3bd1063..66f3ab6998f42 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-match-directive.expected @@ -107,7 +107,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -341,7 +341,7 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "MarkdownUserNameRenderer" + "concreteType": "MarkdownUserNameRenderer" } { @@ -402,7 +402,7 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": "nameRenderer(supported:[\"PlainUserNameRenderer\",\"MarkdownUserNameRenderer\"])" } ], - "type": "User" + "concreteType": "User" } { @@ -437,5 +437,5 @@ fragment PlainUserNameRenderer_name on PlainUserNameRenderer { "storageKey": null } ], - "type": "PlainUserNameRenderer" + "concreteType": "PlainUserNameRenderer" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-module-directive.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-module-directive.expected index b7d2af8dbff7f..1493ccdf163e1 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-module-directive.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-module-directive.expected @@ -100,7 +100,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -258,7 +258,7 @@ fragment NameRendererFragment on User { "storageKey": null } ], - "type": "MarkdownUserNameRenderer" + "concreteType": "MarkdownUserNameRenderer" } { @@ -298,5 +298,5 @@ fragment NameRendererFragment on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-raw-response-type-directive.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-raw-response-type-directive.expected index adb533b31ad12..dd41148e1aa62 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-raw-response-type-directive.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/query-with-raw-response-type-directive.expected @@ -44,7 +44,7 @@ query ViewerQuery @raw_response_type { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-connection-custom-handler.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-connection-custom-handler.expected index 3c134047d0ca1..3bf5d4bd2627b 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-connection-custom-handler.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-connection-custom-handler.expected @@ -132,5 +132,5 @@ fragment RefetchableConnection_feedback on Feedback "storageKey": null } ], - "type": "Feedback" + "concreteType": "Feedback" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-connection.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-connection.expected index 430b9499d0b50..cee367f155a67 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-connection.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-connection.expected @@ -132,5 +132,5 @@ fragment RefetchableConnection_feedback on Feedback "storageKey": null } ], - "type": "Feedback" + "concreteType": "Feedback" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-with-missing-id.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-with-missing-id.expected index 512e744d3b44c..55cd032c6e9c1 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-with-missing-id.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-with-missing-id.expected @@ -50,7 +50,7 @@ fragment ProfilePicture on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -78,5 +78,5 @@ fragment ProfilePicture on User { "type": "User" } ], - "type": "Node" + "concreteType": null } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection-bidirectional.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection-bidirectional.expected index f6bf9912226a5..caea003355e5d 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection-bidirectional.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection-bidirectional.expected @@ -177,5 +177,5 @@ fragment PaginationFragment on Node "type": "User" } ], - "type": "Node" + "concreteType": null } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection-with-stream.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection-with-stream.expected index b0f148546ed3a..8e68bf22c34ba 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection-with-stream.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection-with-stream.expected @@ -149,5 +149,5 @@ fragment PaginationFragment on Node "type": "User" } ], - "type": "Node" + "concreteType": null } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection.expected index bea0088fccb5f..7bbf3260bf9f9 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection.expected @@ -149,5 +149,5 @@ fragment PaginationFragment on Node "type": "User" } ], - "type": "Node" + "concreteType": null } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-client-id-field.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-client-id-field.expected index dc85a6b215d80..a4a3adee32159 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-client-id-field.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-client-id-field.expected @@ -203,7 +203,7 @@ query RelayClientIDFieldQuery($id: ID!) { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/sibling-client-selections.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/sibling-client-selections.expected index 37c44c6377ed6..8c0e9cfaad431 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/sibling-client-selections.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/sibling-client-selections.expected @@ -75,7 +75,7 @@ interface ClientNamed { ] } ], - "type": "ClientType" + "concreteType": "ClientType" } { @@ -192,5 +192,5 @@ interface ClientNamed { ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/stable-literals.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/stable-literals.expected index 755ba2d2d0064..cb1aaa5209d17 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/stable-literals.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/stable-literals.expected @@ -56,7 +56,7 @@ query StableLiteralsTest { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/stream-connection.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/stream-connection.expected index 30d7051a232d6..ce3e14ecfa994 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/stream-connection.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/stream-connection.expected @@ -172,7 +172,7 @@ query NodeQuery($id: ID!) { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unions.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unions.expected index b307708144d22..55098aa8cb57a 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unions.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unions.expected @@ -76,7 +76,7 @@ query UnionQuery { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unmasked-fragment-spreads-dup-arguments.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unmasked-fragment-spreads-dup-arguments.expected index cac8c50d5b98d..40d7e4b0c68a4 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unmasked-fragment-spreads-dup-arguments.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unmasked-fragment-spreads-dup-arguments.expected @@ -51,7 +51,7 @@ fragment UserUtil3_user on User @relay(mask: false) { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -82,7 +82,7 @@ fragment UserUtil3_user on User @relay(mask: false) { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -171,5 +171,5 @@ fragment UserUtil3_user on User @relay(mask: false) { "storageKey": null } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unmasked-fragment-spreads-global-arguments.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unmasked-fragment-spreads-global-arguments.expected index 9a824bf50b6cc..a3de6e2eb5af1 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unmasked-fragment-spreads-global-arguments.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unmasked-fragment-spreads-global-arguments.expected @@ -54,7 +54,7 @@ fragment UserUtil_user on User { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -231,7 +231,7 @@ fragment UserProfile_user on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -260,5 +260,5 @@ fragment UserProfile_user on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unmasked-fragment-spreads-recursive.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unmasked-fragment-spreads-recursive.expected index e4f7b51bce9e5..db29ecef64db4 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unmasked-fragment-spreads-recursive.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unmasked-fragment-spreads-recursive.expected @@ -69,7 +69,7 @@ fragment UserUtil2_user on User { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -285,7 +285,7 @@ fragment UserProfile_user on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -314,7 +314,7 @@ fragment UserProfile_user on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } { @@ -379,5 +379,5 @@ fragment UserProfile_user on User { "storageKey": null } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unused-fragment-argdef-unchecked.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unused-fragment-argdef-unchecked.expected index 40ab9ba897487..51aa771707f51 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unused-fragment-argdef-unchecked.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unused-fragment-argdef-unchecked.expected @@ -59,7 +59,7 @@ fragment ProfilePhoto on User { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -230,7 +230,7 @@ fragment ProfilePhoto_18PEfK on User { "name": "ProfilePhotoWrapper" } ], - "type": "User" + "concreteType": "User" } { @@ -266,7 +266,7 @@ fragment ProfilePhoto_18PEfK on User { "storageKey": "profilePicture(size:[100])" } ], - "type": "User" + "concreteType": "User" } { @@ -301,5 +301,5 @@ fragment ProfilePhoto_18PEfK on User { "name": "ProfilePhoto" } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unused-variables-removed-from-print-not-codegen.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unused-variables-removed-from-print-not-codegen.expected index 7b2f669f86266..d1dbb35aa1507 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unused-variables-removed-from-print-not-codegen.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/unused-variables-removed-from-print-not-codegen.expected @@ -83,7 +83,7 @@ fragment ConnectionFragment on User "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": { @@ -248,5 +248,5 @@ query QueryWithUnusedVariables( ] } ], - "type": "User" + "concreteType": "User" } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/viewer-query.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/viewer-query.expected index e3b039f6df889..3d662a40cd438 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/viewer-query.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/viewer-query.expected @@ -44,7 +44,7 @@ query ViewerQuery { "storageKey": null } ], - "type": "Query" + "concreteType": "Query" }, "kind": "Request", "operation": {