terser 5.16.1 → 5.17.7

package/lib/ast.js

@@ -111,6 +111,14 @@ class AST_Token {
         Object.seal(this);
     }
 
+    // Return a string summary of the token for node.js console.log
+    [Symbol.for("nodejs.util.inspect.custom")](_depth, options) {
+        const special = str => options.stylize(str, "special");
+        const quote = typeof this.value === "string" && this.value.includes("`") ? "'" : "`";
+        const value = `${quote}${this.value}${quote}`;
+        return `${special("[AST_Token")} ${value} at ${this.line}:${this.col}${special("]")}`;
+    }
+
     get nlb() {
         return has_tok_flag(this, TOK_FLAG_NLB);
     }
@@ -897,11 +905,14 @@ var AST_Destructuring = DEFNODE("Destructuring", "names is_array", function AST_
     },
     all_symbols: function() {
         var out = [];
-        this.walk(new TreeWalker(function (node) {
-            if (node instanceof AST_Symbol) {
+        walk(this, node => {
+            if (node instanceof AST_SymbolDeclaration) {
                 out.push(node);
             }
-        }));
+            if (node instanceof AST_Lambda) {
+                return true;
+            }
+        });
         return out;
     }
 });
@@ -994,6 +1005,7 @@ var AST_Jump = DEFNODE("Jump", null, function AST_Jump(props) {
     $documentation: "Base class for “jumps” (for now that's `return`, `throw`, `break` and `continue`)"
 }, AST_Statement);
 
+/** Base class for “exits” (`return` and `throw`) */
 var AST_Exit = DEFNODE("Exit", "value", function AST_Exit(props) {
     if (props) {
         this.value = props.value;
@@ -1256,12 +1268,11 @@ var AST_Case = DEFNODE("Case", "expression", function AST_Case(props) {
 
 /* -----[ EXCEPTIONS ]----- */
 
-var AST_Try = DEFNODE("Try", "bcatch bfinally", function AST_Try(props) {
+var AST_Try = DEFNODE("Try", "body bcatch bfinally", function AST_Try(props) {
     if (props) {
+        this.body = props.body;
         this.bcatch = props.bcatch;
         this.bfinally = props.bfinally;
-        this.body = props.body;
-        this.block_scope = props.block_scope;
         this.start = props.start;
         this.end = props.end;
     }
@@ -1270,12 +1281,13 @@ var AST_Try = DEFNODE("Try", "bcatch bfinally", function AST_Try(props) {
 }, {
     $documentation: "A `try` statement",
     $propdoc: {
+        body: "[AST_TryBlock] the try block",
         bcatch: "[AST_Catch?] the catch block, or null if not present",
         bfinally: "[AST_Finally?] the finally block, or null if not present"
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
-            walk_body(this, visitor);
+            this.body._walk(visitor);
             if (this.bcatch) this.bcatch._walk(visitor);
             if (this.bfinally) this.bfinally._walk(visitor);
         });
@@ -1283,9 +1295,21 @@ var AST_Try = DEFNODE("Try", "bcatch bfinally", function AST_Try(props) {
     _children_backwards(push) {
         if (this.bfinally) push(this.bfinally);
         if (this.bcatch) push(this.bcatch);
-        let i = this.body.length;
-        while (i--) push(this.body[i]);
+        push(this.body);
     },
+}, AST_Statement);
+
+var AST_TryBlock = DEFNODE("TryBlock", null, function AST_TryBlock(props) {
+    if (props) {
+        this.body = props.body;
+        this.block_scope = props.block_scope;
+        this.start = props.start;
+        this.end = props.end;
+    }
+
+    this.flags = 0;
+}, {
+    $documentation: "The `try` block of a try statement"
 }, AST_Block);
 
 var AST_Catch = DEFNODE("Catch", "argname", function AST_Catch(props) {
@@ -1419,6 +1443,13 @@ var AST_VarDef = DEFNODE("VarDef", "name value", function AST_VarDef(props) {
         if (this.value) push(this.value);
         push(this.name);
     },
+    declarations_as_names() {
+        if (this.name instanceof AST_SymbolDeclaration) {
+            return [this];
+        } else {
+            return this.name.all_symbols();
+        }
+    }
 });
 
 var AST_NameMapping = DEFNODE("NameMapping", "foreign_name name", function AST_NameMapping(props) {
@@ -2199,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) {
@@ -2315,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) {
@@ -2588,6 +2654,7 @@ var AST_SymbolImportForeign = DEFNODE("SymbolImportForeign", null, function AST_
         this.scope = props.scope;
         this.name = props.name;
         this.thedef = props.thedef;
+        this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
     }
@@ -2639,6 +2706,7 @@ var AST_SymbolExport = DEFNODE("SymbolExport", null, function AST_SymbolExport(p
         this.scope = props.scope;
         this.name = props.name;
         this.thedef = props.thedef;
+        this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
     }
@@ -2653,6 +2721,7 @@ var AST_SymbolExportForeign = DEFNODE("SymbolExportForeign", null, function AST_
         this.scope = props.scope;
         this.name = props.name;
         this.thedef = props.thedef;
+        this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
     }
@@ -2738,6 +2807,7 @@ var AST_String = DEFNODE("String", "value quote", function AST_String(props) {
         this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -3110,6 +3180,7 @@ class TreeTransformer extends TreeWalker {
 const _PURE     = 0b00000001;
 const _INLINE   = 0b00000010;
 const _NOINLINE = 0b00000100;
+const _KEY      = 0b00001000;
 
 export {
     AST_Accessor,
@@ -3231,6 +3302,7 @@ export {
     AST_Toplevel,
     AST_True,
     AST_Try,
+    AST_TryBlock,
     AST_Unary,
     AST_UnaryPostfix,
     AST_UnaryPrefix,
@@ -3253,4 +3325,5 @@ export {
     _INLINE,
     _NOINLINE,
     _PURE,
+    _KEY,
 };

package/lib/compress/common.js

@@ -46,6 +46,7 @@ import {
     AST_Arrow,
     AST_BlockStatement,
     AST_Call,
+    AST_Chain,
     AST_Class,
     AST_Const,
     AST_Constant,
@@ -226,7 +227,8 @@ export function maintain_this_binding(parent, orig, val) {
         parent instanceof AST_UnaryPrefix && parent.operator == "delete"
         || parent instanceof AST_Call && parent.expression === orig
             && (
-                val instanceof AST_PropAccess
+                val instanceof AST_Chain
+                || val instanceof AST_PropAccess
                 || val instanceof AST_SymbolRef && val.name == "eval"
             )
     ) {
@@ -241,9 +243,10 @@ export function is_func_expr(node) {
     return node instanceof AST_Arrow || node instanceof AST_Function;
 }
 
+/**
+ * Used to determine whether the node can benefit from negation.
+ * Not the case with arrow functions (you need an extra set of parens). */
 export function is_iife_call(node) {
-    // Used to determine whether the node can benefit from negation.
-    // Not the case with arrow functions (you need an extra set of parens).
     if (node.TYPE != "Call") return false;
     return node.expression instanceof AST_Function || is_iife_call(node.expression);
 }

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,22 +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;
 
-        const trimmed_prop = prop.drop_side_effect_free(compressor);
-        if (trimmed_prop)
-            with_effects.push(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) {
@@ -277,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/evaluate.js

@@ -352,6 +352,25 @@ const regexp_flags = new Set([
 def_eval(AST_PropAccess, function (compressor, depth) {
     let obj = this.expression._eval(compressor, depth + 1);
     if (obj === nullish || (this.optional && obj == null)) return nullish;
+
+    // `.length` of strings and arrays is always safe
+    if (this.property === "length") {
+        if (typeof obj === "string") {
+            return obj.length;
+        }
+
+        const is_spreadless_array =
+            obj instanceof AST_Array
+            && obj.elements.every(el => !(el instanceof AST_Expansion));
+
+        if (
+            is_spreadless_array
+            && obj.elements.every(el => !el.has_side_effects(compressor))
+        ) {
+            return obj.elements.length;
+        }
+    }
+
     if (compressor.option("unsafe")) {
         var key = this.property;
         if (key instanceof AST_Node) {
@@ -359,9 +378,9 @@ def_eval(AST_PropAccess, function (compressor, depth) {
             if (key === this.property)
                 return this;
         }
+
         var exp = this.expression;
         if (is_undeclared_ref(exp)) {
-
             var aa;
             var first_arg = exp.name === "hasOwnProperty"
                 && key === "call"