assert: fix deepEqual always return true on URL

meixg · aduh95 · commit fe667bea2879 · 2024-10-19T10:54:34.000+02: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
@@ -27,6 +27,7 @@ const {
 
 const { compare } = internalBinding('buffer');
 const assert = require('internal/assert');
+const { isURL } = require('internal/url');
 const types = require('internal/util/types');
 const {
 isAnyArrayBuffer,
@@ -287,6 +288,10 @@ function innerDeepEqual(val1, val2, strict, memos) {
 }
 } else if (isWeakMap(val1) || isWeakSet(val1)) {
 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
@@ -1346,3 +1346,47 @@ test('Comparing two different WeakSet instances', () => {
 const weakSet2 = new WeakSet();
 assertNotDeepOrStrict(weakSet1, weakSet2);
 });
+
+// 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 change
 const{ compare }=internalBinding('buffer');
 constassert=require('internal/assert');
 +const{ isURL }=require('internal/url');
 consttypes=require('internal/util/types');
 const{
  isAnyArrayBuffer,
+}
 }elseif(isWeakMap(val1)||isWeakSet(val1)){
 returnfalse;
 +}elseif(isURL(val1)){
 +if(!isURL(val2)||val1.href!==val2.href){
 +returnfalse;
 +}
+}
 returnkeyCheck(val1,val2,strict,memos,kNoIterator);
-Original file line number
+Diff line change
 returninternalUrl.pathToFileURL(filepath).href;
+}
 +functionisURL(value){
 +internalUrl??=require('internal/url');
 +returntypeofvalue.href==='string'&&valueinstanceofinternalUrl.URL;
 +}
++
 constbuiltInObjects=newSafeSet(
 ArrayPrototypeFilter(
 ObjectGetOwnPropertyNames(globalThis),
 if(keys.length===0&&protoProps===undefined){
 returnbase;
+}
 +}elseif(isURL(value)&&!(recurseTimes>ctx.depth&&ctx.depth!==null)){
 +base=value.href;
 +if(keys.length===0&&protoProps===undefined){
 +returnbase;
 +}
 }else{
 if(keys.length===0&&protoProps===undefined){
 if(isExternal(value)){
-Original file line number
+Diff line change
 constweakSet2=newWeakSet();
 assertNotDeepOrStrict(weakSet1,weakSet2);
 });
++
 +// check URL
 +{
 +consta=newURL('http://foo');
 +constb=newURL('http://bar');
++
 +assertNotDeepOrStrict(a,b);
 +}
++
 +{
 +consta=newURL('http://foo');
 +constb=newURL('http://foo');
++
 +assertDeepAndStrictEqual(a,b);
 +}
++
 +{
 +consta=newURL('http://foo');
 +constb=newURL('http://foo');
 +a.bar=1;
 +b.bar=2;
 +assertNotDeepOrStrict(a,b);
 +}
++
 +{
 +consta=newURL('http://foo');
 +constb=newURL('http://foo');
 +a.bar=1;
 +b.bar=1;
 +assertDeepAndStrictEqual(a,b);
 +}
++
 +{
 +consta=newURL('http://foo');
 +constb=newURL('http://bar');
 +assert.throws(
 +()=>assert.deepStrictEqual(a,b),
 +{
 +code: 'ERR_ASSERTION',
 +name: 'AssertionError',
 +message: /http:\/\/bar/
 +}
 +);
 +}