terser 5.0.0-beta.2 → 5.2.1

package/lib/mozilla-ast.js

@@ -59,6 +59,7 @@ import {
     AST_Call,
     AST_Case,
     AST_Catch,
+    AST_Chain,
     AST_Class,
     AST_ClassExpression,
     AST_ClassProperty,
@@ -89,6 +90,7 @@ import {
     AST_Hole,
     AST_If,
     AST_Import,
+    AST_ImportMeta,
     AST_Label,
     AST_LabeledStatement,
     AST_LabelRef,
@@ -418,7 +420,15 @@ import {
                 start      : my_start_token(M),
                 end        : my_end_token(M),
                 property   : M.computed ? from_moz(M.property) : M.property.name,
-                expression : from_moz(M.object)
+                expression : from_moz(M.object),
+                optional   : M.optional || false
+            });
+        },
+        ChainExpression: function(M) {
+            return new AST_Chain({
+                start      : my_start_token(M),
+                end        : my_end_token(M),
+                expression : from_moz(M.expression)
             });
         },
         SwitchCase: function(M) {
@@ -545,6 +555,11 @@ import {
                     start: my_start_token(M),
                     end: my_end_token(M)
                 });
+            } else if (M.meta.name === "import" && M.property.name === "meta") {
+                return new AST_ImportMeta({
+                    start: my_start_token(M),
+                    end: my_end_token(M)
+                });
             }
         },
         Identifier: function(M) {
@@ -629,7 +644,7 @@ import {
     map("AssignmentExpression", AST_Assign, "operator=operator, left>left, right>right");
     map("ConditionalExpression", AST_Conditional, "test>condition, consequent>consequent, alternate>alternative");
     map("NewExpression", AST_New, "callee>expression, arguments@args");
-    map("CallExpression", AST_Call, "callee>expression, arguments@args");
+    map("CallExpression", AST_Call, "callee>expression, optional=optional, arguments@args");
 
     def_to_moz(AST_Toplevel, function To_Moz_Program(M) {
         return to_moz_scope("Program", M);
@@ -836,6 +851,20 @@ import {
         };
     });
 
+    def_to_moz(AST_ImportMeta, function To_Moz_MetaProperty() {
+        return {
+            type: "MetaProperty",
+            meta: {
+                type: "Identifier",
+                name: "import"
+            },
+            property: {
+                type: "Identifier",
+                name: "meta"
+            }
+        };
+    });
+
     def_to_moz(AST_Sequence, function To_Moz_SequenceExpression(M) {
         return {
             type: "SequenceExpression",
@@ -849,7 +878,15 @@ import {
             type: "MemberExpression",
             object: to_moz(M.expression),
             computed: isComputed,
-            property: isComputed ? to_moz(M.property) : {type: "Identifier", name: M.property}
+            property: isComputed ? to_moz(M.property) : {type: "Identifier", name: M.property},
+            optional: M.optional
+        };
+    });
+
+    def_to_moz(AST_Chain, function To_Moz_ChainExpression(M) {
+        return {
+            type: "ChainExpression",
+            expression: to_moz(M.expression)
         };
     });
 

package/lib/output.js

@@ -65,6 +65,7 @@ import {
     AST_Call,
     AST_Case,
     AST_Catch,
+    AST_Chain,
     AST_Class,
     AST_ClassExpression,
     AST_ClassProperty,
@@ -94,6 +95,7 @@ import {
     AST_Hole,
     AST_If,
     AST_Import,
+    AST_ImportMeta,
     AST_Jump,
     AST_LabeledStatement,
     AST_Lambda,
@@ -894,8 +896,8 @@ function OutputStream(options) {
         return p instanceof AST_PropAccess && p.expression === this;
     });
 
-    // same goes for an object literal, because otherwise it would be
-    // interpreted as a block of code.
+    // same goes for an object literal (as in AST_Function), because
+    // otherwise {...} would be interpreted as a block of code.
     PARENS(AST_Object, function(output) {
         return !output.has_parens() && first_in_statement(output);
     });
@@ -1411,6 +1413,8 @@ function OutputStream(options) {
             || e instanceof AST_PropAccess
             || e instanceof AST_Unary
             || e instanceof AST_Constant
+            || e instanceof AST_Await
+            || e instanceof AST_Object
         );
         if (parens) output.print("(");
         self.expression.print(output);
@@ -1608,6 +1612,9 @@ function OutputStream(options) {
         self.module_name.print(output);
         output.semicolon();
     });
+    DEFPRINT(AST_ImportMeta, function(self, output) {
+        output.print("import.meta");
+    });
 
     DEFPRINT(AST_NameMapping, function(self, output) {
         var is_import = output.parent() instanceof AST_Import;
@@ -1714,6 +1721,7 @@ function OutputStream(options) {
         if (self.expression instanceof AST_Call || self.expression instanceof AST_Lambda) {
             output.add_mapping(self.start);
         }
+        if (self.optional) output.print("?.");
         output.with_parens(function() {
             self.args.forEach(function(expr, i) {
                 if (i) output.comma();
@@ -1757,6 +1765,9 @@ function OutputStream(options) {
         var print_computed = RESERVED_WORDS.has(prop)
             ? output.option("ie8")
             : !is_identifier_string(prop, output.option("ecma") >= 2015);
+
+        if (self.optional) output.print("?.");
+
         if (print_computed) {
             output.print("[");
             output.add_mapping(self.end);
@@ -1768,7 +1779,7 @@ function OutputStream(options) {
                     output.print(".");
                 }
             }
-            output.print(".");
+            if (!self.optional) output.print(".");
             // the name after dot would be mapped about here.
             output.add_mapping(self.end);
             output.print_name(prop);
@@ -1776,10 +1787,14 @@ function OutputStream(options) {
     });
     DEFPRINT(AST_Sub, function(self, output) {
         self.expression.print(output);
+        if (self.optional) output.print("?.");
         output.print("[");
         self.property.print(output);
         output.print("]");
     });
+    DEFPRINT(AST_Chain, function(self, output) {
+        self.expression.print(output);
+    });
     DEFPRINT(AST_UnaryPrefix, function(self, output) {
         var op = self.operator;
         output.print(op);

package/lib/parse.js

@@ -63,6 +63,7 @@ import {
     AST_Call,
     AST_Case,
     AST_Catch,
+    AST_Chain,
     AST_ClassExpression,
     AST_ClassProperty,
     AST_ConciseMethod,
@@ -91,6 +92,7 @@ import {
     AST_Hole,
     AST_If,
     AST_Import,
+    AST_ImportMeta,
     AST_IterationStatement,
     AST_Label,
     AST_LabeledStatement,
@@ -396,6 +398,15 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
 
     function peek() { return get_full_char(S.text, S.pos); }
 
+    // Used because parsing ?. involves a lookahead for a digit
+    function is_option_chain_op() {
+        const must_be_dot = S.text.charCodeAt(S.pos + 1) === 46;
+        if (!must_be_dot) return false;
+
+        const cannot_be_digit = S.text.charCodeAt(S.pos + 2);
+        return cannot_be_digit < 48 || cannot_be_digit > 57;
+    }
+
     function next(signal_eof, in_string) {
         var ch = get_full_char(S.text, S.pos++);
         if (signal_eof && !ch)
@@ -456,7 +467,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
                            (type == "keyword" && KEYWORDS_BEFORE_EXPRESSION.has(value)) ||
                            (type == "punc" && PUNC_BEFORE_EXPRESSION.has(value))) ||
                            (type == "arrow");
-        if (type == "punc" && value == ".") {
+        if (type == "punc" && (value == "." || value == "?.")) {
             prev_was_dot = true;
         } else if (!is_comment) {
             prev_was_dot = false;
@@ -503,12 +514,14 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
     }
 
     function read_num(prefix) {
-        var has_e = false, after_e = false, has_x = false, has_dot = prefix == ".", is_big_int = false;
+        var has_e = false, after_e = false, has_x = false, has_dot = prefix == ".", is_big_int = false, numeric_separator = false;
         var num = read_while(function(ch, i) {
             if (is_big_int) return false;
 
             var code = ch.charCodeAt(0);
             switch (code) {
+              case 95: // _
+                return (numeric_separator = true);
               case 98: case 66: // bB
                 return (has_x = true); // Can occur in hex sequence, don't return false yet
               case 111: case 79: // oO
@@ -536,6 +549,14 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         if (RE_OCT_NUMBER.test(num) && next_token.has_directive("use strict")) {
             parse_error("Legacy octal literals are not allowed in strict mode");
         }
+        if (numeric_separator) {
+            if (num.endsWith("_")) {
+                parse_error("Numeric separators are not allowed at the end of numeric literals");
+            } else if (num.includes("__")) {
+                parse_error("Only one underscore is allowed as numeric separator");
+            }
+            num = num.replace(/_/g, "");
+        }
         if (num.endsWith("n")) {
             const without_n = num.slice(0, -1);
             const allow_e = RE_HEX_NUMBER.test(without_n);
@@ -882,6 +903,14 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
                   return tok;
               }
               case 61: return handle_eq_sign();
+              case 63: {
+                  if (!is_option_chain_op()) break;  // Handled below
+
+                  next(); // ?
+                  next(); // .
+
+                  return token("punc", "?.");
+              }
               case 96: return read_template_characters(true);
               case 123:
                 S.brace_counter++;
@@ -1000,7 +1029,7 @@ function parse($TEXT, options) {
 
     options = defaults(options, {
         bare_returns   : false,
-        ecma           : 2017,
+        ecma           : null,  // Legacy
         expression     : false,
         filename       : null,
         html5_comments : true,
@@ -1108,7 +1137,7 @@ function parse($TEXT, options) {
     }
 
     function embed_tokens(parser) {
-        return function(...args) {
+        return function _embed_tokens_wrapper(...args) {
             const start = S.token;
             const expr = parser(...args);
             expr.start = start;
@@ -1124,7 +1153,7 @@ function parse($TEXT, options) {
         }
     }
 
-    var statement = embed_tokens(function(is_export_default, is_for_body, is_if_body) {
+    var statement = embed_tokens(function statement(is_export_default, is_for_body, is_if_body) {
         handle_regexp();
         switch (S.token.type) {
           case "string":
@@ -1159,7 +1188,7 @@ function parse($TEXT, options) {
                 }
                 return function_(AST_Defun, false, true, is_export_default);
             }
-            if (S.token.value == "import" && !is_token(peek(), "punc", "(")) {
+            if (S.token.value == "import" && !is_token(peek(), "punc", "(") && !is_token(peek(), "punc", ".")) {
                 next();
                 var node = import_();
                 semicolon();
@@ -1580,7 +1609,6 @@ function parse($TEXT, options) {
 
             if (!is("punc", ")")) {
                 expect(",");
-                if (is("punc", ")") && options.ecma < 2017) unexpected();
             }
 
             if (param instanceof AST_Expansion) {
@@ -1825,7 +1853,6 @@ function parse($TEXT, options) {
             if (!is("punc", ")")) {
                 expect(",");
                 if (is("punc", ")")) {
-                    if (options.ecma < 2017) unexpected();
                     trailing_comma = prev();
                     if (maybe_sequence) invalid_sequence = trailing_comma;
                 }
@@ -2094,7 +2121,7 @@ function parse($TEXT, options) {
         var newexp = expr_atom(false), args;
         if (is("punc", "(")) {
             next();
-            args = expr_list(")", options.ecma >= 2017);
+            args = expr_list(")", true);
         } else {
             args = [];
         }
@@ -2207,6 +2234,9 @@ function parse($TEXT, options) {
         if (is("operator", "new")) {
             return new_(allow_calls);
         }
+        if (is("operator", "import")) {
+            return import_meta();
+        }
         var start = S.token;
         var peeked;
         var async = is("name", "async")
@@ -2584,6 +2614,7 @@ function parse($TEXT, options) {
 
     function import_() {
         var start = prev();
+
         var imported_name;
         var imported_names;
         if (is("name")) {
@@ -2618,6 +2649,17 @@ function parse($TEXT, options) {
         });
     }
 
+    function import_meta() {
+        var start = S.token;
+        expect_token("operator", "import");
+        expect_token("punc", ".");
+        expect_token("name", "meta");
+        return subscripts(new AST_ImportMeta({
+            start: start,
+            end: prev()
+        }), false);
+    }
+
     function map_name(is_import) {
         function make_symbol(type) {
             return new type({
@@ -2798,15 +2840,6 @@ function parse($TEXT, options) {
             }
             /* falls through */
           case "name":
-            if (tmp.value == "yield") {
-                if (is_in_generator()) {
-                    token_error(tmp, "Yield cannot be used as identifier inside generators");
-                } else if (!is_token(peek(), "punc", ":")
-                    && !is_token(peek(), "punc", "(")
-                    && S.input.has_directive("use strict")) {
-                    token_error(tmp, "Unexpected yield identifier inside strict mode");
-                }
-            }
           case "string":
           case "num":
           case "big_int":
@@ -2888,16 +2921,17 @@ function parse($TEXT, options) {
         }
     }
 
-    var subscripts = function(expr, allow_calls) {
+    var subscripts = function(expr, allow_calls, is_chain) {
         var start = expr.start;
         if (is("punc", ".")) {
             next();
             return subscripts(new AST_Dot({
                 start      : start,
                 expression : expr,
+                optional   : false,
                 property   : as_name(),
                 end        : prev()
-            }), allow_calls);
+            }), allow_calls, is_chain);
         }
         if (is("punc", "[")) {
             next();
@@ -2906,22 +2940,80 @@ function parse($TEXT, options) {
             return subscripts(new AST_Sub({
                 start      : start,
                 expression : expr,
+                optional   : false,
                 property   : prop,
                 end        : prev()
-            }), allow_calls);
+            }), allow_calls, is_chain);
         }
         if (allow_calls && is("punc", "(")) {
             next();
             var call = new AST_Call({
                 start      : start,
                 expression : expr,
+                optional   : false,
                 args       : call_args(),
                 end        : prev()
             });
             annotate(call);
-            return subscripts(call, true);
+            return subscripts(call, true, is_chain);
         }
+
+        if (is("punc", "?.")) {
+            next();
+
+            let chain_contents;
+
+            if (allow_calls && is("punc", "(")) {
+                next();
+
+                const call = new AST_Call({
+                    start,
+                    optional: true,
+                    expression: expr,
+                    args: call_args(),
+                    end: prev()
+                });
+                annotate(call);
+
+                chain_contents = subscripts(call, true, true);
+            } else if (is("name")) {
+                chain_contents = subscripts(new AST_Dot({
+                    start,
+                    expression: expr,
+                    optional: true,
+                    property: as_name(),
+                    end: prev()
+                }), allow_calls, true);
+            } else if (is("punc", "[")) {
+                next();
+                const property = expression(true);
+                expect("]");
+                chain_contents = subscripts(new AST_Sub({
+                    start,
+                    expression: expr,
+                    optional: true,
+                    property,
+                    end: prev()
+                }), allow_calls, true);
+            }
+
+            if (!chain_contents) unexpected();
+
+            if (chain_contents instanceof AST_Chain) return chain_contents;
+
+            return new AST_Chain({
+                start,
+                expression: chain_contents,
+                end: prev()
+            });
+        }
+
         if (is("template_head")) {
+            if (is_chain) {
+                // a?.b`c` is a syntax error
+                unexpected();
+            }
+
             return subscripts(new AST_PrefixedTemplateString({
                 start: start,
                 prefix: expr,
@@ -2929,6 +3021,7 @@ function parse($TEXT, options) {
                 end: prev()
             }), allow_calls);
         }
+
         return expr;
     };
 
@@ -2947,7 +3040,6 @@ function parse($TEXT, options) {
             }
             if (!is("punc", ")")) {
                 expect(",");
-                if (is("punc", ")") && options.ecma < 2017) unexpected();
             }
         }
         next();
@@ -3151,13 +3243,14 @@ function parse($TEXT, options) {
         return expression(true);
     }
 
-    return (function() {
+    return (function parse_toplevel() {
         var start = S.token;
         var body = [];
         S.input.push_directives_stack();
         if (options.module) S.input.add_directive("use strict");
-        while (!is("eof"))
+        while (!is("eof")) {
             body.push(statement());
+        }
         S.input.pop_directives_stack();
         var end = prev();
         var toplevel = options.toplevel;

package/lib/propmangle.js

@@ -50,6 +50,7 @@ import {
 } from "./utils/index.js";
 import { base54 } from "./scope.js";
 import {
+    AST_Binary,
     AST_Call,
     AST_Conditional,
     AST_Dot,
@@ -212,6 +213,8 @@ function mangle_properties(ast, options) {
         } else if (node instanceof AST_Call
             && node.expression.print_to_string() == "Object.defineProperty") {
             addStrings(node.args[1], add);
+        } else if (node instanceof AST_Binary && node.operator === "in") {
+            addStrings(node.left, add);
         }
     }));
 
@@ -236,6 +239,8 @@ function mangle_properties(ast, options) {
         } else if (node instanceof AST_Call
             && node.expression.print_to_string() == "Object.defineProperty") {
             node.args[1] = mangleStrings(node.args[1]);
+        } else if (node instanceof AST_Binary && node.operator === "in") {
+            node.left = mangleStrings(node.left);
         }
     }));
 

package/lib/size.js

@@ -32,6 +32,7 @@ import {
     AST_Hole,
     AST_If,
     AST_Import,
+    AST_ImportMeta,
     AST_Infinity,
     AST_LabeledStatement,
     AST_Let,
@@ -81,7 +82,7 @@ import { first_in_statement } from "./utils/first_in_statement.js";
 
 let mangle_options = undefined;
 AST_Node.prototype.size = function (compressor, stack) {
-    mangle_options = undefined; // TODO get mangle_options somehow
+    mangle_options = compressor && compressor.mangle_options;
 
     let size = 0;
     walk_parent(this, (node, info) => {
@@ -159,7 +160,7 @@ AST_Arrow.prototype._size = function () {
         args_and_arrow += 2;
     }
 
-    return lambda_modifiers(this) + args_and_arrow + Array.isArray(this.body) ? list_overhead(this.body) : this.body._size();
+    return lambda_modifiers(this) + args_and_arrow + (Array.isArray(this.body) ? list_overhead(this.body) : this.body._size());
 };
 
 AST_Destructuring.prototype._size = () => 2;
@@ -257,6 +258,8 @@ AST_Import.prototype._size = function () {
     return size;
 };
 
+AST_ImportMeta.prototype._size = () => 11;
+
 AST_Export.prototype._size = function () {
     let size = 7 + (this.is_default ? 8 : 0);
 
@@ -278,6 +281,9 @@ AST_Export.prototype._size = function () {
 };
 
 AST_Call.prototype._size = function () {
+    if (this.optional) {
+        return 4 + list_overhead(this.args);
+    }
     return 2 + list_overhead(this.args);
 };
 
@@ -290,10 +296,15 @@ AST_Sequence.prototype._size = function () {
 };
 
 AST_Dot.prototype._size = function () {
+    if (this.optional) {
+        return this.property.length + 2;
+    }
     return this.property.length + 1;
 };
 
-AST_Sub.prototype._size = () => 2;
+AST_Sub.prototype._size = function () {
+    return this.optional ? 4 : 2;
+};
 
 AST_Unary.prototype._size = function () {
     if (this.operator === "typeof") return 7;
@@ -376,7 +387,7 @@ AST_ClassProperty.prototype._size = function () {
 AST_Symbol.prototype._size = function () {
     return !mangle_options || this.definition().unmangleable(mangle_options)
         ? this.name.length
-        : 2;
+        : 1;
 };
 
 // TODO take propmangle into account
@@ -391,7 +402,7 @@ AST_SymbolRef.prototype._size = AST_SymbolDeclaration.prototype._size = function
 
     if (name === "arguments") return 9;
 
-    return 2;
+    return AST_Symbol.prototype._size.call(this);
 };
 
 AST_NewTarget.prototype._size = () => 10;

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.0.0-beta.2",
+  "version": "5.2.1",
   "engines": {
     "node": ">=6.0.0"
   },
@@ -14,6 +14,7 @@
   "repository": "https://github.com/terser/terser",
   "main": "dist/bundle.min.js",
   "type": "module",
+  "module": "./main.js",
   "exports": {
     ".": {
       "import": "./main.js",
@@ -47,7 +48,8 @@
     "source-map-support": "~0.5.12"
   },
   "devDependencies": {
-    "acorn": "^7.1.1",
+    "@ls-lint/ls-lint": "^1.9.2",
+    "acorn": "^7.4.0",
     "astring": "^1.4.1",
     "eslint": "^7.0.0",
     "eslump": "^2.0.0",
@@ -64,6 +66,7 @@
     "test:mocha": "mocha test/mocha",
     "lint": "eslint lib",
     "lint-fix": "eslint --fix lib",
+    "ls-lint": "ls-lint",
     "build": "rimraf dist/bundle* && rollup --config --silent",
     "prepare": "npm run build",
     "postversion": "echo 'Remember to update the changelog!'"
@@ -140,6 +143,7 @@
   },
   "pre-commit": [
     "lint-fix",
+    "ls-lint",
     "test"
   ]
 }

package/tools/terser.d.ts

@@ -98,7 +98,7 @@ export interface FormatOptions {
     ascii_only?: boolean;
     beautify?: boolean;
     braces?: boolean;
-    comments?: boolean | 'all' | 'some' | RegExp | ( (node: AST_Node, comment: {
+    comments?: boolean | 'all' | 'some' | RegExp | ( (node: any, comment: {
         value: string,
         type: 'comment1' | 'comment2' | 'comment3' | 'comment4',
         pos: number,
@@ -151,7 +151,6 @@ export interface MinifyOptions {
 }
 
 export interface MinifyOutput {
-    ast?: AST_Node;
     code?: string;
     map?: RawSourceMap | string;
 }
@@ -165,4 +164,4 @@ export interface SourceMapOptions {
     url?: string | 'inline';
 }
 
-export async function minify(files: string | string[] | { [file: string]: string }, options?: MinifyOptions): Promise<MinifyOutput>;
+export function minify(files: string | string[] | { [file: string]: string }, options?: MinifyOptions): Promise<MinifyOutput>;