terser 5.16.4 → 5.16.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 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/bin/terser.mjs

@@ -0,0 +1,21 @@
+#!/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;
+});

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); };
@@ -13367,7 +13351,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) {
@@ -30011,10 +29995,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 +30021,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 +30039,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 +30049,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 +30064,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/compress/inference.js

@@ -45,6 +45,7 @@ import {
   AST_Array,
   AST_Arrow,
   AST_Assign,
+  AST_BigInt,
   AST_Binary,
   AST_Block,
   AST_BlockStatement,
@@ -171,7 +172,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) {

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/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.5",
   "engines": {
     "node": ">=10"
   },