graphql 14.0.0 → 14.1.1

package/validation/rules/KnownTypeNames.js

@@ -12,6 +12,10 @@ var _suggestionList = _interopRequireDefault(require("../../jsutils/suggestionLi
 
 var _quotedOrList = _interopRequireDefault(require("../../jsutils/quotedOrList"));
 
+var _predicates = require("../../language/predicates");
+
+var _scalars = require("../../type/scalars");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -20,7 +24,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 function unknownTypeMessage(typeName, suggestedTypes) {
   var message = "Unknown type \"".concat(typeName, "\".");
@@ -40,30 +44,64 @@ function unknownTypeMessage(typeName, suggestedTypes) {
 
 
 function KnownTypeNames(context) {
+  var schema = context.getSchema();
+  var existingTypesMap = schema ? schema.getTypeMap() : Object.create(null);
+  var definedTypes = Object.create(null);
+  var _iteratorNormalCompletion = true;
+  var _didIteratorError = false;
+  var _iteratorError = undefined;
+
+  try {
+    for (var _iterator = context.getDocument().definitions[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var def = _step.value;
+
+      if ((0, _predicates.isTypeDefinitionNode)(def)) {
+        definedTypes[def.name.value] = true;
+      }
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+
+  var typeNames = Object.keys(existingTypesMap).concat(Object.keys(definedTypes));
   return {
-    // TODO: when validating IDL, re-enable these. Experimental version does not
-    // add unreferenced types, resulting in false-positive errors. Squelched
-    // errors for now.
-    ObjectTypeDefinition: function ObjectTypeDefinition() {
-      return false;
-    },
-    InterfaceTypeDefinition: function InterfaceTypeDefinition() {
-      return false;
-    },
-    UnionTypeDefinition: function UnionTypeDefinition() {
-      return false;
-    },
-    InputObjectTypeDefinition: function InputObjectTypeDefinition() {
-      return false;
-    },
-    NamedType: function NamedType(node) {
-      var schema = context.getSchema();
+    NamedType: function NamedType(node, _1, parent, _2, ancestors) {
       var typeName = node.name.value;
-      var type = schema.getType(typeName);
 
-      if (!type) {
-        context.reportError(new _GraphQLError.GraphQLError(unknownTypeMessage(typeName, (0, _suggestionList.default)(typeName, Object.keys(schema.getTypeMap()))), [node]));
+      if (!existingTypesMap[typeName] && !definedTypes[typeName]) {
+        var definitionNode = ancestors[2] || parent;
+        var isSDL = isSDLNode(definitionNode);
+
+        if (isSDL && isSpecifiedScalarName(typeName)) {
+          return;
+        }
+
+        var suggestedTypes = (0, _suggestionList.default)(typeName, isSDL ? specifiedScalarsNames.concat(typeNames) : typeNames);
+        context.reportError(new _GraphQLError.GraphQLError(unknownTypeMessage(typeName, suggestedTypes), node));
       }
     }
   };
+}
+
+var specifiedScalarsNames = _scalars.specifiedScalarTypes.map(function (type) {
+  return type.name;
+});
+
+function isSpecifiedScalarName(typeName) {
+  return specifiedScalarsNames.indexOf(typeName) !== -1;
+}
+
+function isSDLNode(value) {
+  return Boolean(value && !Array.isArray(value) && ((0, _predicates.isTypeSystemDefinitionNode)(value) || (0, _predicates.isTypeSystemExtensionNode)(value)));
 }

package/validation/rules/KnownTypeNames.js.flow

@@ -7,11 +7,21 @@
  * @flow strict
  */
 
-import type { ValidationContext } from '../ValidationContext';
+import type {
+  ValidationContext,
+  SDLValidationContext,
+} from '../ValidationContext';
 import { GraphQLError } from '../../error/GraphQLError';
 import suggestionList from '../../jsutils/suggestionList';
 import quotedOrList from '../../jsutils/quotedOrList';
+import type { ASTNode } from '../../language/ast';
 import type { ASTVisitor } from '../../language/visitor';
+import {
+  isTypeDefinitionNode,
+  isTypeSystemDefinitionNode,
+  isTypeSystemExtensionNode,
+} from '../../language/predicates';
+import { specifiedScalarTypes } from '../../type/scalars';
 
 export function unknownTypeMessage(
   typeName: string,
@@ -30,30 +40,54 @@ export function unknownTypeMessage(
  * A GraphQL document is only valid if referenced types (specifically
  * variable definitions and fragment conditions) are defined by the type schema.
  */
-export function KnownTypeNames(context: ValidationContext): ASTVisitor {
+export function KnownTypeNames(
+  context: ValidationContext | SDLValidationContext,
+): ASTVisitor {
+  const schema = context.getSchema();
+  const existingTypesMap = schema ? schema.getTypeMap() : Object.create(null);
+
+  const definedTypes = Object.create(null);
+  for (const def of context.getDocument().definitions) {
+    if (isTypeDefinitionNode(def)) {
+      definedTypes[def.name.value] = true;
+    }
+  }
+
+  const typeNames = Object.keys(existingTypesMap).concat(
+    Object.keys(definedTypes),
+  );
+
   return {
-    // TODO: when validating IDL, re-enable these. Experimental version does not
-    // add unreferenced types, resulting in false-positive errors. Squelched
-    // errors for now.
-    ObjectTypeDefinition: () => false,
-    InterfaceTypeDefinition: () => false,
-    UnionTypeDefinition: () => false,
-    InputObjectTypeDefinition: () => false,
-    NamedType(node) {
-      const schema = context.getSchema();
+    NamedType(node, _1, parent, _2, ancestors) {
       const typeName = node.name.value;
-      const type = schema.getType(typeName);
-      if (!type) {
+      if (!existingTypesMap[typeName] && !definedTypes[typeName]) {
+        const definitionNode = ancestors[2] || parent;
+        const isSDL = isSDLNode(definitionNode);
+        if (isSDL && isSpecifiedScalarName(typeName)) {
+          return;
+        }
+
+        const suggestedTypes = suggestionList(
+          typeName,
+          isSDL ? specifiedScalarsNames.concat(typeNames) : typeNames,
+        );
         context.reportError(
-          new GraphQLError(
-            unknownTypeMessage(
-              typeName,
-              suggestionList(typeName, Object.keys(schema.getTypeMap())),
-            ),
-            [node],
-          ),
+          new GraphQLError(unknownTypeMessage(typeName, suggestedTypes), node),
         );
       }
     },
   };
 }
+
+const specifiedScalarsNames = specifiedScalarTypes.map(type => type.name);
+function isSpecifiedScalarName(typeName) {
+  return specifiedScalarsNames.indexOf(typeName) !== -1;
+}
+
+function isSDLNode(value: ASTNode | $ReadOnlyArray<ASTNode> | void): boolean {
+  return Boolean(
+    value &&
+      !Array.isArray(value) &&
+      (isTypeSystemDefinitionNode(value) || isTypeSystemExtensionNode(value)),
+  );
+}

package/validation/rules/KnownTypeNames.mjs

@@ -4,11 +4,13 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 import { GraphQLError } from '../../error/GraphQLError';
 import suggestionList from '../../jsutils/suggestionList';
 import quotedOrList from '../../jsutils/quotedOrList';
+import { isTypeDefinitionNode, isTypeSystemDefinitionNode, isTypeSystemExtensionNode } from '../../language/predicates';
+import { specifiedScalarTypes } from '../../type/scalars';
 export function unknownTypeMessage(typeName, suggestedTypes) {
   var message = "Unknown type \"".concat(typeName, "\".");
 
@@ -26,30 +28,63 @@ export function unknownTypeMessage(typeName, suggestedTypes) {
  */
 
 export function KnownTypeNames(context) {
+  var schema = context.getSchema();
+  var existingTypesMap = schema ? schema.getTypeMap() : Object.create(null);
+  var definedTypes = Object.create(null);
+  var _iteratorNormalCompletion = true;
+  var _didIteratorError = false;
+  var _iteratorError = undefined;
+
+  try {
+    for (var _iterator = context.getDocument().definitions[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var def = _step.value;
+
+      if (isTypeDefinitionNode(def)) {
+        definedTypes[def.name.value] = true;
+      }
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+
+  var typeNames = Object.keys(existingTypesMap).concat(Object.keys(definedTypes));
   return {
-    // TODO: when validating IDL, re-enable these. Experimental version does not
-    // add unreferenced types, resulting in false-positive errors. Squelched
-    // errors for now.
-    ObjectTypeDefinition: function ObjectTypeDefinition() {
-      return false;
-    },
-    InterfaceTypeDefinition: function InterfaceTypeDefinition() {
-      return false;
-    },
-    UnionTypeDefinition: function UnionTypeDefinition() {
-      return false;
-    },
-    InputObjectTypeDefinition: function InputObjectTypeDefinition() {
-      return false;
-    },
-    NamedType: function NamedType(node) {
-      var schema = context.getSchema();
+    NamedType: function NamedType(node, _1, parent, _2, ancestors) {
       var typeName = node.name.value;
-      var type = schema.getType(typeName);
 
-      if (!type) {
-        context.reportError(new GraphQLError(unknownTypeMessage(typeName, suggestionList(typeName, Object.keys(schema.getTypeMap()))), [node]));
+      if (!existingTypesMap[typeName] && !definedTypes[typeName]) {
+        var definitionNode = ancestors[2] || parent;
+        var isSDL = isSDLNode(definitionNode);
+
+        if (isSDL && isSpecifiedScalarName(typeName)) {
+          return;
+        }
+
+        var suggestedTypes = suggestionList(typeName, isSDL ? specifiedScalarsNames.concat(typeNames) : typeNames);
+        context.reportError(new GraphQLError(unknownTypeMessage(typeName, suggestedTypes), node));
       }
     }
   };
+}
+var specifiedScalarsNames = specifiedScalarTypes.map(function (type) {
+  return type.name;
+});
+
+function isSpecifiedScalarName(typeName) {
+  return specifiedScalarsNames.indexOf(typeName) !== -1;
+}
+
+function isSDLNode(value) {
+  return Boolean(value && !Array.isArray(value) && (isTypeSystemDefinitionNode(value) || isTypeSystemExtensionNode(value)));
 }

package/validation/rules/LoneAnonymousOperation.js

@@ -16,7 +16,7 @@ var _kinds = require("../../language/kinds");
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 function anonOperationNotAloneMessage() {
   return 'This anonymous operation must be the only defined operation.';

package/validation/rules/LoneAnonymousOperation.mjs

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 import { GraphQLError } from '../../error/GraphQLError';
 import { Kind } from '../../language/kinds';

package/validation/rules/LoneSchemaDefinition.js

@@ -15,7 +15,7 @@ var _GraphQLError = require("../../error/GraphQLError");
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 function schemaDefinitionNotAloneMessage() {
   return 'Must provide only one schema definition.';

package/validation/rules/LoneSchemaDefinition.mjs

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 import { GraphQLError } from '../../error/GraphQLError';
 export function schemaDefinitionNotAloneMessage() {

package/validation/rules/NoFragmentCycles.js

@@ -14,7 +14,7 @@ var _GraphQLError = require("../../error/GraphQLError");
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 function cycleErrorMessage(fragName, spreadNames) {
   var via = spreadNames.length ? ' via ' + spreadNames.join(', ') : '';

package/validation/rules/NoFragmentCycles.js.flow

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type { ValidationContext } from '../ValidationContext';
+import type { ASTValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error/GraphQLError';
 import type { FragmentDefinitionNode } from '../../language/ast';
 import type { ASTVisitor } from '../../language/visitor';
@@ -20,7 +20,7 @@ export function cycleErrorMessage(
   return `Cannot spread fragment "${fragName}" within itself${via}.`;
 }
 
-export function NoFragmentCycles(context: ValidationContext): ASTVisitor {
+export function NoFragmentCycles(context: ASTValidationContext): ASTVisitor {
   // Tracks already visited fragments to maintain O(N) and to ensure that cycles
   // are not redundantly reported.
   const visitedFrags = Object.create(null);

package/validation/rules/NoFragmentCycles.mjs

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 import { GraphQLError } from '../../error/GraphQLError';
 export function cycleErrorMessage(fragName, spreadNames) {

package/validation/rules/NoUndefinedVariables.js

@@ -14,7 +14,7 @@ var _GraphQLError = require("../../error/GraphQLError");
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 function undefinedVarMessage(varName, opName) {
   return opName ? "Variable \"$".concat(varName, "\" is not defined by operation \"").concat(opName, "\".") : "Variable \"$".concat(varName, "\" is not defined.");

package/validation/rules/NoUndefinedVariables.mjs

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 import { GraphQLError } from '../../error/GraphQLError';
 export function undefinedVarMessage(varName, opName) {

package/validation/rules/NoUnusedFragments.js

@@ -14,7 +14,7 @@ var _GraphQLError = require("../../error/GraphQLError");
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 function unusedFragMessage(fragName) {
   return "Fragment \"".concat(fragName, "\" is never used.");

package/validation/rules/NoUnusedFragments.js.flow

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type { ValidationContext } from '../ValidationContext';
+import type { ASTValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error/GraphQLError';
 import type { ASTVisitor } from '../../language/visitor';
 
@@ -21,7 +21,7 @@ export function unusedFragMessage(fragName: string): string {
  * A GraphQL document is only valid if all fragment definitions are spread
  * within operations, or spread within other fragments spread within operations.
  */
-export function NoUnusedFragments(context: ValidationContext): ASTVisitor {
+export function NoUnusedFragments(context: ASTValidationContext): ASTVisitor {
   const operationDefs = [];
   const fragmentDefs = [];
 

package/validation/rules/NoUnusedFragments.mjs

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 import { GraphQLError } from '../../error/GraphQLError';
 export function unusedFragMessage(fragName) {

package/validation/rules/NoUnusedVariables.js

@@ -14,7 +14,7 @@ var _GraphQLError = require("../../error/GraphQLError");
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 function unusedVariableMessage(varName, opName) {
   return opName ? "Variable \"$".concat(varName, "\" is never used in operation \"").concat(opName, "\".") : "Variable \"$".concat(varName, "\" is never used.");

package/validation/rules/NoUnusedVariables.mjs

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 import { GraphQLError } from '../../error/GraphQLError';
 export function unusedVariableMessage(varName, opName) {

package/validation/rules/OverlappingFieldsCanBeMerged.js

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.fieldsConflictMessage = fieldsConflictMessage;
 exports.OverlappingFieldsCanBeMerged = OverlappingFieldsCanBeMerged;
 
+var _find = _interopRequireDefault(require("../../polyfills/find"));
+
+var _objectEntries = _interopRequireDefault(require("../../polyfills/objectEntries"));
+
 var _GraphQLError = require("../../error/GraphQLError");
 
 var _inspect = _interopRequireDefault(require("../../jsutils/inspect"));
 
-var _find = _interopRequireDefault(require("../../jsutils/find"));
-
 var _kinds = require("../../language/kinds");
 
 var _printer = require("../../language/printer");
@@ -22,10 +24,16 @@ var _typeFromAST = require("../../utilities/typeFromAST");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * 
+ */
 function fieldsConflictMessage(responseName, reason) {
-  return "Fields \"".concat(responseName, "\" conflict because ").concat(reasonMessage(reason)) + '. Use different aliases on the fields to fetch both if this was ' + 'intentional.';
+  return "Fields \"".concat(responseName, "\" conflict because ").concat(reasonMessage(reason), ". ") + 'Use different aliases on the fields to fetch both if this was intentional.';
 }
 
 function reasonMessage(reason) {
@@ -294,27 +302,45 @@ function collectConflictsWithin(context, conflicts, cachedFieldsAndFragmentNames
   // A field map is a keyed collection, where each key represents a response
   // name and the value at that key is a list of all fields which provide that
   // response name. For every response name, if there are multiple fields, they
-  // must be compared to find a potential conflict.
-  var _arr = Object.keys(fieldMap);
-
-  for (var _i3 = 0; _i3 < _arr.length; _i3++) {
-    var responseName = _arr[_i3];
-    var fields = fieldMap[responseName]; // This compares every field in the list to every other field in this list
-    // (except to itself). If the list only has one item, nothing needs to
-    // be compared.
-
-    if (fields.length > 1) {
-      for (var i = 0; i < fields.length; i++) {
-        for (var j = i + 1; j < fields.length; j++) {
-          var conflict = findConflict(context, cachedFieldsAndFragmentNames, comparedFragmentPairs, false, // within one collection is never mutually exclusive
-          responseName, fields[i], fields[j]);
-
-          if (conflict) {
-            conflicts.push(conflict);
+  var _iteratorNormalCompletion = true;
+  var _didIteratorError = false;
+  var _iteratorError = undefined;
+
+  try {
+    for (var _iterator = (0, _objectEntries.default)(fieldMap)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var _ref5 = _step.value;
+      var responseName = _ref5[0];
+      var fields = _ref5[1];
+
+      // This compares every field in the list to every other field in this list
+      // (except to itself). If the list only has one item, nothing needs to
+      // be compared.
+      if (fields.length > 1) {
+        for (var i = 0; i < fields.length; i++) {
+          for (var j = i + 1; j < fields.length; j++) {
+            var conflict = findConflict(context, cachedFieldsAndFragmentNames, comparedFragmentPairs, false, // within one collection is never mutually exclusive
+            responseName, fields[i], fields[j]);
+
+            if (conflict) {
+              conflicts.push(conflict);
+            }
           }
         }
       }
     }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
   }
 } // Collect all Conflicts between two collections of fields. This is similar to,
 // but different from the `collectConflictsWithin` function above. This check
@@ -329,10 +355,10 @@ function collectConflictsBetween(context, conflicts, cachedFieldsAndFragmentName
   // response name. For any response name which appears in both provided field
   // maps, each field from the first field map must be compared to every field
   // in the second field map to find potential conflicts.
-  var _arr2 = Object.keys(fieldMap1);
+  var _arr = Object.keys(fieldMap1);
 
-  for (var _i4 = 0; _i4 < _arr2.length; _i4++) {
-    var responseName = _arr2[_i4];
+  for (var _i3 = 0; _i3 < _arr.length; _i3++) {
+    var responseName = _arr[_i3];
     var fields2 = fieldMap2[responseName];
 
     if (fields2) {
@@ -527,14 +553,14 @@ function _collectFieldsAndFragmentNames(context, parentType, selectionSet, nodeA
 
 function subfieldConflicts(conflicts, responseName, node1, node2) {
   if (conflicts.length > 0) {
-    return [[responseName, conflicts.map(function (_ref4) {
-      var reason = _ref4[0];
+    return [[responseName, conflicts.map(function (_ref6) {
+      var reason = _ref6[0];
       return reason;
-    })], conflicts.reduce(function (allFields, _ref5) {
-      var fields1 = _ref5[1];
+    })], conflicts.reduce(function (allFields, _ref7) {
+      var fields1 = _ref7[1];
       return allFields.concat(fields1);
-    }, [node1]), conflicts.reduce(function (allFields, _ref6) {
-      var fields2 = _ref6[2];
+    }, [node1]), conflicts.reduce(function (allFields, _ref8) {
+      var fields2 = _ref8[2];
       return allFields.concat(fields2);
     }, [node2])];
   }
@@ -549,8 +575,6 @@ var PairSet =
 /*#__PURE__*/
 function () {
   function PairSet() {
-    _defineProperty(this, "_data", void 0);
-
     this._data = Object.create(null);
   }
 

package/validation/rules/OverlappingFieldsCanBeMerged.js.flow

@@ -7,10 +7,11 @@
  * @flow strict
  */
 
+import find from '../../polyfills/find';
+import objectEntries from '../../polyfills/objectEntries';
 import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error/GraphQLError';
 import inspect from '../../jsutils/inspect';
-import find from '../../jsutils/find';
 import type { ObjMap } from '../../jsutils/ObjMap';
 import type {
   SelectionSetNode,
@@ -42,9 +43,8 @@ export function fieldsConflictMessage(
   reason: ConflictReasonMessage,
 ): string {
   return (
-    `Fields "${responseName}" conflict because ${reasonMessage(reason)}` +
-    '. Use different aliases on the fields to fetch both if this was ' +
-    'intentional.'
+    `Fields "${responseName}" conflict because ${reasonMessage(reason)}. ` +
+    'Use different aliases on the fields to fetch both if this was intentional.'
   );
 }
 
@@ -486,8 +486,7 @@ function collectConflictsWithin(
   // name and the value at that key is a list of all fields which provide that
   // response name. For every response name, if there are multiple fields, they
   // must be compared to find a potential conflict.
-  for (const responseName of Object.keys(fieldMap)) {
-    const fields = fieldMap[responseName];
+  for (const [responseName, fields] of objectEntries(fieldMap)) {
     // This compares every field in the list to every other field in this list
     // (except to itself). If the list only has one item, nothing needs to
     // be compared.