changing default behavior to generate client field metadata

compiler/crates/common/src/feature_flags.rs

@@ -76,10 +76,6 @@ pub struct FeatureFlags {
     /// Print queries in compact form
     #[serde(default)]
     pub compact_query_text: FeatureFlag,
-
-    // Enables @relay_test_operation support for client data.
-    #[serde(default)]
-    pub enable_mock_client_data_metadata: FeatureFlag,
 }
 
 #[derive(Debug, Deserialize, Clone, Serialize)]

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

@@ -120,7 +120,6 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
         use_named_imports_for_relay_resolvers: false,
         relay_resolver_model_syntax_enabled: false,
         relay_resolver_enable_terse_syntax: false,
-        enable_mock_client_data_metadata: FeatureFlag::Disabled,
     };
 
     let default_project_config = ProjectConfig {

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

@@ -90,7 +90,6 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
         use_named_imports_for_relay_resolvers: false,
         relay_resolver_model_syntax_enabled: false,
         relay_resolver_enable_terse_syntax: false,
-        enable_mock_client_data_metadata: FeatureFlag::Disabled,
     };
 
     let project_config = ProjectConfig {

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

@@ -479,13 +479,7 @@ fn apply_normalization_transforms(
     }
 
     program = log_event.time("generate_test_operation_metadata", || {
-        generate_test_operation_metadata(
-            &program,
-            &project_config.test_path_regex,
-            &project_config
-                .feature_flags
-                .enable_mock_client_data_metadata,
-        )
+        generate_test_operation_metadata(&program, &project_config.test_path_regex)
     })?;
     if let Some(print_stats) = maybe_print_stats {
         print_stats("generate_test_operation_metadata", &program);

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

@@ -9,7 +9,6 @@ use common::ArgumentName;
 use common::Diagnostic;
 use common::DiagnosticsResult;
 use common::DirectiveName;
-use common::FeatureFlag;
 use common::NamedItem;
 use common::WithLocation;
 use graphql_ir::ConstantArgument;
@@ -46,7 +45,6 @@ lazy_static! {
     static ref NULLABLE_KEY: ArgumentName = ArgumentName("nullable".intern());
     static ref PLURAL_KEY: ArgumentName = ArgumentName("plural".intern());
     static ref TYPE_KEY: ArgumentName = ArgumentName("type".intern());
-    static ref MOCK_CLIENT_DATA: ArgumentName = ArgumentName("mock_client_data".intern());
 }
 
 /// Transforms the @relay_test_operation directive to @__metadata thats printed
@@ -56,13 +54,8 @@ lazy_static! {
 pub fn generate_test_operation_metadata(
     program: &Program,
     test_path_regex: &Option<Regex>,
-    enable_mock_client_data_metadata_flag: &FeatureFlag,
 ) -> DiagnosticsResult<Program> {
-    let mut transformer = GenerateTestOperationMetadata::new(
-        program,
-        test_path_regex,
-        enable_mock_client_data_metadata_flag,
-    );
+    let mut transformer = GenerateTestOperationMetadata::new(program, test_path_regex);
     let next_program = transformer
         .transform_program(program)
         .replace_or_else(|| program.clone());
@@ -74,29 +67,23 @@ pub fn generate_test_operation_metadata(
     }
 }
 
-struct GenerateTestOperationMetadata<'program, 'flag> {
-    program: &'program Program,
-    test_path_regex: &'program Option<Regex>,
+struct GenerateTestOperationMetadata<'a> {
+    program: &'a Program,
+    test_path_regex: &'a Option<Regex>,
     errors: Vec<Diagnostic>,
-    enable_mock_client_data_metadata_flag: &'flag FeatureFlag,
 }
 
-impl<'program, 'flag> GenerateTestOperationMetadata<'program, 'flag> {
-    fn new(
-        program: &'program Program,
-        test_path_regex: &'program Option<Regex>,
-        enable_mock_client_data_metadata_flag: &'flag FeatureFlag,
-    ) -> Self {
+impl<'a> GenerateTestOperationMetadata<'a> {
+    fn new(program: &'a Program, test_path_regex: &'a Option<Regex>) -> Self {
         GenerateTestOperationMetadata {
             program,
             test_path_regex,
             errors: Vec::new(),
-            enable_mock_client_data_metadata_flag: &enable_mock_client_data_metadata_flag,
         }
     }
 }
 
-impl<'program, 'flag> Transformer for GenerateTestOperationMetadata<'program, 'flag> {
+impl<'a> Transformer for GenerateTestOperationMetadata<'a> {
     const NAME: &'static str = "GenerateTestOperationMetadata";
     const VISIT_ARGUMENTS: bool = false;
     const VISIT_DIRECTIVES: bool = false;
@@ -129,8 +116,6 @@ impl<'program, 'flag> Transformer for GenerateTestOperationMetadata<'program, 'f
                         ConstantValue::Object(From::from(RelayTestOperationMetadata::new(
                             self.program,
                             &operation.selections,
-                            self.enable_mock_client_data_metadata_flag
-                                .is_fully_enabled(),
                         ))),
                     ));
                 } else {
@@ -226,7 +211,7 @@ pub struct RelayTestOperationMetadata {
 }
 
 impl RelayTestOperationMetadata {
-    pub fn new(program: &Program, selections: &[Selection], mock_client_data: bool) -> Self {
+    pub fn new(program: &Program, selections: &[Selection]) -> Self {
         let schema = program.schema.as_ref();
         let mut selection_type_info: IndexMap<StringKey, RelayTestOperationSelectionTypeInfo> =
             Default::default();
@@ -239,26 +224,22 @@ impl RelayTestOperationMetadata {
                     match selection {
                         Selection::ScalarField(scalar_field) => {
                             let field = schema.field(scalar_field.definition.item);
-                            if !field.is_extension || mock_client_data {
-                                let alias_or_name = scalar_field.alias_or_name(schema);
-                                let next_path = next_path(path, alias_or_name);
-                                selection_type_info.insert(
-                                    next_path,
-                                    RelayTestOperationSelectionTypeInfo::new(schema, field),
-                                );
-                            }
+                            let alias_or_name = scalar_field.alias_or_name(schema);
+                            let next_path = next_path(path, alias_or_name);
+                            selection_type_info.insert(
+                                next_path,
+                                RelayTestOperationSelectionTypeInfo::new(schema, field),
+                            );
                         }
                         Selection::LinkedField(linked_field) => {
                             let field = schema.field(linked_field.definition.item);
-                            if !field.is_extension || mock_client_data {
-                                let alias_or_name = linked_field.alias_or_name(schema);
-                                let next_path = next_path(path, alias_or_name);
-                                selection_type_info.insert(
-                                    next_path,
-                                    RelayTestOperationSelectionTypeInfo::new(schema, field),
-                                );
-                                processing_queue.push((Some(next_path), &linked_field.selections));
-                            }
+                            let alias_or_name = linked_field.alias_or_name(schema);
+                            let next_path = next_path(path, alias_or_name);
+                            selection_type_info.insert(
+                                next_path,
+                                RelayTestOperationSelectionTypeInfo::new(schema, field),
+                            );
+                            processing_queue.push((Some(next_path), &linked_field.selections));
                         }
                         Selection::Condition(condition) => {
                             processing_queue.push((path, &condition.selections));

compiler/crates/relay-transforms/tests/relay_test_operation/mod.rs

@@ -21,10 +21,7 @@ use regex::Regex;
 use relay_test_schema::get_test_schema_with_extensions;
 use relay_transforms::generate_test_operation_metadata;
 
-fn transform_fixture_inner(
-    fixture: &Fixture<'_>,
-    enable_mock_client_data_metadata_flag: &FeatureFlag,
-) -> Result<String, String> {
+pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
     let parts: Vec<_> = fixture.content.split("%extensions%").collect();
 
     if let [base, extensions] = parts.as_slice() {
@@ -40,7 +37,6 @@ fn transform_fixture_inner(
         let next_program = generate_test_operation_metadata(
             &program,
             &test_path_regex,
-            enable_mock_client_data_metadata_flag,
         )
         .map_err(|diagnostics| diagnostics_to_sorted_string(fixture.content, &diagnostics))?;
 
@@ -62,15 +58,5 @@ fn transform_fixture_inner(
         Ok(printed.join("\n\n"))
     } else {
         panic!("Expected exactly one %extensions% section marker.")
-    }
-}
-
-pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
-    transform_fixture_inner(fixture, &FeatureFlag::Disabled)
-}
-
-pub fn transform_fixture_with_mock_client_data_enabled(
-    fixture: &Fixture<'_>,
-) -> Result<String, String> {
-    transform_fixture_inner(fixture, &FeatureFlag::Enabled)
-}
+    }}
+

compiler/crates/relay-transforms/tests/relay_test_operation_test.rs

@@ -10,7 +10,6 @@
 mod relay_test_operation;
 
 use relay_test_operation::transform_fixture;
-use relay_test_operation::transform_fixture_with_mock_client_data_enabled;
 use fixture_tests::test_fixture;
 
 #[test]
@@ -20,18 +19,11 @@ fn prod_query_invalid() {
     test_fixture(transform_fixture, "prod_query.invalid.graphql", "relay_test_operation/fixtures/prod_query.invalid.expected", input, expected);
 }
 
-#[test]
-fn test_client_fields_not_generated_query() {
-    let input = include_str!("relay_test_operation/fixtures/test_client_fields_not_generated_query.graphql");
-    let expected = include_str!("relay_test_operation/fixtures/test_client_fields_not_generated_query.expected");
-    test_fixture(transform_fixture, "test_client_fields_not_generated_query.graphql", "relay_test_operation/fixtures/test_client_fields_not_generated_query.expected", input, expected);
-}
-
 #[test]
 fn test_client_fields_query() {
     let input = include_str!("relay_test_operation/fixtures/test_client_fields_query.graphql");
     let expected = include_str!("relay_test_operation/fixtures/test_client_fields_query.expected");
-    test_fixture(transform_fixture_with_mock_client_data_enabled, "test_client_fields_query.graphql", "relay_test_operation/fixtures/test_client_fields_query.expected", input, expected);
+    test_fixture(transform_fixture, "test_client_fields_query.graphql", "relay_test_operation/fixtures/test_client_fields_query.expected", input, expected);
 }
 
 #[test]