dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-19 04:08:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(codegen): print TemplateLiteral with print_str (#2207)

Browse source
This commit is contained in:
Wenzhe Wang 2024-01-29 23:09:29 +08:00 committed by GitHub
parent 71898ffdd5
commit 9333264428
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 44 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
crates/oxc_codegen/src/gen.rs
View file

@ -1098,9 +1098,7 @@ fn choose_quote(s: &str) -> char {
}
}
fn print_str<const MINIFY: bool>(s: &str, p: &mut Codegen<{ MINIFY }>) {
let quote = choose_quote(s);
p.print(quote as u8);
fn print_unquoted_str<const MINIFY: bool>(s: &str, quote: char, p: &mut Codegen<{ MINIFY }>) {
let mut chars = s.chars();
while let Some(c) = chars.next() {
@ -1153,6 +1151,20 @@ fn print_str<const MINIFY: bool>(s: &str, p: &mut Codegen<{ MINIFY }>) {
p.print_str(b"\"");
}
}
'`' => {
if quote == '`' {
p.print_str(b"\\`");
} else {
p.print_str(b"`");
}
}
'$' => {
if chars.clone().next().is_some_and(|next| next == '{') {
p.print_str(b"\\$");
} else {
p.print_str(b"$");
}
}
// Allow `U+2028` and `U+2029` in string literals
// <https://tc39.es/proposal-json-superset>
// <https://github.com/tc39/proposal-json-superset>
@ -1164,12 +1176,15 @@ fn print_str<const MINIFY: bool>(s: &str, p: &mut Codegen<{ MINIFY }>) {
_ => p.print_str(c.escape_default().to_string().as_bytes()),
}
}
p.print(quote as u8);
}
impl<const MINIFY: bool> Gen<MINIFY> for StringLiteral {
fn gen(&self, p: &mut Codegen<{ MINIFY }>, _ctx: Context) {
print_str(self.value.as_str(), p);
let s = &self.value.as_str();
let quote = choose_quote(s);
p.print(quote as u8);
print_unquoted_str(s, quote, p);
p.print(quote as u8);
}
}
@ -1725,7 +1740,9 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for TemplateLiteral<'a> {
let mut expressions = self.expressions.iter();
for quasi in &self.quasis {
p.print_str(quasi.value.raw.as_bytes());
if let Some(cooked) = &quasi.value.cooked {
print_unquoted_str(cooked.as_str(), '`', p);
}
if let Some(expr) = expressions.next() {
p.print_str(b"${");

42
crates/oxc_codegen/tests/mod.rs
View file

@ -5,10 +5,11 @@ use oxc_span::SourceType;
fn test(source_text: &str, expected: &str) {
let allocator = Allocator::default();
let program = Parser::new(&allocator, source_text, SourceType::default()).parse().program;
let source_type = SourceType::default().with_module(true);
let program = Parser::new(&allocator, source_text, source_type).parse().program;
let program = allocator.alloc(program);
let result = Codegen::<false>::new(source_text.len(), CodegenOptions).build(program);
assert_eq!(expected, result, "for source {source_text}");
assert_eq!(expected, result, "for source {source_text}, expect {expected}, got {result}");
}
#[test]
@ -55,25 +56,24 @@ fn string() {
}
#[test]
#[ignore]
fn template() {
fn test_template_1() {
test("let x = `\\0`", "let x = `\\0`;\n");
test("let x = `\\x01`", "let x = `\x01`;\n");
// test("let x = `\\x01`", "let x = `\\x01`;\n");
test("let x = `\\0${0}`", "let x = `\\0${0}`;\n");
test("let x = `\\x01${0}`", "let x = `\x01${0}`;\n");
// test("let x = `\\x01${0}`", "let x = `\x01${0}`;\n");
test("let x = `${0}\\0`", "let x = `${0}\\0`;\n");
test("let x = `${0}\\x01`", "let x = `${0}\x01`;\n");
// test("let x = `${0}\\x01`", "let x = `${0}\x01`;\n");
test("let x = `${0}\\0${1}`", "let x = `${0}\\0${1}`;\n");
test("let x = `${0}\\x01${1}`", "let x = `${0}\x01${1}`;\n");
// test("let x = `${0}\\x01${1}`", "let x = `${0}\x01${1}`;\n");
test("let x = String.raw`\\1`", "let x = String.raw`\\1`;\n");
test("let x = String.raw`\\x01`", "let x = String.raw`\\x01`;\n");
test("let x = String.raw`\\1${0}`", "let x = String.raw`\\1${0}`;\n");
test("let x = String.raw`\\x01${0}`", "let x = String.raw`\\x01${0}`;\n");
test("let x = String.raw`${0}\\1`", "let x = String.raw`${0}\\1`;\n");
test("let x = String.raw`${0}\\x01`", "let x = String.raw`${0}\\x01`;\n");
test("let x = String.raw`${0}\\1${1}`", "let x = String.raw`${0}\\1${1}`;\n");
test("let x = String.raw`${0}\\x01${1}`", "let x = String.raw`${0}\\x01${1}`;\n");
// test("let x = String.raw`\\1`", "let x = String.raw`\\1`;\n");
// test("let x = String.raw`\\x01`", "let x = String.raw`\\x01`;\n");
// test("let x = String.raw`\\1${0}`", "let x = String.raw`\\1${0}`;\n");
// test("let x = String.raw`\\x01${0}`", "let x = String.raw`\\x01${0}`;\n");
// test("let x = String.raw`${0}\\1`", "let x = String.raw`${0}\\1`;\n");
// test("let x = String.raw`${0}\\x01`", "let x = String.raw`${0}\\x01`;\n");
// test("let x = String.raw`${0}\\1${1}`", "let x = String.raw`${0}\\1${1}`;\n");
// test("let x = String.raw`${0}\\x01${1}`", "let x = String.raw`${0}\\x01${1}`;\n");
test("let x = `${y}`", "let x = `${y}`;\n");
test("let x = `$(y)`", "let x = `$(y)`;\n");
@ -84,7 +84,7 @@ fn template() {
test("await tag`x`", "await tag`x`;\n");
test("await (tag`x`)", "await tag`x`;\n");
test("(await tag)`x`", "(await tag)`x`;\n");
// test("(await tag)`x`", "(await tag)`x`;\n");
test("await tag`${x}`", "await tag`${x}`;\n");
test("await (tag`${x}`)", "await tag`${x}`;\n");
@ -92,13 +92,13 @@ fn template() {
test("new tag`x`", "new tag`x`();\n");
test("new (tag`x`)", "new tag`x`();\n");
test("new tag()`x`", "new tag()`x`;\n");
test("(new tag)`x`", "new tag()`x`;\n");
// test("new tag()`x`", "new tag()`x`;\n");
// test("(new tag)`x`", "new tag()`x`;\n");
test("new tag`${x}`", "new tag`${x}`();\n");
test("new (tag`${x}`)", "new tag`${x}`();\n");
test("new tag()`${x}`", "new tag()`${x}`;\n");
test("(new tag)`${x}`", "new tag()`${x}`;\n");
// test("new tag()`${x}`", "new tag()`${x}`;\n");
// test("(new tag)`${x}`", "new tag()`${x}`;\n");
}
#[test]