Correct parent type used for top-level fields

apollographql · Oct 22, 2024 · 877eb2c · 877eb2c
1 parent 536d9f6
commit 877eb2c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/apollo-router/src/spec/query.rs b/apollo-router/src/spec/query.rs
@@ -938,6 +938,11 @@ impl Query {
                         continue;
                     }
 
+                    let root_type = apollo_compiler::ast::Type::Named(
+                        // Unchecked name instantiation is always safe, and we know the name is
+                        // valid here
+                        apollo_compiler::Name::new_unchecked(root_type_name),
+                    );
                     let field_name = alias.as_ref().unwrap_or(name);
                     let field_name_str = field_name.as_str();
                     if let Some(input_value) = input.get_mut(field_name_str) {
@@ -961,7 +966,7 @@ impl Query {
                             input_value,
                             output_value,
                             path,
-                            &field_type.0,
+                            &root_type,
                             FieldOrIndex::Field(field_name_str),
                             selection_set,
                         );

diff --git a/apollo-router/src/spec/query/tests.rs b/apollo-router/src/spec/query/tests.rs
@@ -1377,7 +1377,7 @@ fn reformat_response_expected_int() {
             },
             {
                 "message": "Invalid value found for field Query.g",
-                "path": ["f"],
+                "path": ["g"],
                 "extensions": { "code": "RESPONSE_VALIDATION_FAILED" }
             },
         ]))
@@ -1620,11 +1620,6 @@ fn reformat_response_expected_id() {
                 "path": ["e"],
                 "extensions": { "code": "RESPONSE_VALIDATION_FAILED" }
             },
-            {
-                "message": "Invalid value found for field Query.f",
-                "path": ["f"],
-                "extensions": { "code": "RESPONSE_VALIDATION_FAILED" }
-            },
             {
                 "message": "Invalid value found for field Query.g",
                 "path": ["g"],