Skip to content

util: support inspecting Map, Set, and Promise #1471

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
monsanto wants to merge 8 commits into from
Closed

util: support inspecting Map, Set, and Promise #1471

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
613a63b
util: support inspecting Map and Set
monsanto Apr 20, 2015
21e4e92
(rebase) add semicolons to test
monsanto Apr 20, 2015
87e36a6
(rebase) check alignment of objects
monsanto Apr 20, 2015
10d88e5
(rebase) these semicolons are going to be the end of me
monsanto Apr 20, 2015
1185ff3
util: support inspecting Promises
monsanto Apr 20, 2015
c4d2cd0
(rebase) promise fixes
monsanto Apr 20, 2015
ba53e97
(rebase) fix showHidden on empty set/map
monsanto Apr 21, 2015
79627ae
nits n stuff
monsanto Apr 23, 2015
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
(rebase) fix showHidden on empty set/map 
we may mutate keys in the typecase, so don't check keys.length until no
more mutations.
  • Loading branch information
@monsanto
monsanto committed Apr 21, 2015
commit ba53e971475e13aab1cf746c3e00c341ae704105
11 changes: 7 additions & 4 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,11 +285,11 @@ function formatValue(ctx, value, recurseTimes) {
}
}

var base = '', empty = keys.length === 0, braces, formatter;
var base = '', empty, braces, formatter;

@bnoordhuis bnoordhuis Apr 23, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Preferably assign empty = false and use strict checks below (i.e. empty = empty === true && keys.length === 0 and if (empty === true) {.)

It's a minor thing but V8 emits marginally tighter code for strict boolean comparisons.


if (Array.isArray(value)) {
braces = ['[', ']'];
empty = empty && value.length === 0;
empty = value.length === 0;
formatter = formatArray;
} else if (value instanceof Set) {
braces = ['Set {', '}'];
Expand All @@ -298,14 +298,14 @@ function formatValue(ctx, value, recurseTimes) {
// property isn't selected by Object.getOwnPropertyNames().
if (ctx.showHidden)
keys.unshift('size');
empty = empty && value.size === 0;
empty = value.size === 0;
formatter = formatSet;
} else if (value instanceof Map) {
braces = ['Map {', '}'];
// ditto
if (ctx.showHidden)
keys.unshift('size');
empty = empty && value.size === 0;
empty = value.size === 0;
formatter = formatMap;
} else {
// Only create a mirror if the object superficially looks like a Promise
Expand All @@ -316,10 +316,13 @@ function formatValue(ctx, value, recurseTimes) {
formatter = formatPromise;
} else {
braces = ['{', '}'];
empty = true; // no other data than keys

@bnoordhuis bnoordhuis Apr 23, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Femto-style nit: two spaces before the comment and please capitalize and punctuate it. Ditto for other comments.

formatter = formatObject;
}
}

empty = empty && keys.length === 0;

// Make functions say that they are functions
if (typeof value === 'function') {
var n = value.name ? ': ' + value.name : '';
Expand Down