terser 3.10.1 → 3.10.2

package/bin/uglifyjs

@@ -11,16 +11,13 @@ var path = require("path");
 var program = require("commander");
 
 var bundle_path = __dirname + "/../dist/bundle.js";
-if (process.env.TERSER_DEBUG
-    /* note: commander not initialized yet */
-    && !/--help/.test(process.argv.toString())
-    && fs.existsSync(bundle_path)) {
-    var UglifyJS = require(bundle_path);
-    try {
-        require("source-map-support").install();
-    } catch (err) {}
-} else if (fs.existsSync(bundle_path)) {
+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");
 }
@@ -34,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();
@@ -447,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/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) {
@@ -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);
         });
@@ -6273,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;
                 }
@@ -9404,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);
                 }
             }
@@ -9496,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");
@@ -11993,6 +12001,7 @@
     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 = {});