terser 5.20.0 → 5.22.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v5.22.0
+ - Do not `unsafe`ly shorten expressions like a?.toString() when they're conditional.
+ - Avoid running drop_unused in nodes that aren't scopes. Fixes a rare crash.
+ - When 'module' is enabled, assume strict mode when figuring out scopes.
+
+## v5.21.0
+ - Do not inline functions that would be retained in the toplevel (as this would cause code duplication).
+ - Fix precedence of arrow function and ternary operator when formatting output.
+
 ## v5.20.0
  - Passing `minify()` zero files will now throw a clean exception (#1450)
  - `drop_console` supports passing in an array of `console.*` method names (#1445)

package/README.md

@@ -154,7 +154,8 @@ a double dash to prevent input files being used as option arguments:
     --keep-fnames               Do not mangle/drop function names.  Useful for
                                 code relying on Function.prototype.name.
     --module                    Input is an ES6 module. If `compress` or `mangle` is
-                                enabled then the `toplevel` option will be enabled.
+                                enabled then the `toplevel` option, as well as strict mode,
+                                will be enabled.
     --name-cache <file>         File to hold mangled name mappings.
     --safari10                  Support non-standard Safari 10/11.
                                 Equivalent to setting `safari10: true` in `minify()`
@@ -912,7 +913,7 @@ If you happen to need the source map as a raw object, set `sourceMap.asObject` t
   [compress option](#compress-options).
 
 - `module` (default `false`) -- Pass `true` an ES6 modules, where the toplevel
-  scope is not the global scope. Implies `toplevel`.
+  scope is not the global scope. Implies `toplevel` and assumes input code is strict mode JS.
 
 - `nth_identifier` (default: an internal mangler that weights based on character
   frequency analysis) -- Pass an object with a `get(n)` function that converts an

package/dist/bundle.min.js

@@ -9742,7 +9742,8 @@ function OutputStream(options) {
         ) {
             return true;
         }
-        return p instanceof AST_PropAccess && p.expression === this;
+        return p instanceof AST_PropAccess && p.expression === this
+            || p instanceof AST_Conditional && p.condition === this;
     });
 
     // same goes for an object literal (as in AST_Function), because
@@ -11572,6 +11573,7 @@ AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = null,
         cache: null,
         ie8: false,
         safari10: false,
+        module: false,
     });
 
     if (!(toplevel instanceof AST_Toplevel)) {
@@ -11739,6 +11741,11 @@ AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = null,
             );
         }
     });
+
+    if (options.module) {
+        tw.directives["use strict"] = true;
+    }
+
     this.walk(tw);
 
     function mark_export(def, level) {
@@ -12423,7 +12430,7 @@ const base54 = (() => {
 
 let mangle_options = undefined;
 AST_Node.prototype.size = function (compressor, stack) {
-    mangle_options = compressor && compressor.mangle_options;
+    mangle_options = compressor && compressor._mangle_options;
 
     let size = 0;
     walk_parent(this, (node, info) => {
@@ -13190,7 +13197,7 @@ function retain_top_func(fn, compressor) {
         && fn instanceof AST_Defun
         && has_flag(fn, TOP)
         && fn.name
-        && compressor.top_retain(fn.name);
+        && compressor.top_retain(fn.name.definition());
 }
 
 /***********************************************************************
@@ -14039,80 +14046,6 @@ function is_lhs(node, parent) {
     if (parent instanceof AST_ForIn && parent.init === node) return node;
 }
 
-(function(def_find_defs) {
-    function to_node(value, orig) {
-        if (value instanceof AST_Node) {
-            if (!(value instanceof AST_Constant)) {
-                // Value may be a function, an array including functions and even a complex assign / block expression,
-                // so it should never be shared in different places.
-                // Otherwise wrong information may be used in the compression phase
-                value = value.clone(true);
-            }
-            return make_node(value.CTOR, orig, value);
-        }
-        if (Array.isArray(value)) return make_node(AST_Array, orig, {
-            elements: value.map(function(value) {
-                return to_node(value, orig);
-            })
-        });
-        if (value && typeof value == "object") {
-            var props = [];
-            for (var key in value) if (HOP(value, key)) {
-                props.push(make_node(AST_ObjectKeyVal, orig, {
-                    key: key,
-                    value: to_node(value[key], orig)
-                }));
-            }
-            return make_node(AST_Object, orig, {
-                properties: props
-            });
-        }
-        return make_node_from_constant(value, orig);
-    }
-
-    AST_Toplevel.DEFMETHOD("resolve_defines", function(compressor) {
-        if (!compressor.option("global_defs")) return this;
-        this.figure_out_scope({ ie8: compressor.option("ie8") });
-        return this.transform(new TreeTransformer(function(node) {
-            var def = node._find_defs(compressor, "");
-            if (!def) return;
-            var level = 0, child = node, parent;
-            while (parent = this.parent(level++)) {
-                if (!(parent instanceof AST_PropAccess)) break;
-                if (parent.expression !== child) break;
-                child = parent;
-            }
-            if (is_lhs(child, parent)) {
-                return;
-            }
-            return def;
-        }));
-    });
-    def_find_defs(AST_Node, noop);
-    def_find_defs(AST_Chain, function(compressor, suffix) {
-        return this.expression._find_defs(compressor, suffix);
-    });
-    def_find_defs(AST_Dot, function(compressor, suffix) {
-        return this.expression._find_defs(compressor, "." + this.property + suffix);
-    });
-    def_find_defs(AST_SymbolDeclaration, function() {
-        if (!this.global()) return;
-    });
-    def_find_defs(AST_SymbolRef, function(compressor, suffix) {
-        if (!this.global()) return;
-        var defines = compressor.option("global_defs");
-        var name = this.name + suffix;
-        if (HOP(defines, name)) return to_node(defines[name], this);
-    });
-    def_find_defs(AST_ImportMeta, function(compressor, suffix) {
-        var defines = compressor.option("global_defs");
-        var name = "import.meta" + suffix;
-        if (HOP(defines, name)) return to_node(defines[name], this);
-    });
-})(function(node, func) {
-    node.DEFMETHOD("_find_defs", func);
-});
-
 // method to negate an expression
 (function(def_negate) {
     function basic_negation(exp) {
@@ -15150,6 +15083,8 @@ const r_keep_assign = /keep_assign/;
 AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
     if (!compressor.option("unused")) return;
     if (compressor.has_directive("use asm")) return;
+    if (!this.variables) return; // not really a scope (eg: AST_Class)
+
     var self = this;
     if (self.pinned()) return;
     var drop_funcs = !(self instanceof AST_Toplevel) || compressor.toplevel.funcs;
@@ -15169,7 +15104,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
     var fixed_ids = new Map();
     if (self instanceof AST_Toplevel && compressor.top_retain) {
         self.variables.forEach(function(def) {
-            if (compressor.top_retain(def) && !in_use_ids.has(def.id)) {
+            if (compressor.top_retain(def)) {
                 in_use_ids.set(def.id, def);
             }
         });
@@ -15184,9 +15119,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             node.argnames.forEach(function(argname) {
                 if (!(argname instanceof AST_SymbolDeclaration)) return;
                 var def = argname.definition();
-                if (!in_use_ids.has(def.id)) {
-                    in_use_ids.set(def.id, def);
-                }
+                in_use_ids.set(def.id, def);
             });
         }
         if (node === self) return;
@@ -15199,7 +15132,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             var node_def = node.name.definition();
             const in_export = tw.parent() instanceof AST_Export;
             if (in_export || !drop_funcs && scope === self) {
-                if (node_def.global && !in_use_ids.has(node_def.id)) {
+                if (node_def.global) {
                     in_use_ids.set(node_def.id, node_def);
                 }
             }
@@ -15207,10 +15140,12 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             map_add(initializations, node_def.id, node);
             return true; // don't go in nested scopes
         }
-        if (node instanceof AST_SymbolFunarg && scope === self) {
+        // In the root scope, we drop things. In inner scopes, we just check for uses.
+        const in_root_scope = scope === self;
+        if (node instanceof AST_SymbolFunarg && in_root_scope) {
             map_add(var_defs_by_id, node.definition().id, node);
         }
-        if (node instanceof AST_Definitions && scope === self) {
+        if (node instanceof AST_Definitions && in_root_scope) {
             const in_export = tw.parent() instanceof AST_Export;
             node.definitions.forEach(function(def) {
                 if (def.name instanceof AST_SymbolVar) {
@@ -15220,7 +15155,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                     walk(def.name, node => {
                         if (node instanceof AST_SymbolDeclaration) {
                             const def = node.definition();
-                            if (def.global && !in_use_ids.has(def.id)) {
+                            if (def.global) {
                                 in_use_ids.set(def.id, def);
                             }
                         }
@@ -17903,8 +17838,9 @@ function inline_into_symbolref(self, compressor) {
     return self;
 }
 
-function inline_into_call(self, fn, compressor) {
+function inline_into_call(self, compressor) {
     var exp = self.expression;
+    var fn = exp;
     var simple_args = self.args.every((arg) => !(arg instanceof AST_Expansion));
 
     if (compressor.option("reduce_vars")
@@ -17912,9 +17848,15 @@ function inline_into_call(self, fn, compressor) {
         && !has_annotation(self, _NOINLINE)
     ) {
         const fixed = fn.fixed_value();
-        if (!retain_top_func(fixed, compressor)) {
-            fn = fixed;
+
+        if (
+            retain_top_func(fixed, compressor)
+            || !compressor.toplevel.funcs && exp.definition().global
+        ) {
+            return self;
         }
+
+        fn = fixed;
     }
 
     var is_func = fn instanceof AST_Lambda;
@@ -18245,6 +18187,80 @@ function inline_into_call(self, fn, compressor) {
     }
 }
 
+(function(def_find_defs) {
+    function to_node(value, orig) {
+        if (value instanceof AST_Node) {
+            if (!(value instanceof AST_Constant)) {
+                // Value may be a function, an array including functions and even a complex assign / block expression,
+                // so it should never be shared in different places.
+                // Otherwise wrong information may be used in the compression phase
+                value = value.clone(true);
+            }
+            return make_node(value.CTOR, orig, value);
+        }
+        if (Array.isArray(value)) return make_node(AST_Array, orig, {
+            elements: value.map(function(value) {
+                return to_node(value, orig);
+            })
+        });
+        if (value && typeof value == "object") {
+            var props = [];
+            for (var key in value) if (HOP(value, key)) {
+                props.push(make_node(AST_ObjectKeyVal, orig, {
+                    key: key,
+                    value: to_node(value[key], orig)
+                }));
+            }
+            return make_node(AST_Object, orig, {
+                properties: props
+            });
+        }
+        return make_node_from_constant(value, orig);
+    }
+
+    AST_Toplevel.DEFMETHOD("resolve_defines", function(compressor) {
+        if (!compressor.option("global_defs")) return this;
+        this.figure_out_scope({ ie8: compressor.option("ie8") });
+        return this.transform(new TreeTransformer(function(node) {
+            var def = node._find_defs(compressor, "");
+            if (!def) return;
+            var level = 0, child = node, parent;
+            while (parent = this.parent(level++)) {
+                if (!(parent instanceof AST_PropAccess)) break;
+                if (parent.expression !== child) break;
+                child = parent;
+            }
+            if (is_lhs(child, parent)) {
+                return;
+            }
+            return def;
+        }));
+    });
+    def_find_defs(AST_Node, noop);
+    def_find_defs(AST_Chain, function(compressor, suffix) {
+        return this.expression._find_defs(compressor, suffix);
+    });
+    def_find_defs(AST_Dot, function(compressor, suffix) {
+        return this.expression._find_defs(compressor, "." + this.property + suffix);
+    });
+    def_find_defs(AST_SymbolDeclaration, function() {
+        if (!this.global()) return;
+    });
+    def_find_defs(AST_SymbolRef, function(compressor, suffix) {
+        if (!this.global()) return;
+        var defines = compressor.option("global_defs");
+        var name = this.name + suffix;
+        if (HOP(defines, name)) return to_node(defines[name], this);
+    });
+    def_find_defs(AST_ImportMeta, function(compressor, suffix) {
+        var defines = compressor.option("global_defs");
+        var name = "import.meta" + suffix;
+        if (HOP(defines, name)) return to_node(defines[name], this);
+    });
+})(function(node, func) {
+    node.DEFMETHOD("_find_defs", func);
+});
+
 /***********************************************************************
 
   A JavaScript tokenizer / parser / beautifier / compressor.
@@ -18398,11 +18414,17 @@ class Compressor extends TreeWalker {
         this.sequences_limit = sequences == 1 ? 800 : sequences | 0;
         this.evaluated_regexps = new Map();
         this._toplevel = undefined;
-        this.mangle_options = mangle_options
+        this._mangle_options = mangle_options
             ? format_mangler_options(mangle_options)
             : mangle_options;
     }
 
+    mangle_options() {
+        var nth_identifier = this._mangle_options && this._mangle_options.nth_identifier || base54;
+        var module = this._mangle_options && this._mangle_options.module || this.option("module");
+        return { ie8: this.option("ie8"), nth_identifier, module };
+    }
+
     option(key) {
         return this.options[key];
     }
@@ -18457,8 +18479,7 @@ class Compressor extends TreeWalker {
         var passes = +this.options.passes || 1;
         var min_count = 1 / 0;
         var stopping = false;
-        var nth_identifier = this.mangle_options && this.mangle_options.nth_identifier || base54;
-        var mangle = { ie8: this.option("ie8"), nth_identifier: nth_identifier };
+        var mangle = this.mangle_options();
         for (var pass = 0; pass < passes; pass++) {
             this._toplevel.figure_out_scope(mangle);
             if (pass === 0 && this.option("drop_console")) {
@@ -19687,18 +19708,10 @@ def_optimize(AST_Call, function(self, compressor) {
     var exp = self.expression;
     var fn = exp;
     inline_array_like_spread(self.args);
-    var simple_args = self.args.every((arg) =>
-        !(arg instanceof AST_Expansion)
-    );
+    var simple_args = self.args.every((arg) => !(arg instanceof AST_Expansion));
 
-    if (compressor.option("reduce_vars")
-        && fn instanceof AST_SymbolRef
-        && !has_annotation(self, _NOINLINE)
-    ) {
-        const fixed = fn.fixed_value();
-        if (!retain_top_func(fixed, compressor)) {
-            fn = fixed;
-        }
+    if (compressor.option("reduce_vars") && fn instanceof AST_SymbolRef) {
+        fn = fn.fixed_value();
     }
 
     var is_func = fn instanceof AST_Lambda;
@@ -19742,7 +19755,7 @@ def_optimize(AST_Call, function(self, compressor) {
         self.args.length = last;
     }
 
-    if (compressor.option("unsafe")) {
+    if (compressor.option("unsafe") && !exp.contains_optional()) {
         if (exp instanceof AST_Dot && exp.start.value === "Array" && exp.property === "from" && self.args.length === 1) {
             const [argument] = self.args;
             if (argument instanceof AST_Array) {
@@ -19957,7 +19970,6 @@ def_optimize(AST_Call, function(self, compressor) {
             argnames: [],
             body: []
         }).optimize(compressor);
-        var nth_identifier = compressor.mangle_options && compressor.mangle_options.nth_identifier || base54;
         if (self.args.every((x) => x instanceof AST_String)) {
             // quite a corner-case, but we can handle it:
             //   https://github.com/mishoo/UglifyJS2/issues/203
@@ -19967,10 +19979,10 @@ def_optimize(AST_Call, function(self, compressor) {
                     return arg.value;
                 }).join(",") + "){" + self.args[self.args.length - 1].value + "})";
                 var ast = parse(code);
-                var mangle = { ie8: compressor.option("ie8"), nth_identifier: nth_identifier };
+                var mangle = compressor.mangle_options();
                 ast.figure_out_scope(mangle);
                 var comp = new Compressor(compressor.options, {
-                    mangle_options: compressor.mangle_options
+                    mangle_options: compressor._mangle_options
                 });
                 ast = ast.transform(comp);
                 ast.figure_out_scope(mangle);
@@ -20006,7 +20018,24 @@ def_optimize(AST_Call, function(self, compressor) {
         }
     }
 
-    return inline_into_call(self, fn, compressor);
+    return inline_into_call(self, compressor);
+});
+
+/** Does this node contain optional property access or optional call? */
+AST_Node.DEFMETHOD("contains_optional", function() {
+    if (
+        this instanceof AST_PropAccess
+        || this instanceof AST_Call
+        || this instanceof AST_Chain
+    ) {
+        if (this.optional) {
+            return true;
+        } else {
+            return this.expression.contains_optional();
+        }
+    } else {
+        return false;
+    }
 });
 
 def_optimize(AST_New, function(self, compressor) {
@@ -21839,10 +21868,10 @@ def_optimize(AST_Destructuring, function(self, compressor) {
         if (def.references.length) return true;
         if (!def.global) return false;
         if (compressor.toplevel.vars) {
-             if (compressor.top_retain) {
-                 return compressor.top_retain(def);
-             }
-             return false;
+            if (compressor.top_retain) {
+                return compressor.top_retain(def);
+            }
+            return false;
         }
         return true;
     }

package/lib/compress/common.js

@@ -344,5 +344,5 @@ export function retain_top_func(fn, compressor) {
         && fn instanceof AST_Defun
         && has_flag(fn, TOP)
         && fn.name
-        && compressor.top_retain(fn.name);
+        && compressor.top_retain(fn.name.definition());
 }

package/lib/compress/drop-unused.js

@@ -109,6 +109,8 @@ const r_keep_assign = /keep_assign/;
 AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
     if (!compressor.option("unused")) return;
     if (compressor.has_directive("use asm")) return;
+    if (!this.variables) return; // not really a scope (eg: AST_Class)
+
     var self = this;
     if (self.pinned()) return;
     var drop_funcs = !(self instanceof AST_Toplevel) || compressor.toplevel.funcs;
@@ -128,7 +130,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
     var fixed_ids = new Map();
     if (self instanceof AST_Toplevel && compressor.top_retain) {
         self.variables.forEach(function(def) {
-            if (compressor.top_retain(def) && !in_use_ids.has(def.id)) {
+            if (compressor.top_retain(def)) {
                 in_use_ids.set(def.id, def);
             }
         });
@@ -143,9 +145,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             node.argnames.forEach(function(argname) {
                 if (!(argname instanceof AST_SymbolDeclaration)) return;
                 var def = argname.definition();
-                if (!in_use_ids.has(def.id)) {
-                    in_use_ids.set(def.id, def);
-                }
+                in_use_ids.set(def.id, def);
             });
         }
         if (node === self) return;
@@ -158,7 +158,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             var node_def = node.name.definition();
             const in_export = tw.parent() instanceof AST_Export;
             if (in_export || !drop_funcs && scope === self) {
-                if (node_def.global && !in_use_ids.has(node_def.id)) {
+                if (node_def.global) {
                     in_use_ids.set(node_def.id, node_def);
                 }
             }
@@ -166,10 +166,12 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             map_add(initializations, node_def.id, node);
             return true; // don't go in nested scopes
         }
-        if (node instanceof AST_SymbolFunarg && scope === self) {
+        // In the root scope, we drop things. In inner scopes, we just check for uses.
+        const in_root_scope = scope === self;
+        if (node instanceof AST_SymbolFunarg && in_root_scope) {
             map_add(var_defs_by_id, node.definition().id, node);
         }
-        if (node instanceof AST_Definitions && scope === self) {
+        if (node instanceof AST_Definitions && in_root_scope) {
             const in_export = tw.parent() instanceof AST_Export;
             node.definitions.forEach(function(def) {
                 if (def.name instanceof AST_SymbolVar) {
@@ -179,7 +181,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                     walk(def.name, node => {
                         if (node instanceof AST_SymbolDeclaration) {
                             const def = node.definition();
-                            if (def.global && !in_use_ids.has(def.id)) {
+                            if (def.global) {
                                 in_use_ids.set(def.id, def);
                             }
                         }

package/lib/compress/global-defs.js

@@ -0,0 +1,92 @@
+import {
+    AST_Array,
+    AST_Chain,
+    AST_Constant,
+    AST_Dot,
+    AST_ImportMeta,
+    AST_Node,
+    AST_Object,
+    AST_ObjectKeyVal,
+    AST_PropAccess,
+    AST_SymbolDeclaration,
+    AST_SymbolRef,
+    AST_Toplevel,
+    TreeTransformer,
+} from "../ast.js";
+import { make_node, noop, HOP } from "../utils/index.js";
+import { make_node_from_constant } from "./common.js";
+import { is_lhs } from "./inference.js";
+
+(function(def_find_defs) {
+    function to_node(value, orig) {
+        if (value instanceof AST_Node) {
+            if (!(value instanceof AST_Constant)) {
+                // Value may be a function, an array including functions and even a complex assign / block expression,
+                // so it should never be shared in different places.
+                // Otherwise wrong information may be used in the compression phase
+                value = value.clone(true);
+            }
+            return make_node(value.CTOR, orig, value);
+        }
+        if (Array.isArray(value)) return make_node(AST_Array, orig, {
+            elements: value.map(function(value) {
+                return to_node(value, orig);
+            })
+        });
+        if (value && typeof value == "object") {
+            var props = [];
+            for (var key in value) if (HOP(value, key)) {
+                props.push(make_node(AST_ObjectKeyVal, orig, {
+                    key: key,
+                    value: to_node(value[key], orig)
+                }));
+            }
+            return make_node(AST_Object, orig, {
+                properties: props
+            });
+        }
+        return make_node_from_constant(value, orig);
+    }
+
+    AST_Toplevel.DEFMETHOD("resolve_defines", function(compressor) {
+        if (!compressor.option("global_defs")) return this;
+        this.figure_out_scope({ ie8: compressor.option("ie8") });
+        return this.transform(new TreeTransformer(function(node) {
+            var def = node._find_defs(compressor, "");
+            if (!def) return;
+            var level = 0, child = node, parent;
+            while (parent = this.parent(level++)) {
+                if (!(parent instanceof AST_PropAccess)) break;
+                if (parent.expression !== child) break;
+                child = parent;
+            }
+            if (is_lhs(child, parent)) {
+                return;
+            }
+            return def;
+        }));
+    });
+    def_find_defs(AST_Node, noop);
+    def_find_defs(AST_Chain, function(compressor, suffix) {
+        return this.expression._find_defs(compressor, suffix);
+    });
+    def_find_defs(AST_Dot, function(compressor, suffix) {
+        return this.expression._find_defs(compressor, "." + this.property + suffix);
+    });
+    def_find_defs(AST_SymbolDeclaration, function() {
+        if (!this.global()) return;
+    });
+    def_find_defs(AST_SymbolRef, function(compressor, suffix) {
+        if (!this.global()) return;
+        var defines = compressor.option("global_defs");
+        var name = this.name + suffix;
+        if (HOP(defines, name)) return to_node(defines[name], this);
+    });
+    def_find_defs(AST_ImportMeta, function(compressor, suffix) {
+        var defines = compressor.option("global_defs");
+        var name = "import.meta" + suffix;
+        if (HOP(defines, name)) return to_node(defines[name], this);
+    });
+})(function(node, func) {
+    node.DEFMETHOD("_find_defs", func);
+});

package/lib/compress/index.js

@@ -204,11 +204,11 @@ import {
     is_reachable,
     can_be_evicted_from_block,
     as_statement_array,
-    retain_top_func,
     is_func_expr,
 } from "./common.js";
 import { tighten_body, trim_unreachable_code } from "./tighten-body.js";
 import { inline_into_symbolref, inline_into_call } from "./inline.js";
+import "./global-defs.js";
 
 class Compressor extends TreeWalker {
     constructor(options, { false_by_default = false, mangle_options = false }) {
@@ -320,11 +320,17 @@ class Compressor extends TreeWalker {
         this.sequences_limit = sequences == 1 ? 800 : sequences | 0;
         this.evaluated_regexps = new Map();
         this._toplevel = undefined;
-        this.mangle_options = mangle_options
+        this._mangle_options = mangle_options
             ? format_mangler_options(mangle_options)
             : mangle_options;
     }
 
+    mangle_options() {
+        var nth_identifier = this._mangle_options && this._mangle_options.nth_identifier || base54;
+        var module = this._mangle_options && this._mangle_options.module || this.option("module");
+        return { ie8: this.option("ie8"), nth_identifier, module };
+    }
+
     option(key) {
         return this.options[key];
     }
@@ -379,8 +385,7 @@ class Compressor extends TreeWalker {
         var passes = +this.options.passes || 1;
         var min_count = 1 / 0;
         var stopping = false;
-        var nth_identifier = this.mangle_options && this.mangle_options.nth_identifier || base54;
-        var mangle = { ie8: this.option("ie8"), nth_identifier: nth_identifier };
+        var mangle = this.mangle_options();
         for (var pass = 0; pass < passes; pass++) {
             this._toplevel.figure_out_scope(mangle);
             if (pass === 0 && this.option("drop_console")) {
@@ -1609,18 +1614,10 @@ def_optimize(AST_Call, function(self, compressor) {
     var exp = self.expression;
     var fn = exp;
     inline_array_like_spread(self.args);
-    var simple_args = self.args.every((arg) =>
-        !(arg instanceof AST_Expansion)
-    );
+    var simple_args = self.args.every((arg) => !(arg instanceof AST_Expansion));
 
-    if (compressor.option("reduce_vars")
-        && fn instanceof AST_SymbolRef
-        && !has_annotation(self, _NOINLINE)
-    ) {
-        const fixed = fn.fixed_value();
-        if (!retain_top_func(fixed, compressor)) {
-            fn = fixed;
-        }
+    if (compressor.option("reduce_vars") && fn instanceof AST_SymbolRef) {
+        fn = fn.fixed_value();
     }
 
     var is_func = fn instanceof AST_Lambda;
@@ -1664,7 +1661,7 @@ def_optimize(AST_Call, function(self, compressor) {
         self.args.length = last;
     }
 
-    if (compressor.option("unsafe")) {
+    if (compressor.option("unsafe") && !exp.contains_optional()) {
         if (exp instanceof AST_Dot && exp.start.value === "Array" && exp.property === "from" && self.args.length === 1) {
             const [argument] = self.args;
             if (argument instanceof AST_Array) {
@@ -1879,7 +1876,6 @@ def_optimize(AST_Call, function(self, compressor) {
             argnames: [],
             body: []
         }).optimize(compressor);
-        var nth_identifier = compressor.mangle_options && compressor.mangle_options.nth_identifier || base54;
         if (self.args.every((x) => x instanceof AST_String)) {
             // quite a corner-case, but we can handle it:
             //   https://github.com/mishoo/UglifyJS2/issues/203
@@ -1889,10 +1885,10 @@ def_optimize(AST_Call, function(self, compressor) {
                     return arg.value;
                 }).join(",") + "){" + self.args[self.args.length - 1].value + "})";
                 var ast = parse(code);
-                var mangle = { ie8: compressor.option("ie8"), nth_identifier: nth_identifier };
+                var mangle = compressor.mangle_options();
                 ast.figure_out_scope(mangle);
                 var comp = new Compressor(compressor.options, {
-                    mangle_options: compressor.mangle_options
+                    mangle_options: compressor._mangle_options
                 });
                 ast = ast.transform(comp);
                 ast.figure_out_scope(mangle);
@@ -1928,7 +1924,24 @@ def_optimize(AST_Call, function(self, compressor) {
         }
     }
 
-    return inline_into_call(self, fn, compressor);
+    return inline_into_call(self, compressor);
+});
+
+/** Does this node contain optional property access or optional call? */
+AST_Node.DEFMETHOD("contains_optional", function() {
+    if (
+        this instanceof AST_PropAccess
+        || this instanceof AST_Call
+        || this instanceof AST_Chain
+    ) {
+        if (this.optional) {
+            return true;
+        } else {
+            return this.expression.contains_optional();
+        }
+    } else {
+        return false;
+    }
 });
 
 def_optimize(AST_New, function(self, compressor) {
@@ -3761,10 +3774,10 @@ def_optimize(AST_Destructuring, function(self, compressor) {
         if (def.references.length) return true;
         if (!def.global) return false;
         if (compressor.toplevel.vars) {
-             if (compressor.top_retain) {
-                 return compressor.top_retain(def);
-             }
-             return false;
+            if (compressor.top_retain) {
+                return compressor.top_retain(def);
+            }
+            return false;
         }
         return true;
     }

package/lib/compress/inference.js

@@ -98,7 +98,6 @@ import {
   AST_TemplateSegment,
   AST_TemplateString,
   AST_This,
-  AST_Toplevel,
   AST_True,
   AST_Try,
   AST_Unary,
@@ -107,7 +106,6 @@ import {
   AST_Undefined,
   AST_VarDef,
 
-  TreeTransformer,
   walk,
   walk_abort,
 
@@ -121,11 +119,9 @@ import {
     return_this,
     make_node,
     member,
-    noop,
     has_annotation,
-    HOP
 } from "../utils/index.js";
-import { make_node_from_constant, make_sequence, best_of_expression, read_property } from "./common.js";
+import { make_sequence, best_of_expression, read_property } from "./common.js";
 
 import { INLINED, UNDEFINED, has_flag } from "./compressor-flags.js";
 import { pure_prop_access_globals, is_pure_native_fn, is_pure_native_method } from "./native-objects.js";
@@ -728,80 +724,6 @@ export function is_lhs(node, parent) {
     if (parent instanceof AST_ForIn && parent.init === node) return node;
 }
 
-(function(def_find_defs) {
-    function to_node(value, orig) {
-        if (value instanceof AST_Node) {
-            if (!(value instanceof AST_Constant)) {
-                // Value may be a function, an array including functions and even a complex assign / block expression,
-                // so it should never be shared in different places.
-                // Otherwise wrong information may be used in the compression phase
-                value = value.clone(true);
-            }
-            return make_node(value.CTOR, orig, value);
-        }
-        if (Array.isArray(value)) return make_node(AST_Array, orig, {
-            elements: value.map(function(value) {
-                return to_node(value, orig);
-            })
-        });
-        if (value && typeof value == "object") {
-            var props = [];
-            for (var key in value) if (HOP(value, key)) {
-                props.push(make_node(AST_ObjectKeyVal, orig, {
-                    key: key,
-                    value: to_node(value[key], orig)
-                }));
-            }
-            return make_node(AST_Object, orig, {
-                properties: props
-            });
-        }
-        return make_node_from_constant(value, orig);
-    }
-
-    AST_Toplevel.DEFMETHOD("resolve_defines", function(compressor) {
-        if (!compressor.option("global_defs")) return this;
-        this.figure_out_scope({ ie8: compressor.option("ie8") });
-        return this.transform(new TreeTransformer(function(node) {
-            var def = node._find_defs(compressor, "");
-            if (!def) return;
-            var level = 0, child = node, parent;
-            while (parent = this.parent(level++)) {
-                if (!(parent instanceof AST_PropAccess)) break;
-                if (parent.expression !== child) break;
-                child = parent;
-            }
-            if (is_lhs(child, parent)) {
-                return;
-            }
-            return def;
-        }));
-    });
-    def_find_defs(AST_Node, noop);
-    def_find_defs(AST_Chain, function(compressor, suffix) {
-        return this.expression._find_defs(compressor, suffix);
-    });
-    def_find_defs(AST_Dot, function(compressor, suffix) {
-        return this.expression._find_defs(compressor, "." + this.property + suffix);
-    });
-    def_find_defs(AST_SymbolDeclaration, function() {
-        if (!this.global()) return;
-    });
-    def_find_defs(AST_SymbolRef, function(compressor, suffix) {
-        if (!this.global()) return;
-        var defines = compressor.option("global_defs");
-        var name = this.name + suffix;
-        if (HOP(defines, name)) return to_node(defines[name], this);
-    });
-    def_find_defs(AST_ImportMeta, function(compressor, suffix) {
-        var defines = compressor.option("global_defs");
-        var name = "import.meta" + suffix;
-        if (HOP(defines, name)) return to_node(defines[name], this);
-    });
-})(function(node, func) {
-    node.DEFMETHOD("_find_defs", func);
-});
-
 // method to negate an expression
 (function(def_negate) {
     function basic_negation(exp) {

package/lib/compress/inline.js

@@ -290,8 +290,9 @@ export function inline_into_symbolref(self, compressor) {
     return self;
 }
 
-export function inline_into_call(self, fn, compressor) {
+export function inline_into_call(self, compressor) {
     var exp = self.expression;
+    var fn = exp;
     var simple_args = self.args.every((arg) => !(arg instanceof AST_Expansion));
 
     if (compressor.option("reduce_vars")
@@ -299,9 +300,15 @@ export function inline_into_call(self, fn, compressor) {
         && !has_annotation(self, _NOINLINE)
     ) {
         const fixed = fn.fixed_value();
-        if (!retain_top_func(fixed, compressor)) {
-            fn = fixed;
+
+        if (
+            retain_top_func(fixed, compressor)
+            || !compressor.toplevel.funcs && exp.definition().global
+        ) {
+            return self;
         }
+
+        fn = fixed;
     }
 
     var is_func = fn instanceof AST_Lambda;

package/lib/output.js

@@ -980,7 +980,8 @@ function OutputStream(options) {
         ) {
             return true;
         }
-        return p instanceof AST_PropAccess && p.expression === this;
+        return p instanceof AST_PropAccess && p.expression === this
+            || p instanceof AST_Conditional && p.condition === this;
     });
 
     // same goes for an object literal (as in AST_Function), because

package/lib/scope.js

@@ -205,6 +205,7 @@ AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = null,
         cache: null,
         ie8: false,
         safari10: false,
+        module: false,
     });
 
     if (!(toplevel instanceof AST_Toplevel)) {
@@ -372,6 +373,11 @@ AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = null,
             );
         }
     });
+
+    if (options.module) {
+        tw.directives["use strict"] = true;
+    }
+
     this.walk(tw);
 
     function mark_export(def, level) {

package/lib/size.js

@@ -89,7 +89,7 @@ import { first_in_statement } from "./utils/first_in_statement.js";
 
 let mangle_options = undefined;
 AST_Node.prototype.size = function (compressor, stack) {
-    mangle_options = compressor && compressor.mangle_options;
+    mangle_options = compressor && compressor._mangle_options;
 
     let size = 0;
     walk_parent(this, (node, info) => {

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