Add location to Directive

Reviewed By: captbaritone Differential Revision: D64071264 fbshipit-source-id: fdee1729ac0ef630689a88176ab3a2c96ab6a622
facebook · Oct 23, 2024 · b0c92e8 · b0c92e8
1 parent 64806f2
commit b0c92e8
Show file tree

Hide file tree

Showing 37 changed files with 59 additions and 0 deletions.
diff --git a/compiler/crates/graphql-ir/src/associated_data.rs b/compiler/crates/graphql-ir/src/associated_data.rs
@@ -83,6 +83,8 @@ macro_rules! associated_data_impl {
                     name: $crate::reexport::WithLocation::generated($name::directive_name()),
                     arguments: Vec::new(),
                     data: Some(Box::new(item)),
+                    location: $crate::reexport::WithLocation::generated($name::directive_name())
+                        .location,
                 }
             }
         }

diff --git a/compiler/crates/graphql-ir/src/build.rs b/compiler/crates/graphql-ir/src/build.rs
@@ -1381,6 +1381,7 @@ impl<'schema, 'signatures, 'options> Builder<'schema, 'signatures, 'options> {
                     .map(DirectiveName),
                 arguments: vec![],
                 data: None,
+                location: self.location.with_span(directive.span),
             });
         }
         let directive_definition = match self
@@ -1420,6 +1421,7 @@ impl<'schema, 'signatures, 'options> Builder<'schema, 'signatures, 'options> {
             ),
             arguments,
             data: None,
+            location: self.location.with_span(directive.span),
         })
     }
 

diff --git a/compiler/crates/graphql-ir/src/ir.rs b/compiler/crates/graphql-ir/src/ir.rs
@@ -568,6 +568,7 @@ pub struct Directive {
     /// to attach arbitrary data on compiler-internal directives, such as to
     /// pass instructions to code generation.
     pub data: Option<Box<dyn AssociatedData>>,
+    pub location: Location,
 }
 impl Named for Directive {
     type Name = DirectiveName;

diff --git a/compiler/crates/graphql-ir/src/signatures.rs b/compiler/crates/graphql-ir/src/signatures.rs
@@ -300,6 +300,7 @@ fn build_fragment_variable_definitions(
                             ),
                             arguments: Vec::new(),
                             data: None,
+                            location: fragment.location.with_span(unused_local_variable_arg.span)
                         });
                     }
 
@@ -334,6 +335,7 @@ fn build_fragment_variable_definitions(
                                 original_variable_name: VariableName(variable_name.value),
                                 fragment_source_location: fragment.location.source_location(),
                             })),
+                            location: fragment.location.with_span(provider_arg.span),
                         });
                     }
 

diff --git a/compiler/crates/graphql-ir/tests/parse/fixtures/argument_definitions.expected b/compiler/crates/graphql-ir/tests/parse/fixtures/argument_definitions.expected
@@ -38,6 +38,7 @@ fragment TestFragment on User
                             },
                             arguments: [],
                             data: None,
+                            location: <generated>:89:102,
                         },
                     ],
                 },
@@ -80,6 +81,7 @@ fragment TestFragment on User
                     },
                     arguments: [],
                     data: None,
+                    location: argument_definitions.graphql:32:156,
                 },
             ],
             selections: [

diff --git a/compiler/crates/graphql-ir/tests/parse/fixtures/directive-generic.expected b/compiler/crates/graphql-ir/tests/parse/fixtures/directive-generic.expected
@@ -51,6 +51,7 @@ fragment TestFragment on User {
                                 },
                             ],
                             data: None,
+                            location: directive-generic.graphql:37:64,
                         },
                     ],
                 },

diff --git a/compiler/crates/graphql-ir/tests/parse/fixtures/fixme_fat_interface_on_union.expected b/compiler/crates/graphql-ir/tests/parse/fixtures/fixme_fat_interface_on_union.expected
@@ -46,6 +46,7 @@ query Test {
                                     },
                                     arguments: [],
                                     data: None,
+                                    location: fixme_fat_interface_on_union.graphql:54:74,
                                 },
                             ],
                         },

diff --git a/compiler/crates/graphql-ir/tests/parse/fixtures/fragment-with-arguments.expected b/compiler/crates/graphql-ir/tests/parse/fixtures/fragment-with-arguments.expected
@@ -97,6 +97,7 @@ fragment Foo on User @argumentDefinitions(localId: {type: "ID!"}) {
                     },
                     arguments: [],
                     data: None,
+                    location: fragment-with-arguments.graphql:32:126,
                 },
             ],
             selections: [
@@ -276,6 +277,7 @@ fragment Foo on User @argumentDefinitions(localId: {type: "ID!"}) {
                     },
                     arguments: [],
                     data: None,
+                    location: fragment-with-arguments.graphql:298:342,
                 },
             ],
             selections: [

diff --git a/compiler/crates/graphql-ir/tests/parse/fixtures/fragment-with-literal-arguments.expected b/compiler/crates/graphql-ir/tests/parse/fixtures/fragment-with-literal-arguments.expected
@@ -95,6 +95,7 @@ fragment ChildFragment on User
                     },
                     arguments: [],
                     data: None,
+                    location: fragment-with-literal-arguments.graphql:119:169,
                 },
             ],
             selections: [

diff --git a/...phql-ir/tests/parse/fixtures/fragment-with-literal-enum-arguments-into-enum-list.expected b/...phql-ir/tests/parse/fixtures/fragment-with-literal-enum-arguments-into-enum-list.expected
@@ -144,6 +144,7 @@ fragment ChildFragment on User
                     },
                     arguments: [],
                     data: None,
+                    location: fragment-with-literal-enum-arguments-into-enum-list.graphql:187:248,
                 },
             ],
             selections: [

diff --git a/...iler/crates/graphql-ir/tests/parse/fixtures/fragment-with-literal-enum-arguments.expected b/...iler/crates/graphql-ir/tests/parse/fixtures/fragment-with-literal-enum-arguments.expected
@@ -136,6 +136,7 @@ fragment ChildFragment on Query
                     },
                     arguments: [],
                     data: None,
+                    location: fragment-with-literal-enum-arguments.graphql:188:245,
                 },
             ],
             selections: [

diff --git a/...crates/graphql-ir/tests/parse/fixtures/fragment-with-literal-enum-list-arguments.expected b/...crates/graphql-ir/tests/parse/fixtures/fragment-with-literal-enum-list-arguments.expected
@@ -148,6 +148,7 @@ fragment ChildFragment on User
                     },
                     arguments: [],
                     data: None,
+                    location: fragment-with-literal-enum-list-arguments.graphql:189:250,
                 },
             ],
             selections: [

diff --git a/...er/crates/graphql-ir/tests/parse/fixtures/fragment-with-literal-object-arguments.expected b/...er/crates/graphql-ir/tests/parse/fixtures/fragment-with-literal-object-arguments.expected
@@ -166,6 +166,7 @@ fragment ChildFragment on Query
                     },
                     arguments: [],
                     data: None,
+                    location: fragment-with-literal-object-arguments.graphql:205:263,
                 },
             ],
             selections: [

diff --git a/...ates/graphql-ir/tests/parse/fixtures/fragment-with-literal-object-list-arguments.expected b/...ates/graphql-ir/tests/parse/fixtures/fragment-with-literal-object-list-arguments.expected
@@ -174,6 +174,7 @@ fragment ChildFragment on Query
                     },
                     arguments: [],
                     data: None,
+                    location: fragment-with-literal-object-list-arguments.graphql:208:270,
                 },
             ],
             selections: [

diff --git a/...crates/graphql-ir/tests/parse/fixtures/fragment-with-variable-definitions-syntax.expected b/...crates/graphql-ir/tests/parse/fixtures/fragment-with-variable-definitions-syntax.expected
@@ -97,6 +97,7 @@ fragment Foo($localId: ID!) on User {
                     },
                     arguments: [],
                     data: None,
+                    location: fragment-with-variable-definitions-syntax.graphql:32:126,
                 },
             ],
             selections: [

diff --git a/compiler/crates/graphql-ir/tests/parse/fixtures/fragment_with_arguments_defaulting.expected b/compiler/crates/graphql-ir/tests/parse/fixtures/fragment_with_arguments_defaulting.expected
@@ -57,6 +57,7 @@ fragment F2 on Query @argumentDefinitions(
                     },
                     arguments: [],
                     data: None,
+                    location: fragment_with_arguments_defaulting.graphql:31:177,
                 },
             ],
             selections: [
@@ -137,6 +138,7 @@ fragment F2 on Query @argumentDefinitions(
                     },
                     arguments: [],
                     data: None,
+                    location: fragment_with_arguments_defaulting.graphql:248:298,
                 },
             ],
             selections: [

diff --git a/compiler/crates/graphql-ir/tests/parse/fixtures/linked-handle-field-with-filters.expected b/compiler/crates/graphql-ir/tests/parse/fixtures/linked-handle-field-with-filters.expected
@@ -136,6 +136,7 @@ fragment LinkedHandleField on User {
                                 },
                             ],
                             data: None,
+                            location: linked-handle-field-with-filters.graphql:81:151,
                         },
                     ],
                     selections: [

diff --git a/compiler/crates/graphql-ir/tests/parse/fixtures/linked-handle-field-with-key.expected b/compiler/crates/graphql-ir/tests/parse/fixtures/linked-handle-field-with-key.expected
@@ -87,6 +87,7 @@ fragment LinkedHandleField on User {
                                 },
                             ],
                             data: None,
+                            location: linked-handle-field-with-key.graphql:62:135,
                         },
                     ],
                     selections: [

diff --git a/compiler/crates/graphql-ir/tests/parse/fixtures/linked-handle-field.expected b/compiler/crates/graphql-ir/tests/parse/fixtures/linked-handle-field.expected
@@ -72,6 +72,7 @@ fragment LinkedHandleField on User {
                                 },
                             ],
                             data: None,
+                            location: linked-handle-field.graphql:62:101,
                         },
                         Directive {
                             name: WithLocation {
@@ -99,6 +100,7 @@ fragment LinkedHandleField on User {
                                 },
                             ],
                             data: None,
+                            location: linked-handle-field.graphql:106:144,
                         },
                     ],
                     selections: [

diff --git a/compiler/crates/graphql-ir/tests/parse/fixtures/linked-handle-filter.expected b/compiler/crates/graphql-ir/tests/parse/fixtures/linked-handle-filter.expected
@@ -92,6 +92,7 @@ fragment LinkedHandleField on User {
                                 },
                             ],
                             data: None,
+                            location: linked-handle-filter.graphql:62:121,
                         },
                         Directive {
                             name: WithLocation {
@@ -119,6 +120,7 @@ fragment LinkedHandleField on User {
                                 },
                             ],
                             data: None,
+                            location: linked-handle-filter.graphql:126:164,
                         },
                     ],
                     selections: [

diff --git a/compiler/crates/graphql-ir/tests/parse/fixtures/scalar-handle-field.expected b/compiler/crates/graphql-ir/tests/parse/fixtures/scalar-handle-field.expected
@@ -53,6 +53,7 @@ fragment ScalarHandleField on User {
                                 },
                             ],
                             data: None,
+                            location: scalar-handle-field.graphql:48:84,
                         },
                         Directive {
                             name: WithLocation {
@@ -80,6 +81,7 @@ fragment ScalarHandleField on User {
                                 },
                             ],
                             data: None,
+                            location: scalar-handle-field.graphql:89:126,
                         },
                     ],
                 },

diff --git a/...hql-ir/tests/parse_with_extensions/fixtures/custom_scalar_directive_arg_variable.expected b/...hql-ir/tests/parse_with_extensions/fixtures/custom_scalar_directive_arg_variable.expected
@@ -97,6 +97,7 @@ extend type Query {
                                 },
                             ],
                             data: None,
+                            location: custom_scalar_directive_arg_variable.graphql:116:149,
                         },
                     ],
                     selections: [
@@ -155,6 +156,7 @@ extend type Query {
                                 },
                             ],
                             data: None,
+                            location: custom_scalar_directive_arg_variable.graphql:204:237,
                         },
                     ],
                 },

diff --git a/...rates/graphql-ir/tests/parse_with_provider/fixtures/fragment_with_valid_provider.expected b/...rates/graphql-ir/tests/parse_with_provider/fixtures/fragment_with_valid_provider.expected
@@ -92,6 +92,7 @@ fragment TestFragment on User
                                     },
                                 },
                             ),
+                            location: fragment_with_valid_provider.graphql:173:199,
                         },
                     ],
                 },
@@ -124,6 +125,7 @@ fragment TestFragment on User
                     },
                     arguments: [],
                     data: None,
+                    location: fragment_with_valid_provider.graphql:32:205,
                 },
             ],
             selections: [

diff --git a/.../graphql-ir/tests/parse_with_provider/fixtures/use_fragment_spread_with_provider.expected b/.../graphql-ir/tests/parse_with_provider/fixtures/use_fragment_spread_with_provider.expected
@@ -138,6 +138,7 @@ fragment ChildFragment2 on User
                                     },
                                 },
                             ),
+                            location: use_fragment_spread_with_provider.graphql:247:275,
                         },
                     ],
                 },
@@ -154,6 +155,7 @@ fragment ChildFragment2 on User
                     },
                     arguments: [],
                     data: None,
+                    location: use_fragment_spread_with_provider.graphql:141:280,
                 },
             ],
             selections: [
@@ -270,6 +272,7 @@ fragment ChildFragment2 on User
                                     },
                                 },
                             ),
+                            location: use_fragment_spread_with_provider.graphql:487:515,
                         },
                     ],
                 },
@@ -286,6 +289,7 @@ fragment ChildFragment2 on User
                     },
                     arguments: [],
                     data: None,
+                    location: use_fragment_spread_with_provider.graphql:414:520,
                 },
             ],
             selections: [

diff --git a/compiler/crates/relay-codegen/tests/request_metadata.rs b/compiler/crates/relay-codegen/tests/request_metadata.rs
@@ -60,6 +60,7 @@ pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String>
                                     ),
                                 }],
                                 data: None,
+                                location: operation.name.location,
                             }],
                             ..operation.clone()
                         };

diff --git a/...es/relay-transforms/src/assignable_fragment_spread/annotate_updatable_fragment_spreads.rs b/...es/relay-transforms/src/assignable_fragment_spread/annotate_updatable_fragment_spreads.rs
@@ -8,6 +8,7 @@
 use std::sync::Arc;
 
 use common::DirectiveName;
+use common::Location;
 use common::NamedItem;
 use common::WithLocation;
 use graphql_ir::Directive;
@@ -60,6 +61,7 @@ impl<'s> Transformer for AnnotateUpdatableFragmentSpreads<'s> {
                 name: WithLocation::generated(*UPDATABLE_DIRECTIVE_FOR_TYPEGEN),
                 arguments: vec![],
                 data: None,
+                location: Location::generated(),
             });
             Transformed::Replace(Selection::FragmentSpread(Arc::new(fragment_spread)))
         } else {

diff --git a/.../assignable_fragment_spread/transform_assignable_fragment_spreads_in_updatable_queries.rs b/.../assignable_fragment_spread/transform_assignable_fragment_spreads_in_updatable_queries.rs
@@ -8,6 +8,7 @@
 use std::sync::Arc;
 
 use common::DirectiveName;
+use common::Location;
 use common::NamedItem;
 use common::WithLocation;
 use graphql_ir::associated_data_impl;
@@ -122,6 +123,7 @@ fn get_directive(type_condition: Type, schema: &SDLSchema) -> Directive {
         name: WithLocation::generated(*ASSIGNABLE_DIRECTIVE_FOR_TYPEGEN),
         arguments: vec![],
         data: Some(Box::new(get_associated_data(type_condition, schema))),
+        location: Location::generated(),
     }
 }
 

diff --git a/compiler/crates/relay-transforms/src/client_edges.rs b/compiler/crates/relay-transforms/src/client_edges.rs
@@ -699,6 +699,7 @@ fn make_refetchable_directive(query_name: OperationDefinitionName) -> Directive
             value: WithLocation::generated(Value::Constant(ConstantValue::String(query_name.0))),
         }],
         data: None,
+        location: Location::generated(),
     }
 }
 

diff --git a/compiler/crates/relay-transforms/src/client_extensions.rs b/compiler/crates/relay-transforms/src/client_extensions.rs
@@ -216,5 +216,6 @@ fn build_client_extension_directive() -> Directive {
         name: WithLocation::generated(*CLIENT_EXTENSION_DIRECTIVE_NAME),
         arguments: Default::default(),
         data: None,
+        location: Location::generated(),
     }
 }
diff --git a/compiler/crates/relay-transforms/src/defer_stream.rs b/compiler/crates/relay-transforms/src/defer_stream.rs
@@ -155,6 +155,7 @@ impl DeferStreamTransform<'_> {
             name: defer.name,
             arguments: next_arguments,
             data: None,
+            location: defer.location,
         };
 
         Ok(Transformed::Replace(Selection::InlineFragment(Arc::new(
@@ -264,6 +265,7 @@ impl DeferStreamTransform<'_> {
             name: stream.name,
             arguments: next_arguments,
             data: None,
+            location: stream.location,
         };
 
         Ok(get_next_selection(replace_directive(

diff --git a/compiler/crates/relay-transforms/src/generate_typename.rs b/compiler/crates/relay-transforms/src/generate_typename.rs
@@ -243,6 +243,7 @@ fn generate_abstract_key_field(
                 name: WithLocation::new(location, *TYPE_DISCRIMINATOR_DIRECTIVE_NAME),
                 arguments: vec![],
                 data: None,
+                location,
             }]
         } else {
             vec![]

diff --git a/compiler/crates/relay-transforms/src/handle_fields/handle_field_util.rs b/compiler/crates/relay-transforms/src/handle_fields/handle_field_util.rs
@@ -7,6 +7,7 @@
 
 use common::ArgumentName;
 use common::DirectiveName;
+use common::Location;
 use common::WithLocation;
 use graphql_ir::Argument;
 use graphql_ir::ConstantValue;
@@ -140,6 +141,7 @@ pub fn build_handle_field_directive(values: HandleFieldDirectiveValues) -> Direc
         name: WithLocation::generated(*HANDLE_FIELD_DIRECTIVE_NAME),
         arguments: directive_arguments,
         data: None,
+        location: Location::generated(),
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,7 @@ fragment TestFragment on User { @@
                                     },
                                 ],
                                 data: None,
+                                location: directive-generic.graphql:37:64,
                             },
                         ],
                     },
@@ Expand Down @@