Revert "assert,util: revert recursive breaking change"

BridgeAR · RafaelGSS · commit 4a47ce5ff939 · 2025-05-02T17:05:49.000-03:00
This reverts commit 575784b. PR-URL: #57622 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
diff --git a/doc/api/assert.md b/doc/api/assert.md
@@ -556,6 +556,10 @@ An alias of [`assert.ok()`][].
 <!-- YAML
 added: v0.1.21
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/57622
+    description: Recursion now stops when either side encounters a circular
+                 reference.
   - version:
       - v22.2.0
       - v20.15.0
@@ -632,7 +636,7 @@ are also recursively evaluated by the following rules.
 * [Object wrappers][] are compared both as objects and unwrapped values.
 * `Object` properties are compared unordered.
 * {Map} keys and {Set} items are compared unordered.
-* Recursion stops when both sides differ or both sides encounter a circular
+* Recursion stops when both sides differ or either side encounters a circular
   reference.
 * Implementation does not test the [`[[Prototype]]`][prototype-spec] of
   objects.
@@ -743,6 +747,10 @@ parameter is an instance of {Error} then it will be thrown instead of the
 <!-- YAML
 added: v1.2.0
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/57622
+    description: Recursion now stops when either side encounters a circular
+                 reference.
   - version:
     - v22.2.0
     - v20.15.0
@@ -802,7 +810,7 @@ are recursively evaluated also by the following rules.
 * [Object wrappers][] are compared both as objects and unwrapped values.
 * `Object` properties are compared unordered.
 * {Map} keys and {Set} items are compared unordered.
-* Recursion stops when both sides differ or both sides encounter a circular
+* Recursion stops when both sides differ or either side encounters a circular
   reference.
 * {WeakMap} and {WeakSet} instances are **not** compared structurally.
   They are only equal if they reference the same object. Any comparison between
diff --git a/lib/internal/util/comparisons.js b/lib/internal/util/comparisons.js
@@ -439,7 +439,10 @@ function keyCheck(val1, val2, mode, memos, iterationType, keys2) {
   if (memos.set === undefined) {
     if (memos.deep === false) {
       if (memos.a === val1) {
-        if (memos.b === val2) return true;
+        return memos.b === val2;
+      }
+      if (memos.b === val2) {
+        return false;
       }
       memos.c = val1;
       memos.d = val2;
@@ -460,8 +463,8 @@ function keyCheck(val1, val2, mode, memos, iterationType, keys2) {
   const originalSize = set.size;
   set.add(val1);
   set.add(val2);
-  if (originalSize === set.size) {
-    return true;
+  if (originalSize !== set.size - 2) {
+    return originalSize === set.size;
   }
 
   const areEq = objEquiv(val1, val2, mode, keys2, memos, iterationType);
diff --git a/test/parallel/test-assert-deep.js b/test/parallel/test-assert-deep.js
@@ -561,7 +561,7 @@ test('GH-14441. Circular structures should be consistent', () => {
     b.a = {};
     b.a.a = a;
 
-    assertDeepAndStrictEqual(a, b);
+    assertNotDeepOrStrict(a, b);
   }
 
   {
@@ -571,7 +571,7 @@ test('GH-14441. Circular structures should be consistent', () => {
     b.a = b;
     const c = {};
     c.a = a;
-    assertDeepAndStrictEqual(b, c);
+    assertNotDeepOrStrict(b, c);
   }
 
   {
@@ -581,7 +581,7 @@ test('GH-14441. Circular structures should be consistent', () => {
     b.add(b);
     const c = new Set();
     c.add(a);
-    assertDeepAndStrictEqual(b, c);
+    assertNotDeepOrStrict(b, c);
   }
 });
 

Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,7 @@ test('GH-14441. Circular structures should be consistent', () => {`
`561`	`561`	`b.a = {};`
`562`	`562`	`b.a.a = a;`
`563`	`563`
`564`		`- assertDeepAndStrictEqual(a, b);`
	`564`	`+ assertNotDeepOrStrict(a, b);`
`565`	`565`	`}`
`566`	`566`
`567`	`567`	`{`
`@@ -571,7 +571,7 @@ test('GH-14441. Circular structures should be consistent', () => {`
`571`	`571`	`b.a = b;`
`572`	`572`	`const c = {};`
`573`	`573`	`c.a = a;`
`574`		`- assertDeepAndStrictEqual(b, c);`
	`574`	`+ assertNotDeepOrStrict(b, c);`
`575`	`575`	`}`
`576`	`576`
`577`	`577`	`{`
`@@ -581,7 +581,7 @@ test('GH-14441. Circular structures should be consistent', () => {`
`581`	`581`	`b.add(b);`
`582`	`582`	`const c = new Set();`
`583`	`583`	`c.add(a);`
`584`		`- assertDeepAndStrictEqual(b, c);`
	`584`	`+ assertNotDeepOrStrict(b, c);`
`585`	`585`	`}`
`586`	`586`	`});`
`587`	`587`