terser 5.21.0 → 5.23.0

package/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
-## v5.20.1
+## v5.23.0
+ - When top_retain will keep a variable assignment around, inline the assignee when it's shorter than the name (#1434)
+ - Remove empty class `static {}` blocks.
+
+## 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.
 

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

@@ -2,7 +2,7 @@
 typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@jridgewell/source-map')) :
 typeof define === 'function' && define.amd ? define(['exports', '@jridgewell/source-map'], factory) :
 (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Terser = {}, global.sourceMap));
-}(this, (function (exports, sourceMap) { 'use strict';
+})(this, (function (exports, sourceMap) { 'use strict';
 
 /***********************************************************************
 
@@ -11573,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)) {
@@ -11740,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) {
@@ -12424,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) => {
@@ -15077,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;
@@ -17688,18 +17696,43 @@ function scope_encloses_variables_in_this_scope(scope, pulled_scope) {
     return false;
 }
 
+/**
+ * An extra check function for `top_retain` option, compare the length of const identifier
+ * and init value length and return true if init value is longer than identifier. for example:
+ * ```
+ * // top_retain: ["example"]
+ * const example = 100
+ * ```
+ * it will return false because length of "100" is short than identifier "example".
+ */
+function is_const_symbol_short_than_init_value(def, fixed_value) {
+    if (def.orig.length === 1 && fixed_value) {
+        const init_value_length = fixed_value.size();
+        const identifer_length = def.name.length;
+        return init_value_length > identifer_length;
+    }
+    return true;
+}
+
 function inline_into_symbolref(self, compressor) {
     const parent = compressor.parent();
-
     const def = self.definition();
     const nearest_scope = compressor.find_scope();
-    if (compressor.top_retain && def.global && compressor.top_retain(def)) {
+    let fixed = self.fixed_value();
+    if (
+        compressor.top_retain &&
+        def.global && 
+        compressor.top_retain(def) && 
+        // when identifier is in top_retain option dose not mean we can always inline it.
+        // if identifier name is longer then init value, we can replace it.
+        is_const_symbol_short_than_init_value(def, fixed)
+    ) {
+        // keep it
         def.fixed = false;
         def.single_use = false;
         return self;
     }
 
-    let fixed = self.fixed_value();
     let single_use = def.single_use
         && !(parent instanceof AST_Call
             && (parent.is_callee_pure(compressor))
@@ -18406,11 +18439,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];
     }
@@ -18465,8 +18504,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")) {
@@ -19742,7 +19780,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 +19995,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 +20004,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);
@@ -20009,6 +20046,23 @@ def_optimize(AST_Call, function(self, 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) {
     if (
         compressor.option("unsafe") &&
@@ -21614,8 +21668,14 @@ def_optimize(AST_Function, function(self, compressor) {
 });
 
 def_optimize(AST_Class, function(self) {
-    // HACK to avoid compress failure.
-    // AST_Class is not really an AST_Scope/AST_Block as it lacks a body.
+    for (let i = 0; i < self.properties.length; i++) {
+        const prop = self.properties[i];
+        if (prop instanceof AST_ClassStaticBlock && prop.body.length == 0) {
+            self.properties.splice(i, 1);
+            i--;
+        }
+    }
+
     return self;
 });
 
@@ -31235,4 +31295,4 @@ exports._default_options = _default_options;
 exports._run_cli = run_cli;
 exports.minify = minify;
 
-})));
+}));

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;

package/lib/compress/index.js

@@ -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")) {
@@ -1656,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) {
@@ -1871,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
@@ -1881,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);
@@ -1923,6 +1927,23 @@ def_optimize(AST_Call, function(self, 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) {
     if (
         compressor.option("unsafe") &&
@@ -3528,8 +3549,14 @@ def_optimize(AST_Function, function(self, compressor) {
 });
 
 def_optimize(AST_Class, function(self) {
-    // HACK to avoid compress failure.
-    // AST_Class is not really an AST_Scope/AST_Block as it lacks a body.
+    for (let i = 0; i < self.properties.length; i++) {
+        const prop = self.properties[i];
+        if (prop instanceof AST_ClassStaticBlock && prop.body.length == 0) {
+            self.properties.splice(i, 1);
+            i--;
+        }
+    }
+
     return self;
 });
 

package/lib/compress/inline.js

@@ -84,7 +84,7 @@ import {
 
     _INLINE,
     _NOINLINE,
-    _PURE
+    _PURE,
 } from "../ast.js";
 import { make_node, has_annotation } from "../utils/index.js";
 import "../size.js";
@@ -148,18 +148,43 @@ function scope_encloses_variables_in_this_scope(scope, pulled_scope) {
     return false;
 }
 
+/**
+ * An extra check function for `top_retain` option, compare the length of const identifier
+ * and init value length and return true if init value is longer than identifier. for example:
+ * ```
+ * // top_retain: ["example"]
+ * const example = 100
+ * ```
+ * it will return false because length of "100" is short than identifier "example".
+ */
+function is_const_symbol_short_than_init_value(def, fixed_value) {
+    if (def.orig.length === 1 && fixed_value) {
+        const init_value_length = fixed_value.size();
+        const identifer_length = def.name.length;
+        return init_value_length > identifer_length;
+    }
+    return true;
+}
+
 export function inline_into_symbolref(self, compressor) {
     const parent = compressor.parent();
-
     const def = self.definition();
     const nearest_scope = compressor.find_scope();
-    if (compressor.top_retain && def.global && compressor.top_retain(def)) {
+    let fixed = self.fixed_value();
+    if (
+        compressor.top_retain &&
+        def.global && 
+        compressor.top_retain(def) && 
+        // when identifier is in top_retain option dose not mean we can always inline it.
+        // if identifier name is longer then init value, we can replace it.
+        is_const_symbol_short_than_init_value(def, fixed)
+    ) {
+        // keep it
         def.fixed = false;
         def.single_use = false;
         return self;
     }
 
-    let fixed = self.fixed_value();
     let single_use = def.single_use
         && !(parent instanceof AST_Call
             && (parent.is_callee_pure(compressor))

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