terser 3.9.2 → 3.10.2

package/lib/ast.js

@@ -627,7 +627,7 @@ var AST_Catch = DEFNODE("Catch", "argname", {
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
-            this.argname._walk(visitor);
+            if (this.argname) this.argname._walk(visitor);
             walk_body(this, visitor);
         });
     }

package/lib/compress.js

@@ -52,6 +52,7 @@ function Compressor(options, false_by_default) {
         arguments     : false,
         arrows        : !false_by_default,
         booleans      : !false_by_default,
+        booleans_as_integers : false,
         collapse_vars : !false_by_default,
         comparisons   : !false_by_default,
         computed_props: !false_by_default,
@@ -892,7 +893,7 @@ merge(Compressor.prototype, {
         var scope, i = 0;
         while (scope = compressor.parent(i++)) {
             if (scope instanceof AST_Scope) break;
-            if (scope instanceof AST_Catch) {
+            if (scope instanceof AST_Catch && scope.argname) {
                 scope = scope.argname.definition().scope;
                 break;
             }
@@ -4633,10 +4634,6 @@ merge(Compressor.prototype, {
                     }
                 }
                 break;
-              case "Symbol":
-                // Symbol's argument is only used for debugging.
-                self.args = [];
-                return self;
             } else if (exp instanceof AST_Dot) switch(exp.property) {
               case "toString":
                 if (self.args.length == 0 && !exp.expression.may_throw_on_access(compressor)) {
@@ -4836,7 +4833,12 @@ merge(Compressor.prototype, {
         if (can_inline && stat instanceof AST_Return && is_regular_func) {
             var value = stat.value;
             if (!value || value.is_constant_expression()) {
-                var args = self.args.concat(value || make_node(AST_Undefined, self));
+                if (value) {
+                    value = value.clone(true);
+                } else {
+                    value = make_node(AST_Undefined, self);
+                }
+                var args = self.args.concat(value);
                 return make_sequence(self, args).optimize(compressor);
             }
         }
@@ -4987,7 +4989,9 @@ merge(Compressor.prototype, {
                     }
                 }
                 if (scope instanceof AST_Catch) {
-                    block_scoped[scope.argname.name] = true;
+                    if (scope.argname) {
+                        block_scoped[scope.argname.name] = true;
+                    }
                 } else if (scope instanceof AST_IterationStatement) {
                     in_loop = [];
                 } else if (scope instanceof AST_SymbolRef) {
@@ -6212,8 +6216,16 @@ merge(Compressor.prototype, {
         if (compressor.in_boolean_context()) return make_node(AST_Number, self, {
             value: +self.value
         });
+        var p = compressor.parent();
+        if (compressor.option("booleans_as_integers")) {
+            if (p instanceof AST_Binary && (p.operator == "===" || p.operator == "!==")) {
+                p.operator = p.operator.replace(/=$/, "");
+            }
+            return make_node(AST_Number, self, {
+                value: +self.value
+            });
+        }
         if (compressor.option("booleans")) {
-            var p = compressor.parent();
             if (p instanceof AST_Binary && (p.operator == "=="
                                             || p.operator == "!=")) {
                 compressor.warn("Non-strict equality against boolean: {operator} {value} [{file}:{line},{col}]", {

package/lib/output.js

@@ -1320,10 +1320,12 @@ function OutputStream(options) {
     });
     DEFPRINT(AST_Catch, function(self, output) {
         output.print("catch");
-        output.space();
-        output.with_parens(function() {
-            self.argname.print(output);
-        });
+        if (self.argname) {
+            output.space();
+            output.with_parens(function() {
+                self.argname.print(output);
+            });
+        }
         output.space();
         print_braced(self, output);
     });

package/lib/parse.js

@@ -420,7 +420,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         }
     }
 
-    function read_escaped_char(in_string) {
+    function read_escaped_char(in_string, template_string) {
         var ch = next(true, in_string);
         switch (ch.charCodeAt(0)) {
           case 110 : return "\n";
@@ -445,7 +445,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
                 next(true);
                 return from_char_code(result);
             }
-            return String.fromCharCode(hex_bytes(4));
+            return String.fromCharCode(hex_bytes(4, template_string));
           case 10  : return ""; // newline
           case 13  :            // \r
             if (peek() == "\n") { // DOS newline
@@ -474,9 +474,12 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         return String.fromCharCode(parseInt(ch, 8));
     }
 
-    function hex_bytes(n) {
+    function hex_bytes(n, abrupt_ending) {
         var num = 0;
         for (; n > 0; --n) {
+            if (abrupt_ending && isNaN(parseInt(peek(), 16))) {
+                return num || "";
+            }
             var digit = parseInt(next(true), 16);
             if (isNaN(digit))
                 parse_error("Invalid hex-character pattern in string");
@@ -522,7 +525,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             raw += ch;
             if (ch == "\\") {
                 var tmp = S.pos;
-                ch = read_escaped_char(true);
+                ch = read_escaped_char(true, true);
                 raw += S.text.substr(tmp, S.pos - tmp);
             }
 
@@ -1847,9 +1850,13 @@ function parse($TEXT, options) {
         if (is("keyword", "catch")) {
             var start = S.token;
             next();
-            expect("(");
-            var name = parameter(undefined, AST_SymbolCatch);
-            expect(")");
+            if (is("punc", "{")) {
+                var name = null;
+            } else {
+                expect("(");
+                var name = parameter(undefined, AST_SymbolCatch);
+                expect(")");
+            }
             bcatch = new AST_Catch({
                 start   : start,
                 argname : name,

package/lib/scope.js

@@ -68,11 +68,11 @@ SymbolDef.prototype = {
             || this.export
             || this.undeclared
             || !options.eval && this.scope.pinned()
-            || options.keep_fnames
+            || (options.keep_fnames instanceof RegExp && options.keep_fnames.test(this.orig[0].name) || options.keep_fnames === true)
                 && (this.orig[0] instanceof AST_SymbolLambda
                     || this.orig[0] instanceof AST_SymbolDefun)
             || this.orig[0] instanceof AST_SymbolMethod
-            || options.keep_classnames
+            || (options.keep_classnames instanceof RegExp && options.keep_classnames.test(this.orig[0].name) || options.keep_classnames === true)
                 && (this.orig[0] instanceof AST_SymbolClass
                     || this.orig[0] instanceof AST_SymbolDefClass);
     },

package/lib/transform.js

@@ -152,7 +152,7 @@ TreeTransformer.prototype = new TreeWalker;
     });
 
     _(AST_Catch, function(self, tw) {
-        self.argname = self.argname.transform(tw);
+        if (self.argname) self.argname = self.argname.transform(tw);
         self.body = do_list(self.body, tw);
     });
 

package/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://github.com/fabiosantoscode/terser",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "3.9.2",
+  "version": "3.10.2",
   "engines": {
     "node": ">=0.8.0"
   },
@@ -14,8 +14,7 @@
     "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)"
   ],
   "repository": "https://github.com/fabiosantoscode/terser.git",
-  "main": "tools/node.js",
-  "browser": "dist/browser.bundle.js",
+  "main": "dist/bundle.js",
   "bin": {
     "terser": "bin/uglifyjs"
   },
@@ -33,17 +32,22 @@
   },
   "devDependencies": {
     "acorn": "~5.7.1",
+    "coveralls": "^3.0.2",
     "escodegen": "^1.9.1",
     "eslint": "^4.19.1",
-    "mocha": "~3.5.1",
+    "istanbul": "^0.4.5",
+    "mocha": "^3.0.0",
+    "mochallel": "^1.6.8",
     "pre-commit": "^1.2.2",
     "semver": "~5.5.0"
   },
   "scripts": {
-    "test": "node test/run-tests.js",
+    "test": "rm -f dist/* && npm run prepublish && node test/run-tests.js",
+    "coverage": "istanbul cover test/run-tests.js",
+    "coveralls": "coveralls < coverage/lcov.info",
     "lint": "eslint lib",
     "lint-fix": "eslint --fix lib",
-    "prepublish": "node bin/uglifyjs lib/utils.js lib/ast.js lib/parse.js lib/transform.js lib/scope.js lib/output.js lib/compress.js lib/sourcemap.js lib/mozilla-ast.js lib/propmangle.js lib/minify.js tools/exports.js -c defaults=false -d \"MOZ_SourceMap=require('source-map')\" --source-map \"includeSources=true,url='browser.bundle.js.map'\" -e \"exports:(typeof module != 'undefined' ? module.exports : Terser = {})\" -b ascii_only --comments /license/ -o dist/browser.bundle.js"
+    "prepublish": "cd dist && node ../bin/uglifyjs ../lib/utils.js ../lib/ast.js ../lib/parse.js ../lib/transform.js ../lib/scope.js ../lib/output.js ../lib/compress.js ../lib/sourcemap.js ../lib/mozilla-ast.js ../lib/propmangle.js ../lib/minify.js ../tools/exports.js -c defaults=false -d \"MOZ_SourceMap=require('source-map')\" --source-map \"includeSources=true,url='bundle.js.map'\" -e \"exports:(typeof module != 'undefined' ? module.exports : Terser = {})\" -b ascii_only --comments /license/ -o ../dist/bundle.js"
   },
   "keywords": [
     "uglify",

package/tools/exports.js

@@ -2,5 +2,6 @@ exports["Dictionary"] = Dictionary;
 exports["minify"] = minify;
 exports["parse"] = parse;
 exports["push_uniq"] = push_uniq;
+exports["OutputStream"] = OutputStream;
 exports["TreeTransformer"] = TreeTransformer;
 exports["TreeWalker"] = TreeWalker;

package/tools/node.js

@@ -1,4 +1,5 @@
 var fs = require("fs");
+var istanbul = require("istanbul");
 
 var UglifyJS = exports;
 var FILES = UglifyJS.FILES = [
@@ -18,52 +19,20 @@ var FILES = UglifyJS.FILES = [
     return require.resolve(file);
 });
 
+var instrumenter = new istanbul.Instrumenter();
+
 new Function("MOZ_SourceMap", "exports", function() {
     var code = FILES.map(function(file) {
-        return fs.readFileSync(file, "utf8");
+        var contents = fs.readFileSync(file, "utf8");
+        if (global.__IS_TESTING__) return instrumenter.instrumentSync(contents, file);
+        return contents;
     });
-    code.push("exports.describe_ast = " + describe_ast.toString());
     return code.join("\n\n");
 }())(
     require("source-map"),
     UglifyJS
 );
 
-function describe_ast() {
-    var out = OutputStream({ beautify: true });
-    function doitem(ctor) {
-        out.print("AST_" + ctor.TYPE);
-        var props = ctor.SELF_PROPS.filter(function(prop){
-            return !/^\$/.test(prop);
-        });
-        if (props.length > 0) {
-            out.space();
-            out.with_parens(function(){
-                props.forEach(function(prop, i){
-                    if (i) out.space();
-                    out.print(prop);
-                });
-            });
-        }
-        if (ctor.documentation) {
-            out.space();
-            out.print_string(ctor.documentation);
-        }
-        if (ctor.SUBCLASSES.length > 0) {
-            out.space();
-            out.with_block(function(){
-                ctor.SUBCLASSES.forEach(function(ctor, i){
-                    out.indent();
-                    doitem(ctor);
-                    out.newline();
-                });
-            });
-        }
-    };
-    doitem(AST_Node);
-    return out + "\n";
-}
-
 function infer_options(options) {
     var result = UglifyJS.minify("", options);
     return result.error && result.error.defs;