graphql 15.3.0 → 15.5.1

package/utilities/introspectionFromSchema.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import invariant from '../jsutils/invariant';
 
 import { parse } from '../language/parser';
@@ -28,8 +27,10 @@ export function introspectionFromSchema(
   options?: IntrospectionOptions,
 ): IntrospectionQuery {
   const optionsWithDefaults = {
+    specifiedByUrl: true,
     directiveIsRepeatable: true,
     schemaDescription: true,
+    inputValueDeprecation: true,
     ...options,
   };
 

package/utilities/introspectionFromSchema.mjs

@@ -20,8 +20,10 @@ import { getIntrospectionQuery } from "./getIntrospectionQuery.mjs";
 
 export function introspectionFromSchema(schema, options) {
   var optionsWithDefaults = _objectSpread({
+    specifiedByUrl: true,
     directiveIsRepeatable: true,
-    schemaDescription: true
+    schemaDescription: true,
+    inputValueDeprecation: true
   }, options);
 
   var document = parse(getIntrospectionQuery(optionsWithDefaults));

package/utilities/lexicographicSortSchema.js

@@ -5,21 +5,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.lexicographicSortSchema = lexicographicSortSchema;
 
-var _objectValues = _interopRequireDefault(require("../polyfills/objectValues"));
+var _objectValues = _interopRequireDefault(require("../polyfills/objectValues.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 _keyValMap = _interopRequireDefault(require("../jsutils/keyValMap"));
+var _keyValMap = _interopRequireDefault(require("../jsutils/keyValMap.js"));
 
-var _schema = require("../type/schema");
+var _naturalCompare = _interopRequireDefault(require("../jsutils/naturalCompare.js"));
 
-var _directives = require("../type/directives");
+var _schema = require("../type/schema.js");
 
-var _introspection = require("../type/introspection");
+var _directives = require("../type/directives.js");
 
-var _definition = require("../type/definition");
+var _introspection = require("../type/introspection.js");
+
+var _definition = require("../type/definition.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -49,8 +51,10 @@ function lexicographicSortSchema(schema) {
 
   function replaceType(type) {
     if ((0, _definition.isListType)(type)) {
+      // $FlowFixMe[incompatible-return]
       return new _definition.GraphQLList(replaceType(type.ofType));
     } else if ((0, _definition.isNonNullType)(type)) {
+      // $FlowFixMe[incompatible-return]
       return new _definition.GraphQLNonNull(replaceType(type.ofType));
     }
 
@@ -193,6 +197,6 @@ function sortBy(array, mapToKey) {
   return array.slice().sort(function (obj1, obj2) {
     var key1 = mapToKey(obj1);
     var key2 = mapToKey(obj2);
-    return key1.localeCompare(key2);
+    return (0, _naturalCompare.default)(key1, key2);
   });
 }

package/utilities/lexicographicSortSchema.js.flow

@@ -1,24 +1,30 @@
 // @flow strict
-
 import objectValues from '../polyfills/objectValues';
 
 import type { ObjMap } from '../jsutils/ObjMap';
 import inspect from '../jsutils/inspect';
 import invariant from '../jsutils/invariant';
 import keyValMap from '../jsutils/keyValMap';
-
-import type { GraphQLNamedType } from '../type/definition';
+import naturalCompare from '../jsutils/naturalCompare';
+
+import type {
+  GraphQLType,
+  GraphQLNamedType,
+  GraphQLFieldConfigMap,
+  GraphQLFieldConfigArgumentMap,
+  GraphQLInputFieldConfigMap,
+} from '../type/definition';
 import { GraphQLSchema } from '../type/schema';
 import { GraphQLDirective } from '../type/directives';
 import { isIntrospectionType } from '../type/introspection';
 import {
+  GraphQLList,
+  GraphQLNonNull,
   GraphQLObjectType,
   GraphQLInterfaceType,
   GraphQLUnionType,
   GraphQLEnumType,
   GraphQLInputObjectType,
-  GraphQLList,
-  GraphQLNonNull,
   isListType,
   isNonNullType,
   isScalarType,
@@ -51,10 +57,12 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
     subscription: replaceMaybeType(schemaConfig.subscription),
   });
 
-  function replaceType(type) {
+  function replaceType<T: GraphQLType>(type: T): T {
     if (isListType(type)) {
+      // $FlowFixMe[incompatible-return]
       return new GraphQLList(replaceType(type.ofType));
     } else if (isNonNullType(type)) {
+      // $FlowFixMe[incompatible-return]
       return new GraphQLNonNull(replaceType(type.ofType));
     }
     return replaceNamedType(type);
@@ -64,11 +72,11 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
     return ((typeMap[type.name]: any): T);
   }
 
-  function replaceMaybeType(maybeType) {
+  function replaceMaybeType<T: ?GraphQLNamedType>(maybeType: T): T {
     return maybeType && replaceNamedType(maybeType);
   }
 
-  function sortDirective(directive) {
+  function sortDirective(directive: GraphQLDirective) {
     const config = directive.toConfig();
     return new GraphQLDirective({
       ...config,
@@ -77,14 +85,14 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
     });
   }
 
-  function sortArgs(args) {
+  function sortArgs(args: GraphQLFieldConfigArgumentMap) {
     return sortObjMap(args, (arg) => ({
       ...arg,
       type: replaceType(arg.type),
     }));
   }
 
-  function sortFields(fieldsMap) {
+  function sortFields(fieldsMap: GraphQLFieldConfigMap<mixed, mixed>) {
     return sortObjMap(fieldsMap, (field) => ({
       ...field,
       type: replaceType(field.type),
@@ -92,7 +100,7 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
     }));
   }
 
-  function sortInputFields(fieldsMap) {
+  function sortInputFields(fieldsMap: GraphQLInputFieldConfigMap) {
     return sortObjMap(fieldsMap, (field) => ({
       ...field,
       type: replaceType(field.type),
@@ -103,7 +111,7 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
     return sortByName(arr).map(replaceNamedType);
   }
 
-  function sortNamedType(type) {
+  function sortNamedType(type: GraphQLNamedType): GraphQLNamedType {
     if (isScalarType(type) || isIntrospectionType(type)) {
       return type;
     }
@@ -174,6 +182,6 @@ function sortBy<T>(
   return array.slice().sort((obj1, obj2) => {
     const key1 = mapToKey(obj1);
     const key2 = mapToKey(obj2);
-    return key1.localeCompare(key2);
+    return naturalCompare(key1, key2);
   });
 }

package/utilities/lexicographicSortSchema.mjs

@@ -8,10 +8,11 @@ import objectValues from "../polyfills/objectValues.mjs";
 import inspect from "../jsutils/inspect.mjs";
 import invariant from "../jsutils/invariant.mjs";
 import keyValMap from "../jsutils/keyValMap.mjs";
+import naturalCompare from "../jsutils/naturalCompare.mjs";
 import { GraphQLSchema } from "../type/schema.mjs";
 import { GraphQLDirective } from "../type/directives.mjs";
 import { isIntrospectionType } from "../type/introspection.mjs";
-import { GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType, GraphQLList, GraphQLNonNull, isListType, isNonNullType, isScalarType, isObjectType, isInterfaceType, isUnionType, isEnumType, isInputObjectType } from "../type/definition.mjs";
+import { GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType, isListType, isNonNullType, isScalarType, isObjectType, isInterfaceType, isUnionType, isEnumType, isInputObjectType } from "../type/definition.mjs";
 /**
  * Sort GraphQLSchema.
  *
@@ -33,8 +34,10 @@ export function lexicographicSortSchema(schema) {
 
   function replaceType(type) {
     if (isListType(type)) {
+      // $FlowFixMe[incompatible-return]
       return new GraphQLList(replaceType(type.ofType));
     } else if (isNonNullType(type)) {
+      // $FlowFixMe[incompatible-return]
       return new GraphQLNonNull(replaceType(type.ofType));
     }
 
@@ -177,6 +180,6 @@ function sortBy(array, mapToKey) {
   return array.slice().sort(function (obj1, obj2) {
     var key1 = mapToKey(obj1);
     var key2 = mapToKey(obj2);
-    return key1.localeCompare(key2);
+    return naturalCompare(key1, key2);
   });
 }

package/utilities/printSchema.js

@@ -7,25 +7,25 @@ exports.printSchema = printSchema;
 exports.printIntrospectionSchema = printIntrospectionSchema;
 exports.printType = printType;
 
-var _objectValues = _interopRequireDefault(require("../polyfills/objectValues"));
+var _objectValues = _interopRequireDefault(require("../polyfills/objectValues.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 _printer = require("../language/printer");
+var _printer = require("../language/printer.js");
 
-var _blockString = require("../language/blockString");
+var _blockString = require("../language/blockString.js");
 
-var _introspection = require("../type/introspection");
+var _introspection = require("../type/introspection.js");
 
-var _scalars = require("../type/scalars");
+var _scalars = require("../type/scalars.js");
 
-var _directives = require("../type/directives");
+var _directives = require("../type/directives.js");
 
-var _definition = require("../type/definition");
+var _definition = require("../type/definition.js");
 
-var _astFromValue = require("./astFromValue");
+var _astFromValue = require("./astFromValue.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -179,7 +179,7 @@ function printUnion(type, options) {
 
 function printEnum(type, options) {
   var values = type.getValues().map(function (value, i) {
-    return printDescription(options, value, '  ', !i) + '  ' + value.name + printDeprecated(value);
+    return printDescription(options, value, '  ', !i) + '  ' + value.name + printDeprecated(value.deprecationReason);
   });
   return printDescription(options, type) + "enum ".concat(type.name) + printBlock(values);
 }
@@ -193,7 +193,7 @@ function printInputObject(type, options) {
 
 function printFields(options, type) {
   var fields = (0, _objectValues.default)(type.getFields()).map(function (f, i) {
-    return printDescription(options, f, '  ', !i) + '  ' + f.name + printArgs(options, f.args, '  ') + ': ' + String(f.type) + printDeprecated(f);
+    return printDescription(options, f, '  ', !i) + '  ' + f.name + printArgs(options, f.args, '  ') + ': ' + String(f.type) + printDeprecated(f.deprecationReason);
   });
   return printBlock(fields);
 }
@@ -229,19 +229,18 @@ function printInputValue(arg) {
     argDecl += " = ".concat((0, _printer.print)(defaultAST));
   }
 
-  return argDecl;
+  return argDecl + printDeprecated(arg.deprecationReason);
 }
 
 function printDirective(directive, options) {
   return printDescription(options, directive) + 'directive @' + directive.name + printArgs(options, directive.args) + (directive.isRepeatable ? ' repeatable' : '') + ' on ' + directive.locations.join(' | ');
 }
 
-function printDeprecated(fieldOrEnumVal) {
-  if (!fieldOrEnumVal.isDeprecated) {
+function printDeprecated(reason) {
+  if (reason == null) {
     return '';
   }
 
-  var reason = fieldOrEnumVal.deprecationReason;
   var reasonAST = (0, _astFromValue.astFromValue)(reason, _scalars.GraphQLString);
 
   if (reasonAST && reason !== _directives.DEFAULT_DEPRECATION_REASON) {

package/utilities/printSchema.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import objectValues from '../polyfills/objectValues';
 
 import inspect from '../jsutils/inspect';
@@ -12,6 +11,8 @@ import type { GraphQLSchema } from '../type/schema';
 import type { GraphQLDirective } from '../type/directives';
 import type {
   GraphQLNamedType,
+  GraphQLArgument,
+  GraphQLInputField,
   GraphQLScalarType,
   GraphQLEnumType,
   GraphQLObjectType,
@@ -232,7 +233,7 @@ function printEnum(type: GraphQLEnumType, options): string {
         printDescription(options, value, '  ', !i) +
         '  ' +
         value.name +
-        printDeprecated(value),
+        printDeprecated(value.deprecationReason),
     );
 
   return (
@@ -250,7 +251,10 @@ function printInputObject(type: GraphQLInputObjectType, options): string {
   );
 }
 
-function printFields(options, type) {
+function printFields(
+  options,
+  type: GraphQLObjectType | GraphQLInterfaceType,
+): string {
   const fields = objectValues(type.getFields()).map(
     (f, i) =>
       printDescription(options, f, '  ', !i) +
@@ -259,16 +263,20 @@ function printFields(options, type) {
       printArgs(options, f.args, '  ') +
       ': ' +
       String(f.type) +
-      printDeprecated(f),
+      printDeprecated(f.deprecationReason),
   );
   return printBlock(fields);
 }
 
-function printBlock(items) {
+function printBlock(items: $ReadOnlyArray<string>): string {
   return items.length !== 0 ? ' {\n' + items.join('\n') + '\n}' : '';
 }
 
-function printArgs(options, args, indentation = '') {
+function printArgs(
+  options,
+  args: Array<GraphQLArgument>,
+  indentation: string = '',
+): string {
   if (args.length === 0) {
     return '';
   }
@@ -295,16 +303,16 @@ function printArgs(options, args, indentation = '') {
   );
 }
 
-function printInputValue(arg) {
+function printInputValue(arg: GraphQLInputField): string {
   const defaultAST = astFromValue(arg.defaultValue, arg.type);
   let argDecl = arg.name + ': ' + String(arg.type);
   if (defaultAST) {
     argDecl += ` = ${print(defaultAST)}`;
   }
-  return argDecl;
+  return argDecl + printDeprecated(arg.deprecationReason);
 }
 
-function printDirective(directive, options) {
+function printDirective(directive: GraphQLDirective, options): string {
   return (
     printDescription(options, directive) +
     'directive @' +
@@ -316,11 +324,10 @@ function printDirective(directive, options) {
   );
 }
 
-function printDeprecated(fieldOrEnumVal) {
-  if (!fieldOrEnumVal.isDeprecated) {
+function printDeprecated(reason: ?string): string {
+  if (reason == null) {
     return '';
   }
-  const reason = fieldOrEnumVal.deprecationReason;
   const reasonAST = astFromValue(reason, GraphQLString);
   if (reasonAST && reason !== DEFAULT_DEPRECATION_REASON) {
     return ' @deprecated(reason: ' + print(reasonAST) + ')';
@@ -328,7 +335,7 @@ function printDeprecated(fieldOrEnumVal) {
   return ' @deprecated';
 }
 
-function printSpecifiedByUrl(scalar: GraphQLScalarType) {
+function printSpecifiedByUrl(scalar: GraphQLScalarType): string {
   if (scalar.specifiedByUrl == null) {
     return '';
   }
@@ -343,9 +350,9 @@ function printSpecifiedByUrl(scalar: GraphQLScalarType) {
 
 function printDescription(
   options,
-  def,
-  indentation = '',
-  firstInBlock = true,
+  def: { +description: ?string, ... },
+  indentation: string = '',
+  firstInBlock: boolean = true,
 ): string {
   const { description } = def;
   if (description == null) {

package/utilities/printSchema.mjs

@@ -158,7 +158,7 @@ function printUnion(type, options) {
 
 function printEnum(type, options) {
   var values = type.getValues().map(function (value, i) {
-    return printDescription(options, value, '  ', !i) + '  ' + value.name + printDeprecated(value);
+    return printDescription(options, value, '  ', !i) + '  ' + value.name + printDeprecated(value.deprecationReason);
   });
   return printDescription(options, type) + "enum ".concat(type.name) + printBlock(values);
 }
@@ -172,7 +172,7 @@ function printInputObject(type, options) {
 
 function printFields(options, type) {
   var fields = objectValues(type.getFields()).map(function (f, i) {
-    return printDescription(options, f, '  ', !i) + '  ' + f.name + printArgs(options, f.args, '  ') + ': ' + String(f.type) + printDeprecated(f);
+    return printDescription(options, f, '  ', !i) + '  ' + f.name + printArgs(options, f.args, '  ') + ': ' + String(f.type) + printDeprecated(f.deprecationReason);
   });
   return printBlock(fields);
 }
@@ -208,19 +208,18 @@ function printInputValue(arg) {
     argDecl += " = ".concat(print(defaultAST));
   }
 
-  return argDecl;
+  return argDecl + printDeprecated(arg.deprecationReason);
 }
 
 function printDirective(directive, options) {
   return printDescription(options, directive) + 'directive @' + directive.name + printArgs(options, directive.args) + (directive.isRepeatable ? ' repeatable' : '') + ' on ' + directive.locations.join(' | ');
 }
 
-function printDeprecated(fieldOrEnumVal) {
-  if (!fieldOrEnumVal.isDeprecated) {
+function printDeprecated(reason) {
+  if (reason == null) {
     return '';
   }
 
-  var reason = fieldOrEnumVal.deprecationReason;
   var reasonAST = astFromValue(reason, GraphQLString);
 
   if (reasonAST && reason !== DEFAULT_DEPRECATION_REASON) {

package/utilities/separateOperations.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.separateOperations = separateOperations;
 
-var _kinds = require("../language/kinds");
+var _kinds = require("../language/kinds.js");
 
-var _visitor = require("../language/visitor");
+var _visitor = require("../language/visitor.js");
 
 /**
  * separateOperations accepts a single AST document which may contain many
@@ -17,72 +17,76 @@ var _visitor = require("../language/visitor");
  */
 function separateOperations(documentAST) {
   var operations = [];
-  var depGraph = Object.create(null);
-  var fromName; // Populate metadata and build a dependency graph.
-
-  (0, _visitor.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 _kinds.Kind.OPERATION_DEFINITION:
+        operations.push(definitionNode);
+        break;
+
+      case _kinds.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: _kinds.Kind.DOCUMENT,
       definitions: documentAST.definitions.filter(function (node) {
-        return node === operation || node.kind === _kinds.Kind.FRAGMENT_DEFINITION && dependencies[node.name.value];
+        return node === operation || node.kind === _kinds.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 = [];
+  (0, _visitor.visit)(selectionSet, {
+    FragmentSpread: function FragmentSpread(node) {
+      dependencies.push(node.name.value);
+    }
+  });
+  return dependencies;
+}