Fix buildVariableDefinitions to use proper root type

timkendall · Dec 11, 2021 · 30c3114 · 30c3114
1 parent edfd44b
commit 30c3114
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/Selection.ts b/src/Selection.ts
@@ -80,6 +80,7 @@ export class Selection<
     const selectionSet = this.toSelectionSet();
     const variableDefinitions = buildVariableDefinitions(
       this.schema,
+      op,
       selectionSet
     );
 

diff --git a/src/Variables.ts b/src/Variables.ts
@@ -1,4 +1,4 @@
-import type { GraphQLSchema } from "graphql";
+import type { GraphQLSchema, OperationTypeNode } from "graphql";
 import { Kind, visitWithTypeInfo, TypeInfo, visit } from "graphql";
 import type { O, U } from "ts-toolbelt";
 
@@ -21,14 +21,15 @@ export const $ = <Name extends string>(name: Name): Variable<Name> =>
 
 export const buildVariableDefinitions = <T extends SelectionSet<any>>(
   schema: GraphQLSchema,
+  root: OperationTypeNode,
   selectionSet: T
 ): Array<VariableDefinition<any, any>> => {
   const variableDefinitions: VariableDefinition<any, any>[] = [];
   const typeInfo = new TypeInfo(schema);
 
-  // @note need to wrap selectionset in operation for TypeInfo to track correctly
+  // @note need to wrap selectionset in an operation (root) for TypeInfo to track correctly
   const operationDefinition = operation(
-    "query",
+    root,
     "",
     selectionSet,
     variableDefinitions

diff --git a/src/__tests__/Selected.test.ts → src/__tests__/Selection.test.ts b/src/__tests__/Selected.test.ts → src/__tests__/Selection.test.ts
diff --git a/src/__tests__/Variables.test.ts b/src/__tests__/Variables.test.ts
@@ -30,6 +30,7 @@ describe("Variables", () => {
     // @note we need a way to get the input type at runtime
     const variableDefinitions = buildVariableDefinitions(
       schema,
+      "query",
       selectionSet(selection)
     );
 
@@ -69,6 +70,7 @@ describe("Variables", () => {
 
     const variableDefinitions = buildVariableDefinitions(
       schema,
+      "query",
       selectionSet(selection)
     );