terser 5.0.0-beta.0 → 5.1.0

package/lib/ast.js

@@ -864,6 +864,10 @@ var AST_Import = DEFNODE("Import", "imported_name imported_names module_name", {
     },
 });
 
+var AST_ImportMeta = DEFNODE("ImportMeta", null, {
+    $documentation: "A reference to import.meta",
+});
+
 var AST_Export = DEFNODE("Export", "exported_definition exported_value is_default exported_names module_name", {
     $documentation: "An `export` statement",
     $propdoc: {
@@ -1642,6 +1646,7 @@ export {
     AST_Hole,
     AST_If,
     AST_Import,
+    AST_ImportMeta,
     AST_Infinity,
     AST_IterationStatement,
     AST_Jump,

package/lib/cli.js

@@ -84,6 +84,7 @@ export async function run_cli({ program, packageJson, fs, path }) {
             options[name] = program[name];
         }
     });
+
     if ("ecma" in program) {
         if (program.ecma != (program.ecma | 0)) fatal("ERROR: ecma must be an integer");
         const ecma = program.ecma | 0;
@@ -313,7 +314,7 @@ export async function run_cli({ program, packageJson, fs, path }) {
             }
         } else if (program.output) {
             fs.writeFileSync(program.output, result.code);
-            if (options.sourceMap.url !== "inline" && result.map) {
+            if (options.sourceMap && options.sourceMap.url !== "inline" && result.map) {
                 fs.writeFileSync(program.output + ".map", result.map);
             }
         } else {

package/lib/compress/index.js

@@ -1628,8 +1628,7 @@ function tighten_body(statements, compressor) {
                 extract_candidates(expr.condition);
                 extract_candidates(expr.consequent);
                 extract_candidates(expr.alternative);
-            } else if (expr instanceof AST_Definitions
-                && (compressor.option("unused") || !(expr instanceof AST_Const))) {
+            } else if (expr instanceof AST_Definitions) {
                 var len = expr.definitions.length;
                 // limit number of trailing variable definitions for consideration
                 var i = len - 200;
@@ -1797,7 +1796,9 @@ function tighten_body(statements, compressor) {
                 if (node === expr || node.body === expr) {
                     found = true;
                     if (node instanceof AST_VarDef) {
-                        node.value = null;
+                        node.value = node.name instanceof AST_SymbolConst
+                             ? make_node(AST_Undefined, node.value)  // `const` always needs value.
+                             : null;
                         return node;
                     }
                     return in_list ? MAP.skip : null;
@@ -2113,7 +2114,7 @@ function tighten_body(statements, compressor) {
         statements.length = n;
         CHANGED = n != len;
         if (has_quit) has_quit.forEach(function(stat) {
-            extract_declarations_from_unreachable_code(compressor, stat, statements);
+            trim_unreachable_code(compressor, stat, statements);
         });
     }
 
@@ -2371,7 +2372,7 @@ function tighten_body(statements, compressor) {
     }
 }
 
-function extract_declarations_from_unreachable_code(compressor, stat, target) {
+function trim_unreachable_code(compressor, stat, target) {
     walk(stat, node => {
         if (node instanceof AST_Var) {
             node.remove_initializers();
@@ -2392,6 +2393,10 @@ function extract_declarations_from_unreachable_code(compressor, stat, target) {
             }));
             return true;
         }
+        if (node instanceof AST_Export || node instanceof AST_Import) {
+            target.push(node);
+            return true;
+        }
         if (node instanceof AST_Scope) {
             return true;
         }
@@ -2443,6 +2448,10 @@ function is_undefined(node, compressor) {
             if (this.properties[i]._dot_throw(compressor)) return true;
         return false;
     });
+    // Do not be as strict with classes as we are with objects.
+    // Hopefully the community is not going to abuse static getters and setters.
+    // https://github.com/terser/terser/issues/724#issuecomment-643655656
+    def_may_throw_on_access(AST_Class, return_false);
     def_may_throw_on_access(AST_ObjectProperty, return_false);
     def_may_throw_on_access(AST_ObjectGetter, return_true);
     def_may_throw_on_access(AST_Expansion, function(compressor) {
@@ -2475,7 +2484,8 @@ function is_undefined(node, compressor) {
         return this.tail_node()._dot_throw(compressor);
     });
     def_may_throw_on_access(AST_SymbolRef, function(compressor) {
-        if (is_undefined(this, compressor)) return true;
+        if (this.name === "arguments") return false;
+        if (has_flag(this, UNDEFINED)) return true;
         if (!is_strict(compressor)) return false;
         if (is_undeclared_ref(this) && this.is_declared(compressor)) return false;
         if (this.is_immutable()) return false;
@@ -2877,13 +2887,33 @@ var static_fns = convert_to_predicate({
         return this;
     });
     var non_converting_binary = makePredicate("&& || ?? === !==");
+    const identity_comparison = makePredicate("== != === !==");
+    const has_identity = value =>
+        typeof value === "object"
+        || typeof value === "function"
+        || typeof value === "symbol";
+
     def_eval(AST_Binary, function(compressor, depth) {
         if (!non_converting_binary.has(this.operator)) depth++;
+
         var left = this.left._eval(compressor, depth);
         if (left === this.left) return this;
         var right = this.right._eval(compressor, depth);
         if (right === this.right) return this;
         var result;
+
+        if (
+            left != null
+            && right != null
+            && identity_comparison.has(this.operator)
+            && has_identity(left)
+            && has_identity(right)
+            && typeof left === typeof right
+        ) {
+            // Do not compare by reference
+            return this;
+        }
+
         switch (this.operator) {
           case "&&"  : result = left &&  right; break;
           case "||"  : result = left ||  right; break;
@@ -2924,20 +2954,24 @@ var static_fns = convert_to_predicate({
         var value = node._eval(compressor, depth);
         return value === node ? this : value;
     });
+
+    // Set of AST_SymbolRef which are currently being evaluated.
+    // Avoids infinite recursion of ._eval()
+    const reentrant_ref_eval = new Set();
     def_eval(AST_SymbolRef, function(compressor, depth) {
+        if (reentrant_ref_eval.has(this)) return this;
+
         var fixed = this.fixed_value();
         if (!fixed) return this;
         var value;
         if (HOP(fixed, "_eval")) {
             value = fixed._eval();
         } else {
-            this._eval = return_this;
+            reentrant_ref_eval.add(this);
             value = fixed._eval(compressor, depth);
-            delete this._eval;
+            reentrant_ref_eval.delete(this);
+
             if (value === fixed) return this;
-            fixed._eval = function() {
-                return value;
-            };
         }
         if (value && typeof value == "object") {
             var escaped = this.definition().escaped;
@@ -2945,13 +2979,7 @@ var static_fns = convert_to_predicate({
         }
         return value;
     });
-    var global_objs = {
-        Array: Array,
-        Math: Math,
-        Number: Number,
-        Object: Object,
-        String: String,
-    };
+    var global_objs = { Array, Math, Number, Object, String };
     var static_values = convert_to_predicate({
         Math: [
             "E",
@@ -4477,7 +4505,7 @@ function if_break_in_loop(self, compressor) {
                 body: self.condition
             }));
         }
-        extract_declarations_from_unreachable_code(compressor, self.body, body);
+        trim_unreachable_code(compressor, self.body, body);
         return make_node(AST_BlockStatement, self, {
             body: body
         });
@@ -4548,7 +4576,7 @@ def_optimize(AST_For, function(self, compressor) {
             if (cond instanceof AST_Node) cond = self.condition.tail_node().evaluate(compressor);
             if (!cond) {
                 var body = [];
-                extract_declarations_from_unreachable_code(compressor, self.body, body);
+                trim_unreachable_code(compressor, self.body, body);
                 if (self.init instanceof AST_Statement) {
                     body.push(self.init);
                 } else if (self.init) {
@@ -4584,7 +4612,7 @@ def_optimize(AST_If, function(self, compressor) {
         if (cond instanceof AST_Node) cond = self.condition.tail_node().evaluate(compressor);
         if (!cond) {
             var body = [];
-            extract_declarations_from_unreachable_code(compressor, self.body, body);
+            trim_unreachable_code(compressor, self.body, body);
             body.push(make_node(AST_SimpleStatement, self.condition, {
                 body: self.condition
             }));
@@ -4597,7 +4625,7 @@ def_optimize(AST_If, function(self, compressor) {
             }));
             body.push(self.body);
             if (self.alternative) {
-                extract_declarations_from_unreachable_code(compressor, self.alternative, body);
+                trim_unreachable_code(compressor, self.alternative, body);
             }
             return make_node(AST_BlockStatement, self, { body: body }).optimize(compressor);
         }
@@ -4809,7 +4837,7 @@ def_optimize(AST_Switch, function(self, compressor) {
         if (prev && !aborts(prev)) {
             prev.body = prev.body.concat(branch.body);
         } else {
-            extract_declarations_from_unreachable_code(compressor, branch, decl);
+            trim_unreachable_code(compressor, branch, decl);
         }
     }
 });
@@ -4820,7 +4848,7 @@ def_optimize(AST_Try, function(self, compressor) {
     if (compressor.option("dead_code") && self.body.every(is_empty)) {
         var body = [];
         if (self.bcatch) {
-            extract_declarations_from_unreachable_code(compressor, self.bcatch, body);
+            trim_unreachable_code(compressor, self.bcatch, body);
         }
         if (self.bfinally) body.push(...self.bfinally.body);
         return make_node(AST_BlockStatement, self, {
@@ -7349,7 +7377,7 @@ function lift_key(self, compressor) {
     if (!compressor.option("computed_props")) return self;
     // save a comparison in the typical case
     if (!(self.key instanceof AST_Constant)) return self;
-    // whitelist acceptable props as not all AST_Constants are true constants
+    // allow certain acceptable props as not all AST_Constants are true constants
     if (self.key instanceof AST_String || self.key instanceof AST_Number) {
         if (self.key.value === "__proto__") return self;
         if (self.key.value == "constructor"

package/lib/equivalent-to.js

@@ -26,6 +26,7 @@ import {
     AST_ForOf,
     AST_If,
     AST_Import,
+    AST_ImportMeta,
     AST_Jump,
     AST_LabeledStatement,
     AST_Lambda,
@@ -209,6 +210,8 @@ AST_Import.prototype.shallow_cmp = mkshallow({
     imported_names: "exist"
 });
 
+AST_ImportMeta.prototype.shallow_cmp = pass_through;
+
 AST_Export.prototype.shallow_cmp = mkshallow({
     exported_definition: "exist",
     exported_value: "exist",

package/lib/mozilla-ast.js

@@ -89,6 +89,7 @@ import {
     AST_Hole,
     AST_If,
     AST_Import,
+    AST_ImportMeta,
     AST_Label,
     AST_LabeledStatement,
     AST_LabelRef,
@@ -545,6 +546,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) {
@@ -836,6 +842,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",

package/lib/output.js

@@ -94,6 +94,7 @@ import {
     AST_Hole,
     AST_If,
     AST_Import,
+    AST_ImportMeta,
     AST_Jump,
     AST_LabeledStatement,
     AST_Lambda,
@@ -1608,6 +1609,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;

package/lib/parse.js

@@ -91,6 +91,7 @@ import {
     AST_Hole,
     AST_If,
     AST_Import,
+    AST_ImportMeta,
     AST_IterationStatement,
     AST_Label,
     AST_LabeledStatement,
@@ -503,12 +504,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 +539,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);
@@ -1159,7 +1170,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();
@@ -2207,6 +2218,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 +2598,7 @@ function parse($TEXT, options) {
 
     function import_() {
         var start = prev();
+
         var imported_name;
         var imported_names;
         if (is("name")) {
@@ -2618,6 +2633,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 +2824,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":

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,
@@ -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);
 

package/main.js

@@ -0,0 +1,27 @@
+import "./lib/transform.js";
+import "./lib/mozilla-ast.js";
+import { minify } from "./lib/minify.js";
+
+export { minify } from "./lib/minify.js";
+export { run_cli as _run_cli } from "./lib/cli.js";
+
+export async function _default_options() {
+    const defs = {};
+
+    Object.keys(infer_options({ 0: 0 })).forEach((component) => {
+        const options = infer_options({
+            [component]: {0: 0}
+        });
+
+        if (options) defs[component] = options;
+    });
+    return defs;
+}
+
+async function infer_options(options) {
+    try {
+        await minify("", options);
+    } catch (error) {
+        return error.defs;
+    }
+}

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.0",
+  "version": "5.1.0",
   "engines": {
     "node": ">=6.0.0"
   },
@@ -38,7 +38,8 @@
     "LICENSE",
     "README.md",
     "CHANGELOG.md",
-    "PATRONS.md"
+    "PATRONS.md",
+    "main.js"
   ],
   "dependencies": {
     "commander": "^2.20.0",
@@ -46,7 +47,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",
@@ -63,6 +65,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!'"
@@ -139,6 +142,7 @@
   },
   "pre-commit": [
     "lint-fix",
+    "ls-lint",
     "test"
   ]
 }