graphql 16.2.0 → 16.3.0

package/validation/rules/OverlappingFieldsCanBeMergedRule.js

@@ -15,6 +15,8 @@ var _printer = require('../../language/printer.js');
 
 var _definition = require('../../type/definition.js');
 
+var _sortValueNode = require('../../utilities/sortValueNode.js');
+
 var _typeFromAST = require('../../utilities/typeFromAST.js');
 
 function reasonMessage(reason) {
@@ -227,6 +229,22 @@ function collectConflictsBetweenFieldsAndFragment(
   // and any fragment names found in the given fragment.
 
   for (const referencedFragmentName of referencedFragmentNames) {
+    // Memoize so two fragments are not compared for conflicts more than once.
+    if (
+      comparedFragmentPairs.has(
+        referencedFragmentName,
+        fragmentName,
+        areMutuallyExclusive,
+      )
+    ) {
+      continue;
+    }
+
+    comparedFragmentPairs.add(
+      referencedFragmentName,
+      fragmentName,
+      areMutuallyExclusive,
+    );
     collectConflictsBetweenFieldsAndFragment(
       context,
       conflicts,
@@ -511,8 +529,6 @@ function findConflict(
       (0, _definition.isObjectType)(parentType2));
 
   if (!areMutuallyExclusive) {
-    var _node1$arguments, _node2$arguments;
-
     // Two aliases must refer to the same field.
     const name1 = node1.name.value;
     const name2 = node2.name.value;
@@ -523,22 +539,9 @@ function findConflict(
         [node1],
         [node2],
       ];
-    } // FIXME https://github.com/graphql/graphql-js/issues/2203
-
-    const args1 =
-      /* c8 ignore next */
-      (_node1$arguments = node1.arguments) !== null &&
-      _node1$arguments !== void 0
-        ? _node1$arguments
-        : [];
-    const args2 =
-      /* c8 ignore next */
-      (_node2$arguments = node2.arguments) !== null &&
-      _node2$arguments !== void 0
-        ? _node2$arguments
-        : []; // Two field calls must have the same arguments.
-
-    if (!sameArguments(args1, args2)) {
+    } // Two field calls must have the same arguments.
+
+    if (stringifyArguments(node1) !== stringifyArguments(node2)) {
       return [
         [responseName, 'they have differing arguments'],
         [node1],
@@ -583,26 +586,27 @@ function findConflict(
   }
 }
 
-function sameArguments(arguments1, arguments2) {
-  if (arguments1.length !== arguments2.length) {
-    return false;
-  }
-
-  return arguments1.every((argument1) => {
-    const argument2 = arguments2.find(
-      (argument) => argument.name.value === argument1.name.value,
-    );
-
-    if (!argument2) {
-      return false;
-    }
-
-    return sameValue(argument1.value, argument2.value);
-  });
-}
-
-function sameValue(value1, value2) {
-  return (0, _printer.print)(value1) === (0, _printer.print)(value2);
+function stringifyArguments(fieldNode) {
+  var _fieldNode$arguments;
+
+  // FIXME https://github.com/graphql/graphql-js/issues/2203
+  const args =
+    /* c8 ignore next */
+    (_fieldNode$arguments = fieldNode.arguments) !== null &&
+    _fieldNode$arguments !== void 0
+      ? _fieldNode$arguments
+      : [];
+  const inputObjectWithArgs = {
+    kind: _kinds.Kind.OBJECT,
+    fields: args.map((argNode) => ({
+      kind: _kinds.Kind.OBJECT_FIELD,
+      name: argNode.name,
+      value: argNode.value,
+    })),
+  };
+  return (0, _printer.print)(
+    (0, _sortValueNode.sortValueNode)(inputObjectWithArgs),
+  );
 } // Two types conflict if both types could not apply to a value simultaneously.
 // Composite types are ignored as their individual field types will be compared
 // later recursively. However List and Non-Null types must match.

package/validation/rules/OverlappingFieldsCanBeMergedRule.mjs

@@ -4,12 +4,13 @@ import { Kind } from '../../language/kinds.mjs';
 import { print } from '../../language/printer.mjs';
 import {
   getNamedType,
-  isNonNullType,
+  isInterfaceType,
   isLeafType,
-  isObjectType,
   isListType,
-  isInterfaceType,
+  isNonNullType,
+  isObjectType,
 } from '../../type/definition.mjs';
+import { sortValueNode } from '../../utilities/sortValueNode.mjs';
 import { typeFromAST } from '../../utilities/typeFromAST.mjs';
 
 function reasonMessage(reason) {
@@ -222,6 +223,22 @@ function collectConflictsBetweenFieldsAndFragment(
   // and any fragment names found in the given fragment.
 
   for (const referencedFragmentName of referencedFragmentNames) {
+    // Memoize so two fragments are not compared for conflicts more than once.
+    if (
+      comparedFragmentPairs.has(
+        referencedFragmentName,
+        fragmentName,
+        areMutuallyExclusive,
+      )
+    ) {
+      continue;
+    }
+
+    comparedFragmentPairs.add(
+      referencedFragmentName,
+      fragmentName,
+      areMutuallyExclusive,
+    );
     collectConflictsBetweenFieldsAndFragment(
       context,
       conflicts,
@@ -506,8 +523,6 @@ function findConflict(
       isObjectType(parentType2));
 
   if (!areMutuallyExclusive) {
-    var _node1$arguments, _node2$arguments;
-
     // Two aliases must refer to the same field.
     const name1 = node1.name.value;
     const name2 = node2.name.value;
@@ -518,22 +533,9 @@ function findConflict(
         [node1],
         [node2],
       ];
-    } // FIXME https://github.com/graphql/graphql-js/issues/2203
-
-    const args1 =
-      /* c8 ignore next */
-      (_node1$arguments = node1.arguments) !== null &&
-      _node1$arguments !== void 0
-        ? _node1$arguments
-        : [];
-    const args2 =
-      /* c8 ignore next */
-      (_node2$arguments = node2.arguments) !== null &&
-      _node2$arguments !== void 0
-        ? _node2$arguments
-        : []; // Two field calls must have the same arguments.
-
-    if (!sameArguments(args1, args2)) {
+    } // Two field calls must have the same arguments.
+
+    if (stringifyArguments(node1) !== stringifyArguments(node2)) {
       return [
         [responseName, 'they have differing arguments'],
         [node1],
@@ -578,26 +580,25 @@ function findConflict(
   }
 }
 
-function sameArguments(arguments1, arguments2) {
-  if (arguments1.length !== arguments2.length) {
-    return false;
-  }
-
-  return arguments1.every((argument1) => {
-    const argument2 = arguments2.find(
-      (argument) => argument.name.value === argument1.name.value,
-    );
-
-    if (!argument2) {
-      return false;
-    }
-
-    return sameValue(argument1.value, argument2.value);
-  });
-}
-
-function sameValue(value1, value2) {
-  return print(value1) === print(value2);
+function stringifyArguments(fieldNode) {
+  var _fieldNode$arguments;
+
+  // FIXME https://github.com/graphql/graphql-js/issues/2203
+  const args =
+    /* c8 ignore next */
+    (_fieldNode$arguments = fieldNode.arguments) !== null &&
+    _fieldNode$arguments !== void 0
+      ? _fieldNode$arguments
+      : [];
+  const inputObjectWithArgs = {
+    kind: Kind.OBJECT,
+    fields: args.map((argNode) => ({
+      kind: Kind.OBJECT_FIELD,
+      name: argNode.name,
+      value: argNode.value,
+    })),
+  };
+  return print(sortValueNode(inputObjectWithArgs));
 } // Two types conflict if both types could not apply to a value simultaneously.
 // Composite types are ignored as their individual field types will be compared
 // later recursively. However List and Non-Null types must match.

package/validation/rules/PossibleFragmentSpreadsRule.js

@@ -11,10 +11,10 @@ var _GraphQLError = require('../../error/GraphQLError.js');
 
 var _definition = require('../../type/definition.js');
 
-var _typeFromAST = require('../../utilities/typeFromAST.js');
-
 var _typeComparators = require('../../utilities/typeComparators.js');
 
+var _typeFromAST = require('../../utilities/typeFromAST.js');
+
 /**
  * Possible fragment spread
  *

package/validation/rules/PossibleFragmentSpreadsRule.mjs

@@ -1,8 +1,8 @@
 import { inspect } from '../../jsutils/inspect.mjs';
 import { GraphQLError } from '../../error/GraphQLError.mjs';
 import { isCompositeType } from '../../type/definition.mjs';
-import { typeFromAST } from '../../utilities/typeFromAST.mjs';
 import { doTypesOverlap } from '../../utilities/typeComparators.mjs';
+import { typeFromAST } from '../../utilities/typeFromAST.mjs';
 
 /**
  * Possible fragment spread

package/validation/rules/PossibleTypeExtensionsRule.js

@@ -5,12 +5,12 @@ Object.defineProperty(exports, '__esModule', {
 });
 exports.PossibleTypeExtensionsRule = PossibleTypeExtensionsRule;
 
+var _didYouMean = require('../../jsutils/didYouMean.js');
+
 var _inspect = require('../../jsutils/inspect.js');
 
 var _invariant = require('../../jsutils/invariant.js');
 
-var _didYouMean = require('../../jsutils/didYouMean.js');
-
 var _suggestionList = require('../../jsutils/suggestionList.js');
 
 var _GraphQLError = require('../../error/GraphQLError.js');

package/validation/rules/PossibleTypeExtensionsRule.mjs

@@ -1,17 +1,17 @@
+import { didYouMean } from '../../jsutils/didYouMean.mjs';
 import { inspect } from '../../jsutils/inspect.mjs';
 import { invariant } from '../../jsutils/invariant.mjs';
-import { didYouMean } from '../../jsutils/didYouMean.mjs';
 import { suggestionList } from '../../jsutils/suggestionList.mjs';
 import { GraphQLError } from '../../error/GraphQLError.mjs';
 import { Kind } from '../../language/kinds.mjs';
 import { isTypeDefinitionNode } from '../../language/predicates.mjs';
 import {
-  isScalarType,
-  isObjectType,
-  isInterfaceType,
-  isUnionType,
   isEnumType,
   isInputObjectType,
+  isInterfaceType,
+  isObjectType,
+  isScalarType,
+  isUnionType,
 } from '../../type/definition.mjs';
 
 /**

package/validation/rules/ProvidedRequiredArgumentsRule.d.ts

@@ -1,7 +1,7 @@
 import type { ASTVisitor } from '../../language/visitor';
 import type {
-  ValidationContext,
   SDLValidationContext,
+  ValidationContext,
 } from '../ValidationContext';
 /**
  * Provided required arguments

package/validation/rules/ProvidedRequiredArgumentsRule.js

@@ -17,10 +17,10 @@ var _kinds = require('../../language/kinds.js');
 
 var _printer = require('../../language/printer.js');
 
-var _directives = require('../../type/directives.js');
-
 var _definition = require('../../type/definition.js');
 
+var _directives = require('../../type/directives.js');
+
 /**
  * Provided required arguments
  *

package/validation/rules/ProvidedRequiredArgumentsRule.mjs

@@ -3,8 +3,8 @@ import { keyMap } from '../../jsutils/keyMap.mjs';
 import { GraphQLError } from '../../error/GraphQLError.mjs';
 import { Kind } from '../../language/kinds.mjs';
 import { print } from '../../language/printer.mjs';
+import { isRequiredArgument, isType } from '../../type/definition.mjs';
 import { specifiedDirectives } from '../../type/directives.mjs';
-import { isType, isRequiredArgument } from '../../type/definition.mjs';
 
 /**
  * Provided required arguments

package/validation/rules/UniqueFieldDefinitionNamesRule.mjs

@@ -1,8 +1,8 @@
 import { GraphQLError } from '../../error/GraphQLError.mjs';
 import {
-  isObjectType,
-  isInterfaceType,
   isInputObjectType,
+  isInterfaceType,
+  isObjectType,
 } from '../../type/definition.mjs';
 
 /**

package/validation/rules/ValuesOfCorrectTypeRule.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, '__esModule', {
 });
 exports.ValuesOfCorrectTypeRule = ValuesOfCorrectTypeRule;
 
-var _keyMap = require('../../jsutils/keyMap.js');
+var _didYouMean = require('../../jsutils/didYouMean.js');
 
 var _inspect = require('../../jsutils/inspect.js');
 
-var _didYouMean = require('../../jsutils/didYouMean.js');
+var _keyMap = require('../../jsutils/keyMap.js');
 
 var _suggestionList = require('../../jsutils/suggestionList.js');
 

package/validation/rules/ValuesOfCorrectTypeRule.mjs

@@ -1,17 +1,17 @@
-import { keyMap } from '../../jsutils/keyMap.mjs';
-import { inspect } from '../../jsutils/inspect.mjs';
 import { didYouMean } from '../../jsutils/didYouMean.mjs';
+import { inspect } from '../../jsutils/inspect.mjs';
+import { keyMap } from '../../jsutils/keyMap.mjs';
 import { suggestionList } from '../../jsutils/suggestionList.mjs';
 import { GraphQLError } from '../../error/GraphQLError.mjs';
 import { print } from '../../language/printer.mjs';
 import {
-  isLeafType,
+  getNamedType,
+  getNullableType,
   isInputObjectType,
+  isLeafType,
   isListType,
   isNonNullType,
   isRequiredInputField,
-  getNullableType,
-  getNamedType,
 } from '../../type/definition.mjs';
 
 /**

package/validation/rules/VariablesInAllowedPositionRule.js

@@ -13,10 +13,10 @@ var _kinds = require('../../language/kinds.js');
 
 var _definition = require('../../type/definition.js');
 
-var _typeFromAST = require('../../utilities/typeFromAST.js');
-
 var _typeComparators = require('../../utilities/typeComparators.js');
 
+var _typeFromAST = require('../../utilities/typeFromAST.js');
+
 /**
  * Variables in allowed position
  *

package/validation/rules/VariablesInAllowedPositionRule.mjs

@@ -2,8 +2,8 @@ import { inspect } from '../../jsutils/inspect.mjs';
 import { GraphQLError } from '../../error/GraphQLError.mjs';
 import { Kind } from '../../language/kinds.mjs';
 import { isNonNullType } from '../../type/definition.mjs';
-import { typeFromAST } from '../../utilities/typeFromAST.mjs';
 import { isTypeSubTypeOf } from '../../utilities/typeComparators.mjs';
+import { typeFromAST } from '../../utilities/typeFromAST.mjs';
 
 /**
  * Variables in allowed position

package/validation/specifiedRules.d.ts

@@ -1,4 +1,4 @@
-import type { ValidationRule, SDLValidationRule } from './ValidationContext';
+import type { SDLValidationRule, ValidationRule } from './ValidationContext';
 /**
  * This set includes all validation rules defined by the GraphQL spec.
  *

package/validation/specifiedRules.js

@@ -7,99 +7,99 @@ exports.specifiedSDLRules = exports.specifiedRules = void 0;
 
 var _ExecutableDefinitionsRule = require('./rules/ExecutableDefinitionsRule.js');
 
-var _UniqueOperationNamesRule = require('./rules/UniqueOperationNamesRule.js');
+var _FieldsOnCorrectTypeRule = require('./rules/FieldsOnCorrectTypeRule.js');
 
-var _LoneAnonymousOperationRule = require('./rules/LoneAnonymousOperationRule.js');
+var _FragmentsOnCompositeTypesRule = require('./rules/FragmentsOnCompositeTypesRule.js');
 
-var _SingleFieldSubscriptionsRule = require('./rules/SingleFieldSubscriptionsRule.js');
+var _KnownArgumentNamesRule = require('./rules/KnownArgumentNamesRule.js');
 
-var _KnownTypeNamesRule = require('./rules/KnownTypeNamesRule.js');
+var _KnownDirectivesRule = require('./rules/KnownDirectivesRule.js');
 
-var _FragmentsOnCompositeTypesRule = require('./rules/FragmentsOnCompositeTypesRule.js');
+var _KnownFragmentNamesRule = require('./rules/KnownFragmentNamesRule.js');
 
-var _VariablesAreInputTypesRule = require('./rules/VariablesAreInputTypesRule.js');
+var _KnownTypeNamesRule = require('./rules/KnownTypeNamesRule.js');
 
-var _ScalarLeafsRule = require('./rules/ScalarLeafsRule.js');
+var _LoneAnonymousOperationRule = require('./rules/LoneAnonymousOperationRule.js');
 
-var _FieldsOnCorrectTypeRule = require('./rules/FieldsOnCorrectTypeRule.js');
+var _LoneSchemaDefinitionRule = require('./rules/LoneSchemaDefinitionRule.js');
 
-var _UniqueFragmentNamesRule = require('./rules/UniqueFragmentNamesRule.js');
+var _NoFragmentCyclesRule = require('./rules/NoFragmentCyclesRule.js');
 
-var _KnownFragmentNamesRule = require('./rules/KnownFragmentNamesRule.js');
+var _NoUndefinedVariablesRule = require('./rules/NoUndefinedVariablesRule.js');
 
 var _NoUnusedFragmentsRule = require('./rules/NoUnusedFragmentsRule.js');
 
-var _PossibleFragmentSpreadsRule = require('./rules/PossibleFragmentSpreadsRule.js');
+var _NoUnusedVariablesRule = require('./rules/NoUnusedVariablesRule.js');
 
-var _NoFragmentCyclesRule = require('./rules/NoFragmentCyclesRule.js');
+var _OverlappingFieldsCanBeMergedRule = require('./rules/OverlappingFieldsCanBeMergedRule.js');
 
-var _UniqueVariableNamesRule = require('./rules/UniqueVariableNamesRule.js');
+var _PossibleFragmentSpreadsRule = require('./rules/PossibleFragmentSpreadsRule.js');
 
-var _NoUndefinedVariablesRule = require('./rules/NoUndefinedVariablesRule.js');
+var _PossibleTypeExtensionsRule = require('./rules/PossibleTypeExtensionsRule.js');
 
-var _NoUnusedVariablesRule = require('./rules/NoUnusedVariablesRule.js');
+var _ProvidedRequiredArgumentsRule = require('./rules/ProvidedRequiredArgumentsRule.js');
 
-var _KnownDirectivesRule = require('./rules/KnownDirectivesRule.js');
+var _ScalarLeafsRule = require('./rules/ScalarLeafsRule.js');
 
-var _UniqueDirectivesPerLocationRule = require('./rules/UniqueDirectivesPerLocationRule.js');
+var _SingleFieldSubscriptionsRule = require('./rules/SingleFieldSubscriptionsRule.js');
 
-var _KnownArgumentNamesRule = require('./rules/KnownArgumentNamesRule.js');
+var _UniqueArgumentDefinitionNamesRule = require('./rules/UniqueArgumentDefinitionNamesRule.js');
 
 var _UniqueArgumentNamesRule = require('./rules/UniqueArgumentNamesRule.js');
 
-var _ValuesOfCorrectTypeRule = require('./rules/ValuesOfCorrectTypeRule.js');
+var _UniqueDirectiveNamesRule = require('./rules/UniqueDirectiveNamesRule.js');
 
-var _ProvidedRequiredArgumentsRule = require('./rules/ProvidedRequiredArgumentsRule.js');
+var _UniqueDirectivesPerLocationRule = require('./rules/UniqueDirectivesPerLocationRule.js');
 
-var _VariablesInAllowedPositionRule = require('./rules/VariablesInAllowedPositionRule.js');
+var _UniqueEnumValueNamesRule = require('./rules/UniqueEnumValueNamesRule.js');
 
-var _OverlappingFieldsCanBeMergedRule = require('./rules/OverlappingFieldsCanBeMergedRule.js');
+var _UniqueFieldDefinitionNamesRule = require('./rules/UniqueFieldDefinitionNamesRule.js');
+
+var _UniqueFragmentNamesRule = require('./rules/UniqueFragmentNamesRule.js');
 
 var _UniqueInputFieldNamesRule = require('./rules/UniqueInputFieldNamesRule.js');
 
-var _LoneSchemaDefinitionRule = require('./rules/LoneSchemaDefinitionRule.js');
+var _UniqueOperationNamesRule = require('./rules/UniqueOperationNamesRule.js');
 
 var _UniqueOperationTypesRule = require('./rules/UniqueOperationTypesRule.js');
 
 var _UniqueTypeNamesRule = require('./rules/UniqueTypeNamesRule.js');
 
-var _UniqueEnumValueNamesRule = require('./rules/UniqueEnumValueNamesRule.js');
-
-var _UniqueFieldDefinitionNamesRule = require('./rules/UniqueFieldDefinitionNamesRule.js');
+var _UniqueVariableNamesRule = require('./rules/UniqueVariableNamesRule.js');
 
-var _UniqueArgumentDefinitionNamesRule = require('./rules/UniqueArgumentDefinitionNamesRule.js');
+var _ValuesOfCorrectTypeRule = require('./rules/ValuesOfCorrectTypeRule.js');
 
-var _UniqueDirectiveNamesRule = require('./rules/UniqueDirectiveNamesRule.js');
+var _VariablesAreInputTypesRule = require('./rules/VariablesAreInputTypesRule.js');
 
-var _PossibleTypeExtensionsRule = require('./rules/PossibleTypeExtensionsRule.js');
+var _VariablesInAllowedPositionRule = require('./rules/VariablesInAllowedPositionRule.js');
 
 // Spec Section: "Executable Definitions"
-// Spec Section: "Operation Name Uniqueness"
-// Spec Section: "Lone Anonymous Operation"
-// Spec Section: "Subscriptions with Single Root Field"
-// Spec Section: "Fragment Spread Type Existence"
-// Spec Section: "Fragments on Composite Types"
-// Spec Section: "Variables are Input Types"
-// Spec Section: "Leaf Field Selections"
 // Spec Section: "Field Selections on Objects, Interfaces, and Unions Types"
-// Spec Section: "Fragment Name Uniqueness"
+// Spec Section: "Fragments on Composite Types"
+// Spec Section: "Argument Names"
+// Spec Section: "Directives Are Defined"
 // Spec Section: "Fragment spread target defined"
-// Spec Section: "Fragments must be used"
-// Spec Section: "Fragment spread is possible"
+// Spec Section: "Fragment Spread Type Existence"
+// Spec Section: "Lone Anonymous Operation"
+// SDL-specific validation rules
 // Spec Section: "Fragments must not form cycles"
-// Spec Section: "Variable Uniqueness"
 // Spec Section: "All Variable Used Defined"
+// Spec Section: "Fragments must be used"
 // Spec Section: "All Variables Used"
-// Spec Section: "Directives Are Defined"
-// Spec Section: "Directives Are Unique Per Location"
-// Spec Section: "Argument Names"
+// Spec Section: "Field Selection Merging"
+// Spec Section: "Fragment spread is possible"
+// Spec Section: "Argument Optionality"
+// Spec Section: "Leaf Field Selections"
+// Spec Section: "Subscriptions with Single Root Field"
 // Spec Section: "Argument Uniqueness"
+// Spec Section: "Directives Are Unique Per Location"
+// Spec Section: "Fragment Name Uniqueness"
+// Spec Section: "Input Object Field Uniqueness"
+// Spec Section: "Operation Name Uniqueness"
+// Spec Section: "Variable Uniqueness"
 // Spec Section: "Value Type Correctness"
-// Spec Section: "Argument Optionality"
+// Spec Section: "Variables are Input Types"
 // Spec Section: "All Variable Usages Are Allowed"
-// Spec Section: "Field Selection Merging"
-// Spec Section: "Input Object Field Uniqueness"
-// SDL-specific validation rules
 
 /**
  * This set includes all validation rules defined by the GraphQL spec.