Skip to content

util: cleanup util #25255

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 5 commits into from
Closed

util: cleanup util #25255

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17aa99f
util: switch recurseTimes counter
BridgeAR Dec 28, 2018
e73a36c
util: code cleanup
BridgeAR Dec 28, 2018
65cad90
util: simpler module namespace code
BridgeAR Dec 28, 2018
057882e
util: remove outdated comment
BridgeAR Dec 28, 2018
669c2f4
util: remove eslint comments and rename variables
BridgeAR Dec 28, 2018
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
Next Next commit
util: switch recurseTimes counter 
This makes sure the counter goes up instead of going down. This allows
to properly track the current inspection depth no matter what the
`depth` option was set to.
  • Loading branch information
@BridgeAR
BridgeAR committed Dec 28, 2018
commit 17aa99f367bca778b30943ca983945be81f22781
23 changes: 12 additions & 11 deletions lib/internal/util/inspect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ function inspect(value, opts) {
}
if (ctx.colors) ctx.stylize = stylizeWithColor;
if (ctx.maxArrayLength === null) ctx.maxArrayLength = Infinity;
return formatValue(ctx, value, ctx.depth);
return formatValue(ctx, value, 0);
}
inspect.custom = customInspectSymbol;

Expand Down Expand Up @@ -405,11 +405,10 @@ function getCtxStyle(constructor, tag) {
}

function formatProxy(ctx, proxy, recurseTimes) {
if (recurseTimes != null) {
if (recurseTimes < 0)
return ctx.stylize('Proxy [Array]', 'special');
recurseTimes -= 1;
if (recurseTimes > ctx.depth && ctx.depth !== null) {
return ctx.stylize('Proxy [Array]', 'special');
}
recurseTimes += 1;
ctx.indentationLvl += 2;
const res = [
formatValue(ctx, proxy[0], recurseTimes),
Expand Down Expand Up @@ -524,7 +523,10 @@ function formatValue(ctx, value, recurseTimes) {
maybeCustom !== inspect &&
// Also filter out any prototype objects using the circular check.
!(value.constructor && value.constructor.prototype === value)) {
const ret = maybeCustom.call(value, recurseTimes, ctx);
// This makes sure the recurseTimes are reported as before while using
// a counter internally.
const depth = ctx.depth === null ? null : ctx.depth - recurseTimes;
const ret = maybeCustom.call(value, depth, ctx);

// If the custom inspection method returned `this`, don't go into
// infinite recursion.
Expand Down Expand Up @@ -638,7 +640,7 @@ function formatRaw(ctx, value, recurseTimes) {
const prefix = getPrefix(constructor, tag, 'RegExp');
if (prefix !== 'RegExp ')
base = `${prefix}${base}`;
if (keys.length === 0 || recurseTimes < 0)
if (keys.length === 0 || recurseTimes > ctx.depth && ctx.depth !== null)
return ctx.stylize(base, 'regexp');
} else if (isDate(value)) {
// Make dates with properties first say the date
Expand Down Expand Up @@ -746,11 +748,10 @@ function formatRaw(ctx, value, recurseTimes) {
}
}

if (recurseTimes != null) {
if (recurseTimes < 0)
return ctx.stylize(`[${getCtxStyle(constructor, tag)}]`, 'special');
recurseTimes -= 1;
if (recurseTimes > ctx.depth && ctx.depth !== null) {
return ctx.stylize(`[${getCtxStyle(constructor, tag)}]`, 'special');
}
recurseTimes += 1;

ctx.seen.push(value);
let output;
Expand Down