graphql 14.1.1 → 14.3.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2015-present, Facebook, Inc.
+Copyright (c) Facebook, Inc. and its affiliates.
 
 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

@@ -4,7 +4,7 @@ The JavaScript reference implementation for GraphQL, a query language for APIs c
 
 [![npm version](https://badge.fury.io/js/graphql.svg)](https://badge.fury.io/js/graphql)
 [![Build Status](https://travis-ci.org/graphql/graphql-js.svg?branch=master)](https://travis-ci.org/graphql/graphql-js?branch=master)
-[![Coverage Status](https://coveralls.io/repos/graphql/graphql-js/badge.svg?branch=master)](https://coveralls.io/r/graphql/graphql-js?branch=master)
+[![Coverage Status](https://codecov.io/gh/graphql/graphql-js/branch/master/graph/badge.svg)](https://codecov.io/gh/graphql/graphql-js)
 
 See more complete documentation at https://graphql.org/ and
 https://graphql.org/graphql-js/.

package/error/GraphQLError.js

@@ -9,14 +9,8 @@ var _printError = require("./printError");
 
 var _location = require("../language/location");
 
-/**
- * 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.
- *
- * 
- */
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 function GraphQLError( // eslint-disable-line no-redeclare
 message, nodes, source, positions, path, originalError, extensions) {
   // Compute list of blame nodes.
@@ -62,7 +56,15 @@ message, nodes, source, positions, path, originalError, extensions) {
     }, []);
   }
 
-  var _extensions = extensions || originalError && originalError.extensions;
+  var _extensions = extensions;
+
+  if (_extensions == null && originalError != null) {
+    var originalExtensions = originalError.extensions;
+
+    if (originalExtensions != null && _typeof(originalExtensions) === 'object') {
+      _extensions = originalExtensions;
+    }
+  }
 
   Object.defineProperties(this, {
     message: {
@@ -143,4 +145,4 @@ GraphQLError.prototype = Object.create(Error.prototype, {
       return (0, _printError.printError)(this);
     }
   }
-});
+});

package/error/GraphQLError.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,10 +8,9 @@
  */
 
 import { printError } from './printError';
-import { getLocation } from '../language/location';
-import type { SourceLocation } from '../language/location';
-import type { ASTNode } from '../language/ast';
-import type { Source } from '../language/source';
+import { type ASTNode } from '../language/ast';
+import { type Source } from '../language/source';
+import { type SourceLocation, getLocation } from '../language/location';
 
 /**
  * A GraphQLError describes an Error found during the parse, validate, or
@@ -139,7 +138,13 @@ export function GraphQLError( // eslint-disable-line no-redeclare
     }, []);
   }
 
-  const _extensions = extensions || (originalError && originalError.extensions);
+  let _extensions = extensions;
+  if (_extensions == null && originalError != null) {
+    const originalExtensions = originalError.extensions;
+    if (originalExtensions != null && typeof originalExtensions === 'object') {
+      _extensions = originalExtensions;
+    }
+  }
 
   Object.defineProperties(this, {
     message: {

package/error/GraphQLError.mjs

@@ -1,5 +1,7 @@
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,6 +10,13 @@
  */
 import { printError } from './printError';
 import { getLocation } from '../language/location';
+/**
+ * A GraphQLError describes an Error found during the parse, validate, or
+ * execute phases of performing a GraphQL operation. In addition to a message
+ * and stack trace, it also includes information about the locations in a
+ * GraphQL document and/or execution result that correspond to the Error.
+ */
+
 export function GraphQLError( // eslint-disable-line no-redeclare
 message, nodes, source, positions, path, originalError, extensions) {
   // Compute list of blame nodes.
@@ -53,7 +62,15 @@ message, nodes, source, positions, path, originalError, extensions) {
     }, []);
   }
 
-  var _extensions = extensions || originalError && originalError.extensions;
+  var _extensions = extensions;
+
+  if (_extensions == null && originalError != null) {
+    var originalExtensions = originalError.extensions;
+
+    if (originalExtensions != null && _typeof(originalExtensions) === 'object') {
+      _extensions = originalExtensions;
+    }
+  }
 
   Object.defineProperties(this, {
     message: {
@@ -133,4 +150,4 @@ GraphQLError.prototype = Object.create(Error.prototype, {
       return printError(this);
     }
   }
-});
+});

package/error/formatError.js

@@ -10,7 +10,7 @@ var _invariant = _interopRequireDefault(require("../jsutils/invariant"));
 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.
@@ -38,4 +38,4 @@ function formatError(error) {
     locations: locations,
     path: path
   };
-}
+}

package/error/formatError.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,8 +8,8 @@
  */
 
 import invariant from '../jsutils/invariant';
-import type { GraphQLError } from './GraphQLError';
-import type { SourceLocation } from '../language/location';
+import { type GraphQLError } from './GraphQLError';
+import { type SourceLocation } from '../language/location';
 
 /**
  * Given a GraphQLError, format it according to the rules described by the

package/error/formatError.mjs

@@ -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.
@@ -28,4 +28,4 @@ export function formatError(error) {
     locations: locations,
     path: path
   };
-}
+}

package/error/index.js

@@ -42,4 +42,4 @@ var _locatedError = require("./locatedError");
 
 var _printError = require("./printError");
 
-var _formatError = require("./formatError");
+var _formatError = require("./formatError");

package/error/index.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,9 +8,12 @@
  */
 
 export { GraphQLError } from './GraphQLError';
+
 export { syntaxError } from './syntaxError';
+
 export { locatedError } from './locatedError';
+
 export { printError } from './printError';
-export { formatError } from './formatError';
 
+export { formatError } from './formatError';
 export type { GraphQLFormattedError } from './formatError';

package/error/index.mjs

@@ -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.
@@ -10,4 +10,4 @@ export { GraphQLError } from './GraphQLError';
 export { syntaxError } from './syntaxError';
 export { locatedError } from './locatedError';
 export { printError } from './printError';
-export { formatError } from './formatError';
+export { formatError } from './formatError';

package/error/locatedError.js

@@ -8,7 +8,7 @@ exports.locatedError = locatedError;
 var _GraphQLError = require("./GraphQLError");
 
 /**
- * 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.
@@ -29,4 +29,4 @@ function locatedError(originalError, nodes, path) {
   }
 
   return new _GraphQLError.GraphQLError(originalError && originalError.message, originalError && originalError.nodes || nodes, originalError && originalError.source, originalError && originalError.positions, path, originalError);
-}
+}

package/error/locatedError.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,7 +8,7 @@
  */
 
 import { GraphQLError } from './GraphQLError';
-import type { ASTNode } from '../language/ast';
+import { type ASTNode } from '../language/ast';
 
 /**
  * Given an arbitrary Error, presumably thrown while attempting to execute a

package/error/locatedError.mjs

@@ -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.
@@ -21,4 +21,4 @@ export function locatedError(originalError, nodes, path) {
   }
 
   return new GraphQLError(originalError && originalError.message, originalError && originalError.nodes || nodes, originalError && originalError.source, originalError && originalError.positions, path, originalError);
-}
+}

package/error/printError.js

@@ -8,7 +8,7 @@ exports.printError = printError;
 var _location = require("../language/location");
 
 /**
- * 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.
@@ -143,4 +143,4 @@ function whitespace(len) {
 
 function lpad(len, str) {
   return whitespace(len - str.length) + str;
-}
+}

package/error/printError.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,10 +7,9 @@
  * @flow strict
  */
 
-import { getLocation } from '../language/location';
-import type { SourceLocation } from '../language/location';
-import type { Source } from '../language/source';
-import type { GraphQLError } from './GraphQLError';
+import { type SourceLocation, getLocation } from '../language/location';
+import { type Source } from '../language/source';
+import { type GraphQLError } from './GraphQLError';
 
 /**
  * Prints a GraphQLError to a string, representing useful location information

package/error/printError.mjs

@@ -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.
@@ -134,4 +134,4 @@ function whitespace(len) {
 
 function lpad(len, str) {
   return whitespace(len - str.length) + str;
-}
+}

package/error/syntaxError.js

@@ -8,7 +8,7 @@ exports.syntaxError = syntaxError;
 var _GraphQLError = require("./GraphQLError");
 
 /**
- * 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.
@@ -22,4 +22,4 @@ var _GraphQLError = require("./GraphQLError");
  */
 function syntaxError(source, position, description) {
   return new _GraphQLError.GraphQLError("Syntax Error: ".concat(description), undefined, source, [position]);
-}
+}

package/error/syntaxError.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type { Source } from '../language/source';
+import { type Source } from '../language/source';
 import { GraphQLError } from './GraphQLError';
 
 /**

package/error/syntaxError.mjs

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,4 +14,4 @@ import { GraphQLError } from './GraphQLError';
 
 export function syntaxError(source, position, description) {
   return new GraphQLError("Syntax Error: ".concat(description), undefined, source, [position]);
-}
+}

package/execution/execute.js

@@ -12,7 +12,7 @@ exports.collectFields = collectFields;
 exports.buildResolveInfo = buildResolveInfo;
 exports.resolveFieldValueOrError = resolveFieldValueOrError;
 exports.getFieldDef = getFieldDef;
-exports.defaultFieldResolver = void 0;
+exports.defaultFieldResolver = exports.defaultTypeResolver = void 0;
 
 var _iterall = require("iterall");
 
@@ -56,18 +56,18 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
-function execute(argsOrSchema, document, rootValue, contextValue, variableValues, operationName, fieldResolver) {
+function execute(argsOrSchema, document, rootValue, contextValue, variableValues, operationName, fieldResolver, typeResolver) {
   /* eslint-enable no-redeclare */
   // Extract arguments from object args if provided.
-  return arguments.length === 1 ? executeImpl(argsOrSchema.schema, argsOrSchema.document, argsOrSchema.rootValue, argsOrSchema.contextValue, argsOrSchema.variableValues, argsOrSchema.operationName, argsOrSchema.fieldResolver) : executeImpl(argsOrSchema, document, rootValue, contextValue, variableValues, operationName, fieldResolver);
+  return arguments.length === 1 ? executeImpl(argsOrSchema.schema, argsOrSchema.document, argsOrSchema.rootValue, argsOrSchema.contextValue, argsOrSchema.variableValues, argsOrSchema.operationName, argsOrSchema.fieldResolver, argsOrSchema.typeResolver) : executeImpl(argsOrSchema, document, rootValue, contextValue, variableValues, operationName, fieldResolver, typeResolver);
 }
 
-function executeImpl(schema, document, rootValue, contextValue, variableValues, operationName, fieldResolver) {
+function executeImpl(schema, document, rootValue, contextValue, variableValues, operationName, fieldResolver, typeResolver) {
   // If arguments are missing or incorrect, throw an error.
   assertValidExecutionArguments(schema, document, variableValues); // If a valid execution context cannot be created due to incorrect arguments,
   // a "Response" with only errors is returned.
 
-  var exeContext = buildExecutionContext(schema, document, rootValue, contextValue, variableValues, operationName, fieldResolver); // Return early errors if execution context failed.
+  var exeContext = buildExecutionContext(schema, document, rootValue, contextValue, variableValues, operationName, fieldResolver, typeResolver); // Return early errors if execution context failed.
 
   if (Array.isArray(exeContext)) {
     return {
@@ -155,7 +155,7 @@ function assertValidExecutionArguments(schema, document, rawVariableValues) {
  */
 
 
-function buildExecutionContext(schema, document, rootValue, contextValue, rawVariableValues, operationName, fieldResolver) {
+function buildExecutionContext(schema, document, rootValue, contextValue, rawVariableValues, operationName, fieldResolver, typeResolver) {
   var errors = [];
   var operation;
   var hasMultipleAssumedOperations = false;
@@ -216,6 +216,7 @@ function buildExecutionContext(schema, document, rootValue, contextValue, rawVar
     operation: operation,
     variableValues: variableValues,
     fieldResolver: fieldResolver || defaultFieldResolver,
+    typeResolver: typeResolver || defaultTypeResolver,
     errors: errors
   };
 }
@@ -327,43 +328,49 @@ function collectFields(exeContext, runtimeType, selectionSet, fields, visitedFra
 
     switch (selection.kind) {
       case _kinds.Kind.FIELD:
-        if (!shouldIncludeNode(exeContext, selection)) {
-          continue;
-        }
+        {
+          if (!shouldIncludeNode(exeContext, selection)) {
+            continue;
+          }
 
-        var name = getFieldEntryKey(selection);
+          var name = getFieldEntryKey(selection);
 
-        if (!fields[name]) {
-          fields[name] = [];
-        }
+          if (!fields[name]) {
+            fields[name] = [];
+          }
 
-        fields[name].push(selection);
-        break;
+          fields[name].push(selection);
+          break;
+        }
 
       case _kinds.Kind.INLINE_FRAGMENT:
-        if (!shouldIncludeNode(exeContext, selection) || !doesFragmentConditionMatch(exeContext, selection, runtimeType)) {
-          continue;
-        }
+        {
+          if (!shouldIncludeNode(exeContext, selection) || !doesFragmentConditionMatch(exeContext, selection, runtimeType)) {
+            continue;
+          }
 
-        collectFields(exeContext, runtimeType, selection.selectionSet, fields, visitedFragmentNames);
-        break;
+          collectFields(exeContext, runtimeType, selection.selectionSet, fields, visitedFragmentNames);
+          break;
+        }
 
       case _kinds.Kind.FRAGMENT_SPREAD:
-        var fragName = selection.name.value;
+        {
+          var fragName = selection.name.value;
 
-        if (visitedFragmentNames[fragName] || !shouldIncludeNode(exeContext, selection)) {
-          continue;
-        }
+          if (visitedFragmentNames[fragName] || !shouldIncludeNode(exeContext, selection)) {
+            continue;
+          }
 
-        visitedFragmentNames[fragName] = true;
-        var fragment = exeContext.fragments[fragName];
+          visitedFragmentNames[fragName] = true;
+          var fragment = exeContext.fragments[fragName];
 
-        if (!fragment || !doesFragmentConditionMatch(exeContext, fragment, runtimeType)) {
-          continue;
-        }
+          if (!fragment || !doesFragmentConditionMatch(exeContext, fragment, runtimeType)) {
+            continue;
+          }
 
-        collectFields(exeContext, runtimeType, fragment.selectionSet, fields, visitedFragmentNames);
-        break;
+          collectFields(exeContext, runtimeType, fragment.selectionSet, fields, visitedFragmentNames);
+          break;
+        }
     }
   }
 
@@ -486,7 +493,11 @@ function resolveFieldValueOrError(exeContext, fieldDef, fieldNodes, resolveFn, s
 
 
 function asErrorInstance(error) {
-  return error instanceof Error ? error : new Error(error || undefined);
+  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.
 
@@ -601,7 +612,7 @@ function completeValue(exeContext, returnType, fieldNodes, info, path, result) {
   /* istanbul ignore next */
 
 
-  throw new Error("Cannot complete value of unexpected type \"".concat((0, _inspect.default)(returnType), "\"."));
+  throw new Error("Cannot complete value of unexpected output type: \"".concat((0, _inspect.default)(returnType), "\"."));
 }
 /**
  * Complete a list value by completing each item in the list with the
@@ -653,7 +664,9 @@ function completeLeafValue(returnType, result) {
 
 
 function completeAbstractValue(exeContext, returnType, fieldNodes, info, path, result) {
-  var runtimeType = returnType.resolveType ? returnType.resolveType(result, exeContext.contextValue, info) : defaultResolveTypeFn(result, exeContext.contextValue, info, returnType);
+  var resolveTypeFn = returnType.resolveType || exeContext.typeResolver;
+  var contextValue = exeContext.contextValue;
+  var runtimeType = resolveTypeFn(result, contextValue, info, returnType);
 
   if ((0, _isPromise.default)(runtimeType)) {
     return runtimeType.then(function (resolvedRuntimeType) {
@@ -751,7 +764,7 @@ function _collectSubfields(exeContext, returnType, fieldNodes) {
  */
 
 
-function defaultResolveTypeFn(value, contextValue, info, abstractType) {
+var defaultTypeResolver = function defaultTypeResolver(value, contextValue, info, abstractType) {
   // First, look for `__typename`.
   if (value !== null && _typeof(value) === 'object' && typeof value.__typename === 'string') {
     return value.__typename;
@@ -784,7 +797,7 @@ function defaultResolveTypeFn(value, contextValue, info, abstractType) {
       }
     });
   }
-}
+};
 /**
  * If a resolve function is not given, then a default resolve behavior is used
  * which takes the property of the source object of the same name as the field
@@ -793,6 +806,8 @@ function defaultResolveTypeFn(value, contextValue, info, abstractType) {
  */
 
 
+exports.defaultTypeResolver = defaultTypeResolver;
+
 var defaultFieldResolver = function defaultFieldResolver(source, args, contextValue, info) {
   // ensure source is a value for which property access is acceptable.
   if (_typeof(source) === 'object' || typeof source === 'function') {
@@ -828,4 +843,4 @@ function getFieldDef(schema, parentType, fieldName) {
   }
 
   return parentType.getFields()[fieldName];
-}
+}