v2.3.5

Only for `--unsafe`.

Close #203

.travis.yml

@@ -0,0 +1,7 @@
+language: node_js
+node_js:
+    - "0.4"
+    - "0.6"
+    - "0.8"
+    - "0.10"
+    - "0.11"

README.md

@@ -1,5 +1,6 @@
 UglifyJS 2
 ==========
+[![Build Status](https://travis-ci.org/mishoo/UglifyJS2.png)](https://travis-ci.org/mishoo/UglifyJS2)
 
 UglifyJS is a JavaScript parser, minifier, compressor or beautifier toolkit.
 

bin/uglifyjs

@@ -23,6 +23,7 @@ mangling you need to use `-c` and `-m`.\
     .describe("source-map-url", "The path to the source map to be added in //@ sourceMappingURL.  Defaults to the value passed with --source-map.")
     .describe("in-source-map", "Input source map, useful if you're compressing JS that was generated from some other original code.")
     .describe("screw-ie8", "Pass this flag if you don't care about full compliance with Internet Explorer 6-8 quirks (by default UglifyJS will try to be IE-proof).")
+    .describe("expr", "Parse a single expression, rather than a program (for parsing JSON)")
     .describe("p", "Skip prefix for original filenames that appear in source maps. \
 For example -p 3 will drop 3 directories from file names and ensure they are relative paths.")
     .describe("o", "Output file (default STDOUT).")
@@ -76,6 +77,8 @@ You need to pass an argument to this option to specify the name that your module
     .string("e")
     .string("comments")
     .string("wrap")
+
+    .boolean("expr")
     .boolean("screw-ie8")
     .boolean("export-all")
     .boolean("self")
@@ -242,8 +245,9 @@ async.eachLimit(files, 1, function (file, cb) {
             }
             else {
                 TOPLEVEL = UglifyJS.parse(code, {
-                    filename: file,
+                    filename   : file,
-                    toplevel: TOPLEVEL
+                    toplevel   : TOPLEVEL,
+                    expression : ARGS.expr,
                 });
             };
         });

lib/compress.js

@@ -1589,6 +1589,45 @@ merge(Compressor.prototype, {
                         operator: "+",
                         right: make_node(AST_String, self, { value: "" })
                     });
+                  case "Function":
+                    if (all(self.args, function(x){ return x instanceof AST_String })) {
+                        // quite a corner-case, but we can handle it:
+                        //   https://github.com/mishoo/UglifyJS2/issues/203
+                        // if the code argument is a constant, then we can minify it.
+                        try {
+                            var code = "(function(" + self.args.slice(0, -1).map(function(arg){
+                                return arg.value;
+                            }).join(",") + "){" + self.args[self.args.length - 1].value + "})()";
+                            var ast = parse(code);
+                            ast.figure_out_scope();
+                            var comp = new Compressor(compressor.options);
+                            ast = ast.transform(comp);
+                            ast.figure_out_scope();
+                            ast.mangle_names();
+                            var fun = ast.body[0].body.expression;
+                            var args = fun.argnames.map(function(arg, i){
+                                return make_node(AST_String, self.args[i], {
+                                    value: arg.print_to_string()
+                                });
+                            });
+                            var code = OutputStream();
+                            AST_BlockStatement.prototype._codegen.call(fun, fun, code);
+                            code = code.toString().replace(/^\{|\}$/g, "");
+                            args.push(make_node(AST_String, self.args[self.args.length - 1], {
+                                value: code
+                            }));
+                            self.args = args;
+                            return self;
+                        } catch(ex) {
+                            if (ex instanceof JS_Parse_Error) {
+                                compressor.warn("Error parsing code passed to new Function [{file}:{line},{col}]", self.args[self.args.length - 1].start);
+                                compressor.warn(ex.toString());
+                            } else {
+                                console.log(ex);
+                            }
+                        }
+                    }
+                    break;
                 }
             }
             else if (exp instanceof AST_Dot && exp.property == "toString" && self.args.length == 0) {
@@ -1965,8 +2004,8 @@ merge(Compressor.prototype, {
         var prop = self.property;
         if (prop instanceof AST_String && compressor.option("properties")) {
             prop = prop.getValue();
-            if (compressor.option("screw_ie8") && RESERVED_WORDS(prop)
+            if ((compressor.option("screw_ie8") && RESERVED_WORDS(prop))
-                || !(RESERVED_WORDS(prop)) && is_identifier_string(prop)) {
+                || (!(RESERVED_WORDS(prop)) && is_identifier_string(prop))) {
                 return make_node(AST_Dot, self, {
                     expression : self.expression,
                     property   : prop

lib/output.js

@@ -351,7 +351,9 @@ function OutputStream(options) {
     AST_Node.DEFMETHOD("print", function(stream, force_parens){
         var self = this, generator = self._codegen;
         stream.push_node(self);
-        if (force_parens || self.needs_parens(stream)) {
+        var needs_parens = self.needs_parens(stream);
+        var fc = self instanceof AST_Function && !stream.option("beautify");
+        if (force_parens || (needs_parens && !fc)) {
             stream.with_parens(function(){
                 self.add_comments(stream);
                 self.add_source_map(stream);
@@ -359,6 +361,7 @@ function OutputStream(options) {
             });
         } else {
             self.add_comments(stream);
+            if (needs_parens && fc) stream.print("!");
             self.add_source_map(stream);
             generator(self, stream);
         }

lib/parse.js

@@ -168,7 +168,10 @@ function is_identifier_char(ch) {
 };
 
 function is_identifier_string(str){
-    for (var i = str.length; --i >= 0;) {
+    var i = str.length;
+    if (i == 0) return false;
+    if (is_digit(str.charCodeAt(0))) return false;
+    while (--i >= 0) {
         if (!is_identifier_char(str.charAt(i)))
             return false;
     }
@@ -585,9 +588,10 @@ var ATOMIC_START_TOKEN = array_to_hash([ "atom", "num", "string", "regexp", "nam
 function parse($TEXT, options) {
 
     options = defaults(options, {
-        strict   : false,
+        strict     : false,
-        filename : null,
+        filename   : null,
-        toplevel : null
+        toplevel   : null,
+        expression : false
     });
 
     var S = {
@@ -1338,15 +1342,8 @@ function parse($TEXT, options) {
 
     function is_assignable(expr) {
         if (!options.strict) return true;
-        switch (expr[0]+"") {
+        if (expr instanceof AST_This) return false;
-          case "dot":
+        return (expr instanceof AST_PropAccess || expr instanceof AST_Symbol);
-          case "sub":
-          case "new":
-          case "call":
-            return true;
-          case "name":
-            return expr[1] != "this";
-        }
     };
 
     var maybe_assign = function(no_in) {
@@ -1390,6 +1387,10 @@ function parse($TEXT, options) {
         return ret;
     };
 
+    if (options.expression) {
+        return expression(true);
+    }
+
     return (function(){
         var start = S.token;
         var body = [];

lib/transform.js

@@ -44,7 +44,6 @@
 "use strict";
 
 // Tree transformer helpers.
-// XXX: eventually I should refactor the compressor to use this infrastructure.
 
 function TreeTransformer(before, after) {
     TreeWalker.call(this);

lib/utils.js

@@ -245,6 +245,13 @@ function makePredicate(words) {
     return new Function("str", f);
 };
 
+function all(array, predicate) {
+    for (var i = array.length; --i >= 0;)
+        if (!predicate(array[i]))
+            return false;
+    return true;
+};
+
 function Dictionary() {
     this._values = Object.create(null);
     this._size = 0;

package.json

@@ -3,17 +3,17 @@
     "description": "JavaScript parser, mangler/compressor and beautifier toolkit",
     "homepage": "http://lisperator.net/uglifyjs",
     "main": "tools/node.js",
-    "version": "2.3.1",
+    "version": "2.3.5",
     "engines": { "node" : ">=0.4.0" },
     "maintainers": [{
         "name": "Mihai Bazon",
         "email": "mihai.bazon@gmail.com",
         "web": "http://lisperator.net/"
     }],
-    "repositories": [{
+    "repository": {
         "type": "git",
         "url": "https://github.com/mishoo/UglifyJS2.git"
-    }],
+    },
     "dependencies": {
         "async"      : "~0.2.6",
         "source-map" : "~0.1.7",

test/compress/properties.js

@@ -19,12 +19,16 @@ dot_properties: {
         a["if"] = "if";
         a["*"] = "asterisk";
         a["\u0EB3"] = "unicode";
+        a[""] = "whitespace";
+        a["1_1"] = "foo";
     }
     expect: {
         a.foo = "bar";
         a["if"] = "if";
         a["*"] = "asterisk";
         a.\u0EB3 = "unicode";
+        a[""] = "whitespace";
+        a["1_1"] = "foo";
     }
 }
 
@@ -38,11 +42,13 @@ dot_properties_es5: {
         a["if"] = "if";
         a["*"] = "asterisk";
         a["\u0EB3"] = "unicode";
+        a[""] = "whitespace";
     }
     expect: {
         a.foo = "bar";
         a.if = "if";
         a["*"] = "asterisk";
         a.\u0EB3 = "unicode";
+        a[""] = "whitespace";
     }
 }