Use valueFromASTUntyped and handle default vs defaultValue for arg

Author: eddeee888

packages/utils/src/defaultValueAstFromType.ts

@@ -1,4 +1,9 @@
-import { Kind, type GraphQLArgument, type GraphQLInputField, type ValueNode } from 'graphql';
+import {
+  valueFromASTUntyped,
+  type GraphQLArgument,
+  type GraphQLInputField,
+  type ValueNode,
+} from 'graphql';
 import { astFromValue } from './astFromValue.js';
 import { astFromValueUntyped } from './astFromValueUntyped.js';
 
@@ -23,7 +28,7 @@ export const defaultValueAstFromType = (
       return (astFromValueUntyped((arg.default as any).value) as any) ?? undefined;
     }
 
-    const value = convertConstValueNode((arg.default as any).literal);
+    const value = valueFromASTUntyped((arg.default as any).literal);
     return (astFromValue(value, arg.type) as any) ?? undefined;
   }
 
@@ -32,26 +37,3 @@ export const defaultValueAstFromType = (
     ? ((astFromValue((arg as any).defaultValue, (arg as any).type) as any) ?? undefined)
     : undefined;
 };
-
-/**
- * `convertConstValueNode` exhaustively traverses an literal node (a node with constant value)
- * and constructs a JavaScript representation of the node values
- *
- * Note: `node` is supposed to be `ConstValueNode` for graphql@17 but
- * it is not available in graphql@15 so we cannot import it from `graphql`
- */
-const convertConstValueNode = (node: any) => {
-  if (node.kind === Kind.NULL) {
-    return null;
-  } else if (node.kind === Kind.LIST) {
-    return node.values.map(convertConstValueNode);
-  } else if (node.kind === Kind.OBJECT) {
-    const result = {};
-    for (const field of node.fields) {
-      result[field.name.value] = convertConstValueNode(field.value);
-    }
-    return result;
-  }
-
-  return node.value;
-};

packages/utils/src/getArgumentValues.ts

@@ -9,8 +9,8 @@ import {
   Kind,
   print,
   valueFromAST,
+  valueFromASTUntyped,
 } from 'graphql';
-import { defaultValueAstFromType } from './defaultValueAstFromType.js';
 import { createGraphQLError } from './errors.js';
 import { hasOwnProperty } from './jsutils.js';
 
@@ -42,9 +42,13 @@ export function getArgumentValues(
     const argumentNode = argNodeMap[arg.name];
 
     if (!argumentNode) {
-      const defaultValue = defaultValueAstFromType(arg) as any;
-      if (defaultValue) {
-        coercedValues[arg.name] = defaultValue.value;
+      if ('default' in (arg as any) && arg.default) {
+        // graphql v17
+        coercedValues[arg.name] =
+          'value' in arg.default ? arg.default.value : valueFromASTUntyped(arg.default.literal);
+      } else if ('defaultValue' in (arg as any)) {
+        // graphql < v17
+        coercedValues[arg.name] = arg.defaultValue;
       } else if (isNonNullType(arg.type)) {
         throw createGraphQLError(
           `Argument "${arg.name}" of required type "${inspect(arg.type)}" ` + 'was not provided.',