terser 5.3.6 → 5.5.0

package/lib/parse.js

@@ -157,6 +157,9 @@ import {
     _PURE
 } from "./ast.js";
 
+var LATEST_RAW = "";  // Only used for numbers and template strings
+var LATEST_TEMPLATE_END = true;
+
 var KEYWORDS = "break case catch class const continue debugger default delete do else export extends finally for function if in instanceof let new return switch throw try typeof var void while with";
 var KEYWORDS_ATOM = "false null true";
 var RESERVED_WORDS = "enum implements import interface package private protected public static super this " + KEYWORDS_ATOM + " " + KEYWORDS;
@@ -212,6 +215,9 @@ var OPERATORS = makePredicate([
     "=",
     "+=",
     "-=",
+    "||=",
+    "&&=",
+    "??=",
     "/=",
     "*=",
     "**=",
@@ -472,29 +478,23 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         } else if (!is_comment) {
             prev_was_dot = false;
         }
-        var ret = {
-            type    : type,
-            value   : value,
-            line    : S.tokline,
-            col     : S.tokcol,
-            pos     : S.tokpos,
-            endline : S.line,
-            endcol  : S.col,
-            endpos  : S.pos,
-            nlb     : S.newline_before,
-            file    : filename
-        };
-        if (/^(?:num|string|regexp)$/i.test(type)) {
-            ret.raw = $TEXT.substring(ret.pos, ret.endpos);
-        }
+        const line     = S.tokline;
+        const col      = S.tokcol;
+        const pos      = S.tokpos;
+        const nlb      = S.newline_before;
+        const file     = filename;
+        let comments_before = [];
+        let comments_after  = [];
+
         if (!is_comment) {
-            ret.comments_before = S.comments_before;
-            ret.comments_after = S.comments_before = [];
+            comments_before = S.comments_before;
+            comments_after = S.comments_before = [];
         }
         S.newline_before = false;
-        ret = new AST_Token(ret);
-        if (!is_comment) previous_token = ret;
-        return ret;
+        const tok = new AST_Token(type, value, line, col, pos, nlb, comments_before, comments_after, file);
+
+        if (!is_comment) previous_token = tok;
+        return tok;
     }
 
     function skip_whitespace() {
@@ -546,6 +546,9 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             return RE_NUM_LITERAL.test(ch);
         });
         if (prefix) num = prefix + num;
+
+        LATEST_RAW = num;
+
         if (RE_OCT_NUMBER.test(num) && next_token.has_directive("use strict")) {
             parse_error("Legacy octal literals are not allowed in strict mode");
         }
@@ -653,15 +656,17 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
     }
 
     var read_string = with_eof_error("Unterminated string constant", function() {
-        var quote = next(), ret = "";
+        const start_pos = S.pos;
+        var quote = next(), ret = [];
         for (;;) {
             var ch = next(true, true);
             if (ch == "\\") ch = read_escaped_char(true, true);
             else if (ch == "\r" || ch == "\n") parse_error("Unterminated string constant");
             else if (ch == quote) break;
-            ret += ch;
+            ret.push(ch);
         }
-        var tok = token("string", ret);
+        var tok = token("string", ret.join(""));
+        LATEST_RAW = S.text.slice(start_pos, S.pos);
         tok.quote = quote;
         return tok;
     });
@@ -680,7 +685,8 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
                 next(true, true);
                 S.brace_counter++;
                 tok = token(begin ? "template_head" : "template_substitution", content);
-                tok.raw = raw;
+                LATEST_RAW = raw;
+                LATEST_TEMPLATE_END = false;
                 return tok;
             }
 
@@ -696,8 +702,8 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         }
         S.template_braces.pop();
         tok = token(begin ? "template_head" : "template_substitution", content);
-        tok.raw = raw;
-        tok.end = true;
+        LATEST_RAW = raw;
+        LATEST_TEMPLATE_END = true;
         return tok;
     });
 
@@ -730,7 +736,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
     });
 
     var read_name = with_eof_error("Unterminated identifier name", function() {
-        var name, ch, escaped = false;
+        var name = [], ch, escaped = false;
         var read_escaped_identifier_char = function() {
             escaped = true;
             next();
@@ -741,17 +747,19 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         };
 
         // Read first character (ID_Start)
-        if ((name = peek()) === "\\") {
-            name = read_escaped_identifier_char();
-            if (!is_identifier_start(name)) {
+        if ((ch = peek()) === "\\") {
+            ch = read_escaped_identifier_char();
+            if (!is_identifier_start(ch)) {
                 parse_error("First identifier char is an invalid identifier char");
             }
-        } else if (is_identifier_start(name)) {
+        } else if (is_identifier_start(ch)) {
             next();
         } else {
             return "";
         }
 
+        name.push(ch);
+
         // Read ID_Continue
         while ((ch = peek()) != null) {
             if ((ch = peek()) === "\\") {
@@ -765,12 +773,13 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
                 }
                 next();
             }
-            name += ch;
+            name.push(ch);
         }
-        if (RESERVED_WORDS.has(name) && escaped) {
+        const name_str = name.join("");
+        if (RESERVED_WORDS.has(name_str) && escaped) {
             parse_error("Escaped characters are not allowed in keywords");
         }
-        return name;
+        return name_str;
     });
 
     var read_regexp = with_eof_error("Unterminated regular expression", function(source) {
@@ -794,7 +803,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             source += ch;
         }
         const flags = read_name();
-        return token("regexp", { source, flags });
+        return token("regexp", "/" + source + "/" + flags);
     });
 
     function read_operator(prefix) {
@@ -987,7 +996,9 @@ var UNARY_PREFIX = makePredicate([
 
 var UNARY_POSTFIX = makePredicate([ "--", "++" ]);
 
-var ASSIGNMENT = makePredicate([ "=", "+=", "-=", "/=", "*=", "**=", "%=", ">>=", "<<=", ">>>=", "|=", "^=", "&=" ]);
+var ASSIGNMENT = makePredicate([ "=", "+=", "-=", "??=", "&&=", "||=", "/=", "*=", "**=", "%=", ">>=", "<<=", ">>>=", "|=", "^=", "&=" ]);
+
+var LOGICAL_ASSIGNMENT = makePredicate([ "??=", "&&=", "||=" ]);
 
 var PRECEDENCE = (function(a, ret) {
     for (var i = 0; i < a.length; ++i) {
@@ -1025,7 +1036,7 @@ function parse($TEXT, options) {
     // Useful because comments_before property of call with parens outside
     // contains both comments inside and outside these parens. Used to find the
     // right #__PURE__ comments for an expression
-    const outer_comments_before_counts = new Map();
+    const outer_comments_before_counts = new WeakMap();
 
     options = defaults(options, {
         bare_returns   : false,
@@ -1159,7 +1170,7 @@ function parse($TEXT, options) {
           case "string":
             if (S.in_directives) {
                 var token = peek();
-                if (!S.token.raw.includes("\\")
+                if (!LATEST_RAW.includes("\\")
                     && (is_token(token, "punc", ";")
                         || is_token(token, "punc", "}")
                         || has_newline_before(token)
@@ -2142,7 +2153,12 @@ function parse($TEXT, options) {
             ret = _make_symbol(AST_SymbolRef);
             break;
           case "num":
-            ret = new AST_Number({ start: tok, end: tok, value: tok.value });
+            ret = new AST_Number({
+                start: tok,
+                end: tok,
+                value: tok.value,
+                raw: LATEST_RAW
+            });
             break;
           case "big_int":
             ret = new AST_BigInt({ start: tok, end: tok, value: tok.value });
@@ -2156,7 +2172,9 @@ function parse($TEXT, options) {
             });
             break;
           case "regexp":
-            ret = new AST_RegExp({ start: tok, end: tok, value: tok.value });
+            const [_, source, flags] = tok.value.match(/^\/(.*)\/(\w*)$/);
+
+            ret = new AST_RegExp({ start: tok, end: tok, value: { source, flags } });
             break;
           case "atom":
             switch (tok.value) {
@@ -2313,7 +2331,7 @@ function parse($TEXT, options) {
             return subscripts(cls, allow_calls);
         }
         if (is("template_head")) {
-            return subscripts(template_string(false), allow_calls);
+            return subscripts(template_string(), allow_calls);
         }
         if (ATOMIC_START_TOKEN.has(S.token.type)) {
             return subscripts(as_atom_node(), allow_calls);
@@ -2326,22 +2344,19 @@ function parse($TEXT, options) {
 
         segments.push(new AST_TemplateSegment({
             start: S.token,
-            raw: S.token.raw,
+            raw: LATEST_RAW,
             value: S.token.value,
             end: S.token
         }));
-        while (!S.token.end) {
+
+        while (!LATEST_TEMPLATE_END) {
             next();
             handle_regexp();
             segments.push(expression(true));
 
-            if (!is_token("template_substitution")) {
-                unexpected();
-            }
-
             segments.push(new AST_TemplateSegment({
                 start: S.token,
-                raw: S.token.raw,
+                raw: LATEST_RAW,
                 value: S.token.value,
                 end: S.token
             }));
@@ -2435,6 +2450,7 @@ function parse($TEXT, options) {
                     left: value,
                     operator: "=",
                     right: expression(false),
+                    logical: false,
                     end: prev()
                 });
             }
@@ -3017,7 +3033,7 @@ function parse($TEXT, options) {
             return subscripts(new AST_PrefixedTemplateString({
                 start: start,
                 prefix: expr,
-                template_string: template_string(true),
+                template_string: template_string(),
                 end: prev()
             }), allow_calls);
         }
@@ -3203,11 +3219,13 @@ function parse($TEXT, options) {
         if (is("operator") && ASSIGNMENT.has(val)) {
             if (is_assignable(left) || (left = to_destructuring(left)) instanceof AST_Destructuring) {
                 next();
+
                 return new AST_Assign({
                     start    : start,
                     left     : left,
                     operator : val,
                     right    : maybe_assign(no_in),
+                    logical  : LOGICAL_ASSIGNMENT.has(val),
                     end      : prev()
                 });
             }

package/package.json

@@ -4,9 +4,9 @@
   "homepage": "https://terser.org",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "5.3.6",
+  "version": "5.5.0",
   "engines": {
-    "node": "^10.0.0,^11.0.0,^12.0.0,>=14.0.0"
+    "node": ">=10"
   },
   "maintainers": [
     "Fábio Santos <fabiosantosart@gmail.com>"
@@ -16,16 +16,15 @@
   "type": "module",
   "module": "./main.js",
   "exports": {
-    ".": {
-      "import": "./main.js",
-      "require": "./dist/bundle.min.js"
-    },
-    "./package": {
-      "default": "./package.json"
-    },
-    "./package.json": {
-      "default": "./package.json"
-    }
+    ".": [
+      {
+        "import": "./main.js",
+        "require": "./dist/bundle.min.js"
+      },
+      "./dist/bundle.min.js"
+    ],
+    "./package": "./package.json",
+    "./package.json": "./package.json"
   },
   "types": "tools/terser.d.ts",
   "bin": {