v2.3.6

SourceMapping pragma has changed to //#

README.md

@@ -287,6 +287,10 @@ can pass additional arguments that control the code output:
   you pass `false` then whenever possible we will use a newline instead of a
   semicolon, leading to more readable output of uglified code (size before
   gzip could be smaller; size after gzip insignificantly larger).
+- `negate-iife` (default `!beautify`) -- prefer negation, rather than
+  parens, for "Immediately-Called Function Expressions".  This defaults to
+  `true` when beautification is off, and `false` if beautification is on;
+  pass it manually to force a value.
 
 ### Keeping copyright notices or other comments
 

bin/uglifyjs

@@ -20,9 +20,10 @@ mangling you need to use `-c` and `-m`.\
 ")
     .describe("source-map", "Specify an output file where to generate source map.")
     .describe("source-map-root", "The path to the original source to be included in the source map.")
-    .describe("source-map-url", "The path to the source map to be added in //@ sourceMappingURL.  Defaults to the value passed with --source-map.")
+    .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")
@@ -243,7 +246,8 @@ async.eachLimit(files, 1, function (file, cb) {
             else {
                 TOPLEVEL = UglifyJS.parse(code, {
                     filename   : file,
-                    toplevel: TOPLEVEL
+                    toplevel   : TOPLEVEL,
+                    expression : ARGS.expr,
                 });
             };
         });
@@ -305,7 +309,7 @@ async.eachLimit(files, 1, function (file, cb) {
 
     if (SOURCE_MAP) {
         fs.writeFileSync(ARGS.source_map, SOURCE_MAP, "utf8");
-        output += "\n/*\n//@ sourceMappingURL=" + (ARGS.source_map_url || ARGS.source_map) + "\n*/";
+        output += "\n//# sourceMappingURL=" + (ARGS.source_map_url || ARGS.source_map);
     }
 
     if (OUTPUT_FILE) {

lib/compress.js

@@ -1590,7 +1590,7 @@ merge(Compressor.prototype, {
                         right: make_node(AST_String, self, { value: "" })
                     });
                   case "Function":
-                    if (self.args[self.args.length - 1] instanceof AST_String) {
+                    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.

lib/output.js

@@ -60,7 +60,8 @@ function OutputStream(options) {
         bracketize    : false,
         semicolons    : true,
         comments      : false,
-        preserve_line : false
+        preserve_line : false,
+        negate_iife   : !(options && options.beautify),
     }, true);
 
     var indentation = 0;
@@ -352,7 +353,7 @@ function OutputStream(options) {
         var self = this, generator = self._codegen;
         stream.push_node(self);
         var needs_parens = self.needs_parens(stream);
-        var fc = self instanceof AST_Function && !stream.option("beautify");
+        var fc = self instanceof AST_Function && stream.option("negate_iife");
         if (force_parens || (needs_parens && !fc)) {
             stream.with_parens(function(){
                 self.add_comments(stream);
@@ -1122,7 +1123,7 @@ function OutputStream(options) {
             if (p instanceof AST_Statement && p.body === node)
                 return true;
             if ((p instanceof AST_Seq           && p.car === node        ) ||
-                (p instanceof AST_Call          && p.expression === node ) ||
+                (p instanceof AST_Call          && p.expression === node && !(p instanceof AST_New) ) ||
                 (p instanceof AST_Dot           && p.expression === node ) ||
                 (p instanceof AST_Sub           && p.expression === node ) ||
                 (p instanceof AST_Conditional   && p.condition === node  ) ||

lib/parse.js

@@ -590,7 +590,8 @@ function parse($TEXT, options) {
     options = defaults(options, {
         strict     : false,
         filename   : null,
-        toplevel : null
+        toplevel   : null,
+        expression : false
     });
 
     var S = {
@@ -1386,6 +1387,10 @@ function parse($TEXT, options) {
         return ret;
     };
 
+    if (options.expression) {
+        return expression(true);
+    }
+
     return (function(){
         var start = S.token;
         var body = [];

lib/scope.js

@@ -187,6 +187,7 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(){
                 } else {
                     g = new SymbolDef(self, globals.size(), node);
                     g.undeclared = true;
+                    g.global = true;
                     globals.set(name, g);
                 }
                 node.thedef = g;

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.3",
+    "version": "2.3.6",
     "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",