terser 5.18.2 → 5.19.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v5.19.1
+ - Better avoid outputting `</script>` and HTML comments.
+ - Fix unused variables in class static blocks not being dropped correctly.
+ - Fix sourcemap names of methods that are `async` or `static`
+
+## v5.19.0
+ - Allow `/*@__MANGLE_PROP__*/` annotation in `object.property`, in addition to property declarations.
+
 ## v5.18.2
  - Stop using recursion in hoisted defuns fix.
 

package/dist/bundle.min.js

@@ -3283,25 +3283,25 @@ function parse($TEXT, options) {
             if(is("privatename") && !S.in_class) 
                 croak("Private field must be used in an enclosing class");
             const AST_DotVariant = is("privatename") ? AST_DotHash : AST_Dot;
-            return subscripts(new AST_DotVariant({
+            return annotate(subscripts(new AST_DotVariant({
                 start      : start,
                 expression : expr,
                 optional   : false,
                 property   : as_name(),
                 end        : prev()
-            }), allow_calls, is_chain);
+            }), allow_calls, is_chain));
         }
         if (is("punc", "[")) {
             next();
             var prop = expression(true);
             expect("]");
-            return subscripts(new AST_Sub({
+            return annotate(subscripts(new AST_Sub({
                 start      : start,
                 expression : expr,
                 optional   : false,
                 property   : prop,
                 end        : prev()
-            }), allow_calls, is_chain);
+            }), allow_calls, is_chain));
         }
         if (allow_calls && is("punc", "(")) {
             next();
@@ -3338,24 +3338,24 @@ function parse($TEXT, options) {
                 if(is("privatename") && !S.in_class) 
                     croak("Private field must be used in an enclosing class");
                 const AST_DotVariant = is("privatename") ? AST_DotHash : AST_Dot;
-                chain_contents = subscripts(new AST_DotVariant({
+                chain_contents = annotate(subscripts(new AST_DotVariant({
                     start,
                     expression: expr,
                     optional: true,
                     property: as_name(),
                     end: prev()
-                }), allow_calls, true);
+                }), allow_calls, true));
             } else if (is("punc", "[")) {
                 next();
                 const property = expression(true);
                 expect("]");
-                chain_contents = subscripts(new AST_Sub({
+                chain_contents = annotate(subscripts(new AST_Sub({
                     start,
                     expression: expr,
                     optional: true,
                     property,
                     end: prev()
-                }), allow_calls, true);
+                }), allow_calls, true));
             }
 
             if (!chain_contents) unexpected();
@@ -5333,6 +5333,7 @@ var AST_Dot = DEFNODE("Dot", "quote", function AST_Dot(props) {
         this.expression = props.expression;
         this.property = props.property;
         this.optional = props.optional;
+        this._annotations = props._annotations;
         this.start = props.start;
         this.end = props.end;
     }
@@ -5380,6 +5381,7 @@ var AST_Sub = DEFNODE("Sub", null, function AST_Sub(props) {
         this.expression = props.expression;
         this.property = props.property;
         this.optional = props.optional;
+        this._annotations = props._annotations;
         this.start = props.start;
         this.end = props.end;
     }
@@ -8952,6 +8954,18 @@ class Rope {
         this.current += str;
     }
 
+    endsWith(str) {
+        const { committed, current } = this;
+        const len = str.length;
+        if (committed.length >= len) {
+            return committed.slice(committed.length - str.length) === str;
+        } else {
+            // `str` is small and this is a rare case so keep it simple
+            const last_bit = committed.slice(-len) + current;
+            return last_bit.endsWith(str);
+        }
+    }
+
     insertAt(char, index) {
         const { committed, current } = this;
         if (index < committed.length) {
@@ -9160,10 +9174,12 @@ function OutputStream(options) {
         mappings.forEach(function(mapping) {
             try {
                 let { name, token } = mapping;
-                if (token.type == "name" || token.type === "privatename") {
-                    name = token.value;
-                } else if (name instanceof AST_Symbol) {
-                    name = token.type === "string" ? token.value : name.name;
+                if (name !== false) {
+                    if (token.type == "name" || token.type === "privatename") {
+                        name = token.value;
+                    } else if (name instanceof AST_Symbol) {
+                        name = token.type === "string" ? token.value : name.name;
+                    }
                 }
                 options.source_map.add(
                     mapping.token.file,
@@ -9331,6 +9347,10 @@ function OutputStream(options) {
         might_need_semicolon = true;
     };
 
+    function ends_with(str) {
+        return OUTPUT.endsWith(str);
+    }
+
     function force_semicolon() {
         might_need_semicolon = false;
         print(";");
@@ -9600,6 +9620,7 @@ function OutputStream(options) {
         comma           : comma,
         colon           : colon,
         last            : function() { return last; },
+        ends_with       : ends_with,
         semicolon       : semicolon,
         force_semicolon : force_semicolon,
         to_utf8         : to_utf8,
@@ -10723,6 +10744,9 @@ function OutputStream(options) {
     });
     DEFPRINT(AST_UnaryPrefix, function(self, output) {
         var op = self.operator;
+        if (op === "--" && output.ends_with("<!")) {
+            output.print(" ");
+        }
         output.print(op);
         if (/^[a-z]/i.test(op)
             || (/[+-]$/.test(op)
@@ -10740,8 +10764,7 @@ function OutputStream(options) {
         var op = self.operator;
         self.left.print(output);
         if (op[0] == ">" /* ">>" ">>>" ">" ">=" */
-            && self.left instanceof AST_UnaryPostfix
-            && self.left.operator == "--") {
+            && output.ends_with("--")) {
             // space is mandatory to avoid outputting -->
             output.print(" ");
         } else {
@@ -10749,17 +10772,7 @@ function OutputStream(options) {
             output.space();
         }
         output.print(op);
-        if ((op == "<" || op == "<<")
-            && self.right instanceof AST_UnaryPrefix
-            && self.right.operator == "!"
-            && self.right.expression instanceof AST_UnaryPrefix
-            && self.right.expression.operator == "--") {
-            // space is mandatory to avoid outputting <!--
-            output.print(" ");
-        } else {
-            // the space is optional depending on "beautify"
-            output.space();
-        }
+        output.space();
         self.right.print(output);
     });
     DEFPRINT(AST_Conditional, function(self, output) {
@@ -10972,6 +10985,7 @@ function OutputStream(options) {
         if (self.key instanceof AST_SymbolMethod) {
             if (is_private) output.print("#");
             print_property_name(self.key.name, self.quote, output);
+            self.key.add_source_map(output);
         } else {
             output.with_square(function() {
                 self.key.print(output);
@@ -11060,12 +11074,18 @@ function OutputStream(options) {
     });
 
     const r_slash_script = /(<\s*\/\s*script)/i;
+    const r_starts_with_script = /^\s*script/i;
     const slash_script_replace = (_, $1) => $1.replace("/", "\\/");
     DEFPRINT(AST_RegExp, function(self, output) {
         let { source, flags } = self.getValue();
         source = regexp_source_fix(source);
         flags = flags ? sort_regexp_flags(flags) : "";
+
+        // Avoid outputting end of script tag
         source = source.replace(r_slash_script, slash_script_replace);
+        if (r_starts_with_script.test(source) && output.ends_with("<")) {
+            output.print(" ");
+        }
 
         output.print(output.to_utf8(`/${source}/${flags}`, false, true));
 
@@ -11189,8 +11209,22 @@ function OutputStream(options) {
         AST_ObjectSetter,
         AST_PrivateGetter,
         AST_PrivateSetter,
+        AST_ConciseMethod,
+        AST_PrivateMethod,
+    ], function(output) {
+        output.add_mapping(this.start, false /*name handled below*/);
+    });
+
+    DEFMAP([
+        AST_SymbolMethod,
+        AST_SymbolPrivateProperty
     ], function(output) {
-        output.add_mapping(this.key.end, this.key.name);
+        const tok_type = this.end && this.end.type;
+        if (tok_type === "name" || tok_type === "privatename") {
+            output.add_mapping(this.end, this.name);
+        } else {
+            output.add_mapping(this.end);
+        }
     });
 
     DEFMAP([ AST_ObjectProperty ], function(output) {
@@ -15279,21 +15313,24 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                     }
                 }
             }
-            if ((node instanceof AST_Defun || node instanceof AST_DefClass) && node !== self) {
+            if (node instanceof AST_DefClass && node !== self) {
+                const def = node.name.definition();
+                descend(node, this);
+                const keep_class = def.global && !drop_funcs || in_use_ids.has(def.id);
+                if (!keep_class) {
+                    const kept = node.drop_side_effect_free(compressor);
+                    if (kept == null) {
+                        def.eliminated++;
+                        return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
+                    }
+                    return kept;
+                }
+                return node;
+            }
+            if (node instanceof AST_Defun && node !== self) {
                 const def = node.name.definition();
                 const keep = def.global && !drop_funcs || in_use_ids.has(def.id);
                 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);
                 }
@@ -29872,7 +29909,38 @@ function mangle_private_properties(ast, options) {
     }
 }
 
-function mangle_properties(ast, options) {
+function find_annotated_props(ast) {
+    var annotated_props = new Set();
+    walk(ast, node => {
+        if (
+            node instanceof AST_ClassPrivateProperty
+            || node instanceof AST_PrivateMethod
+            || node instanceof AST_PrivateGetter
+            || node instanceof AST_PrivateSetter
+            || node instanceof AST_DotHash
+        ) ; else if (node instanceof AST_ObjectKeyVal) {
+            if (typeof node.key == "string" && has_annotation(node, _MANGLEPROP)) {
+                annotated_props.add(node.key);
+            }
+        } else if (node instanceof AST_ObjectProperty) {
+            // setter or getter, since KeyVal is handled above
+            if (has_annotation(node, _MANGLEPROP)) {
+                annotated_props.add(node.key.name);
+            }
+        } else if (node instanceof AST_Dot) {
+            if (has_annotation(node, _MANGLEPROP)) {
+                annotated_props.add(node.property);
+            }
+        } else if (node instanceof AST_Sub) {
+            if (node.property instanceof AST_String && has_annotation(node, _MANGLEPROP)) {
+                annotated_props.add(node.property.value);
+            }
+        }
+    });
+    return annotated_props;
+}
+
+function mangle_properties(ast, options, annotated_props = find_annotated_props(ast)) {
     options = defaults(options, {
         builtins: false,
         cache: null,
@@ -29914,7 +29982,6 @@ function mangle_properties(ast, options) {
         debug_name_suffix = (options.debug === true ? "" : options.debug);
     }
 
-    var annotated_names = new Set();
     var names_to_mangle = new Set();
     var unmangleable = new Set();
     // Track each already-mangled name to prevent nth_identifier from generating
@@ -29923,36 +29990,7 @@ function mangle_properties(ast, options) {
 
     var keep_quoted = !!options.keep_quoted;
 
-    // Step 1: Find all annotated /*@__MANGLEPROP__*/
-    walk(ast, node => {
-        if (
-            node instanceof AST_ClassPrivateProperty
-            || node instanceof AST_PrivateMethod
-            || node instanceof AST_PrivateGetter
-            || node instanceof AST_PrivateSetter
-            || node instanceof AST_DotHash
-        ) ; else if (node instanceof AST_ObjectKeyVal) {
-            if (
-                typeof node.key == "string"
-                && has_annotation(node, _MANGLEPROP)
-                && can_mangle(node.key)
-            ) {
-                annotated_names.add(node.key);
-                clear_annotation(node, _MANGLEPROP);
-            }
-        } else if (node instanceof AST_ObjectProperty) {
-            // setter or getter, since KeyVal is handled above
-            if (
-                has_annotation(node, _MANGLEPROP)
-                && can_mangle(node.key.name)
-            ) {
-                annotated_names.add(node.key.name);
-                clear_annotation(node, _MANGLEPROP);
-            }
-        }
-    });
-
-    // step 2: find candidates to mangle
+    // step 1: find candidates to mangle
     ast.walk(new TreeWalker(function(node) {
         if (
             node instanceof AST_ClassPrivateProperty
@@ -30044,9 +30082,9 @@ function mangle_properties(ast, options) {
     }
 
     function should_mangle(name) {
-        if (only_annotated && !annotated_names.has(name)) return false;
+        if (only_annotated && !annotated_props.has(name)) return false;
         if (regex && !regex.test(name)) {
-            return annotated_names.has(name);
+            return annotated_props.has(name);
         }
         if (reserved.has(name)) return false;
         return cache.has(name)
@@ -30325,6 +30363,10 @@ async function minify(files, options, _fs_module) {
     if (quoted_props && options.mangle.properties.keep_quoted !== "strict") {
         reserve_quoted_keys(toplevel, quoted_props);
     }
+    var annotated_props;
+    if (options.mangle && options.mangle.properties) {
+        annotated_props = find_annotated_props(toplevel);
+    }
     if (options.wrap) {
         toplevel = toplevel.wrap_commonjs(options.wrap);
     }
@@ -30352,7 +30394,7 @@ async function minify(files, options, _fs_module) {
     }
     if (timings) timings.properties = Date.now();
     if (options.mangle && options.mangle.properties) {
-        toplevel = mangle_properties(toplevel, options.mangle.properties);
+        toplevel = mangle_properties(toplevel, options.mangle.properties, annotated_props);
     }
 
     // Format phase

package/lib/ast.js

@@ -1714,6 +1714,7 @@ var AST_Dot = DEFNODE("Dot", "quote", function AST_Dot(props) {
         this.expression = props.expression;
         this.property = props.property;
         this.optional = props.optional;
+        this._annotations = props._annotations;
         this.start = props.start;
         this.end = props.end;
     }
@@ -1761,6 +1762,7 @@ var AST_Sub = DEFNODE("Sub", null, function AST_Sub(props) {
         this.expression = props.expression;
         this.property = props.property;
         this.optional = props.optional;
+        this._annotations = props._annotations;
         this.start = props.start;
         this.end = props.end;
     }

package/lib/compress/drop-unused.js

@@ -273,21 +273,24 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                     }
                 }
             }
-            if ((node instanceof AST_Defun || node instanceof AST_DefClass) && node !== self) {
+            if (node instanceof AST_DefClass && node !== self) {
+                const def = node.name.definition();
+                descend(node, this);
+                const keep_class = def.global && !drop_funcs || in_use_ids.has(def.id);
+                if (!keep_class) {
+                    const kept = node.drop_side_effect_free(compressor);
+                    if (kept == null) {
+                        def.eliminated++;
+                        return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
+                    }
+                    return kept;
+                }
+                return node;
+            }
+            if (node instanceof AST_Defun && node !== self) {
                 const def = node.name.definition();
                 const keep = def.global && !drop_funcs || in_use_ids.has(def.id);
                 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);
                 }

package/lib/minify.js

@@ -17,6 +17,7 @@ import {
     mangle_properties,
     mangle_private_properties,
     reserve_quoted_keys,
+    find_annotated_props,
 } from "./propmangle.js";
 
 // to/from base64 functions
@@ -235,6 +236,10 @@ async function minify(files, options, _fs_module) {
     if (quoted_props && options.mangle.properties.keep_quoted !== "strict") {
         reserve_quoted_keys(toplevel, quoted_props);
     }
+    var annotated_props;
+    if (options.mangle && options.mangle.properties) {
+        annotated_props = find_annotated_props(toplevel);
+    }
     if (options.wrap) {
         toplevel = toplevel.wrap_commonjs(options.wrap);
     }
@@ -268,7 +273,7 @@ async function minify(files, options, _fs_module) {
     }
     if (timings) timings.properties = Date.now();
     if (options.mangle && options.mangle.properties) {
-        toplevel = mangle_properties(toplevel, options.mangle.properties);
+        toplevel = mangle_properties(toplevel, options.mangle.properties, annotated_props);
     }
 
     // Format phase

package/lib/output.js

@@ -190,6 +190,18 @@ class Rope {
         this.current += str;
     }
 
+    endsWith(str) {
+        const { committed, current } = this;
+        const len = str.length;
+        if (committed.length >= len) {
+            return committed.slice(committed.length - str.length) === str;
+        } else {
+            // `str` is small and this is a rare case so keep it simple
+            const last_bit = committed.slice(-len) + current;
+            return last_bit.endsWith(str);
+        }
+    }
+
     insertAt(char, index) {
         const { committed, current } = this;
         if (index < committed.length) {
@@ -398,10 +410,12 @@ function OutputStream(options) {
         mappings.forEach(function(mapping) {
             try {
                 let { name, token } = mapping;
-                if (token.type == "name" || token.type === "privatename") {
-                    name = token.value;
-                } else if (name instanceof AST_Symbol) {
-                    name = token.type === "string" ? token.value : name.name;
+                if (name !== false) {
+                    if (token.type == "name" || token.type === "privatename") {
+                        name = token.value;
+                    } else if (name instanceof AST_Symbol) {
+                        name = token.type === "string" ? token.value : name.name;
+                    }
                 }
                 options.source_map.add(
                     mapping.token.file,
@@ -569,6 +583,10 @@ function OutputStream(options) {
         might_need_semicolon = true;
     };
 
+    function ends_with(str) {
+        return OUTPUT.endsWith(str);
+    }
+
     function force_semicolon() {
         might_need_semicolon = false;
         print(";");
@@ -838,6 +856,7 @@ function OutputStream(options) {
         comma           : comma,
         colon           : colon,
         last            : function() { return last; },
+        ends_with       : ends_with,
         semicolon       : semicolon,
         force_semicolon : force_semicolon,
         to_utf8         : to_utf8,
@@ -1961,6 +1980,9 @@ function OutputStream(options) {
     });
     DEFPRINT(AST_UnaryPrefix, function(self, output) {
         var op = self.operator;
+        if (op === "--" && output.ends_with("<!")) {
+            output.print(" ");
+        }
         output.print(op);
         if (/^[a-z]/i.test(op)
             || (/[+-]$/.test(op)
@@ -1978,8 +2000,7 @@ function OutputStream(options) {
         var op = self.operator;
         self.left.print(output);
         if (op[0] == ">" /* ">>" ">>>" ">" ">=" */
-            && self.left instanceof AST_UnaryPostfix
-            && self.left.operator == "--") {
+            && output.ends_with("--")) {
             // space is mandatory to avoid outputting -->
             output.print(" ");
         } else {
@@ -1987,17 +2008,7 @@ function OutputStream(options) {
             output.space();
         }
         output.print(op);
-        if ((op == "<" || op == "<<")
-            && self.right instanceof AST_UnaryPrefix
-            && self.right.operator == "!"
-            && self.right.expression instanceof AST_UnaryPrefix
-            && self.right.expression.operator == "--") {
-            // space is mandatory to avoid outputting <!--
-            output.print(" ");
-        } else {
-            // the space is optional depending on "beautify"
-            output.space();
-        }
+        output.space();
         self.right.print(output);
     });
     DEFPRINT(AST_Conditional, function(self, output) {
@@ -2210,6 +2221,7 @@ function OutputStream(options) {
         if (self.key instanceof AST_SymbolMethod) {
             if (is_private) output.print("#");
             print_property_name(self.key.name, self.quote, output);
+            self.key.add_source_map(output);
         } else {
             output.with_square(function() {
                 self.key.print(output);
@@ -2298,12 +2310,18 @@ function OutputStream(options) {
     });
 
     const r_slash_script = /(<\s*\/\s*script)/i;
+    const r_starts_with_script = /^\s*script/i;
     const slash_script_replace = (_, $1) => $1.replace("/", "\\/");
     DEFPRINT(AST_RegExp, function(self, output) {
         let { source, flags } = self.getValue();
         source = regexp_source_fix(source);
         flags = flags ? sort_regexp_flags(flags) : "";
+
+        // Avoid outputting end of script tag
         source = source.replace(r_slash_script, slash_script_replace);
+        if (r_starts_with_script.test(source) && output.ends_with("<")) {
+            output.print(" ");
+        }
 
         output.print(output.to_utf8(`/${source}/${flags}`, false, true));
 
@@ -2427,8 +2445,22 @@ function OutputStream(options) {
         AST_ObjectSetter,
         AST_PrivateGetter,
         AST_PrivateSetter,
+        AST_ConciseMethod,
+        AST_PrivateMethod,
     ], function(output) {
-        output.add_mapping(this.key.end, this.key.name);
+        output.add_mapping(this.start, false /*name handled below*/);
+    });
+
+    DEFMAP([
+        AST_SymbolMethod,
+        AST_SymbolPrivateProperty
+    ], function(output) {
+        const tok_type = this.end && this.end.type;
+        if (tok_type === "name" || tok_type === "privatename") {
+            output.add_mapping(this.end, this.name);
+        } else {
+            output.add_mapping(this.end);
+        }
     });
 
     DEFMAP([ AST_ObjectProperty ], function(output) {

package/lib/parse.js

@@ -3138,25 +3138,25 @@ function parse($TEXT, options) {
             if(is("privatename") && !S.in_class) 
                 croak("Private field must be used in an enclosing class");
             const AST_DotVariant = is("privatename") ? AST_DotHash : AST_Dot;
-            return subscripts(new AST_DotVariant({
+            return annotate(subscripts(new AST_DotVariant({
                 start      : start,
                 expression : expr,
                 optional   : false,
                 property   : as_name(),
                 end        : prev()
-            }), allow_calls, is_chain);
+            }), allow_calls, is_chain));
         }
         if (is("punc", "[")) {
             next();
             var prop = expression(true);
             expect("]");
-            return subscripts(new AST_Sub({
+            return annotate(subscripts(new AST_Sub({
                 start      : start,
                 expression : expr,
                 optional   : false,
                 property   : prop,
                 end        : prev()
-            }), allow_calls, is_chain);
+            }), allow_calls, is_chain));
         }
         if (allow_calls && is("punc", "(")) {
             next();
@@ -3193,24 +3193,24 @@ function parse($TEXT, options) {
                 if(is("privatename") && !S.in_class) 
                     croak("Private field must be used in an enclosing class");
                 const AST_DotVariant = is("privatename") ? AST_DotHash : AST_Dot;
-                chain_contents = subscripts(new AST_DotVariant({
+                chain_contents = annotate(subscripts(new AST_DotVariant({
                     start,
                     expression: expr,
                     optional: true,
                     property: as_name(),
                     end: prev()
-                }), allow_calls, true);
+                }), allow_calls, true));
             } else if (is("punc", "[")) {
                 next();
                 const property = expression(true);
                 expect("]");
-                chain_contents = subscripts(new AST_Sub({
+                chain_contents = annotate(subscripts(new AST_Sub({
                     start,
                     expression: expr,
                     optional: true,
                     property,
                     end: prev()
-                }), allow_calls, true);
+                }), allow_calls, true));
             }
 
             if (!chain_contents) unexpected();

package/lib/propmangle.js

@@ -180,7 +180,40 @@ function mangle_private_properties(ast, options) {
     }
 }
 
-function mangle_properties(ast, options) {
+function find_annotated_props(ast) {
+    var annotated_props = new Set();
+    walk(ast, node => {
+        if (
+            node instanceof AST_ClassPrivateProperty
+            || node instanceof AST_PrivateMethod
+            || node instanceof AST_PrivateGetter
+            || node instanceof AST_PrivateSetter
+            || node instanceof AST_DotHash
+        ) {
+            // handled by mangle_private_properties
+        } else if (node instanceof AST_ObjectKeyVal) {
+            if (typeof node.key == "string" && has_annotation(node, _MANGLEPROP)) {
+                annotated_props.add(node.key);
+            }
+        } else if (node instanceof AST_ObjectProperty) {
+            // setter or getter, since KeyVal is handled above
+            if (has_annotation(node, _MANGLEPROP)) {
+                annotated_props.add(node.key.name);
+            }
+        } else if (node instanceof AST_Dot) {
+            if (has_annotation(node, _MANGLEPROP)) {
+                annotated_props.add(node.property);
+            }
+        } else if (node instanceof AST_Sub) {
+            if (node.property instanceof AST_String && has_annotation(node, _MANGLEPROP)) {
+                annotated_props.add(node.property.value);
+            }
+        }
+    });
+    return annotated_props;
+}
+
+function mangle_properties(ast, options, annotated_props = find_annotated_props(ast)) {
     options = defaults(options, {
         builtins: false,
         cache: null,
@@ -222,7 +255,6 @@ function mangle_properties(ast, options) {
         debug_name_suffix = (options.debug === true ? "" : options.debug);
     }
 
-    var annotated_names = new Set();
     var names_to_mangle = new Set();
     var unmangleable = new Set();
     // Track each already-mangled name to prevent nth_identifier from generating
@@ -231,38 +263,7 @@ function mangle_properties(ast, options) {
 
     var keep_quoted = !!options.keep_quoted;
 
-    // Step 1: Find all annotated /*@__MANGLEPROP__*/
-    walk(ast, node => {
-        if (
-            node instanceof AST_ClassPrivateProperty
-            || node instanceof AST_PrivateMethod
-            || node instanceof AST_PrivateGetter
-            || node instanceof AST_PrivateSetter
-            || node instanceof AST_DotHash
-        ) {
-            // handled by mangle_private_properties
-        } else if (node instanceof AST_ObjectKeyVal) {
-            if (
-                typeof node.key == "string"
-                && has_annotation(node, _MANGLEPROP)
-                && can_mangle(node.key)
-            ) {
-                annotated_names.add(node.key);
-                clear_annotation(node, _MANGLEPROP);
-            }
-        } else if (node instanceof AST_ObjectProperty) {
-            // setter or getter, since KeyVal is handled above
-            if (
-                has_annotation(node, _MANGLEPROP)
-                && can_mangle(node.key.name)
-            ) {
-                annotated_names.add(node.key.name);
-                clear_annotation(node, _MANGLEPROP);
-            }
-        }
-    });
-
-    // step 2: find candidates to mangle
+    // step 1: find candidates to mangle
     ast.walk(new TreeWalker(function(node) {
         if (
             node instanceof AST_ClassPrivateProperty
@@ -358,9 +359,9 @@ function mangle_properties(ast, options) {
     }
 
     function should_mangle(name) {
-        if (only_annotated && !annotated_names.has(name)) return false;
+        if (only_annotated && !annotated_props.has(name)) return false;
         if (regex && !regex.test(name)) {
-            return annotated_names.has(name);
+            return annotated_props.has(name);
         }
         if (reserved.has(name)) return false;
         return cache.has(name)
@@ -427,4 +428,5 @@ export {
     reserve_quoted_keys,
     mangle_properties,
     mangle_private_properties,
+    find_annotated_props,
 };

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