Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/oxc_minifier/src/peephole/remove_dead_code.rs
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ mod test {

test("{'hi'}", "");
test("{x==3}", "x == 3");
test("{`hello ${foo}`}", "`hello ${foo}`");
test("{`hello ${foo}`}", "`${foo}`");
test("{ (function(){x++}) }", "");
test("{ (function foo(){x++; foo()}) }", "");
test("function f(){return;}", "function f(){}");
Expand Down
95 changes: 93 additions & 2 deletions crates/oxc_minifier/src/peephole/remove_unused_expression.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
use std::iter;

use oxc_ast::ast::*;
use oxc_ecmascript::{
ToPrimitive,
constant_evaluation::{DetermineValueType, IsLiteralValue, ValueType},
side_effects::MayHaveSideEffects,
};
Expand All @@ -18,9 +21,9 @@ impl<'a> PeepholeOptimizations {
Expression::NewExpression(e) => Self::fold_new_constructor(e, ctx),
Expression::LogicalExpression(_) => self.fold_logical_expression(e, ctx),
Expression::SequenceExpression(_) => self.fold_sequence_expression(e, ctx),
Expression::TemplateLiteral(_) => self.fold_template_literal(e, ctx),
// TODO
// Expression::TemplateLiteral(_)
// | Expression::ObjectExpression(_)
// Expression::ObjectExpression(_)
// | Expression::ConditionalExpression(_)
// | Expression::BinaryExpression(_)
// | Expression::CallExpression(_)
Expand Down Expand Up @@ -181,6 +184,79 @@ impl<'a> PeepholeOptimizations {
}
false
}

// "`${1}2${foo()}3`" -> "`${foo()}`"
fn fold_template_literal(&self, e: &mut Expression<'a>, ctx: Ctx<'a, '_>) -> bool {
let Expression::TemplateLiteral(temp_lit) = e else { return false };
if temp_lit.expressions.is_empty() {
return true;
}

let mut transformed_elements = ctx.ast.vec();
let mut pending_to_string_required_exprs = ctx.ast.vec();

for mut e in temp_lit.expressions.drain(..) {
if e.to_primitive(&ctx).is_symbol() != Some(false) {
pending_to_string_required_exprs.push(e);
} else if !self.remove_unused_expression(&mut e, ctx) {
if pending_to_string_required_exprs.len() > 0 {
// flush pending to string required expressions
let expressions =
ctx.ast.vec_from_iter(pending_to_string_required_exprs.drain(..));
let mut quasis = ctx.ast.vec_from_iter(
iter::repeat_with(|| {
ctx.ast.template_element(
e.span(),
false,
TemplateElementValue { raw: "".into(), cooked: Some("".into()) },
)
})
.take(expressions.len() + 1),
);
quasis
.last_mut()
.expect("template literal must have at least one quasi")
.tail = true;
transformed_elements.push(ctx.ast.expression_template_literal(
e.span(),
quasis,
expressions,
));
}
transformed_elements.push(e);
}
}

if pending_to_string_required_exprs.len() > 0 {
let expressions = ctx.ast.vec_from_iter(pending_to_string_required_exprs.drain(..));
let mut quasis = ctx.ast.vec_from_iter(
iter::repeat_with(|| {
ctx.ast.template_element(
temp_lit.span,
false,
TemplateElementValue { raw: "".into(), cooked: Some("".into()) },
)
})
.take(expressions.len() + 1),
);
quasis.last_mut().expect("template literal must have at least one quasi").tail = true;
transformed_elements.push(ctx.ast.expression_template_literal(
temp_lit.span,
quasis,
expressions,
));
}

if transformed_elements.is_empty() {
return true;
} else if transformed_elements.len() == 1 {
*e = transformed_elements.pop().unwrap();
return false;
}

*e = ctx.ast.expression_sequence(temp_lit.span, transformed_elements);
false
}
}

#[cfg(test)]
Expand Down Expand Up @@ -318,4 +394,19 @@ mod test {
test("({ [bar()]: foo() })", "bar(), foo()");
test_same("({ ...baz, [bar()]: foo() })");
}

#[test]
fn test_fold_template_literal() {
test("`a${b}c${d}e`", "`${b}${d}`");
test("`stuff ${x} ${1}`", "`${x}`");
test("`stuff ${1} ${y}`", "`${y}`");
test("`stuff ${x} ${y}`", "`${x}${y}`");
test("`stuff ${x ? 1 : 2} ${y}`", "x ? 1 : 2, `${y}`"); // can be improved to "x, `${y}`"
test("`stuff ${x} ${y ? 1 : 2}`", "`${x}`, y ? 1 : 2"); // can be improved to "`${x}`, y"
test("`stuff ${x} ${y ? 1 : 2} ${z}`", "`${x}`, y ? 1 : 2, `${z}`"); // can be improved to "`${x}`, y, `${z}`"

test("`4${c}${+a}`", "`${c}`, +a");
test("`${+foo}${c}${+bar}`", "+foo, `${c}`, +bar");
test("`${a}${+b}${c}`", "`${a}`, +b, `${c}`");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1457,7 +1457,7 @@ mod test {
fn test_template_string_to_string() {
test("x = `abcde`", "x = 'abcde'");
test("x = `ab cd ef`", "x = 'ab cd ef'");
test_same("`hello ${name}`");
test_same("x = `hello ${name}`");
test_same("tag `hello ${name}`");
test_same("tag `hello`");
test("x = `hello ${'foo'}`", "x = 'hello foo'");
Expand Down
Loading