Allow Node interface id field to be configurable.

compiler/crates/common/src/feature_flags.rs

@@ -49,6 +49,10 @@ pub struct FeatureFlags {
 
     #[serde(default)]
     pub enable_provided_variables: FeatureFlag,
+
+    /// The name of the `id` field that exists on the `Node` interface.
+    #[serde(default)]
+    pub node_interface_id_field: Option<StringKey>,
 }
 
 #[derive(Debug, Deserialize, Clone, Serialize)]

compiler/crates/relay-codegen/tests/client_edges/mod.rs

@@ -22,7 +22,7 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
         let ir = build(&schema, &ast.definitions).unwrap();
         let program = Program::from_definitions(Arc::clone(&schema), ir);
         let next_program = sort_selections(
-            &client_edges(&program)
+            &client_edges(&program, None)
                 .and_then(|program| relay_resolvers(&program, true))
                 .unwrap(),
         );

compiler/crates/relay-compiler-playground/src/lib.rs

@@ -310,6 +310,7 @@ fn get_programs(
         base_fragment_names,
         &connection_interface,
         Arc::new(feature_flags),
+        None,
         &None,
         Arc::new(perf_logger),
         None,

compiler/crates/relay-compiler/src/build_project/mod.rs

@@ -156,9 +156,9 @@ pub fn build_programs(
 ) -> Result<BuildProgramsOutput, BuildProjectFailure> {
     let project_name = project_config.name;
     let is_incremental_build = compiler_state.has_processed_changes()
-        && !compiler_state.has_breaking_schema_change(project_name)
+        && !compiler_state.has_breaking_schema_change(project_name, project_config)
         && if let Some(base) = project_config.base {
-            !compiler_state.has_breaking_schema_change(base)
+            !compiler_state.has_breaking_schema_change(base, project_config)
         } else {
             true
         };

compiler/crates/relay-compiler/src/compiler_state.rs

@@ -6,7 +6,7 @@
  */
 
 use crate::artifact_map::ArtifactMap;
-use crate::config::Config;
+use crate::config::{Config, ProjectConfig};
 use crate::errors::{Error, Result};
 use crate::file_source::{
     categorize_files, extract_graphql_strings_from_file, read_file_to_string, Clock, File,
@@ -341,7 +341,7 @@ impl CompilerState {
                 .any(|sources| !sources.processed.is_empty())
     }
 
-    fn is_change_safe(&self, sources: &SchemaSources) -> bool {
+    fn is_change_safe(&self, sources: &SchemaSources, project_config: &ProjectConfig) -> bool {
         let previous = sources
             .get_old_sources()
             .into_iter()
@@ -363,7 +363,7 @@ impl CompilerState {
                 &current,
                 &Vec::<(&str, SourceLocationKey)>::new(),
             ) {
-                Ok(schema) => schema_change.is_safe(&schema),
+                Ok(schema) => schema_change.is_safe(&schema, project_config.feature_flags.node_interface_id_field),
                 Err(_) => false,
             }
         }
@@ -381,14 +381,14 @@ impl CompilerState {
     }
 
     /// This method is looking at the pending schema changes to see if they may be breaking (removed types, renamed field, etc)
-    pub fn has_breaking_schema_change(&self, project_name: StringKey) -> bool {
+    pub fn has_breaking_schema_change(&self, project_name: StringKey, project_config: &ProjectConfig) -> bool {
         if let Some(extension) = self.extensions.get(&project_name) {
             if !extension.pending.is_empty() {
                 return true;
             }
         }
         if let Some(schema) = self.schemas.get(&project_name) {
-            if !(schema.pending.is_empty() || self.is_change_safe(schema)) {
+            if !(schema.pending.is_empty() || self.is_change_safe(schema, project_config)) {
                 return true;
             }
         }

compiler/crates/relay-compiler/tests/compile_relay_artifacts/mod.rs

@@ -90,6 +90,7 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
         Default::default(),
         &connection_interface,
         Arc::new(feature_flags),
+        None,
         &None,
         Arc::new(ConsoleLogger),
         None,

compiler/crates/relay-lsp/src/server/lsp_state_resources.rs

@@ -342,9 +342,9 @@ impl<TPerfLogger: PerfLogger + 'static, TSchemaDocumentation: SchemaDocumentatio
             .source_programs
             .contains_key(&project_config.name)
             && compiler_state.has_processed_changes()
-            && !compiler_state.has_breaking_schema_change(project_config.name)
+            && !compiler_state.has_breaking_schema_change(project_config.name, project_config)
             && if let Some(base) = project_config.base {
-                !compiler_state.has_breaking_schema_change(base)
+                !compiler_state.has_breaking_schema_change(base, project_config)
             } else {
                 true
             };

compiler/crates/relay-transforms/src/apply_transforms.rs

@@ -64,6 +64,7 @@ where
                     let operation_program = apply_operation_transforms(
                         project_name,
                         Arc::clone(&common_program),
+                        Arc::clone(&feature_flags),
                         connection_interface,
                         Arc::clone(&base_fragment_names),
                         Arc::clone(&perf_logger),
@@ -148,11 +149,10 @@ fn apply_common_transforms(
         transform_subscriptions(&program)
     })?;
     program = log_event.time("transform_refetchable_fragment", || {
-        transform_refetchable_fragment(&program, &base_fragment_names, false)
+        transform_refetchable_fragment(&program, feature_flags.node_interface_id_field, &base_fragment_names, false)
     })?;
 
-    program = log_event.time("client_edges", || client_edges(&program))?;
-
+    program = log_event.time("client_edges", || client_edges(&program, feature_flags.node_interface_id_field))?;
     program = log_event.time("relay_resolvers", || {
         relay_resolvers(&program, feature_flags.enable_relay_resolver_transform)
     })?;
@@ -225,6 +225,7 @@ fn apply_reader_transforms(
 fn apply_operation_transforms(
     project_name: StringKey,
     program: Arc<Program>,
+    feature_flags: Arc<FeatureFlags>,
     connection_interface: &ConnectionInterface,
     base_fragment_names: Arc<StringKeySet>,
     perf_logger: Arc<impl PerfLogger>,
@@ -239,7 +240,7 @@ fn apply_operation_transforms(
     program = log_event.time("split_module_import", || {
         split_module_import(&program, &base_fragment_names)
     });
-    program = log_event.time("generate_id_field", || generate_id_field(&program));
+    program = log_event.time("generate_id_field", || generate_id_field(&program, feature_flags.node_interface_id_field));
     program = log_event.time("declarative_connection", || {
         transform_declarative_connection(&program, connection_interface)
     })?;
@@ -411,7 +412,7 @@ fn apply_typegen_transforms(
         transform_subscriptions(&program)
     })?;
     program = log_event.time("required_directive", || required_directive(&program))?;
-    program = log_event.time("client_edges", || client_edges(&program))?;
+    program = log_event.time("client_edges", || client_edges(&program, feature_flags.node_interface_id_field))?;
     program = log_event.time(
         "transform_assignable_fragment_spreads_in_regular_queries",
         || transform_assignable_fragment_spreads_in_regular_queries(&program),
@@ -424,7 +425,7 @@ fn apply_typegen_transforms(
     })?;
     log_event.time("flatten", || flatten(&mut program, false, false))?;
     program = log_event.time("transform_refetchable_fragment", || {
-        transform_refetchable_fragment(&program, &base_fragment_names, true)
+        transform_refetchable_fragment(&program, feature_flags.node_interface_id_field, &base_fragment_names, true)
     })?;
     program = log_event.time("remove_base_fragments", || {
         remove_base_fragments(&program, base_fragment_names)

compiler/crates/relay-transforms/src/client_edges.rs

@@ -79,8 +79,8 @@ impl<'a> ClientEdgeMetadata<'a> {
             })
     }
 }
-pub fn client_edges(program: &Program) -> DiagnosticsResult<Program> {
-    let mut transform = ClientEdgesTransform::new(program);
+pub fn client_edges(program: &Program, node_interface_id_field: Option<StringKey>) -> DiagnosticsResult<Program> {
+    let mut transform = ClientEdgesTransform::new(program, node_interface_id_field);
     let mut next_program = transform
         .transform_program(program)
         .replace_or_else(|| program.clone());
@@ -106,12 +106,14 @@ struct ClientEdgesTransform<'program> {
     new_fragments: Vec<Arc<FragmentDefinition>>,
     new_operations: Vec<OperationDefinition>,
     errors: Vec<Diagnostic>,
+    node_interface_id_field: Option<StringKey>,
 }
 
 impl<'program> ClientEdgesTransform<'program> {
-    fn new(program: &'program Program) -> Self {
+    fn new(program: &'program Program, node_interface_id_field: Option<StringKey>) -> Self {
         Self {
             program,
+            node_interface_id_field,
             path: Default::default(),
             query_names: Default::default(),
             document_name: Default::default(),
@@ -169,7 +171,7 @@ impl<'program> ClientEdgesTransform<'program> {
             selections,
         };
 
-        let mut transformer = RefetchableFragment::new(self.program, false);
+        let mut transformer = RefetchableFragment::new(self.program, false, self.node_interface_id_field);
 
         let refetchable_fragment = transformer
             .transform_refetch_fragment_with_refetchable_directive(

compiler/crates/relay-transforms/src/generate_id_field.rs

@@ -20,8 +20,8 @@ use std::{
 
 /// A transform that adds an `id` field on any type that has an id field but
 /// where there is no unaliased `id` selection.
-pub fn generate_id_field(program: &Program) -> Program {
-    let mut transform = GenerateIDFieldTransform::new(program);
+pub fn generate_id_field(program: &Program, node_interface_id_field: Option<StringKey>) -> Program {
+    let mut transform = GenerateIDFieldTransform::new(program, node_interface_id_field);
     transform
         .transform_program(program)
         .replace_or_else(|| program.clone())
@@ -113,8 +113,8 @@ impl<'s> Transformer for GenerateIDFieldTransform<'s> {
 }
 
 impl<'s> GenerateIDFieldTransform<'s> {
-    fn new(program: &'s Program) -> Self {
-        let id_name = "id".intern();
+    fn new(program: &'s Program, node_interface_id_field: Option<StringKey>) -> Self {
+        let id_name = node_interface_id_field.unwrap_or_else(|| "id".intern());
 
         let schema = &program.schema;
         let node_interface = match schema.get_type("Node".intern()) {
@@ -124,7 +124,7 @@ impl<'s> GenerateIDFieldTransform<'s> {
                     .fields
                     .iter()
                     .find(|&&id| schema.field(id).name.item == id_name)
-                    .expect("Expected `Node` to contain a field named `id`.");
+                    .expect(&format!("Expected `Node` to contain a field named `{:}`.", id_name).to_string());
 
                 Some(NodeInterface {
                     id: node_interface_id,

compiler/crates/relay-transforms/src/refetchable_fragment/fetchable_query_generator.rs

@@ -22,10 +22,13 @@ use std::sync::Arc;
 
 fn build_refetch_operation(
     schema: &SDLSchema,
+    node_interface_id_field: Option<StringKey>,
     fragment: &Arc<FragmentDefinition>,
     query_name: StringKey,
     variables_map: &VariableMap,
 ) -> DiagnosticsResult<Option<RefetchRoot>> {
+    let id_name = node_interface_id_field.unwrap_or_else(|| "id".intern());
+
     if let Some(identifier_field_name) = get_fetchable_field_name(fragment, schema)? {
         let identifier_field_id = get_identifier_field_id(fragment, schema, identifier_field_name)?;
 
@@ -58,7 +61,7 @@ fn build_refetch_operation(
             ),
         });
         let mut variable_definitions = build_operation_variable_definitions(&fragment);
-        if let Some(id_argument) = variable_definitions.named(CONSTANTS.id_name) {
+        if let Some(id_argument) = variable_definitions.named(id_name) {
             return Err(vec![Diagnostic::error(
                 ValidationMessage::RefetchableFragmentOnNodeWithExistingID {
                     fragment_name: fragment.name.item,
@@ -67,7 +70,7 @@ fn build_refetch_operation(
             )]);
         }
         variable_definitions.push(VariableDefinition {
-            name: WithLocation::new(fragment.name.location, CONSTANTS.id_name),
+            name: WithLocation::new(fragment.name.location, id_name),
             type_: id_arg.type_.non_null(),
             default_value: None,
             directives: vec![],
@@ -83,7 +86,7 @@ fn build_refetch_operation(
                     value: WithLocation::new(
                         fragment.name.location,
                         Value::Variable(Variable {
-                            name: WithLocation::new(fragment.name.location, CONSTANTS.id_name),
+                            name: WithLocation::new(fragment.name.location, id_name),
                             type_: id_arg.type_.non_null(),
                         }),
                     ),

compiler/crates/relay-transforms/src/refetchable_fragment/mod.rs

@@ -54,13 +54,14 @@ pub use self::refetchable_directive::REFETCHABLE_NAME;
 ///    Fragment to Root IR nodes.
 pub fn transform_refetchable_fragment(
     program: &Program,
+    node_interface_id_field: Option<StringKey>,
     base_fragment_names: &'_ StringKeySet,
     for_typegen: bool,
 ) -> DiagnosticsResult<Program> {
     let mut next_program = Program::new(Arc::clone(&program.schema));
     let query_type = program.schema.query_type().unwrap();
 
-    let mut transformer = RefetchableFragment::new(program, for_typegen);
+    let mut transformer = RefetchableFragment::new(program, for_typegen, node_interface_id_field);
 
     for operation in program.operations() {
         next_program.insert_operation(Arc::clone(operation));
@@ -102,15 +103,17 @@ pub struct RefetchableFragment<'program> {
     existing_refetch_operations: ExistingRefetchOperations,
     for_typegen: bool,
     program: &'program Program,
+    node_interface_id_field: Option<StringKey>,
 }
 
 impl<'program> RefetchableFragment<'program> {
-    pub fn new(program: &'program Program, for_typegen: bool) -> Self {
+    pub fn new(program: &'program Program, for_typegen: bool, node_interface_id_field: Option<StringKey>) -> Self {
         RefetchableFragment {
             connection_constants: Default::default(),
             existing_refetch_operations: Default::default(),
             for_typegen,
             program,
+            node_interface_id_field,
         }
     }
 
@@ -145,6 +148,7 @@ impl<'program> RefetchableFragment<'program> {
         for generator in GENERATORS.iter() {
             if let Some(refetch_root) = (generator.build_refetch_operation)(
                 &self.program.schema,
+                self.node_interface_id_field,
                 fragment,
                 refetchable_directive.query_name.item,
                 &variables_map,
@@ -294,6 +298,7 @@ impl<'program> RefetchableFragment<'program> {
 
 type BuildRefetchOperationFn = fn(
     schema: &SDLSchema,
+    node_interface_id_field: Option<StringKey>,
     fragment: &Arc<FragmentDefinition>,
     query_name: StringKey,
     variables_map: &VariableMap,