terser 5.3.3 → 5.3.7

package/lib/compress/index.js

@@ -4140,9 +4140,12 @@ AST_Scope.DEFMETHOD("hoist_declarations", function(compressor) {
                         hoisted.push(node);
                         return make_node(AST_EmptyStatement, node);
                     }
-                    if (hoist_vars && node instanceof AST_Var) {
+                    if (
+                        hoist_vars
+                        && node instanceof AST_Var
+                        && !node.definitions.some(def => def.name instanceof AST_Destructuring)
+                    ) {
                         node.definitions.forEach(function(def) {
-                            if (def.name instanceof AST_Destructuring) return;
                             vars.set(def.name.name, def);
                             ++vars_found;
                         });
@@ -4222,8 +4225,7 @@ AST_Scope.DEFMETHOD("hoist_declarations", function(compressor) {
                         continue;
                     }
                     if (self.body[i] instanceof AST_BlockStatement) {
-                        var tmp = [ i, 1 ].concat(self.body[i].body);
-                        self.body.splice.apply(self.body, tmp);
+                        self.body.splice(i, 1, ...self.body[i].body);
                         continue;
                     }
                     break;
@@ -4268,9 +4270,14 @@ AST_Scope.DEFMETHOD("hoist_properties", function(compressor) {
                 const defs = new Map();
                 const assignments = [];
                 value.properties.forEach(({ key, value }) => {
+                    const scope = find_scope(hoister);
                     const symbol = self.create_symbol(sym.CTOR, {
                         source: sym,
-                        scope: find_scope(hoister),
+                        scope,
+                        conflict_scopes: new Set([
+                            scope,
+                            ...sym.definition().references.map(ref => ref.scope)
+                        ]),
                         tentative_name: sym.name + "_" + key
                     });
 
@@ -4969,10 +4976,12 @@ AST_Definitions.DEFMETHOD("remove_initializers", function() {
 
 AST_Definitions.DEFMETHOD("to_assignments", function(compressor) {
     var reduce_vars = compressor.option("reduce_vars");
-    var assignments = this.definitions.reduce(function(a, def) {
-        if (def.value && !(def.name instanceof AST_Destructuring)) {
+    var assignments = [];
+
+    for (const def of this.definitions) {
+        if (def.value) {
             var name = make_node(AST_SymbolRef, def.name, def.name);
-            a.push(make_node(AST_Assign, def, {
+            assignments.push(make_node(AST_Assign, def, {
                 operator : "=",
                 left     : name,
                 right    : def.value
@@ -4987,13 +4996,13 @@ AST_Definitions.DEFMETHOD("to_assignments", function(compressor) {
             var var_ = make_node(AST_Var, def, {
                 definitions: [ varDef ]
             });
-            a.push(var_);
+            assignments.push(var_);
         }
-        def = def.name.definition();
-        def.eliminated++;
-        def.replaced--;
-        return a;
-    }, []);
+        const thedef = def.name.definition();
+        thedef.eliminated++;
+        thedef.replaced--;
+    }
+
     if (assignments.length == 0) return null;
     return make_sequence(this, assignments);
 });
@@ -6363,7 +6372,9 @@ def_optimize(AST_SymbolRef, function(self, compressor) {
             && !(parent instanceof AST_Call
                 && (parent.is_expr_pure(compressor))
                     || has_annotation(parent, _NOINLINE))
-            && !(fixed instanceof AST_Defun && parent instanceof AST_Export);
+            && !(parent instanceof AST_Export
+                && fixed instanceof AST_Lambda
+                && fixed.name);
 
         if (single_use && (fixed instanceof AST_Lambda || fixed instanceof AST_Class)) {
             if (retain_top_func(fixed, compressor)) {

package/lib/output.js

@@ -971,6 +971,10 @@ function OutputStream(options) {
                 return true;
             }
 
+            if (po === "??" && (so === "||" || so === "&&")) {
+                return true;
+            }
+
             const pp = PRECEDENCE[po];
             const sp = PRECEDENCE[so];
             if (pp > sp

package/lib/scope.js

@@ -493,6 +493,13 @@ AST_Scope.DEFMETHOD("conflicting_def", function (name) {
     );
 });
 
+AST_Scope.DEFMETHOD("conflicting_def_shallow", function (name) {
+    return (
+        this.enclosed.find(def => def.name === name)
+        || this.variables.has(name)
+    );
+});
+
 AST_Scope.DEFMETHOD("add_child_scope", function (scope) {
     // `scope` is going to be moved into `this` right now.
     // Update the required scopes' information
@@ -526,15 +533,34 @@ AST_Scope.DEFMETHOD("add_child_scope", function (scope) {
     }
 });
 
+function find_scopes_visible_from(scopes) {
+    const found_scopes = new Set();
+
+    for (const scope of new Set(scopes)) {
+        (function bubble_up(scope) {
+            if (scope == null || found_scopes.has(scope)) return;
+
+            found_scopes.add(scope);
+
+            bubble_up(scope.parent_scope);
+        })(scope);
+    }
+
+    return [...found_scopes];
+}
+
 // Creates a symbol during compression
 AST_Scope.DEFMETHOD("create_symbol", function(SymClass, {
     source,
     tentative_name,
     scope,
+    conflict_scopes = [scope],
     init = null
 } = {}) {
     let symbol_name;
 
+    conflict_scopes = find_scopes_visible_from(conflict_scopes);
+
     if (tentative_name) {
         // Implement hygiene (no new names are conflicting with existing names)
         tentative_name =
@@ -542,7 +568,7 @@ AST_Scope.DEFMETHOD("create_symbol", function(SymClass, {
             tentative_name.replace(/(?:^[^a-z_$]|[^a-z0-9_$])/ig, "_");
 
         let i = 0;
-        while (this.conflicting_def(symbol_name)) {
+        while (conflict_scopes.find(s => s.conflicting_def_shallow(symbol_name))) {
             symbol_name = tentative_name + "$" + i++;
         }
     }

package/lib/transform.js

@@ -51,6 +51,7 @@ import {
     AST_Call,
     AST_Case,
     AST_Catch,
+    AST_Chain,
     AST_Class,
     AST_Conditional,
     AST_Definitions,
@@ -236,6 +237,10 @@ def_transform(AST_Sub, function(self, tw) {
     self.property = self.property.transform(tw);
 });
 
+def_transform(AST_Chain, function(self, tw) {
+    self.expression = self.expression.transform(tw);
+});
+
 def_transform(AST_Yield, function(self, tw) {
     if (self.expression) self.expression = self.expression.transform(tw);
 });

package/package.json

@@ -4,9 +4,9 @@
   "homepage": "https://terser.org",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "5.3.3",
+  "version": "5.3.7",
   "engines": {
-    "node": ">=6.0.0"
+    "node": "^10.0.0 || ^11.0.0 || ^12.0.0 || >=14.0.0"
   },
   "maintainers": [
     "Fábio Santos <fabiosantosart@gmail.com>"