v3.6.2

minor tweaks to CI test scripts (#3467 )
fix boolean context detection (#3466 )
2019-10-12 20:19:05 +08:00 · 2019-10-12 05:36:38 +08:00 · 2019-10-12 03:42:57 +08:00 · 2019-10-11 03:52:33 +08:00 · 2019-10-11 01:00:09 +08:00 · 2019-10-10 09:37:02 +08:00
10 changed files with 181 additions and 45 deletions
--- a/lib/ast.js
+++ b/lib/ast.js
@@ -837,11 +837,10 @@ var AST_String = DEFNODE("String", "value quote", {
    }
 }, AST_Constant);

-var AST_Number = DEFNODE("Number", "value literal", {
+var AST_Number = DEFNODE("Number", "value", {
    $documentation: "A number literal",
    $propdoc: {
        value: "[number] the numeric value",
-        literal: "[string] numeric value as string (optional)"
    }
 }, AST_Constant);

@@ -980,6 +979,15 @@ TreeWalker.prototype = {
                || p instanceof AST_Conditional
                || p.tail_node() === self) {
                self = p;
+            } else if (p instanceof AST_Return) {
+                var fn;
+                do {
+                    fn = this.parent(++i);
+                    if (!fn) return false;
+                } while (!(fn instanceof AST_Lambda));
+                if (fn.name) return false;
+                self = this.parent(++i);
+                if (!self || self.TYPE != "Call" || self.expression !== fn) return false;
            } else {
                return false;
            }
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -5696,7 +5696,8 @@ merge(Compressor.prototype, {
            }
            break;
        }
-        if (compressor.option("booleans") && compressor.in_boolean_context()) switch (self.operator) {
+        var in_bool = compressor.option("booleans") && compressor.in_boolean_context();
+        if (in_bool) switch (self.operator) {
          case "+":
            var ll = self.left.evaluate(compressor);
            var rr = self.right.evaluate(compressor);
@@ -5729,9 +5730,9 @@ merge(Compressor.prototype, {
            }
            break;
        }
+        var parent = compressor.parent();
        if (compressor.option("comparisons") && self.is_boolean(compressor)) {
-            if (!(compressor.parent() instanceof AST_Binary)
-                || compressor.parent() instanceof AST_Assign) {
+            if (!(parent instanceof AST_Binary) || parent instanceof AST_Assign) {
                var negated = make_node(AST_UnaryPrefix, self, {
                    operator: "!",
                    expression: self.negate(compressor, first_in_statement(compressor))
@@ -5769,14 +5770,14 @@ merge(Compressor.prototype, {
                var ll = fuzzy_eval(self.left);
                if (!ll) {
                    AST_Node.warn("Condition left of && always false [{file}:{line},{col}]", self.start);
-                    return maintain_this_binding(compressor, compressor.parent(), compressor.self(), self.left).optimize(compressor);
+                    return maintain_this_binding(compressor, parent, compressor.self(), self.left).optimize(compressor);
                } else if (!(ll instanceof AST_Node)) {
                    AST_Node.warn("Condition left of && always true [{file}:{line},{col}]", self.start);
                    return make_sequence(self, [ self.left, self.right ]).optimize(compressor);
                }
                var rr = self.right.evaluate(compressor);
                if (!rr) {
-                    if (compressor.option("booleans") && compressor.in_boolean_context()) {
+                    if (in_bool) {
                        AST_Node.warn("Boolean && always false [{file}:{line},{col}]", self.start);
                        return make_sequence(self, [
                            self.left,
@@ -5784,9 +5785,7 @@ merge(Compressor.prototype, {
                        ]).optimize(compressor);
                    } else self.falsy = true;
                } else if (!(rr instanceof AST_Node)) {
-                    var parent = compressor.parent();
-                    if (parent.operator == "&&" && parent.left === compressor.self()
-                        || compressor.option("booleans") && compressor.in_boolean_context()) {
+                    if (in_bool || parent.operator == "&&" && parent.left === compressor.self()) {
                        AST_Node.warn("Dropping side-effect-free && [{file}:{line},{col}]", self.start);
                        return self.left.optimize(compressor);
                    }
@@ -5808,18 +5807,16 @@ merge(Compressor.prototype, {
                    return make_sequence(self, [ self.left, self.right ]).optimize(compressor);
                } else if (!(ll instanceof AST_Node)) {
                    AST_Node.warn("Condition left of || always true [{file}:{line},{col}]", self.start);
-                    return maintain_this_binding(compressor, compressor.parent(), compressor.self(), self.left).optimize(compressor);
+                    return maintain_this_binding(compressor, parent, compressor.self(), self.left).optimize(compressor);
                }
                var rr = self.right.evaluate(compressor);
                if (!rr) {
-                    var parent = compressor.parent();
-                    if (parent.operator == "||" && parent.left === compressor.self()
-                        || compressor.option("booleans") && compressor.in_boolean_context()) {
+                    if (in_bool || parent.operator == "||" && parent.left === compressor.self()) {
                        AST_Node.warn("Dropping side-effect-free || [{file}:{line},{col}]", self.start);
                        return self.left.optimize(compressor);
                    }
                } else if (!(rr instanceof AST_Node)) {
-                    if (compressor.option("booleans") && compressor.in_boolean_context()) {
+                    if (in_bool) {
                        AST_Node.warn("Boolean || always true [{file}:{line},{col}]", self.start);
                        return make_sequence(self, [
                            self.left,
@@ -6017,12 +6014,11 @@ merge(Compressor.prototype, {
        }
        if (compressor.option("unsafe")) {
            var indexRight = is_indexFn(self.right);
-            if (compressor.option("booleans")
+            if (in_bool
                && indexRight
                && (self.operator == "==" || self.operator == "!=")
                && self.left instanceof AST_Number
-                && self.left.getValue() == 0
-                && compressor.in_boolean_context()) {
+                && self.left.getValue() == 0) {
                return (self.operator == "==" ? make_node(AST_UnaryPrefix, self, {
                    operator: "!",
                    expression: self.right
--- a/lib/minify.js
+++ b/lib/minify.js
@@ -1,19 +1,39 @@
 "use strict";

-var to_ascii = typeof atob == "undefined" ? function(b64) {
-    return new Buffer(b64, "base64").toString();
-} : atob;
-var to_base64 = typeof btoa == "undefined" ? function(str) {
-    return new Buffer(str).toString("base64");
-} : btoa;
+var to_ascii, to_base64;
+if (typeof Buffer == "undefined") {
+    to_ascii = atob;
+    to_base64 = btoa;
+} else if (typeof Buffer.alloc == "undefined") {
+    to_ascii = function(b64) {
+        return new Buffer(b64, "base64").toString();
+    };
+    to_base64 = function(str) {
+        return new Buffer(str).toString("base64");
+    };
+} else {
+    to_ascii = function(b64) {
+        return Buffer.from(b64, "base64").toString();
+    };
+    to_base64 = function(str) {
+        return Buffer.from(str).toString("base64");
+    };
+}

-function read_source_map(name, code) {
-    var match = /\n\/\/# sourceMappingURL=data:application\/json(;.*?)?;base64,(\S+)\s*$/.exec(code);
-    if (!match) {
-        AST_Node.warn("inline source map not found: " + name);
-        return null;
+function read_source_map(name, toplevel) {
+    var comments = toplevel.end.comments_after;
+    for (var i = comments.length; --i >= 0;) {
+        var comment = comments[i];
+        if (comment.type != "comment1") break;
+        var match = /^# ([^\s=]+)=(\S+)\s*$/.exec(comment.value);
+        if (!match) break;
+        if (match[1] == "sourceMappingURL") {
+            match = /^data:application\/json(;.*?)?;base64,(\S+)$/.exec(match[2]);
+            if (!match) break;
+            return to_ascii(match[2]);
+        }
    }
-    return to_ascii(match[2]);
+    AST_Node.warn("inline source map not found: " + name);
 }

 function parse_source_map(content) {
@@ -134,10 +154,10 @@ function minify(files, options) {
            source_maps = source_map_content && Object.create(null);
            for (var name in files) if (HOP(files, name)) {
                options.parse.filename = name;
-                options.parse.toplevel = parse(files[name], options.parse);
+                options.parse.toplevel = toplevel = parse(files[name], options.parse);
                if (source_maps) {
                    if (source_map_content == "inline") {
-                        var inlined_content = read_source_map(name, files[name]);
+                        var inlined_content = read_source_map(name, toplevel);
                        if (inlined_content) {
                            source_maps[name] = parse_source_map(inlined_content);
                        }
@@ -146,7 +166,6 @@ function minify(files, options) {
                    }
                }
            }
-            toplevel = options.parse.toplevel;
        }
        if (quoted_props) {
            reserve_quoted_keys(toplevel, quoted_props);
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "description": "JavaScript parser, mangler/compressor and beautifier toolkit",
  "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
  "license": "BSD-2-Clause",
-  "version": "3.6.1",
+  "version": "3.6.2",
  "engines": {
    "node": ">=0.8.0"
  },
--- a/test/benchmark.js
+++ b/test/benchmark.js
@@ -13,15 +13,15 @@ if (!args.length) {
 }
 args.push("--timings");
 var urls = [
-    "https://code.jquery.com/jquery-3.2.1.js",
-    "https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.4/angular.js",
-    "https://cdnjs.cloudflare.com/ajax/libs/mathjs/3.9.0/math.js",
-    "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.js",
+    "https://code.jquery.com/jquery-3.4.1.js",
+    "https://code.angularjs.org/1.7.8/angular.js",
+    "https://unpkg.com/mathjs@6.2.3/dist/math.js",
    "https://unpkg.com/react@15.3.2/dist/react.js",
-    "http://builds.emberjs.com/tags/v2.11.0/ember.prod.js",
-    "https://cdn.jsdelivr.net/lodash/4.17.4/lodash.js",
-    "https://cdnjs.cloudflare.com/ajax/libs/d3/4.5.0/d3.js",
-    "https://raw.githubusercontent.com/kangax/html-minifier/v3.5.7/dist/htmlminifier.js",
+    "https://cdnjs.cloudflare.com/ajax/libs/d3/5.12.0/d3.js",
+    "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.js",
+    "https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.15/lodash.js",
+    "https://cdnjs.cloudflare.com/ajax/libs/ember.js/2.12.2/ember.prod.js",
+    "https://raw.githubusercontent.com/kangax/html-minifier/v4.0.0/dist/htmlminifier.js",
 ];
 var results = {};
 var remaining = 2 * urls.length;
@@ -94,3 +94,6 @@ urls.forEach(function(url) {
        });
    });
 });
+setInterval(function() {
+    process.stderr.write("\0");
+}, 5 * 60 * 1000).unref();
--- a/test/compress/booleans.js
+++ b/test/compress/booleans.js
@@ -0,0 +1,88 @@
+iife_boolean_context: {
+    options = {
+        booleans: true,
+        evaluate: true,
+    }
+    input: {
+        console.log(function() {
+            return Object(1) || false;
+        }() ? "PASS" : "FAIL");
+        console.log(function() {
+            return [].length || true;
+        }() ? "PASS" : "FAIL");
+    }
+    expect: {
+        console.log(function() {
+            return Object(1);
+        }() ? "PASS" : "FAIL");
+        console.log(function() {
+            return [].length, 1;
+        }() ? "PASS" : "FAIL");
+    }
+    expect_stdout: [
+        "PASS",
+        "PASS",
+    ]
+    expect_warnings: [
+        "WARN: Dropping side-effect-free || [test/compress/booleans.js:2,19]",
+        "WARN: Boolean || always true [test/compress/booleans.js:5,19]",
+    ]
+}
+
+issue_3465_1: {
+    options = {
+        booleans: true,
+    }
+    input: {
+        console.log(function(a) {
+            return typeof a;
+        }() ? "PASS" : "FAIL");
+    }
+    expect: {
+        console.log(function(a) {
+            return 1;
+        }() ? "PASS" : "FAIL");
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3465_2: {
+    options = {
+        booleans: true,
+    }
+    input: {
+        console.log(function f(a) {
+            if (!a) console.log(f(42));
+            return typeof a;
+        }() ? "PASS" : "FAIL");
+    }
+    expect: {
+        console.log(function f(a) {
+            if (!a) console.log(f(42));
+            return typeof a;
+        }() ? "PASS" : "FAIL");
+    }
+    expect_stdout: [
+        "number",
+        "PASS",
+    ]
+}
+
+issue_3465_3: {
+    options = {
+        booleans: true,
+        passes: 2,
+        unused: true,
+    }
+    input: {
+        console.log(function f(a) {
+            return typeof a;
+        }() ? "PASS" : "FAIL");
+    }
+    expect: {
+        console.log(function(a) {
+            return 1;
+        }() ? "PASS" : "FAIL");
+    }
+    expect_stdout: "PASS"
+}
--- a/test/input/issue-3441/input.js
+++ b/test/input/issue-3441/input.js
@@ -0,0 +1,8 @@
+// Generated by CoffeeScript 2.4.1
+(function() {
+  console.log('hello');
+
+}).call(this);
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm1haW4uY29mZmVlIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtFQUFBLE9BQU8sQ0FBQyxHQUFSLENBQVksT0FBWjtBQUFBIiwic291cmNlc0NvbnRlbnQiOlsiY29uc29sZS5sb2cgJ2hlbGxvJ1xuIl19
+//# sourceURL=/Users/mohamed/Downloads/main.coffee
--- a/test/mocha/sourcemaps.js
+++ b/test/mocha/sourcemaps.js
@@ -181,6 +181,18 @@ describe("sourcemaps", function() {
            if (result.error) throw result.error;
            assert.strictEqual(result.code + "\n", readFileSync("test/input/issue-3294/output.js", "utf8"));
        });
+        it("Should work in presence of unrecognised annotations", function() {
+            var result = UglifyJS.minify(read("./test/input/issue-3441/input.js"), {
+                compress: false,
+                mangle: false,
+                sourceMap: {
+                    content: "inline",
+                },
+            });
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code, '(function(){console.log("hello")}).call(this);');
+            assert.strictEqual(result.map, '{"version":3,"sources":["main.coffee"],"names":["console","log"],"mappings":"CAAA,WAAAA,QAAQC,IAAI"}');
+        });
    });

    describe("sourceMapInline", function() {
--- a/test/travis-ufuzz.js
+++ b/test/travis-ufuzz.js
@@ -15,7 +15,7 @@ if (process.argv[2] == "run") {
    var branch = process.argv[3] || "v" + require("../package.json").version;
    var repository = encodeURIComponent(process.argv[4] || "mishoo/UglifyJS2");
    var concurrency = process.argv[5] || 1;
-    var platform = process.argv[6] || "node/latest";
+    var platform = process.argv[6] || "latest";
    (function request() {
        setTimeout(request, (period + wait) / concurrency);
        var options = url.parse("https://api.travis-ci.org/repo/" + repository + "/requests");
@@ -37,7 +37,7 @@ if (process.argv[2] == "run") {
                branch: branch,
                config: {
                    cache: false,
-                    env: "NODEJS_VER=" + platform,
+                    env: "NODE=" + platform,
                    script: "node test/travis-ufuzz run"
                }
            }
--- a/tools/node.js
+++ b/tools/node.js
@@ -46,7 +46,9 @@ function describe_ast() {
        if (ctor.SUBCLASSES.length > 0) {
            out.space();
            out.with_block(function() {
-                ctor.SUBCLASSES.forEach(function(ctor, i) {
+                ctor.SUBCLASSES.sort(function(a, b) {
+                    return a.TYPE < b.TYPE ? -1 : 1;
+                }).forEach(function(ctor, i) {
                    out.indent();
                    doitem(ctor);
                    out.newline();
Author	SHA1	Message	Date
Alex Lam S.L	c3ca293e6b	v3.6.2	2019-10-12 20:19:05 +08:00
Alex Lam S.L	516b67a43b	minor tweaks to CI test scripts (#3467 )	2019-10-12 05:36:38 +08:00
Alex Lam S.L	eba3a37bb5	fix boolean context detection (#3466 ) fixes #3465	2019-10-12 03:42:57 +08:00
Alex Lam S.L	6d57ca1a59	improve source map handling (#3464 ) fixes #2947 fixes #3277 fixes #3411	2019-10-11 03:52:33 +08:00
Alex Lam S.L	3320251b4b	update benchmark URLs (#3462 )	2019-10-11 01:00:09 +08:00
Alex Lam S.L	33c94d3bd9	detect boolean context across IIFEs (#3461 )	2019-10-10 09:37:02 +08:00
Alex Lam S.L	b18f717b46	improve readability of `--help ast` (#3460 )	2019-10-10 04:32:32 +08:00
Alex Lam S.L	a0d4b648bb	remove extraneous property (#3459 ) fixes #3455	2019-10-10 01:36:58 +08:00
Alex Lam S.L	6db880e16d	clean up AST_Binary optimisation logic (#3458 )	2019-10-09 23:45:41 +08:00