terser 5.44.0 → 5.45.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v5.45.0
+
+ - Produce `void 0` instead of `undefined`, which is more safe
+
+## v5.44.1
+
+ - fix bitwise optimization changing the result of `&&`, `||`
+ - switches: make sure `var` is extracted from a deleted default case
+
 ## v5.44.0
 
  - Support `using` and `await using` declarations (#1635)

package/dist/bundle.min.js

@@ -132,6 +132,15 @@ function make_node(ctor, orig, props) {
     return new ctor(props);
 }
 
+/** Makes a `void 0` expression. Use instead of AST_Undefined which may conflict
+ * with an existing variable called `undefined` */
+function make_void_0(orig) {
+    return make_node(AST_UnaryPrefix, orig, {
+        operator: "void",
+        expression: make_node(AST_Number, orig, { value: 0 })
+    });
+}
+
 function push_uniq(array, el) {
     if (!array.includes(el))
         array.push(el);
@@ -13558,7 +13567,7 @@ function make_node_from_constant(val, orig) {
       case "boolean":
         return make_node(val ? AST_True : AST_False, orig);
       case "undefined":
-        return make_node(AST_Undefined, orig);
+        return make_void_0(orig);
       default:
         if (val === null) {
             return make_node(AST_Null, orig, { value: null });
@@ -16408,7 +16417,7 @@ function safe_to_read(tw, def) {
         if (def.fixed == null) {
             var orig = def.orig[0];
             if (orig instanceof AST_SymbolFunarg || orig.name == "arguments") return false;
-            def.fixed = make_node(AST_Undefined, orig);
+            def.fixed = make_void_0(orig);
         }
         return true;
     }
@@ -16706,7 +16715,7 @@ function mark_lambda(tw, descend, compressor) {
             if (d.orig.length > 1) return;
             if (d.fixed === undefined && (!this.uses_arguments || tw.has_directive("use strict"))) {
                 d.fixed = function() {
-                    return iife.args[i] || make_node(AST_Undefined, iife);
+                    return iife.args[i] || make_void_0(iife);
                 };
                 tw.loop_ids.set(d.id, tw.in_loop);
                 mark(tw, d, true);
@@ -17186,8 +17195,8 @@ function remove_initializers(var_statement) {
     return decls.length ? make_node(AST_Var, var_statement, { definitions: decls }) : null;
 }
 
-/** Called on code which we know is unreachable, to keep elements that affect outside of it. */
-function trim_unreachable_code(compressor, stat, target) {
+/** Called on code which won't be executed but has an effect outside of itself: `var`, `function` statements, `export`, `import`. */
+function extract_from_unreachable_code(compressor, stat, target) {
     walk(stat, node => {
         if (node instanceof AST_Var) {
             const no_initializers = remove_initializers(node);
@@ -17212,7 +17221,8 @@ function trim_unreachable_code(compressor, stat, target) {
             target.push(node);
             return true;
         }
-        if (node instanceof AST_Scope) {
+        if (node instanceof AST_Scope || node instanceof AST_Class) {
+            // Do not go into nested scopes
             return true;
         }
     });
@@ -17629,7 +17639,7 @@ function tighten_body(statements, compressor) {
                         }
                     } else {
                         if (!arg) {
-                            arg = make_node(AST_Undefined, sym).transform(compressor);
+                            arg = make_void_0(sym).transform(compressor);
                         } else if (arg instanceof AST_Lambda && arg.pinned()
                             || has_overlapping_symbol(fn, arg, fn_strict)) {
                             arg = null;
@@ -17869,7 +17879,7 @@ function tighten_body(statements, compressor) {
                     found = true;
                     if (node instanceof AST_VarDef) {
                         node.value = node.name instanceof AST_SymbolConst
-                            ? make_node(AST_Undefined, node.value) // `const` always needs value.
+                            ? make_void_0(node.value) // `const` always needs value.
                             : null;
                         return node;
                     }
@@ -18236,7 +18246,7 @@ function tighten_body(statements, compressor) {
         CHANGED = n != len;
         if (has_quit)
             has_quit.forEach(function (stat) {
-                trim_unreachable_code(compressor, stat, statements);
+                extract_from_unreachable_code(compressor, stat, statements);
             });
     }
 
@@ -18308,7 +18318,7 @@ function tighten_body(statements, compressor) {
             var stat = statements[i];
             if (prev) {
                 if (stat instanceof AST_Exit) {
-                    stat.value = cons_seq(stat.value || make_node(AST_Undefined, stat).transform(compressor));
+                    stat.value = cons_seq(stat.value || make_void_0(stat).transform(compressor));
                 } else if (stat instanceof AST_For) {
                     if (!(stat.init instanceof AST_DefinitionsLike)) {
                         const abort = walk(prev.body, node => {
@@ -18812,7 +18822,7 @@ function inline_into_call(self, compressor) {
             if (returned) {
                 returned = returned.clone(true);
             } else {
-                returned = make_node(AST_Undefined, self);
+                returned = make_void_0(self);
             }
             const args = self.args.concat(returned);
             return make_sequence(self, args).optimize(compressor);
@@ -18828,7 +18838,7 @@ function inline_into_call(self, compressor) {
             && returned.name === fn.argnames[0].name
         ) {
             const replacement =
-                (self.args[0] || make_node(AST_Undefined)).optimize(compressor);
+                (self.args[0] || make_void_0()).optimize(compressor);
 
             let parent;
             if (
@@ -18910,7 +18920,7 @@ function inline_into_call(self, compressor) {
 
     const can_drop_this_call = is_regular_func && compressor.option("side_effects") && fn.body.every(is_empty);
     if (can_drop_this_call) {
-        var args = self.args.concat(make_node(AST_Undefined, self));
+        var args = self.args.concat(make_void_0(self));
         return make_sequence(self, args).optimize(compressor);
     }
 
@@ -18929,9 +18939,9 @@ function inline_into_call(self, compressor) {
     return self;
 
     function return_value(stat) {
-        if (!stat) return make_node(AST_Undefined, self);
+        if (!stat) return make_void_0(self);
         if (stat instanceof AST_Return) {
-            if (!stat.value) return make_node(AST_Undefined, self);
+            if (!stat.value) return make_void_0(self);
             return stat.value.clone(true);
         }
         if (stat instanceof AST_SimpleStatement) {
@@ -19077,7 +19087,7 @@ function inline_into_call(self, compressor) {
             } else {
                 var symbol = make_node(AST_SymbolVar, name, name);
                 name.definition().orig.push(symbol);
-                if (!value && in_loop) value = make_node(AST_Undefined, self);
+                if (!value && in_loop) value = make_void_0(self);
                 append_var(decls, expressions, symbol, value);
             }
         }
@@ -19104,7 +19114,7 @@ function inline_into_call(self, compressor) {
                         operator: "=",
                         logical: false,
                         left: sym,
-                        right: make_node(AST_Undefined, name)
+                        right: make_void_0(name),
                     }));
                 }
             }
@@ -19417,6 +19427,11 @@ class Compressor extends TreeWalker {
         }
     }
 
+    /** True if compressor.self()'s result will be turned into a 32-bit integer.
+     * ex:
+     * ~{expr}
+     * (1, 2, {expr}) | 0
+     **/
     in_32_bit_context(other_operand_must_be_number) {
         if (!this.option("evaluate")) return false;
         var self = this.self();
@@ -19434,9 +19449,10 @@ class Compressor extends TreeWalker {
             if (
                 p instanceof AST_Binary
                     && (
-                        p.operator == "&&"
-                        || p.operator == "||"
-                        || p.operator == "??"
+                        // Don't talk about p.left. Can change branch taken
+                        p.operator == "&&" && p.right === self
+                        || p.operator == "||" && p.right === self
+                        || p.operator == "??" && p.right === self
                     )
                 || p instanceof AST_Conditional && p.condition !== self
                 || p.tail_node() === self
@@ -19595,7 +19611,7 @@ AST_Toplevel.DEFMETHOD("drop_console", function(options) {
                 set_flag(exp.expression, SQUEEZED);
                 self.args = [];
             } else {
-                return make_node(AST_Undefined, self);
+                return make_void_0(self);
             }
         }
     });
@@ -19623,12 +19639,7 @@ AST_Scope.DEFMETHOD("process_expression", function(insert, compressor) {
                     : make_node(AST_EmptyStatement, node);
             }
             return make_node(AST_SimpleStatement, node, {
-                body: node.value || make_node(AST_UnaryPrefix, node, {
-                    operator: "void",
-                    expression: make_node(AST_Number, node, {
-                        value: 0
-                    })
-                })
+                body: node.value || make_void_0(node)
             });
         }
         if (node instanceof AST_Class || node instanceof AST_Lambda && node !== self) {
@@ -20039,7 +20050,7 @@ function if_break_in_loop(self, compressor) {
                 body: self.condition
             }));
         }
-        trim_unreachable_code(compressor, self.body, body);
+        extract_from_unreachable_code(compressor, self.body, body);
         return make_node(AST_BlockStatement, self, {
             body: body
         });
@@ -20110,7 +20121,7 @@ def_optimize(AST_For, function(self, compressor) {
             if (cond instanceof AST_Node) cond = self.condition.tail_node().evaluate(compressor);
             if (!cond) {
                 var body = [];
-                trim_unreachable_code(compressor, self.body, body);
+                extract_from_unreachable_code(compressor, self.body, body);
                 if (self.init instanceof AST_Statement) {
                     body.push(self.init);
                 } else if (self.init) {
@@ -20146,7 +20157,7 @@ def_optimize(AST_If, function(self, compressor) {
         if (cond instanceof AST_Node) cond = self.condition.tail_node().evaluate(compressor);
         if (!cond) {
             var body = [];
-            trim_unreachable_code(compressor, self.body, body);
+            extract_from_unreachable_code(compressor, self.body, body);
             body.push(make_node(AST_SimpleStatement, self.condition, {
                 body: self.condition
             }));
@@ -20159,7 +20170,7 @@ def_optimize(AST_If, function(self, compressor) {
             }));
             body.push(self.body);
             if (self.alternative) {
-                trim_unreachable_code(compressor, self.alternative, body);
+                extract_from_unreachable_code(compressor, self.alternative, body);
             }
             return make_node(AST_BlockStatement, self, { body: body }).optimize(compressor);
         }
@@ -20231,8 +20242,8 @@ def_optimize(AST_If, function(self, compressor) {
         return make_node(self.body.CTOR, self, {
             value: make_node(AST_Conditional, self, {
                 condition   : self.condition,
-                consequent  : self.body.value || make_node(AST_Undefined, self.body),
-                alternative : self.alternative.value || make_node(AST_Undefined, self.alternative)
+                consequent  : self.body.value || make_void_0(self.body),
+                alternative : self.alternative.value || make_void_0(self.alternative),
             }).transform(compressor)
         }).optimize(compressor);
     }
@@ -20287,6 +20298,9 @@ def_optimize(AST_Switch, function(self, compressor) {
     var body = [];
     var default_branch;
     var exact_match;
+    // - compress self.body into `body`
+    // - find and deduplicate default branch
+    // - find the exact match (`case 1234` inside `switch(1234)`)
     for (var i = 0, len = self.body.length; i < len && !exact_match; i++) {
         branch = self.body[i];
         if (branch instanceof AST_Default) {
@@ -20316,6 +20330,7 @@ def_optimize(AST_Switch, function(self, compressor) {
         }
         body.push(branch);
     }
+    // i < len if we found an exact_match. eliminate the rest
     while (i < len) eliminate_branch(self.body[i++], body[body.length - 1]);
     self.body = body;
 
@@ -20387,7 +20402,7 @@ def_optimize(AST_Switch, function(self, compressor) {
         let i = body.length - 1;
         for (; i >= 0; i--) {
             let bbody = body[i].body;
-            if (is_break(bbody[bbody.length - 1], compressor)) bbody.pop();
+            while (is_break(bbody[bbody.length - 1], compressor)) bbody.pop();
             if (!is_inert_body(body[i])) break;
         }
         // i now points to the index of a branch that contains a body. By incrementing, it's
@@ -20403,9 +20418,9 @@ def_optimize(AST_Switch, function(self, compressor) {
                 let branch = body[j];
                 if (branch === default_or_exact) {
                     default_or_exact = null;
-                    body.pop();
+                    eliminate_branch(body.pop());
                 } else if (!branch.expression.has_side_effects(compressor)) {
-                    body.pop();
+                    eliminate_branch(body.pop());
                 } else {
                     break;
                 }
@@ -20519,15 +20534,16 @@ def_optimize(AST_Switch, function(self, compressor) {
         // and there's a side-effect somewhere. Just let the below paths take care of it.
     }
 
+    // Reintegrate `decl` (var statements)
     if (body.length > 0) {
         body[0].body = decl.concat(body[0].body);
     }
-
     if (body.length == 0) {
         return make_node(AST_BlockStatement, self, {
             body: decl.concat(statement(self.expression))
         }).optimize(compressor);
     }
+
     if (body.length == 1 && !has_nested_break(self)) {
         // This is the last case body, and we've already pruned any breaks, so it's
         // safe to hoist.
@@ -20607,7 +20623,7 @@ def_optimize(AST_Switch, function(self, compressor) {
         if (prev && !aborts(prev)) {
             prev.body = prev.body.concat(branch.body);
         } else {
-            trim_unreachable_code(compressor, branch, decl);
+            extract_from_unreachable_code(compressor, branch, decl);
         }
     }
     function branches_equivalent(branch, prev, insertBreak) {
@@ -20661,7 +20677,7 @@ def_optimize(AST_Try, function(self, compressor) {
     if (compressor.option("dead_code") && self.body.body.every(is_empty)) {
         var body = [];
         if (self.bcatch) {
-            trim_unreachable_code(compressor, self.bcatch, body);
+            extract_from_unreachable_code(compressor, self.bcatch, body);
         }
         if (self.bfinally) body.push(...self.bfinally.body);
         return make_node(AST_BlockStatement, self, {
@@ -20780,7 +20796,7 @@ def_optimize(AST_Call, function(self, compressor) {
             const value = condition.evaluate(compressor);
     
             if (value === 1 || value === true) {
-                return make_node(AST_Undefined, self);
+                return make_void_0(self).optimize(compressor);
             }
         }
     }    
@@ -21142,6 +21158,10 @@ def_optimize(AST_UnaryPrefix, function(self, compressor) {
     ) {
         return make_sequence(self, [e, make_node(AST_True, self)]).optimize(compressor);
     }
+    // Short-circuit common `void 0`
+    if (self.operator === "void" && e instanceof AST_Number && e.value === 0) {
+        return unsafe_undefined_ref(self, compressor) || self;
+    }
     var seq = self.lift_sequences(compressor);
     if (seq !== self) {
         return seq;
@@ -21152,7 +21172,7 @@ def_optimize(AST_UnaryPrefix, function(self, compressor) {
             self.expression = e;
             return self;
         } else {
-            return make_node(AST_Undefined, self).optimize(compressor);
+            return make_void_0(self).optimize(compressor);
         }
     }
     if (compressor.in_boolean_context()) {
@@ -21338,7 +21358,7 @@ def_optimize(AST_Binary, function(self, compressor) {
             if (expr instanceof AST_SymbolRef ? expr.is_declared(compressor)
                 : !(expr instanceof AST_PropAccess && compressor.option("ie8"))) {
                 self.right = expr;
-                self.left = make_node(AST_Undefined, self.left).optimize(compressor);
+                self.left = make_void_0(self.left).optimize(compressor);
                 if (self.operator.length == 2) self.operator += "=";
             }
         } else if (compressor.option("typeofs")
@@ -21351,7 +21371,7 @@ def_optimize(AST_Binary, function(self, compressor) {
             if (expr instanceof AST_SymbolRef ? expr.is_declared(compressor)
                 : !(expr instanceof AST_PropAccess && compressor.option("ie8"))) {
                 self.left = expr;
-                self.right = make_node(AST_Undefined, self.right).optimize(compressor);
+                self.right = make_void_0(self.right).optimize(compressor);
                 if (self.operator.length == 2) self.operator += "=";
             }
         } else if (self.left instanceof AST_SymbolRef
@@ -21992,7 +22012,8 @@ function is_atomic(lhs, self) {
     return lhs instanceof AST_SymbolRef || lhs.TYPE === self.TYPE;
 }
 
-def_optimize(AST_Undefined, function(self, compressor) {
+/** Apply the `unsafe_undefined` option: find a variable called `undefined` and turn `self` into a reference to it. */
+function unsafe_undefined_ref(self, compressor) {
     if (compressor.option("unsafe_undefined")) {
         var undef = find_variable(compressor, "undefined");
         if (undef) {
@@ -22005,14 +22026,15 @@ def_optimize(AST_Undefined, function(self, compressor) {
             return ref;
         }
     }
+    return null;
+}
+
+def_optimize(AST_Undefined, function(self, compressor) {
+    var symbolref = unsafe_undefined_ref(self, compressor);
+    if (symbolref) return symbolref;
     var lhs = compressor.is_lhs();
     if (lhs && is_atomic(lhs, self)) return self;
-    return make_node(AST_UnaryPrefix, self, {
-        operator: "void",
-        expression: make_node(AST_Number, self, {
-            value: 0
-        })
-    });
+    return make_void_0(self);
 });
 
 def_optimize(AST_Infinity, function(self, compressor) {
@@ -22699,7 +22721,7 @@ def_optimize(AST_Sub, function(self, compressor) {
                 }
             }
             if (retValue instanceof AST_Expansion) break FLATTEN;
-            retValue = retValue instanceof AST_Hole ? make_node(AST_Undefined, retValue) : retValue;
+            retValue = retValue instanceof AST_Hole ? make_void_0(retValue) : retValue;
             if (!flatten) values.unshift(retValue);
             while (--i >= 0) {
                 var value = elements[i];
@@ -22738,7 +22760,7 @@ def_optimize(AST_Chain, function (self, compressor) {
         if (parent instanceof AST_UnaryPrefix && parent.operator === "delete") {
             return make_node_from_constant(0, self);
         }
-        return make_node(AST_Undefined, self);
+        return make_void_0(self).optimize(compressor);
     }
     if (
         self.expression instanceof AST_PropAccess

package/lib/compress/common.js

@@ -87,7 +87,7 @@ import {
     walk_abort,
     walk_parent,
 } from "../ast.js";
-import { make_node, regexp_source_fix, string_template, makePredicate } from "../utils/index.js";
+import { make_node, make_void_0, regexp_source_fix, string_template, makePredicate } from "../utils/index.js";
 import { first_in_statement } from "../utils/first_in_statement.js";
 import { has_flag, TOP } from "./compressor-flags.js";
 
@@ -148,7 +148,7 @@ export function make_node_from_constant(val, orig) {
       case "boolean":
         return make_node(val ? AST_True : AST_False, orig);
       case "undefined":
-        return make_node(AST_Undefined, orig);
+        return make_void_0(orig);
       default:
         if (val === null) {
             return make_node(AST_Null, orig, { value: null });

package/lib/compress/index.js

@@ -146,6 +146,7 @@ import {
     defaults,
     HOP,
     make_node,
+    make_void_0,
     makePredicate,
     MAP,
     remove,
@@ -211,7 +212,7 @@ import {
     as_statement_array,
     is_func_expr,
 } from "./common.js";
-import { tighten_body, trim_unreachable_code } from "./tighten-body.js";
+import { tighten_body, extract_from_unreachable_code } from "./tighten-body.js";
 import { inline_into_symbolref, inline_into_call } from "./inline.js";
 import "./global-defs.js";
 
@@ -378,6 +379,11 @@ class Compressor extends TreeWalker {
         }
     }
 
+    /** True if compressor.self()'s result will be turned into a 32-bit integer.
+     * ex:
+     * ~{expr}
+     * (1, 2, {expr}) | 0
+     **/
     in_32_bit_context(other_operand_must_be_number) {
         if (!this.option("evaluate")) return false;
         var self = this.self();
@@ -395,9 +401,10 @@ class Compressor extends TreeWalker {
             if (
                 p instanceof AST_Binary
                     && (
-                        p.operator == "&&"
-                        || p.operator == "||"
-                        || p.operator == "??"
+                        // Don't talk about p.left. Can change branch taken
+                        p.operator == "&&" && p.right === self
+                        || p.operator == "||" && p.right === self
+                        || p.operator == "??" && p.right === self
                     )
                 || p instanceof AST_Conditional && p.condition !== self
                 || p.tail_node() === self
@@ -556,7 +563,7 @@ AST_Toplevel.DEFMETHOD("drop_console", function(options) {
                 set_flag(exp.expression, SQUEEZED);
                 self.args = [];
             } else {
-                return make_node(AST_Undefined, self);
+                return make_void_0(self);
             }
         }
     });
@@ -584,12 +591,7 @@ AST_Scope.DEFMETHOD("process_expression", function(insert, compressor) {
                     : make_node(AST_EmptyStatement, node);
             }
             return make_node(AST_SimpleStatement, node, {
-                body: node.value || make_node(AST_UnaryPrefix, node, {
-                    operator: "void",
-                    expression: make_node(AST_Number, node, {
-                        value: 0
-                    })
-                })
+                body: node.value || make_void_0(node)
             });
         }
         if (node instanceof AST_Class || node instanceof AST_Lambda && node !== self) {
@@ -1000,7 +1002,7 @@ function if_break_in_loop(self, compressor) {
                 body: self.condition
             }));
         }
-        trim_unreachable_code(compressor, self.body, body);
+        extract_from_unreachable_code(compressor, self.body, body);
         return make_node(AST_BlockStatement, self, {
             body: body
         });
@@ -1071,7 +1073,7 @@ def_optimize(AST_For, function(self, compressor) {
             if (cond instanceof AST_Node) cond = self.condition.tail_node().evaluate(compressor);
             if (!cond) {
                 var body = [];
-                trim_unreachable_code(compressor, self.body, body);
+                extract_from_unreachable_code(compressor, self.body, body);
                 if (self.init instanceof AST_Statement) {
                     body.push(self.init);
                 } else if (self.init) {
@@ -1107,7 +1109,7 @@ def_optimize(AST_If, function(self, compressor) {
         if (cond instanceof AST_Node) cond = self.condition.tail_node().evaluate(compressor);
         if (!cond) {
             var body = [];
-            trim_unreachable_code(compressor, self.body, body);
+            extract_from_unreachable_code(compressor, self.body, body);
             body.push(make_node(AST_SimpleStatement, self.condition, {
                 body: self.condition
             }));
@@ -1120,7 +1122,7 @@ def_optimize(AST_If, function(self, compressor) {
             }));
             body.push(self.body);
             if (self.alternative) {
-                trim_unreachable_code(compressor, self.alternative, body);
+                extract_from_unreachable_code(compressor, self.alternative, body);
             }
             return make_node(AST_BlockStatement, self, { body: body }).optimize(compressor);
         }
@@ -1192,8 +1194,8 @@ def_optimize(AST_If, function(self, compressor) {
         return make_node(self.body.CTOR, self, {
             value: make_node(AST_Conditional, self, {
                 condition   : self.condition,
-                consequent  : self.body.value || make_node(AST_Undefined, self.body),
-                alternative : self.alternative.value || make_node(AST_Undefined, self.alternative)
+                consequent  : self.body.value || make_void_0(self.body),
+                alternative : self.alternative.value || make_void_0(self.alternative),
             }).transform(compressor)
         }).optimize(compressor);
     }
@@ -1248,6 +1250,9 @@ def_optimize(AST_Switch, function(self, compressor) {
     var body = [];
     var default_branch;
     var exact_match;
+    // - compress self.body into `body`
+    // - find and deduplicate default branch
+    // - find the exact match (`case 1234` inside `switch(1234)`)
     for (var i = 0, len = self.body.length; i < len && !exact_match; i++) {
         branch = self.body[i];
         if (branch instanceof AST_Default) {
@@ -1277,6 +1282,7 @@ def_optimize(AST_Switch, function(self, compressor) {
         }
         body.push(branch);
     }
+    // i < len if we found an exact_match. eliminate the rest
     while (i < len) eliminate_branch(self.body[i++], body[body.length - 1]);
     self.body = body;
 
@@ -1348,7 +1354,7 @@ def_optimize(AST_Switch, function(self, compressor) {
         let i = body.length - 1;
         for (; i >= 0; i--) {
             let bbody = body[i].body;
-            if (is_break(bbody[bbody.length - 1], compressor)) bbody.pop();
+            while (is_break(bbody[bbody.length - 1], compressor)) bbody.pop();
             if (!is_inert_body(body[i])) break;
         }
         // i now points to the index of a branch that contains a body. By incrementing, it's
@@ -1364,9 +1370,9 @@ def_optimize(AST_Switch, function(self, compressor) {
                 let branch = body[j];
                 if (branch === default_or_exact) {
                     default_or_exact = null;
-                    body.pop();
+                    eliminate_branch(body.pop());
                 } else if (!branch.expression.has_side_effects(compressor)) {
-                    body.pop();
+                    eliminate_branch(body.pop());
                 } else {
                     break;
                 }
@@ -1480,15 +1486,16 @@ def_optimize(AST_Switch, function(self, compressor) {
         // and there's a side-effect somewhere. Just let the below paths take care of it.
     }
 
+    // Reintegrate `decl` (var statements)
     if (body.length > 0) {
         body[0].body = decl.concat(body[0].body);
     }
-
     if (body.length == 0) {
         return make_node(AST_BlockStatement, self, {
             body: decl.concat(statement(self.expression))
         }).optimize(compressor);
     }
+
     if (body.length == 1 && !has_nested_break(self)) {
         // This is the last case body, and we've already pruned any breaks, so it's
         // safe to hoist.
@@ -1568,7 +1575,7 @@ def_optimize(AST_Switch, function(self, compressor) {
         if (prev && !aborts(prev)) {
             prev.body = prev.body.concat(branch.body);
         } else {
-            trim_unreachable_code(compressor, branch, decl);
+            extract_from_unreachable_code(compressor, branch, decl);
         }
     }
     function branches_equivalent(branch, prev, insertBreak) {
@@ -1622,7 +1629,7 @@ def_optimize(AST_Try, function(self, compressor) {
     if (compressor.option("dead_code") && self.body.body.every(is_empty)) {
         var body = [];
         if (self.bcatch) {
-            trim_unreachable_code(compressor, self.bcatch, body);
+            extract_from_unreachable_code(compressor, self.bcatch, body);
         }
         if (self.bfinally) body.push(...self.bfinally.body);
         return make_node(AST_BlockStatement, self, {
@@ -1741,7 +1748,7 @@ def_optimize(AST_Call, function(self, compressor) {
             const value = condition.evaluate(compressor);
     
             if (value === 1 || value === true) {
-                return make_node(AST_Undefined, self);
+                return make_void_0(self).optimize(compressor);
             }
         }
     }    
@@ -2103,6 +2110,10 @@ def_optimize(AST_UnaryPrefix, function(self, compressor) {
     ) {
         return make_sequence(self, [e, make_node(AST_True, self)]).optimize(compressor);
     }
+    // Short-circuit common `void 0`
+    if (self.operator === "void" && e instanceof AST_Number && e.value === 0) {
+        return unsafe_undefined_ref(self, compressor) || self;
+    }
     var seq = self.lift_sequences(compressor);
     if (seq !== self) {
         return seq;
@@ -2113,7 +2124,7 @@ def_optimize(AST_UnaryPrefix, function(self, compressor) {
             self.expression = e;
             return self;
         } else {
-            return make_node(AST_Undefined, self).optimize(compressor);
+            return make_void_0(self).optimize(compressor);
         }
     }
     if (compressor.in_boolean_context()) {
@@ -2299,7 +2310,7 @@ def_optimize(AST_Binary, function(self, compressor) {
             if (expr instanceof AST_SymbolRef ? expr.is_declared(compressor)
                 : !(expr instanceof AST_PropAccess && compressor.option("ie8"))) {
                 self.right = expr;
-                self.left = make_node(AST_Undefined, self.left).optimize(compressor);
+                self.left = make_void_0(self.left).optimize(compressor);
                 if (self.operator.length == 2) self.operator += "=";
             }
         } else if (compressor.option("typeofs")
@@ -2312,7 +2323,7 @@ def_optimize(AST_Binary, function(self, compressor) {
             if (expr instanceof AST_SymbolRef ? expr.is_declared(compressor)
                 : !(expr instanceof AST_PropAccess && compressor.option("ie8"))) {
                 self.left = expr;
-                self.right = make_node(AST_Undefined, self.right).optimize(compressor);
+                self.right = make_void_0(self.right).optimize(compressor);
                 if (self.operator.length == 2) self.operator += "=";
             }
         } else if (self.left instanceof AST_SymbolRef
@@ -2953,7 +2964,8 @@ function is_atomic(lhs, self) {
     return lhs instanceof AST_SymbolRef || lhs.TYPE === self.TYPE;
 }
 
-def_optimize(AST_Undefined, function(self, compressor) {
+/** Apply the `unsafe_undefined` option: find a variable called `undefined` and turn `self` into a reference to it. */
+function unsafe_undefined_ref(self, compressor) {
     if (compressor.option("unsafe_undefined")) {
         var undef = find_variable(compressor, "undefined");
         if (undef) {
@@ -2966,14 +2978,15 @@ def_optimize(AST_Undefined, function(self, compressor) {
             return ref;
         }
     }
+    return null;
+}
+
+def_optimize(AST_Undefined, function(self, compressor) {
+    var symbolref = unsafe_undefined_ref(self, compressor);
+    if (symbolref) return symbolref;
     var lhs = compressor.is_lhs();
     if (lhs && is_atomic(lhs, self)) return self;
-    return make_node(AST_UnaryPrefix, self, {
-        operator: "void",
-        expression: make_node(AST_Number, self, {
-            value: 0
-        })
-    });
+    return make_void_0(self);
 });
 
 def_optimize(AST_Infinity, function(self, compressor) {
@@ -3660,7 +3673,7 @@ def_optimize(AST_Sub, function(self, compressor) {
                 }
             }
             if (retValue instanceof AST_Expansion) break FLATTEN;
-            retValue = retValue instanceof AST_Hole ? make_node(AST_Undefined, retValue) : retValue;
+            retValue = retValue instanceof AST_Hole ? make_void_0(retValue) : retValue;
             if (!flatten) values.unshift(retValue);
             while (--i >= 0) {
                 var value = elements[i];
@@ -3699,7 +3712,7 @@ def_optimize(AST_Chain, function (self, compressor) {
         if (parent instanceof AST_UnaryPrefix && parent.operator === "delete") {
             return make_node_from_constant(0, self);
         }
-        return make_node(AST_Undefined, self);
+        return make_void_0(self).optimize(compressor);
     }
     if (
         self.expression instanceof AST_PropAccess

package/lib/compress/inline.js

@@ -76,7 +76,6 @@ import {
     AST_This,
     AST_Toplevel,
     AST_UnaryPrefix,
-    AST_Undefined,
     AST_Var,
     AST_VarDef,
 
@@ -86,7 +85,7 @@ import {
     _NOINLINE,
     _PURE,
 } from "../ast.js";
-import { make_node, has_annotation } from "../utils/index.js";
+import { make_node, make_void_0, has_annotation } from "../utils/index.js";
 import "../size.js";
 
 import "./evaluate.js";
@@ -358,7 +357,7 @@ export function inline_into_call(self, compressor) {
             if (returned) {
                 returned = returned.clone(true);
             } else {
-                returned = make_node(AST_Undefined, self);
+                returned = make_void_0(self);
             }
             const args = self.args.concat(returned);
             return make_sequence(self, args).optimize(compressor);
@@ -374,7 +373,7 @@ export function inline_into_call(self, compressor) {
             && returned.name === fn.argnames[0].name
         ) {
             const replacement =
-                (self.args[0] || make_node(AST_Undefined)).optimize(compressor);
+                (self.args[0] || make_void_0()).optimize(compressor);
 
             let parent;
             if (
@@ -456,7 +455,7 @@ export function inline_into_call(self, compressor) {
 
     const can_drop_this_call = is_regular_func && compressor.option("side_effects") && fn.body.every(is_empty);
     if (can_drop_this_call) {
-        var args = self.args.concat(make_node(AST_Undefined, self));
+        var args = self.args.concat(make_void_0(self));
         return make_sequence(self, args).optimize(compressor);
     }
 
@@ -475,9 +474,9 @@ export function inline_into_call(self, compressor) {
     return self;
 
     function return_value(stat) {
-        if (!stat) return make_node(AST_Undefined, self);
+        if (!stat) return make_void_0(self);
         if (stat instanceof AST_Return) {
-            if (!stat.value) return make_node(AST_Undefined, self);
+            if (!stat.value) return make_void_0(self);
             return stat.value.clone(true);
         }
         if (stat instanceof AST_SimpleStatement) {
@@ -623,7 +622,7 @@ export function inline_into_call(self, compressor) {
             } else {
                 var symbol = make_node(AST_SymbolVar, name, name);
                 name.definition().orig.push(symbol);
-                if (!value && in_loop) value = make_node(AST_Undefined, self);
+                if (!value && in_loop) value = make_void_0(self);
                 append_var(decls, expressions, symbol, value);
             }
         }
@@ -650,7 +649,7 @@ export function inline_into_call(self, compressor) {
                         operator: "=",
                         logical: false,
                         left: sym,
-                        right: make_node(AST_Undefined, name)
+                        right: make_void_0(name),
                     }));
                 }
             }

package/lib/compress/reduce-vars.js

@@ -87,7 +87,6 @@ import {
     AST_Try,
     AST_Unary,
     AST_UnaryPrefix,
-    AST_Undefined,
     AST_UsingDef,
     AST_VarDef,
     AST_VarDefLike,
@@ -98,7 +97,7 @@ import {
     walk_body,
     walk_parent,
 } from "../ast.js";
-import { HOP, make_node, noop } from "../utils/index.js";
+import { HOP, make_node, make_void_0, noop } from "../utils/index.js";
 
 import { lazy_op, is_modified, is_lhs } from "./inference.js";
 import { INLINED, clear_flag } from "./compressor-flags.js";
@@ -172,7 +171,7 @@ function safe_to_read(tw, def) {
         if (def.fixed == null) {
             var orig = def.orig[0];
             if (orig instanceof AST_SymbolFunarg || orig.name == "arguments") return false;
-            def.fixed = make_node(AST_Undefined, orig);
+            def.fixed = make_void_0(orig);
         }
         return true;
     }
@@ -470,7 +469,7 @@ function mark_lambda(tw, descend, compressor) {
             if (d.orig.length > 1) return;
             if (d.fixed === undefined && (!this.uses_arguments || tw.has_directive("use strict"))) {
                 d.fixed = function() {
-                    return iife.args[i] || make_node(AST_Undefined, iife);
+                    return iife.args[i] || make_void_0(iife);
                 };
                 tw.loop_ids.set(d.id, tw.in_loop);
                 mark(tw, d, true);

package/lib/compress/tighten-body.js

@@ -106,7 +106,6 @@ import {
     AST_Unary,
     AST_UnaryPostfix,
     AST_UnaryPrefix,
-    AST_Undefined,
     AST_Using,
     AST_Var,
     AST_VarDef,
@@ -122,6 +121,7 @@ import {
 } from "../ast.js";
 import {
     make_node,
+    make_void_0,
     MAP,
     member,
     remove,
@@ -191,8 +191,8 @@ function remove_initializers(var_statement) {
     return decls.length ? make_node(AST_Var, var_statement, { definitions: decls }) : null;
 }
 
-/** Called on code which we know is unreachable, to keep elements that affect outside of it. */
-export function trim_unreachable_code(compressor, stat, target) {
+/** Called on code which won't be executed but has an effect outside of itself: `var`, `function` statements, `export`, `import`. */
+export function extract_from_unreachable_code(compressor, stat, target) {
     walk(stat, node => {
         if (node instanceof AST_Var) {
             const no_initializers = remove_initializers(node);
@@ -217,7 +217,8 @@ export function trim_unreachable_code(compressor, stat, target) {
             target.push(node);
             return true;
         }
-        if (node instanceof AST_Scope) {
+        if (node instanceof AST_Scope || node instanceof AST_Class) {
+            // Do not go into nested scopes
             return true;
         }
     });
@@ -634,7 +635,7 @@ export function tighten_body(statements, compressor) {
                         }
                     } else {
                         if (!arg) {
-                            arg = make_node(AST_Undefined, sym).transform(compressor);
+                            arg = make_void_0(sym).transform(compressor);
                         } else if (arg instanceof AST_Lambda && arg.pinned()
                             || has_overlapping_symbol(fn, arg, fn_strict)) {
                             arg = null;
@@ -874,7 +875,7 @@ export function tighten_body(statements, compressor) {
                     found = true;
                     if (node instanceof AST_VarDef) {
                         node.value = node.name instanceof AST_SymbolConst
-                            ? make_node(AST_Undefined, node.value) // `const` always needs value.
+                            ? make_void_0(node.value) // `const` always needs value.
                             : null;
                         return node;
                     }
@@ -1241,7 +1242,7 @@ export function tighten_body(statements, compressor) {
         CHANGED = n != len;
         if (has_quit)
             has_quit.forEach(function (stat) {
-                trim_unreachable_code(compressor, stat, statements);
+                extract_from_unreachable_code(compressor, stat, statements);
             });
     }
 
@@ -1313,7 +1314,7 @@ export function tighten_body(statements, compressor) {
             var stat = statements[i];
             if (prev) {
                 if (stat instanceof AST_Exit) {
-                    stat.value = cons_seq(stat.value || make_node(AST_Undefined, stat).transform(compressor));
+                    stat.value = cons_seq(stat.value || make_void_0(stat).transform(compressor));
                 } else if (stat instanceof AST_For) {
                     if (!(stat.init instanceof AST_DefinitionsLike)) {
                         const abort = walk(prev.body, node => {

package/lib/utils/index.js

@@ -43,7 +43,7 @@
 
 "use strict";
 
-import { AST_Node } from "../ast.js";
+import { AST_Node, AST_Number, AST_UnaryPrefix } from "../ast.js";
 
 function characters(str) {
     return str.split("");
@@ -130,6 +130,15 @@ function make_node(ctor, orig, props) {
     return new ctor(props);
 }
 
+/** Makes a `void 0` expression. Use instead of AST_Undefined which may conflict
+ * with an existing variable called `undefined` */
+function make_void_0(orig) {
+    return make_node(AST_UnaryPrefix, orig, {
+        operator: "void",
+        expression: make_node(AST_Number, orig, { value: 0 })
+    });
+}
+
 function push_uniq(array, el) {
     if (!array.includes(el))
         array.push(el);
@@ -272,6 +281,7 @@ export {
     HOP,
     keep_name,
     make_node,
+    make_void_0,
     makePredicate,
     map_add,
     map_from_object,

package/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://terser.org",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "5.44.0",
+  "version": "5.45.0",
   "engines": {
     "node": ">=10"
   },
@@ -61,6 +61,10 @@
     "semver": "^7.5.1",
     "source-map": "~0.8.0-beta.0"
   },
+  "overrides": {
+    "serialize-javascript": "6.0.2",
+    "js-yaml": "4.1.1"
+  },
   "scripts": {
     "test": "node test/compress.js && mocha test/mocha",
     "test:compress": "node test/compress.js",