graphql 15.4.0 → 15.5.3

package/utilities/getIntrospectionQuery.js.flow

@@ -17,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 {
@@ -25,6 +29,7 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
     specifiedByUrl: false,
     directiveIsRepeatable: false,
     schemaDescription: false,
+    inputValueDeprecation: false,
     ...options,
   };
 
@@ -39,6 +44,10 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
     ? descriptions
     : '';
 
+  function inputDeprecation(str) {
+    return optionsWithDefault.inputValueDeprecation ? str : '';
+  }
+
   return `
     query IntrospectionQuery {
       __schema {
@@ -54,7 +63,7 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
           ${descriptions}
           ${directiveIsRepeatable}
           locations
-          args {
+          args${inputDeprecation('(includeDeprecated: true)')} {
             ...InputValue
           }
         }
@@ -69,7 +78,7 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
       fields(includeDeprecated: true) {
         name
         ${descriptions}
-        args {
+        args${inputDeprecation('(includeDeprecated: true)')} {
           ...InputValue
         }
         type {
@@ -78,7 +87,7 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
         isDeprecated
         deprecationReason
       }
-      inputFields {
+      inputFields${inputDeprecation('(includeDeprecated: true)')} {
         ...InputValue
       }
       interfaces {
@@ -100,6 +109,8 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
       ${descriptions}
       type { ...TypeRef }
       defaultValue
+      ${inputDeprecation('isDeprecated')}
+      ${inputDeprecation('deprecationReason')}
     }
 
     fragment TypeRef on __Type {
@@ -281,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/introspectionFromSchema.js

@@ -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

@@ -27,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

@@ -13,6 +13,8 @@ var _invariant = _interopRequireDefault(require("../jsutils/invariant.js"));
 
 var _keyValMap = _interopRequireDefault(require("../jsutils/keyValMap.js"));
 
+var _naturalCompare = _interopRequireDefault(require("../jsutils/naturalCompare.js"));
+
 var _schema = require("../type/schema.js");
 
 var _directives = require("../type/directives.js");
@@ -195,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

@@ -5,6 +5,7 @@ import type { ObjMap } from '../jsutils/ObjMap';
 import inspect from '../jsutils/inspect';
 import invariant from '../jsutils/invariant';
 import keyValMap from '../jsutils/keyValMap';
+import naturalCompare from '../jsutils/naturalCompare';
 
 import type {
   GraphQLType,
@@ -110,7 +111,7 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
     return sortByName(arr).map(replaceNamedType);
   }
 
-  function sortNamedType<T: GraphQLNamedType>(type: T) {
+  function sortNamedType(type: GraphQLNamedType): GraphQLNamedType {
     if (isScalarType(type) || isIntrospectionType(type)) {
       return type;
     }
@@ -181,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,6 +8,7 @@ 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";
@@ -179,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/separateOperations.js

@@ -17,72 +17,76 @@ var _visitor = require("../language/visitor.js");
  */
 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;
+}

package/utilities/separateOperations.js.flow

@@ -1,7 +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';
 
@@ -14,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.
@@ -53,7 +56,7 @@ export function separateOperations(
         (node) =>
           node === operation ||
           (node.kind === Kind.FRAGMENT_DEFINITION &&
-            dependencies[node.name.value]),
+            dependencies.has(node.name.value)),
       ),
     };
   }
@@ -61,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/validation/ValidationContext.js.flow

@@ -51,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();
@@ -142,7 +142,7 @@ export class SDLValidationContext extends ASTValidationContext {
     ast: DocumentNode,
     schema: ?GraphQLSchema,
     onError: (err: GraphQLError) => void,
-  ): void {
+  ) {
     super(ast, onError);
     this._schema = schema;
   }
@@ -168,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;

package/validation/rules/FieldsOnCorrectTypeRule.js

@@ -11,6 +11,8 @@ var _didYouMean = _interopRequireDefault(require("../../jsutils/didYouMean.js"))
 
 var _suggestionList = _interopRequireDefault(require("../../jsutils/suggestionList.js"));
 
+var _naturalCompare = _interopRequireDefault(require("../../jsutils/naturalCompare.js"));
+
 var _GraphQLError = require("../../error/GraphQLError.js");
 
 var _definition = require("../../type/definition.js");
@@ -108,7 +110,7 @@ function getSuggestedTypeNames(schema, type, fieldName) {
       return 1;
     }
 
-    return typeA.name.localeCompare(typeB.name);
+    return (0, _naturalCompare.default)(typeA.name, typeB.name);
   }).map(function (x) {
     return x.name;
   });

package/validation/rules/FieldsOnCorrectTypeRule.js.flow

@@ -3,6 +3,7 @@ import arrayFrom from '../../polyfills/arrayFrom';
 
 import didYouMean from '../../jsutils/didYouMean';
 import suggestionList from '../../jsutils/suggestionList';
+import naturalCompare from '../../jsutils/naturalCompare';
 
 import { GraphQLError } from '../../error/GraphQLError';
 
@@ -123,7 +124,7 @@ function getSuggestedTypeNames(
         return 1;
       }
 
-      return typeA.name.localeCompare(typeB.name);
+      return naturalCompare(typeA.name, typeB.name);
     })
     .map((x) => x.name);
 }

package/validation/rules/FieldsOnCorrectTypeRule.mjs

@@ -1,6 +1,7 @@
 import arrayFrom from "../../polyfills/arrayFrom.mjs";
 import didYouMean from "../../jsutils/didYouMean.mjs";
 import suggestionList from "../../jsutils/suggestionList.mjs";
+import naturalCompare from "../../jsutils/naturalCompare.mjs";
 import { GraphQLError } from "../../error/GraphQLError.mjs";
 import { isObjectType, isInterfaceType, isAbstractType } from "../../type/definition.mjs";
 
@@ -94,7 +95,7 @@ function getSuggestedTypeNames(schema, type, fieldName) {
       return 1;
     }
 
-    return typeA.name.localeCompare(typeB.name);
+    return naturalCompare(typeA.name, typeB.name);
   }).map(function (x) {
     return x.name;
   });

package/validation/rules/UniqueDirectiveNamesRule.js

@@ -19,7 +19,7 @@ function UniqueDirectiveNamesRule(context) {
     DirectiveDefinition: function DirectiveDefinition(node) {
       var directiveName = node.name.value;
 
-      if (schema === null || schema === void 0 ? void 0 : schema.getDirective(directiveName)) {
+      if (schema !== null && schema !== void 0 && schema.getDirective(directiveName)) {
         context.reportError(new _GraphQLError.GraphQLError("Directive \"@".concat(directiveName, "\" already exists in the schema. It cannot be redefined."), node.name));
         return;
       }

package/validation/rules/UniqueDirectiveNamesRule.mjs

@@ -12,7 +12,7 @@ export function UniqueDirectiveNamesRule(context) {
     DirectiveDefinition: function DirectiveDefinition(node) {
       var directiveName = node.name.value;
 
-      if (schema === null || schema === void 0 ? void 0 : schema.getDirective(directiveName)) {
+      if (schema !== null && schema !== void 0 && schema.getDirective(directiveName)) {
         context.reportError(new GraphQLError("Directive \"@".concat(directiveName, "\" already exists in the schema. It cannot be redefined."), node.name));
         return;
       }