Collect custom scalars from arguments and input object fields

Closes #6239 Closes #4574
graphql-hive · Jan 17, 2025 · 93dfbb2 · 93dfbb2
1 parent ba20748
commit 93dfbb2
Show file tree

Hide file tree

Showing 5 changed files with 673 additions and 18 deletions.
diff --git a/.changeset/little-donuts-kiss.md b/.changeset/little-donuts-kiss.md
@@ -0,0 +1,9 @@
+---
+'hive-apollo-router-plugin': patch
+'@graphql-hive/core': patch
+'@graphql-hive/apollo': patch
+'@graphql-hive/envelop': patch
+'@graphql-hive/yoga': patch
+---
+
+Collect custom scalars from arguments and input object fields
diff --git a/packages/libraries/core/src/client/collect-schema-coordinates.ts b/packages/libraries/core/src/client/collect-schema-coordinates.ts
@@ -71,7 +71,12 @@ export function collectSchemaCoordinates(args: {
   }
 
   function collectNode(node: ObjectFieldNode | ArgumentNode) {
-    const inputType = args.typeInfo.getInputType()!;
+    const inputType = args.typeInfo.getInputType();
+
+    if (!inputType) {
+      throw new Error('Expected an Input type, got nothing');
+    }
+
     const inputTypeName = resolveTypeName(inputType);
 
     if (node.value.kind === Kind.ENUM) {
@@ -279,6 +284,12 @@ export function collectSchemaCoordinates(args: {
 
         const parentInputTypeName = resolveTypeName(parentInputType);
 
+        if (isScalarType(parentInputType)) {
+          collectInputType(parentInputTypeName);
+          // Prevent the visitor into going deeper into ObjectField
+          return null;
+        }
+
         collectNode(node);
         collectInputType(parentInputTypeName, node.name.value);
       },

diff --git a/packages/libraries/core/tests/collect-schema-coordinates.spec.ts b/packages/libraries/core/tests/collect-schema-coordinates.spec.ts
@@ -159,4 +159,85 @@ describe('collectSchemaCoordinates', () => {
     });
     expect(Array.from(result)).toEqual(['Query.node', 'Node.id', 'User.id']);
   });
+
+  test('custom scalar as argument', () => {
+    const schema = buildSchema(/* GraphQL */ `
+      type Query {
+        random(json: JSON): String
+      }
+      scalar JSON
+    `);
+    const result = collectSchemaCoordinates({
+      documentNode: parse(/* GraphQL */ `
+        query {
+          random(json: { key: { value: "value" } })
+        }
+      `),
+      schema,
+      processVariables: false,
+      variables: null,
+      typeInfo: new TypeInfo(schema),
+    });
+    expect(Array.from(result)).toEqual(['Query.random', 'Query.random.json', 'JSON']);
+  });
+
+  test('custom scalar in input object field', () => {
+    const schema = buildSchema(/* GraphQL */ `
+      type Query {
+        random(input: I): String
+      }
+
+      input I {
+        json: JSON
+      }
+
+      scalar JSON
+    `);
+    const result = collectSchemaCoordinates({
+      documentNode: parse(/* GraphQL */ `
+        query {
+          random(input: { json: { key: { value: "value" } } })
+        }
+      `),
+      schema,
+      processVariables: false,
+      variables: null,
+      typeInfo: new TypeInfo(schema),
+    });
+    expect(Array.from(result)).toEqual(['Query.random', 'Query.random.input', 'I.json', 'JSON']);
+  });
+
+  test('deeply nested inputs', () => {
+    const schema = buildSchema(/* GraphQL */ `
+      type Query {
+        random(a: A): String
+      }
+
+      input A {
+        b: B
+      }
+
+      input B {
+        c: C
+      }
+
+      input C {
+        d: String
+      }
+    `);
+    const result = collectSchemaCoordinates({
+      documentNode: parse(/* GraphQL */ `
+        query {
+          random(a: { b: { c: { d: "D" } } })
+        }
+      `),
+      schema,
+      processVariables: false,
+      variables: null,
+      typeInfo: new TypeInfo(schema),
+    });
+    expect(Array.from(result).sort()).toEqual(
+      ['Query.random', 'Query.random.a', 'A.b', 'B.c', 'C.d', 'String'].sort(),
+    );
+  });
 });