terser 5.16.6 → 5.16.9

package/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 
-## v5.16.7
+## 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.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.
 
@@ -1267,6 +1271,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

@@ -2451,7 +2451,7 @@ function parse($TEXT, options) {
             return new_(allow_calls);
         }
         if (is("name", "import") && is_token(peek(), "punc", ".")) {
-            return import_meta();
+            return import_meta(allow_calls);
         }
         var start = S.token;
         var peeked;
@@ -2944,7 +2944,7 @@ function parse($TEXT, options) {
         });
     }
 
-    function import_meta() {
+    function import_meta(allow_calls) {
         var start = S.token;
         expect_token("name", "import");
         expect_token("punc", ".");
@@ -2952,7 +2952,7 @@ function parse($TEXT, options) {
         return subscripts(new AST_ImportMeta({
             start: start,
             end: prev()
-        }), false);
+        }), allow_calls);
     }
 
     function map_name(is_import) {
@@ -3850,21 +3850,8 @@ var AST_SimpleStatement = DEFNODE("SimpleStatement", "body", function AST_Simple
 
 function walk_body(node, visitor) {
     const body = node.body;
-    if (visitor.walk_defun_first) {
-        for (var i = 0, len = body.length; i < len; i++) {
-            if (body[i] instanceof AST_Defun) {
-                body[i]._walk(visitor);
-            }
-        }
-        for (var i = 0, len = body.length; i < len; i++) {
-            if (!(body[i] instanceof AST_Defun)) {
-                body[i]._walk(visitor);
-            }
-        }
-    } else {
-        for (var i = 0, len = body.length; i < len; i++) {
-            body[i]._walk(visitor);
-        }
+    for (var i = 0, len = body.length; i < len; i++) {
+        body[i]._walk(visitor);
     }
 }
 
@@ -6643,11 +6630,10 @@ const walk_abort = Symbol("abort walk");
 /* -----[ TreeWalker ]----- */
 
 class TreeWalker {
-    constructor(callback, { walk_defun_first = false } = {}) {
+    constructor(callback) {
         this.visit = callback;
         this.stack = [];
         this.directives = Object.create(null);
-        this.walk_defun_first = walk_defun_first;
     }
 
     _visit(node, descend) {
@@ -9756,6 +9742,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) {
@@ -12953,7 +12945,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"
             )
     ) {
@@ -15723,9 +15716,7 @@ def_reduce_vars(AST_Default, function(tw, descend) {
 
 function mark_lambda(tw, descend, compressor) {
     clear_flag(this, INLINED);
-
     push(tw);
-
     reset_variables(tw, compressor, this);
 
     var iife;
@@ -15760,9 +15751,86 @@ function mark_lambda(tw, descend, compressor) {
     descend();
     pop(tw);
 
+    handle_defined_after_hoist(this);
+
     return true;
 }
 
+/**
+ * It's possible for a hoisted function to use something that's not defined yet. Example:
+ *
+ * hoisted();
+ * var defined_after = true;
+ * function hoisted() {
+ *   // use defined_after
+ * }
+ *
+ * This function is called on the parent to handle this issue.
+ */
+function handle_defined_after_hoist(parent) {
+    const defuns = [];
+    walk(parent, node => {
+        if (node === parent) return;
+        if (node instanceof AST_Defun) defuns.push(node);
+        if (
+            node instanceof AST_Scope
+            || node instanceof AST_SimpleStatement
+        ) return true;
+    });
+
+    for (const defun of defuns) {
+        const fname_def = defun.name.definition();
+        const found_self_ref_in_other_defuns = defuns.some(
+            d => d !== defun && d.enclosed.indexOf(fname_def) !== -1
+        );
+
+        for (const def of defun.enclosed) {
+            if (
+                def.fixed === false
+                || def === fname_def
+                || def.scope.get_defun_scope() !== parent
+            ) {
+                continue;
+            }
+
+            // defun is hoisted, so always safe
+            if (
+                def.assignments === 0
+                && def.orig.length === 1
+                && def.orig[0] instanceof AST_SymbolDefun
+            ) {
+                continue;
+            }
+
+            if (found_self_ref_in_other_defuns) {
+                def.fixed = false;
+                continue;
+            }
+
+            // Detect `call_defun(); var used_in_defun = ...`
+            // Because `used_in_defun` can no longer be fixed
+            let found_defun = false;
+            let found_def_after_defun = false;
+            walk(parent, node => {
+                if (node === defun) return true;
+
+                if (node instanceof AST_Symbol) {
+                    if (!found_defun && node.thedef === fname_def) {
+                        found_defun = true;
+                    } else if (found_defun && node.thedef === def) {
+                        found_def_after_defun = true;
+                        return walk_abort;
+                    }
+                }
+            });
+
+            if (found_def_after_defun) {
+                def.fixed = false;
+            }
+        }
+    }
+}
+
 def_reduce_vars(AST_Lambda, mark_lambda);
 
 def_reduce_vars(AST_Do, function(tw, descend, compressor) {
@@ -15883,6 +15951,9 @@ def_reduce_vars(AST_Toplevel, function(tw, descend, compressor) {
         reset_def(compressor, def);
     });
     reset_variables(tw, compressor, this);
+    descend();
+    handle_defined_after_hoist(this);
+    return true;
 });
 
 def_reduce_vars(AST_Try, function(tw, descend, compressor) {
@@ -17964,6 +18035,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,
@@ -18258,7 +18330,7 @@ AST_Toplevel.DEFMETHOD("reset_opt_flags", function(compressor) {
             }
             return node.reduce_vars(preparation, descend, compressor);
         }
-    }, { walk_defun_first: true });
+    });
     // Stack of look-up tables to keep track of whether a `SymbolDef` has been
     // properly assigned before use:
     // - `push()` & `pop()` when visiting conditional branches
@@ -19850,7 +19922,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
@@ -19880,6 +19952,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
@@ -19893,6 +19968,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

package/lib/ast.js

@@ -249,21 +249,8 @@ var AST_SimpleStatement = DEFNODE("SimpleStatement", "body", function AST_Simple
 
 function walk_body(node, visitor) {
     const body = node.body;
-    if (visitor.walk_defun_first) {
-        for (var i = 0, len = body.length; i < len; i++) {
-            if (body[i] instanceof AST_Defun) {
-                body[i]._walk(visitor);
-            }
-        }
-        for (var i = 0, len = body.length; i < len; i++) {
-            if (!(body[i] instanceof AST_Defun)) {
-                body[i]._walk(visitor);
-            }
-        }
-    } else {
-        for (var i = 0, len = body.length; i < len; i++) {
-            body[i]._walk(visitor);
-        }
+    for (var i = 0, len = body.length; i < len; i++) {
+        body[i]._walk(visitor);
     }
 }
 
@@ -3042,11 +3029,10 @@ const walk_abort = Symbol("abort walk");
 /* -----[ TreeWalker ]----- */
 
 class TreeWalker {
-    constructor(callback, { walk_defun_first = false } = {}) {
+    constructor(callback) {
         this.visit = callback;
         this.stack = [];
         this.directives = Object.create(null);
-        this.walk_defun_first = walk_defun_first;
     }
 
     _visit(node, descend) {

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/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,
@@ -539,7 +540,7 @@ AST_Toplevel.DEFMETHOD("reset_opt_flags", function(compressor) {
             }
             return node.reduce_vars(preparation, descend, compressor);
         }
-    }, { walk_defun_first: true });
+    });
     // Stack of look-up tables to keep track of whether a `SymbolDef` has been
     // properly assigned before use:
     // - `push()` & `pop()` when visiting conditional branches
@@ -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

package/lib/compress/reduce-vars.js

@@ -71,6 +71,7 @@ import {
     AST_Number,
     AST_ObjectKeyVal,
     AST_PropAccess,
+    AST_Scope,
     AST_Sequence,
     AST_SimpleStatement,
     AST_Symbol,
@@ -91,6 +92,7 @@ import {
     AST_Yield,
 
     walk,
+    walk_abort,
     walk_body,
 
     _INLINE,
@@ -447,9 +449,7 @@ def_reduce_vars(AST_Default, function(tw, descend) {
 
 function mark_lambda(tw, descend, compressor) {
     clear_flag(this, INLINED);
-
     push(tw);
-
     reset_variables(tw, compressor, this);
 
     var iife;
@@ -484,9 +484,86 @@ function mark_lambda(tw, descend, compressor) {
     descend();
     pop(tw);
 
+    handle_defined_after_hoist(this);
+
     return true;
 }
 
+/**
+ * It's possible for a hoisted function to use something that's not defined yet. Example:
+ *
+ * hoisted();
+ * var defined_after = true;
+ * function hoisted() {
+ *   // use defined_after
+ * }
+ *
+ * This function is called on the parent to handle this issue.
+ */
+function handle_defined_after_hoist(parent) {
+    const defuns = [];
+    walk(parent, node => {
+        if (node === parent) return;
+        if (node instanceof AST_Defun) defuns.push(node);
+        if (
+            node instanceof AST_Scope
+            || node instanceof AST_SimpleStatement
+        ) return true;
+    });
+
+    for (const defun of defuns) {
+        const fname_def = defun.name.definition();
+        const found_self_ref_in_other_defuns = defuns.some(
+            d => d !== defun && d.enclosed.indexOf(fname_def) !== -1
+        );
+
+        for (const def of defun.enclosed) {
+            if (
+                def.fixed === false
+                || def === fname_def
+                || def.scope.get_defun_scope() !== parent
+            ) {
+                continue;
+            }
+
+            // defun is hoisted, so always safe
+            if (
+                def.assignments === 0
+                && def.orig.length === 1
+                && def.orig[0] instanceof AST_SymbolDefun
+            ) {
+                continue;
+            }
+
+            if (found_self_ref_in_other_defuns) {
+                def.fixed = false;
+                continue;
+            }
+
+            // Detect `call_defun(); var used_in_defun = ...`
+            // Because `used_in_defun` can no longer be fixed
+            let found_defun = false;
+            let found_def_after_defun = false;
+            walk(parent, node => {
+                if (node === defun) return true;
+
+                if (node instanceof AST_Symbol) {
+                    if (!found_defun && node.thedef === fname_def) {
+                        found_defun = true;
+                    } else if (found_defun && node.thedef === def) {
+                        found_def_after_defun = true;
+                        return walk_abort;
+                    }
+                }
+            });
+
+            if (found_def_after_defun) {
+                def.fixed = false;
+            }
+        }
+    }
+}
+
 def_reduce_vars(AST_Lambda, mark_lambda);
 
 def_reduce_vars(AST_Do, function(tw, descend, compressor) {
@@ -607,6 +684,9 @@ def_reduce_vars(AST_Toplevel, function(tw, descend, compressor) {
         reset_def(compressor, def);
     });
     reset_variables(tw, compressor, this);
+    descend();
+    handle_defined_after_hoist(this);
+    return true;
 });
 
 def_reduce_vars(AST_Try, function(tw, descend, compressor) {

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

@@ -2308,7 +2308,7 @@ function parse($TEXT, options) {
             return new_(allow_calls);
         }
         if (is("name", "import") && is_token(peek(), "punc", ".")) {
-            return import_meta();
+            return import_meta(allow_calls);
         }
         var start = S.token;
         var peeked;
@@ -2801,7 +2801,7 @@ function parse($TEXT, options) {
         });
     }
 
-    function import_meta() {
+    function import_meta(allow_calls) {
         var start = S.token;
         expect_token("name", "import");
         expect_token("punc", ".");
@@ -2809,7 +2809,7 @@ function parse($TEXT, options) {
         return subscripts(new AST_ImportMeta({
             start: start,
             end: prev()
-        }), false);
+        }), allow_calls);
     }
 
     function map_name(is_import) {

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