graphql 14.1.1 → 14.3.1

package/utilities/buildASTSchema.js

@@ -10,6 +10,8 @@ exports.ASTDefinitionBuilder = void 0;
 
 var _objectValues = _interopRequireDefault(require("../polyfills/objectValues"));
 
+var _inspect = _interopRequireDefault(require("../jsutils/inspect"));
+
 var _invariant = _interopRequireDefault(require("../jsutils/invariant"));
 
 var _keyMap = _interopRequireDefault(require("../jsutils/keyMap"));
@@ -20,7 +22,7 @@ var _valueFromAST = require("./valueFromAST");
 
 var _validate = require("../validation/validate");
 
-var _blockStringValue = _interopRequireDefault(require("../language/blockStringValue"));
+var _blockString = require("../language/blockString");
 
 var _lexer = require("../language/lexer");
 
@@ -45,7 +47,7 @@ var _schema = require("../type/schema");
 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.
@@ -77,7 +79,7 @@ function buildASTSchema(documentAST, options) {
   }
 
   var schemaDef;
-  var nodeMap = Object.create(null);
+  var typeDefs = [];
   var directiveDefs = [];
   var _iteratorNormalCompletion = true;
   var _didIteratorError = false;
@@ -90,7 +92,7 @@ function buildASTSchema(documentAST, options) {
       if (def.kind === _kinds.Kind.SCHEMA_DEFINITION) {
         schemaDef = def;
       } else if ((0, _predicates.isTypeDefinitionNode)(def)) {
-        nodeMap[def.name.value] = def;
+        typeDefs.push(def);
       } else if (def.kind === _kinds.Kind.DIRECTIVE_DEFINITION) {
         directiveDefs.push(def);
       }
@@ -110,16 +112,21 @@ function buildASTSchema(documentAST, options) {
     }
   }
 
+  var astBuilder = new ASTDefinitionBuilder(options, function (typeName) {
+    var type = typeMap[typeName];
+    !type ? (0, _invariant.default)(0, "Type \"".concat(typeName, "\" not found in document.")) : void 0;
+    return type;
+  });
+  var typeMap = keyByNameNode(typeDefs, function (node) {
+    return astBuilder.buildType(node);
+  });
   var operationTypes = schemaDef ? getOperationTypes(schemaDef) : {
-    query: nodeMap.Query,
-    mutation: nodeMap.Mutation,
-    subscription: nodeMap.Subscription
+    query: 'Query',
+    mutation: 'Mutation',
+    subscription: 'Subscription'
   };
-  var definitionBuilder = new ASTDefinitionBuilder(nodeMap, options, function (typeName) {
-    throw new Error("Type \"".concat(typeName, "\" not found in document."));
-  });
   var directives = directiveDefs.map(function (def) {
-    return definitionBuilder.buildDirective(def);
+    return astBuilder.buildDirective(def);
   }); // If specified directives were not explicitly declared, add them.
 
   if (!directives.some(function (directive) {
@@ -138,18 +145,16 @@ function buildASTSchema(documentAST, options) {
     return directive.name === 'deprecated';
   })) {
     directives.push(_directives.GraphQLDeprecatedDirective);
-  } // Note: While this could make early assertions to get the correctly
-  // typed values below, that would throw immediately while type system
-  // validation with validateSchema() will produce more actionable results.
-
+  }
 
   return new _schema.GraphQLSchema({
-    query: operationTypes.query ? definitionBuilder.buildType(operationTypes.query) : null,
-    mutation: operationTypes.mutation ? definitionBuilder.buildType(operationTypes.mutation) : null,
-    subscription: operationTypes.subscription ? definitionBuilder.buildType(operationTypes.subscription) : null,
-    types: (0, _objectValues.default)(nodeMap).map(function (node) {
-      return definitionBuilder.buildType(node);
-    }),
+    // Note: While this could make early assertions to get the correctly
+    // typed values below, that would throw immediately while type system
+    // validation with validateSchema() will produce more actionable results.
+    query: operationTypes.query ? typeMap[operationTypes.query] : null,
+    mutation: operationTypes.mutation ? typeMap[operationTypes.mutation] : null,
+    subscription: operationTypes.subscription ? typeMap[operationTypes.subscription] : null,
+    types: (0, _objectValues.default)(typeMap),
     directives: directives,
     astNode: schemaDef,
     assumeValid: options && options.assumeValid,
@@ -165,7 +170,7 @@ function buildASTSchema(documentAST, options) {
     try {
       for (var _iterator2 = schema.operationTypes[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
         var operationType = _step2.value;
-        opTypes[operationType.operation] = operationType.type;
+        opTypes[operationType.operation] = operationType.type.name.value;
       }
     } catch (err) {
       _didIteratorError2 = true;
@@ -186,47 +191,35 @@ function buildASTSchema(documentAST, options) {
   }
 }
 
+var stdTypeMap = (0, _keyMap.default)(_scalars.specifiedScalarTypes.concat(_introspection.introspectionTypes), function (type) {
+  return type.name;
+});
+
 var ASTDefinitionBuilder =
 /*#__PURE__*/
 function () {
-  function ASTDefinitionBuilder(typeDefinitionsMap, options, resolveType) {
-    this._typeDefinitionsMap = typeDefinitionsMap;
+  function ASTDefinitionBuilder(options, resolveType) {
     this._options = options;
-    this._resolveType = resolveType; // Initialize to the GraphQL built in scalars and introspection types.
-
-    this._cache = (0, _keyMap.default)(_scalars.specifiedScalarTypes.concat(_introspection.introspectionTypes), function (type) {
-      return type.name;
-    });
+    this._resolveType = resolveType;
   }
 
   var _proto = ASTDefinitionBuilder.prototype;
 
-  _proto.buildType = function buildType(node) {
-    var typeName = node.name.value;
-
-    if (!this._cache[typeName]) {
-      if (node.kind === _kinds.Kind.NAMED_TYPE) {
-        var defNode = this._typeDefinitionsMap[typeName];
-        this._cache[typeName] = defNode ? this._makeSchemaDef(defNode) : this._resolveType(node.name.value);
-      } else {
-        this._cache[typeName] = this._makeSchemaDef(node);
-      }
-    }
-
-    return this._cache[typeName];
+  _proto.getNamedType = function getNamedType(node) {
+    var name = node.name.value;
+    return stdTypeMap[name] || this._resolveType(name);
   };
 
-  _proto._buildWrappedType = function _buildWrappedType(typeNode) {
-    if (typeNode.kind === _kinds.Kind.LIST_TYPE) {
-      return (0, _definition.GraphQLList)(this._buildWrappedType(typeNode.type));
+  _proto.getWrappedType = function getWrappedType(node) {
+    if (node.kind === _kinds.Kind.LIST_TYPE) {
+      return new _definition.GraphQLList(this.getWrappedType(node.type));
     }
 
-    if (typeNode.kind === _kinds.Kind.NON_NULL_TYPE) {
-      return (0, _definition.GraphQLNonNull)( // Note: GraphQLNonNull constructor validates this type
-      this._buildWrappedType(typeNode.type));
+    if (node.kind === _kinds.Kind.NON_NULL_TYPE) {
+      return new _definition.GraphQLNonNull(this.getWrappedType(node.type));
     }
 
-    return this.buildType(typeNode);
+    return this.getNamedType(node);
   };
 
   _proto.buildDirective = function buildDirective(directive) {
@@ -254,7 +247,7 @@ function () {
       // Note: While this could make assertions to get the correctly typed
       // value, that would throw immediately while type system validation
       // with validateSchema() will produce more actionable results.
-      type: this._buildWrappedType(field.type),
+      type: this.getWrappedType(field.type),
       description: getDescription(field, this._options),
       args: keyByNameNode(field.arguments || [], function (arg) {
         return _this2.buildArg(arg);
@@ -267,8 +260,8 @@ function () {
   _proto.buildArg = function buildArg(value) {
     // Note: While this could make assertions to get the correctly typed
     // value, that would throw immediately while type system validation
-    var type = this._buildWrappedType(value.type);
-
+    // with validateSchema() will produce more actionable results.
+    var type = this.getWrappedType(value.type);
     return {
       type: type,
       description: getDescription(value, this._options),
@@ -280,8 +273,8 @@ function () {
   _proto.buildInputField = function buildInputField(value) {
     // Note: While this could make assertions to get the correctly typed
     // value, that would throw immediately while type system validation
-    var type = this._buildWrappedType(value.type);
-
+    // with validateSchema() will produce more actionable results.
+    var type = this.getWrappedType(value.type);
     return {
       type: type,
       description: getDescription(value, this._options),
@@ -298,7 +291,13 @@ function () {
     };
   };
 
-  _proto._makeSchemaDef = function _makeSchemaDef(astNode) {
+  _proto.buildType = function buildType(astNode) {
+    var name = astNode.name.value;
+
+    if (stdTypeMap[name]) {
+      return stdTypeMap[name];
+    }
+
     switch (astNode.kind) {
       case _kinds.Kind.OBJECT_TYPE_DEFINITION:
         return this._makeTypeDef(astNode);
@@ -317,10 +316,12 @@ function () {
 
       case _kinds.Kind.INPUT_OBJECT_TYPE_DEFINITION:
         return this._makeInputObjectDef(astNode);
+    } // Not reachable. All possible type definition nodes have been considered.
 
-      default:
-        throw new Error("Type kind \"".concat(astNode.kind, "\" not supported."));
-    }
+    /* istanbul ignore next */
+
+
+    throw new Error("Unexpected type definition node: \"".concat((0, _inspect.default)(astNode), "\"."));
   };
 
   _proto._makeTypeDef = function _makeTypeDef(astNode) {
@@ -333,7 +334,7 @@ function () {
 
     var interfaces = interfaceNodes && interfaceNodes.length > 0 ? function () {
       return interfaceNodes.map(function (ref) {
-        return _this3.buildType(ref);
+        return _this3.getNamedType(ref);
       });
     } : [];
     var fields = fieldNodes && fieldNodes.length > 0 ? function () {
@@ -390,7 +391,7 @@ function () {
 
     var types = typeNodes && typeNodes.length > 0 ? function () {
       return typeNodes.map(function (ref) {
-        return _this6.buildType(ref);
+        return _this6.getNamedType(ref);
       });
     } : [];
     return new _definition.GraphQLUnionType({
@@ -470,7 +471,7 @@ function getDescription(node, options) {
     var rawValue = getLeadingCommentBlock(node);
 
     if (rawValue !== undefined) {
-      return (0, _blockStringValue.default)('\n' + rawValue);
+      return (0, _blockString.dedentBlockStringValue)('\n' + rawValue);
     }
   }
 }
@@ -501,4 +502,4 @@ function getLeadingCommentBlock(node) {
 
 function buildSchema(source, options) {
   return buildASTSchema((0, _parser.parse)(source, options), options);
-}
+}

package/utilities/buildASTSchema.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.
@@ -8,54 +8,51 @@
  */
 
 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 type { ObjMap } from '../jsutils/ObjMap';
+import { type ObjMap } from '../jsutils/ObjMap';
 import { valueFromAST } from './valueFromAST';
 import { assertValidSDL } from '../validation/validate';
-import blockStringValue from '../language/blockStringValue';
+import { dedentBlockStringValue } from '../language/blockString';
 import { TokenKind } from '../language/lexer';
-import { parse } from '../language/parser';
-import type { ParseOptions } from '../language/parser';
-import type { Source } from '../language/source';
+import { type ParseOptions, parse } from '../language/parser';
+import { type Source } from '../language/source';
 import { getDirectiveValues } from '../execution/values';
 import { Kind } from '../language/kinds';
 
-import type {
-  DocumentNode,
-  NameNode,
-  TypeNode,
-  NamedTypeNode,
-  SchemaDefinitionNode,
-  TypeDefinitionNode,
-  ScalarTypeDefinitionNode,
-  ObjectTypeDefinitionNode,
-  FieldDefinitionNode,
-  InputValueDefinitionNode,
-  InterfaceTypeDefinitionNode,
-  UnionTypeDefinitionNode,
-  EnumTypeDefinitionNode,
-  EnumValueDefinitionNode,
-  InputObjectTypeDefinitionNode,
-  DirectiveDefinitionNode,
-  StringValueNode,
-  Location,
+import {
+  type DocumentNode,
+  type NameNode,
+  type TypeNode,
+  type NamedTypeNode,
+  type SchemaDefinitionNode,
+  type TypeDefinitionNode,
+  type ScalarTypeDefinitionNode,
+  type ObjectTypeDefinitionNode,
+  type FieldDefinitionNode,
+  type InputValueDefinitionNode,
+  type InterfaceTypeDefinitionNode,
+  type UnionTypeDefinitionNode,
+  type EnumTypeDefinitionNode,
+  type EnumValueDefinitionNode,
+  type InputObjectTypeDefinitionNode,
+  type DirectiveDefinitionNode,
+  type StringValueNode,
+  type Location,
 } from '../language/ast';
 import { isTypeDefinitionNode } from '../language/predicates';
 
-import type { DirectiveLocationEnum } from '../language/directiveLocation';
-
-import type {
-  GraphQLType,
-  GraphQLNamedType,
-  GraphQLFieldConfig,
-  GraphQLArgumentConfig,
-  GraphQLEnumValueConfig,
-  GraphQLInputFieldConfig,
-} from '../type/definition';
+import { type DirectiveLocationEnum } from '../language/directiveLocation';
 
 import {
+  type GraphQLType,
+  type GraphQLNamedType,
+  type GraphQLFieldConfig,
+  type GraphQLArgumentConfig,
+  type GraphQLEnumValueConfig,
+  type GraphQLInputFieldConfig,
   GraphQLScalarType,
   GraphQLObjectType,
   GraphQLInterfaceType,
@@ -77,8 +74,10 @@ import { introspectionTypes } from '../type/introspection';
 
 import { specifiedScalarTypes } from '../type/scalars';
 
-import { GraphQLSchema } from '../type/schema';
-import type { GraphQLSchemaValidationOptions } from '../type/schema';
+import {
+  type GraphQLSchemaValidationOptions,
+  GraphQLSchema,
+} from '../type/schema';
 
 export type BuildSchemaOptions = {
   ...GraphQLSchemaValidationOptions,
@@ -131,38 +130,36 @@ export function buildASTSchema(
   }
 
   let schemaDef: ?SchemaDefinitionNode;
-  const nodeMap: ObjMap<TypeDefinitionNode> = Object.create(null);
+  const typeDefs: Array<TypeDefinitionNode> = [];
   const directiveDefs: Array<DirectiveDefinitionNode> = [];
 
   for (const def of documentAST.definitions) {
     if (def.kind === Kind.SCHEMA_DEFINITION) {
       schemaDef = def;
     } else if (isTypeDefinitionNode(def)) {
-      nodeMap[def.name.value] = def;
+      typeDefs.push(def);
     } else if (def.kind === Kind.DIRECTIVE_DEFINITION) {
       directiveDefs.push(def);
     }
   }
 
+  const astBuilder = new ASTDefinitionBuilder(options, typeName => {
+    const type = typeMap[typeName];
+    invariant(type, `Type "${typeName}" not found in document.`);
+    return type;
+  });
+
+  const typeMap = keyByNameNode(typeDefs, node => astBuilder.buildType(node));
+
   const operationTypes = schemaDef
     ? getOperationTypes(schemaDef)
     : {
-        query: nodeMap.Query,
-        mutation: nodeMap.Mutation,
-        subscription: nodeMap.Subscription,
+        query: 'Query',
+        mutation: 'Mutation',
+        subscription: 'Subscription',
       };
 
-  const definitionBuilder = new ASTDefinitionBuilder(
-    nodeMap,
-    options,
-    typeName => {
-      throw new Error(`Type "${typeName}" not found in document.`);
-    },
-  );
-
-  const directives = directiveDefs.map(def =>
-    definitionBuilder.buildDirective(def),
-  );
+  const directives = directiveDefs.map(def => astBuilder.buildDirective(def));
 
   // If specified directives were not explicitly declared, add them.
   if (!directives.some(directive => directive.name === 'skip')) {
@@ -177,20 +174,19 @@ export function buildASTSchema(
     directives.push(GraphQLDeprecatedDirective);
   }
 
-  // Note: While this could make early assertions to get the correctly
-  // typed values below, that would throw immediately while type system
-  // validation with validateSchema() will produce more actionable results.
   return new GraphQLSchema({
-    query: operationTypes.query
-      ? (definitionBuilder.buildType(operationTypes.query): any)
-      : null,
+    // Note: While this could make early assertions to get the correctly
+    // typed values below, that would throw immediately while type system
+    // validation with validateSchema() will produce more actionable results.
+    query: operationTypes.query ? (typeMap[operationTypes.query]: any) : null,
     mutation: operationTypes.mutation
-      ? (definitionBuilder.buildType(operationTypes.mutation): any)
+      ? (typeMap[operationTypes.mutation]: any)
       : null,
     subscription: operationTypes.subscription
-      ? (definitionBuilder.buildType(operationTypes.subscription): any)
+      ? (typeMap[operationTypes.subscription]: any)
       : null,
-    types: objectValues(nodeMap).map(node => definitionBuilder.buildType(node)),
+
+    types: objectValues(typeMap),
     directives,
     astNode: schemaDef,
     assumeValid: options && options.assumeValid,
@@ -200,62 +196,41 @@ export function buildASTSchema(
   function getOperationTypes(schema: SchemaDefinitionNode) {
     const opTypes = {};
     for (const operationType of schema.operationTypes) {
-      opTypes[operationType.operation] = operationType.type;
+      opTypes[operationType.operation] = operationType.type.name.value;
     }
     return opTypes;
   }
 }
 
-type TypeDefinitionsMap = ObjMap<TypeDefinitionNode>;
 type TypeResolver = (typeName: string) => GraphQLNamedType;
 
+const stdTypeMap = keyMap(
+  specifiedScalarTypes.concat(introspectionTypes),
+  type => type.name,
+);
+
 export class ASTDefinitionBuilder {
-  _typeDefinitionsMap: TypeDefinitionsMap;
   _options: ?BuildSchemaOptions;
   _resolveType: TypeResolver;
-  _cache: ObjMap<GraphQLNamedType>;
 
-  constructor(
-    typeDefinitionsMap: TypeDefinitionsMap,
-    options: ?BuildSchemaOptions,
-    resolveType: TypeResolver,
-  ) {
-    this._typeDefinitionsMap = typeDefinitionsMap;
+  constructor(options: ?BuildSchemaOptions, resolveType: TypeResolver) {
     this._options = options;
     this._resolveType = resolveType;
-    // Initialize to the GraphQL built in scalars and introspection types.
-    this._cache = keyMap(
-      specifiedScalarTypes.concat(introspectionTypes),
-      type => type.name,
-    );
   }
 
-  buildType(node: NamedTypeNode | TypeDefinitionNode): GraphQLNamedType {
-    const typeName = node.name.value;
-    if (!this._cache[typeName]) {
-      if (node.kind === Kind.NAMED_TYPE) {
-        const defNode = this._typeDefinitionsMap[typeName];
-        this._cache[typeName] = defNode
-          ? this._makeSchemaDef(defNode)
-          : this._resolveType(node.name.value);
-      } else {
-        this._cache[typeName] = this._makeSchemaDef(node);
-      }
-    }
-    return this._cache[typeName];
+  getNamedType(node: NamedTypeNode): GraphQLNamedType {
+    const name = node.name.value;
+    return stdTypeMap[name] || this._resolveType(name);
   }
 
-  _buildWrappedType(typeNode: TypeNode): GraphQLType {
-    if (typeNode.kind === Kind.LIST_TYPE) {
-      return GraphQLList(this._buildWrappedType(typeNode.type));
+  getWrappedType(node: TypeNode): GraphQLType {
+    if (node.kind === Kind.LIST_TYPE) {
+      return new GraphQLList(this.getWrappedType(node.type));
     }
-    if (typeNode.kind === Kind.NON_NULL_TYPE) {
-      return GraphQLNonNull(
-        // Note: GraphQLNonNull constructor validates this type
-        (this._buildWrappedType(typeNode.type): any),
-      );
+    if (node.kind === Kind.NON_NULL_TYPE) {
+      return new GraphQLNonNull(this.getWrappedType(node.type));
     }
-    return this.buildType(typeNode);
+    return this.getNamedType(node);
   }
 
   buildDirective(directive: DirectiveDefinitionNode): GraphQLDirective {
@@ -277,7 +252,7 @@ export class ASTDefinitionBuilder {
       // Note: While this could make assertions to get the correctly typed
       // value, that would throw immediately while type system validation
       // with validateSchema() will produce more actionable results.
-      type: (this._buildWrappedType(field.type): any),
+      type: (this.getWrappedType(field.type): any),
       description: getDescription(field, this._options),
       args: keyByNameNode(field.arguments || [], arg => this.buildArg(arg)),
       deprecationReason: getDeprecationReason(field),
@@ -289,7 +264,7 @@ export class ASTDefinitionBuilder {
     // Note: While this could make assertions to get the correctly typed
     // value, that would throw immediately while type system validation
     // with validateSchema() will produce more actionable results.
-    const type: any = this._buildWrappedType(value.type);
+    const type: any = this.getWrappedType(value.type);
     return {
       type,
       description: getDescription(value, this._options),
@@ -302,7 +277,7 @@ export class ASTDefinitionBuilder {
     // Note: While this could make assertions to get the correctly typed
     // value, that would throw immediately while type system validation
     // with validateSchema() will produce more actionable results.
-    const type: any = this._buildWrappedType(value.type);
+    const type: any = this.getWrappedType(value.type);
     return {
       type,
       description: getDescription(value, this._options),
@@ -319,7 +294,12 @@ export class ASTDefinitionBuilder {
     };
   }
 
-  _makeSchemaDef(astNode: TypeDefinitionNode): GraphQLNamedType {
+  buildType(astNode: TypeDefinitionNode): GraphQLNamedType {
+    const name = astNode.name.value;
+    if (stdTypeMap[name]) {
+      return stdTypeMap[name];
+    }
+
     switch (astNode.kind) {
       case Kind.OBJECT_TYPE_DEFINITION:
         return this._makeTypeDef(astNode);
@@ -333,9 +313,13 @@ export class ASTDefinitionBuilder {
         return this._makeScalarDef(astNode);
       case Kind.INPUT_OBJECT_TYPE_DEFINITION:
         return this._makeInputObjectDef(astNode);
-      default:
-        throw new Error(`Type kind "${astNode.kind}" not supported.`);
     }
+
+    // Not reachable. All possible type definition nodes have been considered.
+    /* istanbul ignore next */
+    throw new Error(
+      `Unexpected type definition node: "${inspect((astNode: empty))}".`,
+    );
   }
 
   _makeTypeDef(astNode: ObjectTypeDefinitionNode) {
@@ -347,7 +331,7 @@ export class ASTDefinitionBuilder {
     // validation with validateSchema() will produce more actionable results.
     const interfaces =
       interfaceNodes && interfaceNodes.length > 0
-        ? () => interfaceNodes.map(ref => (this.buildType(ref): any))
+        ? () => interfaceNodes.map(ref => (this.getNamedType(ref): any))
         : [];
 
     const fields =
@@ -399,7 +383,7 @@ export class ASTDefinitionBuilder {
     // validation with validateSchema() will produce more actionable results.
     const types =
       typeNodes && typeNodes.length > 0
-        ? () => typeNodes.map(ref => (this.buildType(ref): any))
+        ? () => typeNodes.map(ref => (this.getNamedType(ref): any))
         : [];
 
     return new GraphQLUnionType({
@@ -471,7 +455,7 @@ export function getDescription(
   if (options && options.commentDescriptions) {
     const rawValue = getLeadingCommentBlock(node);
     if (rawValue !== undefined) {
-      return blockStringValue('\n' + rawValue);
+      return dedentBlockStringValue('\n' + rawValue);
     }
   }
 }