graphql 15.2.0 → 15.5.0

package/utilities/findBreakingChanges.js.flow

@@ -1,10 +1,10 @@
 // @flow strict
-
 import objectValues from '../polyfills/objectValues';
 
 import keyMap from '../jsutils/keyMap';
 import inspect from '../jsutils/inspect';
 import invariant from '../jsutils/invariant';
+import naturalCompare from '../jsutils/naturalCompare';
 
 import { print } from '../language/printer';
 import { visit } from '../language/visitor';
@@ -543,8 +543,11 @@ function stringifyValue(value: mixed, type: GraphQLInputType): string {
 
   const sortedAST = visit(ast, {
     ObjectValue(objectNode) {
-      const fields = [...objectNode.fields].sort((fieldA, fieldB) =>
-        fieldA.name.value.localeCompare(fieldB.name.value),
+      // Make a copy since sort mutates array
+      const fields = [...objectNode.fields];
+
+      fields.sort((fieldA, fieldB) =>
+        naturalCompare(fieldA.name.value, fieldB.name.value),
       );
       return { ...objectNode, fields };
     },

package/utilities/findBreakingChanges.mjs

@@ -8,6 +8,7 @@ import objectValues from "../polyfills/objectValues.mjs";
 import keyMap from "../jsutils/keyMap.mjs";
 import inspect from "../jsutils/inspect.mjs";
 import invariant from "../jsutils/invariant.mjs";
+import naturalCompare from "../jsutils/naturalCompare.mjs";
 import { print } from "../language/printer.mjs";
 import { visit } from "../language/visitor.mjs";
 import { isSpecifiedScalarType } from "../type/scalars.mjs";
@@ -444,8 +445,10 @@ function stringifyValue(value, type) {
   ast != null || invariant(0);
   var sortedAST = visit(ast, {
     ObjectValue: function ObjectValue(objectNode) {
-      var fields = [].concat(objectNode.fields).sort(function (fieldA, fieldB) {
-        return fieldA.name.value.localeCompare(fieldB.name.value);
+      // Make a copy since sort mutates array
+      var fields = [].concat(objectNode.fields);
+      fields.sort(function (fieldA, fieldB) {
+        return naturalCompare(fieldA.name.value, fieldB.name.value);
       });
       return _objectSpread(_objectSpread({}, objectNode), {}, {
         fields: fields

package/utilities/findDeprecatedUsages.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.findDeprecatedUsages = findDeprecatedUsages;
 
-var _validate = require("../validation/validate");
+var _validate = require("../validation/validate.js");
 
-var _NoDeprecatedCustomRule = require("../validation/rules/custom/NoDeprecatedCustomRule");
+var _NoDeprecatedCustomRule = require("../validation/rules/custom/NoDeprecatedCustomRule.js");
 
 /**
  * A validation rule which reports deprecated usages.

package/utilities/findDeprecatedUsages.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import type { GraphQLError } from '../error/GraphQLError';
 
 import type { DocumentNode } from '../language/ast';

package/utilities/getIntrospectionQuery.d.ts

@@ -18,6 +18,10 @@ export interface IntrospectionOptions {
   // Whether to include `description` field on schema.
   // Default: false
   schemaDescription?: boolean;
+
+  // Whether target GraphQL server support deprecation of input values.
+  // Default: false
+  inputValueDeprecation?: boolean;
 }
 
 export function getIntrospectionQuery(options?: IntrospectionOptions): string;
@@ -169,6 +173,8 @@ export interface IntrospectionInputValue {
   readonly description?: Maybe<string>;
   readonly type: IntrospectionInputTypeRef;
   readonly defaultValue?: Maybe<string>;
+  readonly isDeprecated?: boolean;
+  readonly deprecationReason?: Maybe<string>;
 }
 
 export interface IntrospectionEnumValue {

package/utilities/getIntrospectionQuery.js

@@ -16,12 +16,18 @@ function getIntrospectionQuery(options) {
     descriptions: true,
     specifiedByUrl: false,
     directiveIsRepeatable: false,
-    schemaDescription: false
+    schemaDescription: false,
+    inputValueDeprecation: false
   }, options);
 
   var descriptions = optionsWithDefault.descriptions ? 'description' : '';
   var specifiedByUrl = optionsWithDefault.specifiedByUrl ? 'specifiedByUrl' : '';
   var directiveIsRepeatable = optionsWithDefault.directiveIsRepeatable ? 'isRepeatable' : '';
   var schemaDescription = optionsWithDefault.schemaDescription ? descriptions : '';
-  return "\n    query IntrospectionQuery {\n      __schema {\n        ".concat(schemaDescription, "\n        queryType { name }\n        mutationType { name }\n        subscriptionType { name }\n        types {\n          ...FullType\n        }\n        directives {\n          name\n          ").concat(descriptions, "\n          ").concat(directiveIsRepeatable, "\n          locations\n          args {\n            ...InputValue\n          }\n        }\n      }\n    }\n\n    fragment FullType on __Type {\n      kind\n      name\n      ").concat(descriptions, "\n      ").concat(specifiedByUrl, "\n      fields(includeDeprecated: true) {\n        name\n        ").concat(descriptions, "\n        args {\n          ...InputValue\n        }\n        type {\n          ...TypeRef\n        }\n        isDeprecated\n        deprecationReason\n      }\n      inputFields {\n        ...InputValue\n      }\n      interfaces {\n        ...TypeRef\n      }\n      enumValues(includeDeprecated: true) {\n        name\n        ").concat(descriptions, "\n        isDeprecated\n        deprecationReason\n      }\n      possibleTypes {\n        ...TypeRef\n      }\n    }\n\n    fragment InputValue on __InputValue {\n      name\n      ").concat(descriptions, "\n      type { ...TypeRef }\n      defaultValue\n    }\n\n    fragment TypeRef on __Type {\n      kind\n      name\n      ofType {\n        kind\n        name\n        ofType {\n          kind\n          name\n          ofType {\n            kind\n            name\n            ofType {\n              kind\n              name\n              ofType {\n                kind\n                name\n                ofType {\n                  kind\n                  name\n                  ofType {\n                    kind\n                    name\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  ");
+
+  function inputDeprecation(str) {
+    return optionsWithDefault.inputValueDeprecation ? str : '';
+  }
+
+  return "\n    query IntrospectionQuery {\n      __schema {\n        ".concat(schemaDescription, "\n        queryType { name }\n        mutationType { name }\n        subscriptionType { name }\n        types {\n          ...FullType\n        }\n        directives {\n          name\n          ").concat(descriptions, "\n          ").concat(directiveIsRepeatable, "\n          locations\n          args").concat(inputDeprecation('(includeDeprecated: true)'), " {\n            ...InputValue\n          }\n        }\n      }\n    }\n\n    fragment FullType on __Type {\n      kind\n      name\n      ").concat(descriptions, "\n      ").concat(specifiedByUrl, "\n      fields(includeDeprecated: true) {\n        name\n        ").concat(descriptions, "\n        args").concat(inputDeprecation('(includeDeprecated: true)'), " {\n          ...InputValue\n        }\n        type {\n          ...TypeRef\n        }\n        isDeprecated\n        deprecationReason\n      }\n      inputFields").concat(inputDeprecation('(includeDeprecated: true)'), " {\n        ...InputValue\n      }\n      interfaces {\n        ...TypeRef\n      }\n      enumValues(includeDeprecated: true) {\n        name\n        ").concat(descriptions, "\n        isDeprecated\n        deprecationReason\n      }\n      possibleTypes {\n        ...TypeRef\n      }\n    }\n\n    fragment InputValue on __InputValue {\n      name\n      ").concat(descriptions, "\n      type { ...TypeRef }\n      defaultValue\n      ").concat(inputDeprecation('isDeprecated'), "\n      ").concat(inputDeprecation('deprecationReason'), "\n    }\n\n    fragment TypeRef on __Type {\n      kind\n      name\n      ofType {\n        kind\n        name\n        ofType {\n          kind\n          name\n          ofType {\n            kind\n            name\n            ofType {\n              kind\n              name\n              ofType {\n                kind\n                name\n                ofType {\n                  kind\n                  name\n                  ofType {\n                    kind\n                    name\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  ");
 }

package/utilities/getIntrospectionQuery.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import type { DirectiveLocationEnum } from '../language/directiveLocation';
 
 export type IntrospectionOptions = {|
@@ -18,6 +17,10 @@ export type IntrospectionOptions = {|
   // Whether to include `description` field on schema.
   // Default: false
   schemaDescription?: boolean,
+
+  // Whether target GraphQL server support deprecation of input values.
+  // Default: false
+  inputValueDeprecation?: boolean,
 |};
 
 export function getIntrospectionQuery(options?: IntrospectionOptions): string {
@@ -26,6 +29,7 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
     specifiedByUrl: false,
     directiveIsRepeatable: false,
     schemaDescription: false,
+    inputValueDeprecation: false,
     ...options,
   };
 
@@ -40,6 +44,10 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
     ? descriptions
     : '';
 
+  function inputDeprecation(str) {
+    return optionsWithDefault.inputValueDeprecation ? str : '';
+  }
+
   return `
     query IntrospectionQuery {
       __schema {
@@ -55,7 +63,7 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
           ${descriptions}
           ${directiveIsRepeatable}
           locations
-          args {
+          args${inputDeprecation('(includeDeprecated: true)')} {
             ...InputValue
           }
         }
@@ -70,7 +78,7 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
       fields(includeDeprecated: true) {
         name
         ${descriptions}
-        args {
+        args${inputDeprecation('(includeDeprecated: true)')} {
           ...InputValue
         }
         type {
@@ -79,7 +87,7 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
         isDeprecated
         deprecationReason
       }
-      inputFields {
+      inputFields${inputDeprecation('(includeDeprecated: true)')} {
         ...InputValue
       }
       interfaces {
@@ -101,6 +109,8 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
       ${descriptions}
       type { ...TypeRef }
       defaultValue
+      ${inputDeprecation('isDeprecated')}
+      ${inputDeprecation('deprecationReason')}
     }
 
     fragment TypeRef on __Type {
@@ -175,7 +185,7 @@ export type IntrospectionScalarType = {|
   +kind: 'SCALAR',
   +name: string,
   +description?: ?string,
-  +specifiedByUrl: ?string,
+  +specifiedByUrl?: ?string,
 |};
 
 export type IntrospectionObjectType = {|
@@ -282,6 +292,8 @@ export type IntrospectionInputValue = {|
   +description?: ?string,
   +type: IntrospectionInputTypeRef,
   +defaultValue: ?string,
+  +isDeprecated?: boolean,
+  +deprecationReason?: ?string,
 |};
 
 export type IntrospectionEnumValue = {|

package/utilities/getIntrospectionQuery.mjs

@@ -9,12 +9,18 @@ export function getIntrospectionQuery(options) {
     descriptions: true,
     specifiedByUrl: false,
     directiveIsRepeatable: false,
-    schemaDescription: false
+    schemaDescription: false,
+    inputValueDeprecation: false
   }, options);
 
   var descriptions = optionsWithDefault.descriptions ? 'description' : '';
   var specifiedByUrl = optionsWithDefault.specifiedByUrl ? 'specifiedByUrl' : '';
   var directiveIsRepeatable = optionsWithDefault.directiveIsRepeatable ? 'isRepeatable' : '';
   var schemaDescription = optionsWithDefault.schemaDescription ? descriptions : '';
-  return "\n    query IntrospectionQuery {\n      __schema {\n        ".concat(schemaDescription, "\n        queryType { name }\n        mutationType { name }\n        subscriptionType { name }\n        types {\n          ...FullType\n        }\n        directives {\n          name\n          ").concat(descriptions, "\n          ").concat(directiveIsRepeatable, "\n          locations\n          args {\n            ...InputValue\n          }\n        }\n      }\n    }\n\n    fragment FullType on __Type {\n      kind\n      name\n      ").concat(descriptions, "\n      ").concat(specifiedByUrl, "\n      fields(includeDeprecated: true) {\n        name\n        ").concat(descriptions, "\n        args {\n          ...InputValue\n        }\n        type {\n          ...TypeRef\n        }\n        isDeprecated\n        deprecationReason\n      }\n      inputFields {\n        ...InputValue\n      }\n      interfaces {\n        ...TypeRef\n      }\n      enumValues(includeDeprecated: true) {\n        name\n        ").concat(descriptions, "\n        isDeprecated\n        deprecationReason\n      }\n      possibleTypes {\n        ...TypeRef\n      }\n    }\n\n    fragment InputValue on __InputValue {\n      name\n      ").concat(descriptions, "\n      type { ...TypeRef }\n      defaultValue\n    }\n\n    fragment TypeRef on __Type {\n      kind\n      name\n      ofType {\n        kind\n        name\n        ofType {\n          kind\n          name\n          ofType {\n            kind\n            name\n            ofType {\n              kind\n              name\n              ofType {\n                kind\n                name\n                ofType {\n                  kind\n                  name\n                  ofType {\n                    kind\n                    name\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  ");
+
+  function inputDeprecation(str) {
+    return optionsWithDefault.inputValueDeprecation ? str : '';
+  }
+
+  return "\n    query IntrospectionQuery {\n      __schema {\n        ".concat(schemaDescription, "\n        queryType { name }\n        mutationType { name }\n        subscriptionType { name }\n        types {\n          ...FullType\n        }\n        directives {\n          name\n          ").concat(descriptions, "\n          ").concat(directiveIsRepeatable, "\n          locations\n          args").concat(inputDeprecation('(includeDeprecated: true)'), " {\n            ...InputValue\n          }\n        }\n      }\n    }\n\n    fragment FullType on __Type {\n      kind\n      name\n      ").concat(descriptions, "\n      ").concat(specifiedByUrl, "\n      fields(includeDeprecated: true) {\n        name\n        ").concat(descriptions, "\n        args").concat(inputDeprecation('(includeDeprecated: true)'), " {\n          ...InputValue\n        }\n        type {\n          ...TypeRef\n        }\n        isDeprecated\n        deprecationReason\n      }\n      inputFields").concat(inputDeprecation('(includeDeprecated: true)'), " {\n        ...InputValue\n      }\n      interfaces {\n        ...TypeRef\n      }\n      enumValues(includeDeprecated: true) {\n        name\n        ").concat(descriptions, "\n        isDeprecated\n        deprecationReason\n      }\n      possibleTypes {\n        ...TypeRef\n      }\n    }\n\n    fragment InputValue on __InputValue {\n      name\n      ").concat(descriptions, "\n      type { ...TypeRef }\n      defaultValue\n      ").concat(inputDeprecation('isDeprecated'), "\n      ").concat(inputDeprecation('deprecationReason'), "\n    }\n\n    fragment TypeRef on __Type {\n      kind\n      name\n      ofType {\n        kind\n        name\n        ofType {\n          kind\n          name\n          ofType {\n            kind\n            name\n            ofType {\n              kind\n              name\n              ofType {\n                kind\n                name\n                ofType {\n                  kind\n                  name\n                  ofType {\n                    kind\n                    name\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  ");
 }

package/utilities/getOperationAST.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getOperationAST = getOperationAST;
 
-var _kinds = require("../language/kinds");
+var _kinds = require("../language/kinds.js");
 
 /**
  * Returns an operation AST given a document AST and optionally an operation

package/utilities/getOperationAST.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import type { DocumentNode, OperationDefinitionNode } from '../language/ast';
 import { Kind } from '../language/kinds';
 

package/utilities/getOperationRootType.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getOperationRootType = getOperationRootType;
 
-var _GraphQLError = require("../error/GraphQLError");
+var _GraphQLError = require("../error/GraphQLError.js");
 
 /**
  * Extracts the root type of the operation from the schema.

package/utilities/getOperationRootType.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 import { GraphQLError } from '../error/GraphQLError';
 
 import type {

package/utilities/index.d.ts

@@ -112,5 +112,8 @@ export {
   DangerousChange,
 } from './findBreakingChanges';
 
+// Wrapper type that contains DocumentNode and types that can be deduced from it.
+export { TypedQueryDocumentNode } from './typedQueryDocumentNode';
+
 // @deprecated: Report all deprecated usage within a GraphQL document.
 export { findDeprecatedUsages } from './findDeprecatedUsages';

package/utilities/index.js

@@ -202,46 +202,46 @@ Object.defineProperty(exports, "findDeprecatedUsages", {
   }
 });
 
-var _getIntrospectionQuery = require("./getIntrospectionQuery");
+var _getIntrospectionQuery = require("./getIntrospectionQuery.js");
 
-var _getOperationAST = require("./getOperationAST");
+var _getOperationAST = require("./getOperationAST.js");
 
-var _getOperationRootType = require("./getOperationRootType");
+var _getOperationRootType = require("./getOperationRootType.js");
 
-var _introspectionFromSchema = require("./introspectionFromSchema");
+var _introspectionFromSchema = require("./introspectionFromSchema.js");
 
-var _buildClientSchema = require("./buildClientSchema");
+var _buildClientSchema = require("./buildClientSchema.js");
 
-var _buildASTSchema = require("./buildASTSchema");
+var _buildASTSchema = require("./buildASTSchema.js");
 
-var _extendSchema = require("./extendSchema");
+var _extendSchema = require("./extendSchema.js");
 
-var _lexicographicSortSchema = require("./lexicographicSortSchema");
+var _lexicographicSortSchema = require("./lexicographicSortSchema.js");
 
-var _printSchema = require("./printSchema");
+var _printSchema = require("./printSchema.js");
 
-var _typeFromAST = require("./typeFromAST");
+var _typeFromAST = require("./typeFromAST.js");
 
-var _valueFromAST = require("./valueFromAST");
+var _valueFromAST = require("./valueFromAST.js");
 
-var _valueFromASTUntyped = require("./valueFromASTUntyped");
+var _valueFromASTUntyped = require("./valueFromASTUntyped.js");
 
-var _astFromValue = require("./astFromValue");
+var _astFromValue = require("./astFromValue.js");
 
-var _TypeInfo = require("./TypeInfo");
+var _TypeInfo = require("./TypeInfo.js");
 
-var _coerceInputValue = require("./coerceInputValue");
+var _coerceInputValue = require("./coerceInputValue.js");
 
-var _concatAST = require("./concatAST");
+var _concatAST = require("./concatAST.js");
 
-var _separateOperations = require("./separateOperations");
+var _separateOperations = require("./separateOperations.js");
 
-var _stripIgnoredCharacters = require("./stripIgnoredCharacters");
+var _stripIgnoredCharacters = require("./stripIgnoredCharacters.js");
 
-var _typeComparators = require("./typeComparators");
+var _typeComparators = require("./typeComparators.js");
 
-var _assertValidName = require("./assertValidName");
+var _assertValidName = require("./assertValidName.js");
 
-var _findBreakingChanges = require("./findBreakingChanges");
+var _findBreakingChanges = require("./findBreakingChanges.js");
 
-var _findDeprecatedUsages = require("./findDeprecatedUsages");
+var _findDeprecatedUsages = require("./findDeprecatedUsages.js");

package/utilities/index.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 // Produce the GraphQL query recommended for a full schema introspection.
 // Accepts optional IntrospectionOptions.
 export { getIntrospectionQuery } from './getIntrospectionQuery';

package/utilities/introspectionFromSchema.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.introspectionFromSchema = introspectionFromSchema;
 
-var _invariant = _interopRequireDefault(require("../jsutils/invariant"));
+var _invariant = _interopRequireDefault(require("../jsutils/invariant.js"));
 
-var _parser = require("../language/parser");
+var _parser = require("../language/parser.js");
 
-var _execute = require("../execution/execute");
+var _execute = require("../execution/execute.js");
 
-var _getIntrospectionQuery = require("./getIntrospectionQuery");
+var _getIntrospectionQuery = require("./getIntrospectionQuery.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -32,8 +32,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  */
 function introspectionFromSchema(schema, options) {
   var optionsWithDefaults = _objectSpread({
+    specifiedByUrl: true,
     directiveIsRepeatable: true,
-    schemaDescription: true
+    schemaDescription: true,
+    inputValueDeprecation: true
   }, options);
 
   var document = (0, _parser.parse)((0, _getIntrospectionQuery.getIntrospectionQuery)(optionsWithDefaults));

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);
   });
 }