graphql 15.5.2 → 15.7.0

package/error/GraphQLError.d.ts

@@ -4,6 +4,19 @@ import { ASTNode } from '../language/ast';
 import { Source } from '../language/source';
 import { SourceLocation } from '../language/location';
 
+/**
+ * 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.
+ */
+export interface GraphQLErrorExtensions {
+  [attributeName: string]: any;
+}
+
 /**
  * A GraphQLError describes an Error found during the parse, validate, or
  * execute phases of performing a GraphQL operation. In addition to a message
@@ -18,18 +31,9 @@ export class GraphQLError extends Error {
     positions?: Maybe<ReadonlyArray<number>>,
     path?: Maybe<ReadonlyArray<string | number>>,
     originalError?: Maybe<Error>,
-    extensions?: Maybe<{ [key: string]: any }>,
+    extensions?: Maybe<GraphQLErrorExtensions>,
   );
 
-  /**
-   * A message describing the Error for debugging purposes.
-   *
-   * Enumerable, and appears in the result of JSON.stringify().
-   *
-   * Note: should be treated as readonly, despite invariant usage.
-   */
-  message: string;
-
   /**
    * An array of { line, column } locations within the source GraphQL document
    * which correspond to this error.
@@ -72,12 +76,12 @@ export class GraphQLError extends Error {
   /**
    * The original error thrown from a field resolver during execution.
    */
-  readonly originalError: Maybe<Error>;
+  readonly originalError: Error | undefined;
 
   /**
    * Extension fields to add to the formatted error.
    */
-  readonly extensions: { [key: string]: any } | undefined;
+  readonly extensions: { [key: string]: any };
 }
 
 /**

package/error/GraphQLError.js

@@ -18,6 +18,12 @@ var _printLocation = require("../language/printLocation.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -55,14 +61,6 @@ var GraphQLError = /*#__PURE__*/function (_Error) {
 
   var _super = _createSuper(GraphQLError);
 
-  /**
-   * A message describing the Error for debugging purposes.
-   *
-   * Enumerable, and appears in the result of JSON.stringify().
-   *
-   * Note: should be treated as readonly, despite invariant usage.
-   */
-
   /**
    * An array of { line, column } locations within the source GraphQL document
    * which correspond to this error.
@@ -105,117 +103,78 @@ var GraphQLError = /*#__PURE__*/function (_Error) {
    * Extension fields to add to the formatted error.
    */
   function GraphQLError(message, nodes, source, positions, path, originalError, extensions) {
-    var _locations2, _source2, _positions2, _extensions2;
+    var _nodeLocations, _nodeLocations2, _nodeLocations3;
 
     var _this;
 
     _classCallCheck(this, GraphQLError);
 
-    _this = _super.call(this, message); // Compute list of blame nodes.
+    _this = _super.call(this, message);
+    _this.name = 'GraphQLError';
+    _this.originalError = originalError !== null && originalError !== void 0 ? originalError : undefined; // Compute list of blame nodes.
 
-    var _nodes = Array.isArray(nodes) ? nodes.length !== 0 ? nodes : undefined : nodes ? [nodes] : undefined; // Compute locations in the source for the given nodes/positions.
+    _this.nodes = undefinedIfEmpty(Array.isArray(nodes) ? nodes : nodes ? [nodes] : undefined);
+    var nodeLocations = [];
 
+    for (var _i2 = 0, _ref3 = (_this$nodes = _this.nodes) !== null && _this$nodes !== void 0 ? _this$nodes : []; _i2 < _ref3.length; _i2++) {
+      var _this$nodes;
 
-    var _source = source;
+      var _ref4 = _ref3[_i2];
+      var loc = _ref4.loc;
 
-    if (!_source && _nodes) {
-      var _nodes$0$loc;
-
-      _source = (_nodes$0$loc = _nodes[0].loc) === null || _nodes$0$loc === void 0 ? void 0 : _nodes$0$loc.source;
-    }
-
-    var _positions = positions;
-
-    if (!_positions && _nodes) {
-      _positions = _nodes.reduce(function (list, node) {
-        if (node.loc) {
-          list.push(node.loc.start);
-        }
-
-        return list;
-      }, []);
-    }
-
-    if (_positions && _positions.length === 0) {
-      _positions = undefined;
+      if (loc != null) {
+        nodeLocations.push(loc);
+      }
     }
 
-    var _locations;
-
-    if (positions && source) {
-      _locations = positions.map(function (pos) {
-        return (0, _location.getLocation)(source, pos);
-      });
-    } else if (_nodes) {
-      _locations = _nodes.reduce(function (list, node) {
-        if (node.loc) {
-          list.push((0, _location.getLocation)(node.loc.source, node.loc.start));
-        }
-
-        return list;
-      }, []);
-    }
+    nodeLocations = undefinedIfEmpty(nodeLocations); // Compute locations in the source for the given nodes/positions.
 
-    var _extensions = extensions;
+    _this.source = source !== null && source !== void 0 ? source : (_nodeLocations = nodeLocations) === null || _nodeLocations === void 0 ? void 0 : _nodeLocations[0].source;
+    _this.positions = positions !== null && positions !== void 0 ? positions : (_nodeLocations2 = nodeLocations) === null || _nodeLocations2 === void 0 ? void 0 : _nodeLocations2.map(function (loc) {
+      return loc.start;
+    });
+    _this.locations = positions && source ? positions.map(function (pos) {
+      return (0, _location.getLocation)(source, pos);
+    }) : (_nodeLocations3 = nodeLocations) === null || _nodeLocations3 === void 0 ? void 0 : _nodeLocations3.map(function (loc) {
+      return (0, _location.getLocation)(loc.source, loc.start);
+    });
+    _this.path = path !== null && path !== void 0 ? path : undefined;
+    _this.extensions = extensions !== null && extensions !== void 0 ? extensions : {};
+    var originalExtensions = originalError === null || originalError === void 0 ? void 0 : originalError.extensions;
 
-    if (_extensions == null && originalError != null) {
-      var originalExtensions = originalError.extensions;
+    if ((0, _isObjectLike.default)(originalExtensions)) {
+      _this.extensions = _objectSpread({}, originalExtensions);
+    } // By being enumerable, JSON.stringify will include bellow properties in the resulting output.
+    // This ensures that the simplest possible GraphQL service adheres to the spec.
 
-      if ((0, _isObjectLike.default)(originalExtensions)) {
-        _extensions = originalExtensions;
-      }
-    }
 
     Object.defineProperties(_assertThisInitialized(_this), {
-      name: {
-        value: 'GraphQLError'
-      },
       message: {
-        value: message,
-        // By being enumerable, JSON.stringify will include `message` in the
-        // resulting output. This ensures that the simplest possible GraphQL
-        // service adheres to the spec.
-        enumerable: true,
-        writable: true
+        enumerable: true
       },
       locations: {
-        // Coercing falsy values to undefined ensures they will not be included
-        // in JSON.stringify() when not provided.
-        value: (_locations2 = _locations) !== null && _locations2 !== void 0 ? _locations2 : undefined,
-        // By being enumerable, JSON.stringify will include `locations` in the
-        // resulting output. This ensures that the simplest possible GraphQL
-        // service adheres to the spec.
-        enumerable: _locations != null
+        enumerable: _this.locations != null
       },
       path: {
-        // Coercing falsy values to undefined ensures they will not be included
-        // in JSON.stringify() when not provided.
-        value: path !== null && path !== void 0 ? path : undefined,
-        // By being enumerable, JSON.stringify will include `path` in the
-        // resulting output. This ensures that the simplest possible GraphQL
-        // service adheres to the spec.
-        enumerable: path != null
+        enumerable: _this.path != null
+      },
+      extensions: {
+        enumerable: _this.extensions != null && Object.keys(_this.extensions).length > 0
+      },
+      name: {
+        enumerable: false
       },
       nodes: {
-        value: _nodes !== null && _nodes !== void 0 ? _nodes : undefined
+        enumerable: false
       },
       source: {
-        value: (_source2 = _source) !== null && _source2 !== void 0 ? _source2 : undefined
+        enumerable: false
       },
       positions: {
-        value: (_positions2 = _positions) !== null && _positions2 !== void 0 ? _positions2 : undefined
+        enumerable: false
       },
       originalError: {
-        value: originalError
-      },
-      extensions: {
-        // Coercing falsy values to undefined ensures they will not be included
-        // in JSON.stringify() when not provided.
-        value: (_extensions2 = _extensions) !== null && _extensions2 !== void 0 ? _extensions2 : undefined,
-        // By being enumerable, JSON.stringify will include `path` in the
-        // resulting output. This ensures that the simplest possible GraphQL
-        // service adheres to the spec.
-        enumerable: _extensions != null
+        enumerable: false
       }
     }); // Include (non-enumerable) stack trace.
 
@@ -258,28 +217,32 @@ var GraphQLError = /*#__PURE__*/function (_Error) {
 
   return GraphQLError;
 }( /*#__PURE__*/_wrapNativeSuper(Error));
+
+exports.GraphQLError = GraphQLError;
+
+function undefinedIfEmpty(array) {
+  return array === undefined || array.length === 0 ? undefined : array;
+}
 /**
  * Prints a GraphQLError to a string, representing useful location information
  * about the error's position in the source.
  */
 
 
-exports.GraphQLError = GraphQLError;
-
 function printError(error) {
   var output = error.message;
 
   if (error.nodes) {
-    for (var _i2 = 0, _error$nodes2 = error.nodes; _i2 < _error$nodes2.length; _i2++) {
-      var node = _error$nodes2[_i2];
+    for (var _i4 = 0, _error$nodes2 = error.nodes; _i4 < _error$nodes2.length; _i4++) {
+      var node = _error$nodes2[_i4];
 
       if (node.loc) {
         output += '\n\n' + (0, _printLocation.printLocation)(node.loc);
       }
     }
   } else if (error.source && error.locations) {
-    for (var _i4 = 0, _error$locations2 = error.locations; _i4 < _error$locations2.length; _i4++) {
-      var location = _error$locations2[_i4];
+    for (var _i6 = 0, _error$locations2 = error.locations; _i6 < _error$locations2.length; _i6++) {
+      var location = _error$locations2[_i6];
       output += '\n\n' + (0, _printLocation.printSourceLocation)(error.source, location);
     }
   }

package/error/GraphQLError.js.flow

@@ -1,7 +1,4 @@
 // @flow strict
-// FIXME:
-// flowlint uninitialized-instance-property:off
-
 import isObjectLike from '../jsutils/isObjectLike';
 import { SYMBOL_TO_STRING_TAG } from '../polyfills/symbols';
 
@@ -18,15 +15,6 @@ import { printLocation, printSourceLocation } from '../language/printLocation';
  * GraphQL document and/or execution result that correspond to the Error.
  */
 export class GraphQLError extends Error {
-  /**
-   * A message describing the Error for debugging purposes.
-   *
-   * Enumerable, and appears in the result of JSON.stringify().
-   *
-   * Note: should be treated as readonly, despite invariant usage.
-   */
-  message: string;
-
   /**
    * An array of { line, column } locations within the source GraphQL document
    * which correspond to this error.
@@ -69,12 +57,12 @@ export class GraphQLError extends Error {
   /**
    * The original error thrown from a field resolver during execution.
    */
-  +originalError: ?Error;
+  +originalError: Error | void;
 
   /**
    * Extension fields to add to the formatted error.
    */
-  +extensions: { [key: string]: mixed, ... } | void;
+  +extensions: { [key: string]: mixed, ... };
 
   constructor(
     message: string,
@@ -87,103 +75,60 @@ export class GraphQLError extends Error {
   ) {
     super(message);
 
+    this.name = 'GraphQLError';
+    this.originalError = originalError ?? undefined;
+
     // Compute list of blame nodes.
-    const _nodes = Array.isArray(nodes)
-      ? nodes.length !== 0
-        ? nodes
-        : undefined
-      : nodes
-      ? [nodes]
-      : undefined;
+    this.nodes = undefinedIfEmpty(
+      Array.isArray(nodes) ? nodes : nodes ? [nodes] : undefined,
+    );
+
+    let nodeLocations = [];
+    for (const { loc } of this.nodes ?? []) {
+      if (loc != null) {
+        nodeLocations.push(loc);
+      }
+    }
+    nodeLocations = undefinedIfEmpty(nodeLocations);
 
     // Compute locations in the source for the given nodes/positions.
-    let _source = source;
-    if (!_source && _nodes) {
-      _source = _nodes[0].loc?.source;
-    }
+    this.source = source ?? nodeLocations?.[0].source;
 
-    let _positions = positions;
-    if (!_positions && _nodes) {
-      _positions = _nodes.reduce((list, node) => {
-        if (node.loc) {
-          list.push(node.loc.start);
-        }
-        return list;
-      }, []);
-    }
-    if (_positions && _positions.length === 0) {
-      _positions = undefined;
-    }
+    this.positions = positions ?? nodeLocations?.map((loc) => loc.start);
 
-    let _locations;
-    if (positions && source) {
-      _locations = positions.map((pos) => getLocation(source, pos));
-    } else if (_nodes) {
-      _locations = _nodes.reduce((list, node) => {
-        if (node.loc) {
-          list.push(getLocation(node.loc.source, node.loc.start));
-        }
-        return list;
-      }, []);
-    }
+    this.locations =
+      positions && source
+        ? positions.map((pos) => getLocation(source, pos))
+        : nodeLocations?.map((loc) => getLocation(loc.source, loc.start));
 
-    let _extensions = extensions;
-    if (_extensions == null && originalError != null) {
-      const originalExtensions = originalError.extensions;
-      if (isObjectLike(originalExtensions)) {
-        _extensions = originalExtensions;
-      }
+    this.path = path ?? undefined;
+
+    this.extensions = extensions ?? {};
+
+    const originalExtensions = originalError?.extensions;
+    if (isObjectLike(originalExtensions)) {
+      this.extensions = { ...originalExtensions };
     }
 
+    // By being enumerable, JSON.stringify will include bellow properties in the resulting output.
+    // This ensures that the simplest possible GraphQL service adheres to the spec.
     Object.defineProperties((this: any), {
-      name: { value: 'GraphQLError' },
-      message: {
-        value: message,
-        // By being enumerable, JSON.stringify will include `message` in the
-        // resulting output. This ensures that the simplest possible GraphQL
-        // service adheres to the spec.
-        enumerable: true,
-        writable: true,
-      },
+      message: { enumerable: true },
       locations: {
-        // Coercing falsy values to undefined ensures they will not be included
-        // in JSON.stringify() when not provided.
-        value: _locations ?? undefined,
-        // By being enumerable, JSON.stringify will include `locations` in the
-        // resulting output. This ensures that the simplest possible GraphQL
-        // service adheres to the spec.
-        enumerable: _locations != null,
+        enumerable: this.locations != null,
       },
       path: {
-        // Coercing falsy values to undefined ensures they will not be included
-        // in JSON.stringify() when not provided.
-        value: path ?? undefined,
-        // By being enumerable, JSON.stringify will include `path` in the
-        // resulting output. This ensures that the simplest possible GraphQL
-        // service adheres to the spec.
-        enumerable: path != null,
-      },
-      nodes: {
-        value: _nodes ?? undefined,
-      },
-      source: {
-        value: _source ?? undefined,
-      },
-      positions: {
-        value: _positions ?? undefined,
-      },
-      originalError: {
-        value: originalError,
+        enumerable: this.path != null,
       },
       extensions: {
-        // Coercing falsy values to undefined ensures they will not be included
-        // in JSON.stringify() when not provided.
-        value: _extensions ?? undefined,
-        // By being enumerable, JSON.stringify will include `path` in the
-        // resulting output. This ensures that the simplest possible GraphQL
-        // service adheres to the spec.
-        enumerable: _extensions != null,
+        enumerable:
+          this.extensions != null && Object.keys(this.extensions).length > 0,
       },
+      name: { enumerable: false },
+      nodes: { enumerable: false },
+      source: { enumerable: false },
+      positions: { enumerable: false },
+      originalError: { enumerable: false },
     });
 
     // Include (non-enumerable) stack trace.
@@ -219,6 +164,12 @@ export class GraphQLError extends Error {
   }
 }
 
+function undefinedIfEmpty<T>(
+  array: $ReadOnlyArray<T> | void,
+): $ReadOnlyArray<T> | void {
+  return array === undefined || array.length === 0 ? undefined : array;
+}
+
 /**
  * Prints a GraphQLError to a string, representing useful location information
  * about the error's position in the source.

package/error/GraphQLError.mjs

@@ -1,5 +1,11 @@
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -26,8 +32,6 @@ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || func
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-// FIXME:
-// flowlint uninitialized-instance-property:off
 import isObjectLike from "../jsutils/isObjectLike.mjs";
 import { SYMBOL_TO_STRING_TAG } from "../polyfills/symbols.mjs";
 import { getLocation } from "../language/location.mjs";
@@ -44,14 +48,6 @@ export var GraphQLError = /*#__PURE__*/function (_Error) {
 
   var _super = _createSuper(GraphQLError);
 
-  /**
-   * A message describing the Error for debugging purposes.
-   *
-   * Enumerable, and appears in the result of JSON.stringify().
-   *
-   * Note: should be treated as readonly, despite invariant usage.
-   */
-
   /**
    * An array of { line, column } locations within the source GraphQL document
    * which correspond to this error.
@@ -94,117 +90,78 @@ export var GraphQLError = /*#__PURE__*/function (_Error) {
    * Extension fields to add to the formatted error.
    */
   function GraphQLError(message, nodes, source, positions, path, originalError, extensions) {
-    var _locations2, _source2, _positions2, _extensions2;
+    var _nodeLocations, _nodeLocations2, _nodeLocations3;
 
     var _this;
 
     _classCallCheck(this, GraphQLError);
 
-    _this = _super.call(this, message); // Compute list of blame nodes.
+    _this = _super.call(this, message);
+    _this.name = 'GraphQLError';
+    _this.originalError = originalError !== null && originalError !== void 0 ? originalError : undefined; // Compute list of blame nodes.
 
-    var _nodes = Array.isArray(nodes) ? nodes.length !== 0 ? nodes : undefined : nodes ? [nodes] : undefined; // Compute locations in the source for the given nodes/positions.
+    _this.nodes = undefinedIfEmpty(Array.isArray(nodes) ? nodes : nodes ? [nodes] : undefined);
+    var nodeLocations = [];
 
+    for (var _i2 = 0, _ref3 = (_this$nodes = _this.nodes) !== null && _this$nodes !== void 0 ? _this$nodes : []; _i2 < _ref3.length; _i2++) {
+      var _this$nodes;
 
-    var _source = source;
+      var _ref4 = _ref3[_i2];
+      var loc = _ref4.loc;
 
-    if (!_source && _nodes) {
-      var _nodes$0$loc;
-
-      _source = (_nodes$0$loc = _nodes[0].loc) === null || _nodes$0$loc === void 0 ? void 0 : _nodes$0$loc.source;
+      if (loc != null) {
+        nodeLocations.push(loc);
+      }
     }
 
-    var _positions = positions;
-
-    if (!_positions && _nodes) {
-      _positions = _nodes.reduce(function (list, node) {
-        if (node.loc) {
-          list.push(node.loc.start);
-        }
-
-        return list;
-      }, []);
-    }
+    nodeLocations = undefinedIfEmpty(nodeLocations); // Compute locations in the source for the given nodes/positions.
 
-    if (_positions && _positions.length === 0) {
-      _positions = undefined;
-    }
+    _this.source = source !== null && source !== void 0 ? source : (_nodeLocations = nodeLocations) === null || _nodeLocations === void 0 ? void 0 : _nodeLocations[0].source;
+    _this.positions = positions !== null && positions !== void 0 ? positions : (_nodeLocations2 = nodeLocations) === null || _nodeLocations2 === void 0 ? void 0 : _nodeLocations2.map(function (loc) {
+      return loc.start;
+    });
+    _this.locations = positions && source ? positions.map(function (pos) {
+      return getLocation(source, pos);
+    }) : (_nodeLocations3 = nodeLocations) === null || _nodeLocations3 === void 0 ? void 0 : _nodeLocations3.map(function (loc) {
+      return getLocation(loc.source, loc.start);
+    });
+    _this.path = path !== null && path !== void 0 ? path : undefined;
+    _this.extensions = extensions !== null && extensions !== void 0 ? extensions : {};
+    var originalExtensions = originalError === null || originalError === void 0 ? void 0 : originalError.extensions;
 
-    var _locations;
+    if (isObjectLike(originalExtensions)) {
+      _this.extensions = _objectSpread({}, originalExtensions);
+    } // By being enumerable, JSON.stringify will include bellow properties in the resulting output.
+    // This ensures that the simplest possible GraphQL service adheres to the spec.
 
-    if (positions && source) {
-      _locations = positions.map(function (pos) {
-        return getLocation(source, pos);
-      });
-    } else if (_nodes) {
-      _locations = _nodes.reduce(function (list, node) {
-        if (node.loc) {
-          list.push(getLocation(node.loc.source, node.loc.start));
-        }
-
-        return list;
-      }, []);
-    }
-
-    var _extensions = extensions;
-
-    if (_extensions == null && originalError != null) {
-      var originalExtensions = originalError.extensions;
-
-      if (isObjectLike(originalExtensions)) {
-        _extensions = originalExtensions;
-      }
-    }
 
     Object.defineProperties(_assertThisInitialized(_this), {
-      name: {
-        value: 'GraphQLError'
-      },
       message: {
-        value: message,
-        // By being enumerable, JSON.stringify will include `message` in the
-        // resulting output. This ensures that the simplest possible GraphQL
-        // service adheres to the spec.
-        enumerable: true,
-        writable: true
+        enumerable: true
       },
       locations: {
-        // Coercing falsy values to undefined ensures they will not be included
-        // in JSON.stringify() when not provided.
-        value: (_locations2 = _locations) !== null && _locations2 !== void 0 ? _locations2 : undefined,
-        // By being enumerable, JSON.stringify will include `locations` in the
-        // resulting output. This ensures that the simplest possible GraphQL
-        // service adheres to the spec.
-        enumerable: _locations != null
+        enumerable: _this.locations != null
       },
       path: {
-        // Coercing falsy values to undefined ensures they will not be included
-        // in JSON.stringify() when not provided.
-        value: path !== null && path !== void 0 ? path : undefined,
-        // By being enumerable, JSON.stringify will include `path` in the
-        // resulting output. This ensures that the simplest possible GraphQL
-        // service adheres to the spec.
-        enumerable: path != null
+        enumerable: _this.path != null
+      },
+      extensions: {
+        enumerable: _this.extensions != null && Object.keys(_this.extensions).length > 0
+      },
+      name: {
+        enumerable: false
       },
       nodes: {
-        value: _nodes !== null && _nodes !== void 0 ? _nodes : undefined
+        enumerable: false
       },
       source: {
-        value: (_source2 = _source) !== null && _source2 !== void 0 ? _source2 : undefined
+        enumerable: false
       },
       positions: {
-        value: (_positions2 = _positions) !== null && _positions2 !== void 0 ? _positions2 : undefined
+        enumerable: false
       },
       originalError: {
-        value: originalError
-      },
-      extensions: {
-        // Coercing falsy values to undefined ensures they will not be included
-        // in JSON.stringify() when not provided.
-        value: (_extensions2 = _extensions) !== null && _extensions2 !== void 0 ? _extensions2 : undefined,
-        // By being enumerable, JSON.stringify will include `path` in the
-        // resulting output. This ensures that the simplest possible GraphQL
-        // service adheres to the spec.
-        enumerable: _extensions != null
+        enumerable: false
       }
     }); // Include (non-enumerable) stack trace.
 
@@ -247,25 +204,30 @@ export var GraphQLError = /*#__PURE__*/function (_Error) {
 
   return GraphQLError;
 }( /*#__PURE__*/_wrapNativeSuper(Error));
+
+function undefinedIfEmpty(array) {
+  return array === undefined || array.length === 0 ? undefined : array;
+}
 /**
  * Prints a GraphQLError to a string, representing useful location information
  * about the error's position in the source.
  */
 
+
 export function printError(error) {
   var output = error.message;
 
   if (error.nodes) {
-    for (var _i2 = 0, _error$nodes2 = error.nodes; _i2 < _error$nodes2.length; _i2++) {
-      var node = _error$nodes2[_i2];
+    for (var _i4 = 0, _error$nodes2 = error.nodes; _i4 < _error$nodes2.length; _i4++) {
+      var node = _error$nodes2[_i4];
 
       if (node.loc) {
         output += '\n\n' + printLocation(node.loc);
       }
     }
   } else if (error.source && error.locations) {
-    for (var _i4 = 0, _error$locations2 = error.locations; _i4 < _error$locations2.length; _i4++) {
-      var location = _error$locations2[_i4];
+    for (var _i6 = 0, _error$locations2 = error.locations; _i6 < _error$locations2.length; _i6++) {
+      var location = _error$locations2[_i6];
       output += '\n\n' + printSourceLocation(error.source, location);
     }
   }

package/error/formatError.js

@@ -21,7 +21,7 @@ function formatError(error) {
   var locations = error.locations;
   var path = error.path;
   var extensions = error.extensions;
-  return extensions ? {
+  return extensions && Object.keys(extensions).length > 0 ? {
     message: message,
     locations: locations,
     path: path,

package/error/formatError.js.flow

@@ -16,7 +16,7 @@ export function formatError(error: GraphQLError): GraphQLFormattedError {
   const path = error.path;
   const extensions = error.extensions;
 
-  return extensions
+  return extensions && Object.keys(extensions).length > 0
     ? { message, locations, path, extensions }
     : { message, locations, path };
 }

package/error/formatError.mjs

@@ -12,7 +12,7 @@ export function formatError(error) {
   var locations = error.locations;
   var path = error.path;
   var extensions = error.extensions;
-  return extensions ? {
+  return extensions && Object.keys(extensions).length > 0 ? {
     message: message,
     locations: locations,
     path: path,

package/error/index.d.ts

@@ -1,4 +1,8 @@
-export { GraphQLError, printError } from './GraphQLError';
+export {
+  GraphQLError,
+  GraphQLErrorExtensions,
+  printError,
+} from './GraphQLError';
 export { syntaxError } from './syntaxError';
 export { locatedError } from './locatedError';
 export { formatError, GraphQLFormattedError } from './formatError';

package/index.d.ts

@@ -230,6 +230,7 @@ export {
   Visitor,
   VisitFn,
   VisitorKeyMap,
+  ASTVisitorKeyMap,
   // AST nodes
   ASTNode,
   ASTKindToNode,
@@ -363,6 +364,7 @@ export {
   printError,
   formatError,
   GraphQLFormattedError,
+  GraphQLErrorExtensions,
 } from './error/index';
 
 // Utilities for operating on GraphQL type schema and parsed sources.

package/language/index.d.ts

@@ -17,6 +17,7 @@ export {
   Visitor,
   VisitFn,
   VisitorKeyMap,
+  ASTVisitorKeyMap,
 } from './visitor';
 
 export {

package/language/parser.d.ts

@@ -218,11 +218,11 @@ export class Parser {
   /**
    * Arguments[Const] : ( Argument[?Const]+ )
    */
-  parseArguments: Array<ArgumentNode>;
+  parseArguments(): Array<ArgumentNode>;
   /**
    * Argument[Const] : Name : Value[?Const]
    */
-  parseArgument: ArgumentNode;
+  parseArgument(): ArgumentNode;
   /**
    * Corresponds to both FragmentSpread and InlineFragment in the spec.
    *

package/language/visitor.d.ts

@@ -49,9 +49,18 @@ export type VisitFn<TAnyNode, TVisitedNode = TAnyNode> = (
 
 /**
  * A KeyMap describes each the traversable properties of each kind of node.
+ *
+ * @deprecated Please using ASTVisitorKeyMap instead
  */
 export type VisitorKeyMap<T> = { [P in keyof T]: ReadonlyArray<keyof T[P]> };
 
+/**
+ * A KeyMap describes each the traversable properties of each kind of node.
+ */
+export type ASTVisitorKeyMap = {
+  [P in keyof ASTKindToNode]?: ReadonlyArray<keyof ASTKindToNode[P]>;
+};
+
 // TODO: Should be `[]`, but that requires TypeScript@3
 type EmptyTuple = Array<never>;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql",
-  "version": "15.5.2",
+  "version": "15.7.0",
   "description": "A Query Language and Runtime which can target any service.",
   "license": "MIT",
   "main": "index",

package/type/definition.js

@@ -1166,6 +1166,7 @@ var GraphQLInputObjectType = /*#__PURE__*/function () {
         description: field.description,
         type: field.type,
         defaultValue: field.defaultValue,
+        deprecationReason: field.deprecationReason,
         extensions: field.extensions,
         astNode: field.astNode
       };

package/type/definition.js.flow

@@ -1547,6 +1547,7 @@ export class GraphQLInputObjectType {
       description: field.description,
       type: field.type,
       defaultValue: field.defaultValue,
+      deprecationReason: field.deprecationReason,
       extensions: field.extensions,
       astNode: field.astNode,
     }));

package/type/definition.mjs

@@ -1049,6 +1049,7 @@ export var GraphQLInputObjectType = /*#__PURE__*/function () {
         description: field.description,
         type: field.type,
         defaultValue: field.defaultValue,
+        deprecationReason: field.deprecationReason,
         extensions: field.extensions,
         astNode: field.astNode
       };

package/type/introspection.js

@@ -107,8 +107,17 @@ var __Directive = new _definition.GraphQLObjectType({
       },
       args: {
         type: new _definition.GraphQLNonNull(new _definition.GraphQLList(new _definition.GraphQLNonNull(__InputValue))),
-        resolve: function resolve(directive) {
-          return directive.args;
+        args: {
+          includeDeprecated: {
+            type: _scalars.GraphQLBoolean,
+            defaultValue: false
+          }
+        },
+        resolve: function resolve(field, _ref) {
+          var includeDeprecated = _ref.includeDeprecated;
+          return includeDeprecated ? field.args : field.args.filter(function (arg) {
+            return arg.deprecationReason == null;
+          });
         }
       }
     };
@@ -273,8 +282,8 @@ var __Type = new _definition.GraphQLObjectType({
             defaultValue: false
           }
         },
-        resolve: function resolve(type, _ref) {
-          var includeDeprecated = _ref.includeDeprecated;
+        resolve: function resolve(type, _ref2) {
+          var includeDeprecated = _ref2.includeDeprecated;
 
           if ((0, _definition.isObjectType)(type) || (0, _definition.isInterfaceType)(type)) {
             var fields = (0, _objectValues.default)(type.getFields());
@@ -294,8 +303,8 @@ var __Type = new _definition.GraphQLObjectType({
       },
       possibleTypes: {
         type: new _definition.GraphQLList(new _definition.GraphQLNonNull(__Type)),
-        resolve: function resolve(type, _args, _context, _ref2) {
-          var schema = _ref2.schema;
+        resolve: function resolve(type, _args, _context, _ref3) {
+          var schema = _ref3.schema;
 
           if ((0, _definition.isAbstractType)(type)) {
             return schema.getPossibleTypes(type);
@@ -310,8 +319,8 @@ var __Type = new _definition.GraphQLObjectType({
             defaultValue: false
           }
         },
-        resolve: function resolve(type, _ref3) {
-          var includeDeprecated = _ref3.includeDeprecated;
+        resolve: function resolve(type, _ref4) {
+          var includeDeprecated = _ref4.includeDeprecated;
 
           if ((0, _definition.isEnumType)(type)) {
             var values = type.getValues();
@@ -329,8 +338,8 @@ var __Type = new _definition.GraphQLObjectType({
             defaultValue: false
           }
         },
-        resolve: function resolve(type, _ref4) {
-          var includeDeprecated = _ref4.includeDeprecated;
+        resolve: function resolve(type, _ref5) {
+          var includeDeprecated = _ref5.includeDeprecated;
 
           if ((0, _definition.isInputObjectType)(type)) {
             var values = (0, _objectValues.default)(type.getFields());
@@ -377,8 +386,8 @@ var __Field = new _definition.GraphQLObjectType({
             defaultValue: false
           }
         },
-        resolve: function resolve(field, _ref5) {
-          var includeDeprecated = _ref5.includeDeprecated;
+        resolve: function resolve(field, _ref6) {
+          var includeDeprecated = _ref6.includeDeprecated;
           return includeDeprecated ? field.args : field.args.filter(function (arg) {
             return arg.deprecationReason == null;
           });
@@ -555,8 +564,8 @@ var SchemaMetaFieldDef = {
   type: new _definition.GraphQLNonNull(__Schema),
   description: 'Access the current type schema of this server.',
   args: [],
-  resolve: function resolve(_source, _args, _context, _ref6) {
-    var schema = _ref6.schema;
+  resolve: function resolve(_source, _args, _context, _ref7) {
+    var schema = _ref7.schema;
     return schema;
   },
   isDeprecated: false,
@@ -578,9 +587,9 @@ var TypeMetaFieldDef = {
     extensions: undefined,
     astNode: undefined
   }],
-  resolve: function resolve(_source, _ref7, _context, _ref8) {
-    var name = _ref7.name;
-    var schema = _ref8.schema;
+  resolve: function resolve(_source, _ref8, _context, _ref9) {
+    var name = _ref8.name;
+    var schema = _ref9.schema;
     return schema.getType(name);
   },
   isDeprecated: false,
@@ -594,8 +603,8 @@ var TypeNameMetaFieldDef = {
   type: new _definition.GraphQLNonNull(_scalars.GraphQLString),
   description: 'The name of the current Object type at runtime.',
   args: [],
-  resolve: function resolve(_source, _args, _context, _ref9) {
-    var parentType = _ref9.parentType;
+  resolve: function resolve(_source, _args, _context, _ref10) {
+    var parentType = _ref10.parentType;
     return parentType.name;
   },
   isDeprecated: false,
@@ -608,8 +617,8 @@ var introspectionTypes = Object.freeze([__Schema, __Directive, __DirectiveLocati
 exports.introspectionTypes = introspectionTypes;
 
 function isIntrospectionType(type) {
-  return introspectionTypes.some(function (_ref10) {
-    var name = _ref10.name;
+  return introspectionTypes.some(function (_ref11) {
+    var name = _ref11.name;
     return type.name === name;
   });
 }

package/type/introspection.js.flow

@@ -107,7 +107,17 @@ export const __Directive = new GraphQLObjectType({
         type: new GraphQLNonNull(
           new GraphQLList(new GraphQLNonNull(__InputValue)),
         ),
-        resolve: (directive) => directive.args,
+        args: {
+          includeDeprecated: {
+            type: GraphQLBoolean,
+            defaultValue: false,
+          },
+        },
+        resolve(field, { includeDeprecated }) {
+          return includeDeprecated
+            ? field.args
+            : field.args.filter((arg) => arg.deprecationReason == null);
+        },
       },
     }: GraphQLFieldConfigMap<GraphQLDirective, mixed>),
 });

package/type/introspection.mjs

@@ -86,8 +86,17 @@ export var __Directive = new GraphQLObjectType({
       },
       args: {
         type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(__InputValue))),
-        resolve: function resolve(directive) {
-          return directive.args;
+        args: {
+          includeDeprecated: {
+            type: GraphQLBoolean,
+            defaultValue: false
+          }
+        },
+        resolve: function resolve(field, _ref) {
+          var includeDeprecated = _ref.includeDeprecated;
+          return includeDeprecated ? field.args : field.args.filter(function (arg) {
+            return arg.deprecationReason == null;
+          });
         }
       }
     };
@@ -246,8 +255,8 @@ export var __Type = new GraphQLObjectType({
             defaultValue: false
           }
         },
-        resolve: function resolve(type, _ref) {
-          var includeDeprecated = _ref.includeDeprecated;
+        resolve: function resolve(type, _ref2) {
+          var includeDeprecated = _ref2.includeDeprecated;
 
           if (isObjectType(type) || isInterfaceType(type)) {
             var fields = objectValues(type.getFields());
@@ -267,8 +276,8 @@ export var __Type = new GraphQLObjectType({
       },
       possibleTypes: {
         type: new GraphQLList(new GraphQLNonNull(__Type)),
-        resolve: function resolve(type, _args, _context, _ref2) {
-          var schema = _ref2.schema;
+        resolve: function resolve(type, _args, _context, _ref3) {
+          var schema = _ref3.schema;
 
           if (isAbstractType(type)) {
             return schema.getPossibleTypes(type);
@@ -283,8 +292,8 @@ export var __Type = new GraphQLObjectType({
             defaultValue: false
           }
         },
-        resolve: function resolve(type, _ref3) {
-          var includeDeprecated = _ref3.includeDeprecated;
+        resolve: function resolve(type, _ref4) {
+          var includeDeprecated = _ref4.includeDeprecated;
 
           if (isEnumType(type)) {
             var values = type.getValues();
@@ -302,8 +311,8 @@ export var __Type = new GraphQLObjectType({
             defaultValue: false
           }
         },
-        resolve: function resolve(type, _ref4) {
-          var includeDeprecated = _ref4.includeDeprecated;
+        resolve: function resolve(type, _ref5) {
+          var includeDeprecated = _ref5.includeDeprecated;
 
           if (isInputObjectType(type)) {
             var values = objectValues(type.getFields());
@@ -347,8 +356,8 @@ export var __Field = new GraphQLObjectType({
             defaultValue: false
           }
         },
-        resolve: function resolve(field, _ref5) {
-          var includeDeprecated = _ref5.includeDeprecated;
+        resolve: function resolve(field, _ref6) {
+          var includeDeprecated = _ref6.includeDeprecated;
           return includeDeprecated ? field.args : field.args.filter(function (arg) {
             return arg.deprecationReason == null;
           });
@@ -513,8 +522,8 @@ export var SchemaMetaFieldDef = {
   type: new GraphQLNonNull(__Schema),
   description: 'Access the current type schema of this server.',
   args: [],
-  resolve: function resolve(_source, _args, _context, _ref6) {
-    var schema = _ref6.schema;
+  resolve: function resolve(_source, _args, _context, _ref7) {
+    var schema = _ref7.schema;
     return schema;
   },
   isDeprecated: false,
@@ -535,9 +544,9 @@ export var TypeMetaFieldDef = {
     extensions: undefined,
     astNode: undefined
   }],
-  resolve: function resolve(_source, _ref7, _context, _ref8) {
-    var name = _ref7.name;
-    var schema = _ref8.schema;
+  resolve: function resolve(_source, _ref8, _context, _ref9) {
+    var name = _ref8.name;
+    var schema = _ref9.schema;
     return schema.getType(name);
   },
   isDeprecated: false,
@@ -550,8 +559,8 @@ export var TypeNameMetaFieldDef = {
   type: new GraphQLNonNull(GraphQLString),
   description: 'The name of the current Object type at runtime.',
   args: [],
-  resolve: function resolve(_source, _args, _context, _ref9) {
-    var parentType = _ref9.parentType;
+  resolve: function resolve(_source, _args, _context, _ref10) {
+    var parentType = _ref10.parentType;
     return parentType.name;
   },
   isDeprecated: false,
@@ -561,8 +570,8 @@ export var TypeNameMetaFieldDef = {
 };
 export var introspectionTypes = Object.freeze([__Schema, __Directive, __DirectiveLocation, __Type, __Field, __InputValue, __EnumValue, __TypeKind]);
 export function isIntrospectionType(type) {
-  return introspectionTypes.some(function (_ref10) {
-    var name = _ref10.name;
+  return introspectionTypes.some(function (_ref11) {
+    var name = _ref11.name;
     return type.name === name;
   });
 }

package/version.js

@@ -13,7 +13,7 @@ exports.versionInfo = exports.version = void 0;
 /**
  * A string containing the version of the GraphQL.js library
  */
-var version = '15.5.2';
+var version = '15.7.0';
 /**
  * An object containing the components of the GraphQL.js version string
  */
@@ -21,8 +21,8 @@ var version = '15.5.2';
 exports.version = version;
 var versionInfo = Object.freeze({
   major: 15,
-  minor: 5,
-  patch: 2,
+  minor: 7,
+  patch: 0,
   preReleaseTag: null
 });
 exports.versionInfo = versionInfo;

package/version.js.flow

@@ -7,14 +7,14 @@
 /**
  * A string containing the version of the GraphQL.js library
  */
-export const version = '15.5.2';
+export const version = '15.7.0';
 
 /**
  * An object containing the components of the GraphQL.js version string
  */
 export const versionInfo = Object.freeze({
   major: 15,
-  minor: 5,
-  patch: 2,
+  minor: 7,
+  patch: 0,
   preReleaseTag: null,
 });

package/version.mjs

@@ -6,14 +6,14 @@
 /**
  * A string containing the version of the GraphQL.js library
  */
-export var version = '15.5.2';
+export var version = '15.7.0';
 /**
  * An object containing the components of the GraphQL.js version string
  */
 
 export var versionInfo = Object.freeze({
   major: 15,
-  minor: 5,
-  patch: 2,
+  minor: 7,
+  patch: 0,
   preReleaseTag: null
 });