util: fix formatting of objects with built-in Symbol.toPrimitive · nodejs/node@416052a · GitHub
Skip to content

Commit 416052a

Browse files
islandryuaduh95
authored andcommitted
util: fix formatting of objects with built-in Symbol.toPrimitive
Fixes: #57818 PR-URL: #57832 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
1 parent dda6ca9 commit 416052a

3 files changed

Lines changed: 85 additions & 14 deletions

File tree

doc/api/util.md

Lines changed: 1 addition & 1 deletion

lib/internal/util/inspect.js

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2166,27 +2166,32 @@ function hasBuiltInToString(value) {
21662166
value = proxyTarget;
21672167
}
21682168

2169-
// Check if value has a custom Symbol.toPrimitive transformation.
2170-
if (typeof value[SymbolToPrimitive] === 'function') {
2171-
return false;
2172-
}
2169+
let hasOwnToString = ObjectPrototypeHasOwnProperty;
2170+
let hasOwnToPrimitive = ObjectPrototypeHasOwnProperty;
21732171

2174-
// Count objects that have no `toString` function as built-in.
2172+
// Count objects without `toString` and `Symbol.toPrimitive` function as built-in.
21752173
if (typeof value.toString !== 'function') {
2176-
return true;
2177-
}
2178-
2179-
// The object has a own `toString` property. Thus it's not not a built-in one.
2180-
if (ObjectPrototypeHasOwnProperty(value, 'toString')) {
2174+
if (typeof value[SymbolToPrimitive] !== 'function') {
2175+
return true;
2176+
} else if (ObjectPrototypeHasOwnProperty(value, SymbolToPrimitive)) {
2177+
return false;
2178+
}
2179+
hasOwnToString = returnFalse;
2180+
} else if (ObjectPrototypeHasOwnProperty(value, 'toString')) {
2181+
return false;
2182+
} else if (typeof value[SymbolToPrimitive] !== 'function') {
2183+
hasOwnToPrimitive = returnFalse;
2184+
} else if (ObjectPrototypeHasOwnProperty(value, SymbolToPrimitive)) {
21812185
return false;
21822186
}
21832187

2184-
// Find the object that has the `toString` property as own property in the
2185-
// prototype chain.
2188+
// Find the object that has the `toString` property or `Symbol.toPrimitive` property
2189+
// as own property in the prototype chain.
21862190
let pointer = value;
21872191
do {
21882192
pointer = ObjectGetPrototypeOf(pointer);
2189-
} while (!ObjectPrototypeHasOwnProperty(pointer, 'toString'));
2193+
} while (!hasOwnToString(pointer, 'toString') &&
2194+
!hasOwnToPrimitive(pointer, SymbolToPrimitive));
21902195

21912196
// Check closer if the object is a built-in.
21922197
const descriptor = ObjectGetOwnPropertyDescriptor(pointer, 'constructor');
@@ -2195,6 +2200,10 @@ function hasBuiltInToString(value) {
21952200
builtInObjects.has(descriptor.value.name);
21962201
}
21972202

2203+
function returnFalse() {
2204+
return false;
2205+
}
2206+
21982207
const firstErrorLine = (error) => StringPrototypeSplit(error.message, '\n', 1)[0];
21992208
let CIRCULAR_ERROR_MESSAGE;
22002209
function tryStringify(arg) {

test/parallel/test-util-format.js

Lines changed: 62 additions & 0 deletions

0 commit comments

Comments
 (0)