terser 5.16.4 → 5.16.6

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v5.16.7
+
+ - Become less conservative with analyzing function definitions for `reduce_vars`
+ - Parse `import.meta` as a real AST node and not an `object.property`
+
+## v5.16.5
+
+ - Correctly handle AST transform functions that mutate children arrays
+ - Don't mutate the options object passed to Terser (#1342)
+ - Do not treat BigInt like a number
+
 ## v5.16.4
 
  - Keep `(defaultArg = undefined) => ...`, because default args don't count for function length

package/dist/bundle.min.js

@@ -101,36 +101,20 @@ function return_null() { return null; }
 
 var MAP = (function() {
     function MAP(a, tw, allow_splicing = true) {
-        // Loop but try not to build a new array
+        const new_a = [];
+
         for (let i = 0; i < a.length; ++i) {
             let item = a[i];
             let ret = item.transform(tw, allow_splicing);
 
-            if (ret !== item) {
-                const a1 = a.slice(0, i);
-
-                // Looks like something was transformed. Change the loop.
-                if (ret instanceof AST_Node) {
-                    a1.push(ret);
-                } else if (ret instanceof Splice) {
-                    a1.push(...ret.v);
-                }
-
-                while ((item = a[++i])) {
-                    const ret = item.transform(tw, true);
-
-                    if (ret instanceof AST_Node) {
-                        a1.push(ret);
-                    } else if (ret instanceof Splice) {
-                        a1.push(...ret.v);
-                    }
-                }
-
-                return a1;
+            if (ret instanceof AST_Node) {
+                new_a.push(ret);
+            } else if (ret instanceof Splice) {
+                new_a.push(...ret.v);
             }
         }
 
-        return a;
+        return new_a;
     }
 
     MAP.splice = function(val) { return new Splice(val); };
@@ -2466,7 +2450,7 @@ function parse($TEXT, options) {
         if (is("operator", "new")) {
             return new_(allow_calls);
         }
-        if (is("operator", "import")) {
+        if (is("name", "import") && is_token(peek(), "punc", ".")) {
             return import_meta();
         }
         var start = S.token;
@@ -2962,7 +2946,7 @@ function parse($TEXT, options) {
 
     function import_meta() {
         var start = S.token;
-        expect_token("operator", "import");
+        expect_token("name", "import");
         expect_token("punc", ".");
         expect_token("name", "meta");
         return subscripts(new AST_ImportMeta({
@@ -3866,8 +3850,21 @@ var AST_SimpleStatement = DEFNODE("SimpleStatement", "body", function AST_Simple
 
 function walk_body(node, visitor) {
     const body = node.body;
-    for (var i = 0, len = body.length; i < len; i++) {
-        body[i]._walk(visitor);
+    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);
+        }
     }
 }
 
@@ -6646,10 +6643,11 @@ const walk_abort = Symbol("abort walk");
 /* -----[ TreeWalker ]----- */
 
 class TreeWalker {
-    constructor(callback) {
+    constructor(callback, { walk_defun_first = false } = {}) {
         this.visit = callback;
         this.stack = [];
         this.directives = Object.create(null);
+        this.walk_defun_first = walk_defun_first;
     }
 
     _visit(node, descend) {
@@ -13367,7 +13365,7 @@ const unary_side_effects = makePredicate("delete ++ --");
     def_is_number(AST_Number, return_true);
     const unary = makePredicate("+ - ~ ++ --");
     def_is_number(AST_Unary, function() {
-        return unary.has(this.operator);
+        return unary.has(this.operator) && !(this.expression instanceof AST_BigInt);
     });
     const numeric_ops = makePredicate("- * / % & | ^ << >> >>>");
     def_is_number(AST_Binary, function(compressor) {
@@ -13505,6 +13503,7 @@ function is_nullish(node, compressor) {
             || this.body && this.body.has_side_effects(compressor)
             || this.alternative && this.alternative.has_side_effects(compressor);
     });
+    def_has_side_effects(AST_ImportMeta, return_false);
     def_has_side_effects(AST_LabeledStatement, function(compressor) {
         return this.body.has_side_effects(compressor);
     });
@@ -13608,6 +13607,7 @@ function is_nullish(node, compressor) {
     def_may_throw(AST_Lambda, return_false);
     def_may_throw(AST_SymbolDeclaration, return_false);
     def_may_throw(AST_This, return_false);
+    def_may_throw(AST_ImportMeta, return_false);
 
     function any(list, compressor) {
         for (var i = list.length; --i >= 0;)
@@ -13971,6 +13971,11 @@ function is_lhs(node, parent) {
         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);
 });
@@ -15719,15 +15724,7 @@ def_reduce_vars(AST_Default, function(tw, descend) {
 function mark_lambda(tw, descend, compressor) {
     clear_flag(this, INLINED);
 
-    // Sometimes we detach the lambda for safety, and instead of push()
-    // we go to an entirely fresh lineage of safe_ids.
-    let previous_safe_ids;
-    if (this instanceof AST_Defun || this.uses_arguments || this.pinned()) {
-        previous_safe_ids = tw.safe_ids;
-        tw.safe_ids = Object.create(null);
-    } else {
-        push(tw);
-    }
+    push(tw);
 
     reset_variables(tw, compressor, this);
 
@@ -15759,13 +15756,9 @@ function mark_lambda(tw, descend, compressor) {
             }
         });
     }
-    descend();
 
-    if (previous_safe_ids) {
-        tw.safe_ids = previous_safe_ids;
-    } else {
-        pop(tw);
-    }
+    descend();
+    pop(tw);
 
     return true;
 }
@@ -18265,7 +18258,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
@@ -30011,10 +30004,13 @@ async function minify(files, options, _fs_module) {
     if (options.format.spidermonkey) {
         result.ast = toplevel.to_mozilla_ast();
     }
+    let format_options;
     if (!HOP(options.format, "code") || options.format.code) {
-        if (!options.format.ast) {
+        // Make a shallow copy so that we can modify without mutating the user's input.
+        format_options = {...options.format};
+        if (!format_options.ast) {
             // Destroy stuff to save RAM. (unless the deprecated `ast` option is on)
-            options.format._destroy_ast = true;
+            format_options._destroy_ast = true;
 
             walk(toplevel, node => {
                 if (node instanceof AST_Scope) {
@@ -30034,17 +30030,17 @@ async function minify(files, options, _fs_module) {
             if (options.sourceMap.includeSources && files instanceof AST_Toplevel) {
                 throw new Error("original source content unavailable");
             }
-            options.format.source_map = await SourceMap({
+            format_options.source_map = await SourceMap({
                 file: options.sourceMap.filename,
                 orig: options.sourceMap.content,
                 root: options.sourceMap.root,
                 files: options.sourceMap.includeSources ? files : null,
             });
         }
-        delete options.format.ast;
-        delete options.format.code;
-        delete options.format.spidermonkey;
-        var stream = OutputStream(options.format);
+        delete format_options.ast;
+        delete format_options.code;
+        delete format_options.spidermonkey;
+        var stream = OutputStream(format_options);
         toplevel.print(stream);
         result.code = stream.get();
         if (options.sourceMap) {
@@ -30052,7 +30048,7 @@ async function minify(files, options, _fs_module) {
                 configurable: true,
                 enumerable: true,
                 get() {
-                    const map = options.format.source_map.getEncoded();
+                    const map = format_options.source_map.getEncoded();
                     return (result.map = options.sourceMap.asObject ? map : JSON.stringify(map));
                 },
                 set(value) {
@@ -30062,7 +30058,7 @@ async function minify(files, options, _fs_module) {
                     });
                 }
             });
-            result.decoded_map = options.format.source_map.getDecoded();
+            result.decoded_map = format_options.source_map.getDecoded();
             if (options.sourceMap.url == "inline") {
                 var sourceMap = typeof result.map === "object" ? JSON.stringify(result.map) : result.map;
                 result.code += "\n//# sourceMappingURL=data:application/json;charset=utf-8;base64," + to_base64(sourceMap);
@@ -30077,8 +30073,8 @@ async function minify(files, options, _fs_module) {
             options.nameCache.props = cache_to_json(options.mangle.properties.cache);
         }
     }
-    if (options.format && options.format.source_map) {
-        options.format.source_map.destroy();
+    if (format_options && format_options.source_map) {
+        format_options.source_map.destroy();
     }
     if (timings) {
         timings.end = Date.now();

package/lib/ast.js

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

package/lib/compress/index.js

@@ -539,7 +539,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

package/lib/compress/inference.js

@@ -45,6 +45,7 @@ import {
   AST_Array,
   AST_Arrow,
   AST_Assign,
+  AST_BigInt,
   AST_Binary,
   AST_Block,
   AST_BlockStatement,
@@ -66,6 +67,7 @@ import {
   AST_Function,
   AST_If,
   AST_Import,
+  AST_ImportMeta,
   AST_Jump,
   AST_LabeledStatement,
   AST_Lambda,
@@ -171,7 +173,7 @@ export const unary_side_effects = makePredicate("delete ++ --");
     def_is_number(AST_Number, return_true);
     const unary = makePredicate("+ - ~ ++ --");
     def_is_number(AST_Unary, function() {
-        return unary.has(this.operator);
+        return unary.has(this.operator) && !(this.expression instanceof AST_BigInt);
     });
     const numeric_ops = makePredicate("- * / % & | ^ << >> >>>");
     def_is_number(AST_Binary, function(compressor) {
@@ -309,6 +311,7 @@ export function is_nullish(node, compressor) {
             || this.body && this.body.has_side_effects(compressor)
             || this.alternative && this.alternative.has_side_effects(compressor);
     });
+    def_has_side_effects(AST_ImportMeta, return_false);
     def_has_side_effects(AST_LabeledStatement, function(compressor) {
         return this.body.has_side_effects(compressor);
     });
@@ -412,6 +415,7 @@ export function is_nullish(node, compressor) {
     def_may_throw(AST_Lambda, return_false);
     def_may_throw(AST_SymbolDeclaration, return_false);
     def_may_throw(AST_This, return_false);
+    def_may_throw(AST_ImportMeta, return_false);
 
     function any(list, compressor) {
         for (var i = list.length; --i >= 0;)
@@ -775,6 +779,11 @@ export function is_lhs(node, parent) {
         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/reduce-vars.js

@@ -448,15 +448,7 @@ def_reduce_vars(AST_Default, function(tw, descend) {
 function mark_lambda(tw, descend, compressor) {
     clear_flag(this, INLINED);
 
-    // Sometimes we detach the lambda for safety, and instead of push()
-    // we go to an entirely fresh lineage of safe_ids.
-    let previous_safe_ids;
-    if (this instanceof AST_Defun || this.uses_arguments || this.pinned()) {
-        previous_safe_ids = tw.safe_ids;
-        tw.safe_ids = Object.create(null);
-    } else {
-        push(tw);
-    }
+    push(tw);
 
     reset_variables(tw, compressor, this);
 
@@ -488,13 +480,9 @@ function mark_lambda(tw, descend, compressor) {
             }
         });
     }
-    descend();
 
-    if (previous_safe_ids) {
-        tw.safe_ids = previous_safe_ids;
-    } else {
-        pop(tw);
-    }
+    descend();
+    pop(tw);
 
     return true;
 }

package/lib/minify.js

@@ -280,10 +280,13 @@ async function minify(files, options, _fs_module) {
     if (options.format.spidermonkey) {
         result.ast = toplevel.to_mozilla_ast();
     }
+    let format_options;
     if (!HOP(options.format, "code") || options.format.code) {
-        if (!options.format.ast) {
+        // Make a shallow copy so that we can modify without mutating the user's input.
+        format_options = {...options.format};
+        if (!format_options.ast) {
             // Destroy stuff to save RAM. (unless the deprecated `ast` option is on)
-            options.format._destroy_ast = true;
+            format_options._destroy_ast = true;
 
             walk(toplevel, node => {
                 if (node instanceof AST_Scope) {
@@ -303,17 +306,17 @@ async function minify(files, options, _fs_module) {
             if (options.sourceMap.includeSources && files instanceof AST_Toplevel) {
                 throw new Error("original source content unavailable");
             }
-            options.format.source_map = await SourceMap({
+            format_options.source_map = await SourceMap({
                 file: options.sourceMap.filename,
                 orig: options.sourceMap.content,
                 root: options.sourceMap.root,
                 files: options.sourceMap.includeSources ? files : null,
             });
         }
-        delete options.format.ast;
-        delete options.format.code;
-        delete options.format.spidermonkey;
-        var stream = OutputStream(options.format);
+        delete format_options.ast;
+        delete format_options.code;
+        delete format_options.spidermonkey;
+        var stream = OutputStream(format_options);
         toplevel.print(stream);
         result.code = stream.get();
         if (options.sourceMap) {
@@ -321,7 +324,7 @@ async function minify(files, options, _fs_module) {
                 configurable: true,
                 enumerable: true,
                 get() {
-                    const map = options.format.source_map.getEncoded();
+                    const map = format_options.source_map.getEncoded();
                     return (result.map = options.sourceMap.asObject ? map : JSON.stringify(map));
                 },
                 set(value) {
@@ -331,7 +334,7 @@ async function minify(files, options, _fs_module) {
                     });
                 }
             });
-            result.decoded_map = options.format.source_map.getDecoded();
+            result.decoded_map = format_options.source_map.getDecoded();
             if (options.sourceMap.url == "inline") {
                 var sourceMap = typeof result.map === "object" ? JSON.stringify(result.map) : result.map;
                 result.code += "\n//# sourceMappingURL=data:application/json;charset=utf-8;base64," + to_base64(sourceMap);
@@ -346,8 +349,8 @@ async function minify(files, options, _fs_module) {
             options.nameCache.props = cache_to_json(options.mangle.properties.cache);
         }
     }
-    if (options.format && options.format.source_map) {
-        options.format.source_map.destroy();
+    if (format_options && format_options.source_map) {
+        format_options.source_map.destroy();
     }
     if (timings) {
         timings.end = Date.now();

package/lib/parse.js

@@ -2307,7 +2307,7 @@ function parse($TEXT, options) {
         if (is("operator", "new")) {
             return new_(allow_calls);
         }
-        if (is("operator", "import")) {
+        if (is("name", "import") && is_token(peek(), "punc", ".")) {
             return import_meta();
         }
         var start = S.token;
@@ -2803,7 +2803,7 @@ function parse($TEXT, options) {
 
     function import_meta() {
         var start = S.token;
-        expect_token("operator", "import");
+        expect_token("name", "import");
         expect_token("punc", ".");
         expect_token("name", "meta");
         return subscripts(new AST_ImportMeta({

package/lib/utils/index.js

@@ -99,36 +99,20 @@ function return_null() { return null; }
 
 var MAP = (function() {
     function MAP(a, tw, allow_splicing = true) {
-        // Loop but try not to build a new array
+        const new_a = [];
+
         for (let i = 0; i < a.length; ++i) {
             let item = a[i];
             let ret = item.transform(tw, allow_splicing);
 
-            if (ret !== item) {
-                const a1 = a.slice(0, i);
-
-                // Looks like something was transformed. Change the loop.
-                if (ret instanceof AST_Node) {
-                    a1.push(ret);
-                } else if (ret instanceof Splice) {
-                    a1.push(...ret.v);
-                }
-
-                while ((item = a[++i])) {
-                    const ret = item.transform(tw, true);
-
-                    if (ret instanceof AST_Node) {
-                        a1.push(ret);
-                    } else if (ret instanceof Splice) {
-                        a1.push(...ret.v);
-                    }
-                }
-
-                return a1;
+            if (ret instanceof AST_Node) {
+                new_a.push(ret);
+            } else if (ret instanceof Splice) {
+                new_a.push(...ret.v);
             }
         }
 
-        return a;
+        return new_a;
     }
 
     MAP.splice = function(val) { return new Splice(val); };

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