assert: fix deepEqual always return true on URL

meixg · ruyadorno · commit 907484f04d9d · 2024-11-27T11:03:39.000-05:00
PR-URL: #50853 Fixes: #50836 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git a/lib/internal/util/comparisons.js b/lib/internal/util/comparisons.js
@@ -28,6 +28,7 @@ const {
 const { compare } = internalBinding('buffer');
 const assert = require('internal/assert');
 const { isError } = require('internal/util');
+const { isURL } = require('internal/url');
 const types = require('internal/util/types');
 const {
   isAnyArrayBuffer,
@@ -286,6 +287,10 @@ function innerDeepEqual(val1, val2, strict, memos) {
     ) {
       return false;
     }
+  } else if (isURL(val1)) {
+    if (!isURL(val2) || val1.href !== val2.href) {
+      return false;
+    }
   }
   return keyCheck(val1, val2, strict, memos, kNoIterator);
 }
diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
@@ -166,6 +166,11 @@ function pathToFileUrlHref(filepath) {
   return internalUrl.pathToFileURL(filepath).href;
 }
 
+function isURL(value) {
+  internalUrl ??= require('internal/url');
+  return typeof value.href === 'string' && value instanceof internalUrl.URL;
+}
+
 const builtInObjects = new SafeSet(
   ArrayPrototypeFilter(
     ObjectGetOwnPropertyNames(globalThis),
@@ -1026,6 +1031,11 @@ function formatRaw(ctx, value, recurseTimes, typedArray) {
       if (keys.length === 0 && protoProps === undefined) {
         return base;
       }
+    } else if (isURL(value) && !(recurseTimes > ctx.depth && ctx.depth !== null)) {
+      base = value.href;
+      if (keys.length === 0 && protoProps === undefined) {
+        return base;
+      }
     } else {
       if (keys.length === 0 && protoProps === undefined) {
         if (isExternal(value)) {
diff --git a/test/parallel/test-assert-deep.js b/test/parallel/test-assert-deep.js
@@ -1345,3 +1345,47 @@ test('Crypto', { skip: !hasCrypto }, async () => {
     assertDeepAndStrictEqual(a, b);
   }
 });
+
+// check URL
+{
+  const a = new URL('http://foo');
+  const b = new URL('http://bar');
+
+  assertNotDeepOrStrict(a, b);
+}
+
+{
+  const a = new URL('http://foo');
+  const b = new URL('http://foo');
+
+  assertDeepAndStrictEqual(a, b);
+}
+
+{
+  const a = new URL('http://foo');
+  const b = new URL('http://foo');
+  a.bar = 1;
+  b.bar = 2;
+  assertNotDeepOrStrict(a, b);
+}
+
+{
+  const a = new URL('http://foo');
+  const b = new URL('http://foo');
+  a.bar = 1;
+  b.bar = 1;
+  assertDeepAndStrictEqual(a, b);
+}
+
+{
+  const a = new URL('http://foo');
+  const b = new URL('http://bar');
+  assert.throws(
+    () => assert.deepStrictEqual(a, b),
+    {
+      code: 'ERR_ASSERTION',
+      name: 'AssertionError',
+      message: /http:\/\/bar/
+    }
+  );
+}

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ const {`
`28`	`28`	`const { compare } = internalBinding('buffer');`
`29`	`29`	`const assert = require('internal/assert');`
`30`	`30`	`const { isError } = require('internal/util');`
	`31`	`+const { isURL } = require('internal/url');`
`31`	`32`	`const types = require('internal/util/types');`
`32`	`33`	`const {`
`33`	`34`	`isAnyArrayBuffer,`
`@@ -286,6 +287,10 @@ function innerDeepEqual(val1, val2, strict, memos) {`
`286`	`287`	`) {`
`287`	`288`	`return false;`
`288`	`289`	`}`
	`290`	`+ } else if (isURL(val1)) {`
	`291`	`+ if (!isURL(val2) \|\| val1.href !== val2.href) {`
	`292`	`+ return false;`
	`293`	`+ }`
`289`	`294`	`}`
`290`	`295`	`return keyCheck(val1, val2, strict, memos, kNoIterator);`
`291`	`296`	`}`