graphql 16.5.0 → 17.0.0-alpha.1

package/NotSupportedTSVersion.d.ts

@@ -1 +1 @@
-"Package 'graphql' support only TS versions that are >=4.1.0".
+"Package 'graphql' support only TS versions that are >=4.4.0".

package/README.md

@@ -4,7 +4,6 @@ The JavaScript reference implementation for GraphQL, a query language for APIs c
 
 [![npm version](https://badge.fury.io/js/graphql.svg)](https://badge.fury.io/js/graphql)
 [![Build Status](https://github.com/graphql/graphql-js/workflows/CI/badge.svg?branch=main)](https://github.com/graphql/graphql-js/actions?query=branch%3Amain)
-[![Coverage Status](https://codecov.io/gh/graphql/graphql-js/branch/main/graph/badge.svg)](https://codecov.io/gh/graphql/graphql-js)
 
 See more complete documentation at https://graphql.org/ and
 https://graphql.org/graphql-js/.

package/error/GraphQLError.d.ts

@@ -76,22 +76,6 @@ export declare class GraphQLError extends Error {
    */
   readonly extensions: GraphQLErrorExtensions;
   constructor(message: string, options?: GraphQLErrorOptions);
-  /**
-   * @deprecated Please use the `GraphQLErrorOptions` constructor overload instead.
-   */
-  constructor(
-    message: string,
-    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>,
-  );
   get [Symbol.toStringTag](): string;
   toString(): string;
   toJSON(): GraphQLFormattedError;
@@ -126,17 +110,3 @@ export interface GraphQLFormattedError {
     [key: string]: unknown;
   };
 }
-/**
- * Prints a GraphQLError to a string, representing useful location information
- * about the error's position in the source.
- *
- * @deprecated Please use `error.toString` instead. Will be removed in v17
- */
-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.toJSON` instead. Will be removed in v17
- */
-export declare function formatError(error: GraphQLError): GraphQLFormattedError;

package/error/GraphQLError.js

@@ -1,180 +1,58 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
-  value: true,
-});
-exports.GraphQLError = void 0;
-exports.formatError = formatError;
-exports.printError = printError;
-
-var _isObjectLike = require('../jsutils/isObjectLike.js');
-
-var _location = require('../language/location.js');
-
-var _printLocation = require('../language/printLocation.js');
-
-function toNormalizedOptions(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;
-}
+import { isObjectLike } from '../jsutils/isObjectLike.js';
+import { getLocation } from '../language/location.js';
+import {
+  printLocation,
+  printSourceLocation,
+} from '../language/printLocation.js';
 /**
  * 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
-   * which correspond to this error.
-   *
-   * Errors during validation often contain multiple locations, for example to
-   * point out two things with the same name. Errors during execution include a
-   * single location, the field which produced the error.
-   *
-   * Enumerable, and appears in the result of JSON.stringify().
-   */
-
-  /**
-   * An array describing the JSON-path into the execution response which
-   * corresponds to this error. Only included for errors during execution.
-   *
-   * Enumerable, and appears in the result of JSON.stringify().
-   */
-
-  /**
-   * An array of GraphQL AST Nodes corresponding to this error.
-   */
-
-  /**
-   * The source GraphQL document for the first location of this error.
-   *
-   * Note that if this Error represents more than one node, the source may not
-   * represent nodes after the first node.
-   */
-
-  /**
-   * An array of character offsets within the source GraphQL document
-   * which correspond to this error.
-   */
-
-  /**
-   * The original error thrown from a field resolver during execution.
-   */
-
-  /**
-   * Extension fields to add to the formatted error.
-   */
-
-  /**
-   * @deprecated Please use the `GraphQLErrorOptions` constructor overload instead.
-   */
-  constructor(message, ...rawArgs) {
-    var _this$nodes, _nodeLocations$, _ref;
-
+export class GraphQLError extends Error {
+  constructor(message, options = {}) {
     const { nodes, source, positions, path, originalError, extensions } =
-      toNormalizedOptions(rawArgs);
+      options;
     super(message);
     this.name = 'GraphQLError';
-    this.path = path !== null && path !== void 0 ? path : undefined;
-    this.originalError =
-      originalError !== null && originalError !== void 0
-        ? originalError
-        : undefined; // Compute list of blame nodes.
-
+    this.path = path ?? undefined;
+    this.originalError = originalError ?? undefined;
+    // Compute list of blame nodes.
     this.nodes = undefinedIfEmpty(
       Array.isArray(nodes) ? nodes : nodes ? [nodes] : undefined,
     );
     const nodeLocations = undefinedIfEmpty(
-      (_this$nodes = this.nodes) === null || _this$nodes === void 0
-        ? void 0
-        : _this$nodes.map((node) => node.loc).filter((loc) => loc != null),
-    ); // Compute locations in the source for the given nodes/positions.
-
-    this.source =
-      source !== null && source !== void 0
-        ? source
-        : nodeLocations === null || nodeLocations === void 0
-        ? void 0
-        : (_nodeLocations$ = nodeLocations[0]) === null ||
-          _nodeLocations$ === void 0
-        ? void 0
-        : _nodeLocations$.source;
-    this.positions =
-      positions !== null && positions !== void 0
-        ? positions
-        : nodeLocations === null || nodeLocations === void 0
-        ? void 0
-        : nodeLocations.map((loc) => loc.start);
+      this.nodes?.map((node) => node.loc).filter((loc) => loc != null),
+    );
+    // Compute locations in the source for the given nodes/positions.
+    this.source = source ?? nodeLocations?.[0]?.source;
+    this.positions = positions ?? nodeLocations?.map((loc) => loc.start);
     this.locations =
       positions && source
-        ? positions.map((pos) => (0, _location.getLocation)(source, pos))
-        : nodeLocations === null || nodeLocations === void 0
-        ? void 0
-        : nodeLocations.map((loc) =>
-            (0, _location.getLocation)(loc.source, loc.start),
-          );
-    const originalExtensions = (0, _isObjectLike.isObjectLike)(
-      originalError === null || originalError === void 0
-        ? void 0
-        : originalError.extensions,
-    )
-      ? originalError === null || originalError === void 0
-        ? void 0
-        : originalError.extensions
+        ? positions.map((pos) => getLocation(source, pos))
+        : nodeLocations?.map((loc) => getLocation(loc.source, loc.start));
+    const originalExtensions = isObjectLike(originalError?.extensions)
+      ? originalError?.extensions
       : undefined;
-    this.extensions =
-      (_ref =
-        extensions !== null && extensions !== void 0
-          ? extensions
-          : originalExtensions) !== null && _ref !== void 0
-        ? _ref
-        : Object.create(null); // Only properties prescribed by the spec should be enumerable.
+    this.extensions = extensions ?? originalExtensions ?? Object.create(null);
+    // Only properties prescribed by the spec should be enumerable.
     // Keep the rest as non-enumerable.
-
     Object.defineProperties(this, {
       message: {
         writable: true,
         enumerable: true,
       },
-      name: {
-        enumerable: false,
-      },
-      nodes: {
-        enumerable: false,
-      },
-      source: {
-        enumerable: false,
-      },
-      positions: {
-        enumerable: false,
-      },
-      originalError: {
-        enumerable: false,
-      },
-    }); // Include (non-enumerable) stack trace.
-
+      name: { enumerable: false },
+      nodes: { enumerable: false },
+      source: { enumerable: false },
+      positions: { enumerable: false },
+      originalError: { enumerable: false },
+    });
+    // Include (non-enumerable) stack trace.
     /* c8 ignore start */
     // FIXME: https://github.com/graphql/graphql-js/issues/2317
-
-    if (
-      originalError !== null &&
-      originalError !== void 0 &&
-      originalError.stack
-    ) {
+    if (originalError?.stack) {
       Object.defineProperty(this, 'stack', {
         value: originalError.stack,
         writable: true,
@@ -191,77 +69,40 @@ class GraphQLError extends Error {
     }
     /* c8 ignore stop */
   }
-
   get [Symbol.toStringTag]() {
     return 'GraphQLError';
   }
-
   toString() {
     let output = this.message;
-
     if (this.nodes) {
       for (const node of this.nodes) {
         if (node.loc) {
-          output += '\n\n' + (0, _printLocation.printLocation)(node.loc);
+          output += '\n\n' + printLocation(node.loc);
         }
       }
     } else if (this.source && this.locations) {
       for (const location of this.locations) {
-        output +=
-          '\n\n' +
-          (0, _printLocation.printSourceLocation)(this.source, location);
+        output += '\n\n' + printSourceLocation(this.source, location);
       }
     }
-
     return output;
   }
-
   toJSON() {
     const formattedError = {
       message: this.message,
     };
-
     if (this.locations != null) {
       formattedError.locations = this.locations;
     }
-
     if (this.path != null) {
       formattedError.path = this.path;
     }
-
     if (this.extensions != null && Object.keys(this.extensions).length > 0) {
       formattedError.extensions = this.extensions;
     }
-
     return formattedError;
   }
 }
-
-exports.GraphQLError = GraphQLError;
-
 function undefinedIfEmpty(array) {
   return array === undefined || array.length === 0 ? undefined : array;
 }
-/**
- * See: https://spec.graphql.org/draft/#sec-Errors
- */
-
-/**
- * Prints a GraphQLError to a string, representing useful location information
- * about the error's position in the source.
- *
- * @deprecated Please use `error.toString` instead. Will be removed in v17
- */
-function printError(error) {
-  return error.toString();
-}
-/**
- * Given a GraphQLError, format it according to the rules described by the
- * Response Format, Errors section of the GraphQL Specification.
- *
- * @deprecated Please use `error.toJSON` instead. Will be removed in v17
- */
-
-function formatError(error) {
-  return error.toJSON();
-}

package/error/index.d.ts

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

package/error/index.js

@@ -1,41 +1,3 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
-  value: true,
-});
-Object.defineProperty(exports, 'GraphQLError', {
-  enumerable: true,
-  get: function () {
-    return _GraphQLError.GraphQLError;
-  },
-});
-Object.defineProperty(exports, 'formatError', {
-  enumerable: true,
-  get: function () {
-    return _GraphQLError.formatError;
-  },
-});
-Object.defineProperty(exports, 'locatedError', {
-  enumerable: true,
-  get: function () {
-    return _locatedError.locatedError;
-  },
-});
-Object.defineProperty(exports, 'printError', {
-  enumerable: true,
-  get: function () {
-    return _GraphQLError.printError;
-  },
-});
-Object.defineProperty(exports, 'syntaxError', {
-  enumerable: true,
-  get: function () {
-    return _syntaxError.syntaxError;
-  },
-});
-
-var _GraphQLError = require('./GraphQLError.js');
-
-var _syntaxError = require('./syntaxError.js');
-
-var _locatedError = require('./locatedError.js');
+export { GraphQLError } from './GraphQLError.js';
+export { syntaxError } from './syntaxError.js';
+export { locatedError } from './locatedError.js';

package/error/locatedError.js

@@ -1,40 +1,24 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
-  value: true,
-});
-exports.locatedError = locatedError;
-
-var _toError = require('../jsutils/toError.js');
-
-var _GraphQLError = require('./GraphQLError.js');
-
+import { toError } from '../jsutils/toError.js';
+import { GraphQLError } from './GraphQLError.js';
 /**
  * Given an arbitrary value, presumably thrown while attempting to execute a
  * GraphQL operation, produce a new GraphQLError aware of the location in the
  * document responsible for the original Error.
  */
-function locatedError(rawOriginalError, nodes, path) {
-  var _nodes;
-
-  const originalError = (0, _toError.toError)(rawOriginalError); // Note: this uses a brand-check to support GraphQL errors originating from other contexts.
-
+export function locatedError(rawOriginalError, nodes, path) {
+  const originalError = toError(rawOriginalError);
+  // Note: this uses a brand-check to support GraphQL errors originating from other contexts.
   if (isLocatedGraphQLError(originalError)) {
     return originalError;
   }
-
-  return new _GraphQLError.GraphQLError(originalError.message, {
-    nodes:
-      (_nodes = originalError.nodes) !== null && _nodes !== void 0
-        ? _nodes
-        : nodes,
+  return new GraphQLError(originalError.message, {
+    nodes: originalError.nodes ?? nodes,
     source: originalError.source,
     positions: originalError.positions,
     path,
     originalError,
   });
 }
-
 function isLocatedGraphQLError(error) {
   return Array.isArray(error.path);
 }

package/error/syntaxError.js

@@ -1,18 +1,10 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
-  value: true,
-});
-exports.syntaxError = syntaxError;
-
-var _GraphQLError = require('./GraphQLError.js');
-
+import { GraphQLError } from './GraphQLError.js';
 /**
  * Produces a GraphQLError representing a syntax error, containing useful
  * descriptive information about the syntax error's position in the source.
  */
-function syntaxError(source, position, description) {
-  return new _GraphQLError.GraphQLError(`Syntax Error: ${description}`, {
+export function syntaxError(source, position, description) {
+  return new GraphQLError(`Syntax Error: ${description}`, {
     source,
     positions: [position],
   });

package/execution/collectFields.js

@@ -1,21 +1,12 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
-  value: true,
-});
-exports.collectFields = collectFields;
-exports.collectSubfields = collectSubfields;
-
-var _kinds = require('../language/kinds.js');
-
-var _definition = require('../type/definition.js');
-
-var _directives = require('../type/directives.js');
-
-var _typeFromAST = require('../utilities/typeFromAST.js');
-
-var _values = require('./values.js');
-
+import { AccumulatorMap } from '../jsutils/AccumulatorMap.js';
+import { Kind } from '../language/kinds.js';
+import { isAbstractType } from '../type/definition.js';
+import {
+  GraphQLIncludeDirective,
+  GraphQLSkipDirective,
+} from '../type/directives.js';
+import { typeFromAST } from '../utilities/typeFromAST.js';
+import { getDirectiveValues } from './values.js';
 /**
  * Given a selectionSet, collects all of the fields and returns them.
  *
@@ -25,14 +16,14 @@ var _values = require('./values.js');
  *
  * @internal
  */
-function collectFields(
+export function collectFields(
   schema,
   fragments,
   variableValues,
   runtimeType,
   selectionSet,
 ) {
-  const fields = new Map();
+  const fields = new AccumulatorMap();
   collectFieldsImpl(
     schema,
     fragments,
@@ -54,17 +45,15 @@ function collectFields(
  *
  * @internal
  */
-
-function collectSubfields(
+export function collectSubfields(
   schema,
   fragments,
   variableValues,
   returnType,
   fieldNodes,
 ) {
-  const subFieldNodes = new Map();
+  const subFieldNodes = new AccumulatorMap();
   const visitedFragmentNames = new Set();
-
   for (const node of fieldNodes) {
     if (node.selectionSet) {
       collectFieldsImpl(
@@ -78,10 +67,8 @@ function collectSubfields(
       );
     }
   }
-
   return subFieldNodes;
 }
-
 function collectFieldsImpl(
   schema,
   fragments,
@@ -93,31 +80,20 @@ function collectFieldsImpl(
 ) {
   for (const selection of selectionSet.selections) {
     switch (selection.kind) {
-      case _kinds.Kind.FIELD: {
+      case Kind.FIELD: {
         if (!shouldIncludeNode(variableValues, selection)) {
           continue;
         }
-
-        const name = getFieldEntryKey(selection);
-        const fieldList = fields.get(name);
-
-        if (fieldList !== undefined) {
-          fieldList.push(selection);
-        } else {
-          fields.set(name, [selection]);
-        }
-
+        fields.add(getFieldEntryKey(selection), selection);
         break;
       }
-
-      case _kinds.Kind.INLINE_FRAGMENT: {
+      case Kind.INLINE_FRAGMENT: {
         if (
           !shouldIncludeNode(variableValues, selection) ||
           !doesFragmentConditionMatch(schema, selection, runtimeType)
         ) {
           continue;
         }
-
         collectFieldsImpl(
           schema,
           fragments,
@@ -129,27 +105,22 @@ function collectFieldsImpl(
         );
         break;
       }
-
-      case _kinds.Kind.FRAGMENT_SPREAD: {
+      case Kind.FRAGMENT_SPREAD: {
         const fragName = selection.name.value;
-
         if (
           visitedFragmentNames.has(fragName) ||
           !shouldIncludeNode(variableValues, selection)
         ) {
           continue;
         }
-
         visitedFragmentNames.add(fragName);
         const fragment = fragments[fragName];
-
         if (
           !fragment ||
           !doesFragmentConditionMatch(schema, fragment, runtimeType)
         ) {
           continue;
         }
-
         collectFieldsImpl(
           schema,
           fragments,
@@ -168,62 +139,41 @@ function collectFieldsImpl(
  * Determines if a field should be included based on the `@include` and `@skip`
  * directives, where `@skip` has higher precedence than `@include`.
  */
-
 function shouldIncludeNode(variableValues, node) {
-  const skip = (0, _values.getDirectiveValues)(
-    _directives.GraphQLSkipDirective,
-    node,
-    variableValues,
-  );
-
-  if ((skip === null || skip === void 0 ? void 0 : skip.if) === true) {
+  const skip = getDirectiveValues(GraphQLSkipDirective, node, variableValues);
+  if (skip?.if === true) {
     return false;
   }
-
-  const include = (0, _values.getDirectiveValues)(
-    _directives.GraphQLIncludeDirective,
+  const include = getDirectiveValues(
+    GraphQLIncludeDirective,
     node,
     variableValues,
   );
-
-  if (
-    (include === null || include === void 0 ? void 0 : include.if) === false
-  ) {
+  if (include?.if === false) {
     return false;
   }
-
   return true;
 }
 /**
  * Determines if a fragment is applicable to the given type.
  */
-
 function doesFragmentConditionMatch(schema, fragment, type) {
   const typeConditionNode = fragment.typeCondition;
-
   if (!typeConditionNode) {
     return true;
   }
-
-  const conditionalType = (0, _typeFromAST.typeFromAST)(
-    schema,
-    typeConditionNode,
-  );
-
+  const conditionalType = typeFromAST(schema, typeConditionNode);
   if (conditionalType === type) {
     return true;
   }
-
-  if ((0, _definition.isAbstractType)(conditionalType)) {
+  if (isAbstractType(conditionalType)) {
     return schema.isSubType(conditionalType, type);
   }
-
   return false;
 }
 /**
  * Implements the logic to compute the key of a given field's entry
  */
-
 function getFieldEntryKey(node) {
   return node.alias ? node.alias.value : node.name.value;
 }