foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-25 15:29:32 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext/console): fix uncaught TypeError in css styling (#13567)

Browse source 
When using css coloring in the console, non-color values should be ignored rather than throw exceptions.
Fixes #13469
This commit is contained in:
Zach 2022-02-06 05:00:06 -05:00 committed by GitHub
parent 8cc9a9350b
commit a7850d7fe6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1000,6 +1000,7 @@ Deno.test(function consoleTestWithStyleSpecifier() {
});
Deno.test(function consoleParseCssColor() {
assertEquals(parseCssColor("inherit"), null);
assertEquals(parseCssColor("black"), [0, 0, 0]);
assertEquals(parseCssColor("darkmagenta"), [139, 0, 139]);
assertEquals(parseCssColor("slateblue"), [106, 90, 205]);
@ -1019,6 +1020,14 @@ Deno.test(function consoleParseCssColor() {
});
Deno.test(function consoleParseCss() {
assertEquals(
parseCss("background-color: inherit"),
{ ...DEFAULT_CSS, backgroundColor: "inherit" },
);
assertEquals(
parseCss("color: inherit"),
{ ...DEFAULT_CSS, color: "inherit" },
);
assertEquals(
parseCss("background-color: red"),
{ ...DEFAULT_CSS, backgroundColor: "red" },
@ -1073,10 +1082,22 @@ Deno.test(function consoleParseCss() {
});
Deno.test(function consoleCssToAnsi() {
assertEquals(
cssToAnsiEsc({ ...DEFAULT_CSS, backgroundColor: "inherit" }),
"_[49m",
);
assertEquals(
cssToAnsiEsc({ ...DEFAULT_CSS, backgroundColor: "foo" }),
"_[49m",
);
assertEquals(
cssToAnsiEsc({ ...DEFAULT_CSS, backgroundColor: "black" }),
"_[40m",
);
assertEquals(
cssToAnsiEsc({ ...DEFAULT_CSS, color: "inherit" }),
"_[39m",
);
assertEquals(
cssToAnsiEsc({ ...DEFAULT_CSS, color: "blue" }),
"_[34m",
@ -1572,6 +1593,13 @@ Deno.test(function consoleLogShouldNotThrowError() {
});
});
Deno.test(function consoleLogShouldNotThrowErrorWhenInvalidCssColorsAreGiven() {
mockConsole((console, out) => {
console.log("%cfoo", "color: foo; background-color: bar;");
assertEquals(stripColor(out.toString()), "foo\n");
});
});
// console.log(Invalid Date) test
Deno.test(function consoleLogShoultNotThrowErrorWhenInvalidDateIsPassed() {
mockConsole((console, out) => {

28
ext/console/02_console.js
View file

@ -1621,10 +1621,18 @@
} else if (css.backgroundColor == "white") {
ansi += `\x1b[47m`;
} else {
const [r, g, b] = ArrayIsArray(css.backgroundColor)
? css.backgroundColor
: parseCssColor(css.backgroundColor);
if (ArrayIsArray(css.backgroundColor)) {
const [r, g, b] = css.backgroundColor;
ansi += `\x1b[48;2;${r};${g};${b}m`;
} else {
const parsed = parseCssColor(css.backgroundColor);
if (parsed !== null) {
const [r, g, b] = parsed;
ansi += `\x1b[48;2;${r};${g};${b}m`;
} else {
ansi += "\x1b[49m";
}
}
}
}
if (!colorEquals(css.color, prevCss.color)) {
@ -1647,10 +1655,18 @@
} else if (css.color == "white") {
ansi += `\x1b[37m`;
} else {
const [r, g, b] = ArrayIsArray(css.color)
? css.color
: parseCssColor(css.color);
if (ArrayIsArray(css.color)) {
const [r, g, b] = css.color;
ansi += `\x1b[38;2;${r};${g};${b}m`;
} else {
const parsed = parseCssColor(css.color);
if (parsed !== null) {
const [r, g, b] = parsed;
ansi += `\x1b[38;2;${r};${g};${b}m`;
} else {
ansi += "\x1b[39m";
}
}
}
}
if (css.fontWeight != prevCss.fontWeight) {