terser 5.27.0 → 5.27.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v5.27.2
+ - Recognise `this` as a reference to the surrounding class in `drop_unused`. Closes #1472
+
+## v5.27.1
+ - Fixed case where `collapse_vars` inlines `await` expressions into non-async functions.
+
 ## v5.27.0
  - Created `minify_sync()` alternative to `minify()` since there's no async code left.
 

package/dist/bundle.min.js

@@ -15137,6 +15137,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             return node.expression;
         }
     };
+    var this_def = null;
     var in_use_ids = new Map();
     var fixed_ids = new Map();
     if (self instanceof AST_Toplevel && compressor.top_retain) {
@@ -15148,6 +15149,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
     }
     var var_defs_by_id = new Map();
     var initializations = new Map();
+
     // pass 1: find out which symbols are directly used in
     // this scope (not in nested scopes).
     var scope = this;
@@ -15160,11 +15162,6 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             });
         }
         if (node === self) return;
-        if (node instanceof AST_Class) {
-            if (node.has_side_effects(compressor)) {
-                node.visit_nondeferred_class_parts(tw);
-            }
-        }
         if (node instanceof AST_Defun || node instanceof AST_DefClass) {
             var node_def = node.name.definition();
             const in_export = tw.parent() instanceof AST_Export;
@@ -15174,11 +15171,22 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                 }
             }
 
+            if (node instanceof AST_DefClass && node.has_side_effects(compressor)) {
+                const save_this_def = this_def;
+                this_def = node_def;
+                node.visit_nondeferred_class_parts(tw);
+                this_def = save_this_def;
+            }
+
             map_add(initializations, node_def.id, node);
             return true; // don't go in nested scopes
         }
         // In the root scope, we drop things. In inner scopes, we just check for uses.
         const in_root_scope = scope === self;
+        if (node instanceof AST_This && this_def && in_root_scope) {
+            in_use_ids.set(this_def.id, this_def);
+            return true;
+        }
         if (node instanceof AST_SymbolFunarg && in_root_scope) {
             map_add(var_defs_by_id, node.definition().id, node);
         }
@@ -16725,6 +16733,14 @@ function tighten_body(statements, compressor) {
             return found;
         }
 
+        function arg_is_injectable(arg) {
+            if (arg instanceof AST_Expansion) return false;
+            const contains_await = walk(arg, (node) => {
+                if (node instanceof AST_Await) return walk_abort;
+            });
+            if (contains_await) return false;
+            return true;
+        }
         function extract_args() {
             var iife, fn = compressor.self();
             if (is_func_expr(fn)
@@ -16733,7 +16749,8 @@ function tighten_body(statements, compressor) {
                 && !fn.pinned()
                 && (iife = compressor.parent()) instanceof AST_Call
                 && iife.expression === fn
-                && iife.args.every((arg) => !(arg instanceof AST_Expansion))) {
+                && iife.args.every(arg_is_injectable)
+            ) {
                 var fn_strict = compressor.has_directive("use strict");
                 if (fn_strict && !member(fn_strict, fn.body))
                     fn_strict = false;

package/lib/compress/drop-unused.js

@@ -70,6 +70,7 @@ import {
     AST_SymbolFunarg,
     AST_SymbolRef,
     AST_SymbolVar,
+    AST_This,
     AST_Toplevel,
     AST_Unary,
     AST_Var,
@@ -126,6 +127,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             return node.expression;
         }
     };
+    var this_def = null;
     var in_use_ids = new Map();
     var fixed_ids = new Map();
     if (self instanceof AST_Toplevel && compressor.top_retain) {
@@ -137,6 +139,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
     }
     var var_defs_by_id = new Map();
     var initializations = new Map();
+
     // pass 1: find out which symbols are directly used in
     // this scope (not in nested scopes).
     var scope = this;
@@ -149,11 +152,6 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             });
         }
         if (node === self) return;
-        if (node instanceof AST_Class) {
-            if (node.has_side_effects(compressor)) {
-                node.visit_nondeferred_class_parts(tw);
-            }
-        }
         if (node instanceof AST_Defun || node instanceof AST_DefClass) {
             var node_def = node.name.definition();
             const in_export = tw.parent() instanceof AST_Export;
@@ -163,11 +161,22 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                 }
             }
 
+            if (node instanceof AST_DefClass && node.has_side_effects(compressor)) {
+                const save_this_def = this_def;
+                this_def = node_def;
+                node.visit_nondeferred_class_parts(tw);
+                this_def = save_this_def;
+            }
+
             map_add(initializations, node_def.id, node);
             return true; // don't go in nested scopes
         }
         // In the root scope, we drop things. In inner scopes, we just check for uses.
         const in_root_scope = scope === self;
+        if (node instanceof AST_This && this_def && in_root_scope) {
+            in_use_ids.set(this_def.id, this_def);
+            return true;
+        }
         if (node instanceof AST_SymbolFunarg && in_root_scope) {
             map_add(var_defs_by_id, node.definition().id, node);
         }

package/lib/compress/tighten-body.js

@@ -574,6 +574,14 @@ export function tighten_body(statements, compressor) {
             return found;
         }
 
+        function arg_is_injectable(arg) {
+            if (arg instanceof AST_Expansion) return false;
+            const contains_await = walk(arg, (node) => {
+                if (node instanceof AST_Await) return walk_abort;
+            });
+            if (contains_await) return false;
+            return true;
+        }
         function extract_args() {
             var iife, fn = compressor.self();
             if (is_func_expr(fn)
@@ -582,7 +590,8 @@ export function tighten_body(statements, compressor) {
                 && !fn.pinned()
                 && (iife = compressor.parent()) instanceof AST_Call
                 && iife.expression === fn
-                && iife.args.every((arg) => !(arg instanceof AST_Expansion))) {
+                && iife.args.every(arg_is_injectable)
+            ) {
                 var fn_strict = compressor.has_directive("use strict");
                 if (fn_strict && !member(fn_strict, fn.body))
                     fn_strict = false;

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