graphql 16.8.0 → 16.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql",
-  "version": "16.8.0",
+  "version": "16.8.1",
   "description": "A Query Language and Runtime which can target any service.",
   "license": "MIT",
   "main": "index",

package/validation/rules/OverlappingFieldsCanBeMergedRule.js

@@ -543,7 +543,7 @@ function findConflict(
       ];
     } // Two field calls must have the same arguments.
 
-    if (stringifyArguments(node1) !== stringifyArguments(node2)) {
+    if (!sameArguments(node1, node2)) {
       return [
         [responseName, 'they have differing arguments'],
         [node1],
@@ -588,27 +588,40 @@ function findConflict(
   }
 }
 
-function stringifyArguments(fieldNode) {
-  var _fieldNode$arguments;
+function sameArguments(node1, node2) {
+  const args1 = node1.arguments;
+  const args2 = node2.arguments;
 
-  // FIXME https://github.com/graphql/graphql-js/issues/2203
-  const args =
+  if (args1 === undefined || args1.length === 0) {
+    return args2 === undefined || args2.length === 0;
+  }
+
+  if (args2 === undefined || args2.length === 0) {
+    return false;
+  }
+  /* c8 ignore next */
+
+  if (args1.length !== args2.length) {
     /* 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),
-  );
+    return false;
+    /* c8 ignore next */
+  }
+
+  const values2 = new Map(args2.map(({ name, value }) => [name.value, value]));
+  return args1.every((arg1) => {
+    const value1 = arg1.value;
+    const value2 = values2.get(arg1.name.value);
+
+    if (value2 === undefined) {
+      return false;
+    }
+
+    return stringifyValue(value1) === stringifyValue(value2);
+  });
+}
+
+function stringifyValue(value) {
+  return (0, _printer.print)((0, _sortValueNode.sortValueNode)(value));
 } // 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

@@ -537,7 +537,7 @@ function findConflict(
       ];
     } // Two field calls must have the same arguments.
 
-    if (stringifyArguments(node1) !== stringifyArguments(node2)) {
+    if (!sameArguments(node1, node2)) {
       return [
         [responseName, 'they have differing arguments'],
         [node1],
@@ -582,25 +582,40 @@ function findConflict(
   }
 }
 
-function stringifyArguments(fieldNode) {
-  var _fieldNode$arguments;
+function sameArguments(node1, node2) {
+  const args1 = node1.arguments;
+  const args2 = node2.arguments;
 
-  // FIXME https://github.com/graphql/graphql-js/issues/2203
-  const args =
+  if (args1 === undefined || args1.length === 0) {
+    return args2 === undefined || args2.length === 0;
+  }
+
+  if (args2 === undefined || args2.length === 0) {
+    return false;
+  }
+  /* c8 ignore next */
+
+  if (args1.length !== args2.length) {
     /* 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));
+    return false;
+    /* c8 ignore next */
+  }
+
+  const values2 = new Map(args2.map(({ name, value }) => [name.value, value]));
+  return args1.every((arg1) => {
+    const value1 = arg1.value;
+    const value2 = values2.get(arg1.name.value);
+
+    if (value2 === undefined) {
+      return false;
+    }
+
+    return stringifyValue(value1) === stringifyValue(value2);
+  });
+}
+
+function stringifyValue(value) {
+  return print(sortValueNode(value));
 } // 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/version.js

@@ -10,7 +10,7 @@ exports.versionInfo = exports.version = void 0;
 /**
  * A string containing the version of the GraphQL.js library
  */
-const version = '16.8.0';
+const version = '16.8.1';
 /**
  * An object containing the components of the GraphQL.js version string
  */
@@ -19,7 +19,7 @@ exports.version = version;
 const versionInfo = Object.freeze({
   major: 16,
   minor: 8,
-  patch: 0,
+  patch: 1,
   preReleaseTag: null,
 });
 exports.versionInfo = versionInfo;

package/version.mjs

@@ -4,7 +4,7 @@
 /**
  * A string containing the version of the GraphQL.js library
  */
-export const version = '16.8.0';
+export const version = '16.8.1';
 /**
  * An object containing the components of the GraphQL.js version string
  */
@@ -12,6 +12,6 @@ export const version = '16.8.0';
 export const versionInfo = Object.freeze({
   major: 16,
   minor: 8,
-  patch: 0,
+  patch: 1,
   preReleaseTag: null,
 });