graphql 15.2.0 → 15.5.0

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;
         }
       }
     });
@@ -840,12 +840,12 @@ var defaultFieldResolver = function defaultFieldResolver(source, args, contextVa
 };
 /**
  * This method looks up the field on the given type definition.
- * It has special casing for the two introspection fields, __schema
- * and __typename. __typename is special because it can always be
- * queried as a field, even in situations where no other fields
- * are allowed, like on a Union. __schema could get automatically
- * added to the query type, but that would require mutating type
- * definitions, which would cause issues.
+ * It has special casing for the three introspection fields,
+ * __schema, __type and __typename. __typename is special because
+ * it can always be queried as a field, even in situations where no
+ * other fields are allowed, like on a Union. __schema and __type
+ * could get automatically added to the query type, but that would
+ * require mutating type definitions, which would cause issues.
  *
  * @internal
  */