terser 5.8.0 → 5.9.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v5.9.0
+
+ - Collapsing switch cases with the same bodies (even if they're not next to each other) (#1070).
+ - Fix evaluation of optional chain expressions (#1062)
+ - Fix mangling collision in ESM exports (#1063)
+ - Fix issue with mutating function objects after a second pass (#1047)
+ - Fix for inlining object spread `{ ...obj }` (#1071)
+ - Typescript typings fix (#1069)
+
 ## v5.8.0
 
  - Fixed shadowing variables while moving code in some cases (#1065)

package/dist/bundle.min.js

@@ -11277,9 +11277,8 @@ function is_undefined(node, compressor) {
     );
 }
 
-// Find out if something is == null
-// Used to optimize ?. and ??
-function is_nullish(node, compressor) {
+// Is the node explicitly null or undefined.
+function is_null_or_undefined(node, compressor) {
     let fixed;
     return (
         node instanceof AST_Null
@@ -11289,13 +11288,29 @@ function is_nullish(node, compressor) {
             && (fixed = node.definition().fixed) instanceof AST_Node
             && is_nullish(fixed, compressor)
         )
-        // Recurse into those optional chains!
-        || node instanceof AST_PropAccess && node.optional && is_nullish(node.expression, compressor)
-        || node instanceof AST_Call && node.optional && is_nullish(node.expression, compressor)
-        || node instanceof AST_Chain && is_nullish(node.expression, compressor)
     );
 }
 
+// Find out if this expression is optionally chained from a base-point that we
+// can statically analyze as null or undefined.
+function is_nullish_shortcircuited(node, compressor) {
+    if (node instanceof AST_PropAccess || node instanceof AST_Call) {
+        return (
+            (node.optional && is_null_or_undefined(node.expression, compressor))
+            || is_nullish_shortcircuited(node.expression, compressor)
+        );
+    }
+    if (node instanceof AST_Chain) return is_nullish_shortcircuited(node.expression, compressor);
+    return false;
+}
+
+// Find out if something is == null, or can short circuit into nullish.
+// Used to optimize ?. and ??
+function is_nullish(node, compressor) {
+    if (is_null_or_undefined(node, compressor)) return true;
+    return is_nullish_shortcircuited(node, compressor);
+}
+
 // Determine if expression might cause side effects
 // If there's a possibility that a node may change something when it's executed, this returns true
 (function(def_has_side_effects) {
@@ -11403,13 +11418,12 @@ function is_nullish(node, compressor) {
         return any(this.elements, compressor);
     });
     def_has_side_effects(AST_Dot, function(compressor) {
+        if (is_nullish(this, compressor)) return false;
         return !this.optional && this.expression.may_throw_on_access(compressor)
             || this.expression.has_side_effects(compressor);
     });
     def_has_side_effects(AST_Sub, function(compressor) {
-        if (this.optional && is_nullish(this.expression, compressor)) {
-            return false;
-        }
+        if (is_nullish(this, compressor)) return false;
 
         return !this.optional && this.expression.may_throw_on_access(compressor)
             || this.expression.has_side_effects(compressor)
@@ -11477,7 +11491,7 @@ function is_nullish(node, compressor) {
         return any(this.body, compressor);
     });
     def_may_throw(AST_Call, function(compressor) {
-        if (this.optional && is_nullish(this.expression, compressor)) return false;
+        if (is_nullish(this, compressor)) return false;
         if (any(this.args, compressor)) return true;
         if (this.is_callee_pure(compressor)) return false;
         if (this.expression.may_throw(compressor)) return true;
@@ -11536,12 +11550,12 @@ function is_nullish(node, compressor) {
         return this.body.may_throw(compressor);
     });
     def_may_throw(AST_Dot, function(compressor) {
+        if (is_nullish(this, compressor)) return false;
         return !this.optional && this.expression.may_throw_on_access(compressor)
             || this.expression.may_throw(compressor);
     });
     def_may_throw(AST_Sub, function(compressor) {
-        if (this.optional && is_nullish(this.expression, compressor)) return false;
-
+        if (is_nullish(this, compressor)) return false;
         return !this.optional && this.expression.may_throw_on_access(compressor)
             || this.expression.may_throw(compressor)
             || this.property.may_throw(compressor);
@@ -12033,6 +12047,9 @@ function def_eval(node, func) {
     node.DEFMETHOD("_eval", func);
 }
 
+// Used to propagate a nullish short-circuit signal upwards through the chain.
+const nullish = Symbol("This AST_Chain is nullish");
+
 // If the node has been successfully reduced to a constant,
 // then its value is returned; otherwise the element itself
 // is returned.
@@ -12044,7 +12061,7 @@ AST_Node.DEFMETHOD("evaluate", function (compressor) {
     var val = this._eval(compressor, 1);
     if (!val || val instanceof RegExp)
         return val;
-    if (typeof val == "function" || typeof val == "object")
+    if (typeof val == "function" || typeof val == "object" || val == nullish)
         return this;
     return val;
 });
@@ -12289,11 +12306,8 @@ const regexp_flags = new Set([
 ]);
 
 def_eval(AST_PropAccess, function (compressor, depth) {
-    if (this.optional) {
-        const obj = this.expression._eval(compressor, depth);
-        if (obj == null)
-            return undefined;
-    }
+    const obj = this.expression._eval(compressor, depth);
+    if (obj === nullish || (this.optional && obj == null)) return nullish;
     if (compressor.option("unsafe")) {
         var key = this.property;
         if (key instanceof AST_Node) {
@@ -12348,16 +12362,19 @@ def_eval(AST_PropAccess, function (compressor, depth) {
 
 def_eval(AST_Chain, function (compressor, depth) {
     const evaluated = this.expression._eval(compressor, depth);
-    return evaluated === this.expression ? this : evaluated;
+    return evaluated === nullish
+        ? undefined
+        : evaluated === this.expression
+          ? this
+          : evaluated;
 });
 
 def_eval(AST_Call, function (compressor, depth) {
     var exp = this.expression;
-    if (this.optional) {
-        const callee = this.expression._eval(compressor, depth);
-        if (callee == null)
-            return undefined;
-    }
+
+    const callee = exp._eval(compressor, depth);
+    if (callee === nullish || (this.optional && callee == null)) return nullish;
+
     if (compressor.option("unsafe") && exp instanceof AST_PropAccess) {
         var key = exp.property;
         if (key instanceof AST_Node) {
@@ -12489,8 +12506,8 @@ def_drop_side_effect_free(AST_Constant, return_null);
 def_drop_side_effect_free(AST_This, return_null);
 
 def_drop_side_effect_free(AST_Call, function (compressor, first_in_statement) {
-    if (this.optional && is_nullish(this.expression, compressor)) {
-        return make_node(AST_Undefined, this);
+    if (is_nullish_shortcircuited(this, compressor)) {
+        return this.expression.drop_side_effect_free(compressor, first_in_statement);
     }
 
     if (!this.is_callee_pure(compressor)) {
@@ -12666,21 +12683,19 @@ def_drop_side_effect_free(AST_Array, function (compressor, first_in_statement) {
 });
 
 def_drop_side_effect_free(AST_Dot, function (compressor, first_in_statement) {
-    if (this.optional) {
-        return is_nullish(this.expression, compressor) ? make_node(AST_Undefined, this) : this;
+    if (is_nullish_shortcircuited(this, compressor)) {
+        return this.expression.drop_side_effect_free(compressor, first_in_statement);
     }
-    if (this.expression.may_throw_on_access(compressor))
-        return this;
+    if (this.expression.may_throw_on_access(compressor)) return this;
 
     return this.expression.drop_side_effect_free(compressor, first_in_statement);
 });
 
 def_drop_side_effect_free(AST_Sub, function (compressor, first_in_statement) {
-    if (this.optional) {
-        return is_nullish(this.expression, compressor) ? make_node(AST_Undefined, this) : this;
+    if (is_nullish_shortcircuited(this, compressor)) {
+        return this.expression.drop_side_effect_free(compressor, first_in_statement);
     }
-    if (this.expression.may_throw_on_access(compressor))
-        return this;
+    if (this.expression.may_throw_on_access(compressor)) return this;
 
     var expression = this.expression.drop_side_effect_free(compressor, first_in_statement);
     if (!expression)
@@ -16108,6 +16123,49 @@ def_optimize(AST_Switch, function(self, compressor) {
     while (i < len) eliminate_branch(self.body[i++], body[body.length - 1]);
     self.body = body;
 
+    let default_or_exact = default_branch || exact_match;
+    default_branch = null;
+    exact_match = null;
+
+    // group equivalent branches so they will be located next to each other,
+    // that way the next micro-optimization will merge them.
+    // ** bail micro-optimization if not a simple switch case with breaks
+    if (body.every((branch, i) =>
+        (branch === default_or_exact || !branch.expression.has_side_effects(compressor))
+        && (branch.body.length === 0 || aborts(branch) || body.length - 1 === i))
+    ) {
+        for (let i = 0; i < body.length; i++) {
+            const branch = body[i];
+            for (let j = i + 1; j < body.length; j++) {
+                const next = body[j];
+                if (next.body.length === 0) continue;
+                const last_branch = j === (body.length - 1);
+                const equivalentBranch = branches_equivalent(next, branch, false);
+                if (equivalentBranch || (last_branch && branches_equivalent(next, branch, true))) {
+                    if (!equivalentBranch && last_branch) {
+                        next.body.push(make_node(AST_Break));
+                    }
+
+                    // let's find previous siblings with inert fallthrough...
+                    let x = j - 1;
+                    let fallthroughDepth = 0;
+                    while (x > i) {
+                        if (is_inert_body(body[x--])) {
+                            fallthroughDepth++;
+                        } else {
+                            break;
+                        }
+                    }
+
+                    const plucked = body.splice(j - fallthroughDepth, 1 + fallthroughDepth);
+                    body.splice(i + 1, 0, ...plucked);
+                    i += plucked.length;
+                }
+            }
+        }
+    }
+
+    // merge equivalent branches in a row
     for (let i = 0; i < body.length; i++) {
         let branch = body[i];
         if (branch.body.length === 0) continue;
@@ -16128,10 +16186,6 @@ def_optimize(AST_Switch, function(self, compressor) {
         }
     }
 
-    let default_or_exact = default_branch || exact_match;
-    default_branch = null;
-    exact_match = null;
-
     // Prune any empty branches at the end of the switch statement.
     {
         let i = body.length - 1;
@@ -16522,10 +16576,6 @@ def_optimize(AST_Call, function(self, compressor) {
         }
     }
 
-    if (self.optional && is_nullish(fn, compressor)) {
-        return make_node(AST_Undefined, self);
-    }
-
     var is_func = fn instanceof AST_Lambda;
 
     if (is_func && fn.pinned()) return self;
@@ -16922,6 +16972,7 @@ def_optimize(AST_Call, function(self, compressor) {
     if (can_inline && has_annotation(self, _INLINE)) {
         set_flag(fn, SQUEEZED);
         fn = make_node(fn.CTOR === AST_Defun ? AST_Function : fn.CTOR, fn, fn);
+        fn = fn.clone(true);
         fn.figure_out_scope({}, {
             parent_scope: find_scope(compressor),
             toplevel: compressor.get_toplevel()
@@ -18709,14 +18760,11 @@ def_optimize(AST_Sub, function(self, compressor) {
         ev = make_node_from_constant(ev, self).optimize(compressor);
         return best_of(compressor, ev, self);
     }
-    if (self.optional && is_nullish(self.expression, compressor)) {
-        return make_node(AST_Undefined, self);
-    }
     return self;
 });
 
 def_optimize(AST_Chain, function (self, compressor) {
-    self.expression = self.expression.optimize(compressor);
+    if (is_nullish(self.expression, compressor)) return make_node(AST_Undefined, self);
     return self;
 });
 
@@ -18783,9 +18831,6 @@ def_optimize(AST_Dot, function(self, compressor) {
         ev = make_node_from_constant(ev, self).optimize(compressor);
         return best_of(compressor, ev, self);
     }
-    if (self.optional && is_nullish(self.expression, compressor)) {
-        return make_node(AST_Undefined, self);
-    }
     return self;
 });
 
@@ -18845,9 +18890,11 @@ function inline_object_prop_spread(props, compressor) {
                 // non-iterable value silently does nothing; it is thus safe
                 // to remove. AST_String is the only iterable AST_Constant.
                 props.splice(i, 1);
+                i--;
             } else if (is_nullish(expr, compressor)) {
                 // Likewise, null and undefined can be silently removed.
                 props.splice(i, 1);
+                i--;
             }
         }
     }
@@ -27166,9 +27213,6 @@ function mangle_properties(ast, options) {
     var cache;
     if (options.cache) {
         cache = options.cache.props;
-        cache.forEach(function(mangled_name) {
-            reserved.add(mangled_name);
-        });
     } else {
         cache = new Map();
     }
@@ -27186,6 +27230,9 @@ function mangle_properties(ast, options) {
 
     var names_to_mangle = new Set();
     var unmangleable = new Set();
+    // Track each already-mangled name to prevent nth_identifier from generating
+    // the same name.
+    cache.forEach((mangled_name) => unmangleable.add(mangled_name));
 
     var keep_quoted = !!options.keep_quoted;
 
@@ -27429,6 +27476,7 @@ async function minify(files, options) {
             keep_classnames: false,
             keep_fnames: false,
             module: false,
+            nth_identifier: base54,
             properties: false,
             reserved: [],
             safari10: false,

package/lib/compress/drop-side-effect-free.js

@@ -73,13 +73,12 @@ import {
     AST_TemplateString,
     AST_This,
     AST_Unary,
-    AST_Undefined,
 } from "../ast.js";
 import { make_node, return_null, return_this } from "../utils/index.js";
 import { first_in_statement } from "../utils/first_in_statement.js";
 
 import { pure_prop_access_globals } from "./native-objects.js";
-import { lazy_op, unary_side_effects, is_nullish } from "./inference.js";
+import { lazy_op, unary_side_effects, is_nullish_shortcircuited } from "./inference.js";
 import { WRITE_ONLY, set_flag, clear_flag } from "./compressor-flags.js";
 import { make_sequence, is_func_expr, is_iife_call } from "./common.js";
 
@@ -121,8 +120,8 @@ def_drop_side_effect_free(AST_Constant, return_null);
 def_drop_side_effect_free(AST_This, return_null);
 
 def_drop_side_effect_free(AST_Call, function (compressor, first_in_statement) {
-    if (this.optional && is_nullish(this.expression, compressor)) {
-        return make_node(AST_Undefined, this);
+    if (is_nullish_shortcircuited(this, compressor)) {
+        return this.expression.drop_side_effect_free(compressor, first_in_statement);
     }
 
     if (!this.is_callee_pure(compressor)) {
@@ -298,21 +297,19 @@ def_drop_side_effect_free(AST_Array, function (compressor, first_in_statement) {
 });
 
 def_drop_side_effect_free(AST_Dot, function (compressor, first_in_statement) {
-    if (this.optional) {
-        return is_nullish(this.expression, compressor) ? make_node(AST_Undefined, this) : this;
+    if (is_nullish_shortcircuited(this, compressor)) {
+        return this.expression.drop_side_effect_free(compressor, first_in_statement);
     }
-    if (this.expression.may_throw_on_access(compressor))
-        return this;
+    if (this.expression.may_throw_on_access(compressor)) return this;
 
     return this.expression.drop_side_effect_free(compressor, first_in_statement);
 });
 
 def_drop_side_effect_free(AST_Sub, function (compressor, first_in_statement) {
-    if (this.optional) {
-        return is_nullish(this.expression, compressor) ? make_node(AST_Undefined, this) : this;
+    if (is_nullish_shortcircuited(this, compressor)) {
+        return this.expression.drop_side_effect_free(compressor, first_in_statement);
     }
-    if (this.expression.may_throw_on_access(compressor))
-        return this;
+    if (this.expression.may_throw_on_access(compressor)) return this;
 
     var expression = this.expression.drop_side_effect_free(compressor, first_in_statement);
     if (!expression)

package/lib/compress/evaluate.js

@@ -82,6 +82,9 @@ function def_eval(node, func) {
     node.DEFMETHOD("_eval", func);
 }
 
+// Used to propagate a nullish short-circuit signal upwards through the chain.
+export const nullish = Symbol("This AST_Chain is nullish");
+
 // If the node has been successfully reduced to a constant,
 // then its value is returned; otherwise the element itself
 // is returned.
@@ -93,7 +96,7 @@ AST_Node.DEFMETHOD("evaluate", function (compressor) {
     var val = this._eval(compressor, 1);
     if (!val || val instanceof RegExp)
         return val;
-    if (typeof val == "function" || typeof val == "object")
+    if (typeof val == "function" || typeof val == "object" || val == nullish)
         return this;
     return val;
 });
@@ -338,11 +341,8 @@ const regexp_flags = new Set([
 ]);
 
 def_eval(AST_PropAccess, function (compressor, depth) {
-    if (this.optional) {
-        const obj = this.expression._eval(compressor, depth);
-        if (obj == null)
-            return undefined;
-    }
+    const obj = this.expression._eval(compressor, depth);
+    if (obj === nullish || (this.optional && obj == null)) return nullish;
     if (compressor.option("unsafe")) {
         var key = this.property;
         if (key instanceof AST_Node) {
@@ -397,16 +397,19 @@ def_eval(AST_PropAccess, function (compressor, depth) {
 
 def_eval(AST_Chain, function (compressor, depth) {
     const evaluated = this.expression._eval(compressor, depth);
-    return evaluated === this.expression ? this : evaluated;
+    return evaluated === nullish
+        ? undefined
+        : evaluated === this.expression
+          ? this
+          : evaluated;
 });
 
 def_eval(AST_Call, function (compressor, depth) {
     var exp = this.expression;
-    if (this.optional) {
-        const callee = this.expression._eval(compressor, depth);
-        if (callee == null)
-            return undefined;
-    }
+
+    const callee = exp._eval(compressor, depth);
+    if (callee === nullish || (this.optional && callee == null)) return nullish;
+
     if (compressor.option("unsafe") && exp instanceof AST_PropAccess) {
         var key = exp.property;
         if (key instanceof AST_Node) {

package/lib/compress/index.js

@@ -1598,6 +1598,49 @@ def_optimize(AST_Switch, function(self, compressor) {
     while (i < len) eliminate_branch(self.body[i++], body[body.length - 1]);
     self.body = body;
 
+    let default_or_exact = default_branch || exact_match;
+    default_branch = null;
+    exact_match = null;
+
+    // group equivalent branches so they will be located next to each other,
+    // that way the next micro-optimization will merge them.
+    // ** bail micro-optimization if not a simple switch case with breaks
+    if (body.every((branch, i) =>
+        (branch === default_or_exact || !branch.expression.has_side_effects(compressor))
+        && (branch.body.length === 0 || aborts(branch) || body.length - 1 === i))
+    ) {
+        for (let i = 0; i < body.length; i++) {
+            const branch = body[i];
+            for (let j = i + 1; j < body.length; j++) {
+                const next = body[j];
+                if (next.body.length === 0) continue;
+                const last_branch = j === (body.length - 1);
+                const equivalentBranch = branches_equivalent(next, branch, false);
+                if (equivalentBranch || (last_branch && branches_equivalent(next, branch, true))) {
+                    if (!equivalentBranch && last_branch) {
+                        next.body.push(make_node(AST_Break));
+                    }
+
+                    // let's find previous siblings with inert fallthrough...
+                    let x = j - 1;
+                    let fallthroughDepth = 0;
+                    while (x > i) {
+                        if (is_inert_body(body[x--])) {
+                            fallthroughDepth++;
+                        } else {
+                            break;
+                        }
+                    }
+
+                    const plucked = body.splice(j - fallthroughDepth, 1 + fallthroughDepth);
+                    body.splice(i + 1, 0, ...plucked);
+                    i += plucked.length;
+                }
+            }
+        }
+    }
+
+    // merge equivalent branches in a row
     for (let i = 0; i < body.length; i++) {
         let branch = body[i];
         if (branch.body.length === 0) continue;
@@ -1618,10 +1661,6 @@ def_optimize(AST_Switch, function(self, compressor) {
         }
     }
 
-    let default_or_exact = default_branch || exact_match;
-    default_branch = null;
-    exact_match = null;
-
     // Prune any empty branches at the end of the switch statement.
     {
         let i = body.length - 1;
@@ -2012,10 +2051,6 @@ def_optimize(AST_Call, function(self, compressor) {
         }
     }
 
-    if (self.optional && is_nullish(fn, compressor)) {
-        return make_node(AST_Undefined, self);
-    }
-
     var is_func = fn instanceof AST_Lambda;
 
     if (is_func && fn.pinned()) return self;
@@ -2412,6 +2447,7 @@ def_optimize(AST_Call, function(self, compressor) {
     if (can_inline && has_annotation(self, _INLINE)) {
         set_flag(fn, SQUEEZED);
         fn = make_node(fn.CTOR === AST_Defun ? AST_Function : fn.CTOR, fn, fn);
+        fn = fn.clone(true);
         fn.figure_out_scope({}, {
             parent_scope: find_scope(compressor),
             toplevel: compressor.get_toplevel()
@@ -4199,14 +4235,11 @@ def_optimize(AST_Sub, function(self, compressor) {
         ev = make_node_from_constant(ev, self).optimize(compressor);
         return best_of(compressor, ev, self);
     }
-    if (self.optional && is_nullish(self.expression, compressor)) {
-        return make_node(AST_Undefined, self);
-    }
     return self;
 });
 
 def_optimize(AST_Chain, function (self, compressor) {
-    self.expression = self.expression.optimize(compressor);
+    if (is_nullish(self.expression, compressor)) return make_node(AST_Undefined, self);
     return self;
 });
 
@@ -4273,9 +4306,6 @@ def_optimize(AST_Dot, function(self, compressor) {
         ev = make_node_from_constant(ev, self).optimize(compressor);
         return best_of(compressor, ev, self);
     }
-    if (self.optional && is_nullish(self.expression, compressor)) {
-        return make_node(AST_Undefined, self);
-    }
     return self;
 });
 
@@ -4335,9 +4365,11 @@ function inline_object_prop_spread(props, compressor) {
                 // non-iterable value silently does nothing; it is thus safe
                 // to remove. AST_String is the only iterable AST_Constant.
                 props.splice(i, 1);
+                i--;
             } else if (is_nullish(expr, compressor)) {
                 // Likewise, null and undefined can be silently removed.
                 props.splice(i, 1);
+                i--;
             }
         }
     }

package/lib/compress/inference.js

@@ -226,9 +226,8 @@ export function is_undefined(node, compressor) {
     );
 }
 
-// Find out if something is == null
-// Used to optimize ?. and ??
-export function is_nullish(node, compressor) {
+// Is the node explicitly null or undefined.
+function is_null_or_undefined(node, compressor) {
     let fixed;
     return (
         node instanceof AST_Null
@@ -238,13 +237,29 @@ export function is_nullish(node, compressor) {
             && (fixed = node.definition().fixed) instanceof AST_Node
             && is_nullish(fixed, compressor)
         )
-        // Recurse into those optional chains!
-        || node instanceof AST_PropAccess && node.optional && is_nullish(node.expression, compressor)
-        || node instanceof AST_Call && node.optional && is_nullish(node.expression, compressor)
-        || node instanceof AST_Chain && is_nullish(node.expression, compressor)
     );
 }
 
+// Find out if this expression is optionally chained from a base-point that we
+// can statically analyze as null or undefined.
+export function is_nullish_shortcircuited(node, compressor) {
+    if (node instanceof AST_PropAccess || node instanceof AST_Call) {
+        return (
+            (node.optional && is_null_or_undefined(node.expression, compressor))
+            || is_nullish_shortcircuited(node.expression, compressor)
+        );
+    }
+    if (node instanceof AST_Chain) return is_nullish_shortcircuited(node.expression, compressor);
+    return false;
+}
+
+// Find out if something is == null, or can short circuit into nullish.
+// Used to optimize ?. and ??
+export function is_nullish(node, compressor) {
+    if (is_null_or_undefined(node, compressor)) return true;
+    return is_nullish_shortcircuited(node, compressor);
+}
+
 // Determine if expression might cause side effects
 // If there's a possibility that a node may change something when it's executed, this returns true
 (function(def_has_side_effects) {
@@ -352,13 +367,12 @@ export function is_nullish(node, compressor) {
         return any(this.elements, compressor);
     });
     def_has_side_effects(AST_Dot, function(compressor) {
+        if (is_nullish(this, compressor)) return false;
         return !this.optional && this.expression.may_throw_on_access(compressor)
             || this.expression.has_side_effects(compressor);
     });
     def_has_side_effects(AST_Sub, function(compressor) {
-        if (this.optional && is_nullish(this.expression, compressor)) {
-            return false;
-        }
+        if (is_nullish(this, compressor)) return false;
 
         return !this.optional && this.expression.may_throw_on_access(compressor)
             || this.expression.has_side_effects(compressor)
@@ -426,7 +440,7 @@ export function is_nullish(node, compressor) {
         return any(this.body, compressor);
     });
     def_may_throw(AST_Call, function(compressor) {
-        if (this.optional && is_nullish(this.expression, compressor)) return false;
+        if (is_nullish(this, compressor)) return false;
         if (any(this.args, compressor)) return true;
         if (this.is_callee_pure(compressor)) return false;
         if (this.expression.may_throw(compressor)) return true;
@@ -485,12 +499,12 @@ export function is_nullish(node, compressor) {
         return this.body.may_throw(compressor);
     });
     def_may_throw(AST_Dot, function(compressor) {
+        if (is_nullish(this, compressor)) return false;
         return !this.optional && this.expression.may_throw_on_access(compressor)
             || this.expression.may_throw(compressor);
     });
     def_may_throw(AST_Sub, function(compressor) {
-        if (this.optional && is_nullish(this.expression, compressor)) return false;
-
+        if (is_nullish(this, compressor)) return false;
         return !this.optional && this.expression.may_throw_on_access(compressor)
             || this.expression.may_throw(compressor)
             || this.property.may_throw(compressor);

package/lib/minify.js

@@ -11,6 +11,7 @@ import { AST_Toplevel, AST_Node } from "./ast.js";
 import { parse } from "./parse.js";
 import { OutputStream } from "./output.js";
 import { Compressor } from "./compress/index.js";
+import { base54 } from "./scope.js";
 import { SourceMap } from "./sourcemap.js";
 import {
     mangle_properties,
@@ -113,6 +114,7 @@ async function minify(files, options) {
             keep_classnames: false,
             keep_fnames: false,
             module: false,
+            nth_identifier: base54,
             properties: false,
             reserved: [],
             safari10: false,

package/lib/propmangle.js

@@ -197,9 +197,6 @@ function mangle_properties(ast, options) {
     var cache;
     if (options.cache) {
         cache = options.cache.props;
-        cache.forEach(function(mangled_name) {
-            reserved.add(mangled_name);
-        });
     } else {
         cache = new Map();
     }
@@ -217,6 +214,9 @@ function mangle_properties(ast, options) {
 
     var names_to_mangle = new Set();
     var unmangleable = new Set();
+    // Track each already-mangled name to prevent nth_identifier from generating
+    // the same name.
+    cache.forEach((mangled_name) => unmangleable.add(mangled_name));
 
     var keep_quoted = !!options.keep_quoted;
 

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.8.0",
+  "version": "5.9.0",
   "engines": {
     "node": ">=10"
   },

package/bin/terser.mjs

@@ -1,21 +0,0 @@
-#!/usr/bin/env node
-
-"use strict";
-
-import "../tools/exit.cjs";
-
-import fs from "fs"
-import path from "path"
-import program from "commander"
-
-import { run_cli } from "../lib/cli.js"
-
-const packageJson = {
-    name: "terser",
-    version: "experimental module CLI"
-}
-
-run_cli({ program, packageJson, fs, path }).catch((error) => {
-    console.error(error);
-    process.exitCode = 1;
-});