[Sketch] Hoisted Query Selections

compiler/crates/common/src/feature_flags.rs

@@ -118,6 +118,12 @@ pub struct FeatureFlags {
     #[serde(default)]
     pub allow_resolver_non_nullable_return_type: FeatureFlag,
 
+    /// Enable the `__query` selection syntax for hoisting selections to the
+    /// query root. When enabled, any selection set can include `__query { ... }`
+    /// to select fields from the query root type.
+    #[serde(default)]
+    pub enable_query_root_selection: bool,
+
     /// Disable validating the composite schema (server, client schema
     /// extensions, Relay Resolvers) after its built.
     #[serde(default)]
@@ -256,6 +262,7 @@ impl Default for FeatureFlags {
             enforce_module_name_prefix_for_non_haste: Default::default(),
             emit_nogrep_annotation: Default::default(),
             disable_more_precise_abstract_selection_raw_response_type: Default::default(),
+            enable_query_root_selection: Default::default(),
 
             // enabled-by-default
             enforce_fragment_alias_where_ambiguous: FeatureFlag::Enabled,

compiler/crates/graphql-text-printer/tests/prettier_printer_test.rs

@@ -3,219 +3,109 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * @generated SignedSource<<f40808776b8f008ee81128c4dff60891>>
  */
 
 mod prettier_printer;
 
-use fixture_tests::test_fixture;
 use prettier_printer::transform_fixture;
+use fixture_tests::test_fixture;
 
 #[tokio::test]
-async fn query_simple() {
-    let input = include_str!("prettier_printer/fixtures/query_simple.graphql");
-    let expected = include_str!("prettier_printer/fixtures/query_simple.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "query_simple.graphql",
-        "prettier_printer/fixtures/query_simple.expected",
-        input,
-        expected,
-    )
-    .await;
-}
-
-#[tokio::test]
-async fn query_anonymous() {
-    let input = include_str!("prettier_printer/fixtures/query_anonymous.graphql");
-    let expected = include_str!("prettier_printer/fixtures/query_anonymous.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "query_anonymous.graphql",
-        "prettier_printer/fixtures/query_anonymous.expected",
-        input,
-        expected,
-    )
-    .await;
-}
-
-#[tokio::test]
-async fn query_with_variables() {
-    let input = include_str!("prettier_printer/fixtures/query_with_variables.graphql");
-    let expected = include_str!("prettier_printer/fixtures/query_with_variables.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "query_with_variables.graphql",
-        "prettier_printer/fixtures/query_with_variables.expected",
-        input,
-        expected,
-    )
-    .await;
+async fn argument_values() {
+    let input = include_str!("prettier_printer/fixtures/argument_values.graphql");
+    let expected = include_str!("prettier_printer/fixtures/argument_values.expected");
+    test_fixture(transform_fixture, file!(), "argument_values.graphql", "prettier_printer/fixtures/argument_values.expected", input, expected).await;
 }
 
 #[tokio::test]
-async fn mutation_with_variables() {
-    let input = include_str!("prettier_printer/fixtures/mutation_with_variables.graphql");
-    let expected = include_str!("prettier_printer/fixtures/mutation_with_variables.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "mutation_with_variables.graphql",
-        "prettier_printer/fixtures/mutation_with_variables.expected",
-        input,
-        expected,
-    )
-    .await;
+async fn field_alias() {
+    let input = include_str!("prettier_printer/fixtures/field_alias.graphql");
+    let expected = include_str!("prettier_printer/fixtures/field_alias.expected");
+    test_fixture(transform_fixture, file!(), "field_alias.graphql", "prettier_printer/fixtures/field_alias.expected", input, expected).await;
 }
 
 #[tokio::test]
-async fn subscription_basic() {
-    let input = include_str!("prettier_printer/fixtures/subscription_basic.graphql");
-    let expected = include_str!("prettier_printer/fixtures/subscription_basic.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "subscription_basic.graphql",
-        "prettier_printer/fixtures/subscription_basic.expected",
-        input,
-        expected,
-    )
-    .await;
+async fn field_directives() {
+    let input = include_str!("prettier_printer/fixtures/field_directives.graphql");
+    let expected = include_str!("prettier_printer/fixtures/field_directives.expected");
+    test_fixture(transform_fixture, file!(), "field_directives.graphql", "prettier_printer/fixtures/field_directives.expected", input, expected).await;
 }
 
 #[tokio::test]
 async fn fragment_basic() {
     let input = include_str!("prettier_printer/fixtures/fragment_basic.graphql");
     let expected = include_str!("prettier_printer/fixtures/fragment_basic.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "fragment_basic.graphql",
-        "prettier_printer/fixtures/fragment_basic.expected",
-        input,
-        expected,
-    )
-    .await;
-}
-
-#[tokio::test]
-async fn fragment_with_directive() {
-    let input = include_str!("prettier_printer/fixtures/fragment_with_directive.graphql");
-    let expected = include_str!("prettier_printer/fixtures/fragment_with_directive.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "fragment_with_directive.graphql",
-        "prettier_printer/fixtures/fragment_with_directive.expected",
-        input,
-        expected,
-    )
-    .await;
+    test_fixture(transform_fixture, file!(), "fragment_basic.graphql", "prettier_printer/fixtures/fragment_basic.expected", input, expected).await;
 }
 
 #[tokio::test]
 async fn fragment_spread() {
     let input = include_str!("prettier_printer/fixtures/fragment_spread.graphql");
     let expected = include_str!("prettier_printer/fixtures/fragment_spread.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "fragment_spread.graphql",
-        "prettier_printer/fixtures/fragment_spread.expected",
-        input,
-        expected,
-    )
-    .await;
+    test_fixture(transform_fixture, file!(), "fragment_spread.graphql", "prettier_printer/fixtures/fragment_spread.expected", input, expected).await;
 }
 
 #[tokio::test]
-async fn inline_fragment() {
-    let input = include_str!("prettier_printer/fixtures/inline_fragment.graphql");
-    let expected = include_str!("prettier_printer/fixtures/inline_fragment.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "inline_fragment.graphql",
-        "prettier_printer/fixtures/inline_fragment.expected",
-        input,
-        expected,
-    )
-    .await;
+async fn fragment_with_directive() {
+    let input = include_str!("prettier_printer/fixtures/fragment_with_directive.graphql");
+    let expected = include_str!("prettier_printer/fixtures/fragment_with_directive.expected");
+    test_fixture(transform_fixture, file!(), "fragment_with_directive.graphql", "prettier_printer/fixtures/fragment_with_directive.expected", input, expected).await;
 }
 
 #[tokio::test]
-async fn field_alias() {
-    let input = include_str!("prettier_printer/fixtures/field_alias.graphql");
-    let expected = include_str!("prettier_printer/fixtures/field_alias.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "field_alias.graphql",
-        "prettier_printer/fixtures/field_alias.expected",
-        input,
-        expected,
-    )
-    .await;
+async fn inline_fragment() {
+    let input = include_str!("prettier_printer/fixtures/inline_fragment.graphql");
+    let expected = include_str!("prettier_printer/fixtures/inline_fragment.expected");
+    test_fixture(transform_fixture, file!(), "inline_fragment.graphql", "prettier_printer/fixtures/inline_fragment.expected", input, expected).await;
 }
 
 #[tokio::test]
-async fn field_directives() {
-    let input = include_str!("prettier_printer/fixtures/field_directives.graphql");
-    let expected = include_str!("prettier_printer/fixtures/field_directives.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "field_directives.graphql",
-        "prettier_printer/fixtures/field_directives.expected",
-        input,
-        expected,
-    )
-    .await;
+async fn inline_fragment_directives() {
+    let input = include_str!("prettier_printer/fixtures/inline_fragment_directives.graphql");
+    let expected = include_str!("prettier_printer/fixtures/inline_fragment_directives.expected");
+    test_fixture(transform_fixture, file!(), "inline_fragment_directives.graphql", "prettier_printer/fixtures/inline_fragment_directives.expected", input, expected).await;
 }
 
 #[tokio::test]
-async fn argument_values() {
-    let input = include_str!("prettier_printer/fixtures/argument_values.graphql");
-    let expected = include_str!("prettier_printer/fixtures/argument_values.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "argument_values.graphql",
-        "prettier_printer/fixtures/argument_values.expected",
-        input,
-        expected,
-    )
-    .await;
+async fn mutation_with_variables() {
+    let input = include_str!("prettier_printer/fixtures/mutation_with_variables.graphql");
+    let expected = include_str!("prettier_printer/fixtures/mutation_with_variables.expected");
+    test_fixture(transform_fixture, file!(), "mutation_with_variables.graphql", "prettier_printer/fixtures/mutation_with_variables.expected", input, expected).await;
 }
 
 #[tokio::test]
 async fn nested_selections() {
     let input = include_str!("prettier_printer/fixtures/nested_selections.graphql");
     let expected = include_str!("prettier_printer/fixtures/nested_selections.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "nested_selections.graphql",
-        "prettier_printer/fixtures/nested_selections.expected",
-        input,
-        expected,
-    )
-    .await;
+    test_fixture(transform_fixture, file!(), "nested_selections.graphql", "prettier_printer/fixtures/nested_selections.expected", input, expected).await;
 }
 
 #[tokio::test]
-async fn inline_fragment_directives() {
-    let input = include_str!("prettier_printer/fixtures/inline_fragment_directives.graphql");
-    let expected = include_str!("prettier_printer/fixtures/inline_fragment_directives.expected");
-    test_fixture(
-        transform_fixture,
-        file!(),
-        "inline_fragment_directives.graphql",
-        "prettier_printer/fixtures/inline_fragment_directives.expected",
-        input,
-        expected,
-    )
-    .await;
+async fn query_anonymous() {
+    let input = include_str!("prettier_printer/fixtures/query_anonymous.graphql");
+    let expected = include_str!("prettier_printer/fixtures/query_anonymous.expected");
+    test_fixture(transform_fixture, file!(), "query_anonymous.graphql", "prettier_printer/fixtures/query_anonymous.expected", input, expected).await;
+}
+
+#[tokio::test]
+async fn query_simple() {
+    let input = include_str!("prettier_printer/fixtures/query_simple.graphql");
+    let expected = include_str!("prettier_printer/fixtures/query_simple.expected");
+    test_fixture(transform_fixture, file!(), "query_simple.graphql", "prettier_printer/fixtures/query_simple.expected", input, expected).await;
+}
+
+#[tokio::test]
+async fn query_with_variables() {
+    let input = include_str!("prettier_printer/fixtures/query_with_variables.graphql");
+    let expected = include_str!("prettier_printer/fixtures/query_with_variables.expected");
+    test_fixture(transform_fixture, file!(), "query_with_variables.graphql", "prettier_printer/fixtures/query_with_variables.expected", input, expected).await;
+}
+
+#[tokio::test]
+async fn subscription_basic() {
+    let input = include_str!("prettier_printer/fixtures/subscription_basic.graphql");
+    let expected = include_str!("prettier_printer/fixtures/subscription_basic.expected");
+    test_fixture(transform_fixture, file!(), "subscription_basic.graphql", "prettier_printer/fixtures/subscription_basic.expected", input, expected).await;
 }

compiler/crates/relay-codegen/src/build_ast.rs

@@ -59,6 +59,7 @@ use relay_transforms::INTERNAL_METADATA_DIRECTIVE;
 use relay_transforms::InlineDirectiveMetadata;
 use relay_transforms::ModuleMetadata;
 use relay_transforms::NoInlineFragmentSpreadMetadata;
+use relay_transforms::QUERY_ROOT_SELECTION_DIRECTIVE_NAME;
 use relay_transforms::RESOLVER_BELONGS_TO_BASE_SCHEMA_DIRECTIVE;
 use relay_transforms::RefetchableMetadata;
 use relay_transforms::RelayDirective;
@@ -2208,6 +2209,16 @@ impl<'schema, 'builder, 'config> CodegenBuilder<'schema, 'builder, 'config> {
                             }
                         }
                     }
+                } else if inline_frag
+                    .directives
+                    .iter()
+                    .any(|d| d.name.item == *QUERY_ROOT_SELECTION_DIRECTIVE_NAME)
+                {
+                    let selections = self.build_selections(context, inline_frag.selections.iter());
+                    Primitive::Key(self.object(object! {
+                        kind: Primitive::String(CODEGEN_CONSTANTS.query_root_selection),
+                        selections: selections,
+                    }))
                 } else if
                 // TODO(T63388023): Use typed custom directives
                 inline_frag.directives.len() == 1

compiler/crates/relay-codegen/src/constants.rs

@@ -98,6 +98,7 @@ pub struct CodegenConstants {
     pub provided_variables: StringKey,
     pub provider: StringKey,
     pub query: StringKey,
+    pub query_root_selection: StringKey,
     pub refetch: StringKey,
     pub relay_live_resolver: StringKey,
     pub relay_resolver_normalization_info: StringKey,
@@ -219,6 +220,7 @@ lazy_static! {
         provided_variables: "providedVariables".intern(),
         provider: "provider".intern(),
         query: "query".intern(),
+        query_root_selection: "QueryRootSelection".intern(),
         refetch: "refetch".intern(),
         relay_live_resolver: "RelayLiveResolver".intern(),
         relay_resolver_normalization_info: "normalizationInfo".intern(),

compiler/crates/relay-compiler/relay-compiler-config-schema.json

@@ -672,6 +672,11 @@
           "type": "boolean",
           "default": false
         },
+        "enable_query_root_selection": {
+          "description": "Enable the `__query` selection syntax for hoisting selections to the\nquery root. When enabled, any selection set can include `__query { ... }`\nto select fields from the query root type.",
+          "type": "boolean",
+          "default": false
+        },
         "enable_relay_resolver_mutations": {
           "description": "Allow relay resolvers to extend the Mutation type",
           "type": "boolean",
@@ -739,6 +744,13 @@
             "kind": "disabled"
           }
         },
+        "shard_extra_artifacts": {
+          "description": "Shard generated extra artifacts into subdirectories under\n`extraArtifactsOutput` that mirror the source file's relative path,\nhonoring `shardOutput` / `shardStripRegex`.",
+          "$ref": "#/$defs/FeatureFlag",
+          "default": {
+            "kind": "disabled"
+          }
+        },
         "skip_printing_nulls": {
           "$ref": "#/$defs/FeatureFlag",
           "default": {
@@ -958,6 +970,7 @@
             "enable_3d_branch_arg_generation": false,
             "enable_exec_time_resolvers_directive": false,
             "enable_fragment_argument_transform": false,
+            "enable_query_root_selection": false,
             "enable_relay_resolver_mutations": false,
             "enable_resolver_normalization_ast": false,
             "enable_shadow_resolvers": {
@@ -981,6 +994,9 @@
             "relay_resolver_enable_interface_output_type": {
               "kind": "disabled"
             },
+            "shard_extra_artifacts": {
+              "kind": "disabled"
+            },
             "skip_printing_nulls": {
               "kind": "disabled"
             },

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

@@ -123,6 +123,7 @@ pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String>
         prefer_fetchable_in_refetch_queries: fixture
             .content
             .contains("# prefer_fetchable_in_refetch_queries"),
+        enable_query_root_selection: fixture.content.contains("# enable_query_root_selection"),
         ..Default::default()
     };