graphql 15.3.0 → 15.5.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 GraphQL Contributors
+Copyright (c) GraphQL Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -115,6 +115,16 @@ directly on this branch:
 npm install graphql@git://github.com/graphql/graphql-js.git#npm
 ```
 
+### Experimental features
+
+Each release of GraphQL.js will be accompanied by an experimental release containing support for the `@defer` and `@stream` directive proposal. We are hoping to get community feedback on these releases before the proposal is accepted into the GraphQL specification. You can use this experimental release of GraphQL.js by adding the following to your project's `package.json` file.
+
+```
+"graphql": "experimental-stream-defer"
+```
+
+Community feedback on this experimental release is much appreciated and can be provided on the [issue created for this purpose](https://github.com/graphql/graphql-js/issues/2848).
+
 ### Using in a Browser
 
 GraphQL.js is a general-purpose library and can be used both in a Node server

package/error/GraphQLError.js

@@ -1,23 +1,23 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; 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); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.printError = printError;
 exports.GraphQLError = void 0;
 
-var _isObjectLike = _interopRequireDefault(require("../jsutils/isObjectLike"));
+var _isObjectLike = _interopRequireDefault(require("../jsutils/isObjectLike.js"));
 
-var _symbols = require("../polyfills/symbols");
+var _symbols = require("../polyfills/symbols.js");
 
-var _location = require("../language/location");
+var _location = require("../language/location.js");
 
-var _printLocation = require("../language/printLocation");
+var _printLocation = require("../language/printLocation.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _typeof(obj) { "@babel/helpers - typeof"; 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); }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -219,7 +219,7 @@ var GraphQLError = /*#__PURE__*/function (_Error) {
       }
     }); // Include (non-enumerable) stack trace.
 
-    if (originalError === null || originalError === void 0 ? void 0 : originalError.stack) {
+    if (originalError !== null && originalError !== void 0 && originalError.stack) {
       Object.defineProperty(_assertThisInitialized(_this), 'stack', {
         value: originalError.stack,
         writable: true,
@@ -247,7 +247,7 @@ var GraphQLError = /*#__PURE__*/function (_Error) {
     value: function toString() {
       return printError(this);
     } // FIXME: workaround to not break chai comparisons, should be remove in v16
-    // $FlowFixMe Flow doesn't support computed properties yet
+    // $FlowFixMe[unsupported-syntax] Flow doesn't support computed properties yet
 
   }, {
     key: _symbols.SYMBOL_TO_STRING_TAG,

package/error/GraphQLError.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 // FIXME:
 // flowlint uninitialized-instance-property:off
 
@@ -85,7 +84,7 @@ export class GraphQLError extends Error {
     path?: ?$ReadOnlyArray<string | number>,
     originalError?: ?(Error & { +extensions?: mixed, ... }),
     extensions?: ?{ [key: string]: mixed, ... },
-  ): void {
+  ) {
     super(message);
 
     // Compute list of blame nodes.
@@ -214,7 +213,7 @@ export class GraphQLError extends Error {
   }
 
   // FIXME: workaround to not break chai comparisons, should be remove in v16
-  // $FlowFixMe Flow doesn't support computed properties yet
+  // $FlowFixMe[unsupported-syntax] Flow doesn't support computed properties yet
   get [SYMBOL_TO_STRING_TAG](): string {
     return 'Object';
   }

package/error/GraphQLError.mjs

@@ -208,7 +208,7 @@ export var GraphQLError = /*#__PURE__*/function (_Error) {
       }
     }); // Include (non-enumerable) stack trace.
 
-    if (originalError === null || originalError === void 0 ? void 0 : originalError.stack) {
+    if (originalError !== null && originalError !== void 0 && originalError.stack) {
       Object.defineProperty(_assertThisInitialized(_this), 'stack', {
         value: originalError.stack,
         writable: true,
@@ -236,7 +236,7 @@ export var GraphQLError = /*#__PURE__*/function (_Error) {
     value: function toString() {
       return printError(this);
     } // FIXME: workaround to not break chai comparisons, should be remove in v16
-    // $FlowFixMe Flow doesn't support computed properties yet
+    // $FlowFixMe[unsupported-syntax] Flow doesn't support computed properties yet
 
   }, {
     key: SYMBOL_TO_STRING_TAG,

package/error/formatError.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.formatError = formatError;
 
-var _devAssert = _interopRequireDefault(require("../jsutils/devAssert"));
+var _devAssert = _interopRequireDefault(require("../jsutils/devAssert.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 

package/error/formatError.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import devAssert from '../jsutils/devAssert';
 
 import type { SourceLocation } from '../language/location';

package/error/index.js

@@ -34,10 +34,10 @@ Object.defineProperty(exports, "formatError", {
   }
 });
 
-var _GraphQLError = require("./GraphQLError");
+var _GraphQLError = require("./GraphQLError.js");
 
-var _syntaxError = require("./syntaxError");
+var _syntaxError = require("./syntaxError.js");
 
-var _locatedError = require("./locatedError");
+var _locatedError = require("./locatedError.js");
 
-var _formatError = require("./formatError");
+var _formatError = require("./formatError.js");

package/error/index.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 export { GraphQLError, printError } from './GraphQLError';
 
 export { syntaxError } from './syntaxError';

package/error/locatedError.d.ts

@@ -5,12 +5,12 @@ import { ASTNode } from '../language/ast';
 import { GraphQLError } from './GraphQLError';
 
 /**
- * Given an arbitrary Error, presumably thrown while attempting to execute a
+ * Given an arbitrary value, presumably thrown while attempting to execute a
  * GraphQL operation, produce a new GraphQLError aware of the location in the
  * document responsible for the original Error.
  */
 export function locatedError(
-  originalError: Error | GraphQLError,
+  rawOriginalError: any,
   nodes: ASTNode | ReadonlyArray<ASTNode> | undefined,
   path?: Maybe<ReadonlyArray<string | number>>,
 ): GraphQLError;

package/error/locatedError.js

@@ -5,18 +5,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.locatedError = locatedError;
 
-var _GraphQLError = require("./GraphQLError");
+var _inspect = _interopRequireDefault(require("../jsutils/inspect.js"));
+
+var _GraphQLError = require("./GraphQLError.js");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
- * Given an arbitrary Error, presumably thrown while attempting to execute a
+ * Given an arbitrary value, presumably thrown while attempting to execute a
  * GraphQL operation, produce a new GraphQLError aware of the location in the
  * document responsible for the original Error.
  */
-function locatedError(originalError, nodes, path) {
+function locatedError(rawOriginalError, nodes, path) {
   var _nodes;
 
-  // Note: this uses a brand-check to support GraphQL errors originating from
-  // other contexts.
+  // Sometimes a non-error is thrown, wrap it as an Error instance to ensure a consistent Error interface.
+  var originalError = rawOriginalError instanceof Error ? rawOriginalError : new Error('Unexpected error value: ' + (0, _inspect.default)(rawOriginalError)); // Note: this uses a brand-check to support GraphQL errors originating from other contexts.
+
   if (Array.isArray(originalError.path)) {
     return originalError;
   }

package/error/locatedError.js.flow

@@ -1,21 +1,27 @@
 // @flow strict
+import inspect from '../jsutils/inspect';
 
 import type { ASTNode } from '../language/ast';
 
 import { GraphQLError } from './GraphQLError';
 
 /**
- * Given an arbitrary Error, presumably thrown while attempting to execute a
+ * Given an arbitrary value, presumably thrown while attempting to execute a
  * GraphQL operation, produce a new GraphQLError aware of the location in the
  * document responsible for the original Error.
  */
 export function locatedError(
-  originalError: Error | GraphQLError,
+  rawOriginalError: mixed,
   nodes: ASTNode | $ReadOnlyArray<ASTNode> | void | null,
   path?: ?$ReadOnlyArray<string | number>,
 ): GraphQLError {
-  // Note: this uses a brand-check to support GraphQL errors originating from
-  // other contexts.
+  // Sometimes a non-error is thrown, wrap it as an Error instance to ensure a consistent Error interface.
+  const originalError: Error | GraphQLError =
+    rawOriginalError instanceof Error
+      ? rawOriginalError
+      : new Error('Unexpected error value: ' + inspect(rawOriginalError));
+
+  // Note: this uses a brand-check to support GraphQL errors originating from other contexts.
   if (Array.isArray(originalError.path)) {
     return (originalError: any);
   }

package/error/locatedError.mjs

@@ -1,15 +1,17 @@
+import inspect from "../jsutils/inspect.mjs";
 import { GraphQLError } from "./GraphQLError.mjs";
 /**
- * Given an arbitrary Error, presumably thrown while attempting to execute a
+ * Given an arbitrary value, presumably thrown while attempting to execute a
  * GraphQL operation, produce a new GraphQLError aware of the location in the
  * document responsible for the original Error.
  */
 
-export function locatedError(originalError, nodes, path) {
+export function locatedError(rawOriginalError, nodes, path) {
   var _nodes;
 
-  // Note: this uses a brand-check to support GraphQL errors originating from
-  // other contexts.
+  // Sometimes a non-error is thrown, wrap it as an Error instance to ensure a consistent Error interface.
+  var originalError = rawOriginalError instanceof Error ? rawOriginalError : new Error('Unexpected error value: ' + inspect(rawOriginalError)); // Note: this uses a brand-check to support GraphQL errors originating from other contexts.
+
   if (Array.isArray(originalError.path)) {
     return originalError;
   }

package/error/syntaxError.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.syntaxError = syntaxError;
 
-var _GraphQLError = require("./GraphQLError");
+var _GraphQLError = require("./GraphQLError.js");
 
 /**
  * Produces a GraphQLError representing a syntax error, containing useful

package/error/syntaxError.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import type { Source } from '../language/source';
 
 import { GraphQLError } from './GraphQLError';

package/execution/execute.d.ts

@@ -159,21 +159,6 @@ export function buildResolveInfo(
   path: Path,
 ): GraphQLResolveInfo;
 
-/**
- * Isolates the "ReturnOrAbrupt" behavior to not de-opt the `resolveField`
- * function. Returns the result of resolveFn or the abrupt-return Error object.
- *
- * @internal
- */
-export function resolveFieldValueOrError(
-  exeContext: ExecutionContext,
-  fieldDef: GraphQLField<any, any>,
-  fieldNodes: ReadonlyArray<FieldNode>,
-  resolveFn: GraphQLFieldResolver<any, any>,
-  source: any,
-  info: GraphQLResolveInfo,
-): any;
-
 /**
  * If a resolveType function is not given, then a default resolve behavior is
  * used which attempts two strategies:

package/execution/execute.js

@@ -9,51 +9,48 @@ exports.assertValidExecutionArguments = assertValidExecutionArguments;
 exports.buildExecutionContext = buildExecutionContext;
 exports.collectFields = collectFields;
 exports.buildResolveInfo = buildResolveInfo;
-exports.resolveFieldValueOrError = resolveFieldValueOrError;
 exports.getFieldDef = getFieldDef;
 exports.defaultFieldResolver = exports.defaultTypeResolver = void 0;
 
-var _arrayFrom = _interopRequireDefault(require("../polyfills/arrayFrom"));
+var _inspect = _interopRequireDefault(require("../jsutils/inspect.js"));
 
-var _inspect = _interopRequireDefault(require("../jsutils/inspect"));
+var _memoize = _interopRequireDefault(require("../jsutils/memoize3.js"));
 
-var _memoize = _interopRequireDefault(require("../jsutils/memoize3"));
+var _invariant = _interopRequireDefault(require("../jsutils/invariant.js"));
 
-var _invariant = _interopRequireDefault(require("../jsutils/invariant"));
+var _devAssert = _interopRequireDefault(require("../jsutils/devAssert.js"));
 
-var _devAssert = _interopRequireDefault(require("../jsutils/devAssert"));
+var _isPromise = _interopRequireDefault(require("../jsutils/isPromise.js"));
 
-var _isPromise = _interopRequireDefault(require("../jsutils/isPromise"));
+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 _promiseReduce = _interopRequireDefault(require("../jsutils/promiseReduce.js"));
 
-var _promiseReduce = _interopRequireDefault(require("../jsutils/promiseReduce"));
+var _promiseForObject = _interopRequireDefault(require("../jsutils/promiseForObject.js"));
 
-var _promiseForObject = _interopRequireDefault(require("../jsutils/promiseForObject"));
+var _Path = require("../jsutils/Path.js");
 
-var _Path = require("../jsutils/Path");
+var _GraphQLError = require("../error/GraphQLError.js");
 
-var _GraphQLError = require("../error/GraphQLError");
+var _locatedError = require("../error/locatedError.js");
 
-var _locatedError = require("../error/locatedError");
+var _kinds = require("../language/kinds.js");
 
-var _kinds = require("../language/kinds");
+var _validate = require("../type/validate.js");
 
-var _validate = require("../type/validate");
+var _introspection = require("../type/introspection.js");
 
-var _introspection = require("../type/introspection");
+var _directives = require("../type/directives.js");
 
-var _directives = require("../type/directives");
+var _definition = require("../type/definition.js");
 
-var _definition = require("../type/definition");
+var _typeFromAST = require("../utilities/typeFromAST.js");
 
-var _typeFromAST = require("../utilities/typeFromAST");
+var _getOperationRootType = require("../utilities/getOperationRootType.js");
 
-var _getOperationRootType = require("../utilities/getOperationRootType");
-
-var _values = require("./values");
+var _values = require("./values.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -234,8 +231,6 @@ function executeOperation(exeContext, operation, rootValue) {
   var path = undefined; // Errors from sub-fields of a NonNull type may propagate to the top level,
   // at which point we still log the error and null the parent field, which
   // in this case is the entire response.
-  //
-  // Similar to completeValueCatchingError.
 
   try {
     var result = operation.operation === 'mutation' ? executeFieldsSerially(exeContext, type, rootValue, path, fields) : executeFields(exeContext, type, rootValue, path, fields);
@@ -299,7 +294,7 @@ function executeFields(exeContext, parentType, sourceValue, path, fields) {
     if (result !== undefined) {
       results[responseName] = result;
 
-      if (!containsPromise && (0, _isPromise.default)(result)) {
+      if ((0, _isPromise.default)(result)) {
         containsPromise = true;
       }
     }
@@ -453,43 +448,10 @@ function resolveField(exeContext, parentType, source, fieldNodes, path) {
     return;
   }
 
+  var returnType = fieldDef.type;
   var resolveFn = (_fieldDef$resolve = fieldDef.resolve) !== null && _fieldDef$resolve !== void 0 ? _fieldDef$resolve : exeContext.fieldResolver;
-  var info = buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path); // Get the resolve function, regardless of if its result is normal
-  // or abrupt (error).
-
-  var result = resolveFieldValueOrError(exeContext, fieldDef, fieldNodes, resolveFn, source, info);
-  return completeValueCatchingError(exeContext, fieldDef.type, fieldNodes, info, path, result);
-}
-/**
- * @internal
- */
-
-
-function buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path) {
-  // The resolve function's optional fourth argument is a collection of
-  // information about the current execution state.
-  return {
-    fieldName: fieldDef.name,
-    fieldNodes: fieldNodes,
-    returnType: fieldDef.type,
-    parentType: parentType,
-    path: path,
-    schema: exeContext.schema,
-    fragments: exeContext.fragments,
-    rootValue: exeContext.rootValue,
-    operation: exeContext.operation,
-    variableValues: exeContext.variableValues
-  };
-}
-/**
- * Isolates the "ReturnOrAbrupt" behavior to not de-opt the `resolveField`
- * function. Returns the result of resolveFn or the abrupt-return Error object.
- *
- * @internal
- */
-
+  var info = buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path); // Get the resolve function, regardless of if its result is normal or abrupt (error).
 
-function resolveFieldValueOrError(exeContext, fieldDef, fieldNodes, resolveFn, source, info) {
   try {
     // Build a JS object of arguments from the field.arguments AST, using the
     // variables scope to fulfill any variable references.
@@ -500,26 +462,6 @@ function resolveFieldValueOrError(exeContext, fieldDef, fieldNodes, resolveFn, s
 
     var _contextValue = exeContext.contextValue;
     var result = resolveFn(source, args, _contextValue, info);
-    return (0, _isPromise.default)(result) ? result.then(undefined, asErrorInstance) : result;
-  } catch (error) {
-    return asErrorInstance(error);
-  }
-} // Sometimes a non-error is thrown, wrap it as an Error instance to ensure a
-// consistent Error interface.
-
-
-function asErrorInstance(error) {
-  if (error instanceof Error) {
-    return error;
-  }
-
-  return new Error('Unexpected error value: ' + (0, _inspect.default)(error));
-} // This is a small wrapper around completeValue which detects and logs errors
-// in the execution context.
-
-
-function completeValueCatchingError(exeContext, returnType, fieldNodes, info, path, result) {
-  try {
     var completed;
 
     if ((0, _isPromise.default)(result)) {
@@ -533,21 +475,43 @@ function completeValueCatchingError(exeContext, returnType, fieldNodes, info, pa
     if ((0, _isPromise.default)(completed)) {
       // Note: we don't rely on a `catch` method, but we do expect "thenable"
       // to take a second callback for the error case.
-      return completed.then(undefined, function (error) {
-        return handleFieldError(error, fieldNodes, path, returnType, exeContext);
+      return completed.then(undefined, function (rawError) {
+        var error = (0, _locatedError.locatedError)(rawError, fieldNodes, (0, _Path.pathToArray)(path));
+        return handleFieldError(error, returnType, exeContext);
       });
     }
 
     return completed;
-  } catch (error) {
-    return handleFieldError(error, fieldNodes, path, returnType, exeContext);
+  } catch (rawError) {
+    var error = (0, _locatedError.locatedError)(rawError, fieldNodes, (0, _Path.pathToArray)(path));
+    return handleFieldError(error, returnType, exeContext);
   }
 }
+/**
+ * @internal
+ */
 
-function handleFieldError(rawError, fieldNodes, path, returnType, exeContext) {
-  var error = (0, _locatedError.locatedError)(asErrorInstance(rawError), fieldNodes, (0, _Path.pathToArray)(path)); // If the field type is non-nullable, then it is resolved without any
-  // protection from errors, however it still properly locates the error.
 
+function buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path) {
+  // The resolve function's optional fourth argument is a collection of
+  // information about the current execution state.
+  return {
+    fieldName: fieldDef.name,
+    fieldNodes: fieldNodes,
+    returnType: fieldDef.type,
+    parentType: parentType,
+    path: path,
+    schema: exeContext.schema,
+    fragments: exeContext.fragments,
+    rootValue: exeContext.rootValue,
+    operation: exeContext.operation,
+    variableValues: exeContext.variableValues
+  };
+}
+
+function handleFieldError(error, returnType, exeContext) {
+  // If the field type is non-nullable, then it is resolved without any
+  // protection from errors, however it still properly locates the error.
   if ((0, _definition.isNonNullType)(returnType)) {
     throw error;
   } // Otherwise, error protection is applied, logging the error and resolving
@@ -636,26 +600,47 @@ function completeValue(exeContext, returnType, fieldNodes, info, path, result) {
 
 
 function completeListValue(exeContext, returnType, fieldNodes, info, path, result) {
-  if (!(0, _isCollection.default)(result)) {
-    throw new _GraphQLError.GraphQLError("Expected Iterable, but did not find one for field \"".concat(info.parentType.name, ".").concat(info.fieldName, "\"."));
-  } // This is specified as a simple map, however we're optimizing the path
+  // This is specified as a simple map, however we're optimizing the path
   // where the list contains no Promises by avoiding creating another Promise.
-
-
   var itemType = returnType.ofType;
   var containsPromise = false;
-  var completedResults = (0, _arrayFrom.default)(result, function (item, index) {
+  var completedResults = (0, _safeArrayFrom.default)(result, function (item, index) {
     // No need to modify the info object containing the path,
     // since from here on it is not ever accessed by resolver functions.
-    var fieldPath = (0, _Path.addPath)(path, index, undefined);
-    var completedItem = completeValueCatchingError(exeContext, itemType, fieldNodes, info, fieldPath, item);
+    var itemPath = (0, _Path.addPath)(path, index, undefined);
 
-    if (!containsPromise && (0, _isPromise.default)(completedItem)) {
-      containsPromise = true;
-    }
+    try {
+      var completedItem;
+
+      if ((0, _isPromise.default)(item)) {
+        completedItem = item.then(function (resolved) {
+          return completeValue(exeContext, itemType, fieldNodes, info, itemPath, resolved);
+        });
+      } else {
+        completedItem = completeValue(exeContext, itemType, fieldNodes, info, itemPath, item);
+      }
 
-    return completedItem;
+      if ((0, _isPromise.default)(completedItem)) {
+        containsPromise = true; // Note: we don't rely on a `catch` method, but we do expect "thenable"
+        // to take a second callback for the error case.
+
+        return completedItem.then(undefined, function (rawError) {
+          var error = (0, _locatedError.locatedError)(rawError, fieldNodes, (0, _Path.pathToArray)(itemPath));
+          return handleFieldError(error, itemType, exeContext);
+        });
+      }
+
+      return completedItem;
+    } catch (rawError) {
+      var error = (0, _locatedError.locatedError)(rawError, fieldNodes, (0, _Path.pathToArray)(itemPath));
+      return handleFieldError(error, itemType, exeContext);
+    }
   });
+
+  if (completedResults == null) {
+    throw new _GraphQLError.GraphQLError("Expected Iterable, but did not find one for field \"".concat(info.parentType.name, ".").concat(info.fieldName, "\"."));
+  }
+
   return containsPromise ? Promise.all(completedResults) : completedResults;
 }
 /**
@@ -696,10 +681,25 @@ function completeAbstractValue(exeContext, returnType, fieldNodes, info, path, r
 }
 
 function ensureValidRuntimeType(runtimeTypeOrName, exeContext, returnType, fieldNodes, info, result) {
-  var runtimeType = typeof runtimeTypeOrName === 'string' ? exeContext.schema.getType(runtimeTypeOrName) : runtimeTypeOrName;
+  if (runtimeTypeOrName == null) {
+    throw new _GraphQLError.GraphQLError("Abstract type \"".concat(returnType.name, "\" must resolve to an Object type at runtime for field \"").concat(info.parentType.name, ".").concat(info.fieldName, "\". Either the \"").concat(returnType.name, "\" type should provide a \"resolveType\" function or each possible type should provide an \"isTypeOf\" function."), fieldNodes);
+  } // FIXME: temporary workaround until support for passing object types would be removed in v16.0.0
+
+
+  var runtimeTypeName = (0, _definition.isNamedType)(runtimeTypeOrName) ? runtimeTypeOrName.name : runtimeTypeOrName;
+
+  if (typeof runtimeTypeName !== 'string') {
+    throw new _GraphQLError.GraphQLError("Abstract type \"".concat(returnType.name, "\" must resolve to an Object type at runtime for field \"").concat(info.parentType.name, ".").concat(info.fieldName, "\" with ") + "value ".concat((0, _inspect.default)(result), ", received \"").concat((0, _inspect.default)(runtimeTypeOrName), "\"."));
+  }
+
+  var runtimeType = exeContext.schema.getType(runtimeTypeName);
+
+  if (runtimeType == null) {
+    throw new _GraphQLError.GraphQLError("Abstract type \"".concat(returnType.name, "\" was resolve to a type \"").concat(runtimeTypeName, "\" that does not exist inside schema."), fieldNodes);
+  }
 
   if (!(0, _definition.isObjectType)(runtimeType)) {
-    throw new _GraphQLError.GraphQLError("Abstract type \"".concat(returnType.name, "\" must resolve to an Object type at runtime for field \"").concat(info.parentType.name, ".").concat(info.fieldName, "\" with ") + "value ".concat((0, _inspect.default)(result), ", received \"").concat((0, _inspect.default)(runtimeType), "\". ") + "Either the \"".concat(returnType.name, "\" type should provide a \"resolveType\" function or each possible type should provide an \"isTypeOf\" function."), fieldNodes);
+    throw new _GraphQLError.GraphQLError("Abstract type \"".concat(returnType.name, "\" was resolve to a non-object type \"").concat(runtimeTypeName, "\"."), fieldNodes);
   }
 
   if (!exeContext.schema.isSubType(returnType, runtimeType)) {
@@ -801,7 +801,7 @@ var defaultTypeResolver = function defaultTypeResolver(value, contextValue, info
       if ((0, _isPromise.default)(isTypeOfResult)) {
         promisedIsTypeOfResults[i] = isTypeOfResult;
       } else if (isTypeOfResult) {
-        return type;
+        return type.name;
       }
     }
   }
@@ -810,7 +810,7 @@ var defaultTypeResolver = function defaultTypeResolver(value, contextValue, info
     return Promise.all(promisedIsTypeOfResults).then(function (isTypeOfResults) {
       for (var _i9 = 0; _i9 < isTypeOfResults.length; _i9++) {
         if (isTypeOfResults[_i9]) {
-          return possibleTypes[_i9];
+          return possibleTypes[_i9].name;
         }
       }
     });