graphql 15.3.0 → 15.5.1

package/subscription/subscribe.js.flow

@@ -1,8 +1,6 @@
 // @flow strict
-
-import { SYMBOL_ASYNC_ITERATOR } from '../polyfills/symbols';
-
 import inspect from '../jsutils/inspect';
+import isAsyncIterable from '../jsutils/isAsyncIterable';
 import { addPath, pathToArray } from '../jsutils/Path';
 
 import { GraphQLError } from '../error/GraphQLError';
@@ -10,7 +8,8 @@ import { locatedError } from '../error/locatedError';
 
 import type { DocumentNode } from '../language/ast';
 
-import type { ExecutionResult } from '../execution/execute';
+import type { ExecutionResult, ExecutionContext } from '../execution/execute';
+import { getArgumentValues } from '../execution/values';
 import {
   assertValidExecutionArguments,
   buildExecutionContext,
@@ -18,7 +17,6 @@ import {
   collectFields,
   execute,
   getFieldDef,
-  resolveFieldValueOrError,
 } from '../execution/execute';
 
 import type { GraphQLSchema } from '../type/schema';
@@ -63,7 +61,7 @@ export type SubscriptionArgs = {|
 declare function subscribe(
   SubscriptionArgs,
   ..._: []
-): Promise<AsyncIterator<ExecutionResult> | ExecutionResult>;
+): Promise<AsyncGenerator<ExecutionResult, void, void> | ExecutionResult>;
 /* eslint-disable no-redeclare */
 declare function subscribe(
   schema: GraphQLSchema,
@@ -106,7 +104,7 @@ export function subscribe(
  * an ExecutionResult, containing only errors and no data. Otherwise treat the
  * error as a system-class error and re-throw it.
  */
-function reportGraphQLError(error) {
+function reportGraphQLError(error: mixed): ExecutionResult {
   if (error instanceof GraphQLError) {
     return { errors: [error] };
   }
@@ -115,7 +113,7 @@ function reportGraphQLError(error) {
 
 function subscribeImpl(
   args: SubscriptionArgs,
-): Promise<AsyncIterator<ExecutionResult> | ExecutionResult> {
+): Promise<AsyncGenerator<ExecutionResult, void, void> | ExecutionResult> {
   const {
     schema,
     document,
@@ -160,7 +158,7 @@ function subscribeImpl(
     // Note: Flow can't refine isAsyncIterable, so explicit casts are used.
     isAsyncIterable(resultOrStream)
       ? mapAsyncIterator(
-          ((resultOrStream: any): AsyncIterable<mixed>),
+          resultOrStream,
           mapSourceToResponse,
           reportGraphQLError,
         )
@@ -209,7 +207,7 @@ export function createSourceEventStream(
   // developer mistake which should throw an early error.
   assertValidExecutionArguments(schema, document, variableValues);
 
-  try {
+  return new Promise((resolve) => {
     // If a valid context cannot be created due to incorrect arguments,
     // this will throw an error.
     const exeContext = buildExecutionContext(
@@ -222,91 +220,79 @@ export function createSourceEventStream(
       fieldResolver,
     );
 
-    // Return early errors if execution context failed.
-    if (Array.isArray(exeContext)) {
-      return Promise.resolve({ errors: exeContext });
-    }
-
-    const type = getOperationRootType(schema, exeContext.operation);
-    const fields = collectFields(
-      exeContext,
-      type,
-      exeContext.operation.selectionSet,
-      Object.create(null),
-      Object.create(null),
+    resolve(
+      // Return early errors if execution context failed.
+      Array.isArray(exeContext)
+        ? { errors: exeContext }
+        : executeSubscription(exeContext),
     );
-    const responseNames = Object.keys(fields);
-    const responseName = responseNames[0];
-    const fieldNodes = fields[responseName];
-    const fieldNode = fieldNodes[0];
-    const fieldName = fieldNode.name.value;
-    const fieldDef = getFieldDef(schema, type, fieldName);
+  }).catch(reportGraphQLError);
+}
 
-    if (!fieldDef) {
-      throw new GraphQLError(
-        `The subscription field "${fieldName}" is not defined.`,
-        fieldNodes,
-      );
-    }
+function executeSubscription(
+  exeContext: ExecutionContext,
+): Promise<AsyncIterable<mixed>> {
+  const { schema, operation, variableValues, rootValue } = exeContext;
+  const type = getOperationRootType(schema, operation);
+  const fields = collectFields(
+    exeContext,
+    type,
+    operation.selectionSet,
+    Object.create(null),
+    Object.create(null),
+  );
+  const responseNames = Object.keys(fields);
+  const responseName = responseNames[0];
+  const fieldNodes = fields[responseName];
+  const fieldNode = fieldNodes[0];
+  const fieldName = fieldNode.name.value;
+  const fieldDef = getFieldDef(schema, type, fieldName);
 
-    // Call the `subscribe()` resolver or the default resolver to produce an
-    // AsyncIterable yielding raw payloads.
-    const resolveFn = fieldDef.subscribe ?? exeContext.fieldResolver;
+  if (!fieldDef) {
+    throw new GraphQLError(
+      `The subscription field "${fieldName}" is not defined.`,
+      fieldNodes,
+    );
+  }
 
-    const path = addPath(undefined, responseName, type.name);
+  const path = addPath(undefined, responseName, type.name);
+  const info = buildResolveInfo(exeContext, fieldDef, fieldNodes, type, path);
 
-    const info = buildResolveInfo(exeContext, fieldDef, fieldNodes, type, path);
+  // Coerce to Promise for easier error handling and consistent return type.
+  return new Promise((resolveResult) => {
+    // Implements the "ResolveFieldEventStream" algorithm from GraphQL specification.
+    // It differs from "ResolveFieldValue" due to providing a different `resolveFn`.
 
-    // resolveFieldValueOrError implements the "ResolveFieldEventStream"
-    // algorithm from GraphQL specification. It differs from
-    // "ResolveFieldValue" due to providing a different `resolveFn`.
-    const result = resolveFieldValueOrError(
-      exeContext,
-      fieldDef,
-      fieldNodes,
-      resolveFn,
-      rootValue,
-      info,
-    );
+    // Build a JS object of arguments from the field.arguments AST, using the
+    // variables scope to fulfill any variable references.
+    const args = getArgumentValues(fieldDef, fieldNodes[0], variableValues);
 
-    // Coerce to Promise for easier error handling and consistent return type.
-    return Promise.resolve(result).then((eventStream) => {
-      // If eventStream is an Error, rethrow a located error.
+    // The resolve function's optional third argument is a context value that
+    // is provided to every resolve function within an execution. It is commonly
+    // used to represent an authenticated user, or request-specific caches.
+    const contextValue = exeContext.contextValue;
+
+    // Call the `subscribe()` resolver or the default resolver to produce an
+    // AsyncIterable yielding raw payloads.
+    const resolveFn = fieldDef.subscribe ?? exeContext.fieldResolver;
+    resolveResult(resolveFn(rootValue, args, contextValue, info));
+  }).then(
+    (eventStream) => {
       if (eventStream instanceof Error) {
-        return {
-          errors: [locatedError(eventStream, fieldNodes, pathToArray(path))],
-        };
+        throw locatedError(eventStream, fieldNodes, pathToArray(path));
       }
 
       // Assert field returned an event stream, otherwise yield an error.
-      if (isAsyncIterable(eventStream)) {
-        // Note: isAsyncIterable above ensures this will be correct.
-        return ((eventStream: any): AsyncIterable<mixed>);
+      if (!isAsyncIterable(eventStream)) {
+        throw new Error(
+          'Subscription field must return Async Iterable. ' +
+            `Received: ${inspect(eventStream)}.`,
+        );
       }
-
-      throw new Error(
-        'Subscription field must return Async Iterable. ' +
-          `Received: ${inspect(eventStream)}.`,
-      );
-    });
-  } catch (error) {
-    // As with reportGraphQLError above, if the error is a GraphQLError, report
-    // it as an ExecutionResult; otherwise treat it as a system-class error and
-    // re-throw it.
-    return error instanceof GraphQLError
-      ? Promise.resolve({ errors: [error] })
-      : Promise.reject(error);
-  }
-}
-
-/**
- * Returns true if the provided object implements the AsyncIterator protocol via
- * either implementing a `Symbol.asyncIterator` or `"@@asyncIterator"` method.
- */
-function isAsyncIterable(maybeAsyncIterable: mixed): boolean {
-  if (maybeAsyncIterable == null || typeof maybeAsyncIterable !== 'object') {
-    return false;
-  }
-
-  return typeof maybeAsyncIterable[SYMBOL_ASYNC_ITERATOR] === 'function';
+      return eventStream;
+    },
+    (error) => {
+      throw locatedError(error, fieldNodes, pathToArray(path));
+    },
+  );
 }

package/subscription/subscribe.mjs

@@ -1,11 +1,10 @@
-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); }
-
-import { SYMBOL_ASYNC_ITERATOR } from "../polyfills/symbols.mjs";
 import inspect from "../jsutils/inspect.mjs";
+import isAsyncIterable from "../jsutils/isAsyncIterable.mjs";
 import { addPath, pathToArray } from "../jsutils/Path.mjs";
 import { GraphQLError } from "../error/GraphQLError.mjs";
 import { locatedError } from "../error/locatedError.mjs";
-import { assertValidExecutionArguments, buildExecutionContext, buildResolveInfo, collectFields, execute, getFieldDef, resolveFieldValueOrError } from "../execution/execute.mjs";
+import { getArgumentValues } from "../execution/values.mjs";
+import { assertValidExecutionArguments, buildExecutionContext, buildResolveInfo, collectFields, execute, getFieldDef } from "../execution/execute.mjs";
 import { getOperationRootType } from "../utilities/getOperationRootType.mjs";
 import mapAsyncIterator from "./mapAsyncIterator.mjs";
 export function subscribe(argsOrSchema, document, rootValue, contextValue, variableValues, operationName, fieldResolver, subscribeFieldResolver) {
@@ -108,77 +107,66 @@ export function createSourceEventStream(schema, document, rootValue, contextValu
   // If arguments are missing or incorrectly typed, this is an internal
   // developer mistake which should throw an early error.
   assertValidExecutionArguments(schema, document, variableValues);
-
-  try {
-    var _fieldDef$subscribe;
-
+  return new Promise(function (resolve) {
     // If a valid context cannot be created due to incorrect arguments,
     // this will throw an error.
-    var exeContext = buildExecutionContext(schema, document, rootValue, contextValue, variableValues, operationName, fieldResolver); // Return early errors if execution context failed.
-
-    if (Array.isArray(exeContext)) {
-      return Promise.resolve({
-        errors: exeContext
-      });
-    }
+    var exeContext = buildExecutionContext(schema, document, rootValue, contextValue, variableValues, operationName, fieldResolver);
+    resolve( // Return early errors if execution context failed.
+    Array.isArray(exeContext) ? {
+      errors: exeContext
+    } : executeSubscription(exeContext));
+  }).catch(reportGraphQLError);
+}
 
-    var type = getOperationRootType(schema, exeContext.operation);
-    var fields = collectFields(exeContext, type, exeContext.operation.selectionSet, Object.create(null), Object.create(null));
-    var responseNames = Object.keys(fields);
-    var responseName = responseNames[0];
-    var fieldNodes = fields[responseName];
-    var fieldNode = fieldNodes[0];
-    var fieldName = fieldNode.name.value;
-    var fieldDef = getFieldDef(schema, type, fieldName);
-
-    if (!fieldDef) {
-      throw new GraphQLError("The subscription field \"".concat(fieldName, "\" is not defined."), fieldNodes);
-    } // Call the `subscribe()` resolver or the default resolver to produce an
-    // AsyncIterable yielding raw payloads.
+function executeSubscription(exeContext) {
+  var schema = exeContext.schema,
+      operation = exeContext.operation,
+      variableValues = exeContext.variableValues,
+      rootValue = exeContext.rootValue;
+  var type = getOperationRootType(schema, operation);
+  var fields = collectFields(exeContext, type, operation.selectionSet, Object.create(null), Object.create(null));
+  var responseNames = Object.keys(fields);
+  var responseName = responseNames[0];
+  var fieldNodes = fields[responseName];
+  var fieldNode = fieldNodes[0];
+  var fieldName = fieldNode.name.value;
+  var fieldDef = getFieldDef(schema, type, fieldName);
+
+  if (!fieldDef) {
+    throw new GraphQLError("The subscription field \"".concat(fieldName, "\" is not defined."), fieldNodes);
+  }
 
+  var path = addPath(undefined, responseName, type.name);
+  var info = buildResolveInfo(exeContext, fieldDef, fieldNodes, type, path); // Coerce to Promise for easier error handling and consistent return type.
 
-    var resolveFn = (_fieldDef$subscribe = fieldDef.subscribe) !== null && _fieldDef$subscribe !== void 0 ? _fieldDef$subscribe : exeContext.fieldResolver;
-    var path = addPath(undefined, responseName, type.name);
-    var info = buildResolveInfo(exeContext, fieldDef, fieldNodes, type, path); // resolveFieldValueOrError implements the "ResolveFieldEventStream"
-    // algorithm from GraphQL specification. It differs from
-    // "ResolveFieldValue" due to providing a different `resolveFn`.
+  return new Promise(function (resolveResult) {
+    var _fieldDef$subscribe;
 
-    var result = resolveFieldValueOrError(exeContext, fieldDef, fieldNodes, resolveFn, rootValue, info); // Coerce to Promise for easier error handling and consistent return type.
+    // Implements the "ResolveFieldEventStream" algorithm from GraphQL specification.
+    // It differs from "ResolveFieldValue" due to providing a different `resolveFn`.
+    // Build a JS object of arguments from the field.arguments AST, using the
+    // variables scope to fulfill any variable references.
+    var args = getArgumentValues(fieldDef, fieldNodes[0], variableValues); // The resolve function's optional third argument is a context value that
+    // is provided to every resolve function within an execution. It is commonly
+    // used to represent an authenticated user, or request-specific caches.
 
-    return Promise.resolve(result).then(function (eventStream) {
-      // If eventStream is an Error, rethrow a located error.
-      if (eventStream instanceof Error) {
-        return {
-          errors: [locatedError(eventStream, fieldNodes, pathToArray(path))]
-        };
-      } // Assert field returned an event stream, otherwise yield an error.
+    var contextValue = exeContext.contextValue; // Call the `subscribe()` resolver or the default resolver to produce an
+    // AsyncIterable yielding raw payloads.
 
+    var resolveFn = (_fieldDef$subscribe = fieldDef.subscribe) !== null && _fieldDef$subscribe !== void 0 ? _fieldDef$subscribe : exeContext.fieldResolver;
+    resolveResult(resolveFn(rootValue, args, contextValue, info));
+  }).then(function (eventStream) {
+    if (eventStream instanceof Error) {
+      throw locatedError(eventStream, fieldNodes, pathToArray(path));
+    } // Assert field returned an event stream, otherwise yield an error.
 
-      if (isAsyncIterable(eventStream)) {
-        // Note: isAsyncIterable above ensures this will be correct.
-        return eventStream;
-      }
 
+    if (!isAsyncIterable(eventStream)) {
       throw new Error('Subscription field must return Async Iterable. ' + "Received: ".concat(inspect(eventStream), "."));
-    });
-  } catch (error) {
-    // As with reportGraphQLError above, if the error is a GraphQLError, report
-    // it as an ExecutionResult; otherwise treat it as a system-class error and
-    // re-throw it.
-    return error instanceof GraphQLError ? Promise.resolve({
-      errors: [error]
-    }) : Promise.reject(error);
-  }
-}
-/**
- * Returns true if the provided object implements the AsyncIterator protocol via
- * either implementing a `Symbol.asyncIterator` or `"@@asyncIterator"` method.
- */
-
-function isAsyncIterable(maybeAsyncIterable) {
-  if (maybeAsyncIterable == null || _typeof(maybeAsyncIterable) !== 'object') {
-    return false;
-  }
+    }
 
-  return typeof maybeAsyncIterable[SYMBOL_ASYNC_ITERATOR] === 'function';
+    return eventStream;
+  }, function (error) {
+    throw locatedError(error, fieldNodes, pathToArray(path));
+  });
 }

package/type/definition.d.ts

@@ -183,6 +183,7 @@ interface _GraphQLList<T extends GraphQLType> {
   new (type: T): GraphQLList<T>;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-redeclare
 export const GraphQLList: _GraphQLList<GraphQLType>;
 
 /**
@@ -217,6 +218,7 @@ interface _GraphQLNonNull<T extends GraphQLNullableType> {
   new (type: T): GraphQLNonNull<T>;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-redeclare
 export const GraphQLNonNull: _GraphQLNonNull<GraphQLNullableType>;
 
 export type GraphQLWrappingType = GraphQLList<any> | GraphQLNonNull<any>;
@@ -368,7 +370,7 @@ export interface GraphQLScalarTypeConfig<TInternal, TExternal> {
  * We've provided these template arguments because this is an open type and
  * you may find them useful.
  */
-export interface GraphQLObjectTypeExtensions<TSource = any, TContext = any> {
+export interface GraphQLObjectTypeExtensions<_TSource = any, _TContext = any> {
   [attributeName: string]: any;
 }
 
@@ -499,9 +501,9 @@ export interface GraphQLResolveInfo {
  * you may find them useful.
  */
 export interface GraphQLFieldExtensions<
-  TSource,
-  TContext,
-  TArgs = { [argName: string]: any }
+  _TSource,
+  _TContext,
+  _TArgs = { [argName: string]: any }
 > {
   [attributeName: string]: any;
 }
@@ -544,6 +546,7 @@ export interface GraphQLArgumentConfig {
   description?: Maybe<string>;
   type: GraphQLInputType;
   defaultValue?: any;
+  deprecationReason?: Maybe<string>;
   extensions?: Maybe<Readonly<GraphQLArgumentExtensions>>;
   astNode?: Maybe<InputValueDefinitionNode>;
 }
@@ -563,10 +566,12 @@ export interface GraphQLField<
   args: Array<GraphQLArgument>;
   resolve?: GraphQLFieldResolver<TSource, TContext, TArgs>;
   subscribe?: GraphQLFieldResolver<TSource, TContext, TArgs>;
-  isDeprecated: boolean;
   deprecationReason: Maybe<string>;
   extensions: Maybe<Readonly<GraphQLFieldExtensions<TSource, TContext, TArgs>>>;
   astNode?: Maybe<FieldDefinitionNode>;
+
+  // @deprecated and will be removed in v16
+  isDeprecated: boolean;
 }
 
 export interface GraphQLArgument {
@@ -574,6 +579,7 @@ export interface GraphQLArgument {
   description: Maybe<string>;
   type: GraphQLInputType;
   defaultValue: any;
+  deprecationReason: Maybe<string>;
   extensions: Maybe<Readonly<GraphQLArgumentExtensions>>;
   astNode: Maybe<InputValueDefinitionNode>;
 }
@@ -827,10 +833,12 @@ export interface GraphQLEnumValue {
   name: string;
   description: Maybe<string>;
   value: any;
-  isDeprecated: boolean;
   deprecationReason: Maybe<string>;
   extensions: Maybe<Readonly<GraphQLEnumValueExtensions>>;
   astNode?: Maybe<EnumValueDefinitionNode>;
+
+  // @deprecated and will be removed in v16
+  isDeprecated: boolean;
 }
 
 /**
@@ -913,6 +921,7 @@ export interface GraphQLInputFieldConfig {
   description?: Maybe<string>;
   type: GraphQLInputType;
   defaultValue?: any;
+  deprecationReason?: Maybe<string>;
   extensions?: Maybe<Readonly<GraphQLInputFieldExtensions>>;
   astNode?: Maybe<InputValueDefinitionNode>;
 }
@@ -926,6 +935,7 @@ export interface GraphQLInputField {
   description?: Maybe<string>;
   type: GraphQLInputType;
   defaultValue?: any;
+  deprecationReason: Maybe<string>;
   extensions: Maybe<Readonly<GraphQLInputFieldExtensions>>;
   astNode?: Maybe<InputValueDefinitionNode>;
 }

package/type/definition.js

@@ -46,41 +46,41 @@ exports.isRequiredArgument = isRequiredArgument;
 exports.isRequiredInputField = isRequiredInputField;
 exports.GraphQLInputObjectType = exports.GraphQLEnumType = exports.GraphQLUnionType = exports.GraphQLInterfaceType = exports.GraphQLObjectType = exports.GraphQLScalarType = void 0;
 
-var _objectEntries = _interopRequireDefault(require("../polyfills/objectEntries"));
+var _objectEntries = _interopRequireDefault(require("../polyfills/objectEntries.js"));
 
-var _symbols = require("../polyfills/symbols");
+var _symbols = require("../polyfills/symbols.js");
 
-var _inspect = _interopRequireDefault(require("../jsutils/inspect"));
+var _inspect = _interopRequireDefault(require("../jsutils/inspect.js"));
 
-var _keyMap = _interopRequireDefault(require("../jsutils/keyMap"));
+var _keyMap = _interopRequireDefault(require("../jsutils/keyMap.js"));
 
-var _mapValue = _interopRequireDefault(require("../jsutils/mapValue"));
+var _mapValue = _interopRequireDefault(require("../jsutils/mapValue.js"));
 
-var _toObjMap = _interopRequireDefault(require("../jsutils/toObjMap"));
+var _toObjMap = _interopRequireDefault(require("../jsutils/toObjMap.js"));
 
-var _devAssert = _interopRequireDefault(require("../jsutils/devAssert"));
+var _devAssert = _interopRequireDefault(require("../jsutils/devAssert.js"));
 
-var _keyValMap = _interopRequireDefault(require("../jsutils/keyValMap"));
+var _keyValMap = _interopRequireDefault(require("../jsutils/keyValMap.js"));
 
-var _instanceOf = _interopRequireDefault(require("../jsutils/instanceOf"));
+var _instanceOf = _interopRequireDefault(require("../jsutils/instanceOf.js"));
 
-var _didYouMean = _interopRequireDefault(require("../jsutils/didYouMean"));
+var _didYouMean = _interopRequireDefault(require("../jsutils/didYouMean.js"));
 
-var _isObjectLike = _interopRequireDefault(require("../jsutils/isObjectLike"));
+var _isObjectLike = _interopRequireDefault(require("../jsutils/isObjectLike.js"));
 
-var _identityFunc = _interopRequireDefault(require("../jsutils/identityFunc"));
+var _identityFunc = _interopRequireDefault(require("../jsutils/identityFunc.js"));
 
-var _defineInspect = _interopRequireDefault(require("../jsutils/defineInspect"));
+var _defineInspect = _interopRequireDefault(require("../jsutils/defineInspect.js"));
 
-var _suggestionList = _interopRequireDefault(require("../jsutils/suggestionList"));
+var _suggestionList = _interopRequireDefault(require("../jsutils/suggestionList.js"));
 
-var _GraphQLError = require("../error/GraphQLError");
+var _GraphQLError = require("../error/GraphQLError.js");
 
-var _kinds = require("../language/kinds");
+var _kinds = require("../language/kinds.js");
 
-var _printer = require("../language/printer");
+var _printer = require("../language/printer.js");
 
-var _valueFromASTUntyped = require("../utilities/valueFromASTUntyped");
+var _valueFromASTUntyped = require("../utilities/valueFromASTUntyped.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -299,8 +299,8 @@ function assertAbstractType(type) {
  *     const PersonType = new GraphQLObjectType({
  *       name: 'Person',
  *       fields: () => ({
- *         parents: { type: GraphQLList(PersonType) },
- *         children: { type: GraphQLList(PersonType) },
+ *         parents: { type: new GraphQLList(PersonType) },
+ *         children: { type: new GraphQLList(PersonType) },
  *       })
  *     })
  *
@@ -318,6 +318,7 @@ declare class GraphQLList<+T: GraphQLType> {
 
 
 function GraphQLList(ofType) {
+  // istanbul ignore else (to be removed in v16.0.0)
   if (this instanceof GraphQLList) {
     this.ofType = assertType(ofType);
   } else {
@@ -355,7 +356,7 @@ Object.defineProperty(GraphQLList.prototype, _symbols.SYMBOL_TO_STRING_TAG, {
  *     const RowType = new GraphQLObjectType({
  *       name: 'Row',
  *       fields: () => ({
- *         id: { type: GraphQLNonNull(GraphQLString) },
+ *         id: { type: new GraphQLNonNull(GraphQLString) },
  *       })
  *     })
  *
@@ -373,6 +374,7 @@ declare class GraphQLNonNull<+T: GraphQLNullableType> {
 */
 
 function GraphQLNonNull(ofType) {
+  // istanbul ignore else (to be removed in v16.0.0)
   if (this instanceof GraphQLNonNull) {
     this.ofType = assertNullableType(ofType);
   } else {
@@ -474,7 +476,7 @@ function getNamedType(type) {
 
 
 function resolveThunk(thunk) {
-  // $FlowFixMe(>=0.90.0)
+  // $FlowFixMe[incompatible-use]
   return typeof thunk === 'function' ? thunk() : thunk;
 }
 
@@ -517,8 +519,8 @@ var GraphQLScalarType = /*#__PURE__*/function () {
     this.specifiedByUrl = config.specifiedByUrl;
     this.serialize = (_config$serialize = config.serialize) !== null && _config$serialize !== void 0 ? _config$serialize : _identityFunc.default;
     this.parseValue = parseValue;
-    this.parseLiteral = (_config$parseLiteral = config.parseLiteral) !== null && _config$parseLiteral !== void 0 ? _config$parseLiteral : function (node) {
-      return parseValue((0, _valueFromASTUntyped.valueFromASTUntyped)(node));
+    this.parseLiteral = (_config$parseLiteral = config.parseLiteral) !== null && _config$parseLiteral !== void 0 ? _config$parseLiteral : function (node, variables) {
+      return parseValue((0, _valueFromASTUntyped.valueFromASTUntyped)(node, variables));
     };
     this.extensions = config.extensions && (0, _toObjMap.default)(config.extensions);
     this.astNode = config.astNode;
@@ -556,7 +558,7 @@ var GraphQLScalarType = /*#__PURE__*/function () {
 
   _proto.toJSON = function toJSON() {
     return this.toString();
-  } // $FlowFixMe Flow doesn't support computed properties yet
+  } // $FlowFixMe[unsupported-syntax] Flow doesn't support computed properties yet
   ;
 
   _createClass(GraphQLScalarType, [{
@@ -661,7 +663,7 @@ var GraphQLObjectType = /*#__PURE__*/function () {
 
   _proto2.toJSON = function toJSON() {
     return this.toString();
-  } // $FlowFixMe Flow doesn't support computed properties yet
+  } // $FlowFixMe[unsupported-syntax] Flow doesn't support computed properties yet
   ;
 
   _createClass(GraphQLObjectType, [{
@@ -705,6 +707,7 @@ function defineFieldMap(config) {
         description: argConfig.description,
         type: argConfig.type,
         defaultValue: argConfig.defaultValue,
+        deprecationReason: argConfig.deprecationReason,
         extensions: argConfig.extensions && (0, _toObjMap.default)(argConfig.extensions),
         astNode: argConfig.astNode
       };
@@ -755,6 +758,7 @@ function argsToArgsConfig(args) {
       description: arg.description,
       type: arg.type,
       defaultValue: arg.defaultValue,
+      deprecationReason: arg.deprecationReason,
       extensions: arg.extensions,
       astNode: arg.astNode
     };
@@ -836,7 +840,7 @@ var GraphQLInterfaceType = /*#__PURE__*/function () {
 
   _proto3.toJSON = function toJSON() {
     return this.toString();
-  } // $FlowFixMe Flow doesn't support computed properties yet
+  } // $FlowFixMe[unsupported-syntax] Flow doesn't support computed properties yet
   ;
 
   _createClass(GraphQLInterfaceType, [{
@@ -919,7 +923,7 @@ var GraphQLUnionType = /*#__PURE__*/function () {
 
   _proto4.toJSON = function toJSON() {
     return this.toString();
-  } // $FlowFixMe Flow doesn't support computed properties yet
+  } // $FlowFixMe[unsupported-syntax] Flow doesn't support computed properties yet
   ;
 
   _createClass(GraphQLUnionType, [{
@@ -1069,7 +1073,7 @@ var GraphQLEnumType
 
   _proto5.toJSON = function toJSON() {
     return this.toString();
-  } // $FlowFixMe Flow doesn't support computed properties yet
+  } // $FlowFixMe[unsupported-syntax] Flow doesn't support computed properties yet
   ;
 
   _createClass(GraphQLEnumType, [{
@@ -1126,8 +1130,8 @@ function defineEnumValues(typeName, valueMap) {
  *     const GeoPoint = new GraphQLInputObjectType({
  *       name: 'GeoPoint',
  *       fields: {
- *         lat: { type: GraphQLNonNull(GraphQLFloat) },
- *         lon: { type: GraphQLNonNull(GraphQLFloat) },
+ *         lat: { type: new GraphQLNonNull(GraphQLFloat) },
+ *         lon: { type: new GraphQLNonNull(GraphQLFloat) },
  *         alt: { type: GraphQLFloat, defaultValue: 0 },
  *       }
  *     });
@@ -1182,7 +1186,7 @@ var GraphQLInputObjectType = /*#__PURE__*/function () {
 
   _proto6.toJSON = function toJSON() {
     return this.toString();
-  } // $FlowFixMe Flow doesn't support computed properties yet
+  } // $FlowFixMe[unsupported-syntax] Flow doesn't support computed properties yet
   ;
 
   _createClass(GraphQLInputObjectType, [{
@@ -1209,6 +1213,7 @@ function defineInputFieldMap(config) {
       description: fieldConfig.description,
       type: fieldConfig.type,
       defaultValue: fieldConfig.defaultValue,
+      deprecationReason: fieldConfig.deprecationReason,
       extensions: fieldConfig.extensions && (0, _toObjMap.default)(fieldConfig.extensions),
       astNode: fieldConfig.astNode
     };