add disable_resolver_reader_ast feature flag

Reviewed By: DataDataDataViz Differential Revision: D54307293 fbshipit-source-id: a77bc5234ac4c23726a9442a655d4f8338e9cd87
facebook · Mar 4, 2024 · 57230b4 · 57230b4
1 parent 14314f9
commit 57230b4
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 1 deletion.
diff --git a/compiler/crates/common/src/feature_flags.rs b/compiler/crates/common/src/feature_flags.rs
@@ -98,6 +98,11 @@ pub struct FeatureFlags {
     /// any existing examples.
     #[serde(default)]
     pub allow_required_in_mutation_response: FeatureFlag,
+
+    /// Mirror of `enable_resolver_normalization_ast`
+    /// excludes resolver metadata from reader ast
+    #[serde(default)]
+    pub disable_resolver_reader_ast: bool,
 }
 
 #[derive(Debug, Deserialize, Clone, Serialize, Default)]

diff --git a/compiler/crates/relay-codegen/src/build_ast.rs b/compiler/crates/relay-codegen/src/build_ast.rs
@@ -939,6 +939,14 @@ impl<'schema, 'builder, 'config> CodegenBuilder<'schema, 'builder, 'config> {
 
     fn build_scalar_field_and_handles(&mut self, field: &ScalarField) -> Vec<Primitive> {
         if let Some(resolver_metadata) = RelayResolverMetadata::find(&field.directives) {
+            if self.variant == CodegenVariant::Reader
+                && self
+                    .project_config
+                    .feature_flags
+                    .disable_resolver_reader_ast
+            {
+                return vec![self.build_scalar_field(field)];
+            }
             return vec![self.build_scalar_backed_resolver_field(field, resolver_metadata)];
         }
         match self.variant {
@@ -1221,7 +1229,29 @@ impl<'schema, 'builder, 'config> CodegenBuilder<'schema, 'builder, 'config> {
         {
             let resolver_primitive = match self.variant {
                 CodegenVariant::Reader => {
-                    self.build_reader_relay_resolver(resolver_metadata, Some(primitive))
+                    if self
+                        .project_config
+                        .feature_flags
+                        .disable_resolver_reader_ast
+                    {
+                        let scalar_field = ScalarField {
+                            alias: resolver_metadata.field_alias.map(WithLocation::generated),
+                            definition: WithLocation::generated(resolver_metadata.field_id),
+                            arguments: resolver_metadata.field_arguments.clone(),
+                            directives: frag_spread
+                                .directives
+                                .iter()
+                                .filter(|directive| {
+                                    directive.name.item
+                                        != RequiredMetadataDirective::directive_name()
+                                })
+                                .cloned()
+                                .collect(),
+                        };
+                        self.build_scalar_field(&scalar_field)
+                    } else {
+                        self.build_reader_relay_resolver(resolver_metadata, Some(primitive))
+                    }
                 }
                 // We expect all RelayResolver fragment spreads to be inlined into inline fragment spreads when generating Normalization ASTs.
                 CodegenVariant::Normalization => panic!(
@@ -1717,6 +1747,9 @@ impl<'schema, 'builder, 'config> CodegenBuilder<'schema, 'builder, 'config> {
                 }))
             }
             ClientEdgeMetadataDirective::ClientObject { type_name, location, is_model_live, has_model_instance_field, .. } => {
+                if self.project_config.feature_flags.disable_resolver_reader_ast {
+                    return selections_item;
+                }
                 let concrete_type = match type_name {
                     Some(type_name) => Primitive::String(type_name.0),
                     None => Primitive::Null,

diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/mod.rs b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/mod.rs
@@ -124,6 +124,7 @@ pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String>
         enable_strict_custom_scalars: false,
         allow_required_in_mutation_response: FeatureFlag::Disabled,
         allow_resolvers_in_mutation_response: FeatureFlag::Disabled,
+        disable_resolver_reader_ast: false,
     };
 
     let default_project_config = ProjectConfig {

diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts_with_custom_id/mod.rs b/compiler/crates/relay-compiler/tests/compile_relay_artifacts_with_custom_id/mod.rs
@@ -103,6 +103,7 @@ pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String>
         enable_strict_custom_scalars: false,
         allow_required_in_mutation_response: FeatureFlag::Disabled,
         allow_resolvers_in_mutation_response: FeatureFlag::Disabled,
+        disable_resolver_reader_ast: false,
     };
 
     let default_schema_config = SchemaConfig::default();