Skip to content

Commit f65aa08

Browse files
targosjasnell
authored andcommitted
util: improve inspect for (Async|Generator)Function
Use the constructor name in the output, if present. PR-URL: #11210 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Evan Lucas <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Timothy Gu <[email protected]>
1 parent 615789b commit f65aa08

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

lib/util.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -400,11 +400,14 @@ function formatValue(ctx, value, recurseTimes) {
400400
});
401401
}
402402

403+
var constructor = getConstructorOf(value);
404+
403405
// Some type of object without properties can be shortcutted.
404406
if (keys.length === 0) {
405407
if (typeof value === 'function') {
406-
return ctx.stylize(`[Function${value.name ? `: ${value.name}` : ''}]`,
407-
'special');
408+
const ctorName = constructor ? constructor.name : 'Function';
409+
return ctx.stylize(
410+
`[${ctorName}${value.name ? `: ${value.name}` : ''}]`, 'special');
408411
}
409412
if (isRegExp(value)) {
410413
return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
@@ -440,12 +443,11 @@ function formatValue(ctx, value, recurseTimes) {
440443
// Can't do the same for DataView because it has a non-primitive
441444
// .buffer property that we need to recurse for.
442445
if (binding.isArrayBuffer(value) || binding.isSharedArrayBuffer(value)) {
443-
return `${getConstructorOf(value).name}` +
446+
return `${constructor.name}` +
444447
` { byteLength: ${formatNumber(ctx, value.byteLength)} }`;
445448
}
446449
}
447450

448-
var constructor = getConstructorOf(value);
449451
var base = '', empty = false, braces;
450452
var formatter = formatObject;
451453

@@ -536,7 +538,8 @@ function formatValue(ctx, value, recurseTimes) {
536538

537539
// Make functions say that they are functions
538540
if (typeof value === 'function') {
539-
base = ` [Function${value.name ? `: ${value.name}` : ''}]`;
541+
const ctorName = constructor ? constructor.name : 'Function';
542+
base = ` [${ctorName}${value.name ? `: ${value.name}` : ''}]`;
540543
}
541544

542545
// Make RegExps say that they are RegExps

test/parallel/test-util-inspect.js

+6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ assert.strictEqual(util.inspect(false), 'false');
99
assert.strictEqual(util.inspect(''), "''");
1010
assert.strictEqual(util.inspect('hello'), "'hello'");
1111
assert.strictEqual(util.inspect(function() {}), '[Function]');
12+
assert.strictEqual(util.inspect(async function() {}), '[AsyncFunction]');
13+
assert.strictEqual(util.inspect(function*() {}), '[GeneratorFunction]');
1214
assert.strictEqual(util.inspect(undefined), 'undefined');
1315
assert.strictEqual(util.inspect(null), 'null');
1416
assert.strictEqual(util.inspect(/foo(bar\n)?/gi), '/foo(bar\\n)?/gi');
@@ -28,6 +30,10 @@ assert.strictEqual(util.inspect([1, [2, 3]]), '[ 1, [ 2, 3 ] ]');
2830
assert.strictEqual(util.inspect({}), '{}');
2931
assert.strictEqual(util.inspect({a: 1}), '{ a: 1 }');
3032
assert.strictEqual(util.inspect({a: function() {}}), '{ a: [Function: a] }');
33+
assert.strictEqual(util.inspect({a: async function() {}}),
34+
'{ a: [AsyncFunction: a] }');
35+
assert.strictEqual(util.inspect({a: function*() {}}),
36+
'{ a: [GeneratorFunction: a] }');
3137
assert.strictEqual(util.inspect({a: 1, b: 2}), '{ a: 1, b: 2 }');
3238
assert.strictEqual(util.inspect({'a': {}}), '{ a: {} }');
3339
assert.strictEqual(util.inspect({'a': {'b': 2}}), '{ a: { b: 2 } }');

0 commit comments

Comments
 (0)