Skip to content

util: add support for error subclassing and null prototype #23852

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
antsmartian wants to merge 2 commits into from
Closed

util: add support for error subclassing and null prototype #23852

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5887e9f
util: add support for error subclassing and null handling
antsmartian Oct 24, 2018
d18e25e
addressing review comments
Nov 10, 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
Prev Previous commit
addressing review comments
  • Loading branch information
abelginrayen
abelginrayen committed Nov 10, 2018
commit d18e25ecb8bb141bc21020c518c59bbb86867550
30 changes: 8 additions & 22 deletions lib/internal/util/inspect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,8 +642,9 @@ function formatRaw(ctx, value, recurseTimes) {
}
base = dateToISOString(value);
} else if (isError(value)) {
const prefix = getPrefix(constructor, '', 'Error');
// Make error with message first say the error.
base = formatError(value, getPrefix(constructor, '', 'Error'));
base = formatError(value, prefix);
// Wrap the error in brackets in case it has no stack trace.
const stackStart = base.indexOf('\n at');
if (stackStart === -1) {
Expand All @@ -652,8 +653,7 @@ function formatRaw(ctx, value, recurseTimes) {
// The message and the stack have to be indented as well!
if (ctx.indentationLvl !== 0) {
const indentation = ' '.repeat(ctx.indentationLvl);
base = formatError(value, getPrefix(constructor, '', 'Error'))
.replace(/\n/g, `\n${indentation}`);
base = formatError(value, prefix).replace(/\n/g, `\n${indentation}`);
}
if (keys.length === 0)
return base;
Expand Down Expand Up @@ -863,27 +863,13 @@ function formatPrimitive(fn, value, ctx) {
}

function formatError(value, constructorName) {

if (value.stack) {
let stack = value.stack;
if (!stack.startsWith(constructorName) &&
!(stack.startsWith('file:') && !constructorName.startsWith('file'))) {
const stackStart = value.stack.indexOf('\n at');
const errorAndMessage = value.stack.slice(0, stackStart);
const messageStart = errorAndMessage.indexOf(':');
if (stack && stackStart !== -1) {
stack = stack.slice(stackStart, stack.length);
if (messageStart !== -1) {
const message = errorAndMessage.slice(messageStart + 2,
stackStart.length);
// Reconstruct the stack
stack = constructorName.trim() + ': ' + message.trim() + stack;
} else {
stack = constructorName.trim() + stack;
}
}

return stack;
const parent = Object.getPrototypeOf(value);
if (!stack.startsWith(constructorName)) {
stack = stack.replace(parent, constructorName.trim());
} else if (parent === null) {
stack = stack.replace('Error', constructorName.trim());
}
return stack;
}
Expand Down