Remove Relay Resolver compiler feature flag

Reviewed By: tyao1 Differential Revision: D63656695 fbshipit-source-id: 69b6191b61547f0b03e6ba59eb9f60824a7a7aec
facebook · Oct 1, 2024 · 4e5377b · 4e5377b
1 parent 7b8f1f6
commit 4e5377b
Show file tree

Hide file tree

Showing 113 changed files with 23 additions and 215 deletions.
diff --git a/compiler/crates/common/src/feature_flags.rs b/compiler/crates/common/src/feature_flags.rs
@@ -21,9 +21,6 @@ use crate::Rollout;
 #[derive(Default, Debug, Serialize, Deserialize, Clone, JsonSchema)]
 #[serde(deny_unknown_fields)]
 pub struct FeatureFlags {
- #[serde(default)]
- pub enable_relay_resolver_transform: bool,
-
  #[serde(default)]
  // Enable returning interfaces from Relay Resolvers without @outputType
  pub relay_resolver_enable_interface_output_type: FeatureFlag,

diff --git a/compiler/crates/relay-codegen/tests/client_edges.rs b/compiler/crates/relay-codegen/tests/client_edges.rs
@@ -49,7 +49,7 @@ pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String>
  };
  let next_program = sort_selections(
  &client_edges(&program, &project_config, &Default::default())
- .and_then(|program| relay_resolvers(ProjectName::default(), &program, true))
+ .and_then(|program| relay_resolvers(ProjectName::default(), &program))
  .unwrap(),
  );
  let mut result = next_program

diff --git a/compiler/crates/relay-compiler/relay-compiler-config-schema.json b/compiler/crates/relay-compiler/relay-compiler-config-schema.json
@@ -741,10 +741,6 @@
  "default": false,
  "type": "boolean"
  },
- "enable_relay_resolver_transform": {
- "default": false,
- "type": "boolean"
- },
  "enable_resolver_normalization_ast": {
  "description": "Fully build the normalization AST for Resolvers",
  "default": false,
@@ -1814,7 +1810,6 @@
  "enable_exec_time_resolvers_directive": false,
  "enable_fragment_argument_transform": false,
  "enable_relay_resolver_mutations": false,
- "enable_relay_resolver_transform": false,
  "enable_resolver_normalization_ast": false,
  "enable_strict_custom_scalars": false,
  "enforce_fragment_alias_where_ambiguous": {
@@ -2469,10 +2464,6 @@
  "default": false,
  "type": "boolean"
  },
- "enable_relay_resolver_transform": {
- "default": false,
- "type": "boolean"
- },
  "enable_resolver_normalization_ast": {
  "description": "Fully build the normalization AST for Resolvers",
  "default": false,
@@ -3850,10 +3841,6 @@
  "default": false,
  "type": "boolean"
  },
- "enable_relay_resolver_transform": {
- "default": false,
- "type": "boolean"
- },
  "enable_resolver_normalization_ast": {
  "description": "Fully build the normalization AST for Resolvers",
  "default": false,

diff --git a/compiler/crates/relay-compiler/src/build_project/build_resolvers_schema.rs b/compiler/crates/relay-compiler/src/build_project/build_resolvers_schema.rs
@@ -10,6 +10,5 @@ mod ir_to_schema;
 mod mark_document_as_base;
 
 pub use extract_docblock_ir::extract_docblock_ir;
-pub use extract_docblock_ir::ExtractedDocblockIr;
 pub use ir_to_schema::build_resolver_types_schema_documents;
 pub use ir_to_schema::extend_schema_with_field_ir;
diff --git a/compiler/crates/relay-compiler/src/build_project/build_schema.rs b/compiler/crates/relay-compiler/src/build_project/build_schema.rs
@@ -21,7 +21,6 @@ use schema_validate_lib::SchemaValidationOptions;
 use super::build_resolvers_schema::build_resolver_types_schema_documents;
 use super::build_resolvers_schema::extend_schema_with_field_ir;
 use super::build_resolvers_schema::extract_docblock_ir;
-use super::build_resolvers_schema::ExtractedDocblockIr;
 use crate::compiler_state::CompilerState;
 use crate::config::Config;
 use crate::config::ProjectConfig;
@@ -68,11 +67,7 @@ fn build_schema_impl(
 
  // Collect Relay Resolver schema IR
  let resolver_schema_data = log_event.time("collect_resolver_schema_time", || {
- if project_config.feature_flags.enable_relay_resolver_transform {
- extract_docblock_ir(config, compiler_state, project_config, graphql_asts_map)
- } else {
- Ok(ExtractedDocblockIr::default())
- }
+ extract_docblock_ir(config, compiler_state, project_config, graphql_asts_map)
  })?;
 
  // Convert resolver schema to AST and append it to extension ASTs

diff --git a/compiler/crates/relay-compiler/src/build_project/validate.rs b/compiler/crates/relay-compiler/src/build_project/validate.rs
@@ -86,11 +86,7 @@ pub fn validate(
  validate_updatable_directive(program),
  validate_updatable_fragment_spread(program),
  validate_assignable_directive(program),
- if project_config.feature_flags.enable_relay_resolver_transform {
- validate_resolver_fragments(program)
- } else {
- Ok(())
- },
+ validate_resolver_fragments(program),
  disallow_readtime_features_in_mutations(
  program,
  &project_config

diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts.rs b/compiler/crates/relay-compiler/tests/compile_relay_artifacts.rs
@@ -105,7 +105,6 @@ pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String>
  no_inline: FeatureFlag::Limited {
  allowlist: no_inline_allowlist.into_iter().collect(),
  },
- enable_relay_resolver_transform: true,
  enable_3d_branch_arg_generation: true,
  actor_change_support: FeatureFlag::Enabled,
  text_artifacts: FeatureFlag::Disabled,

diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts_with_custom_id.rs b/compiler/crates/relay-compiler/tests/compile_relay_artifacts_with_custom_id.rs
@@ -86,7 +86,6 @@ pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String>
 
  let feature_flags = FeatureFlags {
  no_inline: FeatureFlag::Enabled,
- enable_relay_resolver_transform: true,
  enable_3d_branch_arg_generation: true,
  actor_change_support: FeatureFlag::Enabled,
  text_artifacts: FeatureFlag::Disabled,

diff --git a/...lay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_extension.expected b/...lay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_extension.expected
@@ -9,9 +9,6 @@ graphql`mutation barMutation {
  "language": "flow",
  "schema": "./schema.graphql",
  "eagerEsModules": true,
- "featureFlags": {
- "enable_relay_resolver_transform": true
- },
  "schemaExtensions": [
  "./extensions.graphql"
  ]

diff --git a/.../relay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_extension.input b/.../relay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_extension.input
@@ -8,9 +8,6 @@ graphql`mutation barMutation {
  "language": "flow",
  "schema": "./schema.graphql",
  "eagerEsModules": true,
- "featureFlags": {
- "enable_relay_resolver_transform": true
- },
  "schemaExtensions": [
  "./extensions.graphql"
  ]

diff --git a/...elay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_resolver.expected b/...elay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_resolver.expected
@@ -15,7 +15,6 @@ graphql`mutation barMutation {
  "schema": "./schema.graphql",
  "eagerEsModules": true,
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_relay_resolver_mutations": true
  }
 }

diff --git a/...s/relay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_resolver.input b/...s/relay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_resolver.input
@@ -14,7 +14,6 @@ graphql`mutation barMutation {
  "schema": "./schema.graphql",
  "eagerEsModules": true,
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_relay_resolver_mutations": true
  }
 }

diff --git a/...lay_compiler_integration/fixtures/client_mutation_resolver_different_mutation_ok.expected b/...lay_compiler_integration/fixtures/client_mutation_resolver_different_mutation_ok.expected
@@ -19,7 +19,6 @@ graphql`mutation barMutation {
  "schema": "./schema.graphql",
  "eagerEsModules": true,
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_relay_resolver_mutations": true
  },
  "schemaExtensions": [

diff --git a/.../relay_compiler_integration/fixtures/client_mutation_resolver_different_mutation_ok.input b/.../relay_compiler_integration/fixtures/client_mutation_resolver_different_mutation_ok.input
@@ -18,7 +18,6 @@ graphql`mutation barMutation {
  "schema": "./schema.graphql",
  "eagerEsModules": true,
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_relay_resolver_mutations": true
  },
  "schemaExtensions": [

diff --git a/...ts/relay_compiler_integration/fixtures/client_mutation_resolver_invalid_disabled.expected b/...ts/relay_compiler_integration/fixtures/client_mutation_resolver_invalid_disabled.expected
@@ -13,10 +13,7 @@ graphql`mutation barMutation {
 {
  "language": "flow",
  "schema": "./schema.graphql",
- "eagerEsModules": true,
- "featureFlags": {
- "enable_relay_resolver_transform": true
- }
+ "eagerEsModules": true
 }
 
 //- schema.graphql

diff --git a/...tests/relay_compiler_integration/fixtures/client_mutation_resolver_invalid_disabled.input b/...tests/relay_compiler_integration/fixtures/client_mutation_resolver_invalid_disabled.input
@@ -12,10 +12,7 @@ graphql`mutation barMutation {
 {
  "language": "flow",
  "schema": "./schema.graphql",
- "eagerEsModules": true,
- "featureFlags": {
- "enable_relay_resolver_transform": true
- }
+ "eagerEsModules": true
 }
 
 //- schema.graphql

diff --git a/...s/relay_compiler_integration/fixtures/client_mutation_resolver_invalid_nonscalar.expected b/...s/relay_compiler_integration/fixtures/client_mutation_resolver_invalid_nonscalar.expected
@@ -31,7 +31,6 @@ graphql`mutation barMutation {
  "schema": "./schema.graphql",
  "eagerEsModules": true,
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_relay_resolver_mutations": true
  },
  "schemaExtensions": [

diff --git a/...ests/relay_compiler_integration/fixtures/client_mutation_resolver_invalid_nonscalar.input b/...ests/relay_compiler_integration/fixtures/client_mutation_resolver_invalid_nonscalar.input
@@ -30,7 +30,6 @@ graphql`mutation barMutation {
  "schema": "./schema.graphql",
  "eagerEsModules": true,
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_relay_resolver_mutations": true
  },
  "schemaExtensions": [

diff --git a/...mpiler_integration/fixtures/client_schema_extension_interface_uses_resolver_type.expected b/...mpiler_integration/fixtures/client_schema_extension_interface_uses_resolver_type.expected
@@ -36,10 +36,7 @@ export function boss() {
  "schema": "schema.graphql",
  "schemaExtensions": [
  "schema-extensions"
- ],
- "featureFlags": {
- "enable_relay_resolver_transform": true
- }
+ ]
 }
 
 //- schema.graphql

diff --git a/..._compiler_integration/fixtures/client_schema_extension_interface_uses_resolver_type.input b/..._compiler_integration/fixtures/client_schema_extension_interface_uses_resolver_type.input
@@ -35,10 +35,7 @@ export function boss() {
  "schema": "schema.graphql",
  "schemaExtensions": [
  "schema-extensions"
- ],
- "featureFlags": {
- "enable_relay_resolver_transform": true
- }
+ ]
 }
 
 //- schema.graphql

diff --git a/...s/relay_compiler_integration/fixtures/custom_scalar_variable_default_arg.invalid.expected b/...s/relay_compiler_integration/fixtures/custom_scalar_variable_default_arg.invalid.expected
@@ -16,7 +16,6 @@ graphql`query fooCustomScalarLiteralArgQuery($arg: CustomScalarType! = "foobar",
  "schema": "./schema.graphql",
  "eagerEsModules": true,
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_relay_resolver_mutations": true,
  "enable_strict_custom_scalars": true
  },

diff --git a/...ests/relay_compiler_integration/fixtures/custom_scalar_variable_default_arg.invalid.input b/...ests/relay_compiler_integration/fixtures/custom_scalar_variable_default_arg.invalid.input
@@ -15,7 +15,6 @@ graphql`query fooCustomScalarLiteralArgQuery($arg: CustomScalarType! = "foobar",
  "schema": "./schema.graphql",
  "eagerEsModules": true,
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_relay_resolver_mutations": true,
  "enable_strict_custom_scalars": true
  },

diff --git a/...elay_compiler_integration/fixtures/custom_scalar_variable_default_arg_non_strict.expected b/...elay_compiler_integration/fixtures/custom_scalar_variable_default_arg_non_strict.expected
@@ -16,7 +16,6 @@ graphql`query fooCustomScalarLiteralArgQuery($arg: CustomScalarType = "foobar",
  "schema": "./schema.graphql",
  "eagerEsModules": true,
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_relay_resolver_mutations": true
  },
  "schemaExtensions": [

diff --git a/...s/relay_compiler_integration/fixtures/custom_scalar_variable_default_arg_non_strict.input b/...s/relay_compiler_integration/fixtures/custom_scalar_variable_default_arg_non_strict.input
@@ -15,7 +15,6 @@ graphql`query fooCustomScalarLiteralArgQuery($arg: CustomScalarType = "foobar",
  "schema": "./schema.graphql",
  "eagerEsModules": true,
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_relay_resolver_mutations": true
  },
  "schemaExtensions": [

diff --git a/...sts/relay_compiler_integration/fixtures/live_resolver_implements_interface_field.expected b/...sts/relay_compiler_integration/fixtures/live_resolver_implements_interface_field.expected
@@ -34,7 +34,6 @@ graphql`fragment PersonComponentFragment on IPerson {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/.../tests/relay_compiler_integration/fixtures/live_resolver_implements_interface_field.input b/.../tests/relay_compiler_integration/fixtures/live_resolver_implements_interface_field.input
@@ -33,7 +33,6 @@ graphql`fragment PersonComponentFragment on IPerson {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/...er_integration/fixtures/multiple_resolvers_on_interface_of_all_strong_model_type.expected b/...er_integration/fixtures/multiple_resolvers_on_interface_of_all_strong_model_type.expected
@@ -38,7 +38,6 @@ graphql`query PersonComponentQuery {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/...piler_integration/fixtures/multiple_resolvers_on_interface_of_all_strong_model_type.input b/...piler_integration/fixtures/multiple_resolvers_on_interface_of_all_strong_model_type.input
@@ -37,7 +37,6 @@ graphql`query PersonComponentQuery {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/...egration/fixtures/multiple_resolvers_returns_interfaces_of_all_strong_model_type.expected b/...egration/fixtures/multiple_resolvers_returns_interfaces_of_all_strong_model_type.expected
@@ -44,7 +44,6 @@ graphql`query PersonComponentQuery {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/...integration/fixtures/multiple_resolvers_returns_interfaces_of_all_strong_model_type.input b/...integration/fixtures/multiple_resolvers_returns_interfaces_of_all_strong_model_type.input
@@ -43,7 +43,6 @@ graphql`query PersonComponentQuery {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/...s/relay-compiler/tests/relay_compiler_integration/fixtures/resolver_on_interface.expected b/...s/relay-compiler/tests/relay_compiler_integration/fixtures/resolver_on_interface.expected
@@ -31,7 +31,6 @@ graphql`fragment PersonComponentFragment on IPerson {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/...ates/relay-compiler/tests/relay_compiler_integration/fixtures/resolver_on_interface.input b/...ates/relay-compiler/tests/relay_compiler_integration/fixtures/resolver_on_interface.input
@@ -30,7 +30,6 @@ graphql`fragment PersonComponentFragment on IPerson {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/...tegration/fixtures/resolver_on_interface_does_not_pass_schema_validation.invalid.expected b/...tegration/fixtures/resolver_on_interface_does_not_pass_schema_validation.invalid.expected
@@ -29,7 +29,6 @@ graphql`fragment PersonComponentFragment on IPerson {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/..._integration/fixtures/resolver_on_interface_does_not_pass_schema_validation.invalid.input b/..._integration/fixtures/resolver_on_interface_does_not_pass_schema_validation.invalid.input
@@ -28,7 +28,6 @@ graphql`fragment PersonComponentFragment on IPerson {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/...lay_compiler_integration/fixtures/resolver_on_interface_of_all_strong_model_type.expected b/...lay_compiler_integration/fixtures/resolver_on_interface_of_all_strong_model_type.expected
@@ -29,7 +29,6 @@ graphql`fragment PersonComponentFragment on IPerson {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/.../relay_compiler_integration/fixtures/resolver_on_interface_of_all_strong_model_type.input b/.../relay_compiler_integration/fixtures/resolver_on_interface_of_all_strong_model_type.input
@@ -28,7 +28,6 @@ graphql`fragment PersonComponentFragment on IPerson {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/...ntegration/fixtures/resolver_on_interface_of_all_strong_model_type_including_cse.expected b/...ntegration/fixtures/resolver_on_interface_of_all_strong_model_type_including_cse.expected
@@ -29,7 +29,6 @@ graphql`fragment PersonComponentFragment on IPerson {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/...r_integration/fixtures/resolver_on_interface_of_all_strong_model_type_including_cse.input b/...r_integration/fixtures/resolver_on_interface_of_all_strong_model_type_including_cse.input
@@ -28,7 +28,6 @@ graphql`fragment PersonComponentFragment on IPerson {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/...ation/fixtures/resolver_on_interface_of_all_strong_model_type_with_root_fragment.expected b/...ation/fixtures/resolver_on_interface_of_all_strong_model_type_with_root_fragment.expected
@@ -28,7 +28,6 @@ graphql`fragment IPersonResolversFragment on IPerson {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }

diff --git a/...egration/fixtures/resolver_on_interface_of_all_strong_model_type_with_root_fragment.input b/...egration/fixtures/resolver_on_interface_of_all_strong_model_type_with_root_fragment.input
@@ -27,7 +27,6 @@ graphql`fragment IPersonResolversFragment on IPerson {
  "schema-extensions"
  ],
  "featureFlags": {
- "enable_relay_resolver_transform": true,
  "enable_resolver_normalization_ast": true,
  "relay_resolver_enable_interface_output_type": { "kind": "enabled" }
  }