terser 5.16.8 → 5.17.0

package/CHANGELOG.md

@@ -1,11 +1,21 @@
 # Changelog
 
+## 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)
+ - New `lhs_constants` option, allowing to stop Terser from swapping comparison operands (#1361)
+
 ## v5.16.8
 
  - Become even less conservative around function definitions for `reduce_vars`
  - Fix parsing context of `import.meta` expressions such that method calls are allowed
 
-## v5.16.7
+## v5.16.6
 
  - Become less conservative with analyzing function definitions for `reduce_vars`
  - Parse `import.meta` as a real AST node and not an `object.property`

package/README.md

@@ -708,7 +708,8 @@ If you happen to need the source map as a raw object, set `sourceMap.asObject` t
 
 - `comparisons` (default: `true`) -- apply certain optimizations to binary nodes,
   e.g. `!(a <= b) → a > b` (only when `unsafe_comps`), attempts to negate binary
-  nodes, e.g. `a = !b && !c && !d && !e → a=!(b||c||d||e)` etc.
+  nodes, e.g. `a = !b && !c && !d && !e → a=!(b||c||d||e)` etc. Note: `comparisons`
+  works best with `lhs_constants` enabled.
 
 - `computed_props` (default: `true`) -- Transforms constant computed properties
   into regular ones: `{["computed"]: 1}` is converted to `{computed: 1}`.
@@ -775,6 +776,9 @@ If you happen to need the source map as a raw object, set `sourceMap.asObject` t
 - `keep_infinity` (default: `false`) -- Pass `true` to prevent `Infinity` from
   being compressed into `1/0`, which may cause performance issues on Chrome.
 
+- `lhs_constants` (default: `true`) -- Moves constant values to the left-hand side
+  of binary nodes. `foo == 42 → 42 == foo`
+
 - `loops` (default: `true`) -- optimizations for `do`, `while` and `for` loops
   when we can statically determine the condition.
 
@@ -1184,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 `#`.
 
@@ -1197,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
@@ -1267,6 +1275,12 @@ expected as code is optimized and mappings are often simply not possible as
 some code no longer exists. For highest fidelity in source map debugging
 disable the `compress` option and just use `mangle`.
 
+When debugging, make sure you enable the **"map scopes"** feature to map mangled variable names back to their original names.  
+Without this, all variable values will be `undefined`. See https://github.com/terser/terser/issues/1367 for more details.
+<br/><br/>
+
+![image](https://user-images.githubusercontent.com/27283110/230441652-ac5cf6b0-5dc5-4ffc-9d8b-bd02875484f4.png)
+
 ### Compiler assumptions
 
 To allow for better optimizations, the compiler makes various assumptions:

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;
+                }
             }
         }
     }
@@ -6363,6 +6372,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 +6745,7 @@ class TreeTransformer extends TreeWalker {
 const _PURE     = 0b00000001;
 const _INLINE   = 0b00000010;
 const _NOINLINE = 0b00000100;
+const _KEY      = 0b00001000;
 
 /***********************************************************************
 
@@ -9742,6 +9753,12 @@ function OutputStream(options) {
             return true;
     });
 
+    PARENS(AST_Chain, function(output) {
+        var p = output.parent();
+        if (!(p instanceof AST_Call || p instanceof AST_PropAccess)) return false;
+        return p.expression === this;
+    });
+
     PARENS(AST_PropAccess, function(output) {
         var p = output.parent();
         if (p instanceof AST_New && p.expression === this) {
@@ -12939,7 +12956,8 @@ function maintain_this_binding(parent, orig, val) {
         parent instanceof AST_UnaryPrefix && parent.operator == "delete"
         || parent instanceof AST_Call && parent.expression === orig
             && (
-                val instanceof AST_PropAccess
+                val instanceof AST_Chain
+                || val instanceof AST_PropAccess
                 || val instanceof AST_SymbolRef && val.name == "eval"
             )
     ) {
@@ -14471,6 +14489,33 @@ 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 =>
+            obj instanceof AST_Array
+            && obj.elements.every(el => !(el instanceof AST_Expansion));
+
+        if (
+            is_spreadless_array(obj)
+            && obj.elements.every(el => !el.has_side_effects(compressor))
+        ) {
+            return obj.elements.length;
+        }
+
+        let fixed;
+        if (
+            obj instanceof AST_SymbolRef
+            && is_spreadless_array((fixed = obj.definition().fixed_value()))
+        ) {
+            return fixed.elements.length;
+        }
+    }
+
     if (compressor.option("unsafe")) {
         var key = this.property;
         if (key instanceof AST_Node) {
@@ -14478,9 +14523,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"
@@ -18028,6 +18073,7 @@ class Compressor extends TreeWalker {
             keep_fargs    : true,
             keep_fnames   : false,
             keep_infinity : false,
+            lhs_constants : !false_by_default,
             loops         : !false_by_default,
             module        : false,
             negate_iife   : !false_by_default,
@@ -19914,7 +19960,7 @@ def_optimize(AST_Binary, function(self, compressor) {
             self.right = tmp;
         }
     }
-    if (commutativeOperators.has(self.operator)) {
+    if (compressor.option("lhs_constants") && commutativeOperators.has(self.operator)) {
         if (self.right.is_constant()
             && !self.left.is_constant()) {
             // if right is a constant, whatever side effects the
@@ -19944,6 +19990,9 @@ def_optimize(AST_Binary, function(self, compressor) {
         // void 0 == x => null == x
         if (!is_strict_comparison && is_undefined(self.left, compressor)) {
             self.left = make_node(AST_Null, self.left);
+        // x == void 0 => x == null
+        } else if (!is_strict_comparison && is_undefined(self.right, compressor)) {
+            self.right = make_node(AST_Null, self.right);
         } else if (compressor.option("typeofs")
             // "undefined" == typeof x => undefined === x
             && self.left instanceof AST_String
@@ -19957,6 +20006,19 @@ def_optimize(AST_Binary, function(self, compressor) {
                 self.left = make_node(AST_Undefined, self.left).optimize(compressor);
                 if (self.operator.length == 2) self.operator += "=";
             }
+        } else if (compressor.option("typeofs")
+            // typeof x === "undefined" => x === undefined
+            && self.left instanceof AST_UnaryPrefix
+            && self.left.operator == "typeof"
+            && self.right instanceof AST_String
+            && self.right.value == "undefined") {
+            var expr = self.left.expression;
+            if (expr instanceof AST_SymbolRef ? expr.is_declared(compressor)
+                : !(expr instanceof AST_PropAccess && compressor.option("ie8"))) {
+                self.left = expr;
+                self.right = make_node(AST_Undefined, self.right).optimize(compressor);
+                if (self.operator.length == 2) self.operator += "=";
+            }
         } else if (self.left instanceof AST_SymbolRef
             // obj !== obj => false
             && self.right instanceof AST_SymbolRef
@@ -20548,13 +20610,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);
@@ -29707,6 +29776,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);
         }
     }));
 
@@ -29738,6 +29809,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);
         }
     }));
 
@@ -29803,6 +29878,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

@@ -2762,6 +2762,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 +3135,7 @@ class TreeTransformer extends TreeWalker {
 const _PURE     = 0b00000001;
 const _INLINE   = 0b00000010;
 const _NOINLINE = 0b00000100;
+const _KEY      = 0b00001000;
 
 export {
     AST_Accessor,
@@ -3278,4 +3280,5 @@ export {
     _INLINE,
     _NOINLINE,
     _PURE,
+    _KEY,
 };

package/lib/compress/common.js

@@ -46,6 +46,7 @@ import {
     AST_Arrow,
     AST_BlockStatement,
     AST_Call,
+    AST_Chain,
     AST_Class,
     AST_Const,
     AST_Constant,
@@ -226,7 +227,8 @@ export function maintain_this_binding(parent, orig, val) {
         parent instanceof AST_UnaryPrefix && parent.operator == "delete"
         || parent instanceof AST_Call && parent.expression === orig
             && (
-                val instanceof AST_PropAccess
+                val instanceof AST_Chain
+                || val instanceof AST_PropAccess
                 || val instanceof AST_SymbolRef && val.name == "eval"
             )
     ) {

package/lib/compress/evaluate.js

@@ -352,6 +352,33 @@ 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 =>
+            obj instanceof AST_Array
+            && obj.elements.every(el => !(el instanceof AST_Expansion));
+
+        if (
+            is_spreadless_array(obj)
+            && obj.elements.every(el => !el.has_side_effects(compressor))
+        ) {
+            return obj.elements.length;
+        }
+
+        let fixed;
+        if (
+            obj instanceof AST_SymbolRef
+            && is_spreadless_array((fixed = obj.definition().fixed_value()))
+        ) {
+            return fixed.elements.length;
+        }
+    }
+
     if (compressor.option("unsafe")) {
         var key = this.property;
         if (key instanceof AST_Node) {
@@ -359,9 +386,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

@@ -245,6 +245,7 @@ class Compressor extends TreeWalker {
             keep_fargs    : true,
             keep_fnames   : false,
             keep_infinity : false,
+            lhs_constants : !false_by_default,
             loops         : !false_by_default,
             module        : false,
             negate_iife   : !false_by_default,
@@ -2131,7 +2132,7 @@ def_optimize(AST_Binary, function(self, compressor) {
             self.right = tmp;
         }
     }
-    if (commutativeOperators.has(self.operator)) {
+    if (compressor.option("lhs_constants") && commutativeOperators.has(self.operator)) {
         if (self.right.is_constant()
             && !self.left.is_constant()) {
             // if right is a constant, whatever side effects the
@@ -2161,6 +2162,9 @@ def_optimize(AST_Binary, function(self, compressor) {
         // void 0 == x => null == x
         if (!is_strict_comparison && is_undefined(self.left, compressor)) {
             self.left = make_node(AST_Null, self.left);
+        // x == void 0 => x == null
+        } else if (!is_strict_comparison && is_undefined(self.right, compressor)) {
+            self.right = make_node(AST_Null, self.right);
         } else if (compressor.option("typeofs")
             // "undefined" == typeof x => undefined === x
             && self.left instanceof AST_String
@@ -2174,6 +2178,19 @@ def_optimize(AST_Binary, function(self, compressor) {
                 self.left = make_node(AST_Undefined, self.left).optimize(compressor);
                 if (self.operator.length == 2) self.operator += "=";
             }
+        } else if (compressor.option("typeofs")
+            // typeof x === "undefined" => x === undefined
+            && self.left instanceof AST_UnaryPrefix
+            && self.left.operator == "typeof"
+            && self.right instanceof AST_String
+            && self.right.value == "undefined") {
+            var expr = self.left.expression;
+            if (expr instanceof AST_SymbolRef ? expr.is_declared(compressor)
+                : !(expr instanceof AST_PropAccess && compressor.option("ie8"))) {
+                self.left = expr;
+                self.right = make_node(AST_Undefined, self.right).optimize(compressor);
+                if (self.operator.length == 2) self.operator += "=";
+            }
         } else if (self.left instanceof AST_SymbolRef
             // obj !== obj => false
             && self.right instanceof AST_SymbolRef
@@ -2765,13 +2782,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/output.js

@@ -1080,6 +1080,12 @@ function OutputStream(options) {
             return true;
     });
 
+    PARENS(AST_Chain, function(output) {
+        var p = output.parent();
+        if (!(p instanceof AST_Call || p instanceof AST_PropAccess)) return false;
+        return p.expression === this;
+    });
+
     PARENS(AST_PropAccess, function(output) {
         var p = output.parent();
         if (p instanceof AST_New && p.expression === this) {

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.8",
+  "version": "5.17.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;
-});