terser 3.9.2 → 3.10.2

package/README.md

@@ -1,7 +1,7 @@
 terser
 ======
 
-[![Build Status](https://travis-ci.org/terser-js/terser.svg?branch=master)](https://travis-ci.org/terser-js/terser)
+[![Build Status](https://travis-ci.org/terser-js/terser.svg?branch=master)](https://travis-ci.org/terser-js/terser) [![Coverage Status](https://coveralls.io/repos/github/terser-js/terser/badge.svg?branch=master)](https://coveralls.io/github/terser-js/terser?branch=master)
 
 A JavaScript parser, mangler/compressor and beautifier toolkit for ES6+.
 
@@ -127,7 +127,6 @@ a double dash to prevent input files being used as option arguments:
                                 for `mangle` and `output` options.
                                 By default `terser` will not work around
                                 Safari 10/11 bugs.
-    --self                      Build Terser as a library (implies --wrap Terser)
     --source-map [options]      Enable source map/specify source map options:
                                 `base`  Path to compute relative paths from input files.
                                 `content`  Input source map, useful if you're compressing
@@ -531,12 +530,13 @@ if (result.error) throw result.error;
 - `ie8` (default `false`) - set to `true` to support IE8.
 
 - `keep_classnames` (default: `undefined`) - pass `true` to prevent discarding or mangling
-  of class names.
+  of class names. Pass a regular expression to only keep class names matching that regex.
 
 - `keep_fnames` (default: `false`) - pass `true` to prevent discarding or mangling
-  of function names.  Useful for code relying on `Function.prototype.name`. If the
-  top level minify option `keep_classnames` is `undefined` it will be overridden with
-  the value of the top level minify option `keep_fnames`.
+  of function names. Pass a regular expression to only keep class names matching that regex.
+  Useful for code relying on `Function.prototype.name`. If the top level minify option
+  `keep_classnames` is `undefined` it will be overridden with the value of the top level
+  minify option `keep_fnames`.
 
 - `safari10` (default: `false`) - pass `true` to work around Safari 10/11 bugs in
   loop scoping and `await`. See `safari10` options in [`mangle`](#mangle-options)
@@ -648,6 +648,9 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 - `booleans` (default: `true`) -- various optimizations for boolean context,
   for example `!!a ? b : c → a ? b : c`
 
+- `booleans_as_integers` (default: `false`) -- Turn booleans into 0 and 1, also
+  makes comparisons with booleans use `==` and `!=` instead of `===` and `!==`.
+
 - `collapse_vars` (default: `true`) -- Collapse single-use non-constant variables,
   side effects permitting.
 
@@ -709,16 +712,17 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 
 - `join_vars` (default: `true`) -- join consecutive `var` statements
 
-- `keep_classnames` (default: `false`) -- Pass `true` to prevent the
-  compressor from discarding class names.  See also: the `keep_classnames`
-  [mangle option](#mangle).
+- `keep_classnames` (default: `false`) -- Pass `true` to prevent the compressor from
+  discarding class names. Pass a regular expression to only keep class names matching
+  that regex. See also: the `keep_classnames` [mangle option](#mangle).
 
 - `keep_fargs` (default: `true`) -- Prevents the compressor from discarding unused
   function arguments.  You need this for code which relies on `Function.length`.
 
 - `keep_fnames` (default: `false`) -- Pass `true` to prevent the
-  compressor from discarding function names.  Useful for code relying on
-  `Function.prototype.name`. See also: the `keep_fnames` [mangle option](#mangle).
+  compressor from discarding function names. Pass a regular expression to only keep
+  class names matching that regex. Useful for code relying on `Function.prototype.name`.
+  See also: the `keep_fnames` [mangle option](#mangle).
 
 - `keep_infinity` (default: `false`) -- Pass `true` to prevent `Infinity` from
   being compressed into `1/0`, which may cause performance issues on Chrome.
@@ -845,9 +849,11 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
   where `eval` or `with` are used.
 
 - `keep_classnames` (default `false`) -- Pass `true` to not mangle class names.
+  Pass a regular expression to only keep class names matching that regex.
   See also: the `keep_classnames` [compress option](#compress-options).
 
 - `keep_fnames` (default `false`) -- Pass `true` to not mangle function names.
+  Pass a regular expression to only keep class names matching that regex.
   Useful for code relying on `Function.prototype.name`. See also: the `keep_fnames`
   [compress option](#compress-options).
 

package/bin/uglifyjs

@@ -10,15 +10,14 @@ var info = require("../package.json");
 var path = require("path");
 var program = require("commander");
 
-var bundle_path = __dirname + "/../dist/browser.bundle.js";
-if (process.env.TERSER_DEBUG
-    /* note: commander not initialized yet */
-    && !/--help|--self/.test(process.argv.toString())
-    && fs.existsSync(bundle_path)) {
-    var UglifyJS = require(bundle_path);
-    try {
-        require("source-map-support").install();
-    } catch (err) {}
+var bundle_path = __dirname + "/../dist/bundle.js";
+if (fs.existsSync(bundle_path)) {
+    var UglifyJS = require(bundle_path)
+    if (process.env.TERSER_DEBUG) {
+        try {
+            require("source-map-support").install();
+        } catch (err) {}
+    }
 } else {
     var UglifyJS = require("../tools/node.js");
 }
@@ -32,7 +31,7 @@ var options = {
 program.version(info.name + " " + info.version);
 program.parseArgv = program.parse;
 program.parse = undefined;
-if (process.argv.indexOf("ast") >= 0) program.helpInformation = UglifyJS.describe_ast;
+if (process.argv.indexOf("ast") >= 0) program.helpInformation = describe_ast;
 else if (process.argv.indexOf("options") >= 0) program.helpInformation = function() {
     var text = [];
     var options = UglifyJS.default_options();
@@ -62,7 +61,6 @@ program.option("--name-cache <file>", "File to hold mangled name mappings.");
 program.option("--rename", "Force symbol expansion.");
 program.option("--no-rename", "Disable symbol expansion.");
 program.option("--safari10", "Support non-standard Safari 10.");
-program.option("--self", "Build Terser as a library (implies --wrap Terser)");
 program.option("--source-map [options]", "Enable source map/specify source map options.", parse_source_map());
 program.option("--timings", "Display operations run time on STDERR.");
 program.option("--toplevel", "Compress and/or mangle variables in toplevel scope.");
@@ -169,16 +167,7 @@ if (program.verbose) {
 } else if (program.warn) {
     options.warnings = true;
 }
-if (program.self) {
-    if (program.args.length) {
-        print_error("WARN: Ignoring input files since --self was passed");
-    }
-    if (!options.wrap) options.wrap = "Terser";
-    simple_glob(UglifyJS.FILES).forEach(function(name) {
-        files[convert_path(name)] = read_file(name);
-    });
-    run();
-} else if (program.args.length) {
+if (program.args.length) {
     simple_glob(program.args).forEach(function(name) {
         files[convert_path(name)] = read_file(name);
     });
@@ -328,7 +317,7 @@ function simple_glob(glob) {
     if (Array.isArray(glob)) {
         return [].concat.apply([], glob.map(simple_glob));
     }
-    if (glob.match(/\*|\?/)) {
+    if (glob && glob.match(/\*|\?/)) {
         var dir = path.dirname(glob);
         try {
             var entries = fs.readdirSync(dir);
@@ -455,3 +444,38 @@ function print(txt) {
     process.stdout.write(txt);
     process.stdout.write("\n");
 }
+
+function describe_ast() {
+    var out = UglifyJS.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(UglifyJS.AST_Node);
+    return out + "\n";
+}

package/dist/{browser.bundle.js → bundle.js}

@@ -763,7 +763,7 @@
         },
         _walk: function(visitor) {
             return visitor._visit(this, function() {
-                this.argname._walk(visitor);
+                if (this.argname) this.argname._walk(visitor);
                 walk_body(this, visitor);
             });
         }
@@ -1516,7 +1516,7 @@
             var valid = parse_js_number(num);
             if (!isNaN(valid)) return token("num", valid); else parse_error("Invalid syntax: " + num);
         }
-        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:
@@ -1550,7 +1550,7 @@
                     next(true);
                     return from_char_code(result);
                 }
-                return String.fromCharCode(hex_bytes(4));
+                return String.fromCharCode(hex_bytes(4, template_string));
 
               case 10:
                 return "";
@@ -1574,9 +1574,10 @@
             if (ch.length > 0 && next_token.has_directive("use strict")) parse_error("Legacy octal escape sequences are not allowed in strict mode");
             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");
                 num = num << 4 | digit;
@@ -1614,7 +1615,7 @@
                 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);
                 }
                 content += ch;
@@ -2640,9 +2641,11 @@
             if (is("keyword", "catch")) {
                 var start = S.token;
                 next();
-                expect("(");
-                var name = parameter(void 0, AST_SymbolCatch);
-                expect(")");
+                if (is("punc", "{")) var name = null; else {
+                    expect("(");
+                    var name = parameter(void 0, AST_SymbolCatch);
+                    expect(")");
+                }
                 bcatch = new AST_Catch({
                     start: start,
                     argname: name,
@@ -3662,7 +3665,7 @@
             if (self.bfinally) self.bfinally = self.bfinally.transform(tw);
         });
         _(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);
         });
         _(AST_Definitions, function(self, tw) {
@@ -3770,7 +3773,7 @@
     SymbolDef.prototype = {
         unmangleable: function(options) {
             if (!options) options = {};
-            return this.global && !options.toplevel || this.export || this.undeclared || !options.eval && this.scope.pinned() || options.keep_fnames && (this.orig[0] instanceof AST_SymbolLambda || this.orig[0] instanceof AST_SymbolDefun) || this.orig[0] instanceof AST_SymbolMethod || options.keep_classnames && (this.orig[0] instanceof AST_SymbolClass || this.orig[0] instanceof AST_SymbolDefClass);
+            return this.global && !options.toplevel || this.export || this.undeclared || !options.eval && this.scope.pinned() || (options.keep_fnames instanceof RegExp && options.keep_fnames.test(this.orig[0].name) || true === options.keep_fnames) && (this.orig[0] instanceof AST_SymbolLambda || this.orig[0] instanceof AST_SymbolDefun) || this.orig[0] instanceof AST_SymbolMethod || (options.keep_classnames instanceof RegExp && options.keep_classnames.test(this.orig[0].name) || true === options.keep_classnames) && (this.orig[0] instanceof AST_SymbolClass || this.orig[0] instanceof AST_SymbolDefClass);
         },
         mangle: function(options) {
             var cache = options.cache && options.cache.props;
@@ -5208,10 +5211,12 @@
         });
         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);
         });
@@ -5595,6 +5600,7 @@
             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,
@@ -6272,7 +6278,7 @@
             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;
                 }
@@ -9236,10 +9242,6 @@
                     });
                 }
                 break;
-
-              case "Symbol":
-                self.args = [];
-                return self;
             } else if (exp instanceof AST_Dot) switch (exp.property) {
               case "toString":
                 if (0 == self.args.length && !exp.expression.may_throw_on_access(compressor)) return make_node(AST_Binary, self, {
@@ -9407,7 +9409,8 @@
             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);
                 }
             }
@@ -9499,7 +9502,9 @@
                     if (scope.is_block_scope() && !(compressor.parent(level - 1) instanceof AST_Scope)) if (scope.block_scope) scope.block_scope.variables.each(function(variable) {
                         block_scoped[variable.name] = true;
                     });
-                    if (scope instanceof AST_Catch) block_scoped[scope.argname.name] = true; else if (scope instanceof AST_IterationStatement) in_loop = []; else if (scope instanceof AST_SymbolRef) if (scope.fixed_value() instanceof AST_Scope) return false;
+                    if (scope instanceof AST_Catch) {
+                        if (scope.argname) block_scoped[scope.argname.name] = true;
+                    } else if (scope instanceof AST_IterationStatement) in_loop = []; else if (scope instanceof AST_SymbolRef) if (scope.fixed_value() instanceof AST_Scope) return false;
                 } while (!(scope instanceof AST_Scope) || scope instanceof AST_Arrow);
                 var safe_to_inject = !(scope instanceof AST_Toplevel) || compressor.toplevel.vars;
                 var inline = compressor.option("inline");
@@ -10369,8 +10374,14 @@
             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}]", {
                         operator: p.operator,
@@ -11990,7 +12001,8 @@
     exports["minify"] = minify;
     exports["parse"] = parse;
     exports["push_uniq"] = push_uniq;
+    exports["OutputStream"] = OutputStream;
     exports["TreeTransformer"] = TreeTransformer;
     exports["TreeWalker"] = TreeWalker;
 })("undefined" != typeof module ? module.exports : Terser = {});
-//# sourceMappingURL=browser.bundle.js.map
+//# sourceMappingURL=bundle.js.map