terser 5.4.0 → 5.6.0

package/lib/parse.js

@@ -65,8 +65,12 @@ import {
     AST_Catch,
     AST_Chain,
     AST_ClassExpression,
+    AST_ClassPrivateProperty,
     AST_ClassProperty,
     AST_ConciseMethod,
+    AST_PrivateGetter,
+    AST_PrivateMethod,
+    AST_PrivateSetter,
     AST_Conditional,
     AST_Const,
     AST_Continue,
@@ -80,6 +84,7 @@ import {
     AST_Directive,
     AST_Do,
     AST_Dot,
+    AST_DotHash,
     AST_EmptyStatement,
     AST_Expansion,
     AST_Export,
@@ -315,12 +320,14 @@ function is_identifier_char(ch) {
     return UNICODE.ID_Continue.test(ch);
 }
 
+const BASIC_IDENT = /^[a-z_$][a-z0-9_$]*$/i;
+
 function is_basic_identifier_string(str) {
-    return /^[a-z_$][a-z0-9_$]*$/i.test(str);
+    return BASIC_IDENT.test(str);
 }
 
 function is_identifier_string(str, allow_surrogates) {
-    if (/^[a-z_$][a-z0-9_$]*$/i.test(str)) {
+    if (BASIC_IDENT.test(str)) {
         return true;
     }
     if (!allow_surrogates && /[\ud800-\udfff]/.test(str)) {
@@ -866,6 +873,11 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             : token("keyword", word);
     }
 
+    function read_private_word() {
+        next();
+        return token("privatename", read_name());
+    }
+
     function with_eof_error(eof_error, cont) {
         return function(x) {
             try {
@@ -935,6 +947,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             if (PUNC_CHARS.has(ch)) return token("punc", next());
             if (OPERATOR_CHARS.has(ch)) return read_operator();
             if (code == 92 || is_identifier_start(ch)) return read_word();
+            if (code == 35) return read_private_word();
             break;
         }
         parse_error("Unexpected character '" + ch + "'");
@@ -1135,6 +1148,13 @@ function parse($TEXT, options) {
         return S.in_async === S.in_function;
     }
 
+    function can_await() {
+        return (
+            S.in_async === S.in_function
+            || S.in_function === 0 && S.input.has_directive("use strict")
+        );
+    }
+
     function semicolon(optional) {
         if (is("punc", ";")) next();
         else if (!optional && !can_insert_semicolon()) unexpected();
@@ -1419,7 +1439,7 @@ function parse($TEXT, options) {
         var for_await_error = "`for await` invalid in this context";
         var await_tok = S.token;
         if (await_tok.type == "name" && await_tok.value == "await") {
-            if (!is_in_async()) {
+            if (!can_await()) {
                 token_error(await_tok, for_await_error);
             }
             next();
@@ -1916,7 +1936,7 @@ function parse($TEXT, options) {
 
     function _await_expression() {
         // Previous token must be "await" and not be interpreted as an identifier
-        if (!is_in_async()) {
+        if (!can_await()) {
             croak("Unexpected await expression outside async function",
                 S.prev.line, S.prev.col, S.prev.pos);
         }
@@ -2536,6 +2556,7 @@ function parse($TEXT, options) {
             }
             return name;
         };
+        var privatename = start.type == "privatename";
         var is_async = false;
         var is_static = false;
         var is_generator = false;
@@ -2543,16 +2564,19 @@ function parse($TEXT, options) {
         if (is_class && name === "static" && !is("punc", "(")) {
             is_static = true;
             property_token = S.token;
+            privatename = property_token.type == "privatename";
             name = as_property_name();
         }
         if (name === "async" && !is("punc", "(") && !is("punc", ",") && !is("punc", "}") && !is("operator", "=")) {
             is_async = true;
             property_token = S.token;
+            privatename = property_token.type == "privatename";
             name = as_property_name();
         }
         if (name === null) {
             is_generator = true;
             property_token = S.token;
+            privatename = property_token.type == "privatename";
             name = as_property_name();
             if (name === null) {
                 unexpected();
@@ -2560,7 +2584,10 @@ function parse($TEXT, options) {
         }
         if (is("punc", "(")) {
             name = get_method_name_ast(name, start);
-            var node = new AST_ConciseMethod({
+            const AST_MethodVariant = privatename
+                ? AST_PrivateMethod
+                : AST_ConciseMethod;
+            var node = new AST_MethodVariant({
                 start       : start,
                 static      : is_static,
                 is_generator: is_generator,
@@ -2574,6 +2601,23 @@ function parse($TEXT, options) {
             return node;
         }
         const setter_token = S.token;
+        if ((name === "get" || name === "set") && setter_token.type === "privatename") {
+            next();
+
+            const AST_AccessorVariant =
+                name === "get"
+                    ? AST_PrivateGetter
+                    : AST_PrivateSetter;
+
+            return new AST_AccessorVariant({
+                start,
+                static: is_static,
+                key: get_method_name_ast(setter_token.value, start),
+                value: create_accessor(),
+                end: prev(),
+            });
+        }
+
         if (name == "get") {
             if (!is("punc") || is("punc", "[")) {
                 name = get_method_name_ast(as_property_name(), start);
@@ -2606,9 +2650,12 @@ function parse($TEXT, options) {
             const quote = key instanceof AST_SymbolClassProperty
                 ? property_token.quote
                 : undefined;
+            const AST_ClassPropertyVariant = privatename
+                ? AST_ClassPrivateProperty
+                : AST_ClassProperty;
             if (is("operator", "=")) {
                 next();
-                return new AST_ClassProperty({
+                return new AST_ClassPropertyVariant({
                     start,
                     static: is_static,
                     quote,
@@ -2616,8 +2663,14 @@ function parse($TEXT, options) {
                     value: expression(false),
                     end: prev()
                 });
-            } else if (is("name") || is("punc", ";") || is("punc", "}")) {
-                return new AST_ClassProperty({
+            } else if (
+                is("name")
+                || is("privatename")
+                || is("operator", "*")
+                || is("punc", ";")
+                || is("punc", "}")
+            ) {
+                return new AST_ClassPropertyVariant({
                     start,
                     static: is_static,
                     quote,
@@ -2856,6 +2909,7 @@ function parse($TEXT, options) {
             }
             /* falls through */
           case "name":
+          case "privatename":
           case "string":
           case "num":
           case "big_int":
@@ -2870,7 +2924,7 @@ function parse($TEXT, options) {
 
     function as_name() {
         var tmp = S.token;
-        if (tmp.type != "name") unexpected();
+        if (tmp.type != "name" && tmp.type != "privatename") unexpected();
         next();
         return tmp.value;
     }
@@ -2941,7 +2995,8 @@ function parse($TEXT, options) {
         var start = expr.start;
         if (is("punc", ".")) {
             next();
-            return subscripts(new AST_Dot({
+            const AST_DotVariant = is("privatename") ? AST_DotHash : AST_Dot;
+            return subscripts(new AST_DotVariant({
                 start      : start,
                 expression : expr,
                 optional   : false,
@@ -2992,8 +3047,9 @@ function parse($TEXT, options) {
                 annotate(call);
 
                 chain_contents = subscripts(call, true, true);
-            } else if (is("name")) {
-                chain_contents = subscripts(new AST_Dot({
+            } else if (is("name") || is("privatename")) {
+                const AST_DotVariant = is("privatename") ? AST_DotHash : AST_Dot;
+                chain_contents = subscripts(new AST_DotVariant({
                     start,
                     expression: expr,
                     optional: true,
@@ -3064,13 +3120,9 @@ function parse($TEXT, options) {
 
     var maybe_unary = function(allow_calls, allow_arrows) {
         var start = S.token;
-        if (start.type == "name" && start.value == "await") {
-            if (is_in_async()) {
-                next();
-                return _await_expression();
-            } else if (S.input.has_directive("use strict")) {
-                token_error(S.token, "Unexpected await identifier inside strict mode");
-            }
+        if (start.type == "name" && start.value == "await" && can_await()) {
+            next();
+            return _await_expression();
         }
         if (is("operator") && UNARY_PREFIX.has(start.value)) {
             next();

package/lib/propmangle.js

@@ -52,10 +52,13 @@ import { base54 } from "./scope.js";
 import {
     AST_Binary,
     AST_Call,
+    AST_ClassPrivateProperty,
     AST_Conditional,
     AST_Dot,
+    AST_DotHash,
     AST_ObjectKeyVal,
     AST_ObjectProperty,
+    AST_PrivateMethod,
     AST_Sequence,
     AST_String,
     AST_Sub,
@@ -155,7 +158,10 @@ function mangle_properties(ast, options) {
     if (!options.builtins) find_builtins(reserved);
 
     var cname = -1;
+    var cprivate = -1;
+
     var cache;
+    var private_cache = new Map();
     if (options.cache) {
         cache = options.cache.props;
         cache.forEach(function(mangled_name) {
@@ -178,12 +184,20 @@ function mangle_properties(ast, options) {
 
     var names_to_mangle = new Set();
     var unmangleable = new Set();
+    var private_properties = new Set();
 
     var keep_quoted_strict = options.keep_quoted === "strict";
 
     // step 1: find candidates to mangle
     ast.walk(new TreeWalker(function(node) {
-        if (node instanceof AST_ObjectKeyVal) {
+        if (
+            node instanceof AST_ClassPrivateProperty
+            || node instanceof AST_PrivateMethod
+        ) {
+            private_properties.add(node.key.name);
+        } else if (node instanceof AST_DotHash) {
+            private_properties.add(node.property);
+        } else if (node instanceof AST_ObjectKeyVal) {
             if (typeof node.key == "string" &&
                 (!keep_quoted_strict || !node.quote)) {
                 add(node.key);
@@ -220,7 +234,14 @@ function mangle_properties(ast, options) {
 
     // step 2: transform the tree, renaming properties
     return ast.transform(new TreeTransformer(function(node) {
-        if (node instanceof AST_ObjectKeyVal) {
+        if (
+            node instanceof AST_ClassPrivateProperty
+            || node instanceof AST_PrivateMethod
+        ) {
+            node.key.name = mangle_private(node.key.name);
+        } else if (node instanceof AST_DotHash) {
+            node.property = mangle_private(node.property);
+        } else if (node instanceof AST_ObjectKeyVal) {
             if (typeof node.key == "string" &&
                 (!keep_quoted_strict || !node.quote)) {
                 node.key = mangle(node.key);
@@ -300,6 +321,16 @@ function mangle_properties(ast, options) {
         return mangled;
     }
 
+    function mangle_private(name) {
+        let mangled = private_cache.get(name);
+        if (!mangled) {
+            mangled = base54(++cprivate);
+            private_cache.set(name, mangled);
+        }
+
+        return mangled;
+    }
+
     function mangleStrings(node) {
         return node.transform(new TreeTransformer(function(node) {
             if (node instanceof AST_Sequence) {

package/lib/scope.js

@@ -65,6 +65,7 @@ import {
     AST_Defun,
     AST_Destructuring,
     AST_Dot,
+    AST_DotHash,
     AST_Export,
     AST_For,
     AST_ForIn,
@@ -919,7 +920,9 @@ AST_Toplevel.DEFMETHOD("compute_char_frequency", function(options) {
             if (this instanceof AST_Symbol && !this.unmangleable(options)) {
                 base54.consider(this.name, -1);
             } else if (options.properties) {
-                if (this instanceof AST_Dot) {
+                if (this instanceof AST_DotHash) {
+                    base54.consider("#" + this.property, -1);
+                } else if (this instanceof AST_Dot) {
                     base54.consider(this.property, -1);
                 } else if (this instanceof AST_Sub) {
                     skip_string(this.property);

package/lib/size.js

@@ -10,6 +10,7 @@ import {
     AST_Call,
     AST_Case,
     AST_Class,
+    AST_ClassPrivateProperty,
     AST_ClassProperty,
     AST_ConciseMethod,
     AST_Conditional,
@@ -22,6 +23,7 @@ import {
     AST_Directive,
     AST_Do,
     AST_Dot,
+    AST_DotHash,
     AST_EmptyStatement,
     AST_Expansion,
     AST_Export,
@@ -47,6 +49,9 @@ import {
     AST_ObjectKeyVal,
     AST_ObjectGetter,
     AST_ObjectSetter,
+    AST_PrivateGetter,
+    AST_PrivateMethod,
+    AST_PrivateSetter,
     AST_RegExp,
     AST_Return,
     AST_Sequence,
@@ -302,6 +307,13 @@ AST_Dot.prototype._size = function () {
     return this.property.length + 1;
 };
 
+AST_DotHash.prototype._size = function () {
+    if (this.optional) {
+        return this.property.length + 3;
+    }
+    return this.property.length + 2;
+};
+
 AST_Sub.prototype._size = function () {
     return this.optional ? 4 : 2;
 };
@@ -369,6 +381,14 @@ AST_ConciseMethod.prototype._size = function () {
     return static_size(this.static) + key_size(this.key) + lambda_modifiers(this);
 };
 
+AST_PrivateMethod.prototype._size = function () {
+    return AST_ConciseMethod.prototype._size.call(this) + 1;
+};
+
+AST_PrivateGetter.prototype._size = AST_PrivateSetter.prototype._size = function () {
+    return AST_ConciseMethod.prototype._size.call(this) + 4;
+};
+
 AST_Class.prototype._size = function () {
     return (
         (this.name ? 8 : 7)
@@ -384,6 +404,10 @@ AST_ClassProperty.prototype._size = function () {
     );
 };
 
+AST_ClassPrivateProperty.prototype._size = function () {
+    return AST_ClassProperty.prototype._size.call(this) + 1;
+};
+
 AST_Symbol.prototype._size = function () {
     return !mangle_options || this.definition().unmangleable(mangle_options)
         ? this.name.length

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.4.0",
+  "version": "5.6.0",
   "engines": {
     "node": ">=10"
   },
@@ -48,16 +48,16 @@
   },
   "devDependencies": {
     "@ls-lint/ls-lint": "^1.9.2",
-    "acorn": "^7.4.0",
-    "astring": "^1.4.1",
-    "eslint": "^7.0.0",
+    "acorn": "^8.0.5",
+    "astring": "^1.6.2",
+    "eslint": "^7.19.0",
     "eslump": "^2.0.0",
     "esm": "^3.2.25",
-    "mocha": "^8.0.0",
+    "mocha": "^8.2.1",
     "pre-commit": "^1.2.2",
-    "rimraf": "^3.0.0",
-    "rollup": "2.0.6",
-    "semver": "^7.1.3"
+    "rimraf": "^3.0.2",
+    "rollup": "2.38.4",
+    "semver": "^7.3.4"
   },
   "scripts": {
     "test": "node test/compress.js && mocha test/mocha",

package/tools/terser.d.ts

@@ -96,6 +96,7 @@ export interface ManglePropertiesOptions {
 
 export interface FormatOptions {
     ascii_only?: boolean;
+    /** @deprecated Not implemented anymore */
     beautify?: boolean;
     braces?: boolean;
     comments?: boolean | 'all' | 'some' | RegExp | ( (node: any, comment: {