Add correct root fragment information

Summary: I noticed when comparing the IR output in our tests, that the root fragment information for the Flow based schema generation was incorrect compared to the docblock based schema gen. This diff updates them so they are using the same information. This is important for the location of error messages. Reviewed By: captbaritone Differential Revision: D58709712 fbshipit-source-id: 457a1ced4f101660b2a0fa7cef3aa3c56fac4d48
facebook · Jun 18, 2024 · bb6f7b3 · bb6f7b3
1 parent 230f8c5
commit bb6f7b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/compiler/crates/relay-schema-generation/src/lib.rs b/compiler/crates/relay-schema-generation/src/lib.rs
@@ -452,13 +452,18 @@ impl RelayResolverExtractor {
             fragment_definition.type_condition.span,
             fragment_definition.type_condition.type_.value,
         );
+        let root_fragment = Some(WithLocation::from_span(
+            fragment_definition.location.source_location(),
+            fragment_definition.name.span,
+            FragmentDefinitionName(fragment_definition.name.value),
+        ));
         let live = field
             .is_live
             .map(|loc| UnpopulatedIrField { key_location: loc });
         self.resolved_field_definitions.push(TerseRelayResolverIr {
             field: field_definition,
             type_: fragment_type_condition,
-            root_fragment: Some(field.entity_name.map(FragmentDefinitionName)), // this includes the $key
+            root_fragment,
             location: field.field_name.location,
             deprecated: None,
             live,

diff --git a/compiler/crates/relay-schema-generation/tests/docblock/fixtures/root-fragment.expected b/compiler/crates/relay-schema-generation/tests/docblock/fixtures/root-fragment.expected
@@ -80,9 +80,9 @@ Field(
             },
             root_fragment: Some(
                 WithLocation {
-                    location: module.js:544:567,
+                    location: module.js:14:33,
                     item: FragmentDefinitionName(
-                        "CatIsHungryFragment$key",
+                        "CatIsHungryFragment",
                     ),
                 },
             ),
@@ -98,7 +98,7 @@ Field(
     ),
 )
 extend type Cat {
-  full_name: String! @relay_resolver(has_output_type: true, import_name: "full_name", import_path: "module.js", fragment_name: "CatIsHungryFragment$key") @resolver_source_hash(value: "97c71c89ad8ccb1e0ff10de8887a25e0")
+  full_name: String! @relay_resolver(fragment_name: "CatIsHungryFragment", has_output_type: true, import_name: "full_name", import_path: "module.js") @resolver_source_hash(value: "97c71c89ad8ccb1e0ff10de8887a25e0")
 }