graphql 15.1.0 → 15.4.0

package/utilities/coerceInputValue.js.flow

@@ -1,8 +1,8 @@
 // @flow strict
-
 import arrayFrom from '../polyfills/arrayFrom';
 import objectValues from '../polyfills/objectValues';
 
+import type { Path } from '../jsutils/Path';
 import inspect from '../jsutils/inspect';
 import invariant from '../jsutils/invariant';
 import didYouMean from '../jsutils/didYouMean';
@@ -10,11 +10,12 @@ import isObjectLike from '../jsutils/isObjectLike';
 import isCollection from '../jsutils/isCollection';
 import suggestionList from '../jsutils/suggestionList';
 import printPathArray from '../jsutils/printPathArray';
-import { type Path, addPath, pathToArray } from '../jsutils/Path';
+import { addPath, pathToArray } from '../jsutils/Path';
 
 import { GraphQLError } from '../error/GraphQLError';
+
+import type { GraphQLInputType } from '../type/definition';
 import {
-  type GraphQLInputType,
   isLeafType,
   isInputObjectType,
   isListType,
@@ -42,7 +43,7 @@ function defaultOnError(
   path: $ReadOnlyArray<string | number>,
   invalidValue: mixed,
   error: GraphQLError,
-) {
+): void {
   let errorPrefix = 'Invalid value ' + inspect(invalidValue);
   if (path.length > 0) {
     errorPrefix += ` at "value${printPathArray(path)}"`;
@@ -80,7 +81,7 @@ function coerceInputValueImpl(
     const itemType = type.ofType;
     if (isCollection(inputValue)) {
       return arrayFrom(inputValue, (itemValue, index) => {
-        const itemPath = addPath(path, index);
+        const itemPath = addPath(path, index, undefined);
         return coerceInputValueImpl(itemValue, itemType, onError, itemPath);
       });
     }
@@ -124,7 +125,7 @@ function coerceInputValueImpl(
         fieldValue,
         field.type,
         onError,
-        addPath(path, field.name),
+        addPath(path, field.name, type.name),
       );
     }
 

package/utilities/coerceInputValue.mjs

@@ -50,7 +50,7 @@ function coerceInputValueImpl(inputValue, type, onError, path) {
 
     if (isCollection(inputValue)) {
       return arrayFrom(inputValue, function (itemValue, index) {
-        var itemPath = addPath(path, index);
+        var itemPath = addPath(path, index, undefined);
         return coerceInputValueImpl(itemValue, itemType, onError, itemPath);
       });
     } // Lists accept a non-list value as a list of one.
@@ -83,7 +83,7 @@ function coerceInputValueImpl(inputValue, type, onError, path) {
         continue;
       }
 
-      coercedValue[field.name] = coerceInputValueImpl(fieldValue, field.type, onError, addPath(path, field.name));
+      coercedValue[field.name] = coerceInputValueImpl(fieldValue, field.type, onError, addPath(path, field.name, type.name));
     } // Ensure every provided field is defined.
 
 

package/utilities/concatAST.js

@@ -5,20 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.concatAST = concatAST;
 
-var _flatMap = _interopRequireDefault(require("../polyfills/flatMap"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * Provided a collection of ASTs, presumably each from different files,
  * concatenate the ASTs together into batched AST, useful for validating many
  * GraphQL source files which together represent one conceptual application.
  */
-function concatAST(asts) {
+function concatAST(documents) {
+  var definitions = [];
+
+  for (var _i2 = 0; _i2 < documents.length; _i2++) {
+    var doc = documents[_i2];
+    definitions = definitions.concat(doc.definitions);
+  }
+
   return {
     kind: 'Document',
-    definitions: (0, _flatMap.default)(asts, function (ast) {
-      return ast.definitions;
-    })
+    definitions: definitions
   };
 }

package/utilities/concatAST.js.flow

@@ -1,17 +1,17 @@
 // @flow strict
-
-import flatMap from '../polyfills/flatMap';
-
-import { type DocumentNode } from '../language/ast';
+import type { DocumentNode } from '../language/ast';
 
 /**
  * Provided a collection of ASTs, presumably each from different files,
  * concatenate the ASTs together into batched AST, useful for validating many
  * GraphQL source files which together represent one conceptual application.
  */
-export function concatAST(asts: $ReadOnlyArray<DocumentNode>): DocumentNode {
-  return {
-    kind: 'Document',
-    definitions: flatMap(asts, (ast) => ast.definitions),
-  };
+export function concatAST(
+  documents: $ReadOnlyArray<DocumentNode>,
+): DocumentNode {
+  let definitions = [];
+  for (const doc of documents) {
+    definitions = definitions.concat(doc.definitions);
+  }
+  return { kind: 'Document', definitions };
 }

package/utilities/concatAST.mjs

@@ -1,15 +1,18 @@
-import flatMap from "../polyfills/flatMap.mjs";
-
 /**
  * Provided a collection of ASTs, presumably each from different files,
  * concatenate the ASTs together into batched AST, useful for validating many
  * GraphQL source files which together represent one conceptual application.
  */
-export function concatAST(asts) {
+export function concatAST(documents) {
+  var definitions = [];
+
+  for (var _i2 = 0; _i2 < documents.length; _i2++) {
+    var doc = documents[_i2];
+    definitions = definitions.concat(doc.definitions);
+  }
+
   return {
     kind: 'Document',
-    definitions: flatMap(asts, function (ast) {
-      return ast.definitions;
-    })
+    definitions: definitions
   };
 }

package/utilities/extendSchema.js

@@ -7,41 +7,41 @@ exports.extendSchema = extendSchema;
 exports.extendSchemaImpl = extendSchemaImpl;
 exports.getDescription = getDescription;
 
-var _objectValues = _interopRequireDefault(require("../polyfills/objectValues"));
+var _objectValues = _interopRequireDefault(require("../polyfills/objectValues.js"));
 
-var _keyMap = _interopRequireDefault(require("../jsutils/keyMap"));
+var _keyMap = _interopRequireDefault(require("../jsutils/keyMap.js"));
 
-var _inspect = _interopRequireDefault(require("../jsutils/inspect"));
+var _inspect = _interopRequireDefault(require("../jsutils/inspect.js"));
 
-var _mapValue = _interopRequireDefault(require("../jsutils/mapValue"));
+var _mapValue = _interopRequireDefault(require("../jsutils/mapValue.js"));
 
-var _invariant = _interopRequireDefault(require("../jsutils/invariant"));
+var _invariant = _interopRequireDefault(require("../jsutils/invariant.js"));
 
-var _devAssert = _interopRequireDefault(require("../jsutils/devAssert"));
+var _devAssert = _interopRequireDefault(require("../jsutils/devAssert.js"));
 
-var _kinds = require("../language/kinds");
+var _kinds = require("../language/kinds.js");
 
-var _tokenKind = require("../language/tokenKind");
+var _tokenKind = require("../language/tokenKind.js");
 
-var _blockString = require("../language/blockString");
+var _blockString = require("../language/blockString.js");
 
-var _predicates = require("../language/predicates");
+var _predicates = require("../language/predicates.js");
 
-var _validate = require("../validation/validate");
+var _validate = require("../validation/validate.js");
 
-var _values = require("../execution/values");
+var _values = require("../execution/values.js");
 
-var _scalars = require("../type/scalars");
+var _schema = require("../type/schema.js");
 
-var _introspection = require("../type/introspection");
+var _scalars = require("../type/scalars.js");
 
-var _directives = require("../type/directives");
+var _introspection = require("../type/introspection.js");
 
-var _schema = require("../type/schema");
+var _directives = require("../type/directives.js");
 
-var _definition = require("../type/definition");
+var _definition = require("../type/definition.js");
 
-var _valueFromAST = require("./valueFromAST");
+var _valueFromAST = require("./valueFromAST.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -160,8 +160,12 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
 
   function replaceType(type) {
     if ((0, _definition.isListType)(type)) {
+      // $FlowFixMe[incompatible-return]
       return new _definition.GraphQLList(replaceType(type.ofType));
-    } else if ((0, _definition.isNonNullType)(type)) {
+    }
+
+    if ((0, _definition.isNonNullType)(type)) {
+      // $FlowFixMe[incompatible-return]
       return new _definition.GraphQLNonNull(replaceType(type.ofType));
     }
 
@@ -313,6 +317,7 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
   function extendField(field) {
     return _objectSpread(_objectSpread({}, field), {}, {
       type: replaceType(field.type),
+      // $FlowFixMe[incompatible-call]
       args: (0, _mapValue.default)(field.args, extendArg)
     });
   }
@@ -428,6 +433,7 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
         type: type,
         description: getDescription(arg, options),
         defaultValue: (0, _valueFromAST.valueFromAST)(arg.defaultValue, type),
+        deprecationReason: getDeprecationReason(arg),
         astNode: arg
       };
     }
@@ -455,6 +461,7 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
           type: type,
           description: getDescription(field, options),
           defaultValue: (0, _valueFromAST.valueFromAST)(field.defaultValue, type),
+          deprecationReason: getDeprecationReason(field),
           astNode: field
         };
       }

package/utilities/extendSchema.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import objectValues from '../polyfills/objectValues';
 
 import keyMap from '../jsutils/keyMap';
@@ -8,45 +7,60 @@ import mapValue from '../jsutils/mapValue';
 import invariant from '../jsutils/invariant';
 import devAssert from '../jsutils/devAssert';
 
+import type { DirectiveLocationEnum } from '../language/directiveLocation';
+import type {
+  Location,
+  DocumentNode,
+  StringValueNode,
+  TypeNode,
+  NamedTypeNode,
+  SchemaDefinitionNode,
+  SchemaExtensionNode,
+  TypeDefinitionNode,
+  InterfaceTypeDefinitionNode,
+  InterfaceTypeExtensionNode,
+  ObjectTypeDefinitionNode,
+  ObjectTypeExtensionNode,
+  UnionTypeDefinitionNode,
+  UnionTypeExtensionNode,
+  FieldDefinitionNode,
+  InputObjectTypeDefinitionNode,
+  InputObjectTypeExtensionNode,
+  InputValueDefinitionNode,
+  EnumTypeDefinitionNode,
+  EnumTypeExtensionNode,
+  EnumValueDefinitionNode,
+  DirectiveDefinitionNode,
+  ScalarTypeDefinitionNode,
+  ScalarTypeExtensionNode,
+} from '../language/ast';
 import { Kind } from '../language/kinds';
 import { TokenKind } from '../language/tokenKind';
 import { dedentBlockStringValue } from '../language/blockString';
-import { type DirectiveLocationEnum } from '../language/directiveLocation';
 import {
   isTypeDefinitionNode,
   isTypeExtensionNode,
 } from '../language/predicates';
-import {
-  type Location,
-  type DocumentNode,
-  type StringValueNode,
-  type TypeNode,
-  type NamedTypeNode,
-  type SchemaDefinitionNode,
-  type SchemaExtensionNode,
-  type TypeDefinitionNode,
-  type InterfaceTypeDefinitionNode,
-  type InterfaceTypeExtensionNode,
-  type ObjectTypeDefinitionNode,
-  type ObjectTypeExtensionNode,
-  type UnionTypeDefinitionNode,
-  type UnionTypeExtensionNode,
-  type FieldDefinitionNode,
-  type InputObjectTypeDefinitionNode,
-  type InputObjectTypeExtensionNode,
-  type InputValueDefinitionNode,
-  type EnumTypeDefinitionNode,
-  type EnumTypeExtensionNode,
-  type EnumValueDefinitionNode,
-  type DirectiveDefinitionNode,
-  type ScalarTypeDefinitionNode,
-  type ScalarTypeExtensionNode,
-} from '../language/ast';
 
 import { assertValidSDLExtension } from '../validation/validate';
 
 import { getDirectiveValues } from '../execution/values';
 
+import type {
+  GraphQLSchemaValidationOptions,
+  GraphQLSchemaNormalizedConfig,
+} from '../type/schema';
+import type {
+  GraphQLType,
+  GraphQLNamedType,
+  GraphQLFieldConfig,
+  GraphQLFieldConfigMap,
+  GraphQLArgumentConfig,
+  GraphQLFieldConfigArgumentMap,
+  GraphQLEnumValueConfigMap,
+  GraphQLInputFieldConfigMap,
+} from '../type/definition';
+import { assertSchema, GraphQLSchema } from '../type/schema';
 import { specifiedScalarTypes, isSpecifiedScalarType } from '../type/scalars';
 import { introspectionTypes, isIntrospectionType } from '../type/introspection';
 import {
@@ -55,18 +69,6 @@ import {
   GraphQLSpecifiedByDirective,
 } from '../type/directives';
 import {
-  type GraphQLSchemaValidationOptions,
-  assertSchema,
-  GraphQLSchema,
-  type GraphQLSchemaNormalizedConfig,
-} from '../type/schema';
-import {
-  type GraphQLType,
-  type GraphQLNamedType,
-  type GraphQLFieldConfigMap,
-  type GraphQLEnumValueConfigMap,
-  type GraphQLInputFieldConfigMap,
-  type GraphQLFieldConfigArgumentMap,
   isScalarType,
   isObjectType,
   isInterfaceType,
@@ -238,10 +240,13 @@ export function extendSchemaImpl(
   // Below are functions used for producing this schema that have closed over
   // this scope and have access to the schema, cache, and newly defined types.
 
-  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)) {
+    }
+    if (isNonNullType(type)) {
+      // $FlowFixMe[incompatible-return]
       return new GraphQLNonNull(replaceType(type.ofType));
     }
     return replaceNamedType(type);
@@ -392,15 +397,18 @@ export function extendSchemaImpl(
     });
   }
 
-  function extendField(field) {
+  function extendField(
+    field: GraphQLFieldConfig<mixed, mixed>,
+  ): GraphQLFieldConfig<mixed, mixed> {
     return {
       ...field,
       type: replaceType(field.type),
+      // $FlowFixMe[incompatible-call]
       args: mapValue(field.args, extendArg),
     };
   }
 
-  function extendArg(arg) {
+  function extendArg(arg: GraphQLArgumentConfig) {
     return {
       ...arg,
       type: replaceType(arg.type),
@@ -511,6 +519,7 @@ export function extendSchemaImpl(
         type,
         description: getDescription(arg, options),
         defaultValue: valueFromAST(arg.defaultValue, type),
+        deprecationReason: getDeprecationReason(arg),
         astNode: arg,
       };
     }
@@ -537,6 +546,7 @@ export function extendSchemaImpl(
           type,
           description: getDescription(field, options),
           defaultValue: valueFromAST(field.defaultValue, type),
+          deprecationReason: getDeprecationReason(field),
           astNode: field,
         };
       }
@@ -705,7 +715,10 @@ const stdTypeMap = keyMap(
  * deprecation reason.
  */
 function getDeprecationReason(
-  node: EnumValueDefinitionNode | FieldDefinitionNode,
+  node:
+    | EnumValueDefinitionNode
+    | FieldDefinitionNode
+    | InputValueDefinitionNode,
 ): ?string {
   const deprecated = getDirectiveValues(GraphQLDeprecatedDirective, node);
   return (deprecated?.reason: any);

package/utilities/extendSchema.mjs

@@ -16,10 +16,10 @@ import { dedentBlockStringValue } from "../language/blockString.mjs";
 import { isTypeDefinitionNode, isTypeExtensionNode } from "../language/predicates.mjs";
 import { assertValidSDLExtension } from "../validation/validate.mjs";
 import { getDirectiveValues } from "../execution/values.mjs";
+import { assertSchema, GraphQLSchema } from "../type/schema.mjs";
 import { specifiedScalarTypes, isSpecifiedScalarType } from "../type/scalars.mjs";
 import { introspectionTypes, isIntrospectionType } from "../type/introspection.mjs";
 import { GraphQLDirective, GraphQLDeprecatedDirective, GraphQLSpecifiedByDirective } from "../type/directives.mjs";
-import { assertSchema, GraphQLSchema } from "../type/schema.mjs";
 import { isScalarType, isObjectType, isInterfaceType, isUnionType, isListType, isNonNullType, isEnumType, isInputObjectType, GraphQLList, GraphQLNonNull, GraphQLScalarType, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType } from "../type/definition.mjs";
 import { valueFromAST } from "./valueFromAST.mjs";
 
@@ -131,8 +131,12 @@ export function extendSchemaImpl(schemaConfig, documentAST, options) {
 
   function replaceType(type) {
     if (isListType(type)) {
+      // $FlowFixMe[incompatible-return]
       return new GraphQLList(replaceType(type.ofType));
-    } else if (isNonNullType(type)) {
+    }
+
+    if (isNonNullType(type)) {
+      // $FlowFixMe[incompatible-return]
       return new GraphQLNonNull(replaceType(type.ofType));
     }
 
@@ -284,6 +288,7 @@ export function extendSchemaImpl(schemaConfig, documentAST, options) {
   function extendField(field) {
     return _objectSpread(_objectSpread({}, field), {}, {
       type: replaceType(field.type),
+      // $FlowFixMe[incompatible-call]
       args: mapValue(field.args, extendArg)
     });
   }
@@ -399,6 +404,7 @@ export function extendSchemaImpl(schemaConfig, documentAST, options) {
         type: type,
         description: getDescription(arg, options),
         defaultValue: valueFromAST(arg.defaultValue, type),
+        deprecationReason: getDeprecationReason(arg),
         astNode: arg
       };
     }
@@ -426,6 +432,7 @@ export function extendSchemaImpl(schemaConfig, documentAST, options) {
           type: type,
           description: getDescription(field, options),
           defaultValue: valueFromAST(field.defaultValue, type),
+          deprecationReason: getDeprecationReason(field),
           astNode: field
         };
       }

package/utilities/findBreakingChanges.js

@@ -7,23 +7,23 @@ exports.findBreakingChanges = findBreakingChanges;
 exports.findDangerousChanges = findDangerousChanges;
 exports.DangerousChangeType = exports.BreakingChangeType = void 0;
 
-var _objectValues = _interopRequireDefault(require("../polyfills/objectValues"));
+var _objectValues = _interopRequireDefault(require("../polyfills/objectValues.js"));
 
-var _keyMap = _interopRequireDefault(require("../jsutils/keyMap"));
+var _keyMap = _interopRequireDefault(require("../jsutils/keyMap.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 _visitor = require("../language/visitor");
+var _visitor = require("../language/visitor.js");
 
-var _scalars = require("../type/scalars");
+var _scalars = require("../type/scalars.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 }; }
 

package/utilities/findBreakingChanges.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import objectValues from '../polyfills/objectValues';
 
 import keyMap from '../jsutils/keyMap';
@@ -9,18 +8,20 @@ import invariant from '../jsutils/invariant';
 import { print } from '../language/printer';
 import { visit } from '../language/visitor';
 
-import { type GraphQLSchema } from '../type/schema';
+import type { GraphQLSchema } from '../type/schema';
+import type {
+  GraphQLField,
+  GraphQLType,
+  GraphQLInputType,
+  GraphQLNamedType,
+  GraphQLEnumType,
+  GraphQLUnionType,
+  GraphQLObjectType,
+  GraphQLInterfaceType,
+  GraphQLInputObjectType,
+} from '../type/definition';
 import { isSpecifiedScalarType } from '../type/scalars';
 import {
-  type GraphQLField,
-  type GraphQLType,
-  type GraphQLInputType,
-  type GraphQLNamedType,
-  type GraphQLEnumType,
-  type GraphQLUnionType,
-  type GraphQLObjectType,
-  type GraphQLInterfaceType,
-  type GraphQLInputObjectType,
   isScalarType,
   isObjectType,
   isInterfaceType,

package/utilities/findDeprecatedUsages.d.ts

@@ -6,8 +6,16 @@ import { GraphQLSchema } from '../type/schema';
  * 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>;
+): ReadonlyArray<GraphQLError>;

package/utilities/findDeprecatedUsages.js

@@ -5,39 +5,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.findDeprecatedUsages = findDeprecatedUsages;
 
-var _GraphQLError = require("../error/GraphQLError");
+var _validate = require("../validation/validate.js");
 
-var _visitor = require("../language/visitor");
-
-var _definition = require("../type/definition");
-
-var _TypeInfo = require("./TypeInfo");
+var _NoDeprecatedCustomRule = require("../validation/rules/custom/NoDeprecatedCustomRule.js");
 
 /**
  * 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])
+ * ```
  */
 function findDeprecatedUsages(schema, ast) {
-  var errors = [];
-  var typeInfo = new _TypeInfo.TypeInfo(schema);
-  (0, _visitor.visit)(ast, (0, _TypeInfo.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.GraphQLError("The field \"".concat(parentType.name, ".").concat(fieldDef.name, "\" is deprecated. ") + fieldDef.deprecationReason, node));
-      }
-    },
-    EnumValue: function EnumValue(node) {
-      var type = (0, _definition.getNamedType)(typeInfo.getInputType());
-      var enumVal = typeInfo.getEnumValue();
-
-      if (type && (enumVal === null || enumVal === void 0 ? void 0 : enumVal.deprecationReason) != null) {
-        errors.push(new _GraphQLError.GraphQLError("The enum value \"".concat(type.name, ".").concat(enumVal.name, "\" is deprecated. ") + enumVal.deprecationReason, node));
-      }
-    }
-  }));
-  return errors;
+  return (0, _validate.validate)(schema, ast, [_NoDeprecatedCustomRule.NoDeprecatedCustomRule]);
 }