Skip to content

[v12.x] multiple util and assert backports #31431

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.

Sign up for GitHub

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

Closed
BridgeAR wants to merge 15 commits into from
Closed

[v12.x] multiple util and assert backports #31431

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9d82b76
util: fix .format() not always calling toString when it should be
BridgeAR Nov 9, 2019
2859667
benchmark: add more util inspect and format benchmarks
BridgeAR Nov 30, 2019
e110449
util: improve performance inspecting proxies
BridgeAR Nov 30, 2019
62ed6a2
util: never trigger any proxy traps using `format()`
BridgeAR Dec 1, 2019
7d19aba
util: fix built-in detection
BridgeAR Nov 30, 2019
a9d41b7
util: inspect (user defined) prototype properties
BridgeAR Nov 30, 2019
0b08d32
util: refactor inspect code for constistency
BridgeAR Nov 2, 2019
1e2c535
util: add (typed) array length to the default output
BridgeAR Dec 19, 2019
a676531
src: accept single argument in getProxyDetails
BridgeAR Dec 8, 2019
9c9b338
util: improve prototype inspection using `inspect()` and `showHidden`
BridgeAR Dec 26, 2019
32dfdb8
assert: fix generatedMessage property
BridgeAR Jun 14, 2019
ad12514
assert: DRY .throws code
BridgeAR Jun 14, 2019
8b82c85
doc: update assert.throws() examples
BridgeAR Jun 17, 2019
ed2d864
doc: make `AssertionError` a link
BridgeAR Jun 20, 2019
e2970ab
assert: implement `assert.match()` and `assert.doesNotMatch()`
BridgeAR Dec 12, 2019
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
Prev Previous commit
Next Next commit
util: never trigger any proxy traps using format() 
PR-URL: #30767
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
  • Loading branch information
@BridgeAR
BridgeAR committed Jan 20, 2020
commit 62ed6a20373b834956f6703015167cb75f809a3c
7 changes: 7 additions & 0 deletions lib/internal/util/inspect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1646,6 +1646,13 @@ function format(...args) {
}

function hasBuiltInToString(value) {
// Prevent triggering proxy traps.
const getFullProxy = false;
const proxyTarget = getProxyDetails(value, getFullProxy);
if (proxyTarget !== undefined) {
value = proxyTarget;
}

// Count objects that have no `toString` function as built-in.
if (typeof value.toString !== 'function') {
return true;
Expand Down
3 changes: 3 additions & 0 deletions test/parallel/test-util-inspect-proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ proxyObj = new Proxy(target, handler);
// Inspecting the proxy should not actually walk it's properties
util.inspect(proxyObj, opts);

// Make sure inspecting object does not trigger any proxy traps.
util.format('%s', proxyObj);

// getProxyDetails is an internal method, not intended for public use.
// This is here to test that the internals are working correctly.
let details = processUtil.getProxyDetails(proxyObj, true);
Expand Down