terser 5.18.1 → 5.19.0

package/CHANGELOG.md

@@ -1,9 +1,15 @@
 # Changelog
 
-## v7.18.1
+## 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.
+
+## v5.18.1
  - Fix major performance issue caused by hoisted defuns' scopes bugfix.
 
-## v7.18.0
+## v5.18.0
  - Add new `/*@__MANGLE_PROP__*/` annotation, to mark properties that should be mangled.
 
 ## v5.17.7

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;
     }
@@ -16013,23 +16015,25 @@ function handle_defined_after_hoist(parent) {
 
             // find the index in `found_symbols`, with some special rules:
             const find = (sym_id, starting_at = 0, must_be_write = false) => {
-                const index = found_symbols.indexOf(sym_id, starting_at);
+                let index = starting_at;
 
-                if (
-                    defun_range
-                    && index >= defun_range.start
-                    && index < defun_range.end
-                ) {
-                    return find(sym_id, defun_range.end, must_be_write);
-                } else if (
-                    must_be_write
-                    && index >= 0
-                    && !found_symbol_writes.has(index)
-                ) {
-                    return find(sym_id, index + 1, must_be_write);
-                } else {
-                    return index;
+                for (;;) {
+                    index = found_symbols.indexOf(sym_id, index);
+
+                    if (index === -1) {
+                        break;
+                    } else if (index >= defun_range.start && index < defun_range.end) {
+                        index = defun_range.end;
+                        continue;
+                    } else if (must_be_write && !found_symbol_writes.has(index)) {
+                        index++;
+                        continue;
+                    } else {
+                        break;
+                    }
                 }
+
+                return index;
             };
 
             const read_defun_at = find(fname_def.id);
@@ -29870,7 +29874,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,
@@ -29912,7 +29947,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
@@ -29921,36 +29955,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
@@ -30042,9 +30047,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)
@@ -30323,6 +30328,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);
     }
@@ -30350,7 +30359,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/reduce-vars.js

@@ -592,23 +592,25 @@ function handle_defined_after_hoist(parent) {
 
             // find the index in `found_symbols`, with some special rules:
             const find = (sym_id, starting_at = 0, must_be_write = false) => {
-                const index = found_symbols.indexOf(sym_id, starting_at);
-
-                if (
-                    defun_range
-                    && index >= defun_range.start
-                    && index < defun_range.end
-                ) {
-                    return find(sym_id, defun_range.end, must_be_write);
-                } else if (
-                    must_be_write
-                    && index >= 0
-                    && !found_symbol_writes.has(index)
-                ) {
-                    return find(sym_id, index + 1, must_be_write);
-                } else {
-                    return index;
+                let index = starting_at;
+
+                for (;;) {
+                    index = found_symbols.indexOf(sym_id, index);
+
+                    if (index === -1) {
+                        break;
+                    } else if (index >= defun_range.start && index < defun_range.end) {
+                        index = defun_range.end;
+                        continue;
+                    } else if (must_be_write && !found_symbol_writes.has(index)) {
+                        index++;
+                        continue;
+                    } else {
+                        break;
+                    }
                 }
+
+                return index;
             };
 
             const read_defun_at = find(fname_def.id);

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