foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-21 21:50:00 -05:00
Code Issues Packages 1 Wiki Activity

fix: don't swallow customInspect exceptions (#9095)

Browse source
This commit is contained in:
Steven Guerrero 2021-01-14 14:18:51 -05:00 • committed by GitHub
parent 979d71c883
commit 2d1208556a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cli/tests/unit/console_test.ts
View file

@ -12,6 +12,7 @@ import {
assert,
assertEquals,
assertStringIncludes,
assertThrows,
unitTest,
} from "./test_util.ts";
import { stripColor } from "../../../std/fmt/colors.ts";
@ -834,19 +835,11 @@ unitTest(function consoleTestWithCustomInspectorError(): void {
}
}
assertEquals(stringify(new A()), "A {}");
class B {
constructor(public field: { a: string }) {}
[customInspect](): string {
return this.field.a;
}
}
assertEquals(stringify(new B({ a: "a" })), "a");
assertEquals(
stringify(B.prototype),
"B { [Symbol(Deno.customInspect)]: [Function: [Deno.customInspect]] }",
assertThrows(
() => stringify(new A()),
Error,
"BOOM",
"Custom inspect won't attempt to parse if user defined function throws",
);
});

18
runtime/js/02_console.js
View file

@ -190,11 +190,7 @@
function inspectFunction(value, _ctx) {
if (customInspect in value && typeof value[customInspect] === "function") {
try {
return String(value[customInspect]());
} catch {
// pass
}
return String(value[customInspect]());
}
// Might be Function/AsyncFunction/GeneratorFunction/AsyncGeneratorFunction
let cstrName = Object.getPrototypeOf(value)?.constructor?.name;
@ -865,11 +861,7 @@
inspectOptions,
) {
if (customInspect in value && typeof value[customInspect] === "function") {
try {
return String(value[customInspect]());
} catch {
// pass
}
return String(value[customInspect]());
}
// This non-unique symbol is used to support op_crates, ie.
// in op_crates/web we don't want to depend on unique "Deno.customInspect"
@ -880,11 +872,7 @@
nonUniqueCustomInspect in value &&
typeof value[nonUniqueCustomInspect] === "function"
) {
try {
return String(value[nonUniqueCustomInspect]());
} catch {
// pass
}
return String(value[nonUniqueCustomInspect]());
}
if (value instanceof Error) {
return String(value.stack);