Skip to content

assert: fix deepEqual always return true on URL #50853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/internal/util/comparisons.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down
10 changes: 10 additions & 0 deletions lib/internal/util/inspect.js
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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)) {
Expand Down
44 changes: 44 additions & 0 deletions test/parallel/test-assert-deep.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/
}
);
}
Loading