graphql 16.4.0 → 16.6.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,9 +75,9 @@ export declare class GraphQLError extends Error {
    * Extension fields to add to the formatted error.
    */
   readonly extensions: GraphQLErrorExtensions;
-  constructor(message: string, args?: GraphQLErrorArgs);
+  constructor(message: string, options?: GraphQLErrorOptions);
   /**
-   * @deprecated Please use the `GraphQLErrorArgs` constructor overload instead.
+   * @deprecated Please use the `GraphQLErrorOptions` constructor overload instead.
    */
   constructor(
     message: string,

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;

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;

package/error/index.d.ts

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

package/execution/subscribe.d.ts

@@ -55,6 +55,10 @@ export declare function subscribe(
  * or otherwise separating these two steps. For more on this, see the
  * "Supporting Subscriptions at Scale" information in the GraphQL specification.
  */
+export declare function createSourceEventStream(
+  args: ExecutionArgs,
+): Promise<AsyncIterable<unknown> | ExecutionResult>;
+/** @deprecated will be removed in next major version in favor of named arguments */
 export declare function createSourceEventStream(
   schema: GraphQLSchema,
   document: DocumentNode,

package/execution/subscribe.js

@@ -54,25 +54,7 @@ async function subscribe(args) {
       false,
       'graphql@16 dropped long-deprecated support for positional arguments, please pass an object instead.',
     );
-  const {
-    schema,
-    document,
-    rootValue,
-    contextValue,
-    variableValues,
-    operationName,
-    fieldResolver,
-    subscribeFieldResolver,
-  } = args;
-  const resultOrStream = await createSourceEventStream(
-    schema,
-    document,
-    rootValue,
-    contextValue,
-    variableValues,
-    operationName,
-    subscribeFieldResolver,
-  );
+  const resultOrStream = await createSourceEventStream(args);
 
   if (!(0, _isAsyncIterable.isAsyncIterable)(resultOrStream)) {
     return resultOrStream;
@@ -84,21 +66,32 @@ async function subscribe(args) {
   // "ExecuteQuery" algorithm, for which `execute` is also used.
 
   const mapSourceToResponse = (payload) =>
-    (0, _execute.execute)({
-      schema,
-      document,
-      rootValue: payload,
-      contextValue,
-      variableValues,
-      operationName,
-      fieldResolver,
-    }); // Map every source value to a ExecutionResult value as described above.
+    (0, _execute.execute)({ ...args, rootValue: payload }); // Map every source value to a ExecutionResult value as described above.
 
   return (0, _mapAsyncIterator.mapAsyncIterator)(
     resultOrStream,
     mapSourceToResponse,
   );
 }
+
+function toNormalizedArgs(args) {
+  const firstArg = args[0];
+
+  if (firstArg && 'document' in firstArg) {
+    return firstArg;
+  }
+
+  return {
+    schema: firstArg,
+    // FIXME: when underlying TS bug fixed, see https://github.com/microsoft/TypeScript/issues/31613
+    document: args[1],
+    rootValue: args[2],
+    contextValue: args[3],
+    variableValues: args[4],
+    operationName: args[5],
+    subscribeFieldResolver: args[6],
+  };
+}
 /**
  * Implements the "CreateSourceEventStream" algorithm described in the
  * GraphQL specification, resolving the subscription source event stream.
@@ -128,29 +121,15 @@ async function subscribe(args) {
  * "Supporting Subscriptions at Scale" information in the GraphQL specification.
  */
 
-async function createSourceEventStream(
-  schema,
-  document,
-  rootValue,
-  contextValue,
-  variableValues,
-  operationName,
-  subscribeFieldResolver,
-) {
-  // If arguments are missing or incorrectly typed, this is an internal
+async function createSourceEventStream(...rawArgs) {
+  const args = toNormalizedArgs(rawArgs);
+  const { schema, document, variableValues } = args; // If arguments are missing or incorrectly typed, this is an internal
   // developer mistake which should throw an early error.
+
   (0, _execute.assertValidExecutionArguments)(schema, document, variableValues); // If a valid execution context cannot be created due to incorrect arguments,
   // a "Response" with only errors is returned.
 
-  const exeContext = (0, _execute.buildExecutionContext)({
-    schema,
-    document,
-    rootValue,
-    contextValue,
-    variableValues,
-    operationName,
-    subscribeFieldResolver,
-  }); // Return early errors if execution context failed.
+  const exeContext = (0, _execute.buildExecutionContext)(args); // Return early errors if execution context failed.
 
   if (!('schema' in exeContext)) {
     return {

package/execution/subscribe.mjs

@@ -43,25 +43,7 @@ export async function subscribe(args) {
       false,
       'graphql@16 dropped long-deprecated support for positional arguments, please pass an object instead.',
     );
-  const {
-    schema,
-    document,
-    rootValue,
-    contextValue,
-    variableValues,
-    operationName,
-    fieldResolver,
-    subscribeFieldResolver,
-  } = args;
-  const resultOrStream = await createSourceEventStream(
-    schema,
-    document,
-    rootValue,
-    contextValue,
-    variableValues,
-    operationName,
-    subscribeFieldResolver,
-  );
+  const resultOrStream = await createSourceEventStream(args);
 
   if (!isAsyncIterable(resultOrStream)) {
     return resultOrStream;
@@ -73,18 +55,29 @@ export async function subscribe(args) {
   // "ExecuteQuery" algorithm, for which `execute` is also used.
 
   const mapSourceToResponse = (payload) =>
-    execute({
-      schema,
-      document,
-      rootValue: payload,
-      contextValue,
-      variableValues,
-      operationName,
-      fieldResolver,
-    }); // Map every source value to a ExecutionResult value as described above.
+    execute({ ...args, rootValue: payload }); // Map every source value to a ExecutionResult value as described above.
 
   return mapAsyncIterator(resultOrStream, mapSourceToResponse);
 }
+
+function toNormalizedArgs(args) {
+  const firstArg = args[0];
+
+  if (firstArg && 'document' in firstArg) {
+    return firstArg;
+  }
+
+  return {
+    schema: firstArg,
+    // FIXME: when underlying TS bug fixed, see https://github.com/microsoft/TypeScript/issues/31613
+    document: args[1],
+    rootValue: args[2],
+    contextValue: args[3],
+    variableValues: args[4],
+    operationName: args[5],
+    subscribeFieldResolver: args[6],
+  };
+}
 /**
  * Implements the "CreateSourceEventStream" algorithm described in the
  * GraphQL specification, resolving the subscription source event stream.
@@ -114,29 +107,15 @@ export async function subscribe(args) {
  * "Supporting Subscriptions at Scale" information in the GraphQL specification.
  */
 
-export async function createSourceEventStream(
-  schema,
-  document,
-  rootValue,
-  contextValue,
-  variableValues,
-  operationName,
-  subscribeFieldResolver,
-) {
-  // If arguments are missing or incorrectly typed, this is an internal
+export async function createSourceEventStream(...rawArgs) {
+  const args = toNormalizedArgs(rawArgs);
+  const { schema, document, variableValues } = args; // If arguments are missing or incorrectly typed, this is an internal
   // developer mistake which should throw an early error.
+
   assertValidExecutionArguments(schema, document, variableValues); // If a valid execution context cannot be created due to incorrect arguments,
   // a "Response" with only errors is returned.
 
-  const exeContext = buildExecutionContext({
-    schema,
-    document,
-    rootValue,
-    contextValue,
-    variableValues,
-    operationName,
-    subscribeFieldResolver,
-  }); // Return early errors if execution context failed.
+  const exeContext = buildExecutionContext(args); // Return early errors if execution context failed.
 
   if (!('schema' in exeContext)) {
     return {

package/index.d.ts

@@ -346,6 +346,7 @@ export {
   formatError,
 } from './error/index';
 export type {
+  GraphQLErrorOptions,
   GraphQLFormattedError,
   GraphQLErrorExtensions,
 } from './error/index';

package/language/ast.d.ts

@@ -179,11 +179,12 @@ export interface OperationDefinitionNode {
   readonly directives?: ReadonlyArray<DirectiveNode>;
   readonly selectionSet: SelectionSetNode;
 }
-export declare enum OperationTypeNode {
+declare enum OperationTypeNode {
   QUERY = 'query',
   MUTATION = 'mutation',
   SUBSCRIPTION = 'subscription',
 }
+export { OperationTypeNode };
 export interface VariableDefinitionNode {
   readonly kind: Kind.VARIABLE_DEFINITION;
   readonly loc?: Location;

package/language/ast.js

@@ -214,7 +214,7 @@ function isNode(maybeNode) {
 }
 /** Name */
 
-let OperationTypeNode;
+var OperationTypeNode;
 exports.OperationTypeNode = OperationTypeNode;
 
 (function (OperationTypeNode) {

package/language/ast.mjs

@@ -197,10 +197,12 @@ export function isNode(maybeNode) {
 }
 /** Name */
 
-export let OperationTypeNode;
+var OperationTypeNode;
 
 (function (OperationTypeNode) {
   OperationTypeNode['QUERY'] = 'query';
   OperationTypeNode['MUTATION'] = 'mutation';
   OperationTypeNode['SUBSCRIPTION'] = 'subscription';
 })(OperationTypeNode || (OperationTypeNode = {}));
+
+export { OperationTypeNode };

package/language/directiveLocation.d.ts

@@ -1,7 +1,7 @@
 /**
  * The set of allowed directive location values.
  */
-export declare enum DirectiveLocation {
+declare enum DirectiveLocation {
   /** Request Definitions */
   QUERY = 'QUERY',
   MUTATION = 'MUTATION',
@@ -24,6 +24,7 @@ export declare enum DirectiveLocation {
   INPUT_OBJECT = 'INPUT_OBJECT',
   INPUT_FIELD_DEFINITION = 'INPUT_FIELD_DEFINITION',
 }
+export { DirectiveLocation };
 /**
  * The enum type representing the directive location values.
  *

package/language/directiveLocation.js

@@ -8,13 +8,7 @@ exports.DirectiveLocation = void 0;
 /**
  * The set of allowed directive location values.
  */
-let DirectiveLocation;
-/**
- * The enum type representing the directive location values.
- *
- * @deprecated Please use `DirectiveLocation`. Will be remove in v17.
- */
-
+var DirectiveLocation;
 exports.DirectiveLocation = DirectiveLocation;
 
 (function (DirectiveLocation) {
@@ -38,3 +32,8 @@ exports.DirectiveLocation = DirectiveLocation;
   DirectiveLocation['INPUT_OBJECT'] = 'INPUT_OBJECT';
   DirectiveLocation['INPUT_FIELD_DEFINITION'] = 'INPUT_FIELD_DEFINITION';
 })(DirectiveLocation || (exports.DirectiveLocation = DirectiveLocation = {}));
+/**
+ * The enum type representing the directive location values.
+ *
+ * @deprecated Please use `DirectiveLocation`. Will be remove in v17.
+ */

package/language/directiveLocation.mjs

@@ -1,12 +1,7 @@
 /**
  * The set of allowed directive location values.
  */
-export let DirectiveLocation;
-/**
- * The enum type representing the directive location values.
- *
- * @deprecated Please use `DirectiveLocation`. Will be remove in v17.
- */
+var DirectiveLocation;
 
 (function (DirectiveLocation) {
   DirectiveLocation['QUERY'] = 'QUERY';
@@ -29,3 +24,10 @@ export let DirectiveLocation;
   DirectiveLocation['INPUT_OBJECT'] = 'INPUT_OBJECT';
   DirectiveLocation['INPUT_FIELD_DEFINITION'] = 'INPUT_FIELD_DEFINITION';
 })(DirectiveLocation || (DirectiveLocation = {}));
+
+export { DirectiveLocation };
+/**
+ * The enum type representing the directive location values.
+ *
+ * @deprecated Please use `DirectiveLocation`. Will be remove in v17.
+ */

package/language/kinds.d.ts

@@ -1,7 +1,7 @@
 /**
  * The set of allowed kind values for AST nodes.
  */
-export declare enum Kind {
+declare enum Kind {
   /** Name */
   NAME = 'Name',
   /** Document */
@@ -57,6 +57,7 @@ export declare enum Kind {
   ENUM_TYPE_EXTENSION = 'EnumTypeExtension',
   INPUT_OBJECT_TYPE_EXTENSION = 'InputObjectTypeExtension',
 }
+export { Kind };
 /**
  * The enum type representing the possible kind values of AST nodes.
  *

package/language/kinds.js

@@ -8,13 +8,7 @@ exports.Kind = void 0;
 /**
  * The set of allowed kind values for AST nodes.
  */
-let Kind;
-/**
- * The enum type representing the possible kind values of AST nodes.
- *
- * @deprecated Please use `Kind`. Will be remove in v17.
- */
-
+var Kind;
 exports.Kind = Kind;
 
 (function (Kind) {
@@ -62,3 +56,8 @@ exports.Kind = Kind;
   Kind['ENUM_TYPE_EXTENSION'] = 'EnumTypeExtension';
   Kind['INPUT_OBJECT_TYPE_EXTENSION'] = 'InputObjectTypeExtension';
 })(Kind || (exports.Kind = Kind = {}));
+/**
+ * The enum type representing the possible kind values of AST nodes.
+ *
+ * @deprecated Please use `Kind`. Will be remove in v17.
+ */

package/language/kinds.mjs

@@ -1,12 +1,7 @@
 /**
  * The set of allowed kind values for AST nodes.
  */
-export let Kind;
-/**
- * The enum type representing the possible kind values of AST nodes.
- *
- * @deprecated Please use `Kind`. Will be remove in v17.
- */
+var Kind;
 
 (function (Kind) {
   Kind['NAME'] = 'Name';
@@ -53,3 +48,10 @@ export let Kind;
   Kind['ENUM_TYPE_EXTENSION'] = 'EnumTypeExtension';
   Kind['INPUT_OBJECT_TYPE_EXTENSION'] = 'InputObjectTypeExtension';
 })(Kind || (Kind = {}));
+
+export { Kind };
+/**
+ * The enum type representing the possible kind values of AST nodes.
+ *
+ * @deprecated Please use `Kind`. Will be remove in v17.
+ */

package/language/parser.d.ts

@@ -64,6 +64,14 @@ export interface ParseOptions {
    * disables that behavior for performance or testing.
    */
   noLocation?: boolean;
+  /**
+   * Parser CPU and memory usage is linear to the number of tokens in a document
+   * however in extreme cases it becomes quadratic due to memory exhaustion.
+   * Parsing happens before validation so even invalid queries can burn lots of
+   * CPU time and memory.
+   * To prevent this you can set a maximum number of tokens allowed within a document.
+   */
+  maxTokens?: number | undefined;
   /**
    * @deprecated will be removed in the v17.0.0
    *
@@ -87,7 +95,7 @@ export interface ParseOptions {
  */
 export declare function parse(
   source: string | Source,
-  options?: ParseOptions,
+  options?: ParseOptions | undefined,
 ): DocumentNode;
 /**
  * Given a string containing a GraphQL value (ex. `[42]`), parse the AST for
@@ -101,7 +109,7 @@ export declare function parse(
  */
 export declare function parseValue(
   source: string | Source,
-  options?: ParseOptions,
+  options?: ParseOptions | undefined,
 ): ValueNode;
 /**
  * Similar to parseValue(), but raises a parse error if it encounters a
@@ -109,7 +117,7 @@ export declare function parseValue(
  */
 export declare function parseConstValue(
   source: string | Source,
-  options?: ParseOptions,
+  options?: ParseOptions | undefined,
 ): ConstValueNode;
 /**
  * Given a string containing a GraphQL Type (ex. `[Int!]`), parse the AST for
@@ -123,7 +131,7 @@ export declare function parseConstValue(
  */
 export declare function parseType(
   source: string | Source,
-  options?: ParseOptions,
+  options?: ParseOptions | undefined,
 ): TypeNode;
 /**
  * This class is exported only to assist people in implementing their own parsers
@@ -137,8 +145,9 @@ export declare function parseType(
  * @internal
  */
 export declare class Parser {
-  protected _options: Maybe<ParseOptions>;
+  protected _options: ParseOptions;
   protected _lexer: Lexer;
+  protected _tokenCounter: number;
   constructor(source: string | Source, options?: ParseOptions);
   /**
    * Converts a name lex token into a name parse node.
@@ -551,4 +560,5 @@ export declare class Parser {
    * Advances the parser to the next lex token after last item in the list.
    */
   delimitedMany<T>(delimiterKind: TokenKind, parseFn: () => T): Array<T>;
+  advanceLexer(): void;
 }

package/language/parser.js

@@ -92,12 +92,13 @@ function parseType(source, options) {
  */
 
 class Parser {
-  constructor(source, options) {
+  constructor(source, options = {}) {
     const sourceObj = (0, _source.isSource)(source)
       ? source
       : new _source.Source(source);
     this._lexer = new _lexer.Lexer(sourceObj);
     this._options = options;
+    this._tokenCounter = 0;
   }
   /**
    * Converts a name lex token into a name parse node.
@@ -432,18 +433,12 @@ class Parser {
    */
 
   parseFragmentDefinition() {
-    var _this$_options;
-
     const start = this._lexer.token;
     this.expectKeyword('fragment'); // Legacy support for defining variables within fragments changes
     // the grammar of FragmentDefinition:
     //   - fragment FragmentName VariableDefinitions? on TypeCondition Directives? SelectionSet
 
-    if (
-      ((_this$_options = this._options) === null || _this$_options === void 0
-        ? void 0
-        : _this$_options.allowLegacyFragmentVariables) === true
-    ) {
+    if (this._options.allowLegacyFragmentVariables === true) {
       return this.node(start, {
         kind: _kinds.Kind.FRAGMENT_DEFINITION,
         name: this.parseFragmentName(),
@@ -504,16 +499,14 @@ class Parser {
         return this.parseObject(isConst);
 
       case _tokenKind.TokenKind.INT:
-        this._lexer.advance();
-
+        this.advanceLexer();
         return this.node(token, {
           kind: _kinds.Kind.INT,
           value: token.value,
         });
 
       case _tokenKind.TokenKind.FLOAT:
-        this._lexer.advance();
-
+        this.advanceLexer();
         return this.node(token, {
           kind: _kinds.Kind.FLOAT,
           value: token.value,
@@ -524,7 +517,7 @@ class Parser {
         return this.parseStringLiteral();
 
       case _tokenKind.TokenKind.NAME:
-        this._lexer.advance();
+        this.advanceLexer();
 
         switch (token.value) {
           case 'true':
@@ -580,9 +573,7 @@ class Parser {
 
   parseStringLiteral() {
     const token = this._lexer.token;
-
-    this._lexer.advance();
-
+    this.advanceLexer();
     return this.node(token, {
       kind: _kinds.Kind.STRING,
       value: token.value,
@@ -1373,13 +1364,7 @@ class Parser {
    */
 
   node(startToken, node) {
-    var _this$_options2;
-
-    if (
-      ((_this$_options2 = this._options) === null || _this$_options2 === void 0
-        ? void 0
-        : _this$_options2.noLocation) !== true
-    ) {
+    if (this._options.noLocation !== true) {
       node.loc = new _ast.Location(
         startToken,
         this._lexer.lastToken,
@@ -1405,8 +1390,7 @@ class Parser {
     const token = this._lexer.token;
 
     if (token.kind === kind) {
-      this._lexer.advance();
-
+      this.advanceLexer();
       return token;
     }
 
@@ -1425,8 +1409,7 @@ class Parser {
     const token = this._lexer.token;
 
     if (token.kind === kind) {
-      this._lexer.advance();
-
+      this.advanceLexer();
       return true;
     }
 
@@ -1441,7 +1424,7 @@ class Parser {
     const token = this._lexer.token;
 
     if (token.kind === _tokenKind.TokenKind.NAME && token.value === value) {
-      this._lexer.advance();
+      this.advanceLexer();
     } else {
       throw (0, _syntaxError.syntaxError)(
         this._lexer.source,
@@ -1459,8 +1442,7 @@ class Parser {
     const token = this._lexer.token;
 
     if (token.kind === _tokenKind.TokenKind.NAME && token.value === value) {
-      this._lexer.advance();
-
+      this.advanceLexer();
       return true;
     }
 
@@ -1547,6 +1529,24 @@ class Parser {
 
     return nodes;
   }
+
+  advanceLexer() {
+    const { maxTokens } = this._options;
+
+    const token = this._lexer.advance();
+
+    if (maxTokens !== undefined && token.kind !== _tokenKind.TokenKind.EOF) {
+      ++this._tokenCounter;
+
+      if (this._tokenCounter > maxTokens) {
+        throw (0, _syntaxError.syntaxError)(
+          this._lexer.source,
+          token.start,
+          `Document contains more that ${maxTokens} tokens. Parsing aborted.`,
+        );
+      }
+    }
+  }
 }
 /**
  * A helper function to describe a token as a string for debugging.

package/language/parser.mjs

@@ -78,10 +78,11 @@ export function parseType(source, options) {
  */
 
 export class Parser {
-  constructor(source, options) {
+  constructor(source, options = {}) {
     const sourceObj = isSource(source) ? source : new Source(source);
     this._lexer = new Lexer(sourceObj);
     this._options = options;
+    this._tokenCounter = 0;
   }
   /**
    * Converts a name lex token into a name parse node.
@@ -410,18 +411,12 @@ export class Parser {
    */
 
   parseFragmentDefinition() {
-    var _this$_options;
-
     const start = this._lexer.token;
     this.expectKeyword('fragment'); // Legacy support for defining variables within fragments changes
     // the grammar of FragmentDefinition:
     //   - fragment FragmentName VariableDefinitions? on TypeCondition Directives? SelectionSet
 
-    if (
-      ((_this$_options = this._options) === null || _this$_options === void 0
-        ? void 0
-        : _this$_options.allowLegacyFragmentVariables) === true
-    ) {
+    if (this._options.allowLegacyFragmentVariables === true) {
       return this.node(start, {
         kind: Kind.FRAGMENT_DEFINITION,
         name: this.parseFragmentName(),
@@ -482,16 +477,14 @@ export class Parser {
         return this.parseObject(isConst);
 
       case TokenKind.INT:
-        this._lexer.advance();
-
+        this.advanceLexer();
         return this.node(token, {
           kind: Kind.INT,
           value: token.value,
         });
 
       case TokenKind.FLOAT:
-        this._lexer.advance();
-
+        this.advanceLexer();
         return this.node(token, {
           kind: Kind.FLOAT,
           value: token.value,
@@ -502,7 +495,7 @@ export class Parser {
         return this.parseStringLiteral();
 
       case TokenKind.NAME:
-        this._lexer.advance();
+        this.advanceLexer();
 
         switch (token.value) {
           case 'true':
@@ -558,9 +551,7 @@ export class Parser {
 
   parseStringLiteral() {
     const token = this._lexer.token;
-
-    this._lexer.advance();
-
+    this.advanceLexer();
     return this.node(token, {
       kind: Kind.STRING,
       value: token.value,
@@ -1332,13 +1323,7 @@ export class Parser {
    */
 
   node(startToken, node) {
-    var _this$_options2;
-
-    if (
-      ((_this$_options2 = this._options) === null || _this$_options2 === void 0
-        ? void 0
-        : _this$_options2.noLocation) !== true
-    ) {
+    if (this._options.noLocation !== true) {
       node.loc = new Location(
         startToken,
         this._lexer.lastToken,
@@ -1364,8 +1349,7 @@ export class Parser {
     const token = this._lexer.token;
 
     if (token.kind === kind) {
-      this._lexer.advance();
-
+      this.advanceLexer();
       return token;
     }
 
@@ -1384,8 +1368,7 @@ export class Parser {
     const token = this._lexer.token;
 
     if (token.kind === kind) {
-      this._lexer.advance();
-
+      this.advanceLexer();
       return true;
     }
 
@@ -1400,7 +1383,7 @@ export class Parser {
     const token = this._lexer.token;
 
     if (token.kind === TokenKind.NAME && token.value === value) {
-      this._lexer.advance();
+      this.advanceLexer();
     } else {
       throw syntaxError(
         this._lexer.source,
@@ -1418,8 +1401,7 @@ export class Parser {
     const token = this._lexer.token;
 
     if (token.kind === TokenKind.NAME && token.value === value) {
-      this._lexer.advance();
-
+      this.advanceLexer();
       return true;
     }
 
@@ -1506,6 +1488,24 @@ export class Parser {
 
     return nodes;
   }
+
+  advanceLexer() {
+    const { maxTokens } = this._options;
+
+    const token = this._lexer.advance();
+
+    if (maxTokens !== undefined && token.kind !== TokenKind.EOF) {
+      ++this._tokenCounter;
+
+      if (this._tokenCounter > maxTokens) {
+        throw syntaxError(
+          this._lexer.source,
+          token.start,
+          `Document contains more that ${maxTokens} tokens. Parsing aborted.`,
+        );
+      }
+    }
+  }
 }
 /**
  * A helper function to describe a token as a string for debugging.

package/language/tokenKind.d.ts

@@ -2,7 +2,7 @@
  * An exported enum describing the different kinds of tokens that the
  * lexer emits.
  */
-export declare enum TokenKind {
+declare enum TokenKind {
   SOF = '<SOF>',
   EOF = '<EOF>',
   BANG = '!',
@@ -26,6 +26,7 @@ export declare enum TokenKind {
   BLOCK_STRING = 'BlockString',
   COMMENT = 'Comment',
 }
+export { TokenKind };
 /**
  * The enum type representing the token kinds values.
  *

package/language/tokenKind.js

@@ -9,13 +9,7 @@ exports.TokenKind = void 0;
  * An exported enum describing the different kinds of tokens that the
  * lexer emits.
  */
-let TokenKind;
-/**
- * The enum type representing the token kinds values.
- *
- * @deprecated Please use `TokenKind`. Will be remove in v17.
- */
-
+var TokenKind;
 exports.TokenKind = TokenKind;
 
 (function (TokenKind) {
@@ -42,3 +36,8 @@ exports.TokenKind = TokenKind;
   TokenKind['BLOCK_STRING'] = 'BlockString';
   TokenKind['COMMENT'] = 'Comment';
 })(TokenKind || (exports.TokenKind = TokenKind = {}));
+/**
+ * The enum type representing the token kinds values.
+ *
+ * @deprecated Please use `TokenKind`. Will be remove in v17.
+ */

package/language/tokenKind.mjs

@@ -2,12 +2,7 @@
  * An exported enum describing the different kinds of tokens that the
  * lexer emits.
  */
-export let TokenKind;
-/**
- * The enum type representing the token kinds values.
- *
- * @deprecated Please use `TokenKind`. Will be remove in v17.
- */
+var TokenKind;
 
 (function (TokenKind) {
   TokenKind['SOF'] = '<SOF>';
@@ -33,3 +28,10 @@ export let TokenKind;
   TokenKind['BLOCK_STRING'] = 'BlockString';
   TokenKind['COMMENT'] = 'Comment';
 })(TokenKind || (TokenKind = {}));
+
+export { TokenKind };
+/**
+ * The enum type representing the token kinds values.
+ *
+ * @deprecated Please use `TokenKind`. Will be remove in v17.
+ */

package/package.json

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

package/type/introspection.d.ts

@@ -7,7 +7,7 @@ export declare const __Type: GraphQLObjectType;
 export declare const __Field: GraphQLObjectType;
 export declare const __InputValue: GraphQLObjectType;
 export declare const __EnumValue: GraphQLObjectType;
-export declare enum TypeKind {
+declare enum TypeKind {
   SCALAR = 'SCALAR',
   OBJECT = 'OBJECT',
   INTERFACE = 'INTERFACE',
@@ -17,6 +17,7 @@ export declare enum TypeKind {
   LIST = 'LIST',
   NON_NULL = 'NON_NULL',
 }
+export { TypeKind };
 export declare const __TypeKind: GraphQLEnumType;
 /**
  * Note that these are GraphQLField and not GraphQLFieldConfig,

package/type/introspection.js

@@ -493,7 +493,7 @@ const __EnumValue = new _definition.GraphQLObjectType({
 });
 
 exports.__EnumValue = __EnumValue;
-let TypeKind;
+var TypeKind;
 exports.TypeKind = TypeKind;
 
 (function (TypeKind) {

package/type/introspection.mjs

@@ -433,7 +433,7 @@ export const __EnumValue = new GraphQLObjectType({
     },
   }),
 });
-export let TypeKind;
+var TypeKind;
 
 (function (TypeKind) {
   TypeKind['SCALAR'] = 'SCALAR';
@@ -446,6 +446,7 @@ export let TypeKind;
   TypeKind['NON_NULL'] = 'NON_NULL';
 })(TypeKind || (TypeKind = {}));
 
+export { TypeKind };
 export const __TypeKind = new GraphQLEnumType({
   name: '__TypeKind',
   description: 'An enum describing what kind of type a given `__Type` is.',

package/utilities/findBreakingChanges.d.ts

@@ -1,5 +1,5 @@
 import type { GraphQLSchema } from '../type/schema';
-export declare enum BreakingChangeType {
+declare enum BreakingChangeType {
   TYPE_REMOVED = 'TYPE_REMOVED',
   TYPE_CHANGED_KIND = 'TYPE_CHANGED_KIND',
   TYPE_REMOVED_FROM_UNION = 'TYPE_REMOVED_FROM_UNION',
@@ -17,7 +17,8 @@ export declare enum BreakingChangeType {
   DIRECTIVE_REPEATABLE_REMOVED = 'DIRECTIVE_REPEATABLE_REMOVED',
   DIRECTIVE_LOCATION_REMOVED = 'DIRECTIVE_LOCATION_REMOVED',
 }
-export declare enum DangerousChangeType {
+export { BreakingChangeType };
+declare enum DangerousChangeType {
   VALUE_ADDED_TO_ENUM = 'VALUE_ADDED_TO_ENUM',
   TYPE_ADDED_TO_UNION = 'TYPE_ADDED_TO_UNION',
   OPTIONAL_INPUT_FIELD_ADDED = 'OPTIONAL_INPUT_FIELD_ADDED',
@@ -25,6 +26,7 @@ export declare enum DangerousChangeType {
   IMPLEMENTED_INTERFACE_ADDED = 'IMPLEMENTED_INTERFACE_ADDED',
   ARG_DEFAULT_VALUE_CHANGE = 'ARG_DEFAULT_VALUE_CHANGE',
 }
+export { DangerousChangeType };
 export interface BreakingChange {
   type: BreakingChangeType;
   description: string;

package/utilities/findBreakingChanges.js

@@ -23,7 +23,7 @@ var _astFromValue = require('./astFromValue.js');
 
 var _sortValueNode = require('./sortValueNode.js');
 
-let BreakingChangeType;
+var BreakingChangeType;
 exports.BreakingChangeType = BreakingChangeType;
 
 (function (BreakingChangeType) {
@@ -52,7 +52,7 @@ exports.BreakingChangeType = BreakingChangeType;
   BreakingChangeType || (exports.BreakingChangeType = BreakingChangeType = {}),
 );
 
-let DangerousChangeType;
+var DangerousChangeType;
 exports.DangerousChangeType = DangerousChangeType;
 
 (function (DangerousChangeType) {

package/utilities/findBreakingChanges.mjs

@@ -18,7 +18,7 @@ import {
 import { isSpecifiedScalarType } from '../type/scalars.mjs';
 import { astFromValue } from './astFromValue.mjs';
 import { sortValueNode } from './sortValueNode.mjs';
-export let BreakingChangeType;
+var BreakingChangeType;
 
 (function (BreakingChangeType) {
   BreakingChangeType['TYPE_REMOVED'] = 'TYPE_REMOVED';
@@ -44,7 +44,8 @@ export let BreakingChangeType;
     'DIRECTIVE_LOCATION_REMOVED';
 })(BreakingChangeType || (BreakingChangeType = {}));
 
-export let DangerousChangeType;
+export { BreakingChangeType };
+var DangerousChangeType;
 
 (function (DangerousChangeType) {
   DangerousChangeType['VALUE_ADDED_TO_ENUM'] = 'VALUE_ADDED_TO_ENUM';
@@ -57,6 +58,8 @@ export let DangerousChangeType;
   DangerousChangeType['ARG_DEFAULT_VALUE_CHANGE'] = 'ARG_DEFAULT_VALUE_CHANGE';
 })(DangerousChangeType || (DangerousChangeType = {}));
 
+export { DangerousChangeType };
+
 /**
  * Given two schemas, returns an Array containing descriptions of all the types
  * of breaking changes covered by the other functions down below.

package/version.js

@@ -10,7 +10,7 @@ exports.versionInfo = exports.version = void 0;
 /**
  * A string containing the version of the GraphQL.js library
  */
-const version = '16.4.0';
+const version = '16.6.0';
 /**
  * An object containing the components of the GraphQL.js version string
  */
@@ -18,7 +18,7 @@ const version = '16.4.0';
 exports.version = version;
 const versionInfo = Object.freeze({
   major: 16,
-  minor: 4,
+  minor: 6,
   patch: 0,
   preReleaseTag: null,
 });

package/version.mjs

@@ -4,14 +4,14 @@
 /**
  * A string containing the version of the GraphQL.js library
  */
-export const version = '16.4.0';
+export const version = '16.6.0';
 /**
  * An object containing the components of the GraphQL.js version string
  */
 
 export const versionInfo = Object.freeze({
   major: 16,
-  minor: 4,
+  minor: 6,
   patch: 0,
   preReleaseTag: null,
 });