swc-project/swc
1
1
Fork 0
mirror of https://github.com/swc-project/swc.git synced 2024-11-26 09:54:22 +03:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix(es/minifier): Collect raw str values for new Tpl element (#9261)

Browse Source 
**Description:**

Convert `raw` value to `cooked` for creating a new Tpl element.


**Related issue:**

 - Closes https://github.com/swc-project/swc/issues/9184
This commit is contained in:
pshu 2024-07-17 13:50:04 +08:00 committed by GitHub
parent 38c8453103
commit 6ddbfa04db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/swc_ecma_minifier/src/compress/pure/strings.rs
View File

@ -121,13 +121,15 @@ impl Pure<'_> {
quasis: Default::default(), quasis: Default::default(),
exprs: Default::default(), exprs: Default::default(),
}; };
let mut cur_str_value = String::new(); let mut cur_cooked_str = String::new();
let mut cur_raw_str = String::new();
for idx in 0..(tpl.quasis.len() + tpl.exprs.len()) { for idx in 0..(tpl.quasis.len() + tpl.exprs.len()) {
if idx % 2 == 0 { if idx % 2 == 0 {
let q = tpl.quasis[idx / 2].take(); let q = tpl.quasis[idx / 2].take();
cur_str_value.push_str(q.cooked.as_deref().unwrap_or(&*q.raw)); cur_cooked_str.push_str(&Str::from_tpl_raw(&q.raw));
cur_raw_str.push_str(&q.raw);
} else { } else {
let mut e = tpl.exprs[idx / 2].take(); let mut e = tpl.exprs[idx / 2].take();
self.eval_nested_tpl(&mut e); self.eval_nested_tpl(&mut e);
@ -141,16 +143,19 @@ impl Pure<'_> {
if idx % 2 == 0 { if idx % 2 == 0 {
let q = e.quasis[idx / 2].take(); let q = e.quasis[idx / 2].take();
cur_str_value.push_str(q.cooked.as_deref().unwrap_or(&*q.raw)); cur_cooked_str.push_str(Str::from_tpl_raw(&q.raw).as_ref());
cur_raw_str.push_str(&q.raw);
} else { } else {
let s = Atom::from(&*cur_str_value); let cooked = Atom::from(&*cur_cooked_str);
cur_str_value.clear(); let raw = Atom::from(&*cur_raw_str);
cur_cooked_str.clear();
cur_raw_str.clear();
new_tpl.quasis.push(TplElement { new_tpl.quasis.push(TplElement {
span: DUMMY_SP, span: DUMMY_SP,
tail: false, tail: false,
cooked: Some(s.clone()), cooked: Some(cooked),
raw: s, raw,
}); });
let e = e.exprs[idx / 2].take(); let e = e.exprs[idx / 2].take();
@ -160,14 +165,16 @@ impl Pure<'_> {
} }
} }
_ => { _ => {
let s = Atom::from(&*cur_str_value); let cooked = Atom::from(&*cur_cooked_str);
cur_str_value.clear(); let raw = Atom::from(&*cur_raw_str);
cur_cooked_str.clear();
cur_raw_str.clear();
new_tpl.quasis.push(TplElement { new_tpl.quasis.push(TplElement {
span: DUMMY_SP, span: DUMMY_SP,
tail: false, tail: false,
cooked: Some(s.clone()), cooked: Some(cooked),
raw: s, raw,
}); });
new_tpl.exprs.push(e); new_tpl.exprs.push(e);
@ -176,12 +183,13 @@ impl Pure<'_> {
} }
} }
let s = Atom::from(&*cur_str_value); let cooked = Atom::from(&*cur_cooked_str);
let raw = Atom::from(&*cur_raw_str);
new_tpl.quasis.push(TplElement { new_tpl.quasis.push(TplElement {
span: DUMMY_SP, span: DUMMY_SP,
tail: false, tail: false,
cooked: Some(s.clone()), cooked: Some(cooked),
raw: s, raw,
}); });
*e = new_tpl.into(); *e = new_tpl.into();

20
crates/swc_ecma_minifier/tests/exec.rs
View File

@ -11325,3 +11325,23 @@ fn issue_9010() {
"#, "#,
); );
} }
#[test]
fn issue_9184() {
run_default_exec_test(
r#"
let pi= Math.random() >1.1 ? "foo": "bar";
console.log(`(${`${pi}`} - ${`\\*${pi}`})`)
"#,
);
}
#[test]
fn issue_9184_2() {
run_default_exec_test(
r#"
let pi= Math.random() < -1 ? "foo": "bar";
console.log(`(${`${pi}`} - ${`\\*${pi}`})`)
"#,
);
}