emit identifier info in dedicated object

facebook · Mar 20, 2023 · c3866a7 · c3866a7
1 parent c5be931
commit c3866a7
Show file tree

Hide file tree

Showing 107 changed files with 763 additions and 388 deletions.
diff --git a/compiler/crates/relay-codegen/src/build_ast.rs b/compiler/crates/relay-codegen/src/build_ast.rs
@@ -438,17 +438,13 @@ impl<'schema, 'builder, 'config> CodegenBuilder<'schema, 'builder, 'config> {
                     ),
                 operation: Primitive::GraphQLModuleDependency(GraphQLModuleDependency::Name(refetch_metadata.operation_name.into())),
             };
-            if let Some(identifier_field) = refetch_metadata.identifier_field {
+            if let Some(identifier_info) = &refetch_metadata.identifier_info {
                 refetch_object.push(ObjectEntry {
-                    key: CODEGEN_CONSTANTS.identifier_field,
-                    value: Primitive::String(identifier_field),
-                });
-            }
-
-            if let Some(x) = refetch_metadata.identifier_query_variable_name {
-                refetch_object.push(ObjectEntry {
-                    key: CODEGEN_CONSTANTS.identifier_query_variable_name,
-                    value: Primitive::String(x),
+                    key: CODEGEN_CONSTANTS.identifier_info,
+                    value: Primitive::Key(self.object(object! {
+                        identifier_field:  Primitive::String(identifier_info.identifier_field),
+                        identifier_query_variable_name:  Primitive::String(identifier_info.identifier_query_variable_name),
+                    })),
                 });
             }
 

diff --git a/compiler/crates/relay-codegen/src/constants.rs b/compiler/crates/relay-codegen/src/constants.rs
@@ -61,6 +61,7 @@ pub struct CodegenConstants {
     pub id: StringKey,
     pub identifier_field: StringKey,
     pub identifier_query_variable_name: StringKey,
+    pub identifier_info: StringKey,
     pub if_: StringKey,
     pub inline_data_fragment_spread: StringKey,
     pub inline_data_fragment: StringKey,
@@ -172,6 +173,7 @@ lazy_static! {
         id: "id".intern(),
         identifier_field: "identifierField".intern(),
         identifier_query_variable_name: "identifierQueryVariableName".intern(),
+        identifier_info: "identifierInfo".intern(),
         if_: "if".intern(),
         inline_data_fragment_spread: "InlineDataFragmentSpread".intern(),
         inline_data_fragment: "InlineDataFragment".intern(),

diff --git a/.../crates/relay-codegen/tests/client_edges/fixtures/client-edge-backed-by-resolver.expected b/.../crates/relay-codegen/tests/client_edges/fixtures/client-edge-backed-by-resolver.expected
@@ -127,8 +127,10 @@ extend type User {
         "node"
       ],
       "operation": require('ClientEdgeQuery_Foo_user_best_friend.graphql'),
-      "identifierField": "id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "RefetchableClientEdgeQuery_Foo_user_best_friend",

diff --git a/...relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-node-interface.expected b/...relay-compiler/tests/compile_relay_artifacts/fixtures/fragment-on-node-interface.expected
@@ -244,8 +244,10 @@ fragment fragmentOnNodeInterface_RefetchableFragment on Node {
         "node"
       ],
       "operation": require('RefetchableFragmentQuery.graphql'),
-      "identifierField": "id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "fragmentOnNodeInterface_RefetchableFragment",

diff --git a/...piler/tests/compile_relay_artifacts/fixtures/fragment-on-non-node-fetchable-type.expected b/...piler/tests/compile_relay_artifacts/fixtures/fragment-on-non-node-fetchable-type.expected
@@ -263,8 +263,10 @@ fragment fragmentOnNonNodeFetchableType_RefetchableFragment on NonNodeStory {
         "fetch__NonNodeStory"
       ],
       "operation": require('RefetchableFragmentQuery.graphql'),
-      "identifierField": "fetch_id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "fetch_id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "fragmentOnNonNodeFetchableType_RefetchableFragment",

diff --git a/.../compile_relay_artifacts/fixtures/fragment-on-object-implementing-node-interface.expected b/.../compile_relay_artifacts/fixtures/fragment-on-object-implementing-node-interface.expected
@@ -235,8 +235,10 @@ fragment fragmentOnObjectImplementingNodeInterface_RefetchableFragment on User {
         "node"
       ],
       "operation": require('RefetchableFragmentQuery.graphql'),
-      "identifierField": "id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "fragmentOnObjectImplementingNodeInterface_RefetchableFragment",

diff --git a/...er/tests/compile_relay_artifacts/fixtures/provided-variable-refetchable-fragment.expected b/...er/tests/compile_relay_artifacts/fixtures/provided-variable-refetchable-fragment.expected
@@ -321,8 +321,10 @@ fragment providedVariableRefetchableFragment_providedVariableFragment on User {
         "node"
       ],
       "operation": require('refetchableQuery.graphql'),
-      "identifierField": "id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "providedVariableRefetchableFragment",

diff --git a/...ler/tests/compile_relay_artifacts/fixtures/refetchable-connection-custom-handler.expected b/...ler/tests/compile_relay_artifacts/fixtures/refetchable-connection-custom-handler.expected
@@ -318,8 +318,10 @@ fragment refetchableConnectionCustomHandler_RefetchableConnection_feedback on Fe
         "node"
       ],
       "operation": require('RefetchableConnectionQuery.graphql'),
-      "identifierField": "id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "refetchableConnectionCustomHandler_RefetchableConnection_feedback",

diff --git a/...tes/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-connection.expected b/...tes/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-connection.expected
@@ -318,8 +318,10 @@ fragment refetchableConnection_RefetchableConnection_feedback on Feedback {
         "node"
       ],
       "operation": require('RefetchableConnectionQuery.graphql'),
-      "identifierField": "id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "refetchableConnection_RefetchableConnection_feedback",

diff --git a/...ts/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-with-missing-id.expected b/...ts/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-with-missing-id.expected
@@ -243,8 +243,10 @@ fragment refetchableFragmentOnNodeWithMissingId_RefetchableFragment on Node {
         "node"
       ],
       "operation": require('RefetchableFragmentQuery.graphql'),
-      "identifierField": "id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "refetchableFragmentOnNodeWithMissingId_RefetchableFragment",

diff --git a/...pile_relay_artifacts/fixtures/refetchable-fragment-with-connection-bidirectional.expected b/...pile_relay_artifacts/fixtures/refetchable-fragment-with-connection-bidirectional.expected
@@ -421,8 +421,10 @@ fragment refetchableFragmentWithConnectionBidirectional_PaginationFragment_1G22u
         "node"
       ],
       "operation": require('RefetchableFragmentQuery.graphql'),
-      "identifierField": "id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "refetchableFragmentWithConnectionBidirectional_PaginationFragment",

diff --git a/...compile_relay_artifacts/fixtures/refetchable-fragment-with-connection-es-modules.expected b/...compile_relay_artifacts/fixtures/refetchable-fragment-with-connection-es-modules.expected
@@ -355,8 +355,10 @@ import RefetchableFragmentQuery_graphql from './RefetchableFragmentQuery.graphql
         "node"
       ],
       "operation": RefetchableFragmentQuery_graphql,
-      "identifierField": "id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "refetchableFragmentWithConnectionEsModules_PaginationFragment",

diff --git a/...ompile_relay_artifacts/fixtures/refetchable-fragment-with-connection-with-stream.expected b/...ompile_relay_artifacts/fixtures/refetchable-fragment-with-connection-with-stream.expected
@@ -365,8 +365,10 @@ fragment refetchableFragmentWithConnectionWithStream_PaginationFragment_1G22uz o
         "node"
       ],
       "operation": require('RefetchableFragmentQuery.graphql'),
-      "identifierField": "id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "refetchableFragmentWithConnectionWithStream_PaginationFragment",

diff --git a/...iler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection.expected b/...iler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection.expected
@@ -348,8 +348,10 @@ fragment refetchableFragmentWithConnection_PaginationFragment_1G22uz on Node {
         "node"
       ],
       "operation": require('RefetchableFragmentQuery.graphql'),
-      "identifierField": "id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "refetchableFragmentWithConnection_PaginationFragment",

diff --git a/...mpiler/tests/compile_relay_artifacts/fixtures/relay-resolver-backing-client-edge.expected b/...mpiler/tests/compile_relay_artifacts/fixtures/relay-resolver-backing-client-edge.expected
@@ -287,8 +287,10 @@ fragment relayResolverBackingClientEdge_best_friend_resolver on User {
         "node"
       ],
       "operation": require('ClientEdgeQuery_relayResolverBackingClientEdgeQuery_me__best_friend.graphql'),
-      "identifierField": "id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "RefetchableClientEdgeQuery_relayResolverBackingClientEdgeQuery_me__best_friend",

diff --git a/.../tests/compile_relay_artifacts/fixtures/relay-resolver-with-required-client-edge.expected b/.../tests/compile_relay_artifacts/fixtures/relay-resolver-with-required-client-edge.expected
@@ -292,8 +292,10 @@ fragment relayResolverWithRequiredClientEdge_best_friend_resolver on User {
         "node"
       ],
       "operation": require('ClientEdgeQuery_relayResolverWithRequiredClientEdgeQuery_me__best_friend.graphql'),
-      "identifierField": "id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "RefetchableClientEdgeQuery_relayResolverWithRequiredClientEdgeQuery_me__best_friend",

diff --git a/...cts_with_custom_id/fixtures/fragment-on-node-interface-with-custom-variable-name.expected b/...cts_with_custom_id/fixtures/fragment-on-node-interface-with-custom-variable-name.expected
@@ -244,8 +244,10 @@ fragment fragmentOnNodeInterface_RefetchableFragment on Node {
         "node"
       ],
       "operation": require('RefetchableFragmentQuery.graphql'),
-      "identifierField": "global_id",
-      "identifierQueryVariableName": "variable_name"
+      "indentifierInfo": {
+        "identifierField": "global_id",
+        "identifierQueryVariableName": "variable_name"
+      }
     }
   },
   "name": "fragmentOnNodeInterface_RefetchableFragment",

diff --git a/...tests/compile_relay_artifacts_with_custom_id/fixtures/fragment-on-node-interface.expected b/...tests/compile_relay_artifacts_with_custom_id/fixtures/fragment-on-node-interface.expected
@@ -244,8 +244,10 @@ fragment fragmentOnNodeInterface_RefetchableFragment on Node {
         "node"
       ],
       "operation": require('RefetchableFragmentQuery.graphql'),
-      "identifierField": "global_id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "global_id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "fragmentOnNodeInterface_RefetchableFragment",

diff --git a/...ixtures/fragment-on-object-implementing-node-interface-with-custom-variable-name.expected b/...ixtures/fragment-on-object-implementing-node-interface-with-custom-variable-name.expected
@@ -235,8 +235,10 @@ fragment fragmentOnObjectImplementingNodeInterface_RefetchableFragment on User {
         "node"
       ],
       "operation": require('RefetchableFragmentQuery.graphql'),
-      "identifierField": "global_id",
-      "identifierQueryVariableName": "variable_name"
+      "indentifierInfo": {
+        "identifierField": "global_id",
+        "identifierQueryVariableName": "variable_name"
+      }
     }
   },
   "name": "fragmentOnObjectImplementingNodeInterface_RefetchableFragment",

diff --git a/...artifacts_with_custom_id/fixtures/fragment-on-object-implementing-node-interface.expected b/...artifacts_with_custom_id/fixtures/fragment-on-object-implementing-node-interface.expected
@@ -235,8 +235,10 @@ fragment fragmentOnObjectImplementingNodeInterface_RefetchableFragment on User {
         "node"
       ],
       "operation": require('RefetchableFragmentQuery.graphql'),
-      "identifierField": "global_id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "global_id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "fragmentOnObjectImplementingNodeInterface_RefetchableFragment",

diff --git a/...tifacts_with_custom_id/fixtures/refetchable-connection-with-custom-variable-name.expected b/...tifacts_with_custom_id/fixtures/refetchable-connection-with-custom-variable-name.expected
@@ -318,8 +318,10 @@ fragment refetchableConnection_RefetchableConnection_feedback on Feedback {
         "node"
       ],
       "operation": require('RefetchableConnectionQuery.graphql'),
-      "identifierField": "global_id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "global_id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "refetchableConnection_RefetchableConnection_feedback",

diff --git a/...ler/tests/compile_relay_artifacts_with_custom_id/fixtures/refetchable-connection.expected b/...ler/tests/compile_relay_artifacts_with_custom_id/fixtures/refetchable-connection.expected
@@ -318,8 +318,10 @@ fragment refetchableConnection_RefetchableConnection_feedback on Feedback {
         "node"
       ],
       "operation": require('RefetchableConnectionQuery.graphql'),
-      "identifierField": "global_id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "global_id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "refetchableConnection_RefetchableConnection_feedback",

diff --git a/...y_artifacts_with_custom_id/fixtures/refetchable-fragment-on-node-with-missing-id.expected b/...y_artifacts_with_custom_id/fixtures/refetchable-fragment-on-node-with-missing-id.expected
@@ -243,8 +243,10 @@ fragment refetchableFragmentOnNodeWithMissingId_RefetchableFragment on Node {
         "node"
       ],
       "operation": require('RefetchableFragmentQuery.graphql'),
-      "identifierField": "global_id",
-      "identifierQueryVariableName": "id"
+      "indentifierInfo": {
+        "identifierField": "global_id",
+        "identifierQueryVariableName": "id"
+      }
     }
   },
   "name": "refetchableFragmentOnNodeWithMissingId_RefetchableFragment",

diff --git a/compiler/crates/relay-transforms/src/refetchable_fragment/fetchable_query_generator.rs b/compiler/crates/relay-transforms/src/refetchable_fragment/fetchable_query_generator.rs
@@ -37,6 +37,7 @@ use super::build_used_global_variables;
 use super::validation_message::ValidationMessage;
 use super::QueryGenerator;
 use super::RefetchRoot;
+use super::RefetchableIdentifierInfo;
 use super::RefetchableMetadata;
 use super::CONSTANTS;
 use crate::root_variables::VariableMap;
@@ -72,8 +73,11 @@ fn build_refetch_operation(
                 RefetchableMetadata {
                     operation_name: query_name,
                     path: vec![fetch_field_name],
-                    identifier_field: Some(identifier_field_name),
-                    identifier_query_variable_name: Some(schema_config.node_interface_id_variable_name),
+                    identifier_info: Some(RefetchableIdentifierInfo {
+                        identifier_field: identifier_field_name,
+                        identifier_query_variable_name: schema_config
+                            .node_interface_id_variable_name,
+                    }),
                 },
             ),
             selections: enforce_selections_with_id_field(

diff --git a/compiler/crates/relay-transforms/src/refetchable_fragment/node_query_generator.rs b/compiler/crates/relay-transforms/src/refetchable_fragment/node_query_generator.rs
@@ -41,6 +41,7 @@ use super::validation_message::ValidationMessage;
 use super::QueryGenerator;
 use super::RefetchRoot;
 use super::RefetchableMetadata;
+use super::RefetchableIdentifierInfo;
 use super::CONSTANTS;
 use crate::root_variables::VariableMap;
 
@@ -120,8 +121,11 @@ fn build_refetch_operation(
                     RefetchableMetadata {
                         operation_name: query_name,
                         path: vec![CONSTANTS.node_field_name],
-                        identifier_field: Some(id_name),
-                        identifier_query_variable_name: Some(schema_config.node_interface_id_variable_name),
+                        identifier_info: Some(RefetchableIdentifierInfo {
+                            identifier_field: id_name,
+                            identifier_query_variable_name: schema_config
+                                .node_interface_id_variable_name,
+                        }),
                     },
                 ),
                 used_global_variables: build_used_global_variables(

diff --git a/compiler/crates/relay-transforms/src/refetchable_fragment/query_query_generator.rs b/compiler/crates/relay-transforms/src/refetchable_fragment/query_query_generator.rs
@@ -41,8 +41,7 @@ fn build_refetch_operation(
             RefetchableMetadata {
                 operation_name: query_name,
                 path: vec![],
-                identifier_field: None,
-                identifier_query_variable_name: None,
+                identifier_info: None,
             },
         ),
         used_global_variables: build_used_global_variables(

diff --git a/compiler/crates/relay-transforms/src/refetchable_fragment/utils.rs b/compiler/crates/relay-transforms/src/refetchable_fragment/utils.rs
@@ -31,12 +31,17 @@ use lazy_static::lazy_static;
 use super::validation_message::ValidationMessage;
 use crate::root_variables::VariableMap;
 
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct RefetchableIdentifierInfo {
+    pub identifier_field: StringKey,
+    pub identifier_query_variable_name: StringKey,
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct RefetchableMetadata {
     pub operation_name: OperationDefinitionName,
     pub path: Vec<StringKey>,
-    pub identifier_field: Option<StringKey>,
-    pub identifier_query_variable_name: Option<StringKey>,
+    pub identifier_info: Option<RefetchableIdentifierInfo>,
 }
 associated_data_impl!(RefetchableMetadata);
 

diff --git a/compiler/crates/relay-transforms/src/refetchable_fragment/viewer_query_generator.rs b/compiler/crates/relay-transforms/src/refetchable_fragment/viewer_query_generator.rs
@@ -50,8 +50,7 @@ fn build_refetch_operation(
             RefetchableMetadata {
                 operation_name: query_name,
                 path: vec![CONSTANTS.viewer_field_name],
-                identifier_field: None,
-                identifier_query_variable_name: None,
+                identifier_info: None,
             },
         ),
         used_global_variables: build_used_global_variables(