terser 5.33.0 → 5.34.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v5.34.1
+
+ - bump the rollup devDependency to disable CVE warnings (Terser was not affected)
+
+## v5.34.0
+
+ - internal: stop assigning properties to objects they don't belong in
+ - internal: run compress tests in parallel
+ - `drop_console`: emit an empty function if the return value of `console.METHOD(...)` may be called.
+
 ## v5.33.0
 
  - `reduce_vars` improved when dealing with hoisted function definitions (#1544)

package/dist/bundle.min.js

@@ -2,7 +2,7 @@
 typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@jridgewell/source-map')) :
 typeof define === 'function' && define.amd ? define(['exports', '@jridgewell/source-map'], factory) :
 (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Terser = {}, global.sourceMap));
-}(this, (function (exports, sourceMap) { 'use strict';
+})(this, (function (exports, sourceMap) { 'use strict';
 
 /***********************************************************************
 
@@ -11674,7 +11674,7 @@ function redefined_catch_def(def) {
     }
 }
 
-AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = null, toplevel = this } = {}) {
+AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = undefined, toplevel = this } = {}) {
     options = defaults(options, {
         cache: null,
         ie8: false,
@@ -11998,7 +11998,7 @@ AST_Scope.DEFMETHOD("add_child_scope", function (scope) {
     scope.parent_scope = this;
 
     // Propagate to this.uses_arguments from arrow functions
-    if ((scope instanceof AST_Arrow) && !this.uses_arguments) {
+    if ((scope instanceof AST_Arrow) && (this instanceof AST_Lambda && !this.uses_arguments)) {
         this.uses_arguments = walk(scope, node => {
             if (
                 node instanceof AST_SymbolRef
@@ -13065,6 +13065,23 @@ function make_sequence(orig, expressions) {
     });
 }
 
+function make_empty_function(self) {
+    return make_node(AST_Function, self, {
+        uses_arguments: false,
+        argnames: [],
+        body: [],
+        is_generator: false,
+        async: false,
+        variables: new Map(),
+        uses_with: false,
+        uses_eval: false,
+        parent_scope: null,
+        enclosed: [],
+        cname: 0,
+        block_scope: undefined,
+    });
+}
+
 function make_node_from_constant(val, orig) {
     switch (typeof val) {
       case "string":
@@ -14418,6 +14435,54 @@ function is_modified(compressor, tw, node, value, level, immutable) {
     }
 }
 
+/**
+ * Check if a node may be used by the expression it's in
+ * void (0, 1, {node}, 2) -> false
+ * console.log(0, {node}) -> true
+ */
+function is_used_in_expression(tw) {
+    for (let p = -1, node, parent; node = tw.parent(p), parent = tw.parent(p + 1); p++) {
+        if (parent instanceof AST_Sequence) {
+            const nth_expression = parent.expressions.indexOf(node);
+            if (nth_expression !== parent.expressions.length - 1) {
+                // Detect (0, x.noThis)() constructs
+                const grandparent = tw.parent(p + 2);
+                if (
+                    parent.expressions.length > 2
+                    || parent.expressions.length === 1
+                    || !requires_sequence_to_maintain_binding(grandparent, parent, parent.expressions[1])
+                ) {
+                    return false;
+                }
+                return true;
+            } else {
+                continue;
+            }
+        }
+        if (parent instanceof AST_Unary) {
+            const op = parent.operator;
+            if (op === "void") {
+                return false;
+            }
+            if (op === "typeof" || op === "+" || op === "-" || op === "!" || op === "~") {
+                continue;
+            }
+        }
+        if (
+            parent instanceof AST_SimpleStatement
+            || parent instanceof AST_LabeledStatement
+        ) {
+            return false;
+        }
+        if (parent instanceof AST_Scope) {
+            return false;
+        }
+        return true;
+    }
+
+    return true;
+}
+
 /***********************************************************************
 
   A JavaScript tokenizer / parser / beautifier / compressor.
@@ -15672,45 +15737,6 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
     }
 });
 
-/**
- * Check if a node may be used by the expression it's in
- * void (0, 1, {node}, 2) -> false
- * console.log(0, {node}) -> true
- */
-function is_used_in_expression(tw) {
-    for (let p = -1, node, parent; node = tw.parent(p), parent = tw.parent(p + 1); p++) {
-        if (parent instanceof AST_Sequence) {
-            const nth_expression = parent.expressions.indexOf(node);
-            if (nth_expression !== parent.expressions.length - 1) {
-                // Detect (0, x.noThis)() constructs
-                const grandparent = tw.parent(p + 2);
-                if (
-                    parent.expressions.length > 2
-                    || parent.expressions.length === 1
-                    || !requires_sequence_to_maintain_binding(grandparent, parent, parent.expressions[1])
-                ) {
-                    return false;
-                }
-                return true;
-            } else {
-                continue;
-            }
-        }
-        if (parent instanceof AST_Unary) {
-            const op = parent.operator;
-            if (op === "void") {
-                return false;
-            }
-            if (op === "typeof" || op === "+" || op === "-" || op === "!" || op === "~") {
-                continue;
-            }
-        }
-        return true;
-    }
-
-    return true;
-}
-
 /***********************************************************************
 
   A JavaScript tokenizer / parser / beautifier / compressor.
@@ -18935,9 +18961,8 @@ def_optimize(AST_Node, function(self) {
 });
 
 AST_Toplevel.DEFMETHOD("drop_console", function(options) {
-    var isArray = Array.isArray(options);
-
-    return this.transform(new TreeTransformer(function(self) {
+    const isArray = Array.isArray(options);
+    const tt = new TreeTransformer(function(self) {
         if (self.TYPE !== "Call") {
             return;
         }
@@ -18948,18 +18973,35 @@ AST_Toplevel.DEFMETHOD("drop_console", function(options) {
             return;
         }
 
-        if (isArray && options.indexOf(exp.property) === -1) {
+        if (isArray && !options.includes(exp.property)) {
             return;
         }
 
         var name = exp.expression;
+        var depth = 2;
         while (name.expression) {
             name = name.expression;
+            depth++;
         }
+
         if (is_undeclared_ref(name) && name.name == "console") {
-            return make_node(AST_Undefined, self);
+            if (
+                depth === 3
+                && !["call", "apply"].includes(exp.property)
+                && is_used_in_expression(tt)
+            ) {
+                // a (used) call to Function.prototype methods (eg: console.log.bind(console))
+                // but not .call and .apply which would also return undefined.
+                exp.expression = make_empty_function(self);
+                set_flag(exp.expression, SQUEEZED);
+                self.args = [];
+            } else {
+                return make_node(AST_Undefined, self);
+            }
         }
-    }));
+    });
+
+    return this.transform(tt);
 });
 
 AST_Node.DEFMETHOD("equivalent_to", function(node) {
@@ -20336,10 +20378,7 @@ def_optimize(AST_Call, function(self, compressor) {
         && is_undeclared_ref(exp)
         && exp.name == "Function") {
         // new Function() => function(){}
-        if (self.args.length == 0) return make_node(AST_Function, self, {
-            argnames: [],
-            body: []
-        }).optimize(compressor);
+        if (self.args.length == 0) return make_empty_function(self).optimize(compressor);
         if (self.args.every((x) => x instanceof AST_String)) {
             // quite a corner-case, but we can handle it:
             //   https://github.com/mishoo/UglifyJS2/issues/203
@@ -22099,10 +22138,7 @@ def_optimize(AST_Dot, function(self, compressor) {
             });
             break;
           case "Function":
-            self.expression = make_node(AST_Function, self.expression, {
-                argnames: [],
-                body: []
-            });
+            self.expression = make_empty_function(self.expression);
             break;
           case "Number":
             self.expression = make_node(AST_Number, self.expression, {
@@ -31647,7 +31683,9 @@ function mangle_properties(ast, options, annotated_props = find_annotated_props(
         } else if (node instanceof AST_ObjectProperty) {
             // setter, getter, method or class field
             if (!keep_quoted || !node.quote) {
-                node.key.name = mangle(node.key.name);
+                if (!node.computed_key()) {
+                    node.key.name = mangle(node.key.name);
+                }
             }
         } else if (node instanceof AST_Dot) {
             if (!keep_quoted || !node.quote) {
@@ -32024,7 +32062,7 @@ function* minify_sync_or_async(files, options, _fs_module) {
                 if (node.block_scope) {
                     node.block_scope.variables = undefined;
                     node.block_scope.enclosed = undefined;
-                    node.parent_scope = undefined;
+                    node.block_scope.parent_scope = undefined;
                 }
             });
         }
@@ -32616,4 +32654,4 @@ exports._run_cli = run_cli;
 exports.minify = minify;
 exports.minify_sync = minify_sync;
 
-})));
+}));

package/lib/compress/common.js

@@ -107,6 +107,23 @@ export function make_sequence(orig, expressions) {
     });
 }
 
+export function make_empty_function(self) {
+    return make_node(AST_Function, self, {
+        uses_arguments: false,
+        argnames: [],
+        body: [],
+        is_generator: false,
+        async: false,
+        variables: new Map(),
+        uses_with: false,
+        uses_eval: false,
+        parent_scope: null,
+        enclosed: [],
+        cname: 0,
+        block_scope: undefined,
+    });
+}
+
 export function make_node_from_constant(val, orig) {
     switch (typeof val) {
       case "string":

package/lib/compress/drop-unused.js

@@ -103,8 +103,8 @@ import {
     is_empty,
     is_ref_of,
     can_be_evicted_from_block,
-    requires_sequence_to_maintain_binding,
 } from "./common.js";
+import { is_used_in_expression } from "./inference.js";
 
 const r_keep_assign = /keep_assign/;
 
@@ -503,42 +503,3 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
         }
     }
 });
-
-/**
- * Check if a node may be used by the expression it's in
- * void (0, 1, {node}, 2) -> false
- * console.log(0, {node}) -> true
- */
-function is_used_in_expression(tw) {
-    for (let p = -1, node, parent; node = tw.parent(p), parent = tw.parent(p + 1); p++) {
-        if (parent instanceof AST_Sequence) {
-            const nth_expression = parent.expressions.indexOf(node);
-            if (nth_expression !== parent.expressions.length - 1) {
-                // Detect (0, x.noThis)() constructs
-                const grandparent = tw.parent(p + 2);
-                if (
-                    parent.expressions.length > 2
-                    || parent.expressions.length === 1
-                    || !requires_sequence_to_maintain_binding(grandparent, parent, parent.expressions[1])
-                ) {
-                    return false;
-                }
-                return true;
-            } else {
-                continue;
-            }
-        }
-        if (parent instanceof AST_Unary) {
-            const op = parent.operator;
-            if (op === "void") {
-                return false;
-            }
-            if (op === "typeof" || op === "+" || op === "-" || op === "!" || op === "~") {
-                continue;
-            }
-        }
-        return true;
-    }
-
-    return true;
-}

package/lib/compress/index.js

@@ -176,6 +176,7 @@ import {
     is_undefined,
     is_lhs,
     aborts,
+    is_used_in_expression,
 } from "./inference.js";
 import {
     SQUEEZED,
@@ -195,6 +196,7 @@ import {
     make_sequence,
     best_of,
     best_of_expression,
+    make_empty_function,
     make_node_from_constant,
     merge_sequence,
     get_simple_key,
@@ -510,9 +512,8 @@ def_optimize(AST_Node, function(self) {
 });
 
 AST_Toplevel.DEFMETHOD("drop_console", function(options) {
-    var isArray = Array.isArray(options);
-
-    return this.transform(new TreeTransformer(function(self) {
+    const isArray = Array.isArray(options);
+    const tt = new TreeTransformer(function(self) {
         if (self.TYPE !== "Call") {
             return;
         }
@@ -523,18 +524,35 @@ AST_Toplevel.DEFMETHOD("drop_console", function(options) {
             return;
         }
 
-        if (isArray && options.indexOf(exp.property) === -1) {
+        if (isArray && !options.includes(exp.property)) {
             return;
         }
 
         var name = exp.expression;
+        var depth = 2;
         while (name.expression) {
             name = name.expression;
+            depth++;
         }
+
         if (is_undeclared_ref(name) && name.name == "console") {
-            return make_node(AST_Undefined, self);
+            if (
+                depth === 3
+                && !["call", "apply"].includes(exp.property)
+                && is_used_in_expression(tt)
+            ) {
+                // a (used) call to Function.prototype methods (eg: console.log.bind(console))
+                // but not .call and .apply which would also return undefined.
+                exp.expression = make_empty_function(self);
+                set_flag(exp.expression, SQUEEZED);
+                self.args = [];
+            } else {
+                return make_node(AST_Undefined, self);
+            }
         }
-    }));
+    });
+
+    return this.transform(tt);
 });
 
 AST_Node.DEFMETHOD("equivalent_to", function(node) {
@@ -1911,10 +1929,7 @@ def_optimize(AST_Call, function(self, compressor) {
         && is_undeclared_ref(exp)
         && exp.name == "Function") {
         // new Function() => function(){}
-        if (self.args.length == 0) return make_node(AST_Function, self, {
-            argnames: [],
-            body: []
-        }).optimize(compressor);
+        if (self.args.length == 0) return make_empty_function(self).optimize(compressor);
         if (self.args.every((x) => x instanceof AST_String)) {
             // quite a corner-case, but we can handle it:
             //   https://github.com/mishoo/UglifyJS2/issues/203
@@ -3674,10 +3689,7 @@ def_optimize(AST_Dot, function(self, compressor) {
             });
             break;
           case "Function":
-            self.expression = make_node(AST_Function, self.expression, {
-                argnames: [],
-                body: []
-            });
+            self.expression = make_empty_function(self.expression);
             break;
           case "Number":
             self.expression = make_node(AST_Number, self.expression, {

package/lib/compress/inference.js

@@ -121,7 +121,7 @@ import {
     member,
     has_annotation,
 } from "../utils/index.js";
-import { make_sequence, best_of_expression, read_property } from "./common.js";
+import { make_sequence, best_of_expression, read_property, requires_sequence_to_maintain_binding } from "./common.js";
 
 import { INLINED, UNDEFINED, has_flag } from "./compressor-flags.js";
 import { pure_prop_access_globals, is_pure_native_fn, is_pure_native_method } from "./native-objects.js";
@@ -982,3 +982,51 @@ export function is_modified(compressor, tw, node, value, level, immutable) {
         return !immutable && is_modified(compressor, tw, parent, prop, level + 1);
     }
 }
+
+/**
+ * Check if a node may be used by the expression it's in
+ * void (0, 1, {node}, 2) -> false
+ * console.log(0, {node}) -> true
+ */
+export function is_used_in_expression(tw) {
+    for (let p = -1, node, parent; node = tw.parent(p), parent = tw.parent(p + 1); p++) {
+        if (parent instanceof AST_Sequence) {
+            const nth_expression = parent.expressions.indexOf(node);
+            if (nth_expression !== parent.expressions.length - 1) {
+                // Detect (0, x.noThis)() constructs
+                const grandparent = tw.parent(p + 2);
+                if (
+                    parent.expressions.length > 2
+                    || parent.expressions.length === 1
+                    || !requires_sequence_to_maintain_binding(grandparent, parent, parent.expressions[1])
+                ) {
+                    return false;
+                }
+                return true;
+            } else {
+                continue;
+            }
+        }
+        if (parent instanceof AST_Unary) {
+            const op = parent.operator;
+            if (op === "void") {
+                return false;
+            }
+            if (op === "typeof" || op === "+" || op === "-" || op === "!" || op === "~") {
+                continue;
+            }
+        }
+        if (
+            parent instanceof AST_SimpleStatement
+            || parent instanceof AST_LabeledStatement
+        ) {
+            return false;
+        }
+        if (parent instanceof AST_Scope) {
+            return false;
+        }
+        return true;
+    }
+
+    return true;
+}

package/lib/minify.js

@@ -305,7 +305,7 @@ function* minify_sync_or_async(files, options, _fs_module) {
                 if (node.block_scope) {
                     node.block_scope.variables = undefined;
                     node.block_scope.enclosed = undefined;
-                    node.parent_scope = undefined;
+                    node.block_scope.parent_scope = undefined;
                 }
             });
         }

package/lib/propmangle.js

@@ -326,7 +326,9 @@ function mangle_properties(ast, options, annotated_props = find_annotated_props(
         } else if (node instanceof AST_ObjectProperty) {
             // setter, getter, method or class field
             if (!keep_quoted || !node.quote) {
-                node.key.name = mangle(node.key.name);
+                if (!node.computed_key()) {
+                    node.key.name = mangle(node.key.name);
+                }
             }
         } else if (node instanceof AST_Dot) {
             if (!keep_quoted || !node.quote) {

package/lib/scope.js

@@ -200,7 +200,7 @@ function redefined_catch_def(def) {
     }
 }
 
-AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = null, toplevel = this } = {}) {
+AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = undefined, toplevel = this } = {}) {
     options = defaults(options, {
         cache: null,
         ie8: false,
@@ -524,7 +524,7 @@ AST_Scope.DEFMETHOD("add_child_scope", function (scope) {
     scope.parent_scope = this;
 
     // Propagate to this.uses_arguments from arrow functions
-    if ((scope instanceof AST_Arrow) && !this.uses_arguments) {
+    if ((scope instanceof AST_Arrow) && (this instanceof AST_Lambda && !this.uses_arguments)) {
         this.uses_arguments = walk(scope, node => {
             if (
                 node instanceof AST_SymbolRef

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.33.0",
+  "version": "5.34.1",
   "engines": {
     "node": ">=10"
   },
@@ -57,7 +57,7 @@
     "esm": "^3.2.25",
     "mocha": "^9.2.0",
     "pre-commit": "^1.2.2",
-    "rollup": "^2.56.3",
+    "rollup": "^2.79.2",
     "semver": "^7.5.1",
     "source-map": "~0.8.0-beta.0"
   },