enhance(wrap/MapLeafValues): fallback to regular AST transformation i…

…f astFromValue fails
ardatan · Mar 12, 2024 · 69181f6 · 69181f6
1 parent 31f89d0
commit 69181f6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/.changeset/honest-steaks-act.md b/.changeset/honest-steaks-act.md
@@ -0,0 +1,5 @@
+---
+"@graphql-tools/wrap": patch
+---
+
+MapLeafValues: fallback to `astFromValueUntyped` if `astFromValue` fails
diff --git a/packages/utils/src/astFromValueUntyped.ts b/packages/utils/src/astFromValueUntyped.ts
@@ -41,6 +41,9 @@ export function astFromValueUntyped(value: any): ValueNode | null {
   }
 
   if (typeof value === 'object') {
+    if (value instanceof Date) {
+      return { kind: Kind.STRING, value: value.toISOString() };
+    }
     const fieldNodes: Array<ObjectFieldNode> = [];
     for (const fieldName in value) {
       const fieldValue = value[fieldName];

diff --git a/packages/wrap/src/transforms/MapLeafValues.ts b/packages/wrap/src/transforms/MapLeafValues.ts
@@ -15,6 +15,7 @@ import {
 } from 'graphql';
 import { DelegationContext, SubschemaConfig, Transform } from '@graphql-tools/delegate';
 import {
+  astFromValueUntyped,
   ExecutionRequest,
   ExecutionResult,
   ResultVisitorMap,
@@ -194,7 +195,12 @@ export default class MapLeafValues<TContext = Record<string, any>>
           if (argValue?.kind === Kind.VARIABLE) {
             variableValues[argValue.name.value] = transformedValue;
           } else {
-            const newValueNode = astFromValue(transformedValue, argType);
+            let newValueNode: any;
+            try {
+              newValueNode = astFromValue(transformedValue, argType);
+            } catch (e) {
+              newValueNode = astFromValueUntyped(transformedValue);
+            }
             if (newValueNode != null) {
               argumentNodeMap[argName] = {
                 ...argumentNode,