Support @argumentDefinitions in @inline fragments

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

@@ -1418,10 +1418,16 @@ impl<'schema, 'builder, 'config> CodegenBuilder<'schema, 'builder, 'config> {
         inline_directive_data: &InlineDirectiveMetadata,
     ) -> Primitive {
         let selections = self.build_selections(context, inline_fragment.selections.iter());
+        let args = self.build_arguments(&inline_directive_data.arguments);
+
         Primitive::Key(self.object(object! {
             kind: Primitive::String(CODEGEN_CONSTANTS.inline_data_fragment_spread),
             name: Primitive::String(inline_directive_data.fragment_name),
             selections: selections,
+            args: match args {
+                None => Primitive::SkippableNull,
+                Some(key) => Primitive::Key(key),
+            },
         }))
     }
 

compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/inline-data-fragment-global-vars.expected

@@ -53,7 +53,8 @@ fragment inlineDataFragmentGlobalVarsProfile on User @inline {
               ],
               "storageKey": null
             }
-          ]
+          ],
+          "args": null
         }
       ],
       "storageKey": null

compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/inline-data-fragment-local-args.expected

@@ -1,5 +1,4 @@
 ==================================== INPUT ====================================
-# expected-to-throw
 fragment inlineDataFragmentLocalArgsFragment on Query {
   usingLiteralPassedValue: me {
     ...inlineDataFragmentLocalArgsProfile @arguments(sizeArg: [100])
@@ -19,53 +18,164 @@ fragment inlineDataFragmentLocalArgsProfile on User
     uri
   }
 }
-==================================== ERROR ====================================
-✖︎ Variables from @argumentDefinitions are not yet supported inside @inline fragments.
-
-  inline-data-fragment-local-args.graphql:14:10
-   13 │ 
-   14 │ fragment inlineDataFragmentLocalArgsProfile on User
-      │          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   15 │   @inline
-
-  ℹ︎ Variable used:
-
-  inline-data-fragment-local-args.graphql:16:24
-   15 │   @inline
-   16 │   @argumentDefinitions(sizeArg: {type: "[Int]", defaultValue: [50]}) {
-      │                        ^^^^^^^
-   17 │   profilePicture(size: $sizeArg) {
-
-
-✖︎ Variables from @argumentDefinitions are not yet supported inside @inline fragments.
-
-  inline-data-fragment-local-args.graphql:14:10
-   13 │ 
-   14 │ fragment inlineDataFragmentLocalArgsProfile on User
-      │          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   15 │   @inline
-
-  ℹ︎ Variable used:
-
-  inline-data-fragment-local-args.graphql:16:24
-   15 │   @inline
-   16 │   @argumentDefinitions(sizeArg: {type: "[Int]", defaultValue: [50]}) {
-      │                        ^^^^^^^
-   17 │   profilePicture(size: $sizeArg) {
-
-
-✖︎ Variables from @argumentDefinitions are not yet supported inside @inline fragments.
-
-  inline-data-fragment-local-args.graphql:14:10
-   13 │ 
-   14 │ fragment inlineDataFragmentLocalArgsProfile on User
-      │          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   15 │   @inline
-
-  ℹ︎ Variable used:
+==================================== OUTPUT ===================================
+{
+  "argumentDefinitions": [
+    {
+      "kind": "RootArgument",
+      "name": "globalSizeVar"
+    }
+  ],
+  "kind": "Fragment",
+  "metadata": null,
+  "name": "inlineDataFragmentLocalArgsFragment",
+  "selections": [
+    {
+      "alias": "usingLiteralPassedValue",
+      "args": null,
+      "concreteType": "User",
+      "kind": "LinkedField",
+      "name": "me",
+      "plural": false,
+      "selections": [
+        {
+          "kind": "InlineDataFragmentSpread",
+          "name": "inlineDataFragmentLocalArgsProfile",
+          "selections": [
+            {
+              "alias": null,
+              "args": [
+                {
+                  "kind": "Variable",
+                  "name": "size",
+                  "variableName": "sizeArg"
+                }
+              ],
+              "concreteType": "Image",
+              "kind": "LinkedField",
+              "name": "profilePicture",
+              "plural": false,
+              "selections": [
+                {
+                  "alias": null,
+                  "args": null,
+                  "kind": "ScalarField",
+                  "name": "uri",
+                  "storageKey": null
+                }
+              ],
+              "storageKey": null
+            }
+          ],
+          "args": [
+            {
+              "kind": "Literal",
+              "name": "sizeArg",
+              "value": [
+                100
+              ]
+            }
+          ]
+        }
+      ],
+      "storageKey": null
+    },
+    {
+      "alias": "usingGlobalPassedValue",
+      "args": null,
+      "concreteType": "User",
+      "kind": "LinkedField",
+      "name": "me",
+      "plural": false,
+      "selections": [
+        {
+          "kind": "InlineDataFragmentSpread",
+          "name": "inlineDataFragmentLocalArgsProfile",
+          "selections": [
+            {
+              "alias": null,
+              "args": [
+                {
+                  "kind": "Variable",
+                  "name": "size",
+                  "variableName": "sizeArg"
+                }
+              ],
+              "concreteType": "Image",
+              "kind": "LinkedField",
+              "name": "profilePicture",
+              "plural": false,
+              "selections": [
+                {
+                  "alias": null,
+                  "args": null,
+                  "kind": "ScalarField",
+                  "name": "uri",
+                  "storageKey": null
+                }
+              ],
+              "storageKey": null
+            }
+          ],
+          "args": [
+            {
+              "kind": "Variable",
+              "name": "sizeArg",
+              "variableName": "globalSizeVar"
+            }
+          ]
+        }
+      ],
+      "storageKey": null
+    },
+    {
+      "alias": "usingDefaultValue",
+      "args": null,
+      "concreteType": "User",
+      "kind": "LinkedField",
+      "name": "me",
+      "plural": false,
+      "selections": [
+        {
+          "kind": "InlineDataFragmentSpread",
+          "name": "inlineDataFragmentLocalArgsProfile",
+          "selections": [
+            {
+              "alias": null,
+              "args": [
+                {
+                  "kind": "Variable",
+                  "name": "size",
+                  "variableName": "sizeArg"
+                }
+              ],
+              "concreteType": "Image",
+              "kind": "LinkedField",
+              "name": "profilePicture",
+              "plural": false,
+              "selections": [
+                {
+                  "alias": null,
+                  "args": null,
+                  "kind": "ScalarField",
+                  "name": "uri",
+                  "storageKey": null
+                }
+              ],
+              "storageKey": null
+            }
+          ],
+          "args": null
+        }
+      ],
+      "storageKey": null
+    }
+  ],
+  "type": "Query",
+  "abstractKey": null
+}
 
-  inline-data-fragment-local-args.graphql:16:24
-   15 │   @inline
-   16 │   @argumentDefinitions(sizeArg: {type: "[Int]", defaultValue: [50]}) {
-      │                        ^^^^^^^
-   17 │   profilePicture(size: $sizeArg) {
+{
+  "kind": "InlineDataFragment",
+  "name": "inlineDataFragmentLocalArgsProfile"
+}

compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/inline-data-fragment-local-args.graphql

@@ -1,4 +1,3 @@
-# expected-to-throw
 fragment inlineDataFragmentLocalArgsFragment on Query {
   usingLiteralPassedValue: me {
     ...inlineDataFragmentLocalArgsProfile @arguments(sizeArg: [100])

compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/inline-data-fragment.expected

@@ -263,7 +263,8 @@ fragment inlineDataFragment_Profile on User {
               ],
               "storageKey": "profilePicture(size:100)"
             }
-          ]
+          ],
+          "args": null
         },
         {
           "alias": null,
@@ -355,7 +356,8 @@ fragment inlineDataFragment_Profile on User {
               "type": "User",
               "abstractKey": null
             }
-          ]
+          ],
+          "args": null
         }
       ],
       "storageKey": "username(name:\"test\")"

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

@@ -7,8 +7,8 @@
 
 use common::{Diagnostic, DiagnosticsResult, Location, NamedItem, WithLocation};
 use graphql_ir::{
-    associated_data_impl, FragmentSpread, InlineFragment, Program, Selection, Transformed,
-    Transformer,
+    associated_data_impl, Argument, FragmentSpread, InlineFragment, Program, Selection,
+    Transformed, Transformer,
 };
 
 use intern::string_key::{Intern, StringKey};
@@ -50,6 +50,7 @@ impl<'s> InlineDataFragmentsTransform<'s> {
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct InlineDirectiveMetadata {
     pub fragment_name: StringKey,
+    pub arguments: Vec<Argument>,
 }
 associated_data_impl!(InlineDirectiveMetadata);
 
@@ -68,20 +69,6 @@ impl<'s> Transformer for InlineDataFragmentsTransform<'s> {
         if fragment.directives.named(*INLINE_DIRECTIVE_NAME).is_none() {
             next_fragment_spread
         } else {
-            if !fragment.variable_definitions.is_empty() {
-                let mut error = Diagnostic::error(
-                    ValidationMessage::InlineDataFragmentArgumentsNotSupported,
-                    fragment.name.location,
-                );
-                for var in fragment
-                    .variable_definitions
-                    .iter()
-                    .chain(fragment.used_global_variables.iter())
-                {
-                    error = error.annotate("Variable used:", var.name.location);
-                }
-                self.errors.push(error);
-            }
             match &next_fragment_spread {
                 Transformed::Keep => {
                     if !spread.directives.is_empty() {
@@ -144,12 +131,11 @@ impl<'s> Transformer for InlineDataFragmentsTransform<'s> {
 
             let inline_fragment = InlineFragment {
                 type_condition: None,
-                directives: vec![
-                    InlineDirectiveMetadata {
-                        fragment_name: name,
-                    }
-                    .into(),
-                ],
+                directives: vec![InlineDirectiveMetadata {
+                    fragment_name: name,
+                    arguments: spread.arguments.clone(),
+                }
+                .into()],
                 selections: vec![Selection::InlineFragment(Arc::new(InlineFragment {
                     type_condition: Some(fragment.type_condition),
                     directives: vec![],
@@ -169,9 +155,6 @@ enum ValidationMessage {
     #[error("Found a circular reference from fragment '{fragment_name}'.")]
     CircularFragmentReference { fragment_name: StringKey },
 
-    #[error("Variables from @argumentDefinitions are not yet supported inside @inline fragments.")]
-    InlineDataFragmentArgumentsNotSupported,
-
     #[error("Directives on fragment spreads for @inline fragments are not yet supported")]
     InlineDataFragmentDirectivesNotSupported,
 }

compiler/crates/relay-transforms/tests/inline_data_fragment/fixtures/recursive.expected

@@ -29,6 +29,7 @@ fragment InlineDataFragment on Image @inline {
   ... @__InlineDirectiveMetadata
   # InlineDirectiveMetadata {
   #     fragment_name: "AnotherInlineDataFragment",
+  #     arguments: [],
   # }
    {
     ... on Image {
@@ -43,13 +44,15 @@ fragment UserProfile on User {
     ... @__InlineDirectiveMetadata
     # InlineDirectiveMetadata {
     #     fragment_name: "InlineDataFragment",
+    #     arguments: [],
     # }
      {
       ... on Image {
         uri
         ... @__InlineDirectiveMetadata
         # InlineDirectiveMetadata {
         #     fragment_name: "AnotherInlineDataFragment",
+        #     arguments: [],
         # }
          {
           ... on Image {
@@ -62,6 +65,7 @@ fragment UserProfile on User {
     ... @include(if: $cond) @__InlineDirectiveMetadata
     # InlineDirectiveMetadata {
     #     fragment_name: "AnotherInlineDataFragment",
+    #     arguments: [],
     # }
      {
       ... on Image {
@@ -74,13 +78,15 @@ fragment UserProfile on User {
     ... @__InlineDirectiveMetadata
     # InlineDirectiveMetadata {
     #     fragment_name: "InlineDataFragment",
+    #     arguments: [],
     # }
      {
       ... on Image {
         uri
         ... @__InlineDirectiveMetadata
         # InlineDirectiveMetadata {
         #     fragment_name: "AnotherInlineDataFragment",
+        #     arguments: [],
         # }
          {
           ... on Image {