graphql 15.1.0 → 15.4.0

package/utilities/findDeprecatedUsages.js.flow

@@ -1,58 +1,29 @@
 // @flow strict
+import type { GraphQLError } from '../error/GraphQLError';
 
-import { GraphQLError } from '../error/GraphQLError';
+import type { DocumentNode } from '../language/ast';
 
-import { visit } from '../language/visitor';
-import { type DocumentNode } from '../language/ast';
+import type { GraphQLSchema } from '../type/schema';
 
-import { getNamedType } from '../type/definition';
-import { type GraphQLSchema } from '../type/schema';
-
-import { TypeInfo, visitWithTypeInfo } from './TypeInfo';
+import { validate } from '../validation/validate';
+import { NoDeprecatedCustomRule } from '../validation/rules/custom/NoDeprecatedCustomRule';
 
 /**
  * A validation rule which reports deprecated usages.
  *
  * Returns a list of GraphQLError instances describing each deprecated use.
+ *
+ * @deprecated Please use `validate` with `NoDeprecatedCustomRule` instead:
+ *
+ * ```
+ * import { validate, NoDeprecatedCustomRule } from 'graphql'
+ *
+ * const errors = validate(schema, document, [NoDeprecatedCustomRule])
+ * ```
  */
 export function findDeprecatedUsages(
   schema: GraphQLSchema,
   ast: DocumentNode,
-): Array<GraphQLError> {
-  const errors = [];
-  const typeInfo = new TypeInfo(schema);
-
-  visit(
-    ast,
-    visitWithTypeInfo(typeInfo, {
-      Field(node) {
-        const parentType = typeInfo.getParentType();
-        const fieldDef = typeInfo.getFieldDef();
-        if (parentType && fieldDef?.deprecationReason != null) {
-          errors.push(
-            new GraphQLError(
-              `The field "${parentType.name}.${fieldDef.name}" is deprecated. ` +
-                fieldDef.deprecationReason,
-              node,
-            ),
-          );
-        }
-      },
-      EnumValue(node) {
-        const type = getNamedType(typeInfo.getInputType());
-        const enumVal = typeInfo.getEnumValue();
-        if (type && enumVal?.deprecationReason != null) {
-          errors.push(
-            new GraphQLError(
-              `The enum value "${type.name}.${enumVal.name}" is deprecated. ` +
-                enumVal.deprecationReason,
-              node,
-            ),
-          );
-        }
-      },
-    }),
-  );
-
-  return errors;
+): $ReadOnlyArray<GraphQLError> {
+  return validate(schema, ast, [NoDeprecatedCustomRule]);
 }

package/utilities/findDeprecatedUsages.mjs

@@ -1,33 +1,19 @@
-import { GraphQLError } from "../error/GraphQLError.mjs";
-import { visit } from "../language/visitor.mjs";
-import { getNamedType } from "../type/definition.mjs";
-import { TypeInfo, visitWithTypeInfo } from "./TypeInfo.mjs";
+import { validate } from "../validation/validate.mjs";
+import { NoDeprecatedCustomRule } from "../validation/rules/custom/NoDeprecatedCustomRule.mjs";
 /**
  * A validation rule which reports deprecated usages.
  *
  * Returns a list of GraphQLError instances describing each deprecated use.
+ *
+ * @deprecated Please use `validate` with `NoDeprecatedCustomRule` instead:
+ *
+ * ```
+ * import { validate, NoDeprecatedCustomRule } from 'graphql'
+ *
+ * const errors = validate(schema, document, [NoDeprecatedCustomRule])
+ * ```
  */
 
 export function findDeprecatedUsages(schema, ast) {
-  var errors = [];
-  var typeInfo = new TypeInfo(schema);
-  visit(ast, visitWithTypeInfo(typeInfo, {
-    Field: function Field(node) {
-      var parentType = typeInfo.getParentType();
-      var fieldDef = typeInfo.getFieldDef();
-
-      if (parentType && (fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.deprecationReason) != null) {
-        errors.push(new GraphQLError("The field \"".concat(parentType.name, ".").concat(fieldDef.name, "\" is deprecated. ") + fieldDef.deprecationReason, node));
-      }
-    },
-    EnumValue: function EnumValue(node) {
-      var type = getNamedType(typeInfo.getInputType());
-      var enumVal = typeInfo.getEnumValue();
-
-      if (type && (enumVal === null || enumVal === void 0 ? void 0 : enumVal.deprecationReason) != null) {
-        errors.push(new GraphQLError("The enum value \"".concat(type.name, ".").concat(enumVal.name, "\" is deprecated. ") + enumVal.deprecationReason, node));
-      }
-    }
-  }));
-  return errors;
+  return validate(schema, ast, [NoDeprecatedCustomRule]);
 }

package/utilities/getIntrospectionQuery.js.flow

@@ -1,6 +1,5 @@
 // @flow strict
-
-import { type DirectiveLocationEnum } from '../language/directiveLocation';
+import type { DirectiveLocationEnum } from '../language/directiveLocation';
 
 export type IntrospectionOptions = {|
   // Whether to include descriptions in the introspection result.
@@ -175,7 +174,7 @@ export type IntrospectionScalarType = {|
   +kind: 'SCALAR',
   +name: string,
   +description?: ?string,
-  +specifiedByUrl: ?string,
+  +specifiedByUrl?: ?string,
 |};
 
 export type IntrospectionObjectType = {|

package/utilities/getOperationAST.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getOperationAST = getOperationAST;
 
-var _kinds = require("../language/kinds");
+var _kinds = require("../language/kinds.js");
 
 /**
  * Returns an operation AST given a document AST and optionally an operation

package/utilities/getOperationAST.js.flow

@@ -1,10 +1,6 @@
 // @flow strict
-
+import type { DocumentNode, OperationDefinitionNode } from '../language/ast';
 import { Kind } from '../language/kinds';
-import {
-  type DocumentNode,
-  type OperationDefinitionNode,
-} from '../language/ast';
 
 /**
  * Returns an operation AST given a document AST and optionally an operation

package/utilities/getOperationAST.mjs

@@ -1,10 +1,10 @@
 import { Kind } from "../language/kinds.mjs";
-
 /**
  * Returns an operation AST given a document AST and optionally an operation
  * name. If a name is not provided, an operation is only returned if only one is
  * provided in the document.
  */
+
 export function getOperationAST(documentAST, operationName) {
   var operation = null;
 

package/utilities/getOperationRootType.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getOperationRootType = getOperationRootType;
 
-var _GraphQLError = require("../error/GraphQLError");
+var _GraphQLError = require("../error/GraphQLError.js");
 
 /**
  * Extracts the root type of the operation from the schema.

package/utilities/getOperationRootType.js.flow

@@ -1,14 +1,13 @@
 // @flow strict
-
 import { GraphQLError } from '../error/GraphQLError';
 
-import {
-  type OperationDefinitionNode,
-  type OperationTypeDefinitionNode,
+import type {
+  OperationDefinitionNode,
+  OperationTypeDefinitionNode,
 } from '../language/ast';
 
-import { type GraphQLSchema } from '../type/schema';
-import { type GraphQLObjectType } from '../type/definition';
+import type { GraphQLSchema } from '../type/schema';
+import type { GraphQLObjectType } from '../type/definition';
 
 /**
  * Extracts the root type of the operation from the schema.

package/utilities/index.d.ts

@@ -112,5 +112,8 @@ export {
   DangerousChange,
 } from './findBreakingChanges';
 
-// Report all deprecated usage within a GraphQL document.
+// Wrapper type that contains DocumentNode and types that can be deduced from it.
+export { TypedQueryDocumentNode } from './typedQueryDocumentNode';
+
+// @deprecated: Report all deprecated usage within a GraphQL document.
 export { findDeprecatedUsages } from './findDeprecatedUsages';

package/utilities/index.js

@@ -202,46 +202,46 @@ Object.defineProperty(exports, "findDeprecatedUsages", {
   }
 });
 
-var _getIntrospectionQuery = require("./getIntrospectionQuery");
+var _getIntrospectionQuery = require("./getIntrospectionQuery.js");
 
-var _getOperationAST = require("./getOperationAST");
+var _getOperationAST = require("./getOperationAST.js");
 
-var _getOperationRootType = require("./getOperationRootType");
+var _getOperationRootType = require("./getOperationRootType.js");
 
-var _introspectionFromSchema = require("./introspectionFromSchema");
+var _introspectionFromSchema = require("./introspectionFromSchema.js");
 
-var _buildClientSchema = require("./buildClientSchema");
+var _buildClientSchema = require("./buildClientSchema.js");
 
-var _buildASTSchema = require("./buildASTSchema");
+var _buildASTSchema = require("./buildASTSchema.js");
 
-var _extendSchema = require("./extendSchema");
+var _extendSchema = require("./extendSchema.js");
 
-var _lexicographicSortSchema = require("./lexicographicSortSchema");
+var _lexicographicSortSchema = require("./lexicographicSortSchema.js");
 
-var _printSchema = require("./printSchema");
+var _printSchema = require("./printSchema.js");
 
-var _typeFromAST = require("./typeFromAST");
+var _typeFromAST = require("./typeFromAST.js");
 
-var _valueFromAST = require("./valueFromAST");
+var _valueFromAST = require("./valueFromAST.js");
 
-var _valueFromASTUntyped = require("./valueFromASTUntyped");
+var _valueFromASTUntyped = require("./valueFromASTUntyped.js");
 
-var _astFromValue = require("./astFromValue");
+var _astFromValue = require("./astFromValue.js");
 
-var _TypeInfo = require("./TypeInfo");
+var _TypeInfo = require("./TypeInfo.js");
 
-var _coerceInputValue = require("./coerceInputValue");
+var _coerceInputValue = require("./coerceInputValue.js");
 
-var _concatAST = require("./concatAST");
+var _concatAST = require("./concatAST.js");
 
-var _separateOperations = require("./separateOperations");
+var _separateOperations = require("./separateOperations.js");
 
-var _stripIgnoredCharacters = require("./stripIgnoredCharacters");
+var _stripIgnoredCharacters = require("./stripIgnoredCharacters.js");
 
-var _typeComparators = require("./typeComparators");
+var _typeComparators = require("./typeComparators.js");
 
-var _assertValidName = require("./assertValidName");
+var _assertValidName = require("./assertValidName.js");
 
-var _findBreakingChanges = require("./findBreakingChanges");
+var _findBreakingChanges = require("./findBreakingChanges.js");
 
-var _findDeprecatedUsages = require("./findDeprecatedUsages");
+var _findDeprecatedUsages = require("./findDeprecatedUsages.js");

package/utilities/index.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 // Produce the GraphQL query recommended for a full schema introspection.
 // Accepts optional IntrospectionOptions.
 export { getIntrospectionQuery } from './getIntrospectionQuery';
@@ -111,5 +110,5 @@ export {
 } from './findBreakingChanges';
 export type { BreakingChange, DangerousChange } from './findBreakingChanges';
 
-// Report all deprecated usage within a GraphQL document.
+// @deprecated: Report all deprecated usage within a GraphQL document.
 export { findDeprecatedUsages } from './findDeprecatedUsages';

package/utilities/index.mjs

@@ -45,5 +45,5 @@ export { isEqualType, isTypeSubTypeOf, doTypesOverlap } from "./typeComparators.
 export { assertValidName, isValidNameError } from "./assertValidName.mjs"; // Compares two GraphQLSchemas and detects breaking changes.
 
 export { BreakingChangeType, DangerousChangeType, findBreakingChanges, findDangerousChanges } from "./findBreakingChanges.mjs";
-// Report all deprecated usage within a GraphQL document.
+// @deprecated: Report all deprecated usage within a GraphQL document.
 export { findDeprecatedUsages } from "./findDeprecatedUsages.mjs";

package/utilities/introspectionFromSchema.js

@@ -5,15 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.introspectionFromSchema = introspectionFromSchema;
 
-var _invariant = _interopRequireDefault(require("../jsutils/invariant"));
+var _invariant = _interopRequireDefault(require("../jsutils/invariant.js"));
 
-var _isPromise = _interopRequireDefault(require("../jsutils/isPromise"));
+var _parser = require("../language/parser.js");
 
-var _parser = require("../language/parser");
+var _execute = require("../execution/execute.js");
 
-var _execute = require("../execution/execute");
-
-var _getIntrospectionQuery = require("./getIntrospectionQuery");
+var _getIntrospectionQuery = require("./getIntrospectionQuery.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -39,10 +37,10 @@ function introspectionFromSchema(schema, options) {
   }, options);
 
   var document = (0, _parser.parse)((0, _getIntrospectionQuery.getIntrospectionQuery)(optionsWithDefaults));
-  var result = (0, _execute.execute)({
+  var result = (0, _execute.executeSync)({
     schema: schema,
     document: document
   });
-  !(0, _isPromise.default)(result) && !result.errors && result.data || (0, _invariant.default)(0);
+  !result.errors && result.data || (0, _invariant.default)(0);
   return result.data;
 }

package/utilities/introspectionFromSchema.js.flow

@@ -1,17 +1,17 @@
 // @flow strict
-
 import invariant from '../jsutils/invariant';
-import isPromise from '../jsutils/isPromise';
 
 import { parse } from '../language/parser';
-import { execute } from '../execution/execute';
-import { type GraphQLSchema } from '../type/schema';
 
-import {
-  type IntrospectionQuery,
-  type IntrospectionOptions,
-  getIntrospectionQuery,
+import type { GraphQLSchema } from '../type/schema';
+
+import { executeSync } from '../execution/execute';
+
+import type {
+  IntrospectionQuery,
+  IntrospectionOptions,
 } from './getIntrospectionQuery';
+import { getIntrospectionQuery } from './getIntrospectionQuery';
 
 /**
  * Build an IntrospectionQuery from a GraphQLSchema
@@ -33,7 +33,7 @@ export function introspectionFromSchema(
   };
 
   const document = parse(getIntrospectionQuery(optionsWithDefaults));
-  const result = execute({ schema, document });
-  invariant(!isPromise(result) && !result.errors && result.data);
+  const result = executeSync({ schema, document });
+  invariant(!result.errors && result.data);
   return (result.data: any);
 }

package/utilities/introspectionFromSchema.mjs

@@ -5,9 +5,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 
 import invariant from "../jsutils/invariant.mjs";
-import isPromise from "../jsutils/isPromise.mjs";
 import { parse } from "../language/parser.mjs";
-import { execute } from "../execution/execute.mjs";
+import { executeSync } from "../execution/execute.mjs";
 import { getIntrospectionQuery } from "./getIntrospectionQuery.mjs";
 /**
  * Build an IntrospectionQuery from a GraphQLSchema
@@ -26,10 +25,10 @@ export function introspectionFromSchema(schema, options) {
   }, options);
 
   var document = parse(getIntrospectionQuery(optionsWithDefaults));
-  var result = execute({
+  var result = executeSync({
     schema: schema,
     document: document
   });
-  !isPromise(result) && !result.errors && result.data || invariant(0);
+  !result.errors && result.data || invariant(0);
   return result.data;
 }

package/utilities/lexicographicSortSchema.js

@@ -5,21 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.lexicographicSortSchema = lexicographicSortSchema;
 
-var _objectValues = _interopRequireDefault(require("../polyfills/objectValues"));
+var _objectValues = _interopRequireDefault(require("../polyfills/objectValues.js"));
 
-var _inspect = _interopRequireDefault(require("../jsutils/inspect"));
+var _inspect = _interopRequireDefault(require("../jsutils/inspect.js"));
 
-var _invariant = _interopRequireDefault(require("../jsutils/invariant"));
+var _invariant = _interopRequireDefault(require("../jsutils/invariant.js"));
 
-var _keyValMap = _interopRequireDefault(require("../jsutils/keyValMap"));
+var _keyValMap = _interopRequireDefault(require("../jsutils/keyValMap.js"));
 
-var _schema = require("../type/schema");
+var _schema = require("../type/schema.js");
 
-var _directives = require("../type/directives");
+var _directives = require("../type/directives.js");
 
-var _introspection = require("../type/introspection");
+var _introspection = require("../type/introspection.js");
 
-var _definition = require("../type/definition");
+var _definition = require("../type/definition.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -49,8 +49,10 @@ function lexicographicSortSchema(schema) {
 
   function replaceType(type) {
     if ((0, _definition.isListType)(type)) {
+      // $FlowFixMe[incompatible-return]
       return new _definition.GraphQLList(replaceType(type.ofType));
     } else if ((0, _definition.isNonNullType)(type)) {
+      // $FlowFixMe[incompatible-return]
       return new _definition.GraphQLNonNull(replaceType(type.ofType));
     }
 

package/utilities/lexicographicSortSchema.js.flow

@@ -1,24 +1,29 @@
 // @flow strict
-
 import objectValues from '../polyfills/objectValues';
 
+import type { ObjMap } from '../jsutils/ObjMap';
 import inspect from '../jsutils/inspect';
 import invariant from '../jsutils/invariant';
 import keyValMap from '../jsutils/keyValMap';
-import { type ObjMap } from '../jsutils/ObjMap';
 
+import type {
+  GraphQLType,
+  GraphQLNamedType,
+  GraphQLFieldConfigMap,
+  GraphQLFieldConfigArgumentMap,
+  GraphQLInputFieldConfigMap,
+} from '../type/definition';
 import { GraphQLSchema } from '../type/schema';
 import { GraphQLDirective } from '../type/directives';
 import { isIntrospectionType } from '../type/introspection';
 import {
-  type GraphQLNamedType,
+  GraphQLList,
+  GraphQLNonNull,
   GraphQLObjectType,
   GraphQLInterfaceType,
   GraphQLUnionType,
   GraphQLEnumType,
   GraphQLInputObjectType,
-  GraphQLList,
-  GraphQLNonNull,
   isListType,
   isNonNullType,
   isScalarType,
@@ -51,10 +56,12 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
     subscription: replaceMaybeType(schemaConfig.subscription),
   });
 
-  function replaceType(type) {
+  function replaceType<T: GraphQLType>(type: T): T {
     if (isListType(type)) {
+      // $FlowFixMe[incompatible-return]
       return new GraphQLList(replaceType(type.ofType));
     } else if (isNonNullType(type)) {
+      // $FlowFixMe[incompatible-return]
       return new GraphQLNonNull(replaceType(type.ofType));
     }
     return replaceNamedType(type);
@@ -64,11 +71,11 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
     return ((typeMap[type.name]: any): T);
   }
 
-  function replaceMaybeType(maybeType) {
+  function replaceMaybeType<T: ?GraphQLNamedType>(maybeType: T): T {
     return maybeType && replaceNamedType(maybeType);
   }
 
-  function sortDirective(directive) {
+  function sortDirective(directive: GraphQLDirective) {
     const config = directive.toConfig();
     return new GraphQLDirective({
       ...config,
@@ -77,14 +84,14 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
     });
   }
 
-  function sortArgs(args) {
+  function sortArgs(args: GraphQLFieldConfigArgumentMap) {
     return sortObjMap(args, (arg) => ({
       ...arg,
       type: replaceType(arg.type),
     }));
   }
 
-  function sortFields(fieldsMap) {
+  function sortFields(fieldsMap: GraphQLFieldConfigMap<mixed, mixed>) {
     return sortObjMap(fieldsMap, (field) => ({
       ...field,
       type: replaceType(field.type),
@@ -92,7 +99,7 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
     }));
   }
 
-  function sortInputFields(fieldsMap) {
+  function sortInputFields(fieldsMap: GraphQLInputFieldConfigMap) {
     return sortObjMap(fieldsMap, (field) => ({
       ...field,
       type: replaceType(field.type),
@@ -103,7 +110,7 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
     return sortByName(arr).map(replaceNamedType);
   }
 
-  function sortNamedType(type) {
+  function sortNamedType<T: GraphQLNamedType>(type: T) {
     if (isScalarType(type) || isIntrospectionType(type)) {
       return type;
     }

package/utilities/lexicographicSortSchema.mjs

@@ -11,7 +11,7 @@ import keyValMap from "../jsutils/keyValMap.mjs";
 import { GraphQLSchema } from "../type/schema.mjs";
 import { GraphQLDirective } from "../type/directives.mjs";
 import { isIntrospectionType } from "../type/introspection.mjs";
-import { GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType, GraphQLList, GraphQLNonNull, isListType, isNonNullType, isScalarType, isObjectType, isInterfaceType, isUnionType, isEnumType, isInputObjectType } from "../type/definition.mjs";
+import { GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType, isListType, isNonNullType, isScalarType, isObjectType, isInterfaceType, isUnionType, isEnumType, isInputObjectType } from "../type/definition.mjs";
 /**
  * Sort GraphQLSchema.
  *
@@ -33,8 +33,10 @@ export function lexicographicSortSchema(schema) {
 
   function replaceType(type) {
     if (isListType(type)) {
+      // $FlowFixMe[incompatible-return]
       return new GraphQLList(replaceType(type.ofType));
     } else if (isNonNullType(type)) {
+      // $FlowFixMe[incompatible-return]
       return new GraphQLNonNull(replaceType(type.ofType));
     }
 

package/utilities/printSchema.js

@@ -7,25 +7,25 @@ exports.printSchema = printSchema;
 exports.printIntrospectionSchema = printIntrospectionSchema;
 exports.printType = printType;
 
-var _objectValues = _interopRequireDefault(require("../polyfills/objectValues"));
+var _objectValues = _interopRequireDefault(require("../polyfills/objectValues.js"));
 
-var _inspect = _interopRequireDefault(require("../jsutils/inspect"));
+var _inspect = _interopRequireDefault(require("../jsutils/inspect.js"));
 
-var _invariant = _interopRequireDefault(require("../jsutils/invariant"));
+var _invariant = _interopRequireDefault(require("../jsutils/invariant.js"));
 
-var _printer = require("../language/printer");
+var _printer = require("../language/printer.js");
 
-var _blockString = require("../language/blockString");
+var _blockString = require("../language/blockString.js");
 
-var _introspection = require("../type/introspection");
+var _introspection = require("../type/introspection.js");
 
-var _scalars = require("../type/scalars");
+var _scalars = require("../type/scalars.js");
 
-var _directives = require("../type/directives");
+var _directives = require("../type/directives.js");
 
-var _definition = require("../type/definition");
+var _definition = require("../type/definition.js");
 
-var _astFromValue = require("./astFromValue");
+var _astFromValue = require("./astFromValue.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -179,7 +179,7 @@ function printUnion(type, options) {
 
 function printEnum(type, options) {
   var values = type.getValues().map(function (value, i) {
-    return printDescription(options, value, '  ', !i) + '  ' + value.name + printDeprecated(value);
+    return printDescription(options, value, '  ', !i) + '  ' + value.name + printDeprecated(value.deprecationReason);
   });
   return printDescription(options, type) + "enum ".concat(type.name) + printBlock(values);
 }
@@ -193,7 +193,7 @@ function printInputObject(type, options) {
 
 function printFields(options, type) {
   var fields = (0, _objectValues.default)(type.getFields()).map(function (f, i) {
-    return printDescription(options, f, '  ', !i) + '  ' + f.name + printArgs(options, f.args, '  ') + ': ' + String(f.type) + printDeprecated(f);
+    return printDescription(options, f, '  ', !i) + '  ' + f.name + printArgs(options, f.args, '  ') + ': ' + String(f.type) + printDeprecated(f.deprecationReason);
   });
   return printBlock(fields);
 }
@@ -229,19 +229,18 @@ function printInputValue(arg) {
     argDecl += " = ".concat((0, _printer.print)(defaultAST));
   }
 
-  return argDecl;
+  return argDecl + printDeprecated(arg.deprecationReason);
 }
 
 function printDirective(directive, options) {
   return printDescription(options, directive) + 'directive @' + directive.name + printArgs(options, directive.args) + (directive.isRepeatable ? ' repeatable' : '') + ' on ' + directive.locations.join(' | ');
 }
 
-function printDeprecated(fieldOrEnumVal) {
-  if (!fieldOrEnumVal.isDeprecated) {
+function printDeprecated(reason) {
+  if (reason == null) {
     return '';
   }
 
-  var reason = fieldOrEnumVal.deprecationReason;
   var reasonAST = (0, _astFromValue.astFromValue)(reason, _scalars.GraphQLString);
 
   if (reasonAST && reason !== _directives.DEFAULT_DEPRECATION_REASON) {