terser 5.17.4 → 5.17.5

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v5.17.5
+ - Take into account the non-deferred bits of a class, such as static properties, while dropping unused code.
+
 ## v5.17.4
 
  - Fix crash when trying to negate a class (`!class{}`)

package/dist/bundle.min.js

@@ -5840,6 +5840,40 @@ var AST_Class = DEFNODE("Class", "name extends properties", function AST_Class(p
         if (this.extends) push(this.extends);
         if (this.name) push(this.name);
     },
+    /** go through the bits that are executed instantly, not when the class is `new`'d. Doesn't walk the name. */
+    visit_nondeferred_class_parts(visitor) {
+        if (this.extends) {
+            this.extends._walk(visitor);
+        }
+        this.properties.forEach((prop) => {
+            if (prop instanceof AST_ClassStaticBlock) {
+                prop._walk(visitor);
+                return;
+            }
+            if (prop.computed_key()) {
+                visitor.push(prop);
+                prop.key._walk(visitor);
+                visitor.pop();
+            }
+            if ((prop instanceof AST_ClassPrivateProperty || prop instanceof AST_ClassProperty) && prop.static && prop.value) {
+                visitor.push(prop);
+                prop.value._walk(visitor);
+                visitor.pop();
+            }
+        });
+    },
+    /** go through the bits that are executed later, when the class is `new`'d or a static method is called */
+    visit_deferred_class_parts(visitor) {
+        this.properties.forEach((prop) => {
+            if (prop instanceof AST_ConciseMethod) {
+                prop.walk(visitor);
+            } else if (prop instanceof AST_ClassProperty && !prop.static && prop.value) {
+                visitor.push(prop);
+                prop.value._walk(visitor);
+                visitor.pop();
+            }
+        });
+    },
 }, AST_Scope /* TODO a class might have a scope but it's not a scope */);
 
 var AST_ClassProperty = DEFNODE("ClassProperty", "static quote", function AST_ClassProperty(props) {
@@ -5956,6 +5990,7 @@ var AST_ClassStaticBlock = DEFNODE("ClassStaticBlock", "body block_scope", funct
         while (i--) push(this.body[i]);
     },
     clone: clone_block_scope,
+    computed_key: () => false
 }, AST_Scope);
 
 var AST_ClassExpression = DEFNODE("ClassExpression", null, function AST_ClassExpression(props) {
@@ -14772,31 +14807,43 @@ def_drop_side_effect_free(AST_Class, function (compressor) {
     const trimmed_extends = this.extends && this.extends.drop_side_effect_free(compressor);
     if (trimmed_extends)
         with_effects.push(trimmed_extends);
+
     for (const prop of this.properties) {
         if (prop instanceof AST_ClassStaticBlock) {
-            if (prop.body.some(stat => stat.has_side_effects(compressor))) {
-                return this;
-            } else {
-                continue;
+            if (prop.has_side_effects(compressor)) {
+                return this; // Be cautious about these
             }
-        }
+        } else {
+            const trimmed_prop = prop.drop_side_effect_free(compressor);
+            if (trimmed_prop) {
+                if (trimmed_prop.contains_this()) return this;
 
-        if (
-            prop instanceof AST_ClassProperty
-            && prop.static
-            && prop.value.has_side_effects(compressor)
-            && prop.contains_this()
-        ) {
-            return this;
+                with_effects.push(trimmed_prop);
+            }
         }
-
-        const trimmed_prop = prop.drop_side_effect_free(compressor);
-        if (trimmed_prop)
-            with_effects.push(trimmed_prop);
     }
+
     if (!with_effects.length)
         return null;
-    return make_sequence(this, with_effects);
+
+    const exprs = make_sequence(this, with_effects);
+    if (this instanceof AST_DefClass) {
+        // We want a statement
+        return make_node(AST_SimpleStatement, this, { body: exprs });
+    } else {
+        return exprs;
+    }
+});
+
+def_drop_side_effect_free(AST_ClassProperty, function (compressor) {
+    const key = this.computed_key() && this.key.drop_side_effect_free(compressor);
+
+    const value = this.static && this.value
+        && this.value.drop_side_effect_free(compressor);
+
+    if (key && value)
+        return make_sequence(this, [key, value]);
+    return key || value || null;
 });
 
 def_drop_side_effect_free(AST_Binary, function (compressor, first_in_statement) {
@@ -14902,17 +14949,6 @@ def_drop_side_effect_free(AST_ObjectProperty, function (compressor, first_in_sta
     return key || value;
 });
 
-def_drop_side_effect_free(AST_ClassProperty, function (compressor) {
-    const key = this.computed_key() && this.key.drop_side_effect_free(compressor);
-
-    const value = this.static && this.value
-        && this.value.drop_side_effect_free(compressor);
-
-    if (key && value)
-        return make_sequence(this, [key, value]);
-    return key || value || null;
-});
-
 def_drop_side_effect_free(AST_ConciseMethod, function () {
     return this.computed_key() ? this.key : null;
 });
@@ -15072,6 +15108,11 @@ 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;
@@ -15080,23 +15121,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                     in_use_ids.set(node_def.id, node_def);
                 }
             }
-            if (node instanceof AST_DefClass) {
-                if (
-                    node.extends
-                    && (node.extends.has_side_effects(compressor)
-                    || node.extends.may_throw(compressor))
-                ) {
-                    node.extends.walk(tw);
-                }
-                for (const prop of node.properties) {
-                    if (
-                        prop.has_side_effects(compressor) ||
-                        prop.may_throw(compressor)
-                    ) {
-                        prop.walk(tw);
-                    }
-                }
-            }
+
             map_add(initializations, node_def.id, node);
             return true; // don't go in nested scopes
         }
@@ -15161,9 +15186,9 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                         if (!in_use || fixed_ids.has(def.id) && fixed_ids.get(def.id) !== node) {
                             return maintain_this_binding(parent, node, node.right.transform(tt));
                         }
-                    } else if (!in_use) return in_list ? MAP.skip : make_node(AST_Number, node, {
-                        value: 0
-                    });
+                    } else if (!in_use) {
+                        return in_list ? MAP.skip : make_node(AST_Number, node, { value: 0 });
+                    }
                 }
             }
             if (scope !== self) return;
@@ -15206,11 +15231,18 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             if ((node instanceof AST_Defun || node instanceof AST_DefClass) && node !== self) {
                 const def = node.name.definition();
                 const keep = def.global && !drop_funcs || in_use_ids.has(def.id);
-                // Class "extends" and static blocks may have side effects
-                const has_side_effects = !keep
-                    && node instanceof AST_Class
-                    && node.has_side_effects(compressor);
-                if (!keep && !has_side_effects) {
+                if (!keep) {
+                    // Class "extends" and static blocks may have side effects
+                    if (node instanceof AST_Class) {
+                        const kept = node.drop_side_effect_free(compressor);
+                        if (kept !== node) {
+                            def.eliminated++;
+                            if (kept) return kept;
+                            return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
+                        } else {
+                            return kept;
+                        }
+                    }
                     def.eliminated++;
                     return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
                 }
@@ -15306,9 +15338,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                   case 1:
                     return body[0];
                   default:
-                    return in_list ? MAP.splice(body) : make_node(AST_BlockStatement, node, {
-                        body: body
-                    });
+                    return in_list ? MAP.splice(body) : make_node(AST_BlockStatement, node, { body });
                 }
             }
             // certain combination of unused name + side effect leads to:
@@ -15351,7 +15381,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                 }
                 return node;
             }
-            if (node instanceof AST_Scope) {
+            if (node instanceof AST_Scope && !(node instanceof AST_ClassStaticBlock)) {
                 const save_scope = scope;
                 scope = node;
                 descend(node, this);
@@ -15390,7 +15420,11 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             }
             return true;
         }
-        if (node instanceof AST_Scope) {
+        if (node instanceof AST_Class) {
+            descend();
+            return true;
+        }
+        if (node instanceof AST_Scope && !(node instanceof AST_ClassStaticBlock)) {
             var save_scope = scope;
             scope = node;
             descend();
@@ -18556,8 +18590,6 @@ def_optimize(AST_Lambda, opt_AST_Lambda);
 AST_Scope.DEFMETHOD("hoist_declarations", function(compressor) {
     var self = this;
     if (compressor.has_directive("use asm")) return self;
-    // Hoisting makes no sense in an arrow func
-    if (!Array.isArray(self.body)) return self;
 
     var hoist_funs = compressor.option("hoist_funs");
     var hoist_vars = compressor.option("hoist_vars");

package/lib/ast.js

@@ -2230,6 +2230,40 @@ var AST_Class = DEFNODE("Class", "name extends properties", function AST_Class(p
         if (this.extends) push(this.extends);
         if (this.name) push(this.name);
     },
+    /** go through the bits that are executed instantly, not when the class is `new`'d. Doesn't walk the name. */
+    visit_nondeferred_class_parts(visitor) {
+        if (this.extends) {
+            this.extends._walk(visitor);
+        }
+        this.properties.forEach((prop) => {
+            if (prop instanceof AST_ClassStaticBlock) {
+                prop._walk(visitor);
+                return;
+            }
+            if (prop.computed_key()) {
+                visitor.push(prop);
+                prop.key._walk(visitor);
+                visitor.pop();
+            }
+            if ((prop instanceof AST_ClassPrivateProperty || prop instanceof AST_ClassProperty) && prop.static && prop.value) {
+                visitor.push(prop);
+                prop.value._walk(visitor);
+                visitor.pop();
+            }
+        });
+    },
+    /** go through the bits that are executed later, when the class is `new`'d or a static method is called */
+    visit_deferred_class_parts(visitor) {
+        this.properties.forEach((prop) => {
+            if (prop instanceof AST_ConciseMethod) {
+                prop.walk(visitor);
+            } else if (prop instanceof AST_ClassProperty && !prop.static && prop.value) {
+                visitor.push(prop);
+                prop.value._walk(visitor);
+                visitor.pop();
+            }
+        });
+    },
 }, AST_Scope /* TODO a class might have a scope but it's not a scope */);
 
 var AST_ClassProperty = DEFNODE("ClassProperty", "static quote", function AST_ClassProperty(props) {
@@ -2346,6 +2380,7 @@ var AST_ClassStaticBlock = DEFNODE("ClassStaticBlock", "body block_scope", funct
         while (i--) push(this.body[i]);
     },
     clone: clone_block_scope,
+    computed_key: () => false
 }, AST_Scope);
 
 var AST_ClassExpression = DEFNODE("ClassExpression", null, function AST_ClassExpression(props) {

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

@@ -55,6 +55,7 @@ import {
     AST_ConciseMethod,
     AST_Conditional,
     AST_Constant,
+    AST_DefClass,
     AST_Dot,
     AST_Expansion,
     AST_Function,
@@ -68,6 +69,7 @@ import {
     AST_PropAccess,
     AST_Scope,
     AST_Sequence,
+    AST_SimpleStatement,
     AST_Sub,
     AST_SymbolRef,
     AST_TemplateSegment,
@@ -156,31 +158,43 @@ def_drop_side_effect_free(AST_Class, function (compressor) {
     const trimmed_extends = this.extends && this.extends.drop_side_effect_free(compressor);
     if (trimmed_extends)
         with_effects.push(trimmed_extends);
+
     for (const prop of this.properties) {
         if (prop instanceof AST_ClassStaticBlock) {
-            if (prop.body.some(stat => stat.has_side_effects(compressor))) {
-                return this;
-            } else {
-                continue;
+            if (prop.has_side_effects(compressor)) {
+                return this; // Be cautious about these
             }
-        }
+        } else {
+            const trimmed_prop = prop.drop_side_effect_free(compressor);
+            if (trimmed_prop) {
+                if (trimmed_prop.contains_this()) return this;
 
-        if (
-            prop instanceof AST_ClassProperty
-            && prop.static
-            && prop.value.has_side_effects(compressor)
-            && prop.contains_this()
-        ) {
-            return this;
+                with_effects.push(trimmed_prop);
+            }
         }
-
-        const trimmed_prop = prop.drop_side_effect_free(compressor);
-        if (trimmed_prop)
-            with_effects.push(trimmed_prop);
     }
+
     if (!with_effects.length)
         return null;
-    return make_sequence(this, with_effects);
+
+    const exprs = make_sequence(this, with_effects);
+    if (this instanceof AST_DefClass) {
+        // We want a statement
+        return make_node(AST_SimpleStatement, this, { body: exprs });
+    } else {
+        return exprs;
+    }
+});
+
+def_drop_side_effect_free(AST_ClassProperty, function (compressor) {
+    const key = this.computed_key() && this.key.drop_side_effect_free(compressor);
+
+    const value = this.static && this.value
+        && this.value.drop_side_effect_free(compressor);
+
+    if (key && value)
+        return make_sequence(this, [key, value]);
+    return key || value || null;
 });
 
 def_drop_side_effect_free(AST_Binary, function (compressor, first_in_statement) {
@@ -286,17 +300,6 @@ def_drop_side_effect_free(AST_ObjectProperty, function (compressor, first_in_sta
     return key || value;
 });
 
-def_drop_side_effect_free(AST_ClassProperty, function (compressor) {
-    const key = this.computed_key() && this.key.drop_side_effect_free(compressor);
-
-    const value = this.static && this.value
-        && this.value.drop_side_effect_free(compressor);
-
-    if (key && value)
-        return make_sequence(this, [key, value]);
-    return key || value || null;
-});
-
 def_drop_side_effect_free(AST_ConciseMethod, function () {
     return this.computed_key() ? this.key : null;
 });

package/lib/compress/drop-unused.js

@@ -47,6 +47,7 @@ import {
     AST_BlockStatement,
     AST_Class,
     AST_ClassExpression,
+    AST_ClassStaticBlock,
     AST_DefaultAssign,
     AST_DefClass,
     AST_Definitions,
@@ -152,6 +153,11 @@ 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;
@@ -160,23 +166,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                     in_use_ids.set(node_def.id, node_def);
                 }
             }
-            if (node instanceof AST_DefClass) {
-                if (
-                    node.extends
-                    && (node.extends.has_side_effects(compressor)
-                    || node.extends.may_throw(compressor))
-                ) {
-                    node.extends.walk(tw);
-                }
-                for (const prop of node.properties) {
-                    if (
-                        prop.has_side_effects(compressor) ||
-                        prop.may_throw(compressor)
-                    ) {
-                        prop.walk(tw);
-                    }
-                }
-            }
+
             map_add(initializations, node_def.id, node);
             return true; // don't go in nested scopes
         }
@@ -241,9 +231,9 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                         if (!in_use || fixed_ids.has(def.id) && fixed_ids.get(def.id) !== node) {
                             return maintain_this_binding(parent, node, node.right.transform(tt));
                         }
-                    } else if (!in_use) return in_list ? MAP.skip : make_node(AST_Number, node, {
-                        value: 0
-                    });
+                    } else if (!in_use) {
+                        return in_list ? MAP.skip : make_node(AST_Number, node, { value: 0 });
+                    }
                 }
             }
             if (scope !== self) return;
@@ -286,11 +276,18 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             if ((node instanceof AST_Defun || node instanceof AST_DefClass) && node !== self) {
                 const def = node.name.definition();
                 const keep = def.global && !drop_funcs || in_use_ids.has(def.id);
-                // Class "extends" and static blocks may have side effects
-                const has_side_effects = !keep
-                    && node instanceof AST_Class
-                    && node.has_side_effects(compressor);
-                if (!keep && !has_side_effects) {
+                if (!keep) {
+                    // Class "extends" and static blocks may have side effects
+                    if (node instanceof AST_Class) {
+                        const kept = node.drop_side_effect_free(compressor);
+                        if (kept !== node) {
+                            def.eliminated++;
+                            if (kept) return kept;
+                            return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
+                        } else {
+                            return kept;
+                        }
+                    }
                     def.eliminated++;
                     return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
                 }
@@ -386,9 +383,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                   case 1:
                     return body[0];
                   default:
-                    return in_list ? MAP.splice(body) : make_node(AST_BlockStatement, node, {
-                        body: body
-                    });
+                    return in_list ? MAP.splice(body) : make_node(AST_BlockStatement, node, { body });
                 }
             }
             // certain combination of unused name + side effect leads to:
@@ -431,7 +426,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                 }
                 return node;
             }
-            if (node instanceof AST_Scope) {
+            if (node instanceof AST_Scope && !(node instanceof AST_ClassStaticBlock)) {
                 const save_scope = scope;
                 scope = node;
                 descend(node, this);
@@ -470,7 +465,11 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             }
             return true;
         }
-        if (node instanceof AST_Scope) {
+        if (node instanceof AST_Class) {
+            descend();
+            return true;
+        }
+        if (node instanceof AST_Scope && !(node instanceof AST_ClassStaticBlock)) {
             var save_scope = scope;
             scope = node;
             descend();

package/lib/compress/index.js

@@ -655,8 +655,6 @@ def_optimize(AST_Lambda, opt_AST_Lambda);
 AST_Scope.DEFMETHOD("hoist_declarations", function(compressor) {
     var self = this;
     if (compressor.has_directive("use asm")) return self;
-    // Hoisting makes no sense in an arrow func
-    if (!Array.isArray(self.body)) return self;
 
     var hoist_funs = compressor.option("hoist_funs");
     var hoist_vars = compressor.option("hoist_vars");

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