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

fix(minifer): keep idents if not in scope when minimizing array exprs (#8551)

Browse source
This commit is contained in:
camc314 2025-01-16 14:26:37 +00:00
parent 7cc81ef5ef
commit 65c596d002
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
crates/oxc_minifier/src/ast_passes/peephole_remove_dead_code.rs
View file

@ -414,10 +414,11 @@ impl<'a, 'b> PeepholeRemoveDeadCode {
let mut pending_spread_elements = ctx.ast.vec();
if array_expr.elements.len() == 0
|| array_expr
.elements
.iter()
.all(|el| matches!(el, ArrayExpressionElement::SpreadElement(_)))
|| array_expr.elements.iter().all(|el| match el {
ArrayExpressionElement::SpreadElement(_) => true,
ArrayExpressionElement::Identifier(ident) => ctx.is_global_reference(ident),
_ => false,
})
{
return None;
}
@ -433,7 +434,7 @@ impl<'a, 'b> PeepholeRemoveDeadCode {
let el = el.to_expression_mut();
let el_expr = ctx.ast.move_expression(el);
if !el_expr.is_literal_value(false)
&& !matches!(el_expr, Expression::Identifier(_))
&& !matches!(&el_expr, Expression::Identifier(ident) if !ctx.is_global_reference(ident))
{
if pending_spread_elements.len() > 0 {
// flush pending spread elements
@ -703,7 +704,8 @@ mod test {
fn test_array_literal() {
fold("([])", "");
fold("([1])", "");
fold("([a])", "");
fold("([a])", "[a]");
fold("var a; ([a])", "var a;");
fold("([foo()])", "foo()");
fold_same("baz.map((v) => [v])");
}
@ -711,9 +713,11 @@ mod test {
#[test]
fn test_array_literal_containing_spread() {
fold_same("([...c])");
fold("([4, ...c, a])", "([...c])");
fold("([4, ...c, a])", "([...c], a)");
fold("var a; ([4, ...c, a])", "var a; ([...c])");
fold("([foo(), ...c, bar()])", "(foo(), [...c], bar())");
fold("([...a, b, ...c])", "([...a, ...c])");
fold("([...a, b, ...c])", "([...a, b, ...c])");
fold("var b; ([...a, b, ...c])", "var b; ([...a, ...c])");
fold_same("([...b, ...c])"); // It would also be fine if the spreads were split apart.
}