graphql 0.13.1 → 0.13.2

package/utilities/buildASTSchema.js.flow

@@ -14,6 +14,7 @@ import { valueFromAST } from './valueFromAST';
 import blockStringValue from '../language/blockStringValue';
 import { TokenKind } from '../language/lexer';
 import { parse } from '../language/parser';
+import type { ParseOptions } from '../language/parser';
 import type { Source } from '../language/source';
 import { getDirectiveValues } from '../execution/values';
 import { Kind } from '../language/kinds';
@@ -48,10 +49,10 @@ import {
   GraphQLUnionType,
   GraphQLEnumType,
   GraphQLInputObjectType,
+  GraphQLList,
+  GraphQLNonNull,
 } from '../type/definition';
 
-import { GraphQLList, GraphQLNonNull } from '../type/wrappers';
-
 import {
   GraphQLDirective,
   GraphQLSkipDirective,
@@ -72,7 +73,7 @@ import type {
   GraphQLFieldConfig,
 } from '../type/definition';
 
-type Options = {|
+export type BuildSchemaOptions = {
   ...GraphQLSchemaValidationOptions,
 
   /**
@@ -83,7 +84,7 @@ type Options = {|
    * Default: false
    */
   commentDescriptions?: boolean,
-|};
+};
 
 function buildWrappedType(
   innerType: GraphQLType,
@@ -128,7 +129,7 @@ function getNamedTypeNode(typeNode: TypeNode): NamedTypeNode {
  */
 export function buildASTSchema(
   ast: DocumentNode,
-  options?: Options,
+  options?: BuildSchemaOptions,
 ): GraphQLSchema {
   if (!ast || ast.kind !== Kind.DOCUMENT) {
     throw new Error('Must provide a document ast.');
@@ -183,8 +184,7 @@ export function buildASTSchema(
     },
   );
 
-  const types = typeDefs.map(def => definitionBuilder.buildType(def));
-
+  const types = definitionBuilder.buildTypes(typeDefs);
   const directives = directiveDefs.map(def =>
     definitionBuilder.buildDirective(def),
   );
@@ -246,13 +246,13 @@ type TypeResolver = (typeRef: NamedTypeNode) => GraphQLNamedType;
 
 export class ASTDefinitionBuilder {
   _typeDefinitionsMap: TypeDefinitionsMap;
-  _options: ?Options;
+  _options: ?BuildSchemaOptions;
   _resolveType: TypeResolver;
   _cache: ObjMap<GraphQLNamedType>;
 
   constructor(
     typeDefinitionsMap: TypeDefinitionsMap,
-    options: ?Options,
+    options: ?BuildSchemaOptions,
     resolveType: TypeResolver,
   ) {
     this._typeDefinitionsMap = typeDefinitionsMap;
@@ -265,6 +265,12 @@ export class ASTDefinitionBuilder {
     );
   }
 
+  buildTypes(
+    nodes: $ReadOnlyArray<NamedTypeNode | TypeDefinitionNode>,
+  ): Array<GraphQLNamedType> {
+    return nodes.map(node => this.buildType(node));
+  }
+
   buildType(node: NamedTypeNode | TypeDefinitionNode): GraphQLNamedType {
     const typeName = node.name.value;
     if (!this._cache[typeName]) {
@@ -333,11 +339,15 @@ export class ASTDefinitionBuilder {
 
   _makeTypeDef(def: ObjectTypeDefinitionNode) {
     const typeName = def.name.value;
+    const interfaces = def.interfaces;
     return new GraphQLObjectType({
       name: typeName,
       description: getDescription(def, this._options),
       fields: () => this._makeFieldDefMap(def),
-      interfaces: () => this._makeImplementedInterfaces(def),
+      // Note: While this could make early assertions to get the correctly
+      // typed values, that would throw immediately while type system
+      // validation with validateSchema() will produce more actionable results.
+      interfaces: interfaces ? () => (this.buildTypes(interfaces): any) : [],
       astNode: def,
     });
   }
@@ -354,16 +364,6 @@ export class ASTDefinitionBuilder {
       : {};
   }
 
-  _makeImplementedInterfaces(def: ObjectTypeDefinitionNode) {
-    return (
-      def.interfaces &&
-      // Note: While this could make early assertions to get the correctly
-      // typed values, that would throw immediately while type system
-      // validation with validateSchema() will produce more actionable results.
-      def.interfaces.map(iface => (this.buildType(iface): any))
-    );
-  }
-
   _makeInputValues(values: $ReadOnlyArray<InputValueDefinitionNode>) {
     return keyValMap(
       values,
@@ -418,7 +418,7 @@ export class ASTDefinitionBuilder {
       // Note: While this could make assertions to get the correctly typed
       // values below, that would throw immediately while type system
       // validation with validateSchema() will produce more actionable results.
-      types: def.types ? def.types.map(t => (this.buildType(t): any)) : [],
+      types: def.types ? (this.buildTypes(def.types): any) : [],
       astNode: def,
     });
   }
@@ -464,7 +464,7 @@ function getDeprecationReason(
  */
 export function getDescription(
   node: { +description?: StringValueNode, +loc?: Location },
-  options: ?Options,
+  options: ?BuildSchemaOptions,
 ): void | string {
   if (node.description) {
     return node.description.value;
@@ -503,6 +503,9 @@ function getLeadingCommentBlock(node): void | string {
  * A helper function to build a GraphQLSchema directly from a source
  * document.
  */
-export function buildSchema(source: string | Source): GraphQLSchema {
-  return buildASTSchema(parse(source));
+export function buildSchema(
+  source: string | Source,
+  options?: BuildSchemaOptions & ParseOptions,
+): GraphQLSchema {
+  return buildASTSchema(parse(source, options), options);
 }

package/utilities/buildASTSchema.mjs

@@ -20,9 +20,7 @@ import { parse } from '../language/parser';
 import { getDirectiveValues } from '../execution/values';
 import { Kind } from '../language/kinds';
 
-import { assertNullableType, GraphQLScalarType, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType } from '../type/definition';
-
-import { GraphQLList, GraphQLNonNull } from '../type/wrappers';
+import { assertNullableType, GraphQLScalarType, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType, GraphQLList, GraphQLNonNull } from '../type/definition';
 
 import { GraphQLDirective, GraphQLSkipDirective, GraphQLIncludeDirective, GraphQLDeprecatedDirective } from '../type/directives';
 
@@ -116,10 +114,7 @@ export function buildASTSchema(ast, options) {
     throw new Error('Type "' + typeRef.name.value + '" not found in document.');
   });
 
-  var types = typeDefs.map(function (def) {
-    return definitionBuilder.buildType(def);
-  });
-
+  var types = definitionBuilder.buildTypes(typeDefs);
   var directives = directiveDefs.map(function (def) {
     return definitionBuilder.buildDirective(def);
   });
@@ -187,6 +182,14 @@ export var ASTDefinitionBuilder = function () {
     });
   }
 
+  ASTDefinitionBuilder.prototype.buildTypes = function buildTypes(nodes) {
+    var _this = this;
+
+    return nodes.map(function (node) {
+      return _this.buildType(node);
+    });
+  };
+
   ASTDefinitionBuilder.prototype.buildType = function buildType(node) {
     var typeName = node.name.value;
     if (!this._cache[typeName]) {
@@ -250,44 +253,36 @@ export var ASTDefinitionBuilder = function () {
   };
 
   ASTDefinitionBuilder.prototype._makeTypeDef = function _makeTypeDef(def) {
-    var _this = this;
+    var _this2 = this;
 
     var typeName = def.name.value;
+    var interfaces = def.interfaces;
     return new GraphQLObjectType({
       name: typeName,
       description: getDescription(def, this._options),
       fields: function fields() {
-        return _this._makeFieldDefMap(def);
-      },
-      interfaces: function interfaces() {
-        return _this._makeImplementedInterfaces(def);
+        return _this2._makeFieldDefMap(def);
       },
+      // Note: While this could make early assertions to get the correctly
+      // typed values, that would throw immediately while type system
+      // validation with validateSchema() will produce more actionable results.
+      interfaces: interfaces ? function () {
+        return _this2.buildTypes(interfaces);
+      } : [],
       astNode: def
     });
   };
 
   ASTDefinitionBuilder.prototype._makeFieldDefMap = function _makeFieldDefMap(def) {
-    var _this2 = this;
+    var _this3 = this;
 
     return def.fields ? keyValMap(def.fields, function (field) {
       return field.name.value;
     }, function (field) {
-      return _this2.buildField(field);
+      return _this3.buildField(field);
     }) : {};
   };
 
-  ASTDefinitionBuilder.prototype._makeImplementedInterfaces = function _makeImplementedInterfaces(def) {
-    var _this3 = this;
-
-    return def.interfaces &&
-    // Note: While this could make early assertions to get the correctly
-    // typed values, that would throw immediately while type system
-    // validation with validateSchema() will produce more actionable results.
-    def.interfaces.map(function (iface) {
-      return _this3.buildType(iface);
-    });
-  };
-
   ASTDefinitionBuilder.prototype._makeInputValues = function _makeInputValues(values) {
     var _this4 = this;
 
@@ -339,17 +334,13 @@ export var ASTDefinitionBuilder = function () {
   };
 
   ASTDefinitionBuilder.prototype._makeUnionDef = function _makeUnionDef(def) {
-    var _this7 = this;
-
     return new GraphQLUnionType({
       name: def.name.value,
       description: getDescription(def, this._options),
       // Note: While this could make assertions to get the correctly typed
       // values below, that would throw immediately while type system
       // validation with validateSchema() will produce more actionable results.
-      types: def.types ? def.types.map(function (t) {
-        return _this7.buildType(t);
-      }) : [],
+      types: def.types ? this.buildTypes(def.types) : [],
       astNode: def
     });
   };
@@ -366,13 +357,13 @@ export var ASTDefinitionBuilder = function () {
   };
 
   ASTDefinitionBuilder.prototype._makeInputObjectDef = function _makeInputObjectDef(def) {
-    var _this8 = this;
+    var _this7 = this;
 
     return new GraphQLInputObjectType({
       name: def.name.value,
       description: getDescription(def, this._options),
       fields: function fields() {
-        return def.fields ? _this8._makeInputValues(def.fields) : {};
+        return def.fields ? _this7._makeInputValues(def.fields) : {};
       },
       astNode: def
     });
@@ -430,6 +421,6 @@ function getLeadingCommentBlock(node) {
  * A helper function to build a GraphQLSchema directly from a source
  * document.
  */
-export function buildSchema(source) {
-  return buildASTSchema(parse(source));
+export function buildSchema(source, options) {
+  return buildASTSchema(parse(source, options), options);
 }

package/utilities/buildClientSchema.js

@@ -27,8 +27,6 @@ var _directiveLocation = require('../language/directiveLocation');
 
 var _definition = require('../type/definition');
 
-var _wrappers = require('../type/wrappers');
-
 var _directives = require('../type/directives');
 
 var _introspection = require('../type/introspection');
@@ -49,15 +47,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * This function expects a complete introspection result. Don't forget to check
  * the "errors" field of a server response before calling this function.
  */
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- *  strict
- */
-
 function buildClientSchema(introspection, options) {
   // Get the schema from the introspection result.
   var schemaIntrospection = introspection.__schema;
@@ -82,7 +71,7 @@ function buildClientSchema(introspection, options) {
       if (!itemRef) {
         throw new Error('Decorated type deeper than introspection query.');
       }
-      return (0, _wrappers.GraphQLList)(getType(itemRef));
+      return (0, _definition.GraphQLList)(getType(itemRef));
     }
     if (typeRef.kind === _introspection.TypeKind.NON_NULL) {
       var nullableRef = typeRef.ofType;
@@ -90,7 +79,7 @@ function buildClientSchema(introspection, options) {
         throw new Error('Decorated type deeper than introspection query.');
       }
       var nullableType = getType(nullableRef);
-      return (0, _wrappers.GraphQLNonNull)((0, _definition.assertNullableType)(nullableType));
+      return (0, _definition.GraphQLNonNull)((0, _definition.assertNullableType)(nullableType));
     }
     if (!typeRef.name) {
       throw new Error('Unknown type reference: ' + JSON.stringify(typeRef));
@@ -309,4 +298,11 @@ function buildClientSchema(introspection, options) {
     assumeValid: options && options.assumeValid,
     allowedLegacyNames: options && options.allowedLegacyNames
   });
-}
+} /**
+   * Copyright (c) 2015-present, Facebook, Inc.
+   *
+   * This source code is licensed under the MIT license found in the
+   * LICENSE file in the root directory of this source tree.
+   *
+   *  strict
+   */

package/utilities/buildClientSchema.js.flow

@@ -25,13 +25,13 @@ import {
   GraphQLUnionType,
   GraphQLEnumType,
   GraphQLInputObjectType,
+  GraphQLList,
+  GraphQLNonNull,
   assertNullableType,
   assertObjectType,
   assertInterfaceType,
 } from '../type/definition';
 
-import { GraphQLList, GraphQLNonNull } from '../type/wrappers';
-
 import type {
   GraphQLType,
   GraphQLInputType,

package/utilities/buildClientSchema.mjs

@@ -16,9 +16,7 @@ import { GraphQLSchema } from '../type/schema';
 
 import { DirectiveLocation } from '../language/directiveLocation';
 
-import { isInputType, isOutputType, GraphQLScalarType, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType, assertNullableType, assertObjectType, assertInterfaceType } from '../type/definition';
-
-import { GraphQLList, GraphQLNonNull } from '../type/wrappers';
+import { isInputType, isOutputType, GraphQLScalarType, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType, GraphQLList, GraphQLNonNull, assertNullableType, assertObjectType, assertInterfaceType } from '../type/definition';
 
 import { GraphQLDirective } from '../type/directives';
 

package/utilities/extendSchema.js

@@ -27,8 +27,6 @@ var _introspection = require('../type/introspection');
 
 var _definition = require('../type/definition');
 
-var _wrappers = require('../type/wrappers');
-
 var _directives = require('../type/directives');
 
 var _kinds = require('../language/kinds');
@@ -53,6 +51,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  *        Provide true to use preceding comments as the description.
  *
  */
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ *  strict
+ */
+
 function extendSchema(schema, documentAST, options) {
   !(0, _schema.isSchema)(schema) ? (0, _invariant2.default)(0, 'Must provide valid GraphQLSchema') : void 0;
 
@@ -84,6 +91,7 @@ function extendSchema(schema, documentAST, options) {
         typeDefinitionMap[typeName] = def;
         break;
       case _kinds.Kind.OBJECT_TYPE_EXTENSION:
+      case _kinds.Kind.INTERFACE_TYPE_EXTENSION:
         // Sanity check that this type extension exists within the
         // schema's existing types.
         var extendedTypeName = def.name.value;
@@ -91,21 +99,10 @@ function extendSchema(schema, documentAST, options) {
         if (!existingType) {
           throw new _GraphQLError.GraphQLError('Cannot extend type "' + extendedTypeName + '" because it does not ' + 'exist in the existing schema.', [def]);
         }
-        if (!(0, _definition.isObjectType)(existingType)) {
-          throw new _GraphQLError.GraphQLError('Cannot extend non-object type "' + extendedTypeName + '".', [def]);
-        }
-        typeExtensionsMap[extendedTypeName] = appendExtensionToTypeExtensions(def, typeExtensionsMap[extendedTypeName]);
-        break;
-      case _kinds.Kind.INTERFACE_TYPE_EXTENSION:
-        var extendedInterfaceTypeName = def.name.value;
-        var existingInterfaceType = schema.getType(extendedInterfaceTypeName);
-        if (!existingInterfaceType) {
-          throw new _GraphQLError.GraphQLError('Cannot extend interface "' + extendedInterfaceTypeName + '" because ' + 'it does not exist in the existing schema.', [def]);
-        }
-        if (!(0, _definition.isInterfaceType)(existingInterfaceType)) {
-          throw new _GraphQLError.GraphQLError('Cannot extend non-interface type "' + extendedInterfaceTypeName + '".', [def]);
-        }
-        typeExtensionsMap[extendedInterfaceTypeName] = appendExtensionToTypeExtensions(def, typeExtensionsMap[extendedInterfaceTypeName]);
+        checkExtensionNode(existingType, def);
+
+        var existingTypeExtensions = typeExtensionsMap[extendedTypeName];
+        typeExtensionsMap[extendedTypeName] = existingTypeExtensions ? existingTypeExtensions.concat([def]) : [def];
         break;
       case _kinds.Kind.DIRECTIVE_DEFINITION:
         var directiveName = def.name.value;
@@ -142,9 +139,6 @@ function extendSchema(schema, documentAST, options) {
   var extendTypeCache = Object.create(null);
 
   // Get the root Query, Mutation, and Subscription object types.
-  // 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.
   var existingQueryType = schema.getQueryType();
   var queryType = existingQueryType ? getExtendedType(existingQueryType) : null;
 
@@ -156,9 +150,7 @@ function extendSchema(schema, documentAST, options) {
 
   var types = [].concat((0, _objectValues2.default)(schema.getTypeMap()).map(function (type) {
     return getExtendedType(type);
-  }), (0, _objectValues2.default)(typeDefinitionMap).map(function (type) {
-    return astBuilder.buildType(type);
-  }));
+  }), astBuilder.buildTypes((0, _objectValues2.default)(typeDefinitionMap)));
 
   // Support both original legacy names and extended legacy names.
   var schemaAllowedLegacyNames = schema.__allowedLegacyNames;
@@ -176,14 +168,6 @@ function extendSchema(schema, documentAST, options) {
     allowedLegacyNames: allowedLegacyNames
   });
 
-  function appendExtensionToTypeExtensions(extension, existingTypeExtensions) {
-    if (!existingTypeExtensions) {
-      return [extension];
-    }
-    existingTypeExtensions.push(extension);
-    return existingTypeExtensions;
-  }
-
   // 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.
 
@@ -320,18 +304,26 @@ function extendSchema(schema, documentAST, options) {
 
   function extendFieldType(typeDef) {
     if ((0, _definition.isListType)(typeDef)) {
-      return (0, _wrappers.GraphQLList)(extendFieldType(typeDef.ofType));
+      return (0, _definition.GraphQLList)(extendFieldType(typeDef.ofType));
     }
     if ((0, _definition.isNonNullType)(typeDef)) {
-      return (0, _wrappers.GraphQLNonNull)(extendFieldType(typeDef.ofType));
+      return (0, _definition.GraphQLNonNull)(extendFieldType(typeDef.ofType));
     }
     return getExtendedType(typeDef);
   }
-} /**
-   * Copyright (c) 2015-present, Facebook, Inc.
-   *
-   * This source code is licensed under the MIT license found in the
-   * LICENSE file in the root directory of this source tree.
-   *
-   *  strict
-   */
+}
+
+function checkExtensionNode(type, node) {
+  switch (node.kind) {
+    case _kinds.Kind.OBJECT_TYPE_EXTENSION:
+      if (!(0, _definition.isObjectType)(type)) {
+        throw new _GraphQLError.GraphQLError('Cannot extend non-object type "' + type.name + '".', [node]);
+      }
+      break;
+    case _kinds.Kind.INTERFACE_TYPE_EXTENSION:
+      if (!(0, _definition.isInterfaceType)(type)) {
+        throw new _GraphQLError.GraphQLError('Cannot extend non-interface type "' + type.name + '".', [node]);
+      }
+      break;
+  }
+}

package/utilities/extendSchema.js.flow

@@ -23,23 +23,19 @@ import {
   isUnionType,
   isListType,
   isNonNullType,
+  GraphQLList,
+  GraphQLNonNull,
   GraphQLObjectType,
   GraphQLInterfaceType,
   GraphQLUnionType,
 } from '../type/definition';
-import { GraphQLList, GraphQLNonNull } from '../type/wrappers';
 
 import { GraphQLDirective } from '../type/directives';
 
 import { Kind } from '../language/kinds';
 
 import type { GraphQLType, GraphQLNamedType } from '../type/definition';
-
-import type {
-  DocumentNode,
-  DirectiveDefinitionNode,
-  TypeExtensionNode,
-} from '../language/ast';
+import type { DocumentNode, DirectiveDefinitionNode } from '../language/ast';
 
 type Options = {|
   ...GraphQLSchemaValidationOptions,
@@ -114,6 +110,7 @@ export function extendSchema(
         typeDefinitionMap[typeName] = def;
         break;
       case Kind.OBJECT_TYPE_EXTENSION:
+      case Kind.INTERFACE_TYPE_EXTENSION:
         // Sanity check that this type extension exists within the
         // schema's existing types.
         const extendedTypeName = def.name.value;
@@ -125,39 +122,12 @@ export function extendSchema(
             [def],
           );
         }
-        if (!isObjectType(existingType)) {
-          throw new GraphQLError(
-            `Cannot extend non-object type "${extendedTypeName}".`,
-            [def],
-          );
-        }
-        typeExtensionsMap[extendedTypeName] = appendExtensionToTypeExtensions(
-          def,
-          typeExtensionsMap[extendedTypeName],
-        );
-        break;
-      case Kind.INTERFACE_TYPE_EXTENSION:
-        const extendedInterfaceTypeName = def.name.value;
-        const existingInterfaceType = schema.getType(extendedInterfaceTypeName);
-        if (!existingInterfaceType) {
-          throw new GraphQLError(
-            `Cannot extend interface "${extendedInterfaceTypeName}" because ` +
-              'it does not exist in the existing schema.',
-            [def],
-          );
-        }
-        if (!isInterfaceType(existingInterfaceType)) {
-          throw new GraphQLError(
-            `Cannot extend non-interface type "${extendedInterfaceTypeName}".`,
-            [def],
-          );
-        }
-        typeExtensionsMap[
-          extendedInterfaceTypeName
-        ] = appendExtensionToTypeExtensions(
-          def,
-          typeExtensionsMap[extendedInterfaceTypeName],
-        );
+        checkExtensionNode(existingType, def);
+
+        const existingTypeExtensions = typeExtensionsMap[extendedTypeName];
+        typeExtensionsMap[extendedTypeName] = existingTypeExtensions
+          ? existingTypeExtensions.concat([def])
+          : [def];
         break;
       case Kind.DIRECTIVE_DEFINITION:
         const directiveName = def.name.value;
@@ -212,9 +182,6 @@ export function extendSchema(
   const extendTypeCache = Object.create(null);
 
   // Get the root Query, Mutation, and Subscription object types.
-  // 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.
   const existingQueryType = schema.getQueryType();
   const queryType = existingQueryType
     ? getExtendedType(existingQueryType)
@@ -235,7 +202,7 @@ export function extendSchema(
     // that any type not directly referenced by a field will get created.
     ...objectValues(schema.getTypeMap()).map(type => getExtendedType(type)),
     // Do the same with new types.
-    ...objectValues(typeDefinitionMap).map(type => astBuilder.buildType(type)),
+    ...astBuilder.buildTypes(objectValues(typeDefinitionMap)),
   ];
 
   // Support both original legacy names and extended legacy names.
@@ -257,17 +224,6 @@ export function extendSchema(
     allowedLegacyNames,
   });
 
-  function appendExtensionToTypeExtensions(
-    extension: TypeExtensionNode,
-    existingTypeExtensions: ?Array<TypeExtensionNode>,
-  ): Array<TypeExtensionNode> {
-    if (!existingTypeExtensions) {
-      return [extension];
-    }
-    existingTypeExtensions.push(extension);
-    return existingTypeExtensions;
-  }
-
   // 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.
 
@@ -420,3 +376,24 @@ export function extendSchema(
     return getExtendedType(typeDef);
   }
 }
+
+function checkExtensionNode(type, node) {
+  switch (node.kind) {
+    case Kind.OBJECT_TYPE_EXTENSION:
+      if (!isObjectType(type)) {
+        throw new GraphQLError(
+          `Cannot extend non-object type "${type.name}".`,
+          [node],
+        );
+      }
+      break;
+    case Kind.INTERFACE_TYPE_EXTENSION:
+      if (!isInterfaceType(type)) {
+        throw new GraphQLError(
+          `Cannot extend non-interface type "${type.name}".`,
+          [node],
+        );
+      }
+      break;
+  }
+}