graphql 0.12.3 → 0.13.2

package/error/GraphQLError.js

@@ -21,7 +21,7 @@ var _location = require('../language/location');
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 function GraphQLError( // eslint-disable-line no-redeclare
@@ -51,9 +51,8 @@ message, nodes, source, positions, path, originalError, extensions) {
 
   var _locations = void 0;
   if (positions && source) {
-    var providedSource = source;
     _locations = positions.map(function (pos) {
-      return (0, _location.getLocation)(providedSource, pos);
+      return (0, _location.getLocation)(source, pos);
     });
   } else if (_nodes) {
     _locations = _nodes.reduce(function (list, node) {

package/error/GraphQLError.js.flow

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict
  */
 
 import { printError } from './printError';
@@ -84,7 +84,7 @@ declare class GraphQLError extends Error {
   +originalError: ?Error;
 
   /**
-   * The original error thrown from a field resolver during execution.
+   * Extension fields to add to the formatted error.
    */
   +extensions: ?{ [key: string]: mixed };
 }
@@ -125,8 +125,7 @@ export function GraphQLError( // eslint-disable-line no-redeclare
 
   let _locations;
   if (positions && source) {
-    const providedSource = source;
-    _locations = positions.map(pos => getLocation(providedSource, pos));
+    _locations = positions.map(pos => getLocation(source, pos));
   } else if (_nodes) {
     _locations = _nodes.reduce((list, node) => {
       if (node.loc) {

package/{module/error/GraphQLError.js → error/GraphQLError.mjs}

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 import { printError } from './printError';
@@ -45,9 +45,8 @@ message, nodes, source, positions, path, originalError, extensions) {
 
   var _locations = void 0;
   if (positions && source) {
-    var providedSource = source;
     _locations = positions.map(function (pos) {
-      return getLocation(providedSource, pos);
+      return getLocation(source, pos);
     });
   } else if (_nodes) {
     _locations = _nodes.reduce(function (list, node) {

package/error/formatError.js

@@ -10,7 +10,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
                                                                                                                                                                                                                                                                    * This source code is licensed under the MIT license found in the
                                                                                                                                                                                                                                                                    * LICENSE file in the root directory of this source tree.
                                                                                                                                                                                                                                                                    *
-                                                                                                                                                                                                                                                                   * 
+                                                                                                                                                                                                                                                                   *  strict
                                                                                                                                                                                                                                                                    */
 
 exports.formatError = formatError;

package/error/formatError.js.flow

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict
  */
 
 import invariant from '../jsutils/invariant';

package/{module/error/formatError.js → error/formatError.mjs}

@@ -6,7 +6,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 import invariant from '../jsutils/invariant';

package/error/index.js.flow

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict
  */
 
 export { GraphQLError } from './GraphQLError';

package/{module/error/index.js → error/index.mjs}

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 export { GraphQLError } from './GraphQLError';

package/error/locatedError.js

@@ -15,6 +15,7 @@ var _GraphQLError = require('./GraphQLError');
 function locatedError(originalError, nodes, path) {
   // Note: this uses a brand-check to support GraphQL errors originating from
   // other contexts.
+  // $FlowFixMe(>=0.68.0)
   if (originalError && Array.isArray(originalError.path)) {
     return originalError;
   }
@@ -26,5 +27,5 @@ function locatedError(originalError, nodes, path) {
    * This source code is licensed under the MIT license found in the
    * LICENSE file in the root directory of this source tree.
    *
-   * 
+   *  strict
    */

package/error/locatedError.js.flow

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict
  */
 
 import { GraphQLError } from './GraphQLError';
@@ -22,6 +22,7 @@ export function locatedError(
 ): GraphQLError {
   // Note: this uses a brand-check to support GraphQL errors originating from
   // other contexts.
+  // $FlowFixMe(>=0.68.0)
   if (originalError && Array.isArray(originalError.path)) {
     return (originalError: any);
   }

package/{module/error/locatedError.js → error/locatedError.mjs}

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 import { GraphQLError } from './GraphQLError';
@@ -18,6 +18,7 @@ import { GraphQLError } from './GraphQLError';
 export function locatedError(originalError, nodes, path) {
   // Note: this uses a brand-check to support GraphQL errors originating from
   // other contexts.
+  // $FlowFixMe(>=0.68.0)
   if (originalError && Array.isArray(originalError.path)) {
     return originalError;
   }

package/error/printError.js

@@ -38,7 +38,7 @@ function printError(error) {
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 function highlightSourceAtLocation(source, location) {

package/error/printError.js.flow

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict
  */
 
 import { getLocation } from '../language/location';

package/{module/error/printError.js → error/printError.mjs}

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 import { getLocation } from '../language/location';

package/error/syntaxError.js

@@ -17,7 +17,7 @@ var _GraphQLError = require('./GraphQLError');
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 function syntaxError(source, position, description) {

package/error/syntaxError.js.flow

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict
  */
 
 import type { Source } from '../language/source';

package/{module/error/syntaxError.js → error/syntaxError.mjs}

@@ -11,7 +11,7 @@ import { GraphQLError } from './GraphQLError';
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 export function syntaxError(source, position, description) {

package/execution/execute.js

@@ -11,7 +11,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
                                                                                                                                                                                                                                                                                * This source code is licensed under the MIT license found in the
                                                                                                                                                                                                                                                                                * LICENSE file in the root directory of this source tree.
                                                                                                                                                                                                                                                                                *
-                                                                                                                                                                                                                                                                               * 
+                                                                                                                                                                                                                                                                               *  strict
                                                                                                                                                                                                                                                                                */
 
 exports.execute = execute;
@@ -41,12 +41,26 @@ var _isNullish = require('../jsutils/isNullish');
 
 var _isNullish2 = _interopRequireDefault(_isNullish);
 
+var _isPromise = require('../jsutils/isPromise');
+
+var _isPromise2 = _interopRequireDefault(_isPromise);
+
+var _memoize = require('../jsutils/memoize3');
+
+var _memoize2 = _interopRequireDefault(_memoize);
+
+var _promiseForObject = require('../jsutils/promiseForObject');
+
+var _promiseForObject2 = _interopRequireDefault(_promiseForObject);
+
+var _promiseReduce = require('../jsutils/promiseReduce');
+
+var _promiseReduce2 = _interopRequireDefault(_promiseReduce);
+
 var _typeFromAST = require('../utilities/typeFromAST');
 
 var _kinds = require('../language/kinds');
 
-var Kind = _interopRequireWildcard(_kinds);
-
 var _values = require('./values');
 
 var _definition = require('../type/definition');
@@ -59,8 +73,6 @@ var _directives = require('../type/directives');
 
 var _validate = require('../type/validate');
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -148,9 +160,8 @@ function executeImpl(schema, document, rootValue, contextValue, variableValues,
  * response defined by the "Response" section of the GraphQL specification.
  */
 function buildResponse(context, data) {
-  var promise = getPromise(data);
-  if (promise) {
-    return promise.then(function (resolved) {
+  if ((0, _isPromise2.default)(data)) {
+    return data.then(function (resolved) {
       return buildResponse(context, resolved);
     });
   }
@@ -207,14 +218,14 @@ function buildExecutionContext(schema, document, rootValue, contextValue, rawVar
   for (var i = 0; i < document.definitions.length; i++) {
     var definition = document.definitions[i];
     switch (definition.kind) {
-      case Kind.OPERATION_DEFINITION:
+      case _kinds.Kind.OPERATION_DEFINITION:
         if (!operationName && operation) {
           hasMultipleAssumedOperations = true;
         } else if (!operationName || definition.name && definition.name.value === operationName) {
           operation = definition;
         }
         break;
-      case Kind.FRAGMENT_DEFINITION:
+      case _kinds.Kind.FRAGMENT_DEFINITION:
         fragments[definition.name.value] = definition;
         break;
     }
@@ -276,9 +287,8 @@ function executeOperation(exeContext, operation, rootValue) {
   // Similar to completeValueCatchingError.
   try {
     var result = operation.operation === 'mutation' ? executeFieldsSerially(exeContext, type, rootValue, path, fields) : executeFields(exeContext, type, rootValue, path, fields);
-    var promise = getPromise(result);
-    if (promise) {
-      return promise.then(undefined, function (error) {
+    if ((0, _isPromise2.default)(result)) {
+      return result.then(undefined, function (error) {
         exeContext.errors.push(error);
         return Promise.resolve(null);
       });
@@ -323,25 +333,22 @@ function getOperationRootType(schema, operation) {
  * for "write" mode.
  */
 function executeFieldsSerially(exeContext, parentType, sourceValue, path, fields) {
-  return Object.keys(fields).reduce(function (prevPromise, responseName) {
-    return prevPromise.then(function (results) {
-      var fieldNodes = fields[responseName];
-      var fieldPath = addPath(path, responseName);
-      var result = resolveField(exeContext, parentType, sourceValue, fieldNodes, fieldPath);
-      if (result === undefined) {
-        return results;
-      }
-      var promise = getPromise(result);
-      if (promise) {
-        return promise.then(function (resolvedResult) {
-          results[responseName] = resolvedResult;
-          return results;
-        });
-      }
-      results[responseName] = result;
+  return (0, _promiseReduce2.default)(Object.keys(fields), function (results, responseName) {
+    var fieldNodes = fields[responseName];
+    var fieldPath = addPath(path, responseName);
+    var result = resolveField(exeContext, parentType, sourceValue, fieldNodes, fieldPath);
+    if (result === undefined) {
       return results;
-    });
-  }, Promise.resolve({}));
+    }
+    if ((0, _isPromise2.default)(result)) {
+      return result.then(function (resolvedResult) {
+        results[responseName] = resolvedResult;
+        return results;
+      });
+    }
+    results[responseName] = result;
+    return results;
+  }, Object.create(null));
 }
 
 /**
@@ -359,7 +366,7 @@ function executeFields(exeContext, parentType, sourceValue, path, fields) {
       return results;
     }
     results[responseName] = result;
-    if (getPromise(result)) {
+    if (!containsPromise && (0, _isPromise2.default)(result)) {
       containsPromise = true;
     }
     return results;
@@ -374,7 +381,7 @@ function executeFields(exeContext, parentType, sourceValue, path, fields) {
   // of resolving that field, which is possibly a promise. Return
   // a promise that will return this same map, but with any
   // promises replaced with the values they resolved to.
-  return promiseForObject(finalResults);
+  return (0, _promiseForObject2.default)(finalResults);
 }
 
 /**
@@ -389,7 +396,7 @@ function collectFields(exeContext, runtimeType, selectionSet, fields, visitedFra
   for (var i = 0; i < selectionSet.selections.length; i++) {
     var selection = selectionSet.selections[i];
     switch (selection.kind) {
-      case Kind.FIELD:
+      case _kinds.Kind.FIELD:
         if (!shouldIncludeNode(exeContext, selection)) {
           continue;
         }
@@ -399,13 +406,13 @@ function collectFields(exeContext, runtimeType, selectionSet, fields, visitedFra
         }
         fields[name].push(selection);
         break;
-      case Kind.INLINE_FRAGMENT:
+      case _kinds.Kind.INLINE_FRAGMENT:
         if (!shouldIncludeNode(exeContext, selection) || !doesFragmentConditionMatch(exeContext, selection, runtimeType)) {
           continue;
         }
         collectFields(exeContext, runtimeType, selection.selectionSet, fields, visitedFragmentNames);
         break;
-      case Kind.FRAGMENT_SPREAD:
+      case _kinds.Kind.FRAGMENT_SPREAD:
         var fragName = selection.name.value;
         if (visitedFragmentNames[fragName] || !shouldIncludeNode(exeContext, selection)) {
           continue;
@@ -457,26 +464,6 @@ function doesFragmentConditionMatch(exeContext, fragment, type) {
   return false;
 }
 
-/**
- * This function transforms a JS object `ObjMap<Promise<T>>` into
- * a `Promise<ObjMap<T>>`
- *
- * This is akin to bluebird's `Promise.props`, but implemented only using
- * `Promise.all` so it will work with any implementation of ES6 promises.
- */
-function promiseForObject(object) {
-  var keys = Object.keys(object);
-  var valuesAndPromises = keys.map(function (name) {
-    return object[name];
-  });
-  return Promise.all(valuesAndPromises).then(function (values) {
-    return values.reduce(function (resolvedObject, value, i) {
-      resolvedObject[keys[i]] = value;
-      return resolvedObject;
-    }, Object.create(null));
-  });
-}
-
 /**
  * Implements the logic to compute the key of a given field's entry
  */
@@ -542,8 +529,7 @@ function resolveFieldValueOrError(exeContext, fieldDef, fieldNodes, resolveFn, s
     var context = exeContext.contextValue;
 
     var result = resolveFn(source, args, context, info);
-    var promise = getPromise(result);
-    return promise ? promise.then(undefined, asErrorInstance) : result;
+    return (0, _isPromise2.default)(result) ? result.then(undefined, asErrorInstance) : result;
   } catch (error) {
     return asErrorInstance(error);
   }
@@ -568,13 +554,12 @@ function completeValueCatchingError(exeContext, returnType, fieldNodes, info, pa
   // a null value for this field if one is encountered.
   try {
     var completed = completeValueWithLocatedError(exeContext, returnType, fieldNodes, info, path, result);
-    var promise = getPromise(completed);
-    if (promise) {
+    if ((0, _isPromise2.default)(completed)) {
       // If `completeValueWithLocatedError` returned a rejected promise, log
       // the rejection error and resolve to null.
       // Note: we don't rely on a `catch` method, but we do expect "thenable"
       // to take a second callback for the error case.
-      return promise.then(undefined, function (error) {
+      return completed.then(undefined, function (error) {
         exeContext.errors.push(error);
         return Promise.resolve(null);
       });
@@ -593,9 +578,8 @@ function completeValueCatchingError(exeContext, returnType, fieldNodes, info, pa
 function completeValueWithLocatedError(exeContext, returnType, fieldNodes, info, path, result) {
   try {
     var completed = completeValue(exeContext, returnType, fieldNodes, info, path, result);
-    var promise = getPromise(completed);
-    if (promise) {
-      return promise.then(undefined, function (error) {
+    if ((0, _isPromise2.default)(completed)) {
+      return completed.then(undefined, function (error) {
         return Promise.reject((0, _error.locatedError)(asErrorInstance(error), fieldNodes, responsePathAsArray(path)));
       });
     }
@@ -628,9 +612,8 @@ function completeValueWithLocatedError(exeContext, returnType, fieldNodes, info,
  */
 function completeValue(exeContext, returnType, fieldNodes, info, path, result) {
   // If result is a Promise, apply-lift over completeValue.
-  var promise = getPromise(result);
-  if (promise) {
-    return promise.then(function (resolved) {
+  if ((0, _isPromise2.default)(result)) {
+    return result.then(function (resolved) {
       return completeValue(exeContext, returnType, fieldNodes, info, path, resolved);
     });
   }
@@ -700,7 +683,7 @@ function completeListValue(exeContext, returnType, fieldNodes, info, path, resul
     var fieldPath = addPath(path, index);
     var completedItem = completeValueCatchingError(exeContext, itemType, fieldNodes, info, fieldPath, item);
 
-    if (!containsPromise && getPromise(completedItem)) {
+    if (!containsPromise && (0, _isPromise2.default)(completedItem)) {
       containsPromise = true;
     }
     completedResults.push(completedItem);
@@ -729,9 +712,8 @@ 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 promise = getPromise(runtimeType);
-  if (promise) {
-    return promise.then(function (resolvedRuntimeType) {
+  if ((0, _isPromise2.default)(runtimeType)) {
+    return runtimeType.then(function (resolvedRuntimeType) {
       return completeObjectValue(exeContext, ensureValidRuntimeType(resolvedRuntimeType, exeContext, returnType, fieldNodes, info, result), fieldNodes, info, path, result);
     });
   }
@@ -763,10 +745,9 @@ function completeObjectValue(exeContext, returnType, fieldNodes, info, path, res
   if (returnType.isTypeOf) {
     var isTypeOf = returnType.isTypeOf(result, exeContext.contextValue, info);
 
-    var promise = getPromise(isTypeOf);
-    if (promise) {
-      return promise.then(function (isTypeOfResult) {
-        if (!isTypeOfResult) {
+    if ((0, _isPromise2.default)(isTypeOf)) {
+      return isTypeOf.then(function (resolvedIsTypeOf) {
+        if (!resolvedIsTypeOf) {
           throw invalidReturnTypeError(returnType, result, fieldNodes);
         }
         return collectAndExecuteSubfields(exeContext, returnType, fieldNodes, info, path, result);
@@ -787,6 +768,17 @@ function invalidReturnTypeError(returnType, result, fieldNodes) {
 
 function collectAndExecuteSubfields(exeContext, returnType, fieldNodes, info, path, result) {
   // Collect sub-fields to execute to complete this value.
+  var subFieldNodes = collectSubfields(exeContext, returnType, fieldNodes);
+  return executeFields(exeContext, returnType, result, path, subFieldNodes);
+}
+
+/**
+ * A memoized collection of relevant subfields in the context of the return
+ * type. Memoizing ensures the subfields are not repeatedly calculated, which
+ * saves overhead when resolving lists of values.
+ */
+var collectSubfields = (0, _memoize2.default)(_collectSubfields);
+function _collectSubfields(exeContext, returnType, fieldNodes) {
   var subFieldNodes = Object.create(null);
   var visitedFragmentNames = Object.create(null);
   for (var i = 0; i < fieldNodes.length; i++) {
@@ -795,8 +787,7 @@ function collectAndExecuteSubfields(exeContext, returnType, fieldNodes, info, pa
       subFieldNodes = collectFields(exeContext, returnType, selectionSet, subFieldNodes, visitedFragmentNames);
     }
   }
-
-  return executeFields(exeContext, returnType, result, path, subFieldNodes);
+  return subFieldNodes;
 }
 
 /**
@@ -825,9 +816,8 @@ function defaultResolveTypeFn(value, context, info, abstractType) {
     if (type.isTypeOf) {
       var isTypeOfResult = type.isTypeOf(value, context, info);
 
-      var promise = getPromise(isTypeOfResult);
-      if (promise) {
-        promisedIsTypeOfResults[i] = promise;
+      if ((0, _isPromise2.default)(isTypeOfResult)) {
+        promisedIsTypeOfResults[i] = isTypeOfResult;
       } else if (isTypeOfResult) {
         return type;
       }
@@ -862,16 +852,6 @@ var defaultFieldResolver = exports.defaultFieldResolver = function defaultFieldR
   }
 };
 
-/**
- * Only returns the value if it acts like a Promise, i.e. has a "then" function,
- * otherwise returns void.
- */
-function getPromise(value) {
-  if ((typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object' && value !== null && typeof value.then === 'function') {
-    return value;
-  }
-}
-
 /**
  * This method looks up the field on the given type defintion.
  * It has special casing for the two introspection fields, __schema