Skip to content
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

Jump to bottom

util: add more predefined color codes to inspect.colors #30659

Closed
wants to merge 5 commits into from
Closed

util: add more predefined color codes to inspect.colors #30659

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0646ee4
util: improve inspect's customInspect performance
BridgeAR Nov 21, 2019
de5d3a5
util: add more predefined color codes to inspect.colors
BridgeAR Nov 25, 2019
6d6b860
fixup: util: add more predefined color codes to inspect.colors
BridgeAR Nov 26, 2019
87e6091
fixup: improve doc wording
BridgeAR Nov 28, 2019
8f5432d
fixup: util: improve inspect's customInspect performance
BridgeAR Dec 6, 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
21 changes: 14 additions & 7 deletions lib/internal/util/inspect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,20 @@ const meta = [
];

function getUserOptions(ctx) {
const obj = { stylize: ctx.stylize };
for (const key of ObjectKeys(inspectDefaultOptions)) {
obj[key] = ctx[key];
}
if (ctx.userOptions === undefined)
return obj;
return { ...obj, ...ctx.userOptions };
return {
BridgeAR marked this conversation as resolved.
Show resolved Hide resolved
stylize: ctx.stylize,
showHidden: ctx.showHidden,
depth: ctx.depth,
colors: ctx.colors,
customInspect: ctx.customInspect,
showProxy: ctx.showProxy,
maxArrayLength: ctx.maxArrayLength,
breakLength: ctx.breakLength,
compact: ctx.compact,
sorted: ctx.sorted,
getters: ctx.getters,
...ctx.userOptions
};
}

/**
Expand Down
9 changes: 7 additions & 2 deletions test/parallel/test-util-inspect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,10 @@ util.inspect({ hasOwnProperty: null });
assert.strictEqual(opts.budget, undefined);
assert.strictEqual(opts.indentationLvl, undefined);
assert.strictEqual(opts.showHidden, false);
assert.deepStrictEqual(
new Set(Object.keys(util.inspect.defaultOptions).concat(['stylize'])),
new Set(Object.keys(opts))
);
opts.showHidden = true;
return { [util.inspect.custom]: common.mustCall((depth, opts2) => {
assert.deepStrictEqual(clone, opts2);
Expand All @@ -881,10 +885,11 @@ util.inspect({ hasOwnProperty: null });
}

{
const subject = { [util.inspect.custom]: common.mustCall((depth) => {
const subject = { [util.inspect.custom]: common.mustCall((depth, opts) => {
assert.strictEqual(depth, null);
assert.strictEqual(opts.compact, true);
}) };
util.inspect(subject, { depth: null });
util.inspect(subject, { depth: null, compact: true });
}

{
Expand Down