terser 5.16.9 → 5.17.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v5.17.1
+ - Fix evaluating `.length` when the source array might've been mutated
+
+## v5.17.0
+ - Drop vestigial `= undefined` default argument in IIFE calls (#1366)
+ - Evaluate known arrays' `.length` property when statically determinable
+ - Add `@__KEY__` annotation to mangle string literals (#1365)
+
 ## v5.16.9
  - Fix parentheses in output of optional chains (`a?.b`) (#1374)
  - More documentation on source maps (#1368)

package/README.md

@@ -1188,6 +1188,7 @@ Annotations in Terser are a way to tell it to treat a certain function call diff
  * `/*@__INLINE__*/` - forces a function to be inlined somewhere.
  * `/*@__NOINLINE__*/` - Makes sure the called function is not inlined into the call site.
  * `/*@__PURE__*/` - Marks a function call as pure. That means, it can safely be dropped.
+ * `/*@__KEY__*/` - Marks a string literal as a property to also mangle it when mangling properties.
 
 You can use either a `@` sign at the start, or a `#`.
 
@@ -1201,6 +1202,9 @@ function_always_inlined_here()
 function_cant_be_inlined_into_here()
 
 const x = /*#__PURE__*/i_am_dropped_if_x_is_not_used()
+
+function lookup(object, key) { return object[key]; }
+lookup({ i_will_be_mangled_too: "bar" }, /*@__KEY__*/ "i_will_be_mangled_too");
 ```
 
 ### ESTree / SpiderMonkey AST

package/dist/bundle.min.js

@@ -264,6 +264,10 @@ function set_annotation(node, annotation) {
     node._annotations |= annotation;
 }
 
+function clear_annotation(node, annotation) {
+    node._annotations &= ~annotation;
+}
+
 /***********************************************************************
 
   A JavaScript tokenizer / parser / beautifier / compressor.
@@ -2368,6 +2372,7 @@ function parse($TEXT, options) {
                 value : tok.value,
                 quote : tok.quote
             });
+            annotate(ret);            
             break;
           case "regexp":
             const [_, source, flags] = tok.value.match(/^\/(.*)\/(\w*)$/);
@@ -3254,6 +3259,10 @@ function parse($TEXT, options) {
                     set_annotation(node, _NOINLINE);
                     break;
                 }
+                if (/[@#]__KEY__/.test(comment.value)) {
+                    set_annotation(node, _KEY);
+                    break;
+                }
             }
         }
     }
@@ -4506,11 +4515,14 @@ var AST_Destructuring = DEFNODE("Destructuring", "names is_array", function AST_
     },
     all_symbols: function() {
         var out = [];
-        this.walk(new TreeWalker(function (node) {
-            if (node instanceof AST_Symbol) {
+        walk(this, node => {
+            if (node instanceof AST_SymbolDeclaration) {
                 out.push(node);
             }
-        }));
+            if (node instanceof AST_Lambda) {
+                return true;
+            }
+        });
         return out;
     }
 });
@@ -5041,6 +5053,13 @@ var AST_VarDef = DEFNODE("VarDef", "name value", function AST_VarDef(props) {
         if (this.value) push(this.value);
         push(this.name);
     },
+    declarations_as_names() {
+        if (this.name instanceof AST_SymbolDeclaration) {
+            return [this];
+        } else {
+            return this.name.all_symbols();
+        }
+    }
 });
 
 var AST_NameMapping = DEFNODE("NameMapping", "foreign_name name", function AST_NameMapping(props) {
@@ -6363,6 +6382,7 @@ var AST_String = DEFNODE("String", "value quote", function AST_String(props) {
         this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -6735,6 +6755,7 @@ class TreeTransformer extends TreeWalker {
 const _PURE     = 0b00000001;
 const _INLINE   = 0b00000010;
 const _NOINLINE = 0b00000100;
+const _KEY      = 0b00001000;
 
 /***********************************************************************
 
@@ -14478,6 +14499,25 @@ const regexp_flags = new Set([
 def_eval(AST_PropAccess, function (compressor, depth) {
     let obj = this.expression._eval(compressor, depth + 1);
     if (obj === nullish || (this.optional && obj == null)) return nullish;
+
+    // `.length` of strings and arrays is always safe
+    if (this.property === "length") {
+        if (typeof obj === "string") {
+            return obj.length;
+        }
+
+        const is_spreadless_array =
+            obj instanceof AST_Array
+            && obj.elements.every(el => !(el instanceof AST_Expansion));
+
+        if (
+            is_spreadless_array
+            && obj.elements.every(el => !el.has_side_effects(compressor))
+        ) {
+            return obj.elements.length;
+        }
+    }
+
     if (compressor.option("unsafe")) {
         var key = this.property;
         if (key instanceof AST_Node) {
@@ -14485,9 +14525,9 @@ def_eval(AST_PropAccess, function (compressor, depth) {
             if (key === this.property)
                 return this;
         }
+
         var exp = this.expression;
         if (is_undeclared_ref(exp)) {
-
             var aa;
             var first_arg = exp.name === "hasOwnProperty"
                 && key === "call"
@@ -16100,12 +16140,31 @@ function is_lhs_read_only(lhs) {
     return false;
 }
 
-// Remove code which we know is unreachable.
+/** var a = 1 --> var a*/
+function remove_initializers(var_statement) {
+    var decls = [];
+    var_statement.definitions.forEach(function(def) {
+        if (def.name instanceof AST_SymbolDeclaration) {
+            def.value = null;
+            decls.push(def);
+        } else {
+            def.declarations_as_names().forEach(name => {
+                decls.push(make_node(AST_VarDef, def, {
+                    name,
+                    value: null
+                }));
+            });
+        }
+    });
+    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) {
     walk(stat, node => {
         if (node instanceof AST_Var) {
-            node.remove_initializers();
-            target.push(node);
+            const no_initializers = remove_initializers(node);
+            if (no_initializers) target.push(no_initializers);
             return true;
         }
         if (
@@ -19335,26 +19394,6 @@ def_optimize(AST_Try, function(self, compressor) {
     return self;
 });
 
-AST_Definitions.DEFMETHOD("remove_initializers", function() {
-    var decls = [];
-    this.definitions.forEach(function(def) {
-        if (def.name instanceof AST_SymbolDeclaration) {
-            def.value = null;
-            decls.push(def);
-        } else {
-            walk(def.name, node => {
-                if (node instanceof AST_SymbolDeclaration) {
-                    decls.push(make_node(AST_VarDef, def, {
-                        name: node,
-                        value: null
-                    }));
-                }
-            });
-        }
-    });
-    this.definitions = decls;
-});
-
 AST_Definitions.DEFMETHOD("to_assignments", function(compressor) {
     var reduce_vars = compressor.option("reduce_vars");
     var assignments = [];
@@ -20572,13 +20611,20 @@ def_optimize(AST_DefaultAssign, function(self, compressor) {
 
     // `[x = undefined] = foo` ---> `[x] = foo`
     // `(arg = undefined) => ...` ---> `(arg) => ...` (unless `keep_fargs`)
-    if (
-        evaluateRight === undefined &&
-        (compressor.parent() instanceof AST_Lambda
-            ? compressor.option("keep_fargs") === false
-            : true)
-    ) {
-        self = self.left;
+    // `((arg = undefined) => ...)()` ---> `((arg) => ...)()`
+    let lambda, iife;
+    if (evaluateRight === undefined) {
+        if (
+            (lambda = compressor.parent()) instanceof AST_Lambda
+                ? (
+                    compressor.option("keep_fargs") === false
+                    || (iife = compressor.parent(1)).TYPE === "Call"
+                        && iife.expression === lambda
+                )
+                : true
+        ) {
+            self = self.left;
+        }
     } else if (evaluateRight !== self.right) {
         evaluateRight = make_node_from_constant(evaluateRight, self.right);
         self.right = best_of_expression(evaluateRight, self.right);
@@ -29731,6 +29777,8 @@ function mangle_properties(ast, options) {
             addStrings(node.args[1], add);
         } else if (node instanceof AST_Binary && node.operator === "in") {
             addStrings(node.left, add);
+        } else if (node instanceof AST_String && has_annotation(node, _KEY)) {
+            add(node.value);
         }
     }));
 
@@ -29762,6 +29810,10 @@ function mangle_properties(ast, options) {
             node.args[1] = mangleStrings(node.args[1]);
         } else if (node instanceof AST_Binary && node.operator === "in") {
             node.left = mangleStrings(node.left);
+        } else if (node instanceof AST_String && has_annotation(node, _KEY)) {
+            // Clear _KEY annotation to prevent double mangling
+            clear_annotation(node, _KEY);
+            node.value = mangle(node.value);
         }
     }));
 
@@ -29827,6 +29879,8 @@ function mangle_properties(ast, options) {
                 var last = node.expressions.length - 1;
                 node.expressions[last] = mangleStrings(node.expressions[last]);
             } else if (node instanceof AST_String) {
+                // Clear _KEY annotation to prevent double mangling
+                clear_annotation(node, _KEY);
                 node.value = mangle(node.value);
             } else if (node instanceof AST_Conditional) {
                 node.consequent = mangleStrings(node.consequent);

package/lib/ast.js

@@ -905,11 +905,14 @@ var AST_Destructuring = DEFNODE("Destructuring", "names is_array", function AST_
     },
     all_symbols: function() {
         var out = [];
-        this.walk(new TreeWalker(function (node) {
-            if (node instanceof AST_Symbol) {
+        walk(this, node => {
+            if (node instanceof AST_SymbolDeclaration) {
                 out.push(node);
             }
-        }));
+            if (node instanceof AST_Lambda) {
+                return true;
+            }
+        });
         return out;
     }
 });
@@ -1440,6 +1443,13 @@ var AST_VarDef = DEFNODE("VarDef", "name value", function AST_VarDef(props) {
         if (this.value) push(this.value);
         push(this.name);
     },
+    declarations_as_names() {
+        if (this.name instanceof AST_SymbolDeclaration) {
+            return [this];
+        } else {
+            return this.name.all_symbols();
+        }
+    }
 });
 
 var AST_NameMapping = DEFNODE("NameMapping", "foreign_name name", function AST_NameMapping(props) {
@@ -2762,6 +2772,7 @@ var AST_String = DEFNODE("String", "value quote", function AST_String(props) {
         this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -3134,6 +3145,7 @@ class TreeTransformer extends TreeWalker {
 const _PURE     = 0b00000001;
 const _INLINE   = 0b00000010;
 const _NOINLINE = 0b00000100;
+const _KEY      = 0b00001000;
 
 export {
     AST_Accessor,
@@ -3278,4 +3290,5 @@ export {
     _INLINE,
     _NOINLINE,
     _PURE,
+    _KEY,
 };

package/lib/compress/evaluate.js

@@ -352,6 +352,25 @@ const regexp_flags = new Set([
 def_eval(AST_PropAccess, function (compressor, depth) {
     let obj = this.expression._eval(compressor, depth + 1);
     if (obj === nullish || (this.optional && obj == null)) return nullish;
+
+    // `.length` of strings and arrays is always safe
+    if (this.property === "length") {
+        if (typeof obj === "string") {
+            return obj.length;
+        }
+
+        const is_spreadless_array =
+            obj instanceof AST_Array
+            && obj.elements.every(el => !(el instanceof AST_Expansion));
+
+        if (
+            is_spreadless_array
+            && obj.elements.every(el => !el.has_side_effects(compressor))
+        ) {
+            return obj.elements.length;
+        }
+    }
+
     if (compressor.option("unsafe")) {
         var key = this.property;
         if (key instanceof AST_Node) {
@@ -359,9 +378,9 @@ def_eval(AST_PropAccess, function (compressor, depth) {
             if (key === this.property)
                 return this;
         }
+
         var exp = this.expression;
         if (is_undeclared_ref(exp)) {
-
             var aa;
             var first_arg = exp.name === "hasOwnProperty"
                 && key === "call"

package/lib/compress/index.js

@@ -1545,26 +1545,6 @@ def_optimize(AST_Try, function(self, compressor) {
     return self;
 });
 
-AST_Definitions.DEFMETHOD("remove_initializers", function() {
-    var decls = [];
-    this.definitions.forEach(function(def) {
-        if (def.name instanceof AST_SymbolDeclaration) {
-            def.value = null;
-            decls.push(def);
-        } else {
-            walk(def.name, node => {
-                if (node instanceof AST_SymbolDeclaration) {
-                    decls.push(make_node(AST_VarDef, def, {
-                        name: node,
-                        value: null
-                    }));
-                }
-            });
-        }
-    });
-    this.definitions = decls;
-});
-
 AST_Definitions.DEFMETHOD("to_assignments", function(compressor) {
     var reduce_vars = compressor.option("reduce_vars");
     var assignments = [];
@@ -2782,13 +2762,20 @@ def_optimize(AST_DefaultAssign, function(self, compressor) {
 
     // `[x = undefined] = foo` ---> `[x] = foo`
     // `(arg = undefined) => ...` ---> `(arg) => ...` (unless `keep_fargs`)
-    if (
-        evaluateRight === undefined &&
-        (compressor.parent() instanceof AST_Lambda
-            ? compressor.option("keep_fargs") === false
-            : true)
-    ) {
-        self = self.left;
+    // `((arg = undefined) => ...)()` ---> `((arg) => ...)()`
+    let lambda, iife;
+    if (evaluateRight === undefined) {
+        if (
+            (lambda = compressor.parent()) instanceof AST_Lambda
+                ? (
+                    compressor.option("keep_fargs") === false
+                    || (iife = compressor.parent(1)).TYPE === "Call"
+                        && iife.expression === lambda
+                )
+                : true
+        ) {
+            self = self.left;
+        }
     } else if (evaluateRight !== self.right) {
         evaluateRight = make_node_from_constant(evaluateRight, self.right);
         self.right = best_of_expression(evaluateRight, self.right);

package/lib/compress/tighten-body.js

@@ -170,12 +170,31 @@ function is_lhs_read_only(lhs) {
     return false;
 }
 
-// Remove code which we know is unreachable.
+/** var a = 1 --> var a*/
+function remove_initializers(var_statement) {
+    var decls = [];
+    var_statement.definitions.forEach(function(def) {
+        if (def.name instanceof AST_SymbolDeclaration) {
+            def.value = null;
+            decls.push(def);
+        } else {
+            def.declarations_as_names().forEach(name => {
+                decls.push(make_node(AST_VarDef, def, {
+                    name,
+                    value: null
+                }));
+            });
+        }
+    });
+    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) {
     walk(stat, node => {
         if (node instanceof AST_Var) {
-            node.remove_initializers();
-            target.push(node);
+            const no_initializers = remove_initializers(node);
+            if (no_initializers) target.push(no_initializers);
             return true;
         }
         if (

package/lib/parse.js

@@ -162,7 +162,8 @@ import {
     AST_Yield,
     _INLINE,
     _NOINLINE,
-    _PURE
+    _PURE,
+    _KEY
 } from "./ast.js";
 
 var LATEST_RAW = "";  // Only used for numbers and template strings
@@ -2225,6 +2226,7 @@ function parse($TEXT, options) {
                 value : tok.value,
                 quote : tok.quote
             });
+            annotate(ret);            
             break;
           case "regexp":
             const [_, source, flags] = tok.value.match(/^\/(.*)\/(\w*)$/);
@@ -3111,6 +3113,10 @@ function parse($TEXT, options) {
                     set_annotation(node, _NOINLINE);
                     break;
                 }
+                if (/[@#]__KEY__/.test(comment.value)) {
+                    set_annotation(node, _KEY);
+                    break;
+                }
             }
         }
     }

package/lib/propmangle.js

@@ -47,6 +47,8 @@
 import {
     defaults,
     push_uniq,
+    has_annotation,
+    clear_annotation,
 } from "./utils/index.js";
 import { base54 } from "./scope.js";
 import {
@@ -67,6 +69,7 @@ import {
     AST_Sub,
     TreeTransformer,
     TreeWalker,
+    _KEY,
 } from "./ast.js";
 import { domprops } from "../tools/domprops.js";
 
@@ -263,6 +266,8 @@ function mangle_properties(ast, options) {
             addStrings(node.args[1], add);
         } else if (node instanceof AST_Binary && node.operator === "in") {
             addStrings(node.left, add);
+        } else if (node instanceof AST_String && has_annotation(node, _KEY)) {
+            add(node.value);
         }
     }));
 
@@ -296,6 +301,10 @@ function mangle_properties(ast, options) {
             node.args[1] = mangleStrings(node.args[1]);
         } else if (node instanceof AST_Binary && node.operator === "in") {
             node.left = mangleStrings(node.left);
+        } else if (node instanceof AST_String && has_annotation(node, _KEY)) {
+            // Clear _KEY annotation to prevent double mangling
+            clear_annotation(node, _KEY);
+            node.value = mangle(node.value);
         }
     }));
 
@@ -361,6 +370,8 @@ function mangle_properties(ast, options) {
                 var last = node.expressions.length - 1;
                 node.expressions[last] = mangleStrings(node.expressions[last]);
             } else if (node instanceof AST_String) {
+                // Clear _KEY annotation to prevent double mangling
+                clear_annotation(node, _KEY);
                 node.value = mangle(node.value);
             } else if (node instanceof AST_Conditional) {
                 node.consequent = mangleStrings(node.consequent);

package/lib/utils/index.js

@@ -262,6 +262,10 @@ function set_annotation(node, annotation) {
     node._annotations |= annotation;
 }
 
+function clear_annotation(node, annotation) {
+    node._annotations &= ~annotation;
+}
+
 export {
     characters,
     defaults,
@@ -286,5 +290,6 @@ export {
     sort_regexp_flags,
     string_template,
     has_annotation,
-    set_annotation
+    set_annotation,
+    clear_annotation,
 };

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