graphql 16.3.0 → 16.5.0

package/error/GraphQLError.d.ts

@@ -14,7 +14,7 @@ import type { Source } from '../language/source';
 export interface GraphQLErrorExtensions {
   [attributeName: string]: unknown;
 }
-export interface GraphQLErrorArgs {
+export interface GraphQLErrorOptions {
   nodes?: ReadonlyArray<ASTNode> | ASTNode | null;
   source?: Maybe<Source>;
   positions?: Maybe<ReadonlyArray<number>>;
@@ -75,8 +75,9 @@ export declare class GraphQLError extends Error {
    * Extension fields to add to the formatted error.
    */
   readonly extensions: GraphQLErrorExtensions;
+  constructor(message: string, options?: GraphQLErrorOptions);
   /**
-   * @deprecated Please use the `GraphQLErrorArgs` constructor overload instead.
+   * @deprecated Please use the `GraphQLErrorOptions` constructor overload instead.
    */
   constructor(
     message: string,
@@ -91,7 +92,6 @@ export declare class GraphQLError extends Error {
     >,
     extensions?: Maybe<GraphQLErrorExtensions>,
   );
-  constructor(message: string, args?: GraphQLErrorArgs);
   get [Symbol.toStringTag](): string;
   toString(): string;
   toJSON(): GraphQLFormattedError;
@@ -137,6 +137,6 @@ export declare function printError(error: GraphQLError): string;
  * Given a GraphQLError, format it according to the rules described by the
  * Response Format, Errors section of the GraphQL Specification.
  *
- * @deprecated Please use `error.toString` instead. Will be removed in v17
+ * @deprecated Please use `error.toJSON` instead. Will be removed in v17
  */
 export declare function formatError(error: GraphQLError): GraphQLFormattedError;

package/error/GraphQLError.js

@@ -13,7 +13,7 @@ var _location = require('../language/location.js');
 
 var _printLocation = require('../language/printLocation.js');
 
-function toNormalizedArgs(args) {
+function toNormalizedOptions(args) {
   const firstArg = args[0];
 
   if (firstArg == null || 'kind' in firstArg || 'length' in firstArg) {
@@ -80,13 +80,13 @@ class GraphQLError extends Error {
    */
 
   /**
-   * @deprecated Please use the `GraphQLErrorArgs` constructor overload instead.
+   * @deprecated Please use the `GraphQLErrorOptions` constructor overload instead.
    */
   constructor(message, ...rawArgs) {
     var _this$nodes, _nodeLocations$, _ref;
 
     const { nodes, source, positions, path, originalError, extensions } =
-      toNormalizedArgs(rawArgs);
+      toNormalizedOptions(rawArgs);
     super(message);
     this.name = 'GraphQLError';
     this.path = path !== null && path !== void 0 ? path : undefined;
@@ -259,7 +259,7 @@ function printError(error) {
  * Given a GraphQLError, format it according to the rules described by the
  * Response Format, Errors section of the GraphQL Specification.
  *
- * @deprecated Please use `error.toString` instead. Will be removed in v17
+ * @deprecated Please use `error.toJSON` instead. Will be removed in v17
  */
 
 function formatError(error) {

package/error/GraphQLError.mjs

@@ -5,7 +5,7 @@ import {
   printSourceLocation,
 } from '../language/printLocation.mjs';
 
-function toNormalizedArgs(args) {
+function toNormalizedOptions(args) {
   const firstArg = args[0];
 
   if (firstArg == null || 'kind' in firstArg || 'length' in firstArg) {
@@ -72,13 +72,13 @@ export class GraphQLError extends Error {
    */
 
   /**
-   * @deprecated Please use the `GraphQLErrorArgs` constructor overload instead.
+   * @deprecated Please use the `GraphQLErrorOptions` constructor overload instead.
    */
   constructor(message, ...rawArgs) {
     var _this$nodes, _nodeLocations$, _ref;
 
     const { nodes, source, positions, path, originalError, extensions } =
-      toNormalizedArgs(rawArgs);
+      toNormalizedOptions(rawArgs);
     super(message);
     this.name = 'GraphQLError';
     this.path = path !== null && path !== void 0 ? path : undefined;
@@ -245,7 +245,7 @@ export function printError(error) {
  * Given a GraphQLError, format it according to the rules described by the
  * Response Format, Errors section of the GraphQL Specification.
  *
- * @deprecated Please use `error.toString` instead. Will be removed in v17
+ * @deprecated Please use `error.toJSON` instead. Will be removed in v17
  */
 
 export function formatError(error) {

package/error/index.d.ts

@@ -1,5 +1,6 @@
 export { GraphQLError, printError, formatError } from './GraphQLError';
 export type {
+  GraphQLErrorOptions,
   GraphQLFormattedError,
   GraphQLErrorExtensions,
 } from './GraphQLError';

package/error/locatedError.js

@@ -23,16 +23,16 @@ function locatedError(rawOriginalError, nodes, path) {
     return originalError;
   }
 
-  return new _GraphQLError.GraphQLError(
-    originalError.message,
-    (_nodes = originalError.nodes) !== null && _nodes !== void 0
-      ? _nodes
-      : nodes,
-    originalError.source,
-    originalError.positions,
+  return new _GraphQLError.GraphQLError(originalError.message, {
+    nodes:
+      (_nodes = originalError.nodes) !== null && _nodes !== void 0
+        ? _nodes
+        : nodes,
+    source: originalError.source,
+    positions: originalError.positions,
     path,
     originalError,
-  );
+  });
 }
 
 function isLocatedGraphQLError(error) {

package/error/locatedError.mjs

@@ -15,16 +15,16 @@ export function locatedError(rawOriginalError, nodes, path) {
     return originalError;
   }
 
-  return new GraphQLError(
-    originalError.message,
-    (_nodes = originalError.nodes) !== null && _nodes !== void 0
-      ? _nodes
-      : nodes,
-    originalError.source,
-    originalError.positions,
+  return new GraphQLError(originalError.message, {
+    nodes:
+      (_nodes = originalError.nodes) !== null && _nodes !== void 0
+        ? _nodes
+        : nodes,
+    source: originalError.source,
+    positions: originalError.positions,
     path,
     originalError,
-  );
+  });
 }
 
 function isLocatedGraphQLError(error) {

package/error/syntaxError.js

@@ -12,10 +12,8 @@ var _GraphQLError = require('./GraphQLError.js');
  * descriptive information about the syntax error's position in the source.
  */
 function syntaxError(source, position, description) {
-  return new _GraphQLError.GraphQLError(
-    `Syntax Error: ${description}`,
-    undefined,
+  return new _GraphQLError.GraphQLError(`Syntax Error: ${description}`, {
     source,
-    [position],
-  );
+    positions: [position],
+  });
 }

package/error/syntaxError.mjs

@@ -5,7 +5,8 @@ import { GraphQLError } from './GraphQLError.mjs';
  */
 
 export function syntaxError(source, position, description) {
-  return new GraphQLError(`Syntax Error: ${description}`, undefined, source, [
-    position,
-  ]);
+  return new GraphQLError(`Syntax Error: ${description}`, {
+    source,
+    positions: [position],
+  });
 }

package/execution/execute.js

@@ -324,7 +324,9 @@ function executeOperation(exeContext, operation, rootValue) {
   if (rootType == null) {
     throw new _GraphQLError.GraphQLError(
       `Schema is not configured to execute ${operation.operation} operation.`,
-      operation,
+      {
+        nodes: operation,
+      },
     );
   }
 
@@ -842,21 +844,27 @@ function ensureValidRuntimeType(
   if (runtimeType == null) {
     throw new _GraphQLError.GraphQLError(
       `Abstract type "${returnType.name}" was resolved to a type "${runtimeTypeName}" that does not exist inside the schema.`,
-      fieldNodes,
+      {
+        nodes: fieldNodes,
+      },
     );
   }
 
   if (!(0, _definition.isObjectType)(runtimeType)) {
     throw new _GraphQLError.GraphQLError(
       `Abstract type "${returnType.name}" was resolved to a non-object type "${runtimeTypeName}".`,
-      fieldNodes,
+      {
+        nodes: fieldNodes,
+      },
     );
   }
 
   if (!exeContext.schema.isSubType(returnType, runtimeType)) {
     throw new _GraphQLError.GraphQLError(
       `Runtime Object type "${runtimeType.name}" is not a possible type for "${returnType.name}".`,
-      fieldNodes,
+      {
+        nodes: fieldNodes,
+      },
     );
   }
 
@@ -910,7 +918,9 @@ function invalidReturnTypeError(returnType, result, fieldNodes) {
   return new _GraphQLError.GraphQLError(
     `Expected value of type "${returnType.name}" but got: ${(0,
     _inspect.inspect)(result)}.`,
-    fieldNodes,
+    {
+      nodes: fieldNodes,
+    },
   );
 }
 /**

package/execution/execute.mjs

@@ -305,7 +305,9 @@ function executeOperation(exeContext, operation, rootValue) {
   if (rootType == null) {
     throw new GraphQLError(
       `Schema is not configured to execute ${operation.operation} operation.`,
-      operation,
+      {
+        nodes: operation,
+      },
     );
   }
 
@@ -812,21 +814,27 @@ function ensureValidRuntimeType(
   if (runtimeType == null) {
     throw new GraphQLError(
       `Abstract type "${returnType.name}" was resolved to a type "${runtimeTypeName}" that does not exist inside the schema.`,
-      fieldNodes,
+      {
+        nodes: fieldNodes,
+      },
     );
   }
 
   if (!isObjectType(runtimeType)) {
     throw new GraphQLError(
       `Abstract type "${returnType.name}" was resolved to a non-object type "${runtimeTypeName}".`,
-      fieldNodes,
+      {
+        nodes: fieldNodes,
+      },
     );
   }
 
   if (!exeContext.schema.isSubType(returnType, runtimeType)) {
     throw new GraphQLError(
       `Runtime Object type "${runtimeType.name}" is not a possible type for "${returnType.name}".`,
-      fieldNodes,
+      {
+        nodes: fieldNodes,
+      },
     );
   }
 
@@ -879,7 +887,9 @@ function completeObjectValue(
 function invalidReturnTypeError(returnType, result, fieldNodes) {
   return new GraphQLError(
     `Expected value of type "${returnType.name}" but got: ${inspect(result)}.`,
-    fieldNodes,
+    {
+      nodes: fieldNodes,
+    },
   );
 }
 /**

package/execution/index.d.ts

@@ -11,4 +11,8 @@ export type {
   FormattedExecutionResult,
 } from './execute';
 export { subscribe, createSourceEventStream } from './subscribe';
-export { getVariableValues, getDirectiveValues } from './values';
+export {
+  getArgumentValues,
+  getVariableValues,
+  getDirectiveValues,
+} from './values';

package/execution/index.js

@@ -33,6 +33,12 @@ Object.defineProperty(exports, 'executeSync', {
     return _execute.executeSync;
   },
 });
+Object.defineProperty(exports, 'getArgumentValues', {
+  enumerable: true,
+  get: function () {
+    return _values.getArgumentValues;
+  },
+});
 Object.defineProperty(exports, 'getDirectiveValues', {
   enumerable: true,
   get: function () {

package/execution/index.mjs

@@ -6,4 +6,8 @@ export {
   defaultTypeResolver,
 } from './execute.mjs';
 export { subscribe, createSourceEventStream } from './subscribe.mjs';
-export { getVariableValues, getDirectiveValues } from './values.mjs';
+export {
+  getArgumentValues,
+  getVariableValues,
+  getDirectiveValues,
+} from './values.mjs';

package/execution/subscribe.js

@@ -190,7 +190,9 @@ async function executeSubscription(exeContext) {
   if (rootType == null) {
     throw new _GraphQLError.GraphQLError(
       'Schema is not configured to execute subscription operation.',
-      operation,
+      {
+        nodes: operation,
+      },
     );
   }
 
@@ -208,7 +210,9 @@ async function executeSubscription(exeContext) {
     const fieldName = fieldNodes[0].name.value;
     throw new _GraphQLError.GraphQLError(
       `The subscription field "${fieldName}" is not defined.`,
-      fieldNodes,
+      {
+        nodes: fieldNodes,
+      },
     );
   }
 

package/execution/subscribe.mjs

@@ -176,7 +176,9 @@ async function executeSubscription(exeContext) {
   if (rootType == null) {
     throw new GraphQLError(
       'Schema is not configured to execute subscription operation.',
-      operation,
+      {
+        nodes: operation,
+      },
     );
   }
 
@@ -194,7 +196,9 @@ async function executeSubscription(exeContext) {
     const fieldName = fieldNodes[0].name.value;
     throw new GraphQLError(
       `The subscription field "${fieldName}" is not defined.`,
-      fieldNodes,
+      {
+        nodes: fieldNodes,
+      },
     );
   }
 

package/execution/values.d.ts

@@ -46,8 +46,6 @@ export declare function getVariableValues(
  * Note: The returned value is a plain Object with a prototype, since it is
  * exposed to user code. Care should be taken to not pull values from the
  * Object prototype.
- *
- * @internal
  */
 export declare function getArgumentValues(
   def: GraphQLField<unknown, unknown> | GraphQLDirective,

package/execution/values.js

@@ -85,7 +85,9 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) {
       onError(
         new _GraphQLError.GraphQLError(
           `Variable "$${varName}" expected value of type "${varTypeStr}" which cannot be used as an input type.`,
-          varDefNode.type,
+          {
+            nodes: varDefNode.type,
+          },
         ),
       );
       continue;
@@ -102,7 +104,9 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) {
         onError(
           new _GraphQLError.GraphQLError(
             `Variable "$${varName}" of required type "${varTypeStr}" was not provided.`,
-            varDefNode,
+            {
+              nodes: varDefNode,
+            },
           ),
         );
       }
@@ -117,7 +121,9 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) {
       onError(
         new _GraphQLError.GraphQLError(
           `Variable "$${varName}" of non-null type "${varTypeStr}" must not be null.`,
-          varDefNode,
+          {
+            nodes: varDefNode,
+          },
         ),
       );
       continue;
@@ -138,14 +144,10 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) {
         }
 
         onError(
-          new _GraphQLError.GraphQLError(
-            prefix + '; ' + error.message,
-            varDefNode,
-            undefined,
-            undefined,
-            undefined,
-            error.originalError,
-          ),
+          new _GraphQLError.GraphQLError(prefix + '; ' + error.message, {
+            nodes: varDefNode,
+            originalError: error.originalError,
+          }),
         );
       },
     );
@@ -160,8 +162,6 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) {
  * Note: The returned value is a plain Object with a prototype, since it is
  * exposed to user code. Care should be taken to not pull values from the
  * Object prototype.
- *
- * @internal
  */
 
 function getArgumentValues(def, node, variableValues) {
@@ -193,7 +193,9 @@ function getArgumentValues(def, node, variableValues) {
           `Argument "${name}" of required type "${(0, _inspect.inspect)(
             argType,
           )}" ` + 'was not provided.',
-          node,
+          {
+            nodes: node,
+          },
         );
       }
 
@@ -218,7 +220,9 @@ function getArgumentValues(def, node, variableValues) {
               argType,
             )}" ` +
               `was provided the variable "$${variableName}" which was not provided a runtime value.`,
-            valueNode,
+            {
+              nodes: valueNode,
+            },
           );
         }
 
@@ -233,7 +237,9 @@ function getArgumentValues(def, node, variableValues) {
         `Argument "${name}" of non-null type "${(0, _inspect.inspect)(
           argType,
         )}" ` + 'must not be null.',
-        valueNode,
+        {
+          nodes: valueNode,
+        },
       );
     }
 
@@ -251,7 +257,9 @@ function getArgumentValues(def, node, variableValues) {
         `Argument "${name}" has invalid value ${(0, _printer.print)(
           valueNode,
         )}.`,
-        valueNode,
+        {
+          nodes: valueNode,
+        },
       );
     }
 

package/execution/values.mjs

@@ -67,7 +67,9 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) {
       onError(
         new GraphQLError(
           `Variable "$${varName}" expected value of type "${varTypeStr}" which cannot be used as an input type.`,
-          varDefNode.type,
+          {
+            nodes: varDefNode.type,
+          },
         ),
       );
       continue;
@@ -81,7 +83,9 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) {
         onError(
           new GraphQLError(
             `Variable "$${varName}" of required type "${varTypeStr}" was not provided.`,
-            varDefNode,
+            {
+              nodes: varDefNode,
+            },
           ),
         );
       }
@@ -96,7 +100,9 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) {
       onError(
         new GraphQLError(
           `Variable "$${varName}" of non-null type "${varTypeStr}" must not be null.`,
-          varDefNode,
+          {
+            nodes: varDefNode,
+          },
         ),
       );
       continue;
@@ -114,14 +120,10 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) {
         }
 
         onError(
-          new GraphQLError(
-            prefix + '; ' + error.message,
-            varDefNode,
-            undefined,
-            undefined,
-            undefined,
-            error.originalError,
-          ),
+          new GraphQLError(prefix + '; ' + error.message, {
+            nodes: varDefNode,
+            originalError: error.originalError,
+          }),
         );
       },
     );
@@ -136,8 +138,6 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) {
  * Note: The returned value is a plain Object with a prototype, since it is
  * exposed to user code. Care should be taken to not pull values from the
  * Object prototype.
- *
- * @internal
  */
 
 export function getArgumentValues(def, node, variableValues) {
@@ -165,7 +165,9 @@ export function getArgumentValues(def, node, variableValues) {
         throw new GraphQLError(
           `Argument "${name}" of required type "${inspect(argType)}" ` +
             'was not provided.',
-          node,
+          {
+            nodes: node,
+          },
         );
       }
 
@@ -188,7 +190,9 @@ export function getArgumentValues(def, node, variableValues) {
           throw new GraphQLError(
             `Argument "${name}" of required type "${inspect(argType)}" ` +
               `was provided the variable "$${variableName}" which was not provided a runtime value.`,
-            valueNode,
+            {
+              nodes: valueNode,
+            },
           );
         }
 
@@ -202,7 +206,9 @@ export function getArgumentValues(def, node, variableValues) {
       throw new GraphQLError(
         `Argument "${name}" of non-null type "${inspect(argType)}" ` +
           'must not be null.',
-        valueNode,
+        {
+          nodes: valueNode,
+        },
       );
     }
 
@@ -214,7 +220,9 @@ export function getArgumentValues(def, node, variableValues) {
       // continue with an invalid argument value.
       throw new GraphQLError(
         `Argument "${name}" has invalid value ${print(valueNode)}.`,
-        valueNode,
+        {
+          nodes: valueNode,
+        },
       );
     }
 

package/index.d.ts

@@ -284,6 +284,7 @@ export {
   defaultFieldResolver,
   defaultTypeResolver,
   responsePathAsArray,
+  getArgumentValues,
   getVariableValues,
   getDirectiveValues,
   subscribe,
@@ -345,6 +346,7 @@ export {
   formatError,
 } from './error/index';
 export type {
+  GraphQLErrorOptions,
   GraphQLFormattedError,
   GraphQLErrorExtensions,
 } from './error/index';

package/index.js

@@ -741,6 +741,12 @@ Object.defineProperty(exports, 'formatError', {
     return _index5.formatError;
   },
 });
+Object.defineProperty(exports, 'getArgumentValues', {
+  enumerable: true,
+  get: function () {
+    return _index3.getArgumentValues;
+  },
+});
 Object.defineProperty(exports, 'getDirectiveValues', {
   enumerable: true,
   get: function () {

package/index.mjs

@@ -161,6 +161,7 @@ export {
   defaultFieldResolver,
   defaultTypeResolver,
   responsePathAsArray,
+  getArgumentValues,
   getVariableValues,
   getDirectiveValues,
   subscribe,

package/jsutils/instanceOf.js

@@ -14,8 +14,9 @@ var _inspect = require('./inspect.js');
  * See: https://webpack.js.org/guides/production/
  */
 const instanceOf =
-  /* c8 ignore next 5 */
+  /* c8 ignore next 6 */
   // FIXME: https://github.com/graphql/graphql-js/issues/2317
+  // eslint-disable-next-line no-undef
   process.env.NODE_ENV === 'production'
     ? function instanceOf(value, constructor) {
         return value instanceof constructor;

package/jsutils/instanceOf.mjs

@@ -7,8 +7,9 @@ import { inspect } from './inspect.mjs';
  */
 
 export const instanceOf =
-  /* c8 ignore next 5 */
+  /* c8 ignore next 6 */
   // FIXME: https://github.com/graphql/graphql-js/issues/2317
+  // eslint-disable-next-line no-undef
   process.env.NODE_ENV === 'production'
     ? function instanceOf(value, constructor) {
         return value instanceof constructor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql",
-  "version": "16.3.0",
+  "version": "16.5.0",
   "description": "A Query Language and Runtime which can target any service.",
   "license": "MIT",
   "main": "index",
@@ -31,7 +31,7 @@
     "graphql-js"
   ],
   "engines": {
-    "node": "^12.22.0 || ^14.16.0 || >=16.0.0"
+    "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
   },
   "publishConfig": {
     "tag": "latest"