terser 5.40.0 → 5.42.0

package/lib/output.js

@@ -1811,11 +1811,11 @@ function OutputStream(options) {
             foreign_name.name;
         if (!names_are_different &&
             foreign_name.name === "*" &&
-            foreign_name.quote != self.name.quote) {
+            !!foreign_name.quote != !!self.name.quote) {
                 // export * as "*"
             names_are_different = true;
         }
-        var foreign_name_is_name = foreign_name.quote == null;
+        var foreign_name_is_name = !foreign_name.quote;
         if (names_are_different) {
             if (is_import) {
                 if (foreign_name_is_name) {
@@ -1824,7 +1824,7 @@ function OutputStream(options) {
                     output.print_string(foreign_name.name, foreign_name.quote);
                 }
             } else {
-                if (self.name.quote == null) {
+                if (!self.name.quote) {
                     self.name.print(output);
                 } else {
                     output.print_string(self.name.name, self.name.quote);
@@ -1844,7 +1844,7 @@ function OutputStream(options) {
                 }
             }
         } else {
-            if (self.name.quote == null) {
+            if (!self.name.quote) {
                 self.name.print(output);
             } else {
                 output.print_string(self.name.name, self.name.quote);
@@ -2233,7 +2233,7 @@ function OutputStream(options) {
 
         output.print("#");
         
-        print_property_name(self.key.name, self.quote, output);
+        print_property_name(self.key.name, undefined, output);
 
         if (self.value) {
             output.print("=");
@@ -2361,7 +2361,11 @@ function OutputStream(options) {
         }
     });
     DEFPRINT(AST_BigInt, function(self, output) {
-        output.print(self.getValue() + "n");
+        if (output.option("keep_numbers") && self.raw) {
+            output.print(self.raw);
+        } else {
+            output.print(self.getValue() + "n");
+        }
     });
 
     const r_slash_script = /(<\s*\/\s*script)/i;

package/lib/parse.js

@@ -108,7 +108,6 @@ import {
     AST_NameMapping,
     AST_New,
     AST_NewTarget,
-    AST_Node,
     AST_Null,
     AST_Number,
     AST_Object,
@@ -184,7 +183,6 @@ ALL_RESERVED_WORDS = makePredicate(ALL_RESERVED_WORDS);
 
 var OPERATOR_CHARS = makePredicate(characters("+-*&%=<>!?|~^"));
 
-var RE_NUM_LITERAL = /[0-9a-f]/i;
 var RE_HEX_NUMBER = /^0x[0-9a-f]+$/i;
 var RE_OCT_NUMBER = /^0[0-7]+$/;
 var RE_ES6_OCT_NUMBER = /^0o[0-7]+$/i;
@@ -549,15 +547,16 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
                 return after_e;
               case (after_e = false, 46): // .
                 return (!has_dot && !has_x && !has_e) ? (has_dot = true) : false;
-            }
-
-            if (ch === "n") {
+              case 110: // n
                 is_big_int = true;
-
                 return true;
             }
 
-            return RE_NUM_LITERAL.test(ch);
+            return (
+                code >= 48 && code <= 57 // 0-9
+                || code >= 97 && code <= 102 // a-f
+                || code >= 65 && code <= 70 // A-F
+            );
         });
         if (prefix) num = prefix + num;
 
@@ -574,7 +573,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             }
             num = num.replace(/_/g, "");
         }
-        if (num.endsWith("n")) {
+        if (is_big_int) {
             const without_n = num.slice(0, -1);
             const allow_e = RE_HEX_NUMBER.test(without_n);
             const valid = parse_js_number(without_n, allow_e);
@@ -749,7 +748,24 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         return next_token;
     });
 
-    var read_name = with_eof_error("Unterminated identifier name", function() {
+    var read_name = function () {
+        let start = S.pos, end = start - 1, ch = "c";
+
+        while (
+            (ch = S.text.charAt(++end))
+            && (ch >= "a" && ch <= "z" || ch >= "A" && ch <= "Z")
+        );
+
+        if (end > start + 1 && ch && ch !== "\\" && !is_identifier_char(ch)) {
+            S.pos += end - start;
+            S.col += end - start;
+            return S.text.slice(start, S.pos);
+        }
+
+        return read_name_hard();
+    };
+
+    var read_name_hard = with_eof_error("Unterminated identifier name", function() {
         var name = [], ch, escaped = false;
         var read_escaped_identifier_char = function() {
             escaped = true;
@@ -1573,7 +1589,7 @@ function parse($TEXT, options) {
         return new ctor({
             start : args.start,
             end   : body.end,
-            is_generator: is_generator,
+            is_generator: is_generator || is_generator_property,
             async : is_async,
             name  : name,
             argnames: args,
@@ -2201,7 +2217,12 @@ function parse($TEXT, options) {
             });
             break;
           case "big_int":
-            ret = new AST_BigInt({ start: tok, end: tok, value: tok.value });
+            ret = new AST_BigInt({
+                start: tok,
+                end: tok,
+                value: tok.value,
+                raw: LATEST_RAW,
+            });
             break;
           case "string":
             ret = new AST_String({
@@ -2465,7 +2486,7 @@ function parse($TEXT, options) {
 
             // Check property and fetch value
             if (!is("punc", ":")) {
-                var concise = concise_method_or_getset(name, start);
+                var concise = object_or_class_property(name, start);
                 if (concise) {
                     a.push(concise);
                     continue;
@@ -2500,7 +2521,7 @@ function parse($TEXT, options) {
             const kv = new AST_ObjectKeyVal({
                 start: start,
                 quote: start.quote,
-                key: name instanceof AST_Node ? name : "" + name,
+                key: name,
                 value: value,
                 end: prev()
             });
@@ -2511,7 +2532,7 @@ function parse($TEXT, options) {
     });
 
     function class_(KindOfClass, is_export_default) {
-        var start, method, class_name, extends_, a = [];
+        var start, method, class_name, extends_, properties = [];
 
         S.input.push_directives_stack(); // Push directive stack, but not scope stack
         S.input.add_directive("use strict");
@@ -2540,9 +2561,9 @@ function parse($TEXT, options) {
         while (is("punc", ";")) { next(); }  // Leading semicolons are okay in class bodies.
         while (!is("punc", "}")) {
             start = S.token;
-            method = concise_method_or_getset(as_property_name(), start, true);
+            method = object_or_class_property(as_property_name(), start, true);
             if (!method) { unexpected(); }
-            a.push(method);
+            properties.push(method);
             while (is("punc", ";")) { next(); }
         }
         // mark in class feild,
@@ -2556,19 +2577,15 @@ function parse($TEXT, options) {
             start: start,
             name: class_name,
             extends: extends_,
-            properties: a,
+            properties: properties,
             end: prev(),
         });
     }
 
-    function concise_method_or_getset(name, start, is_class) {
-        const get_symbol_ast = (name, SymbolClass = AST_SymbolMethod) => {
-            if (typeof name === "string" || typeof name === "number") {
-                return new SymbolClass({
-                    start,
-                    name: "" + name,
-                    end: prev()
-                });
+    function object_or_class_property(name, start, is_class) {
+        const get_symbol_ast = (name, SymbolClass) => {
+            if (typeof name === "string") {
+                return new SymbolClass({ start, name, end: prev() });
             } else if (name === null) {
                 unexpected();
             }
@@ -2616,7 +2633,7 @@ function parse($TEXT, options) {
                     ? AST_ObjectGetter
                     : AST_ObjectSetter;
 
-                name = get_symbol_ast(name);
+                name = get_symbol_ast(name, AST_SymbolMethod);
                 return annotate(new AccessorClass({
                     start,
                     static: is_static,
@@ -2633,7 +2650,7 @@ function parse($TEXT, options) {
                 return annotate(new AccessorClass({
                     start,
                     static: is_static,
-                    key: get_symbol_ast(name),
+                    key: get_symbol_ast(name, AST_SymbolMethod),
                     value: create_accessor(),
                     end: prev(),
                 }));
@@ -2641,7 +2658,7 @@ function parse($TEXT, options) {
         }
 
         if (is("punc", "(")) {
-            name = get_symbol_ast(name);
+            name = get_symbol_ast(name, AST_SymbolMethod);
             const AST_MethodVariant = is_private
                 ? AST_PrivateMethod
                 : AST_ConciseMethod;
@@ -2660,13 +2677,17 @@ function parse($TEXT, options) {
         }
 
         if (is_class) {
-            const key = get_symbol_ast(name, AST_SymbolClassProperty);
-            const quote = key instanceof AST_SymbolClassProperty
-                ? property_token.quote
-                : undefined;
+            const AST_SymbolVariant = is_private
+                ? AST_SymbolPrivateProperty
+                : AST_SymbolClassProperty;
             const AST_ClassPropertyVariant = is_private
                 ? AST_ClassPrivateProperty
                 : AST_ClassProperty;
+
+            const key = get_symbol_ast(name, AST_SymbolVariant);
+            const quote = key instanceof AST_SymbolClassProperty
+                ? property_token.quote
+                : undefined;
             if (is("operator", "=")) {
                 next();
                 return annotate(
@@ -2686,6 +2707,9 @@ function parse($TEXT, options) {
                 || is("operator", "*")
                 || is("punc", ";")
                 || is("punc", "}")
+                || is("string")
+                || is("num")
+                || is("big_int")
             ) {
                 return annotate(
                     new AST_ClassPropertyVariant({
@@ -2810,10 +2834,12 @@ function parse($TEXT, options) {
             } else {
                 foreign_name = make_symbol(foreign_type, S.token.quote);
             }
-        } else if (is_import) {
-            name = new type(foreign_name);
         } else {
-            foreign_name = new foreign_type(name);
+            if (is_import) {
+                name = new type(foreign_name);
+            } else {
+                foreign_name = new foreign_type(name);
+            }
         }
 
         return new AST_NameMapping({
@@ -2984,12 +3010,14 @@ function parse($TEXT, options) {
           case "name":
           case "privatename":
           case "string":
-          case "num":
-          case "big_int":
           case "keyword":
           case "atom":
             next();
             return tmp.value;
+          case "num":
+          case "big_int":
+            next();
+            return "" + tmp.value;
           default:
             unexpected(tmp);
         }

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