graphql 15.3.0 → 15.5.1

package/utilities/buildASTSchema.js

@@ -6,19 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.buildASTSchema = buildASTSchema;
 exports.buildSchema = buildSchema;
 
-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 _parser = require("../language/parser");
+var _parser = require("../language/parser.js");
 
-var _validate = require("../validation/validate");
+var _validate = require("../validation/validate.js");
 
-var _schema = require("../type/schema");
+var _schema = require("../type/schema.js");
 
-var _directives = require("../type/directives");
+var _directives = require("../type/directives.js");
 
-var _extendSchema = require("./extendSchema");
+var _extendSchema = require("./extendSchema.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -80,28 +80,18 @@ function buildASTSchema(documentAST, options) {
 
   var directives = config.directives; // If specified directives were not explicitly declared, add them.
 
-  if (!directives.some(function (directive) {
-    return directive.name === 'skip';
-  })) {
-    directives.push(_directives.GraphQLSkipDirective);
-  }
-
-  if (!directives.some(function (directive) {
-    return directive.name === 'include';
-  })) {
-    directives.push(_directives.GraphQLIncludeDirective);
-  }
+  var _loop = function _loop(_i4) {
+    var stdDirective = _directives.specifiedDirectives[_i4];
 
-  if (!directives.some(function (directive) {
-    return directive.name === 'deprecated';
-  })) {
-    directives.push(_directives.GraphQLDeprecatedDirective);
-  }
+    if (directives.every(function (directive) {
+      return directive.name !== stdDirective.name;
+    })) {
+      directives.push(stdDirective);
+    }
+  };
 
-  if (!directives.some(function (directive) {
-    return directive.name === 'specifiedBy';
-  })) {
-    directives.push(_directives.GraphQLSpecifiedByDirective);
+  for (var _i4 = 0; _i4 < _directives.specifiedDirectives.length; _i4++) {
+    _loop(_i4);
   }
 
   return new _schema.GraphQLSchema(config);

package/utilities/buildASTSchema.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import devAssert from '../jsutils/devAssert';
 
 import type { Source } from '../language/source';
@@ -12,12 +11,7 @@ import { assertValidSDL } from '../validation/validate';
 
 import type { GraphQLSchemaValidationOptions } from '../type/schema';
 import { GraphQLSchema } from '../type/schema';
-import {
-  GraphQLSkipDirective,
-  GraphQLIncludeDirective,
-  GraphQLDeprecatedDirective,
-  GraphQLSpecifiedByDirective,
-} from '../type/directives';
+import { specifiedDirectives } from '../type/directives';
 
 import { extendSchemaImpl } from './extendSchema';
 
@@ -102,20 +96,10 @@ export function buildASTSchema(
 
   const { directives } = config;
   // If specified directives were not explicitly declared, add them.
-  if (!directives.some((directive) => directive.name === 'skip')) {
-    directives.push(GraphQLSkipDirective);
-  }
-
-  if (!directives.some((directive) => directive.name === 'include')) {
-    directives.push(GraphQLIncludeDirective);
-  }
-
-  if (!directives.some((directive) => directive.name === 'deprecated')) {
-    directives.push(GraphQLDeprecatedDirective);
-  }
-
-  if (!directives.some((directive) => directive.name === 'specifiedBy')) {
-    directives.push(GraphQLSpecifiedByDirective);
+  for (const stdDirective of specifiedDirectives) {
+    if (directives.every((directive) => directive.name !== stdDirective.name)) {
+      directives.push(stdDirective);
+    }
   }
 
   return new GraphQLSchema(config);

package/utilities/buildASTSchema.mjs

@@ -3,7 +3,7 @@ import { Kind } from "../language/kinds.mjs";
 import { parse } from "../language/parser.mjs";
 import { assertValidSDL } from "../validation/validate.mjs";
 import { GraphQLSchema } from "../type/schema.mjs";
-import { GraphQLSkipDirective, GraphQLIncludeDirective, GraphQLDeprecatedDirective, GraphQLSpecifiedByDirective } from "../type/directives.mjs";
+import { specifiedDirectives } from "../type/directives.mjs";
 import { extendSchemaImpl } from "./extendSchema.mjs";
 
 /**
@@ -64,28 +64,18 @@ export function buildASTSchema(documentAST, options) {
 
   var directives = config.directives; // If specified directives were not explicitly declared, add them.
 
-  if (!directives.some(function (directive) {
-    return directive.name === 'skip';
-  })) {
-    directives.push(GraphQLSkipDirective);
-  }
-
-  if (!directives.some(function (directive) {
-    return directive.name === 'include';
-  })) {
-    directives.push(GraphQLIncludeDirective);
-  }
+  var _loop = function _loop(_i4) {
+    var stdDirective = specifiedDirectives[_i4];
 
-  if (!directives.some(function (directive) {
-    return directive.name === 'deprecated';
-  })) {
-    directives.push(GraphQLDeprecatedDirective);
-  }
+    if (directives.every(function (directive) {
+      return directive.name !== stdDirective.name;
+    })) {
+      directives.push(stdDirective);
+    }
+  };
 
-  if (!directives.some(function (directive) {
-    return directive.name === 'specifiedBy';
-  })) {
-    directives.push(GraphQLSpecifiedByDirective);
+  for (var _i4 = 0; _i4 < specifiedDirectives.length; _i4++) {
+    _loop(_i4);
   }
 
   return new GraphQLSchema(config);

package/utilities/buildClientSchema.js

@@ -5,29 +5,29 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildClientSchema = buildClientSchema;
 
-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 _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 _isObjectLike = _interopRequireDefault(require("../jsutils/isObjectLike"));
+var _isObjectLike = _interopRequireDefault(require("../jsutils/isObjectLike.js"));
 
-var _parser = require("../language/parser");
+var _parser = require("../language/parser.js");
 
-var _schema = require("../type/schema");
+var _schema = require("../type/schema.js");
 
-var _directives = require("../type/directives");
+var _directives = require("../type/directives.js");
 
-var _scalars = require("../type/scalars");
+var _scalars = require("../type/scalars.js");
 
-var _introspection = require("../type/introspection");
+var _introspection = require("../type/introspection.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 }; }
 
@@ -89,7 +89,7 @@ function buildClientSchema(introspection, options) {
         throw new Error('Decorated type deeper than introspection query.');
       }
 
-      return (0, _definition.GraphQLList)(getType(itemRef));
+      return new _definition.GraphQLList(getType(itemRef));
     }
 
     if (typeRef.kind === _introspection.TypeKind.NON_NULL) {
@@ -100,7 +100,7 @@ function buildClientSchema(introspection, options) {
       }
 
       var nullableType = getType(nullableRef);
-      return (0, _definition.GraphQLNonNull)((0, _definition.assertNullableType)(nullableType));
+      return new _definition.GraphQLNonNull((0, _definition.assertNullableType)(nullableType));
     }
 
     return getNamedType(typeRef);
@@ -307,7 +307,8 @@ function buildClientSchema(introspection, options) {
     return {
       description: inputValueIntrospection.description,
       type: type,
-      defaultValue: defaultValue
+      defaultValue: defaultValue,
+      deprecationReason: inputValueIntrospection.deprecationReason
     };
   }
 

package/utilities/buildClientSchema.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import objectValues from '../polyfills/objectValues';
 
 import inspect from '../jsutils/inspect';
@@ -10,7 +9,12 @@ import isObjectLike from '../jsutils/isObjectLike';
 import { parseValue } from '../language/parser';
 
 import type { GraphQLSchemaValidationOptions } from '../type/schema';
-import type { GraphQLType, GraphQLNamedType } from '../type/definition';
+import type {
+  GraphQLType,
+  GraphQLNamedType,
+  GraphQLFieldConfig,
+  GraphQLFieldConfigMap,
+} from '../type/definition';
 import { GraphQLSchema } from '../type/schema';
 import { GraphQLDirective } from '../type/directives';
 import { specifiedScalarTypes } from '../type/scalars';
@@ -18,14 +22,14 @@ import { introspectionTypes, TypeKind } from '../type/introspection';
 import {
   isInputType,
   isOutputType,
+  GraphQLList,
+  GraphQLNonNull,
   GraphQLScalarType,
   GraphQLObjectType,
   GraphQLInterfaceType,
   GraphQLUnionType,
   GraphQLEnumType,
   GraphQLInputObjectType,
-  GraphQLList,
-  GraphQLNonNull,
   assertNullableType,
   assertObjectType,
   assertInterfaceType,
@@ -33,6 +37,9 @@ import {
 
 import type {
   IntrospectionQuery,
+  IntrospectionDirective,
+  IntrospectionField,
+  IntrospectionInputValue,
   IntrospectionType,
   IntrospectionScalarType,
   IntrospectionObjectType,
@@ -123,7 +130,7 @@ export function buildClientSchema(
       if (!itemRef) {
         throw new Error('Decorated type deeper than introspection query.');
       }
-      return GraphQLList(getType(itemRef));
+      return new GraphQLList(getType(itemRef));
     }
     if (typeRef.kind === TypeKind.NON_NULL) {
       const nullableRef = typeRef.ofType;
@@ -131,7 +138,7 @@ export function buildClientSchema(
         throw new Error('Decorated type deeper than introspection query.');
       }
       const nullableType = getType(nullableRef);
-      return GraphQLNonNull(assertNullableType(nullableType));
+      return new GraphQLNonNull(assertNullableType(nullableType));
     }
     return getNamedType(typeRef);
   }
@@ -205,7 +212,7 @@ export function buildClientSchema(
     implementingIntrospection:
       | IntrospectionObjectType
       | IntrospectionInterfaceType,
-  ) {
+  ): Array<GraphQLInterfaceType> {
     // TODO: Temporary workaround until GraphQL ecosystem will fully support
     // 'interfaces' on interface types.
     if (
@@ -302,7 +309,9 @@ export function buildClientSchema(
     });
   }
 
-  function buildFieldDefMap(typeIntrospection) {
+  function buildFieldDefMap(
+    typeIntrospection: IntrospectionObjectType | IntrospectionInterfaceType,
+  ): GraphQLFieldConfigMap<mixed, mixed> {
     if (!typeIntrospection.fields) {
       throw new Error(
         `Introspection result missing fields: ${inspect(typeIntrospection)}.`,
@@ -316,7 +325,9 @@ export function buildClientSchema(
     );
   }
 
-  function buildField(fieldIntrospection) {
+  function buildField(
+    fieldIntrospection: IntrospectionField,
+  ): GraphQLFieldConfig<mixed, mixed> {
     const type = getType(fieldIntrospection.type);
     if (!isOutputType(type)) {
       const typeStr = inspect(type);
@@ -340,7 +351,9 @@ export function buildClientSchema(
     };
   }
 
-  function buildInputValueDefMap(inputValueIntrospections) {
+  function buildInputValueDefMap(
+    inputValueIntrospections: $ReadOnlyArray<IntrospectionInputValue>,
+  ) {
     return keyValMap(
       inputValueIntrospections,
       (inputValue) => inputValue.name,
@@ -348,7 +361,7 @@ export function buildClientSchema(
     );
   }
 
-  function buildInputValue(inputValueIntrospection) {
+  function buildInputValue(inputValueIntrospection: IntrospectionInputValue) {
     const type = getType(inputValueIntrospection.type);
     if (!isInputType(type)) {
       const typeStr = inspect(type);
@@ -365,10 +378,13 @@ export function buildClientSchema(
       description: inputValueIntrospection.description,
       type,
       defaultValue,
+      deprecationReason: inputValueIntrospection.deprecationReason,
     };
   }
 
-  function buildDirective(directiveIntrospection) {
+  function buildDirective(
+    directiveIntrospection: IntrospectionDirective,
+  ): GraphQLDirective {
     if (!directiveIntrospection.args) {
       const directiveIntrospectionStr = inspect(directiveIntrospection);
       throw new Error(

package/utilities/buildClientSchema.mjs

@@ -8,7 +8,7 @@ import { GraphQLSchema } from "../type/schema.mjs";
 import { GraphQLDirective } from "../type/directives.mjs";
 import { specifiedScalarTypes } from "../type/scalars.mjs";
 import { introspectionTypes, TypeKind } from "../type/introspection.mjs";
-import { isInputType, isOutputType, GraphQLScalarType, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType, GraphQLList, GraphQLNonNull, assertNullableType, assertObjectType, assertInterfaceType } from "../type/definition.mjs";
+import { isInputType, isOutputType, GraphQLList, GraphQLNonNull, GraphQLScalarType, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType, assertNullableType, assertObjectType, assertInterfaceType } from "../type/definition.mjs";
 import { valueFromAST } from "./valueFromAST.mjs";
 /**
  * Build a GraphQLSchema for use by client tools.
@@ -69,7 +69,7 @@ export function buildClientSchema(introspection, options) {
         throw new Error('Decorated type deeper than introspection query.');
       }
 
-      return GraphQLList(getType(itemRef));
+      return new GraphQLList(getType(itemRef));
     }
 
     if (typeRef.kind === TypeKind.NON_NULL) {
@@ -80,7 +80,7 @@ export function buildClientSchema(introspection, options) {
       }
 
       var nullableType = getType(nullableRef);
-      return GraphQLNonNull(assertNullableType(nullableType));
+      return new GraphQLNonNull(assertNullableType(nullableType));
     }
 
     return getNamedType(typeRef);
@@ -287,7 +287,8 @@ export function buildClientSchema(introspection, options) {
     return {
       description: inputValueIntrospection.description,
       type: type,
-      defaultValue: defaultValue
+      defaultValue: defaultValue,
+      deprecationReason: inputValueIntrospection.deprecationReason
     };
   }
 

package/utilities/coerceInputValue.js

@@ -5,29 +5,27 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.coerceInputValue = coerceInputValue;
 
-var _arrayFrom = _interopRequireDefault(require("../polyfills/arrayFrom"));
+var _objectValues3 = _interopRequireDefault(require("../polyfills/objectValues.js"));
 
-var _objectValues3 = _interopRequireDefault(require("../polyfills/objectValues"));
+var _inspect = _interopRequireDefault(require("../jsutils/inspect.js"));
 
-var _inspect = _interopRequireDefault(require("../jsutils/inspect"));
+var _invariant = _interopRequireDefault(require("../jsutils/invariant.js"));
 
-var _invariant = _interopRequireDefault(require("../jsutils/invariant"));
+var _didYouMean = _interopRequireDefault(require("../jsutils/didYouMean.js"));
 
-var _didYouMean = _interopRequireDefault(require("../jsutils/didYouMean"));
+var _isObjectLike = _interopRequireDefault(require("../jsutils/isObjectLike.js"));
 
-var _isObjectLike = _interopRequireDefault(require("../jsutils/isObjectLike"));
+var _safeArrayFrom = _interopRequireDefault(require("../jsutils/safeArrayFrom.js"));
 
-var _isCollection = _interopRequireDefault(require("../jsutils/isCollection"));
+var _suggestionList = _interopRequireDefault(require("../jsutils/suggestionList.js"));
 
-var _suggestionList = _interopRequireDefault(require("../jsutils/suggestionList"));
+var _printPathArray = _interopRequireDefault(require("../jsutils/printPathArray.js"));
 
-var _printPathArray = _interopRequireDefault(require("../jsutils/printPathArray"));
+var _Path = require("../jsutils/Path.js");
 
-var _Path = require("../jsutils/Path");
+var _GraphQLError = require("../error/GraphQLError.js");
 
-var _GraphQLError = require("../error/GraphQLError");
-
-var _definition = require("../type/definition");
+var _definition = require("../type/definition.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -67,12 +65,13 @@ function coerceInputValueImpl(inputValue, type, onError, path) {
 
   if ((0, _definition.isListType)(type)) {
     var itemType = type.ofType;
+    var coercedList = (0, _safeArrayFrom.default)(inputValue, function (itemValue, index) {
+      var itemPath = (0, _Path.addPath)(path, index, undefined);
+      return coerceInputValueImpl(itemValue, itemType, onError, itemPath);
+    });
 
-    if ((0, _isCollection.default)(inputValue)) {
-      return (0, _arrayFrom.default)(inputValue, function (itemValue, index) {
-        var itemPath = (0, _Path.addPath)(path, index, undefined);
-        return coerceInputValueImpl(itemValue, itemType, onError, itemPath);
-      });
+    if (coercedList != null) {
+      return coercedList;
     } // Lists accept a non-list value as a list of one.
 
 

package/utilities/coerceInputValue.js.flow

@@ -1,6 +1,4 @@
 // @flow strict
-
-import arrayFrom from '../polyfills/arrayFrom';
 import objectValues from '../polyfills/objectValues';
 
 import type { Path } from '../jsutils/Path';
@@ -8,7 +6,7 @@ import inspect from '../jsutils/inspect';
 import invariant from '../jsutils/invariant';
 import didYouMean from '../jsutils/didYouMean';
 import isObjectLike from '../jsutils/isObjectLike';
-import isCollection from '../jsutils/isCollection';
+import safeArrayFrom from '../jsutils/safeArrayFrom';
 import suggestionList from '../jsutils/suggestionList';
 import printPathArray from '../jsutils/printPathArray';
 import { addPath, pathToArray } from '../jsutils/Path';
@@ -35,7 +33,7 @@ type OnErrorCB = (
 export function coerceInputValue(
   inputValue: mixed,
   type: GraphQLInputType,
-  onError?: OnErrorCB = defaultOnError,
+  onError: OnErrorCB = defaultOnError,
 ): mixed {
   return coerceInputValueImpl(inputValue, type, onError);
 }
@@ -44,7 +42,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,12 +78,16 @@ function coerceInputValueImpl(
 
   if (isListType(type)) {
     const itemType = type.ofType;
-    if (isCollection(inputValue)) {
-      return arrayFrom(inputValue, (itemValue, index) => {
-        const itemPath = addPath(path, index, undefined);
-        return coerceInputValueImpl(itemValue, itemType, onError, itemPath);
-      });
+
+    const coercedList = safeArrayFrom(inputValue, (itemValue, index) => {
+      const itemPath = addPath(path, index, undefined);
+      return coerceInputValueImpl(itemValue, itemType, onError, itemPath);
+    });
+
+    if (coercedList != null) {
+      return coercedList;
     }
+
     // Lists accept a non-list value as a list of one.
     return [coerceInputValueImpl(inputValue, itemType, onError, path)];
   }

package/utilities/coerceInputValue.mjs

@@ -1,10 +1,9 @@
-import arrayFrom from "../polyfills/arrayFrom.mjs";
 import objectValues from "../polyfills/objectValues.mjs";
 import inspect from "../jsutils/inspect.mjs";
 import invariant from "../jsutils/invariant.mjs";
 import didYouMean from "../jsutils/didYouMean.mjs";
 import isObjectLike from "../jsutils/isObjectLike.mjs";
-import isCollection from "../jsutils/isCollection.mjs";
+import safeArrayFrom from "../jsutils/safeArrayFrom.mjs";
 import suggestionList from "../jsutils/suggestionList.mjs";
 import printPathArray from "../jsutils/printPathArray.mjs";
 import { addPath, pathToArray } from "../jsutils/Path.mjs";
@@ -47,12 +46,13 @@ function coerceInputValueImpl(inputValue, type, onError, path) {
 
   if (isListType(type)) {
     var itemType = type.ofType;
+    var coercedList = safeArrayFrom(inputValue, function (itemValue, index) {
+      var itemPath = addPath(path, index, undefined);
+      return coerceInputValueImpl(itemValue, itemType, onError, itemPath);
+    });
 
-    if (isCollection(inputValue)) {
-      return arrayFrom(inputValue, function (itemValue, index) {
-        var itemPath = addPath(path, index, undefined);
-        return coerceInputValueImpl(itemValue, itemType, onError, itemPath);
-      });
+    if (coercedList != null) {
+      return coercedList;
     } // Lists accept a non-list value as a list of one.
 
 

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,7 +1,4 @@
 // @flow strict
-
-import flatMap from '../polyfills/flatMap';
-
 import type { DocumentNode } from '../language/ast';
 
 /**
@@ -9,9 +6,12 @@ import type { DocumentNode } from '../language/ast';
  * 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
   };
 }