refactor(minifier): implement array helpers for folding constructor

oxc-project · Oct 2, 2024 · 5f18f8b · 5f18f8b
1 parent 1131f92
commit 5f18f8b
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/crates/oxc_minifier/src/ast_passes/peephole_substitute_alternate_syntax.rs b/crates/oxc_minifier/src/ast_passes/peephole_substitute_alternate_syntax.rs
@@ -340,16 +340,8 @@ impl<'a> PeepholeSubstituteAlternateSyntax {
                     }
                     // `new Array(8)` -> `Array(8)`
                     else if arg.is_number_literal() {
-                        let mut arguments = Vec::new_in(ctx.ast.allocator);
-                        arguments
-                            .push(ctx.ast.argument_expression((*arg).clone_in(ctx.ast.allocator)));
-                        *expr = ctx.ast.expression_call(
-                            new_expr.span,
-                            new_expr.callee.clone_in(ctx.ast.allocator),
-                            NONE,
-                            arguments,
-                            false,
-                        )
+                        *expr = self.array_constructor_call(&new_expr.arguments, ctx);
+                        self.changed = true;
                     }
                     // `new Array(literal)` -> `[literal]`
                     else if arg.is_literal() {
@@ -363,13 +355,8 @@ impl<'a> PeepholeSubstituteAlternateSyntax {
                     }
                     // `new Array()` -> `Array()`
                     else {
-                        *expr = ctx.ast.expression_call(
-                            new_expr.span,
-                            new_expr.callee.clone_in(ctx.ast.allocator),
-                            NONE,
-                            new_expr.arguments.clone_in(ctx.ast.allocator),
-                            false,
-                        )
+                        *expr = self.array_constructor_call(&new_expr.arguments, ctx);
+                        self.changed = true;
                     }
                 }
             }
@@ -395,6 +382,16 @@ impl<'a> PeepholeSubstituteAlternateSyntax {
             }
         }
     }
+
+    /// returns an `Array()` constructor call with zero, one, or more arguments
+    fn array_constructor_call(
+        &self,
+        arguments: &Vec<'a, Argument<'a>>,
+        ctx: &mut TraverseCtx<'a>,
+    ) -> Expression<'a> {
+        let callee = ctx.ast.expression_identifier_reference(SPAN, "Array");
+        ctx.ast.expression_call(SPAN, callee, NONE, arguments.clone_in(ctx.ast.allocator), false)
+    }
 }
 
 /// <https://github.com/google/closure-compiler/blob/master/test/com/google/javascript/jscomp/PeepholeSubstituteAlternateSyntax.java>