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

fix(cli/console): quote object symbol keys that are invalid identifiers (#7553)

Browse source
This commit is contained in:
Casper Beyer 2020-09-22 23:10:02 +08:00 committed by GitHub
parent c30c782c2c
commit a33315aaa7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cli/rt/02_console.js
View file

@ -481,6 +481,19 @@
return quoteString(string);
}
// Surround a symbol's description in quotes when it is required (e.g the description has non printable characters).
function maybeQuoteSymbol(symbol) {
if (symbol.description === undefined) {
return symbol.toString();
}
if (/^[a-zA-Z_][a-zA-Z_.0-9]*$/.test(symbol.description)) {
return symbol.toString();
}
return `Symbol(${quoteString(symbol.description)})`;
}
// Print strings when they are inside of arrays or objects with quotes
function inspectValueWithQuotes(
value,
@ -734,7 +747,7 @@
}
for (const key of symbolKeys) {
entries.push(
`${replaceEscapeSequences(key.toString())}: ${
`${maybeQuoteSymbol(key)}: ${
inspectValueWithQuotes(
value[key],
ctx,

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

@ -110,6 +110,24 @@ unitTest(
),
`{ "foo\\b": "bar\\n", "bar\\r": "baz\\t", "qux\\x00": "qux\\x00" }`,
);
assertEquals(
stringify(
{
[Symbol("foo\b")]: `Symbol("foo\n")`,
[Symbol("bar\n")]: `Symbol("bar\n")`,
[Symbol("bar\r")]: `Symbol("bar\r")`,
[Symbol("baz\t")]: `Symbol("baz\t")`,
[Symbol("qux\0")]: `Symbol("qux\0")`,
},
),
`{
Symbol("foo\\b"): 'Symbol("foo\\n\")',
Symbol("bar\\n"): 'Symbol("bar\\n\")',
Symbol("bar\\r"): 'Symbol("bar\\r\")',
Symbol("baz\\t"): 'Symbol("baz\\t\")',
Symbol("qux\\x00"): 'Symbol(\"qux\\x00")'
}`,
);
assertEquals(
stringify(new Set(["foo\n", "foo\r", "foo\0"])),
`Set { "foo\\n", "foo\\r", "foo\\x00" }`,