graphql 15.3.0 → 15.5.1

package/utilities/separateOperations.js.flow

@@ -1,8 +1,11 @@
 // @flow strict
-
 import type { ObjMap } from '../jsutils/ObjMap';
 
-import type { DocumentNode, OperationDefinitionNode } from '../language/ast';
+import type {
+  DocumentNode,
+  OperationDefinitionNode,
+  SelectionSetNode,
+} from '../language/ast';
 import { Kind } from '../language/kinds';
 import { visit } from '../language/visitor';
 
@@ -15,36 +18,35 @@ import { visit } from '../language/visitor';
 export function separateOperations(
   documentAST: DocumentNode,
 ): ObjMap<DocumentNode> {
-  const operations = [];
+  const operations: Array<OperationDefinitionNode> = [];
   const depGraph: DepGraph = Object.create(null);
-  let fromName;
 
   // Populate metadata and build a dependency graph.
-  visit(documentAST, {
-    OperationDefinition(node) {
-      fromName = opName(node);
-      operations.push(node);
-    },
-    FragmentDefinition(node) {
-      fromName = node.name.value;
-    },
-    FragmentSpread(node) {
-      const toName = node.name.value;
-      let dependents = depGraph[fromName];
-      if (dependents === undefined) {
-        dependents = depGraph[fromName] = Object.create(null);
-      }
-      dependents[toName] = true;
-    },
-  });
+  for (const definitionNode of documentAST.definitions) {
+    switch (definitionNode.kind) {
+      case Kind.OPERATION_DEFINITION:
+        operations.push(definitionNode);
+        break;
+      case Kind.FRAGMENT_DEFINITION:
+        depGraph[definitionNode.name.value] = collectDependencies(
+          definitionNode.selectionSet,
+        );
+        break;
+    }
+  }
 
   // For each operation, produce a new synthesized AST which includes only what
   // is necessary for completing that operation.
   const separatedDocumentASTs = Object.create(null);
   for (const operation of operations) {
-    const operationName = opName(operation);
-    const dependencies = Object.create(null);
-    collectTransitiveDependencies(dependencies, depGraph, operationName);
+    const dependencies = new Set();
+
+    for (const fragmentName of collectDependencies(operation.selectionSet)) {
+      collectTransitiveDependencies(dependencies, depGraph, fragmentName);
+    }
+
+    // Provides the empty string for anonymous operations.
+    const operationName = operation.name ? operation.name.value : '';
 
     // The list of definition nodes to be included for this operation, sorted
     // to retain the same order as the original document.
@@ -54,7 +56,7 @@ export function separateOperations(
         (node) =>
           node === operation ||
           (node.kind === Kind.FRAGMENT_DEFINITION &&
-            dependencies[node.name.value]),
+            dependencies.has(node.name.value)),
       ),
     };
   }
@@ -62,27 +64,34 @@ export function separateOperations(
   return separatedDocumentASTs;
 }
 
-type DepGraph = ObjMap<ObjMap<boolean>>;
-
-// Provides the empty string for anonymous operations.
-function opName(operation: OperationDefinitionNode): string {
-  return operation.name ? operation.name.value : '';
-}
+type DepGraph = ObjMap<Array<string>>;
 
 // From a dependency graph, collects a list of transitive dependencies by
 // recursing through a dependency graph.
 function collectTransitiveDependencies(
-  collected: ObjMap<boolean>,
+  collected: Set<string>,
   depGraph: DepGraph,
   fromName: string,
 ): void {
-  const immediateDeps = depGraph[fromName];
-  if (immediateDeps) {
-    for (const toName of Object.keys(immediateDeps)) {
-      if (!collected[toName]) {
-        collected[toName] = true;
+  if (!collected.has(fromName)) {
+    collected.add(fromName);
+
+    const immediateDeps = depGraph[fromName];
+    if (immediateDeps !== undefined) {
+      for (const toName of immediateDeps) {
         collectTransitiveDependencies(collected, depGraph, toName);
       }
     }
   }
 }
+
+function collectDependencies(selectionSet: SelectionSetNode): Array<string> {
+  const dependencies = [];
+
+  visit(selectionSet, {
+    FragmentSpread(node) {
+      dependencies.push(node.name.value);
+    },
+  });
+  return dependencies;
+}

package/utilities/separateOperations.mjs

@@ -9,72 +9,76 @@ import { visit } from "../language/visitor.mjs";
 
 export function separateOperations(documentAST) {
   var operations = [];
-  var depGraph = Object.create(null);
-  var fromName; // Populate metadata and build a dependency graph.
-
-  visit(documentAST, {
-    OperationDefinition: function OperationDefinition(node) {
-      fromName = opName(node);
-      operations.push(node);
-    },
-    FragmentDefinition: function FragmentDefinition(node) {
-      fromName = node.name.value;
-    },
-    FragmentSpread: function FragmentSpread(node) {
-      var toName = node.name.value;
-      var dependents = depGraph[fromName];
+  var depGraph = Object.create(null); // Populate metadata and build a dependency graph.
 
-      if (dependents === undefined) {
-        dependents = depGraph[fromName] = Object.create(null);
-      }
+  for (var _i2 = 0, _documentAST$definiti2 = documentAST.definitions; _i2 < _documentAST$definiti2.length; _i2++) {
+    var definitionNode = _documentAST$definiti2[_i2];
 
-      dependents[toName] = true;
+    switch (definitionNode.kind) {
+      case Kind.OPERATION_DEFINITION:
+        operations.push(definitionNode);
+        break;
+
+      case Kind.FRAGMENT_DEFINITION:
+        depGraph[definitionNode.name.value] = collectDependencies(definitionNode.selectionSet);
+        break;
     }
-  }); // For each operation, produce a new synthesized AST which includes only what
+  } // For each operation, produce a new synthesized AST which includes only what
   // is necessary for completing that operation.
 
+
   var separatedDocumentASTs = Object.create(null);
 
-  var _loop = function _loop(_i2) {
-    var operation = operations[_i2];
-    var operationName = opName(operation);
-    var dependencies = Object.create(null);
-    collectTransitiveDependencies(dependencies, depGraph, operationName); // The list of definition nodes to be included for this operation, sorted
+  var _loop = function _loop(_i4) {
+    var operation = operations[_i4];
+    var dependencies = new Set();
+
+    for (var _i6 = 0, _collectDependencies2 = collectDependencies(operation.selectionSet); _i6 < _collectDependencies2.length; _i6++) {
+      var fragmentName = _collectDependencies2[_i6];
+      collectTransitiveDependencies(dependencies, depGraph, fragmentName);
+    } // Provides the empty string for anonymous operations.
+
+
+    var operationName = operation.name ? operation.name.value : ''; // The list of definition nodes to be included for this operation, sorted
     // to retain the same order as the original document.
 
     separatedDocumentASTs[operationName] = {
       kind: Kind.DOCUMENT,
       definitions: documentAST.definitions.filter(function (node) {
-        return node === operation || node.kind === Kind.FRAGMENT_DEFINITION && dependencies[node.name.value];
+        return node === operation || node.kind === Kind.FRAGMENT_DEFINITION && dependencies.has(node.name.value);
       })
     };
   };
 
-  for (var _i2 = 0; _i2 < operations.length; _i2++) {
-    _loop(_i2);
+  for (var _i4 = 0; _i4 < operations.length; _i4++) {
+    _loop(_i4);
   }
 
   return separatedDocumentASTs;
 }
 
-// Provides the empty string for anonymous operations.
-function opName(operation) {
-  return operation.name ? operation.name.value : '';
-} // From a dependency graph, collects a list of transitive dependencies by
+// From a dependency graph, collects a list of transitive dependencies by
 // recursing through a dependency graph.
-
-
 function collectTransitiveDependencies(collected, depGraph, fromName) {
-  var immediateDeps = depGraph[fromName];
+  if (!collected.has(fromName)) {
+    collected.add(fromName);
+    var immediateDeps = depGraph[fromName];
 
-  if (immediateDeps) {
-    for (var _i4 = 0, _Object$keys2 = Object.keys(immediateDeps); _i4 < _Object$keys2.length; _i4++) {
-      var toName = _Object$keys2[_i4];
-
-      if (!collected[toName]) {
-        collected[toName] = true;
+    if (immediateDeps !== undefined) {
+      for (var _i8 = 0; _i8 < immediateDeps.length; _i8++) {
+        var toName = immediateDeps[_i8];
         collectTransitiveDependencies(collected, depGraph, toName);
       }
     }
   }
 }
+
+function collectDependencies(selectionSet) {
+  var dependencies = [];
+  visit(selectionSet, {
+    FragmentSpread: function FragmentSpread(node) {
+      dependencies.push(node.name.value);
+    }
+  });
+  return dependencies;
+}

package/utilities/stripIgnoredCharacters.js

@@ -5,17 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.stripIgnoredCharacters = stripIgnoredCharacters;
 
-var _inspect = _interopRequireDefault(require("../jsutils/inspect"));
+var _source = require("../language/source.js");
 
-var _source = require("../language/source");
+var _tokenKind = require("../language/tokenKind.js");
 
-var _tokenKind = require("../language/tokenKind");
+var _lexer = require("../language/lexer.js");
 
-var _lexer = require("../language/lexer");
-
-var _blockString = require("../language/blockString");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _blockString = require("../language/blockString.js");
 
 /**
  * Strips characters that are not significant to the validity or execution
@@ -70,12 +66,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * """Type description""" type Foo{"""Field description""" bar:String}
  */
 function stripIgnoredCharacters(source) {
-  var sourceObj = typeof source === 'string' ? new _source.Source(source) : source;
-
-  if (!(sourceObj instanceof _source.Source)) {
-    throw new TypeError("Must provide string or Source. Received: ".concat((0, _inspect.default)(sourceObj), "."));
-  }
-
+  var sourceObj = (0, _source.isSource)(source) ? source : new _source.Source(source);
   var body = sourceObj.body;
   var lexer = new _lexer.Lexer(sourceObj);
   var strippedBody = '';
@@ -116,9 +107,8 @@ function dedentBlockString(blockStr) {
   // skip leading and trailing triple quotations
   var rawStr = blockStr.slice(3, -3);
   var body = (0, _blockString.dedentBlockStringValue)(rawStr);
-  var lines = body.split(/\r\n|[\n\r]/g);
 
-  if ((0, _blockString.getBlockStringIndentation)(lines) > 0) {
+  if ((0, _blockString.getBlockStringIndentation)(body) > 0) {
     body = '\n' + body;
   }
 

package/utilities/stripIgnoredCharacters.js.flow

@@ -1,8 +1,5 @@
 // @flow strict
-
-import inspect from '../jsutils/inspect';
-
-import { Source } from '../language/source';
+import { Source, isSource } from '../language/source';
 import { TokenKind } from '../language/tokenKind';
 import { Lexer, isPunctuatorTokenKind } from '../language/lexer';
 import {
@@ -63,12 +60,7 @@ import {
  * """Type description""" type Foo{"""Field description""" bar:String}
  */
 export function stripIgnoredCharacters(source: string | Source): string {
-  const sourceObj = typeof source === 'string' ? new Source(source) : source;
-  if (!(sourceObj instanceof Source)) {
-    throw new TypeError(
-      `Must provide string or Source. Received: ${inspect(sourceObj)}.`,
-    );
-  }
+  const sourceObj = isSource(source) ? source : new Source(source);
 
   const body = sourceObj.body;
   const lexer = new Lexer(sourceObj);
@@ -104,13 +96,12 @@ export function stripIgnoredCharacters(source: string | Source): string {
   return strippedBody;
 }
 
-function dedentBlockString(blockStr) {
+function dedentBlockString(blockStr: string): string {
   // skip leading and trailing triple quotations
   const rawStr = blockStr.slice(3, -3);
   let body = dedentBlockStringValue(rawStr);
 
-  const lines = body.split(/\r\n|[\n\r]/g);
-  if (getBlockStringIndentation(lines) > 0) {
+  if (getBlockStringIndentation(body) > 0) {
     body = '\n' + body;
   }
 

package/utilities/stripIgnoredCharacters.mjs

@@ -1,5 +1,4 @@
-import inspect from "../jsutils/inspect.mjs";
-import { Source } from "../language/source.mjs";
+import { Source, isSource } from "../language/source.mjs";
 import { TokenKind } from "../language/tokenKind.mjs";
 import { Lexer, isPunctuatorTokenKind } from "../language/lexer.mjs";
 import { dedentBlockStringValue, getBlockStringIndentation } from "../language/blockString.mjs";
@@ -57,12 +56,7 @@ import { dedentBlockStringValue, getBlockStringIndentation } from "../language/b
  */
 
 export function stripIgnoredCharacters(source) {
-  var sourceObj = typeof source === 'string' ? new Source(source) : source;
-
-  if (!(sourceObj instanceof Source)) {
-    throw new TypeError("Must provide string or Source. Received: ".concat(inspect(sourceObj), "."));
-  }
-
+  var sourceObj = isSource(source) ? source : new Source(source);
   var body = sourceObj.body;
   var lexer = new Lexer(sourceObj);
   var strippedBody = '';
@@ -103,9 +97,8 @@ function dedentBlockString(blockStr) {
   // skip leading and trailing triple quotations
   var rawStr = blockStr.slice(3, -3);
   var body = dedentBlockStringValue(rawStr);
-  var lines = body.split(/\r\n|[\n\r]/g);
 
-  if (getBlockStringIndentation(lines) > 0) {
+  if (getBlockStringIndentation(body) > 0) {
     body = '\n' + body;
   }
 

package/utilities/typeComparators.js

@@ -7,7 +7,7 @@ exports.isEqualType = isEqualType;
 exports.isTypeSubTypeOf = isTypeSubTypeOf;
 exports.doTypesOverlap = doTypesOverlap;
 
-var _definition = require("../type/definition");
+var _definition = require("../type/definition.js");
 
 /**
  * Provided two types, return true if the types are equal (invariant).

package/utilities/typeComparators.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import type { GraphQLSchema } from '../type/schema';
 import type { GraphQLType, GraphQLCompositeType } from '../type/definition';
 import {

package/utilities/typeFromAST.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.typeFromAST = typeFromAST;
 
-var _inspect = _interopRequireDefault(require("../jsutils/inspect"));
+var _inspect = _interopRequireDefault(require("../jsutils/inspect.js"));
 
-var _invariant = _interopRequireDefault(require("../jsutils/invariant"));
+var _invariant = _interopRequireDefault(require("../jsutils/invariant.js"));
 
-var _kinds = require("../language/kinds");
+var _kinds = require("../language/kinds.js");
 
-var _definition = require("../type/definition");
+var _definition = require("../type/definition.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -21,12 +21,12 @@ function typeFromAST(schema, typeNode) {
 
   if (typeNode.kind === _kinds.Kind.LIST_TYPE) {
     innerType = typeFromAST(schema, typeNode.type);
-    return innerType && (0, _definition.GraphQLList)(innerType);
+    return innerType && new _definition.GraphQLList(innerType);
   }
 
   if (typeNode.kind === _kinds.Kind.NON_NULL_TYPE) {
     innerType = typeFromAST(schema, typeNode.type);
-    return innerType && (0, _definition.GraphQLNonNull)(innerType);
+    return innerType && new _definition.GraphQLNonNull(innerType);
   } // istanbul ignore else (See: 'https://github.com/graphql/graphql-js/issues/2618')
 
 

package/utilities/typeFromAST.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import inspect from '../jsutils/inspect';
 import invariant from '../jsutils/invariant';
 
@@ -40,11 +39,11 @@ export function typeFromAST(schema, typeNode) {
   let innerType;
   if (typeNode.kind === Kind.LIST_TYPE) {
     innerType = typeFromAST(schema, typeNode.type);
-    return innerType && GraphQLList(innerType);
+    return innerType && new GraphQLList(innerType);
   }
   if (typeNode.kind === Kind.NON_NULL_TYPE) {
     innerType = typeFromAST(schema, typeNode.type);
-    return innerType && GraphQLNonNull(innerType);
+    return innerType && new GraphQLNonNull(innerType);
   }
   // istanbul ignore else (See: 'https://github.com/graphql/graphql-js/issues/2618')
   if (typeNode.kind === Kind.NAMED_TYPE) {

package/utilities/typeFromAST.mjs

@@ -18,12 +18,12 @@ export function typeFromAST(schema, typeNode) {
 
   if (typeNode.kind === Kind.LIST_TYPE) {
     innerType = typeFromAST(schema, typeNode.type);
-    return innerType && GraphQLList(innerType);
+    return innerType && new GraphQLList(innerType);
   }
 
   if (typeNode.kind === Kind.NON_NULL_TYPE) {
     innerType = typeFromAST(schema, typeNode.type);
-    return innerType && GraphQLNonNull(innerType);
+    return innerType && new GraphQLNonNull(innerType);
   } // istanbul ignore else (See: 'https://github.com/graphql/graphql-js/issues/2618')
 
 

package/utilities/typedQueryDocumentNode.d.ts

@@ -0,0 +1,20 @@
+import { DocumentNode, ExecutableDefinitionNode } from '../language/ast';
+
+/**
+ * Wrapper type that contains DocumentNode and types that can be deduced from it.
+ */
+export interface TypedQueryDocumentNode<
+  TResponseData = Record<string, any>,
+  TRequestVariables = Record<string, any>
+> extends DocumentNode {
+  readonly definitions: ReadonlyArray<ExecutableDefinitionNode>;
+  // FIXME: remove once TS implements proper way to enforce nominal typing
+  /**
+   * This type is used to ensure that the variables you pass in to the query are assignable to Variables
+   * and that the Result is assignable to whatever you pass your result to. The method is never actually
+   * implemented, but the type is valid because we list it as optional
+   */
+  __ensureTypesOfVariablesAndResultMatching?: (
+    variables: TRequestVariables,
+  ) => TResponseData;
+}

package/utilities/valueFromAST.js

@@ -5,17 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.valueFromAST = valueFromAST;
 
-var _objectValues3 = _interopRequireDefault(require("../polyfills/objectValues"));
+var _objectValues3 = _interopRequireDefault(require("../polyfills/objectValues.js"));
 
-var _keyMap = _interopRequireDefault(require("../jsutils/keyMap"));
+var _keyMap = _interopRequireDefault(require("../jsutils/keyMap.js"));
 
-var _inspect = _interopRequireDefault(require("../jsutils/inspect"));
+var _inspect = _interopRequireDefault(require("../jsutils/inspect.js"));
 
-var _invariant = _interopRequireDefault(require("../jsutils/invariant"));
+var _invariant = _interopRequireDefault(require("../jsutils/invariant.js"));
 
-var _kinds = require("../language/kinds");
+var _kinds = require("../language/kinds.js");
 
-var _definition = require("../type/definition");
+var _definition = require("../type/definition.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 

package/utilities/valueFromAST.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import objectValues from '../polyfills/objectValues';
 
 import type { ObjMap } from '../jsutils/ObjMap';
@@ -154,7 +153,10 @@ export function valueFromAST(
 
 // Returns true if the provided valueNode is a variable which is not defined
 // in the set of variables.
-function isMissingVariable(valueNode, variables) {
+function isMissingVariable(
+  valueNode: ValueNode,
+  variables: ?ObjMap<mixed>,
+): boolean {
   return (
     valueNode.kind === Kind.VARIABLE &&
     (variables == null || variables[valueNode.name.value] === undefined)

package/utilities/valueFromASTUntyped.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.valueFromASTUntyped = valueFromASTUntyped;
 
-var _inspect = _interopRequireDefault(require("../jsutils/inspect"));
+var _inspect = _interopRequireDefault(require("../jsutils/inspect.js"));
 
-var _invariant = _interopRequireDefault(require("../jsutils/invariant"));
+var _invariant = _interopRequireDefault(require("../jsutils/invariant.js"));
 
-var _keyValMap = _interopRequireDefault(require("../jsutils/keyValMap"));
+var _keyValMap = _interopRequireDefault(require("../jsutils/keyValMap.js"));
 
-var _kinds = require("../language/kinds");
+var _kinds = require("../language/kinds.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 

package/utilities/valueFromASTUntyped.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import type { ObjMap } from '../jsutils/ObjMap';
 import inspect from '../jsutils/inspect';
 import invariant from '../jsutils/invariant';

package/validation/ValidationContext.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ValidationContext = exports.SDLValidationContext = exports.ASTValidationContext = void 0;
 
-var _kinds = require("../language/kinds");
+var _kinds = require("../language/kinds.js");
 
-var _visitor = require("../language/visitor");
+var _visitor = require("../language/visitor.js");
 
-var _TypeInfo = require("../utilities/TypeInfo");
+var _TypeInfo = require("../utilities/TypeInfo.js");
 
 function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 

package/validation/ValidationContext.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import type { ObjMap } from '../jsutils/ObjMap';
 
 import type { GraphQLError } from '../error/GraphQLError';
@@ -52,7 +51,7 @@ export class ASTValidationContext {
     $ReadOnlyArray<FragmentDefinitionNode>,
   >;
 
-  constructor(ast: DocumentNode, onError: (err: GraphQLError) => void): void {
+  constructor(ast: DocumentNode, onError: (err: GraphQLError) => void) {
     this._ast = ast;
     this._fragments = undefined;
     this._fragmentSpreads = new Map();
@@ -143,7 +142,7 @@ export class SDLValidationContext extends ASTValidationContext {
     ast: DocumentNode,
     schema: ?GraphQLSchema,
     onError: (err: GraphQLError) => void,
-  ): void {
+  ) {
     super(ast, onError);
     this._schema = schema;
   }
@@ -169,7 +168,7 @@ export class ValidationContext extends ASTValidationContext {
     ast: DocumentNode,
     typeInfo: TypeInfo,
     onError: (err: GraphQLError) => void,
-  ): void {
+  ) {
     super(ast, onError);
     this._schema = schema;
     this._typeInfo = typeInfo;