graphql 16.2.0 → 16.3.0

package/error/GraphQLError.d.ts

@@ -1,7 +1,7 @@
 import type { Maybe } from '../jsutils/Maybe';
 import type { ASTNode } from '../language/ast';
-import type { Source } from '../language/source';
 import type { SourceLocation } from '../language/location';
+import type { Source } from '../language/source';
 /**
  * Custom extensions
  *
@@ -14,6 +14,18 @@ import type { SourceLocation } from '../language/location';
 export interface GraphQLErrorExtensions {
   [attributeName: string]: unknown;
 }
+export interface GraphQLErrorArgs {
+  nodes?: ReadonlyArray<ASTNode> | ASTNode | null;
+  source?: Maybe<Source>;
+  positions?: Maybe<ReadonlyArray<number>>;
+  path?: Maybe<ReadonlyArray<string | number>>;
+  originalError?: Maybe<
+    Error & {
+      readonly extensions?: unknown;
+    }
+  >;
+  extensions?: Maybe<GraphQLErrorExtensions>;
+}
 /**
  * A GraphQLError describes an Error found during the parse, validate, or
  * execute phases of performing a GraphQL operation. In addition to a message
@@ -63,6 +75,9 @@ export declare class GraphQLError extends Error {
    * Extension fields to add to the formatted error.
    */
   readonly extensions: GraphQLErrorExtensions;
+  /**
+   * @deprecated Please use the `GraphQLErrorArgs` constructor overload instead.
+   */
   constructor(
     message: string,
     nodes?: ReadonlyArray<ASTNode> | ASTNode | null,
@@ -76,6 +91,7 @@ export declare class GraphQLError extends Error {
     >,
     extensions?: Maybe<GraphQLErrorExtensions>,
   );
+  constructor(message: string, args?: GraphQLErrorArgs);
   get [Symbol.toStringTag](): string;
   toString(): string;
   toJSON(): GraphQLFormattedError;

package/error/GraphQLError.js

@@ -13,12 +13,29 @@ var _location = require('../language/location.js');
 
 var _printLocation = require('../language/printLocation.js');
 
+function toNormalizedArgs(args) {
+  const firstArg = args[0];
+
+  if (firstArg == null || 'kind' in firstArg || 'length' in firstArg) {
+    return {
+      nodes: firstArg,
+      source: args[1],
+      positions: args[2],
+      path: args[3],
+      originalError: args[4],
+      extensions: args[5],
+    };
+  }
+
+  return firstArg;
+}
 /**
  * A GraphQLError describes an Error found during the parse, validate, or
  * execute phases of performing a GraphQL operation. In addition to a message
  * and stack trace, it also includes information about the locations in a
  * GraphQL document and/or execution result that correspond to the Error.
  */
+
 class GraphQLError extends Error {
   /**
    * An array of `{ line, column }` locations within the source GraphQL document
@@ -61,17 +78,15 @@ class GraphQLError extends Error {
   /**
    * Extension fields to add to the formatted error.
    */
-  constructor(
-    message,
-    nodes,
-    source,
-    positions,
-    path,
-    originalError,
-    extensions,
-  ) {
+
+  /**
+   * @deprecated Please use the `GraphQLErrorArgs` constructor overload instead.
+   */
+  constructor(message, ...rawArgs) {
     var _this$nodes, _nodeLocations$, _ref;
 
+    const { nodes, source, positions, path, originalError, extensions } =
+      toNormalizedArgs(rawArgs);
     super(message);
     this.name = 'GraphQLError';
     this.path = path !== null && path !== void 0 ? path : undefined;

package/error/GraphQLError.mjs

@@ -4,22 +4,30 @@ import {
   printLocation,
   printSourceLocation,
 } from '../language/printLocation.mjs';
-/**
- * Custom extensions
- *
- * @remarks
- * Use a unique identifier name for your extension, for example the name of
- * your library or project. Do not use a shortened identifier as this increases
- * the risk of conflicts. We recommend you add at most one extension field,
- * an object which can contain all the values you need.
- */
 
+function toNormalizedArgs(args) {
+  const firstArg = args[0];
+
+  if (firstArg == null || 'kind' in firstArg || 'length' in firstArg) {
+    return {
+      nodes: firstArg,
+      source: args[1],
+      positions: args[2],
+      path: args[3],
+      originalError: args[4],
+      extensions: args[5],
+    };
+  }
+
+  return firstArg;
+}
 /**
  * A GraphQLError describes an Error found during the parse, validate, or
  * execute phases of performing a GraphQL operation. In addition to a message
  * and stack trace, it also includes information about the locations in a
  * GraphQL document and/or execution result that correspond to the Error.
  */
+
 export class GraphQLError extends Error {
   /**
    * An array of `{ line, column }` locations within the source GraphQL document
@@ -62,17 +70,15 @@ export class GraphQLError extends Error {
   /**
    * Extension fields to add to the formatted error.
    */
-  constructor(
-    message,
-    nodes,
-    source,
-    positions,
-    path,
-    originalError,
-    extensions,
-  ) {
+
+  /**
+   * @deprecated Please use the `GraphQLErrorArgs` constructor overload instead.
+   */
+  constructor(message, ...rawArgs) {
     var _this$nodes, _nodeLocations$, _ref;
 
+    const { nodes, source, positions, path, originalError, extensions } =
+      toNormalizedArgs(rawArgs);
     super(message);
     this.name = 'GraphQLError';
     this.path = path !== null && path !== void 0 ? path : undefined;

package/execution/collectFields.d.ts

@@ -1,11 +1,11 @@
 import type { ObjMap } from '../jsutils/ObjMap';
 import type {
-  SelectionSetNode,
   FieldNode,
   FragmentDefinitionNode,
+  SelectionSetNode,
 } from '../language/ast';
-import type { GraphQLSchema } from '../type/schema';
 import type { GraphQLObjectType } from '../type/definition';
+import type { GraphQLSchema } from '../type/schema';
 /**
  * Given a selectionSet, collects all of the fields and returns them.
  *

package/execution/collectFields.js

@@ -8,10 +8,10 @@ exports.collectSubfields = collectSubfields;
 
 var _kinds = require('../language/kinds.js');
 
-var _directives = require('../type/directives.js');
-
 var _definition = require('../type/definition.js');
 
+var _directives = require('../type/directives.js');
+
 var _typeFromAST = require('../utilities/typeFromAST.js');
 
 var _values = require('./values.js');

package/execution/collectFields.mjs

@@ -1,9 +1,9 @@
 import { Kind } from '../language/kinds.mjs';
+import { isAbstractType } from '../type/definition.mjs';
 import {
   GraphQLIncludeDirective,
   GraphQLSkipDirective,
 } from '../type/directives.mjs';
-import { isAbstractType } from '../type/definition.mjs';
 import { typeFromAST } from '../utilities/typeFromAST.mjs';
 import { getDirectiveValues } from './values.mjs';
 /**

package/execution/execute.d.ts

@@ -1,23 +1,23 @@
-import type { Path } from '../jsutils/Path';
+import type { Maybe } from '../jsutils/Maybe';
 import type { ObjMap } from '../jsutils/ObjMap';
+import type { Path } from '../jsutils/Path';
 import type { PromiseOrValue } from '../jsutils/PromiseOrValue';
-import type { Maybe } from '../jsutils/Maybe';
 import type { GraphQLFormattedError } from '../error/GraphQLError';
 import { GraphQLError } from '../error/GraphQLError';
 import type {
   DocumentNode,
-  OperationDefinitionNode,
   FieldNode,
   FragmentDefinitionNode,
+  OperationDefinitionNode,
 } from '../language/ast';
-import type { GraphQLSchema } from '../type/schema';
 import type {
-  GraphQLObjectType,
   GraphQLField,
   GraphQLFieldResolver,
+  GraphQLObjectType,
   GraphQLResolveInfo,
   GraphQLTypeResolver,
 } from '../type/definition';
+import type { GraphQLSchema } from '../type/schema';
 /**
  * Terminology
  *

package/execution/execute.js

@@ -11,25 +11,25 @@ exports.execute = execute;
 exports.executeSync = executeSync;
 exports.getFieldDef = getFieldDef;
 
-var _inspect = require('../jsutils/inspect.js');
+var _devAssert = require('../jsutils/devAssert.js');
 
-var _memoize = require('../jsutils/memoize3.js');
+var _inspect = require('../jsutils/inspect.js');
 
 var _invariant = require('../jsutils/invariant.js');
 
-var _devAssert = require('../jsutils/devAssert.js');
-
-var _isPromise = require('../jsutils/isPromise.js');
+var _isIterableObject = require('../jsutils/isIterableObject.js');
 
 var _isObjectLike = require('../jsutils/isObjectLike.js');
 
-var _promiseReduce = require('../jsutils/promiseReduce.js');
+var _isPromise = require('../jsutils/isPromise.js');
 
-var _promiseForObject = require('../jsutils/promiseForObject.js');
+var _memoize = require('../jsutils/memoize3.js');
 
 var _Path = require('../jsutils/Path.js');
 
-var _isIterableObject = require('../jsutils/isIterableObject.js');
+var _promiseForObject = require('../jsutils/promiseForObject.js');
+
+var _promiseReduce = require('../jsutils/promiseReduce.js');
 
 var _GraphQLError = require('../error/GraphQLError.js');
 
@@ -39,16 +39,16 @@ var _ast = require('../language/ast.js');
 
 var _kinds = require('../language/kinds.js');
 
-var _validate = require('../type/validate.js');
+var _definition = require('../type/definition.js');
 
 var _introspection = require('../type/introspection.js');
 
-var _definition = require('../type/definition.js');
-
-var _values = require('./values.js');
+var _validate = require('../type/validate.js');
 
 var _collectFields = require('./collectFields.js');
 
+var _values = require('./values.js');
+
 /**
  * A memoized collection of relevant subfields with regard to the return
  * type. Memoizing ensures the subfields are not repeatedly calculated, which

package/execution/execute.mjs

@@ -1,35 +1,35 @@
+import { devAssert } from '../jsutils/devAssert.mjs';
 import { inspect } from '../jsutils/inspect.mjs';
-import { memoize3 } from '../jsutils/memoize3.mjs';
 import { invariant } from '../jsutils/invariant.mjs';
-import { devAssert } from '../jsutils/devAssert.mjs';
-import { isPromise } from '../jsutils/isPromise.mjs';
+import { isIterableObject } from '../jsutils/isIterableObject.mjs';
 import { isObjectLike } from '../jsutils/isObjectLike.mjs';
-import { promiseReduce } from '../jsutils/promiseReduce.mjs';
-import { promiseForObject } from '../jsutils/promiseForObject.mjs';
+import { isPromise } from '../jsutils/isPromise.mjs';
+import { memoize3 } from '../jsutils/memoize3.mjs';
 import { addPath, pathToArray } from '../jsutils/Path.mjs';
-import { isIterableObject } from '../jsutils/isIterableObject.mjs';
+import { promiseForObject } from '../jsutils/promiseForObject.mjs';
+import { promiseReduce } from '../jsutils/promiseReduce.mjs';
 import { GraphQLError } from '../error/GraphQLError.mjs';
 import { locatedError } from '../error/locatedError.mjs';
 import { OperationTypeNode } from '../language/ast.mjs';
 import { Kind } from '../language/kinds.mjs';
-import { assertValidSchema } from '../type/validate.mjs';
 import {
-  SchemaMetaFieldDef,
-  TypeMetaFieldDef,
-  TypeNameMetaFieldDef,
-} from '../type/introspection.mjs';
-import {
-  isObjectType,
   isAbstractType,
   isLeafType,
   isListType,
   isNonNullType,
+  isObjectType,
 } from '../type/definition.mjs';
-import { getVariableValues, getArgumentValues } from './values.mjs';
+import {
+  SchemaMetaFieldDef,
+  TypeMetaFieldDef,
+  TypeNameMetaFieldDef,
+} from '../type/introspection.mjs';
+import { assertValidSchema } from '../type/validate.mjs';
 import {
   collectFields,
   collectSubfields as _collectSubfields,
 } from './collectFields.mjs';
+import { getArgumentValues, getVariableValues } from './values.mjs';
 /**
  * A memoized collection of relevant subfields with regard to the return
  * type. Memoizing ensures the subfields are not repeatedly calculated, which

package/execution/index.d.ts

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

package/execution/index.js

@@ -39,6 +39,12 @@ Object.defineProperty(exports, 'getDirectiveValues', {
     return _values.getDirectiveValues;
   },
 });
+Object.defineProperty(exports, 'getVariableValues', {
+  enumerable: true,
+  get: function () {
+    return _values.getVariableValues;
+  },
+});
 Object.defineProperty(exports, 'responsePathAsArray', {
   enumerable: true,
   get: function () {

package/execution/index.mjs

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

package/execution/subscribe.d.ts

@@ -1,7 +1,7 @@
 import type { Maybe } from '../jsutils/Maybe';
 import type { DocumentNode } from '../language/ast';
-import type { GraphQLSchema } from '../type/schema';
 import type { GraphQLFieldResolver } from '../type/definition';
+import type { GraphQLSchema } from '../type/schema';
 import type { ExecutionArgs, ExecutionResult } from './execute';
 /**
  * Implements the "Subscribe" algorithm described in the GraphQL specification.

package/execution/subscribe.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, '__esModule', {
 exports.createSourceEventStream = createSourceEventStream;
 exports.subscribe = subscribe;
 
-var _inspect = require('../jsutils/inspect.js');
-
 var _devAssert = require('../jsutils/devAssert.js');
 
+var _inspect = require('../jsutils/inspect.js');
+
 var _isAsyncIterable = require('../jsutils/isAsyncIterable.js');
 
 var _Path = require('../jsutils/Path.js');
@@ -20,12 +20,12 @@ var _locatedError = require('../error/locatedError.js');
 
 var _collectFields = require('./collectFields.js');
 
-var _values = require('./values.js');
-
 var _execute = require('./execute.js');
 
 var _mapAsyncIterator = require('./mapAsyncIterator.js');
 
+var _values = require('./values.js');
+
 /**
  * Implements the "Subscribe" algorithm described in the GraphQL specification.
  *

package/execution/subscribe.mjs

@@ -1,11 +1,10 @@
-import { inspect } from '../jsutils/inspect.mjs';
 import { devAssert } from '../jsutils/devAssert.mjs';
+import { inspect } from '../jsutils/inspect.mjs';
 import { isAsyncIterable } from '../jsutils/isAsyncIterable.mjs';
 import { addPath, pathToArray } from '../jsutils/Path.mjs';
 import { GraphQLError } from '../error/GraphQLError.mjs';
 import { locatedError } from '../error/locatedError.mjs';
 import { collectFields } from './collectFields.mjs';
-import { getArgumentValues } from './values.mjs';
 import {
   assertValidExecutionArguments,
   buildExecutionContext,
@@ -14,6 +13,7 @@ import {
   getFieldDef,
 } from './execute.mjs';
 import { mapAsyncIterator } from './mapAsyncIterator.mjs';
+import { getArgumentValues } from './values.mjs';
 /**
  * Implements the "Subscribe" algorithm described in the GraphQL specification.
  *

package/execution/values.d.ts

@@ -1,14 +1,14 @@
-import type { ObjMap } from '../jsutils/ObjMap';
 import type { Maybe } from '../jsutils/Maybe';
+import type { ObjMap } from '../jsutils/ObjMap';
 import { GraphQLError } from '../error/GraphQLError';
 import type {
-  FieldNode,
   DirectiveNode,
+  FieldNode,
   VariableDefinitionNode,
 } from '../language/ast';
-import type { GraphQLSchema } from '../type/schema';
 import type { GraphQLField } from '../type/definition';
 import type { GraphQLDirective } from '../type/directives';
+import type { GraphQLSchema } from '../type/schema';
 declare type CoercedVariableValues =
   | {
       errors: ReadonlyArray<GraphQLError>;
@@ -28,8 +28,6 @@ declare type CoercedVariableValues =
  * 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 getVariableValues(
   schema: GraphQLSchema,

package/execution/values.js

@@ -7,10 +7,10 @@ exports.getArgumentValues = getArgumentValues;
 exports.getDirectiveValues = getDirectiveValues;
 exports.getVariableValues = getVariableValues;
 
-var _keyMap = require('../jsutils/keyMap.js');
-
 var _inspect = require('../jsutils/inspect.js');
 
+var _keyMap = require('../jsutils/keyMap.js');
+
 var _printPathArray = require('../jsutils/printPathArray.js');
 
 var _GraphQLError = require('../error/GraphQLError.js');
@@ -21,12 +21,12 @@ var _printer = require('../language/printer.js');
 
 var _definition = require('../type/definition.js');
 
+var _coerceInputValue = require('../utilities/coerceInputValue.js');
+
 var _typeFromAST = require('../utilities/typeFromAST.js');
 
 var _valueFromAST = require('../utilities/valueFromAST.js');
 
-var _coerceInputValue = require('../utilities/coerceInputValue.js');
-
 /**
  * Prepares an object map of variableValues of the correct type based on the
  * provided variable definitions and arbitrary input. If the input cannot be
@@ -35,8 +35,6 @@ var _coerceInputValue = require('../utilities/coerceInputValue.js');
  * 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 getVariableValues(schema, varDefNodes, inputs, options) {
   const errors = [];

package/execution/values.mjs

@@ -1,13 +1,13 @@
-import { keyMap } from '../jsutils/keyMap.mjs';
 import { inspect } from '../jsutils/inspect.mjs';
+import { keyMap } from '../jsutils/keyMap.mjs';
 import { printPathArray } from '../jsutils/printPathArray.mjs';
 import { GraphQLError } from '../error/GraphQLError.mjs';
 import { Kind } from '../language/kinds.mjs';
 import { print } from '../language/printer.mjs';
 import { isInputType, isNonNullType } from '../type/definition.mjs';
+import { coerceInputValue } from '../utilities/coerceInputValue.mjs';
 import { typeFromAST } from '../utilities/typeFromAST.mjs';
 import { valueFromAST } from '../utilities/valueFromAST.mjs';
-import { coerceInputValue } from '../utilities/coerceInputValue.mjs';
 
 /**
  * Prepares an object map of variableValues of the correct type based on the
@@ -17,8 +17,6 @@ import { coerceInputValue } from '../utilities/coerceInputValue.mjs';
  * 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 getVariableValues(schema, varDefNodes, inputs, options) {
   const errors = [];

package/graphql.js

@@ -12,9 +12,9 @@ var _isPromise = require('./jsutils/isPromise.js');
 
 var _parser = require('./language/parser.js');
 
-var _validate = require('./validation/validate.js');
+var _validate = require('./type/validate.js');
 
-var _validate2 = require('./type/validate.js');
+var _validate2 = require('./validation/validate.js');
 
 var _execute = require('./execution/execute.js');
 
@@ -57,7 +57,7 @@ function graphqlImpl(args) {
     typeResolver,
   } = args; // Validate Schema
 
-  const schemaValidationErrors = (0, _validate2.validateSchema)(schema);
+  const schemaValidationErrors = (0, _validate.validateSchema)(schema);
 
   if (schemaValidationErrors.length > 0) {
     return {
@@ -75,7 +75,7 @@ function graphqlImpl(args) {
     };
   } // Validate
 
-  const validationErrors = (0, _validate.validate)(schema, document);
+  const validationErrors = (0, _validate2.validate)(schema, document);
 
   if (validationErrors.length > 0) {
     return {

package/graphql.mjs

@@ -1,8 +1,8 @@
 import { devAssert } from './jsutils/devAssert.mjs';
 import { isPromise } from './jsutils/isPromise.mjs';
 import { parse } from './language/parser.mjs';
-import { validate } from './validation/validate.mjs';
 import { validateSchema } from './type/validate.mjs';
+import { validate } from './validation/validate.mjs';
 import { execute } from './execution/execute.mjs';
 /**
  * This is the primary entry point function for fulfilling GraphQL operations