graphql 14.1.1 → 14.3.1

package/utilities/buildClientSchema.mjs

@@ -1,14 +1,14 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
  * 
  */
+import objectValues from '../polyfills/objectValues';
 import inspect from '../jsutils/inspect';
 import invariant from '../jsutils/invariant';
-import keyMap from '../jsutils/keyMap';
 import keyValMap from '../jsutils/keyValMap';
 import { valueFromAST } from './valueFromAST';
 import { parseValue } from '../language/parser';
@@ -32,16 +32,38 @@ import { specifiedScalarTypes } from '../type/scalars';
  */
 export function buildClientSchema(introspection, options) {
   // Get the schema from the introspection result.
-  var schemaIntrospection = introspection.__schema; // Converts the list of types into a keyMap based on the type names.
+  var schemaIntrospection = introspection.__schema; // Iterate through all types, getting the type definition for each.
+
+  var typeMap = keyValMap(schemaIntrospection.types, function (typeIntrospection) {
+    return typeIntrospection.name;
+  }, function (typeIntrospection) {
+    return buildType(typeIntrospection);
+  });
+
+  for (var _i = 0, _arr = [].concat(specifiedScalarTypes, introspectionTypes); _i < _arr.length; _i++) {
+    var stdType = _arr[_i];
+
+    if (typeMap[stdType.name]) {
+      typeMap[stdType.name] = stdType;
+    }
+  } // Get the root Query, Mutation, and Subscription types.
 
-  var typeIntrospectionMap = keyMap(schemaIntrospection.types, function (type) {
-    return type.name;
-  }); // A cache to use to store the actual GraphQLType definition objects by name.
-  // Initialize to the GraphQL built in scalars. All functions below are inline
-  // so that this type def cache is within the scope of the closure.
 
-  var typeDefCache = keyMap(specifiedScalarTypes.concat(introspectionTypes), function (type) {
-    return type.name;
+  var queryType = schemaIntrospection.queryType ? getObjectType(schemaIntrospection.queryType) : null;
+  var mutationType = schemaIntrospection.mutationType ? getObjectType(schemaIntrospection.mutationType) : null;
+  var subscriptionType = schemaIntrospection.subscriptionType ? getObjectType(schemaIntrospection.subscriptionType) : null; // Get the directives supported by Introspection, assuming empty-set if
+  // directives were not queried for.
+
+  var directives = schemaIntrospection.directives ? schemaIntrospection.directives.map(buildDirective) : []; // Then produce and return a Schema with these types.
+
+  return new GraphQLSchema({
+    query: queryType,
+    mutation: mutationType,
+    subscription: subscriptionType,
+    types: objectValues(typeMap),
+    directives: directives,
+    assumeValid: options && options.assumeValid,
+    allowedLegacyNames: options && options.allowedLegacyNames
   }); // Given a type reference in introspection, return the GraphQLType instance.
   // preferring cached instances before building new instances.
 
@@ -75,19 +97,13 @@ export function buildClientSchema(introspection, options) {
   }
 
   function getNamedType(typeName) {
-    if (typeDefCache[typeName]) {
-      return typeDefCache[typeName];
-    }
-
-    var typeIntrospection = typeIntrospectionMap[typeName];
+    var type = typeMap[typeName];
 
-    if (!typeIntrospection) {
+    if (!type) {
       throw new Error("Invalid or incomplete schema, unknown type: ".concat(typeName, ". Ensure ") + 'that a full introspection query is used in order to build a ' + 'client schema.');
     }
 
-    var typeDef = buildType(typeIntrospection);
-    typeDefCache[typeName] = typeDef;
-    return typeDef;
+    return type;
   }
 
   function getInputType(typeRef) {
@@ -276,28 +292,5 @@ export function buildClientSchema(introspection, options) {
       locations: directiveIntrospection.locations.slice(),
       args: buildInputValueDefMap(directiveIntrospection.args)
     });
-  } // Iterate through all types, getting the type definition for each, ensuring
-  // that any type not directly referenced by a field will get created.
-
-
-  var types = schemaIntrospection.types.map(function (typeIntrospection) {
-    return getNamedType(typeIntrospection.name);
-  }); // Get the root Query, Mutation, and Subscription types.
-
-  var queryType = schemaIntrospection.queryType ? getObjectType(schemaIntrospection.queryType) : null;
-  var mutationType = schemaIntrospection.mutationType ? getObjectType(schemaIntrospection.mutationType) : null;
-  var subscriptionType = schemaIntrospection.subscriptionType ? getObjectType(schemaIntrospection.subscriptionType) : null; // Get the directives supported by Introspection, assuming empty-set if
-  // directives were not queried for.
-
-  var directives = schemaIntrospection.directives ? schemaIntrospection.directives.map(buildDirective) : []; // Then produce and return a Schema with these types.
-
-  return new GraphQLSchema({
-    query: queryType,
-    mutation: mutationType,
-    subscription: subscriptionType,
-    types: types,
-    directives: directives,
-    assumeValid: options && options.assumeValid,
-    allowedLegacyNames: options && options.allowedLegacyNames
-  });
-}
+  }
+}

package/utilities/coerceValue.js

@@ -154,10 +154,8 @@ function coerceValue(value, type, blameNode, path) {
       }
     }
 
-    var _arr = Object.keys(value);
-
-    for (var _i = 0; _i < _arr.length; _i++) {
-      var fieldName = _arr[_i];
+    for (var _i = 0, _Object$keys = Object.keys(value); _i < _Object$keys.length; _i++) {
+      var fieldName = _Object$keys[_i];
 
       if (!fields[fieldName]) {
         var _suggestions = (0, _suggestionList.default)(fieldName, Object.keys(fields));
@@ -169,11 +167,12 @@ function coerceValue(value, type, blameNode, path) {
     }
 
     return _errors ? ofErrors(_errors) : ofValue(_coercedValue);
-  }
+  } // Not reachable. All possible input types have been considered.
+
   /* istanbul ignore next */
 
 
-  throw new Error("Unexpected type: ".concat(type, "."));
+  throw new Error("Unexpected input type: \"".concat((0, _inspect.default)(type), "\"."));
 }
 
 function ofValue(value) {
@@ -218,4 +217,4 @@ function printPath(path) {
   }
 
   return pathStr ? 'value' + pathStr : '';
-}
+}

package/utilities/coerceValue.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,15 +14,15 @@ import isInvalid from '../jsutils/isInvalid';
 import orList from '../jsutils/orList';
 import suggestionList from '../jsutils/suggestionList';
 import { GraphQLError } from '../error/GraphQLError';
-import type { ASTNode } from '../language/ast';
+import { type ASTNode } from '../language/ast';
 import {
+  type GraphQLInputType,
   isScalarType,
   isEnumType,
   isInputObjectType,
   isListType,
   isNonNullType,
 } from '../type/definition';
-import type { GraphQLInputType } from '../type/definition';
 
 type CoercedValue = {|
   +errors: $ReadOnlyArray<GraphQLError> | void,
@@ -201,8 +201,9 @@ export function coerceValue(
     return errors ? ofErrors(errors) : ofValue(coercedValue);
   }
 
+  // Not reachable. All possible input types have been considered.
   /* istanbul ignore next */
-  throw new Error(`Unexpected type: ${(type: empty)}.`);
+  throw new Error(`Unexpected input type: "${inspect((type: empty))}".`);
 }
 
 function ofValue(value) {

package/utilities/coerceValue.mjs

@@ -1,7 +1,7 @@
 function _typeof(obj) { 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); }
 
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -146,10 +146,8 @@ export function coerceValue(value, type, blameNode, path) {
       }
     }
 
-    var _arr = Object.keys(value);
-
-    for (var _i = 0; _i < _arr.length; _i++) {
-      var fieldName = _arr[_i];
+    for (var _i = 0, _Object$keys = Object.keys(value); _i < _Object$keys.length; _i++) {
+      var fieldName = _Object$keys[_i];
 
       if (!fields[fieldName]) {
         var _suggestions = suggestionList(fieldName, Object.keys(fields));
@@ -161,11 +159,12 @@ export function coerceValue(value, type, blameNode, path) {
     }
 
     return _errors ? ofErrors(_errors) : ofValue(_coercedValue);
-  }
+  } // Not reachable. All possible input types have been considered.
+
   /* istanbul ignore next */
 
 
-  throw new Error("Unexpected type: ".concat(type, "."));
+  throw new Error("Unexpected input type: \"".concat(inspect(type), "\"."));
 }
 
 function ofValue(value) {
@@ -210,4 +209,4 @@ function printPath(path) {
   }
 
   return pathStr ? 'value' + pathStr : '';
-}
+}

package/utilities/concatAST.js

@@ -5,8 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.concatAST = concatAST;
 
+var _flatMap = _interopRequireDefault(require("../polyfills/flatMap"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,18 +24,10 @@ exports.concatAST = concatAST;
  * GraphQL source files which together represent one conceptual application.
  */
 function concatAST(asts) {
-  var batchDefinitions = [];
-
-  for (var i = 0; i < asts.length; i++) {
-    var definitions = asts[i].definitions;
-
-    for (var j = 0; j < definitions.length; j++) {
-      batchDefinitions.push(definitions[j]);
-    }
-  }
-
   return {
     kind: 'Document',
-    definitions: batchDefinitions
+    definitions: (0, _flatMap.default)(asts, function (ast) {
+      return ast.definitions;
+    })
   };
-}
+}

package/utilities/concatAST.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,7 +7,8 @@
  * @flow strict
  */
 
-import type { DocumentNode } from '../language/ast';
+import flatMap from '../polyfills/flatMap';
+import { type DocumentNode } from '../language/ast';
 
 /**
  * Provided a collection of ASTs, presumably each from different files,
@@ -15,15 +16,8 @@ import type { DocumentNode } from '../language/ast';
  * GraphQL source files which together represent one conceptual application.
  */
 export function concatAST(asts: $ReadOnlyArray<DocumentNode>): DocumentNode {
-  const batchDefinitions = [];
-  for (let i = 0; i < asts.length; i++) {
-    const definitions = asts[i].definitions;
-    for (let j = 0; j < definitions.length; j++) {
-      batchDefinitions.push(definitions[j]);
-    }
-  }
   return {
     kind: 'Document',
-    definitions: batchDefinitions,
+    definitions: flatMap(asts, ast => ast.definitions),
   };
 }

package/utilities/concatAST.mjs

@@ -1,11 +1,12 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
  * 
  */
+import flatMap from '../polyfills/flatMap';
 
 /**
  * Provided a collection of ASTs, presumably each from different files,
@@ -13,18 +14,10 @@
  * GraphQL source files which together represent one conceptual application.
  */
 export function concatAST(asts) {
-  var batchDefinitions = [];
-
-  for (var i = 0; i < asts.length; i++) {
-    var definitions = asts[i].definitions;
-
-    for (var j = 0; j < definitions.length; j++) {
-      batchDefinitions.push(definitions[j]);
-    }
-  }
-
   return {
     kind: 'Document',
-    definitions: batchDefinitions
+    definitions: flatMap(asts, function (ast) {
+      return ast.definitions;
+    })
   };
-}
+}