Skip to content

Commit d65a24c

Browse files
islandryumarco-ippolito
authored andcommitted
util: fix formatting of objects with built-in Symbol.toPrimitive
Fixes: nodejs#57818 PR-URL: nodejs#57832 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Chengzhong Wu <[email protected]>
1 parent 337ec1a commit d65a24c

File tree

3 files changed

+85
-14
lines changed

3 files changed

+85
-14
lines changed

doc/api/util.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ corresponding argument. Supported specifiers are:
286286

287287
* `%s`: `String` will be used to convert all values except `BigInt`, `Object`
288288
and `-0`. `BigInt` values will be represented with an `n` and Objects that
289-
have no user defined `toString` function are inspected using `util.inspect()`
289+
have neither a user defined `toString` function nor `Symbol.toPrimitive` function are inspected using `util.inspect()`
290290
with options `{ depth: 0, colors: false, compact: 3 }`.
291291
* `%d`: `Number` will be used to convert all values except `BigInt` and
292292
`Symbol`.

lib/internal/util/inspect.js

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2125,27 +2125,32 @@ function hasBuiltInToString(value) {
21252125
value = proxyTarget;
21262126
}
21272127

2128-
// Check if value has a custom Symbol.toPrimitive transformation.
2129-
if (typeof value[SymbolToPrimitive] === 'function') {
2130-
return false;
2131-
}
2128+
let hasOwnToString = ObjectPrototypeHasOwnProperty;
2129+
let hasOwnToPrimitive = ObjectPrototypeHasOwnProperty;
21322130

2133-
// Count objects that have no `toString` function as built-in.
2131+
// Count objects without `toString` and `Symbol.toPrimitive` function as built-in.
21342132
if (typeof value.toString !== 'function') {
2135-
return true;
2136-
}
2137-
2138-
// The object has a own `toString` property. Thus it's not not a built-in one.
2139-
if (ObjectPrototypeHasOwnProperty(value, 'toString')) {
2133+
if (typeof value[SymbolToPrimitive] !== 'function') {
2134+
return true;
2135+
} else if (ObjectPrototypeHasOwnProperty(value, SymbolToPrimitive)) {
2136+
return false;
2137+
}
2138+
hasOwnToString = returnFalse;
2139+
} else if (ObjectPrototypeHasOwnProperty(value, 'toString')) {
2140+
return false;
2141+
} else if (typeof value[SymbolToPrimitive] !== 'function') {
2142+
hasOwnToPrimitive = returnFalse;
2143+
} else if (ObjectPrototypeHasOwnProperty(value, SymbolToPrimitive)) {
21402144
return false;
21412145
}
21422146

2143-
// Find the object that has the `toString` property as own property in the
2144-
// prototype chain.
2147+
// Find the object that has the `toString` property or `Symbol.toPrimitive` property
2148+
// as own property in the prototype chain.
21452149
let pointer = value;
21462150
do {
21472151
pointer = ObjectGetPrototypeOf(pointer);
2148-
} while (!ObjectPrototypeHasOwnProperty(pointer, 'toString'));
2152+
} while (!hasOwnToString(pointer, 'toString') &&
2153+
!hasOwnToPrimitive(pointer, SymbolToPrimitive));
21492154

21502155
// Check closer if the object is a built-in.
21512156
const descriptor = ObjectGetOwnPropertyDescriptor(pointer, 'constructor');
@@ -2154,6 +2159,10 @@ function hasBuiltInToString(value) {
21542159
builtInObjects.has(descriptor.value.name);
21552160
}
21562161

2162+
function returnFalse() {
2163+
return false;
2164+
}
2165+
21572166
const firstErrorLine = (error) => StringPrototypeSplit(error.message, '\n', 1)[0];
21582167
let CIRCULAR_ERROR_MESSAGE;
21592168
function tryStringify(arg) {

test/parallel/test-util-format.js

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,68 @@ assert.strictEqual(util.format('%s', -Infinity), '-Infinity');
290290
assert.strictEqual(util.format('%s', objectWithToPrimitive + ''), 'default context');
291291
}
292292

293+
// built-in toPrimitive is the same behavior as inspect
294+
{
295+
const date = new Date('2023-10-01T00:00:00Z');
296+
assert.strictEqual(util.format('%s', date), util.inspect(date));
297+
298+
const symbol = Symbol('foo');
299+
assert.strictEqual(util.format('%s', symbol), util.inspect(symbol));
300+
}
301+
302+
// Prototype chain handling for toString
303+
{
304+
function hasToStringButNoToPrimitive() {}
305+
306+
hasToStringButNoToPrimitive.prototype.toString = function() {
307+
return 'hasToStringButNoToPrimitive';
308+
};
309+
310+
let obj = new hasToStringButNoToPrimitive();
311+
assert.strictEqual(util.format('%s', obj.toString()), 'hasToStringButNoToPrimitive');
312+
313+
function inheritsFromHasToStringButNoToPrimitive() {}
314+
Object.setPrototypeOf(inheritsFromHasToStringButNoToPrimitive.prototype,
315+
hasToStringButNoToPrimitive.prototype);
316+
obj = new inheritsFromHasToStringButNoToPrimitive();
317+
assert.strictEqual(util.format('%s', obj.toString()), 'hasToStringButNoToPrimitive');
318+
}
319+
320+
// Prototype chain handling for Symbol.toPrimitive
321+
{
322+
function hasToPrimitiveButNoToString() {}
323+
324+
hasToPrimitiveButNoToString.prototype[Symbol.toPrimitive] = function() {
325+
return 'hasToPrimitiveButNoToString';
326+
};
327+
328+
let obj = new hasToPrimitiveButNoToString();
329+
assert.strictEqual(util.format('%s', obj[Symbol.toPrimitive]()), 'hasToPrimitiveButNoToString');
330+
function inheritsFromHasToPrimitiveButNoToString() {}
331+
Object.setPrototypeOf(inheritsFromHasToPrimitiveButNoToString.prototype,
332+
hasToPrimitiveButNoToString.prototype);
333+
obj = new inheritsFromHasToPrimitiveButNoToString();
334+
assert.strictEqual(util.format('%s', obj[Symbol.toPrimitive]()), 'hasToPrimitiveButNoToString');
335+
}
336+
337+
// Prototype chain handling for both toString and Symbol.toPrimitive
338+
{
339+
function hasBothToStringAndToPrimitive() {}
340+
hasBothToStringAndToPrimitive.prototype.toString = function() {
341+
return 'toString';
342+
};
343+
hasBothToStringAndToPrimitive.prototype[Symbol.toPrimitive] = function() {
344+
return 'toPrimitive';
345+
};
346+
let obj = new hasBothToStringAndToPrimitive();
347+
assert.strictEqual(util.format('%s', obj.toString()), 'toString');
348+
function inheritsFromHasBothToStringAndToPrimitive() {}
349+
Object.setPrototypeOf(inheritsFromHasBothToStringAndToPrimitive.prototype,
350+
hasBothToStringAndToPrimitive.prototype);
351+
obj = new inheritsFromHasBothToStringAndToPrimitive();
352+
assert.strictEqual(util.format('%s', obj.toString()), 'toString');
353+
}
354+
293355
// JSON format specifier
294356
assert.strictEqual(util.format('%j'), '%j');
295357
assert.strictEqual(util.format('%j', 42), '42');

0 commit comments

Comments
 (0)