@graphql-tools/utils 9.0.0 → 9.1.0-alpha-20221107154712-2cdb94c3

package/cjs/getArgumentValues.js

@@ -14,7 +14,7 @@ const inspect_js_1 = require("./inspect.js");
  * Object prototype.
  */
 function getArgumentValues(def, node, variableValues = {}) {
-    var _a;
+    var _a, _b, _c, _d;
     const coercedValues = {};
     const argumentNodes = (_a = node.arguments) !== null && _a !== void 0 ? _a : [];
     const argNodeMap = argumentNodes.reduce((prev, arg) => ({
@@ -57,16 +57,43 @@ function getArgumentValues(def, node, variableValues = {}) {
                 nodes: [valueNode],
             });
         }
-        const coercedValue = (0, graphql_1.valueFromAST)(valueNode, argType, variableValues);
-        if (coercedValue === undefined) {
-            // Note: ValuesOfCorrectTypeRule validation should catch this before
-            // execution. This is a runtime check to ensure execution does not
-            // continue with an invalid argument value.
-            throw (0, errors_js_1.createGraphQLError)(`Argument "${name}" has invalid value ${(0, graphql_1.print)(valueNode)}.`, {
-                nodes: [valueNode],
-            });
+        try {
+            const coercedValue = (0, graphql_1.valueFromAST)(valueNode, argType, variableValues);
+            if (coercedValue === undefined) {
+                // Note: ValuesOfCorrectTypeRule validation should catch this before
+                // execution. This is a runtime check to ensure execution does not
+                // continue with an invalid argument value.
+                throw (0, errors_js_1.createGraphQLError)(`Argument "${name}" has invalid value ${(0, graphql_1.print)(valueNode)}.`, {
+                    nodes: [valueNode],
+                });
+            }
+            coercedValues[name] = coercedValue;
+        }
+        catch (e) {
+            if (e instanceof graphql_1.GraphQLError && ((_c = (_b = e.extensions) === null || _b === void 0 ? void 0 : _b.http) === null || _c === void 0 ? void 0 : _c.status) == null) {
+                Object.defineProperty(e, 'extensions', {
+                    value: {
+                        ...e.extensions,
+                        http: {
+                            ...(_d = e.extensions) === null || _d === void 0 ? void 0 : _d.http,
+                            status: 400,
+                        },
+                    },
+                });
+                throw e;
+            }
+            else if (e instanceof TypeError) {
+                throw (0, errors_js_1.createGraphQLError)(e.message, {
+                    nodes: [valueNode],
+                    extensions: {
+                        http: {
+                            status: 400,
+                        },
+                    },
+                });
+            }
+            throw e;
         }
-        coercedValues[name] = coercedValue;
     }
     return coercedValues;
 }

package/esm/getArgumentValues.js

@@ -1,5 +1,5 @@
 import { hasOwnProperty } from './jsutils.js';
-import { valueFromAST, isNonNullType, Kind, print, } from 'graphql';
+import { valueFromAST, isNonNullType, Kind, print, GraphQLError, } from 'graphql';
 import { createGraphQLError } from './errors.js';
 import { inspect } from './inspect.js';
 /**
@@ -11,7 +11,7 @@ import { inspect } from './inspect.js';
  * Object prototype.
  */
 export function getArgumentValues(def, node, variableValues = {}) {
-    var _a;
+    var _a, _b, _c, _d;
     const coercedValues = {};
     const argumentNodes = (_a = node.arguments) !== null && _a !== void 0 ? _a : [];
     const argNodeMap = argumentNodes.reduce((prev, arg) => ({
@@ -54,16 +54,43 @@ export function getArgumentValues(def, node, variableValues = {}) {
                 nodes: [valueNode],
             });
         }
-        const coercedValue = valueFromAST(valueNode, argType, variableValues);
-        if (coercedValue === undefined) {
-            // Note: ValuesOfCorrectTypeRule validation should catch this before
-            // execution. This is a runtime check to ensure execution does not
-            // continue with an invalid argument value.
-            throw createGraphQLError(`Argument "${name}" has invalid value ${print(valueNode)}.`, {
-                nodes: [valueNode],
-            });
+        try {
+            const coercedValue = valueFromAST(valueNode, argType, variableValues);
+            if (coercedValue === undefined) {
+                // Note: ValuesOfCorrectTypeRule validation should catch this before
+                // execution. This is a runtime check to ensure execution does not
+                // continue with an invalid argument value.
+                throw createGraphQLError(`Argument "${name}" has invalid value ${print(valueNode)}.`, {
+                    nodes: [valueNode],
+                });
+            }
+            coercedValues[name] = coercedValue;
+        }
+        catch (e) {
+            if (e instanceof GraphQLError && ((_c = (_b = e.extensions) === null || _b === void 0 ? void 0 : _b.http) === null || _c === void 0 ? void 0 : _c.status) == null) {
+                Object.defineProperty(e, 'extensions', {
+                    value: {
+                        ...e.extensions,
+                        http: {
+                            ...(_d = e.extensions) === null || _d === void 0 ? void 0 : _d.http,
+                            status: 400,
+                        },
+                    },
+                });
+                throw e;
+            }
+            else if (e instanceof TypeError) {
+                throw createGraphQLError(e.message, {
+                    nodes: [valueNode],
+                    extensions: {
+                        http: {
+                            status: 400,
+                        },
+                    },
+                });
+            }
+            throw e;
         }
-        coercedValues[name] = coercedValue;
     }
     return coercedValues;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/utils",
-  "version": "9.0.0",
+  "version": "9.1.0-alpha-20221107154712-2cdb94c3",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {

package/typings/Interfaces.d.cts

@@ -15,6 +15,7 @@ export interface ExecutionResult<TData = any, TExtensions = any> {
     extensions?: TExtensions;
     label?: string;
     path?: ReadonlyArray<string | number>;
+    items?: TData | null;
 }
 export interface ExecutionRequest<TArgs extends Record<string, any> = Record<string, any>, TContext = any, TRootValue = any, TExtensions = Record<string, any>> {
     document: DocumentNode;

package/typings/Interfaces.d.ts

@@ -15,6 +15,7 @@ export interface ExecutionResult<TData = any, TExtensions = any> {
     extensions?: TExtensions;
     label?: string;
     path?: ReadonlyArray<string | number>;
+    items?: TData | null;
 }
 export interface ExecutionRequest<TArgs extends Record<string, any> = Record<string, any>, TContext = any, TRootValue = any, TExtensions = Record<string, any>> {
     document: DocumentNode;