Backport fix

graphql · Dec 20, 2023 · 7102d25 · 7102d25
1 parent 5493930
commit 7102d25
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/src/validation/rules/OverlappingFieldsCanBeMergedRule.js b/src/validation/rules/OverlappingFieldsCanBeMergedRule.js
@@ -264,6 +264,24 @@ function collectConflictsBetweenFieldsAndFragment(
   // (E) Then collect any conflicts between the provided collection of fields
   // and any fragment names found in the given fragment.
   for (let i = 0; i < fragmentNames2.length; i++) {
+    const referencedFragmentName = fragmentNames2[i];
+
+    // 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,