terser 5.17.6 → 5.18.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v7.18.0
+ - Add new `/*@__MANGLE_PROP__*/` annotation, to mark properties that should be mangled.
+
+## v5.17.7
+ - Update some dependencies
+ - Add consistent sorting for `v` RegExp flag
+ - Add `inert` DOM attribute to domprops
+
 ## v5.17.6
  - Fixes to mozilla AST input and output, for class properties, private properties and static blocks
  - Fix outputting a shorthand property in quotes when safari10 and ecma=2015 options are enabled

package/README.md

@@ -106,6 +106,7 @@ a double dash to prevent input files being used as option arguments:
                                                `strict` disables quoted properties
                                                being automatically reserved.
                                 `regex`  Only mangle matched property names.
+                                `only_annotated` Only mangle properties defined with /*@__MANGLE_PROP__*/.
                                 `reserved`  List of names that should not be mangled.
     -f, --format [options]      Specify format options.
                                 `preamble`  Preamble to prepend to the output. You
@@ -1189,6 +1190,7 @@ Annotations in Terser are a way to tell it to treat a certain function call diff
  * `/*@__NOINLINE__*/` - Makes sure the called function is not inlined into the call site.
  * `/*@__PURE__*/` - Marks a function call as pure. That means, it can safely be dropped.
  * `/*@__KEY__*/` - Marks a string literal as a property to also mangle it when mangling properties.
+ * `/*@__MANGLE_PROP__*/` - Opts-in an object property (or class field) for mangling, when the property mangler is enabled.
 
 You can use either a `@` sign at the start, or a `#`.
 

package/dist/bundle.min.js

@@ -2,7 +2,7 @@
 typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@jridgewell/source-map')) :
 typeof define === 'function' && define.amd ? define(['exports', '@jridgewell/source-map'], factory) :
 (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Terser = {}, global.sourceMap));
-}(this, (function (exports, sourceMap) { 'use strict';
+})(this, (function (exports, sourceMap) { 'use strict';
 
 /***********************************************************************
 
@@ -239,7 +239,7 @@ const re_safe_regexp = /^[\\/|\0\s\w^$.[\]()]*$/;
 /** Check if the regexp is safe for Terser to create without risking a RegExp DOS */
 const regexp_is_safe = (source) => re_safe_regexp.test(source);
 
-const all_flags = "dgimsuy";
+const all_flags = "dgimsuyv";
 function sort_regexp_flags(flags) {
     const existing_flags = new Set(flags.split(""));
     let out = "";
@@ -2372,7 +2372,7 @@ function parse($TEXT, options) {
                 value : tok.value,
                 quote : tok.quote
             });
-            annotate(ret);            
+            annotate(ret);
             break;
           case "regexp":
             const [_, source, flags] = tok.value.match(/^\/(.*)\/(\w*)$/);
@@ -2684,13 +2684,14 @@ function parse($TEXT, options) {
             }
 
             // Create property
-            a.push(new AST_ObjectKeyVal({
+            const kv = new AST_ObjectKeyVal({
                 start: start,
                 quote: start.quote,
                 key: name instanceof AST_Node ? name : "" + name,
                 value: value,
                 end: prev()
-            }));
+            });
+            a.push(annotate(kv));
         }
         next();
         return new AST_Object({ properties: a });
@@ -2803,26 +2804,26 @@ function parse($TEXT, options) {
                     : AST_ObjectSetter;
 
                 name = get_symbol_ast(name);
-                return new AccessorClass({
+                return annotate(new AccessorClass({
                     start,
                     static: is_static,
                     key: name,
                     quote: name instanceof AST_SymbolMethod ? property_token.quote : undefined,
                     value: create_accessor(),
                     end: prev()
-                });
+                }));
             } else {
                 const AccessorClass = accessor_type === "get"
                     ? AST_PrivateGetter
                     : AST_PrivateSetter;
 
-                return new AccessorClass({
+                return annotate(new AccessorClass({
                     start,
                     static: is_static,
                     key: get_symbol_ast(name),
                     value: create_accessor(),
                     end: prev(),
-                });
+                }));
             }
         }
 
@@ -2842,7 +2843,7 @@ function parse($TEXT, options) {
                 value       : create_accessor(is_generator, is_async),
                 end         : prev()
             });
-            return node;
+            return annotate(node);
         }
 
         if (is_class) {
@@ -2855,14 +2856,16 @@ function parse($TEXT, options) {
                 : AST_ClassProperty;
             if (is("operator", "=")) {
                 next();
-                return new AST_ClassPropertyVariant({
-                    start,
-                    static: is_static,
-                    quote,
-                    key,
-                    value: expression(false),
-                    end: prev()
-                });
+                return annotate(
+                    new AST_ClassPropertyVariant({
+                        start,
+                        static: is_static,
+                        quote,
+                        key,
+                        value: expression(false),
+                        end: prev()
+                    })
+                );
             } else if (
                 is("name")
                 || is("privatename")
@@ -2870,13 +2873,15 @@ function parse($TEXT, options) {
                 || is("punc", ";")
                 || is("punc", "}")
             ) {
-                return new AST_ClassPropertyVariant({
-                    start,
-                    static: is_static,
-                    quote,
-                    key,
-                    end: prev()
-                });
+                return annotate(
+                    new AST_ClassPropertyVariant({
+                        start,
+                        static: is_static,
+                        quote,
+                        key,
+                        end: prev()
+                    })
+                );
             }
         }
     }
@@ -3239,10 +3244,9 @@ function parse($TEXT, options) {
     }
 
     // Annotate AST_Call, AST_Lambda or AST_New with the special comments
-    function annotate(node) {
-        var start = node.start;
-        var comments = start.comments_before;
-        const comments_outside_parens = outer_comments_before_counts.get(start);
+    function annotate(node, before_token = node.start) {
+        var comments = before_token.comments_before;
+        const comments_outside_parens = outer_comments_before_counts.get(before_token);
         var i = comments_outside_parens != null ? comments_outside_parens : comments.length;
         while (--i >= 0) {
             var comment = comments[i];
@@ -3263,8 +3267,13 @@ function parse($TEXT, options) {
                     set_annotation(node, _KEY);
                     break;
                 }
+                if (/[@#]__MANGLE_PROP__/.test(comment.value)) {
+                    set_annotation(node, _MANGLEPROP);
+                    break;
+                }
             }
         }
+        return node;
     }
 
     var subscripts = function(expr, allow_calls, is_chain) {
@@ -5623,6 +5632,7 @@ var AST_ObjectProperty = DEFNODE("ObjectProperty", "key value", function AST_Obj
         this.value = props.value;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -5652,6 +5662,7 @@ var AST_ObjectKeyVal = DEFNODE("ObjectKeyVal", "quote", function AST_ObjectKeyVa
         this.value = props.value;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -5713,6 +5724,7 @@ var AST_ObjectSetter = DEFNODE("ObjectSetter", "quote static", function AST_Obje
         this.value = props.value;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -5735,6 +5747,7 @@ var AST_ObjectGetter = DEFNODE("ObjectGetter", "quote static", function AST_Obje
         this.value = props.value;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -5762,6 +5775,7 @@ var AST_ConciseMethod = DEFNODE(
             this.value = props.value;
             this.start = props.start;
             this.end = props.end;
+            this._annotations = props._annotations;
         }
 
         this.flags = 0;
@@ -5884,6 +5898,7 @@ var AST_ClassProperty = DEFNODE("ClassProperty", "static quote", function AST_Cl
         this.value = props.value;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -6787,10 +6802,11 @@ class TreeTransformer extends TreeWalker {
     }
 }
 
-const _PURE     = 0b00000001;
-const _INLINE   = 0b00000010;
-const _NOINLINE = 0b00000100;
-const _KEY      = 0b00001000;
+const _PURE       = 0b00000001;
+const _INLINE     = 0b00000010;
+const _NOINLINE   = 0b00000100;
+const _KEY        = 0b00001000;
+const _MANGLEPROP = 0b00010000;
 
 /***********************************************************************
 
@@ -26641,6 +26657,7 @@ var domprops = [
     "indexOf",
     "indexedDB",
     "indicate",
+    "inert",
     "inertiaDestinationX",
     "inertiaDestinationY",
     "info",
@@ -29818,6 +29835,7 @@ function mangle_properties(ast, options) {
         regex: null,
         reserved: null,
         undeclared: false,
+        only_annotated: false,
     }, true);
 
     var nth_identifier = options.nth_identifier;
@@ -29836,6 +29854,7 @@ function mangle_properties(ast, options) {
         cache = new Map();
     }
 
+    var only_annotated = options.only_annotated;
     var regex = options.regex && new RegExp(options.regex);
 
     // note debug is either false (disabled), or a string of the debug suffix to use (enabled).
@@ -29847,6 +29866,7 @@ 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
@@ -29855,7 +29875,36 @@ function mangle_properties(ast, options) {
 
     var keep_quoted = !!options.keep_quoted;
 
-    // step 1: find candidates to mangle
+    // 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
     ast.walk(new TreeWalker(function(node) {
         if (
             node instanceof AST_ClassPrivateProperty
@@ -29947,15 +29996,19 @@ function mangle_properties(ast, options) {
     }
 
     function should_mangle(name) {
-        if (regex && !regex.test(name)) return false;
+        if (only_annotated && !annotated_names.has(name)) return false;
+        if (regex && !regex.test(name)) {
+            return annotated_names.has(name);
+        }
         if (reserved.has(name)) return false;
         return cache.has(name)
             || names_to_mangle.has(name);
     }
 
     function add(name) {
-        if (can_mangle(name))
+        if (can_mangle(name)) {
             names_to_mangle.add(name);
+        }
 
         if (!should_mangle(name)) {
             unmangleable.add(name);
@@ -30842,4 +30895,4 @@ exports._default_options = _default_options;
 exports._run_cli = run_cli;
 exports.minify = minify;
 
-})));
+}));

package/lib/ast.js

@@ -2013,6 +2013,7 @@ var AST_ObjectProperty = DEFNODE("ObjectProperty", "key value", function AST_Obj
         this.value = props.value;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -2042,6 +2043,7 @@ var AST_ObjectKeyVal = DEFNODE("ObjectKeyVal", "quote", function AST_ObjectKeyVa
         this.value = props.value;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -2103,6 +2105,7 @@ var AST_ObjectSetter = DEFNODE("ObjectSetter", "quote static", function AST_Obje
         this.value = props.value;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -2125,6 +2128,7 @@ var AST_ObjectGetter = DEFNODE("ObjectGetter", "quote static", function AST_Obje
         this.value = props.value;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -2152,6 +2156,7 @@ var AST_ConciseMethod = DEFNODE(
             this.value = props.value;
             this.start = props.start;
             this.end = props.end;
+            this._annotations = props._annotations;
         }
 
         this.flags = 0;
@@ -2274,6 +2279,7 @@ var AST_ClassProperty = DEFNODE("ClassProperty", "static quote", function AST_Cl
         this.value = props.value;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -3177,10 +3183,11 @@ class TreeTransformer extends TreeWalker {
     }
 }
 
-const _PURE     = 0b00000001;
-const _INLINE   = 0b00000010;
-const _NOINLINE = 0b00000100;
-const _KEY      = 0b00001000;
+const _PURE       = 0b00000001;
+const _INLINE     = 0b00000010;
+const _NOINLINE   = 0b00000100;
+const _KEY        = 0b00001000;
+const _MANGLEPROP = 0b00010000;
 
 export {
     AST_Accessor,
@@ -3326,4 +3333,5 @@ export {
     _NOINLINE,
     _PURE,
     _KEY,
+    _MANGLEPROP,
 };

package/lib/parse.js

@@ -163,7 +163,8 @@ import {
     _INLINE,
     _NOINLINE,
     _PURE,
-    _KEY
+    _KEY,
+    _MANGLEPROP,
 } from "./ast.js";
 
 var LATEST_RAW = "";  // Only used for numbers and template strings
@@ -2226,7 +2227,7 @@ function parse($TEXT, options) {
                 value : tok.value,
                 quote : tok.quote
             });
-            annotate(ret);            
+            annotate(ret);
             break;
           case "regexp":
             const [_, source, flags] = tok.value.match(/^\/(.*)\/(\w*)$/);
@@ -2538,13 +2539,14 @@ function parse($TEXT, options) {
             }
 
             // Create property
-            a.push(new AST_ObjectKeyVal({
+            const kv = new AST_ObjectKeyVal({
                 start: start,
                 quote: start.quote,
                 key: name instanceof AST_Node ? name : "" + name,
                 value: value,
                 end: prev()
-            }));
+            });
+            a.push(annotate(kv));
         }
         next();
         return new AST_Object({ properties: a });
@@ -2657,26 +2659,26 @@ function parse($TEXT, options) {
                     : AST_ObjectSetter;
 
                 name = get_symbol_ast(name);
-                return new AccessorClass({
+                return annotate(new AccessorClass({
                     start,
                     static: is_static,
                     key: name,
                     quote: name instanceof AST_SymbolMethod ? property_token.quote : undefined,
                     value: create_accessor(),
                     end: prev()
-                });
+                }));
             } else {
                 const AccessorClass = accessor_type === "get"
                     ? AST_PrivateGetter
                     : AST_PrivateSetter;
 
-                return new AccessorClass({
+                return annotate(new AccessorClass({
                     start,
                     static: is_static,
                     key: get_symbol_ast(name),
                     value: create_accessor(),
                     end: prev(),
-                });
+                }));
             }
         }
 
@@ -2696,7 +2698,7 @@ function parse($TEXT, options) {
                 value       : create_accessor(is_generator, is_async),
                 end         : prev()
             });
-            return node;
+            return annotate(node);
         }
 
         if (is_class) {
@@ -2709,14 +2711,16 @@ function parse($TEXT, options) {
                 : AST_ClassProperty;
             if (is("operator", "=")) {
                 next();
-                return new AST_ClassPropertyVariant({
-                    start,
-                    static: is_static,
-                    quote,
-                    key,
-                    value: expression(false),
-                    end: prev()
-                });
+                return annotate(
+                    new AST_ClassPropertyVariant({
+                        start,
+                        static: is_static,
+                        quote,
+                        key,
+                        value: expression(false),
+                        end: prev()
+                    })
+                );
             } else if (
                 is("name")
                 || is("privatename")
@@ -2724,13 +2728,15 @@ function parse($TEXT, options) {
                 || is("punc", ";")
                 || is("punc", "}")
             ) {
-                return new AST_ClassPropertyVariant({
-                    start,
-                    static: is_static,
-                    quote,
-                    key,
-                    end: prev()
-                });
+                return annotate(
+                    new AST_ClassPropertyVariant({
+                        start,
+                        static: is_static,
+                        quote,
+                        key,
+                        end: prev()
+                    })
+                );
             }
         }
     }
@@ -3093,10 +3099,9 @@ function parse($TEXT, options) {
     }
 
     // Annotate AST_Call, AST_Lambda or AST_New with the special comments
-    function annotate(node) {
-        var start = node.start;
-        var comments = start.comments_before;
-        const comments_outside_parens = outer_comments_before_counts.get(start);
+    function annotate(node, before_token = node.start) {
+        var comments = before_token.comments_before;
+        const comments_outside_parens = outer_comments_before_counts.get(before_token);
         var i = comments_outside_parens != null ? comments_outside_parens : comments.length;
         while (--i >= 0) {
             var comment = comments[i];
@@ -3117,8 +3122,13 @@ function parse($TEXT, options) {
                     set_annotation(node, _KEY);
                     break;
                 }
+                if (/[@#]__MANGLE_PROP__/.test(comment.value)) {
+                    set_annotation(node, _MANGLEPROP);
+                    break;
+                }
             }
         }
+        return node;
     }
 
     var subscripts = function(expr, allow_calls, is_chain) {

package/lib/propmangle.js

@@ -70,6 +70,9 @@ import {
     TreeTransformer,
     TreeWalker,
     _KEY,
+    _MANGLEPROP,
+
+    walk,
 } from "./ast.js";
 import { domprops } from "../tools/domprops.js";
 
@@ -188,6 +191,7 @@ function mangle_properties(ast, options) {
         regex: null,
         reserved: null,
         undeclared: false,
+        only_annotated: false,
     }, true);
 
     var nth_identifier = options.nth_identifier;
@@ -206,6 +210,7 @@ function mangle_properties(ast, options) {
         cache = new Map();
     }
 
+    var only_annotated = options.only_annotated;
     var regex = options.regex && new RegExp(options.regex);
 
     // note debug is either false (disabled), or a string of the debug suffix to use (enabled).
@@ -217,6 +222,7 @@ 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
@@ -225,7 +231,38 @@ function mangle_properties(ast, options) {
 
     var keep_quoted = !!options.keep_quoted;
 
-    // step 1: find candidates to mangle
+    // 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
     ast.walk(new TreeWalker(function(node) {
         if (
             node instanceof AST_ClassPrivateProperty
@@ -321,15 +358,19 @@ function mangle_properties(ast, options) {
     }
 
     function should_mangle(name) {
-        if (regex && !regex.test(name)) return false;
+        if (only_annotated && !annotated_names.has(name)) return false;
+        if (regex && !regex.test(name)) {
+            return annotated_names.has(name);
+        }
         if (reserved.has(name)) return false;
         return cache.has(name)
             || names_to_mangle.has(name);
     }
 
     function add(name) {
-        if (can_mangle(name))
+        if (can_mangle(name)) {
             names_to_mangle.add(name);
+        }
 
         if (!should_mangle(name)) {
             unmangleable.add(name);

package/lib/utils/index.js

@@ -237,7 +237,7 @@ const re_safe_regexp = /^[\\/|\0\s\w^$.[\]()]*$/;
 /** Check if the regexp is safe for Terser to create without risking a RegExp DOS */
 export const regexp_is_safe = (source) => re_safe_regexp.test(source);
 
-const all_flags = "dgimsuy";
+const all_flags = "dgimsuyv";
 function sort_regexp_flags(flags) {
     const existing_flags = new Set(flags.split(""));
     let out = "";

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.6",
+  "version": "5.18.0",
   "engines": {
     "node": ">=10"
   },
@@ -44,22 +44,21 @@
     "main.js"
   ],
   "dependencies": {
-    "@jridgewell/source-map": "^0.3.2",
-    "acorn": "^8.5.0",
+    "@jridgewell/source-map": "^0.3.3",
+    "acorn": "^8.8.2",
     "commander": "^2.20.0",
     "source-map-support": "~0.5.20"
   },
   "devDependencies": {
-    "@ls-lint/ls-lint": "^1.10.0",
-    "astring": "^1.7.5",
+    "@ls-lint/ls-lint": "^1.11.2",
+    "astring": "^1.8.5",
     "eslint": "^7.32.0",
     "eslump": "^3.0.0",
     "esm": "^3.2.25",
     "mocha": "^9.2.0",
     "pre-commit": "^1.2.2",
-    "rimraf": "^3.0.2",
-    "rollup": "2.56.3",
-    "semver": "^7.3.4",
+    "rollup": "^2.56.3",
+    "semver": "^7.5.1",
     "source-map": "~0.8.0-beta.0"
   },
   "scripts": {
@@ -69,7 +68,7 @@
     "lint": "eslint lib",
     "lint-fix": "eslint --fix lib",
     "ls-lint": "ls-lint",
-    "build": "rimraf dist/bundle* && rollup --config --silent",
+    "build": "rollup --config --silent",
     "prepare": "npm run build",
     "postversion": "echo 'Remember to update the changelog!'"
   },

package/tools/domprops.js

@@ -4768,6 +4768,7 @@ export var domprops = [
     "indexOf",
     "indexedDB",
     "indicate",
+    "inert",
     "inertiaDestinationX",
     "inertiaDestinationY",
     "info",