terser 5.17.2 → 5.17.4

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v5.17.4
+
+ - Fix crash when trying to negate a class (`!class{}`)
+ - Avoid outputting comments between `yield`/`await` and its argument
+ - Fix detection of left-hand-side of assignment, to avoid optimizing it like any other expression in some edge cases
+
+## v5.17.3
+
+ - Fix issue with trimming a static class property's contents accessing the class as `this`.
+
 ## v5.17.2
  - Be less conservative when detecting use-before-definition of `var` in hoisted functions.
  - Support unusual (but perfectly valid) initializers of for-in and for-of loops.

package/dist/bundle.min.js

@@ -9345,14 +9345,17 @@ function OutputStream(options) {
         if (!start) return;
         var printed_comments = self.printed_comments;
 
-        // There cannot be a newline between return and its value.
-        const return_with_value = node instanceof AST_Exit && node.value;
+        // There cannot be a newline between return/yield and its value.
+        const keyword_with_value = 
+            node instanceof AST_Exit && node.value
+            || (node instanceof AST_Await || node instanceof AST_Yield)
+                && node.expression;
 
         if (
             start.comments_before
             && printed_comments.has(start.comments_before)
         ) {
-            if (return_with_value) {
+            if (keyword_with_value) {
                 start.comments_before = [];
             } else {
                 return;
@@ -9365,10 +9368,12 @@ function OutputStream(options) {
         }
         printed_comments.add(comments);
 
-        if (return_with_value) {
+        if (keyword_with_value) {
             var tw = new TreeWalker(function(node) {
                 var parent = tw.parent();
                 if (parent instanceof AST_Exit
+                    || parent instanceof AST_Await
+                    || parent instanceof AST_Yield
                     || parent instanceof AST_Binary && parent.left === node
                     || parent.TYPE == "Call" && parent.expression === node
                     || parent instanceof AST_Conditional && parent.condition === node
@@ -9387,7 +9392,7 @@ function OutputStream(options) {
                 }
             });
             tw.push(node);
-            node.value.walk(tw);
+            keyword_with_value.walk(tw);
         }
 
         if (current_pos == 0) {
@@ -14022,6 +14027,9 @@ function is_lhs(node, parent) {
     def_negate(AST_Function, function() {
         return basic_negation(this);
     });
+    def_negate(AST_Class, function() {
+        return basic_negation(this);
+    });
     def_negate(AST_Arrow, function() {
         return basic_negation(this);
     });
@@ -14155,6 +14163,19 @@ const aborts = (thing) => thing && thing.aborts();
     node.DEFMETHOD("aborts", func);
 });
 
+AST_Node.DEFMETHOD("contains_this", function() {
+    return walk(this, node => {
+        if (node instanceof AST_This) return walk_abort;
+        if (
+            node !== this
+            && node instanceof AST_Scope
+            && !(node instanceof AST_Arrow)
+        ) {
+            return true;
+        }
+    });
+});
+
 function is_modified(compressor, tw, node, value, level, immutable) {
     var parent = tw.parent(level);
     var lhs = is_lhs(node, parent);
@@ -14760,6 +14781,15 @@ def_drop_side_effect_free(AST_Class, function (compressor) {
             }
         }
 
+        if (
+            prop instanceof AST_ClassProperty
+            && prop.static
+            && prop.value.has_side_effects(compressor)
+            && prop.contains_this()
+        ) {
+            return this;
+        }
+
         const trimmed_prop = prop.drop_side_effect_free(compressor);
         if (trimmed_prop)
             with_effects.push(trimmed_prop);
@@ -18313,6 +18343,13 @@ class Compressor extends TreeWalker {
         if (opt === node) set_flag(opt, SQUEEZED);
         return opt;
     }
+
+    /** Alternative to plain is_lhs() which doesn't work within .optimize() */
+    is_lhs() {
+        const self = this.stack[this.stack.length - 1];
+        const parent = this.stack[this.stack.length - 2];
+        return is_lhs(self, parent);
+    }
 }
 
 function def_optimize(node, optimizer) {
@@ -20470,8 +20507,7 @@ def_optimize(AST_SymbolRef, function(self, compressor) {
         }
     }
 
-    const parent = compressor.parent();
-    if (compressor.option("reduce_vars") && is_lhs(self, parent) !== self) {
+    if (compressor.option("reduce_vars") && !compressor.is_lhs()) {
         return inline_into_symbolref(self, compressor);
     } else {
         return self;
@@ -20495,7 +20531,7 @@ def_optimize(AST_Undefined, function(self, compressor) {
             return ref;
         }
     }
-    var lhs = is_lhs(compressor.self(), compressor.parent());
+    var lhs = compressor.is_lhs();
     if (lhs && is_atomic(lhs, self)) return self;
     return make_node(AST_UnaryPrefix, self, {
         operator: "void",
@@ -20506,7 +20542,7 @@ def_optimize(AST_Undefined, function(self, compressor) {
 });
 
 def_optimize(AST_Infinity, function(self, compressor) {
-    var lhs = is_lhs(compressor.self(), compressor.parent());
+    var lhs = compressor.is_lhs();
     if (lhs && is_atomic(lhs, self)) return self;
     if (
         compressor.option("keep_infinity")
@@ -20527,7 +20563,7 @@ def_optimize(AST_Infinity, function(self, compressor) {
 });
 
 def_optimize(AST_NaN, function(self, compressor) {
-    var lhs = is_lhs(compressor.self(), compressor.parent());
+    var lhs = compressor.is_lhs();
     if (lhs && !is_atomic(lhs, self)
         || find_variable(compressor, "NaN")) {
         return make_node(AST_Binary, self, {
@@ -21103,7 +21139,10 @@ def_optimize(AST_Sub, function(self, compressor) {
                     }
                 }
             }
-            prop = self.property = best_of_expression(prop, make_node_from_constant(key, prop).transform(compressor));
+            prop = self.property = best_of_expression(
+                prop,
+                make_node_from_constant(key, prop).transform(compressor)
+            );
             var property = "" + key;
             if (is_basic_identifier_string(property)
                 && property.length <= prop.size() + 1) {
@@ -21161,7 +21200,7 @@ def_optimize(AST_Sub, function(self, compressor) {
             return sym;
         }
     }
-    if (is_lhs(self, compressor.parent())) return self;
+    if (compressor.is_lhs()) return self;
     if (key !== prop) {
         var sub = self.flatten_object(property, compressor);
         if (sub) {
@@ -21229,22 +21268,9 @@ def_optimize(AST_Chain, function (self, compressor) {
     return self;
 });
 
-AST_Lambda.DEFMETHOD("contains_this", function() {
-    return walk(this, node => {
-        if (node instanceof AST_This) return walk_abort;
-        if (
-            node !== this
-            && node instanceof AST_Scope
-            && !(node instanceof AST_Arrow)
-        ) {
-            return true;
-        }
-    });
-});
-
 def_optimize(AST_Dot, function(self, compressor) {
     const parent = compressor.parent();
-    if (is_lhs(self, parent)) return self;
+    if (compressor.is_lhs()) return self;
     if (compressor.option("unsafe_proto")
         && self.expression instanceof AST_Dot
         && self.expression.property == "prototype") {

package/lib/compress/drop-side-effect-free.js

@@ -165,6 +165,15 @@ def_drop_side_effect_free(AST_Class, function (compressor) {
             }
         }
 
+        if (
+            prop instanceof AST_ClassProperty
+            && prop.static
+            && prop.value.has_side_effects(compressor)
+            && prop.contains_this()
+        ) {
+            return this;
+        }
+
         const trimmed_prop = prop.drop_side_effect_free(compressor);
         if (trimmed_prop)
             with_effects.push(trimmed_prop);

package/lib/compress/index.js

@@ -442,6 +442,13 @@ class Compressor extends TreeWalker {
         if (opt === node) set_flag(opt, SQUEEZED);
         return opt;
     }
+
+    /** Alternative to plain is_lhs() which doesn't work within .optimize() */
+    is_lhs() {
+        const self = this.stack[this.stack.length - 1];
+        const parent = this.stack[this.stack.length - 2];
+        return is_lhs(self, parent);
+    }
 }
 
 function def_optimize(node, optimizer) {
@@ -2599,8 +2606,7 @@ def_optimize(AST_SymbolRef, function(self, compressor) {
         }
     }
 
-    const parent = compressor.parent();
-    if (compressor.option("reduce_vars") && is_lhs(self, parent) !== self) {
+    if (compressor.option("reduce_vars") && !compressor.is_lhs()) {
         return inline_into_symbolref(self, compressor);
     } else {
         return self;
@@ -2624,7 +2630,7 @@ def_optimize(AST_Undefined, function(self, compressor) {
             return ref;
         }
     }
-    var lhs = is_lhs(compressor.self(), compressor.parent());
+    var lhs = compressor.is_lhs();
     if (lhs && is_atomic(lhs, self)) return self;
     return make_node(AST_UnaryPrefix, self, {
         operator: "void",
@@ -2635,7 +2641,7 @@ def_optimize(AST_Undefined, function(self, compressor) {
 });
 
 def_optimize(AST_Infinity, function(self, compressor) {
-    var lhs = is_lhs(compressor.self(), compressor.parent());
+    var lhs = compressor.is_lhs();
     if (lhs && is_atomic(lhs, self)) return self;
     if (
         compressor.option("keep_infinity")
@@ -2656,7 +2662,7 @@ def_optimize(AST_Infinity, function(self, compressor) {
 });
 
 def_optimize(AST_NaN, function(self, compressor) {
-    var lhs = is_lhs(compressor.self(), compressor.parent());
+    var lhs = compressor.is_lhs();
     if (lhs && !is_atomic(lhs, self)
         || find_variable(compressor, "NaN")) {
         return make_node(AST_Binary, self, {
@@ -3232,7 +3238,10 @@ def_optimize(AST_Sub, function(self, compressor) {
                     }
                 }
             }
-            prop = self.property = best_of_expression(prop, make_node_from_constant(key, prop).transform(compressor));
+            prop = self.property = best_of_expression(
+                prop,
+                make_node_from_constant(key, prop).transform(compressor)
+            );
             var property = "" + key;
             if (is_basic_identifier_string(property)
                 && property.length <= prop.size() + 1) {
@@ -3290,7 +3299,7 @@ def_optimize(AST_Sub, function(self, compressor) {
             return sym;
         }
     }
-    if (is_lhs(self, compressor.parent())) return self;
+    if (compressor.is_lhs()) return self;
     if (key !== prop) {
         var sub = self.flatten_object(property, compressor);
         if (sub) {
@@ -3358,22 +3367,9 @@ def_optimize(AST_Chain, function (self, compressor) {
     return self;
 });
 
-AST_Lambda.DEFMETHOD("contains_this", function() {
-    return walk(this, node => {
-        if (node instanceof AST_This) return walk_abort;
-        if (
-            node !== this
-            && node instanceof AST_Scope
-            && !(node instanceof AST_Arrow)
-        ) {
-            return true;
-        }
-    });
-});
-
 def_optimize(AST_Dot, function(self, compressor) {
     const parent = compressor.parent();
-    if (is_lhs(self, parent)) return self;
+    if (compressor.is_lhs()) return self;
     if (compressor.option("unsafe_proto")
         && self.expression instanceof AST_Dot
         && self.expression.property == "prototype") {

package/lib/compress/inference.js

@@ -84,6 +84,7 @@ import {
   AST_PropAccess,
   AST_RegExp,
   AST_Return,
+  AST_Scope,
   AST_Sequence,
   AST_SimpleStatement,
   AST_Statement,
@@ -817,6 +818,9 @@ export function is_lhs(node, parent) {
     def_negate(AST_Function, function() {
         return basic_negation(this);
     });
+    def_negate(AST_Class, function() {
+        return basic_negation(this);
+    });
     def_negate(AST_Arrow, function() {
         return basic_negation(this);
     });
@@ -950,6 +954,19 @@ export const aborts = (thing) => thing && thing.aborts();
     node.DEFMETHOD("aborts", func);
 });
 
+AST_Node.DEFMETHOD("contains_this", function() {
+    return walk(this, node => {
+        if (node instanceof AST_This) return walk_abort;
+        if (
+            node !== this
+            && node instanceof AST_Scope
+            && !(node instanceof AST_Arrow)
+        ) {
+            return true;
+        }
+    });
+});
+
 export function is_modified(compressor, tw, node, value, level, immutable) {
     var parent = tw.parent(level);
     var lhs = is_lhs(node, parent);

package/lib/output.js

@@ -662,14 +662,17 @@ function OutputStream(options) {
         if (!start) return;
         var printed_comments = self.printed_comments;
 
-        // There cannot be a newline between return and its value.
-        const return_with_value = node instanceof AST_Exit && node.value;
+        // There cannot be a newline between return/yield and its value.
+        const keyword_with_value = 
+            node instanceof AST_Exit && node.value
+            || (node instanceof AST_Await || node instanceof AST_Yield)
+                && node.expression;
 
         if (
             start.comments_before
             && printed_comments.has(start.comments_before)
         ) {
-            if (return_with_value) {
+            if (keyword_with_value) {
                 start.comments_before = [];
             } else {
                 return;
@@ -682,10 +685,12 @@ function OutputStream(options) {
         }
         printed_comments.add(comments);
 
-        if (return_with_value) {
+        if (keyword_with_value) {
             var tw = new TreeWalker(function(node) {
                 var parent = tw.parent();
                 if (parent instanceof AST_Exit
+                    || parent instanceof AST_Await
+                    || parent instanceof AST_Yield
                     || parent instanceof AST_Binary && parent.left === node
                     || parent.TYPE == "Call" && parent.expression === node
                     || parent instanceof AST_Conditional && parent.condition === node
@@ -704,7 +709,7 @@ function OutputStream(options) {
                 }
             });
             tw.push(node);
-            node.value.walk(tw);
+            keyword_with_value.walk(tw);
         }
 
         if (current_pos == 0) {

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