v3.5.8

fixes #3377

README.md

@@ -605,6 +605,8 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 - `arguments` (default: `true`) -- replace `arguments[index]` with function
   parameter name whenever possible.
 
+- `assignments` (default: `true`) -- apply optimizations to assignment expressions.
+
 - `booleans` (default: `true`) -- various optimizations for boolean context,
   for example `!!a ? b : c → a ? b : c`
 
@@ -634,6 +636,9 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 - `expression` (default: `false`) -- Pass `true` to preserve completion values
   from terminal statements without `return`, e.g. in bookmarklets.
 
+- `functions` (default: `true`) -- convert declarations from `var`to `function`
+  whenever possible.
+
 - `global_defs` (default: `{}`) -- see [conditional compilation](#conditional-compilation)
 
 - `hoist_funs` (default: `false`) -- hoist function declarations

lib/ast.js

@@ -773,7 +773,7 @@ var AST_Label = DEFNODE("Label", "references", {
     }
 }, AST_Symbol);
 
-var AST_SymbolRef = DEFNODE("SymbolRef", null, {
+var AST_SymbolRef = DEFNODE("SymbolRef", "fixed", {
     $documentation: "Reference to some symbol (not definition/declaration)",
 }, AST_Symbol);
 

lib/output.js

@@ -123,7 +123,7 @@ function OutputStream(options) {
         });
     } : function(str) {
         var s = "";
-        for (var i = 0, len = str.length; i < len; i++) {
+        for (var i = 0; i < str.length; i++) {
             if (is_surrogate_pair_head(str[i]) && !is_surrogate_pair_tail(str[i + 1])
                 || is_surrogate_pair_tail(str[i]) && !is_surrogate_pair_head(str[i - 1])) {
                 s += "\\u" + str.charCodeAt(i).toString(16);

lib/parse.js

@@ -164,10 +164,6 @@ function is_unicode_connector_punctuation(ch) {
     return UNICODE.connector_punctuation.test(ch);
 }
 
-function is_identifier(name) {
-    return !RESERVED_WORDS[name] && /^[a-z_$][a-z0-9_$]*$/i.test(name);
-}
-
 function is_identifier_start(code) {
     return code == 36 || code == 95 || is_letter(code);
 }
@@ -272,10 +268,8 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
 
     function find_eol() {
         var text = S.text;
-        for (var i = S.pos, n = S.text.length; i < n; ++i) {
+        for (var i = S.pos; i < S.text.length; ++i) {
-            var ch = text[i];
+            if (NEWLINE_CHARS[text[i]]) return i;
-            if (NEWLINE_CHARS[ch])
-                return i;
         }
         return -1;
     }

lib/scope.js

@@ -61,8 +61,6 @@ SymbolDef.next_id = 1;
 
 SymbolDef.prototype = {
     unmangleable: function(options) {
-        if (!options) options = {};
-
         return this.global && !options.toplevel
             || this.undeclared
             || !options.eval && this.scope.pinned()
@@ -198,24 +196,20 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
         }
         if (node instanceof AST_SymbolLambda) {
             var def = node.thedef;
-            if (def.orig.length == 1) {
+            redefine(node, node.scope.parent_scope);
-                redefine(node, node.scope.parent_scope);
+            node.thedef.init = def.init;
-                node.thedef.init = def.init;
-            }
             return true;
         }
     }));
 
     function redefine(node, scope) {
         var name = node.name;
-        var refs = node.thedef.references;
+        var old_def = node.thedef;
-        var def = scope.find_variable(name) || self.globals.get(name) || scope.def_variable(node);
+        var new_def = scope.find_variable(name) || self.globals.get(name) || scope.def_variable(node);
-        refs.forEach(function(ref) {
+        old_def.orig.concat(old_def.references).forEach(function(node) {
-            ref.thedef = def;
+            node.thedef = new_def;
-            ref.reference(options);
+            node.reference(options);
         });
-        node.thedef = def;
-        node.reference(options);
     }
 });
 
@@ -300,7 +294,7 @@ AST_Scope.DEFMETHOD("def_variable", function(symbol, init) {
 
 AST_Lambda.DEFMETHOD("resolve", return_this);
 AST_Scope.DEFMETHOD("resolve", function() {
-    return this.parent_scope;
+    return this.parent_scope.resolve();
 });
 AST_Toplevel.DEFMETHOD("resolve", return_this);
 
@@ -337,7 +331,7 @@ function next_mangled_name(scope, options, def) {
         } while (scope = scope.parent_scope);
     });
     var name;
-    for (var i = 0, len = holes.length; i < len; i++) {
+    for (var i = 0; i < holes.length; i++) {
         name = base54(holes[i]);
         if (names[name]) continue;
         holes.splice(i, 1);
@@ -346,7 +340,7 @@ function next_mangled_name(scope, options, def) {
     }
     while (true) {
         name = base54(++scope.cname);
-        if (in_use[name] || !is_identifier(name) || options.reserved.has[name]) continue;
+        if (in_use[name] || RESERVED_WORDS[name] || options.reserved.has[name]) continue;
         if (!names[name]) break;
         holes.push(scope.cname);
     }
@@ -426,7 +420,7 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
             var name;
             do {
                 name = base54(++lname);
-            } while (!is_identifier(name));
+            } while (RESERVED_WORDS[name]);
             node.mangled_name = name;
             return true;
         }
@@ -497,7 +491,7 @@ AST_Toplevel.DEFMETHOD("expand_names", function(options) {
         var name;
         do {
             name = base54(cname++);
-        } while (avoid[name] || !is_identifier(name));
+        } while (avoid[name] || RESERVED_WORDS[name]);
         return name;
     }
 
@@ -559,7 +553,7 @@ var base54 = (function() {
     var freq = Object.create(null);
     function init(chars) {
         var array = [];
-        for (var i = 0, len = chars.length; i < len; i++) {
+        for (var i = 0; i < chars.length; i++) {
             var ch = chars[i];
             array.push(ch);
             freq[ch] = -1e-2 * i;

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.4.10",
+  "version": "3.5.8",
   "engines": {
     "node": ">=0.8.0"
   },
@@ -23,12 +23,12 @@
     "LICENSE"
   ],
   "dependencies": {
-    "commander": "~2.19.0",
+    "commander": "~2.20.0",
     "source-map": "~0.6.1"
   },
   "devDependencies": {
     "acorn": "~6.1.1",
-    "semver": "~5.6.0"
+    "semver": "~6.0.0"
   },
   "scripts": {
     "test": "node test/run-tests.js"

test/compress/arrays.js

@@ -239,3 +239,113 @@ index_length: {
     }
     expect_stdout: "1 2"
 }
+
+constructor_bad: {
+    options = {
+        unsafe: true
+    }
+    input: {
+        try {
+            Array(NaN);
+            console.log("FAIL1");
+        } catch (ex) {
+            try {
+                new Array(NaN);
+                console.log("FAIL2");
+            } catch (ex) {
+                console.log("PASS");
+            }
+        }
+        try {
+            Array(3.14);
+            console.log("FAIL1");
+        } catch (ex) {
+            try {
+                new Array(3.14);
+                console.log("FAIL2");
+            } catch (ex) {
+                console.log("PASS");
+            }
+        }
+    }
+    expect: {
+        try {
+            Array(NaN);
+            console.log("FAIL1");
+        } catch (ex) {
+            try {
+                Array(NaN);
+                console.log("FAIL2");
+            } catch (ex) {
+                console.log("PASS");
+            }
+        }
+        try {
+            Array(3.14);
+            console.log("FAIL1");
+        } catch (ex) {
+            try {
+                Array(3.14);
+                console.log("FAIL2");
+            } catch (ex) {
+                console.log("PASS");
+            }
+        }
+    }
+    expect_stdout: [
+        "PASS",
+        "PASS",
+    ]
+    expect_warnings: [
+        "WARN: Invalid array length: 3.14 [test/compress/arrays.js:13,12]",
+        "WARN: Invalid array length: 3.14 [test/compress/arrays.js:17,16]",
+    ]
+}
+
+constructor_good: {
+    options = {
+        unsafe: true
+    }
+    input: {
+        console.log(Array());
+        console.log(Array(0));
+        console.log(Array(1));
+        console.log(Array(6));
+        console.log(Array(7));
+        console.log(Array(1, 2));
+        console.log(Array(false));
+        console.log(Array("foo"));
+        console.log(Array(Array));
+        console.log(new Array());
+        console.log(new Array(0));
+        console.log(new Array(1));
+        console.log(new Array(6));
+        console.log(new Array(7));
+        console.log(new Array(1, 2));
+        console.log(new Array(false));
+        console.log(new Array("foo"));
+        console.log(new Array(Array));
+    }
+    expect: {
+        console.log([]);
+        console.log([]);
+        console.log([,]);
+        console.log([,,,,,,]);
+        console.log(Array(7));
+        console.log([ 1, 2 ]);
+        console.log([ false ]);
+        console.log([ "foo" ]);
+        console.log(Array(Array));
+        console.log([]);
+        console.log([]);
+        console.log([,]);
+        console.log([,,,,,,]);
+        console.log(Array(7));
+        console.log([ 1, 2 ]);
+        console.log([ false ]);
+        console.log([ "foo" ]);
+        console.log(Array(Array));
+    }
+    expect_stdout: true
+    expect_warnings: []
+}

test/compress/asm.js

@@ -1,5 +1,6 @@
 asm_mixed: {
     options = {
+        assignments: true,
         booleans: true,
         comparisons: true,
         conditionals: true,

test/compress/assignment.js

@@ -1,5 +1,6 @@
 op_equals_left_local_var: {
     options = {
+        assignments: true,
         evaluate: true,
     }
     input: {
@@ -60,6 +61,7 @@ op_equals_left_local_var: {
 
 op_equals_right_local_var: {
     options = {
+        assignments: true,
         evaluate: true,
     }
     input: {
@@ -123,6 +125,7 @@ op_equals_right_local_var: {
 }
 op_equals_left_global_var: {
     options = {
+        assignments: true,
         evaluate: true,
     }
     input: {
@@ -179,6 +182,7 @@ op_equals_left_global_var: {
 
 op_equals_right_global_var: {
     options = {
+        assignments: true,
         evaluate: true,
     }
     input: {
@@ -236,3 +240,74 @@ op_equals_right_global_var: {
         x = g() &   x;
     }
 }
+
+increment_decrement_1: {
+    options = {
+        assignments: true,
+        reduce_vars: true,
+    }
+    input: {
+        console.log(function(a) {
+            a += 1;
+            a -= 1;
+            return a;
+        }(42));
+    }
+    expect: {
+        console.log(function(a){
+            ++a;
+            --a;
+            return a;
+        }(42));
+    }
+    expect_stdout: "42"
+}
+
+increment_decrement_2: {
+    options = {
+        assignments: true,
+        passes: 2,
+        reduce_vars: true,
+    }
+    input: {
+        console.log(function(a) {
+            a = a + 1;
+            a = a - 1;
+            a += 1;
+            a -= 1;
+            return a;
+        }(42));
+    }
+    expect: {
+        console.log(function(a){
+            ++a;
+            --a;
+            ++a;
+            --a;
+            return a;
+        }(42));
+    }
+    expect_stdout: "42"
+}
+
+issue_3375: {
+    options = {
+        assignments: true,
+        reduce_vars: true,
+    }
+    input: {
+        console.log(typeof function(b) {
+            var a = b += 1;
+            --b;
+            return a;
+        }("object"));
+    }
+    expect: {
+        console.log(typeof function(b) {
+            var a = b += 1;
+            --b;
+            return a;
+        }("object"));
+    }
+    expect_stdout: "string"
+}

test/compress/collapse_vars.js

@@ -944,7 +944,7 @@ collapse_vars_misc1: {
         function f5(x) { var z = foo(); return (5 - window.x) / z }
         function f6() { return window.a * window.z && zap() }
         function f7() { var b = window.a * window.z; return b + b }
-        function f8() { var b = window.a * window.z; return b + (b + 5) }
+        function f8() { var b = window.a * window.z; return b + (5 + b) }
         function f9() { var b = window.a * window.z; return bar() || b }
         function f10(x) { var a = 5; return a += 3; }
         function f11(x) { var a = 5; return a += 2; }
@@ -3895,11 +3895,11 @@ issue_2436_10: {
             o = { b: 3 };
             return n;
         }
-        console.log((c = o, [
+        console.log([
-            c.a,
+            (c = o).a,
             f(c.b),
             c.b,
-        ]).join(" "));
+        ].join(" "));
         var c;
     }
     expect_stdout: "1 2 2"
@@ -6121,3 +6121,60 @@ issue_3327: {
     }
     expect_stdout: "PASS 42"
 }
+
+assign_left: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        console.log(function(a, b) {
+            (b = a, b.p).q = "PASS";
+            return a.p.q;
+        }({p: {}}));
+    }
+    expect: {
+        console.log(function(a, b) {
+            (b = a).p.q = "PASS";
+            return a.p.q;
+        }({p: {}}));
+    }
+    expect_stdout: "PASS"
+}
+
+sub_property: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        console.log(function(a, b) {
+            return a[(b = a, b.length - 1)];
+        }([ "FAIL", "PASS" ]));
+    }
+    expect: {
+        console.log(function(a, b) {
+            return a[(b = a).length - 1];
+        }([ "FAIL", "PASS" ]));
+    }
+    expect_stdout: "PASS"
+}
+
+assign_undeclared: {
+    options = {
+        collapse_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var A = (console.log(42), function() {});
+        B = new A();
+        console.log(typeof B);
+    }
+    expect: {
+        B = new (console.log(42), function() {})();
+        console.log(typeof B);
+    }
+    expect_stdout: [
+        "42",
+        "object",
+    ]
+}

test/compress/comparisons.js

@@ -323,3 +323,60 @@ is_number_unsafe: {
     }
     expect_stdout: "true"
 }
+
+is_boolean_var: {
+    options = {
+        comparisons: true,
+        reduce_vars: true,
+    }
+    input: {
+        console.log(function(a, b) {
+            for (var i = 0, c = !b; i < a.length; i++)
+                if (!a[i] === c)
+                    return i;
+        }([ false, true ], 42));
+    }
+    expect: {
+        console.log(function(a, b) {
+            for (var i = 0, c = !b; i < a.length; i++)
+                if (!a[i] == c)
+                    return i;
+        }([ false, true ], 42));
+    }
+    expect_stdout: "1"
+}
+
+is_defined: {
+    options = {
+        comparisons: true,
+    }
+    input: {
+        console.log(function a() {
+            return void 0 === a;
+        }());
+    }
+    expect: {
+        console.log(function a() {
+            return a, false;
+        }());
+    }
+    expect_stdout: "false"
+    expect_warnings: [
+        "WARN: Expression always defined [test/compress/comparisons.js:2,19]",
+    ]
+}
+
+unsafe_indexOf: {
+    options = {
+        booleans: true,
+        comparisons: true,
+        unsafe: true,
+    }
+    input: {
+        if (Object.keys({ foo: 42 }).indexOf("foo") >= 0) console.log("PASS");
+    }
+    expect: {
+        if (~Object.keys({ foo: 42 }).indexOf("foo")) console.log("PASS");
+    }
+    expect_stdout: "PASS"
+}

test/compress/conditionals.js

@@ -1367,6 +1367,7 @@ cond_seq_assign_2: {
 
 cond_seq_assign_3: {
     options = {
+        assignments: true,
         conditionals: true,
     }
     input: {
@@ -1415,3 +1416,22 @@ issue_3271: {
     }
     expect_stdout: "1 1"
 }
+
+iife_condition: {
+    options = {
+        conditionals: true,
+        side_effects: true,
+    }
+    input: {
+        if (function() {
+            return console;
+        }())
+            console.log("PASS");
+    }
+    expect: {
+        !function() {
+            return console;
+        }() || console.log("PASS");
+    }
+    expect_stdout: "PASS"
+}

test/compress/dead-code.js

@@ -942,3 +942,21 @@ issue_2929: {
     }
     expect_stdout: "PASS"
 }
+
+unsafe_string_replace: {
+    options = {
+        side_effects: true,
+        unsafe: true,
+    }
+    input: {
+        "foo".replace("f", function() {
+            console.log("PASS");
+        });
+    }
+    expect: {
+        "foo".replace("f", function() {
+            console.log("PASS");
+        });
+    }
+    expect_stdout: "PASS"
+}

test/compress/drop-unused.js

@@ -2005,3 +2005,24 @@ issue_3233: {
     }
     expect_stdout: "PASS"
 }
+
+issue_3375: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var b = 1;
+        var a = c = [], c = --b + ("function" == typeof f && f());
+        var a = c && c[a];
+        console.log(a, b);
+    }
+    expect: {
+        var b = 1;
+        var a = [], c = --b + ("function" == typeof f && f());
+        a = c && c[a];
+        console.log(a, b);
+    }
+    expect_stdout: "0 0"
+}

test/compress/evaluate.js

@@ -820,8 +820,8 @@ unsafe_charAt_noop: {
     }
     expect: {
         console.log(
-            s.charAt(0),
+            s[0],
-            "string".charAt(x),
+            "string"[0 | x],
             (typeof x)[0]
         );
     }
@@ -1124,14 +1124,14 @@ issue_2207_1: {
         console.log(Math.max(3, 6, 2, 7, 3, 4));
         console.log(Math.cos(1.2345));
         console.log(Math.cos(1.2345) - Math.sin(4.321));
-        console.log(Math.pow(Math.PI, Math.E - Math.LN10));
+        console.log(Math.pow(Math.PI, Math.E - Math.LN10).toFixed(15));
     }
     expect: {
         console.log("A");
         console.log(7);
         console.log(Math.cos(1.2345));
         console.log(1.2543732512566947);
-        console.log(1.6093984514472044);
+        console.log("1.609398451447204");
     }
     expect_stdout: true
 }
@@ -1540,7 +1540,7 @@ issue_2926_2: {
     expect_stdout: "function"
 }
 
-issue_2968: {
+issue_2968_1: {
     options = {
         collapse_vars: true,
         evaluate: true,
@@ -1571,6 +1571,39 @@ issue_2968: {
     expect_stdout: "PASS"
 }
 
+issue_2968_2: {
+    options = {
+        assignments: true,
+        collapse_vars: true,
+        evaluate: true,
+        inline: true,
+        passes: 2,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var c = "FAIL";
+        (function() {
+            (function(a, b) {
+                a <<= 0;
+                a && (a[(c = "PASS", 0 >>> (b += 1))] = 0);
+            })(42, -42);
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = "FAIL";
+        (function() {
+            a = 42,
+            ((a <<= 0) && (a[(c = "PASS", 0)] = 0));
+            var a;
+        })();
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
+
 truthy_conditionals: {
     options = {
         conditionals: true,
@@ -1610,3 +1643,90 @@ truthy_loops: {
         }
     }
 }
+
+if_increment: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function(a) {
+            if (console)
+                return ++a;
+        }(0));
+    }
+    expect: {
+        console.log(function(a) {
+            if (console)
+                return 1;
+        }());
+    }
+    expect_stdout: "1"
+}
+
+try_increment: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function(a) {
+            try {
+                return ++a;
+            } catch (e) {}
+        }(0));
+    }
+    expect: {
+        console.log(function(a) {
+            try {
+                return 1;
+            } catch (e) {}
+        }());
+    }
+    expect_stdout: "1"
+}
+
+unsafe_escaped: {
+    options = {
+        evaluate: true,
+        inline: true,
+        passes: 3,
+        reduce_vars: true,
+        side_effects: true,
+        unsafe: true,
+        unused: true,
+    }
+    input: {
+        (function(a) {
+            console.log(function(index) {
+                return a[index];
+            }(function(term) {
+                return a.indexOf(term);
+            }("PASS")));
+        })([ "PASS" ]);
+    }
+    expect: {
+        console.log("PASS");
+    }
+    expect_stdout: "PASS"
+}
+
+unsafe_string_replace: {
+    options = {
+        evaluate: true,
+        unsafe: true,
+    }
+    input: {
+        "foo".replace("f", function() {
+            console.log("PASS");
+        });
+    }
+    expect: {
+        "foo".replace("f", function() {
+            console.log("PASS");
+        });
+    }
+    expect_stdout: "PASS"
+}

test/compress/functions.js

@@ -358,6 +358,7 @@ inner_ref: {
 
 issue_2107: {
     options = {
+        assignments: true,
         collapse_vars: true,
         inline: true,
         passes: 3,
@@ -387,6 +388,7 @@ issue_2107: {
 
 issue_2114_1: {
     options = {
+        assignments: true,
         collapse_vars: true,
         if_return: true,
         inline: true,
@@ -419,6 +421,7 @@ issue_2114_1: {
 
 issue_2114_2: {
     options = {
+        assignments: true,
         collapse_vars: true,
         if_return: true,
         inline: true,
@@ -1223,6 +1226,7 @@ issue_2630_1: {
 
 issue_2630_2: {
     options = {
+        assignments: true,
         collapse_vars: true,
         inline: true,
         passes: 2,
@@ -1320,6 +1324,7 @@ issue_2630_4: {
 
 issue_2630_5: {
     options = {
+        assignments: true,
         collapse_vars: true,
         inline: true,
         reduce_vars: true,
@@ -1398,6 +1403,8 @@ recursive_inline_2: {
 issue_2657: {
     options = {
         inline: true,
+        passes: 2,
+        reduce_funcs: true,
         reduce_vars: true,
         sequences: true,
         unused: true,
@@ -2467,6 +2474,7 @@ issue_3297_3: {
         inline: true,
         join_vars: true,
         passes: 3,
+        reduce_funcs: true,
         reduce_vars: true,
         sequences: true,
         side_effects: true,
@@ -2505,18 +2513,18 @@ issue_3297_3: {
         }).processBulk([1, 2, 3]);
     }
     expect: {
-        function function1(c) {
+        function function1(u) {
             return {
-                processBulk: function n(o) {
+                processBulk: function n(r) {
-                    var r, t, u = c();
+                    var o, t = u();
-                    o && 0 < o.length && (r = {
+                    r && 0 < r.length && (o = {
-                        param1: o.shift(),
+                        param1: r.shift(),
                         param2: {
-                            subparam1: u
+                            subparam1: t
                         }
-                    }, t = function() {
+                    },
-                        n(o);
+                    console.log(JSON.stringify(o)),
-                    }, console.log(JSON.stringify(r)), t());
+                    n(r));
                 }
             };
         }
@@ -2530,3 +2538,530 @@ issue_3297_3: {
         '{"param1":3,"param2":{"subparam1":42}}',
     ]
 }
+
+cross_references_1: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var Math = {
+            square: function(n) {
+                return n * n;
+            }
+        };
+        console.log((function(factory) {
+            return factory();
+        })(function() {
+            return function(Math) {
+                return function(n) {
+                    return Math.square(n);
+                };
+            }(Math);
+        })(3));
+    }
+    expect: {
+        var Math = {
+            square: function(n) {
+                return n * n;
+            }
+        };
+        console.log(function(Math) {
+            return function(n) {
+                return Math.square(n);
+            };
+        }(Math)(3));
+    }
+    expect_stdout: "9"
+}
+
+cross_references_2: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        hoist_props: true,
+        inline: true,
+        passes: 4,
+        pure_getters: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var Math = {
+            square: function(n) {
+                return n * n;
+            }
+        };
+        console.log((function(factory) {
+            return factory();
+        })(function() {
+            return function(Math) {
+                return function(n) {
+                    return Math.square(n);
+                };
+            }(Math);
+        })(3));
+    }
+    expect: {
+        console.log(9);
+    }
+    expect_stdout: "9"
+}
+
+cross_references_3: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var Math = {
+            square: function(n) {
+                return n * n;
+            },
+            cube: function(n) {
+                return n * n * n;
+            }
+        };
+        console.log(function(factory) {
+            return factory();
+        }(function() {
+            return function(Math) {
+                return function(n) {
+                    Math = {
+                        square: function(x) {
+                            return "(SQUARE" + x + ")";
+                        },
+                        cube: function(x) {
+                            return "(CUBE" + x + ")";
+                        }
+                    };
+                    return Math.square(n) + Math.cube(n);
+                };
+            }(Math);
+        })(2));
+        console.log(Math.square(3), Math.cube(3));
+    }
+    expect: {
+        var Math = {
+            square: function(n) {
+                return n * n;
+            },
+            cube: function(n) {
+                return n * n * n;
+            }
+        };
+        console.log(function(Math) {
+            return function(n) {
+                Math = {
+                    square: function(x) {
+                        return "(SQUARE" + x + ")";
+                    },
+                    cube: function(x) {
+                        return "(CUBE" + x + ")";
+                    }
+                };
+                return Math.square(n) + Math.cube(n);
+            };
+        }(Math)(2));
+        console.log(Math.square(3), Math.cube(3));
+    }
+    expect_stdout: [
+        "(SQUARE2)(CUBE2)",
+        "9 27",
+    ]
+}
+
+loop_inline: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function(o) {
+            function g(p) {
+                return o[p];
+            }
+            function h(q) {
+                while (g(q));
+            }
+            return h;
+        }([ 1, "foo", 0 ])(2));
+    }
+    expect: {
+        console.log(function(o) {
+            return function(q) {
+                while (p = q, o[p]);
+                var p;
+            };
+        }([ 1, "foo", 0 ])(2));
+    }
+    expect_stdout: "undefined"
+}
+
+functions: {
+    options = {
+        functions: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        !function() {
+            var a = function a() {
+                return a && "a";
+            };
+            var b = function x() {
+                return !!x;
+            };
+            var c = function(c) {
+                return c;
+            };
+            if (c(b(a()))) {
+                var d = function() {};
+                var e = function y() {
+                    return typeof y;
+                };
+                var f = function(f) {
+                    return f;
+                };
+                console.log(a(d()), b(e()), c(f(42)), typeof d, e(), typeof f);
+            }
+        }();
+    }
+    expect: {
+        !function() {
+            function a() {
+                return a && "a";
+            }
+            function b() {
+                return !!b;
+            }
+            var c = function(c) {
+                return c;
+            };
+            if (c(b(a()))) {
+                function d() {}
+                function e() {
+                    return typeof e;
+                }
+                var f = function(f) {
+                    return f;
+                };
+                console.log(a(d()), b(e()), c(f(42)), typeof d, e(), typeof f);
+            }
+        }();
+    }
+    expect_stdout: "a true 42 function function function"
+}
+
+functions_use_strict: {
+    options = {
+        functions: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        "use strict";
+        !function() {
+            var a = function a() {
+                return a && "a";
+            };
+            var b = function x() {
+                return !!x;
+            };
+            var c = function(c) {
+                return c;
+            };
+            if (c(b(a()))) {
+                var d = function() {};
+                var e = function y() {
+                    return typeof y;
+                };
+                var f = function(f) {
+                    return f;
+                };
+                console.log(a(d()), b(e()), c(f(42)), typeof d, e(), typeof f);
+            }
+        }();
+    }
+    expect: {
+        "use strict";
+        !function() {
+            function a() {
+                return a && "a";
+            }
+            function b() {
+                return !!b;
+            }
+            var c = function(c) {
+                return c;
+            };
+            if (c(b(a()))) {
+                var d = function() {};
+                var e = function y() {
+                    return typeof y;
+                };
+                var f = function(f) {
+                    return f;
+                };
+                console.log(a(d()), b(e()), c(f(42)), typeof d, e(), typeof f);
+            }
+        }();
+    }
+    expect_stdout: "a true 42 function function function"
+}
+
+issue_2437: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+        functions: true,
+        inline: true,
+        join_vars: true,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function foo() {
+            return bar();
+        }
+        function bar() {
+            if (xhrDesc) {
+                var req = new XMLHttpRequest();
+                var result = !!req.onreadystatechange;
+                Object.defineProperty(XMLHttpRequest.prototype, 'onreadystatechange', xhrDesc || {});
+                return result;
+            } else {
+                var req = new XMLHttpRequest();
+                var detectFunc = function(){};
+                req.onreadystatechange = detectFunc;
+                var result = req[SYMBOL_FAKE_ONREADYSTATECHANGE_1] === detectFunc;
+                req.onreadystatechange = null;
+                return result;
+            }
+        }
+        console.log(foo());
+    }
+    expect: {
+        console.log(function() {
+            if (xhrDesc) {
+                var result = !!(req = new XMLHttpRequest()).onreadystatechange;
+                return Object.defineProperty(XMLHttpRequest.prototype, "onreadystatechange", xhrDesc || {}),
+                    result;
+            }
+            function detectFunc() {}
+            var req;
+            (req = new XMLHttpRequest()).onreadystatechange = detectFunc;
+            result = req[SYMBOL_FAKE_ONREADYSTATECHANGE_1] === detectFunc;
+            return req.onreadystatechange = null, result;
+        }());
+    }
+}
+
+issue_2485: {
+    options = {
+        functions: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var foo = function(bar) {
+            var n = function(a, b) {
+                return a + b;
+            };
+            var sumAll = function(arg) {
+                return arg.reduce(n, 0);
+            };
+            var runSumAll = function(arg) {
+                return sumAll(arg);
+            };
+            bar.baz = function(arg) {
+                var n = runSumAll(arg);
+                return (n.get = 1), n;
+            };
+            return bar;
+        };
+        var bar = foo({});
+        console.log(bar.baz([1, 2, 3]));
+    }
+    expect: {
+        var foo = function(bar) {
+            function n(a, b) {
+                return a + b;
+            }
+            function runSumAll(arg) {
+                return function(arg) {
+                    return arg.reduce(n, 0);
+                }(arg);
+            }
+            bar.baz = function(arg) {
+                var n = runSumAll(arg);
+                return (n.get = 1), n;
+            };
+            return bar;
+        };
+        var bar = foo({});
+        console.log(bar.baz([1, 2, 3]));
+    }
+    expect_stdout: "6"
+}
+
+issue_3364: {
+    options = {
+        functions: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    mangle = {}
+    input: {
+        var s = 2, a = 100, b = 10, c = 0;
+        function f(p, e, r) {
+            try {
+                for (var i = 1; i-- > 0;)
+                    var a = function(x) {
+                        function g(y) {
+                            y && y[a++];
+                        }
+                        var x = g(--s >= 0 && f(c++));
+                        for (var j = 1; --j > 0;);
+                    }();
+            } catch (e) {
+                try {
+                    return;
+                } catch (z) {
+                    for (var k = 1; --k > 0;) {
+                        for (var l = 1; l > 0; --l) {
+                            var n = function() {};
+                            for (var k in n)
+                                var o = (n, k);
+                        }
+                    }
+                }
+            }
+        }
+        var r = f();
+        console.log(c);
+    }
+    expect: {
+        var s = 2, c = 0;
+        (function n(r, o, a) {
+            try {
+                for (var f = 1; f-- >0;)
+                    var t = function(r) {
+                        (function(r) {
+                            r && r[t++];
+                        })(--s >= 0 && n(c++));
+                        for (var o = 1; --o > 0;);
+                    }();
+            } catch (o) {
+                try {
+                    return;
+                } catch (r) {
+                    for (var v = 1; --v > 0;)
+                        for (var i = 1; i > 0;--i) {
+                            function u() {}
+                            for (var v in u);
+                        }
+                }
+            }
+        })();
+        console.log(c);
+    }
+    expect_stdout: "2"
+}
+
+issue_3366: {
+    options = {
+        functions: true,
+        inline: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            function g() {
+                return function() {};
+            }
+            var a = g();
+            (function() {
+                this && a && console.log("PASS");
+            })();
+        }
+        f();
+    }
+    expect: {
+        void function() {
+            this && a && console.log("PASS");
+        }();
+        function a() {}
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3371: {
+    options = {
+        functions: true,
+        inline: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var a = function f() {
+                (function() {
+                    console.log(typeof f);
+                })();
+            };
+            while (a());
+        })();
+    }
+    expect: {
+        (function() {
+            function a() {
+                console.log(typeof a);
+            }
+            while (a());
+        })();
+    }
+    expect_stdout: "function"
+}
+
+class_iife: {
+    options = {
+        inline: true,
+        sequences: true,
+        toplevel: true,
+    }
+    input: {
+        var A = function() {
+            function B() {}
+            B.prototype.m = function() {
+                console.log("PASS");
+            };
+            return B;
+        }();
+        new A().m();
+    }
+    expect: {
+        var A = (B.prototype.m = function() {
+            console.log("PASS");
+        }, B);
+        function B() {}
+        new A().m();
+    }
+    expect_stdout: "PASS"
+}

test/compress/ie8.js

@@ -861,3 +861,111 @@ issue_3215_4: {
     }
     expect_stdout: "PASS"
 }
+
+issue_3355_1: {
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        (function f() {
+            var f;
+        })();
+        (function g() {
+        })();
+        console.log(typeof f === typeof g);
+    }
+    expect: {
+        (function o() {
+            var o;
+        })();
+        (function o() {
+        })();
+        console.log(typeof f === typeof g);
+    }
+    expect_stdout: "true"
+}
+
+issue_3355_2: {
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        (function f() {
+            var f;
+        })();
+        (function g() {
+        })();
+        console.log(typeof f === typeof g);
+    }
+    expect: {
+        (function f() {
+            var f;
+        })();
+        (function g() {
+        })();
+        console.log(typeof f === typeof g);
+    }
+    expect_stdout: "true"
+}
+
+issue_3355_3: {
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        !function(a) {
+            "aaaaaaaaaa";
+            a();
+            var b = function c() {
+                var c = 42;
+                console.log("FAIL");
+            };
+        }(function() {
+            console.log("PASS");
+        });
+    }
+    expect: {
+        !function(a) {
+            "aaaaaaaaaa";
+            a();
+            var o = function a() {
+                var a = 42;
+                console.log("FAIL");
+            };
+        }(function() {
+            console.log("PASS");
+        });
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3355_4: {
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        !function(a) {
+            "aaaaaaaaaa";
+            a();
+            var b = function c() {
+                var c = 42;
+                console.log("FAIL");
+            };
+        }(function() {
+            console.log("PASS");
+        });
+    }
+    expect: {
+        !function(a) {
+            "aaaaaaaaaa";
+            a();
+            var o = function n() {
+                var n = 42;
+                console.log("FAIL");
+            };
+        }(function() {
+            console.log("PASS");
+        });
+    }
+    expect_stdout: "PASS"
+}

test/compress/issue-1639.js

@@ -1,4 +1,3 @@
-
 issue_1639_1: {
     options = {
         booleans: true,
@@ -12,7 +11,6 @@ issue_1639_1: {
     }
     input: {
         var a = 100, b = 10;
-
         var L1 = 5;
         while (--L1 > 0) {
             if ((--b), false) {
@@ -21,7 +19,6 @@ issue_1639_1: {
                 }
             }
         }
-
         console.log(a, b);
     }
     expect: {
@@ -29,7 +26,7 @@ issue_1639_1: {
             if (--b, 0) var ignore = 0;
         console.log(a, b);
     }
-    expect_stdout: true
+    expect_stdout: "100 6"
 }
 
 issue_1639_2: {
@@ -44,25 +41,23 @@ issue_1639_2: {
     }
     input: {
         var a = 100, b = 10;
-
         function f19() {
             if (++a, false)
                 if (a)
                     if (++a);
         }
         f19();
-
         console.log(a, b);
     }
     expect: {
         var a = 100, b = 10;
         function f19() {
-            ++a, 0;
+            ++a, 1;
         }
         f19(),
         console.log(a, b);
     }
-    expect_stdout: true
+    expect_stdout: "101 10"
 }
 
 issue_1639_3: {
@@ -84,5 +79,5 @@ issue_1639_3: {
         a++,
         console.log(a, b);
     }
-    expect_stdout: true
+    expect_stdout: "101 10"
 }

test/compress/loops.js

@@ -646,3 +646,30 @@ issue_2904: {
     }
     expect_stdout: "1"
 }
+
+issue_3371: {
+    options = {
+        functions: true,
+        join_vars: true,
+        loops: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var a = function() {
+                console.log("PASS");
+            };
+            while (a());
+        })();
+    }
+    expect: {
+        (function() {
+            function a() {
+                console.log("PASS");
+            }
+            for (; a(); );
+        })();
+    }
+    expect_stdout: "PASS"
+}

test/compress/reduce_vars.js

@@ -281,8 +281,8 @@ unsafe_evaluate_escaped: {
         console.log(function(){ var o={p:3},a=[o]; console.log(a[0].p++); return o.p; }());
     }
     expect: {
-        console.log(function(){ var o={p:1}; console.log(o, o.p); return o.p; }());
+        console.log(function(){ var o={p:1}; console.log(o, 1); return o.p; }());
-        console.log(function(){ var o={p:2}; console.log(o.p, o); return o.p; }());
+        console.log(function(){ var o={p:2}; console.log(2, o); return o.p; }());
         console.log(function(){ var o={p:3},a=[o]; console.log(a[0].p++); return o.p; }());
     }
     expect_stdout: true
@@ -6716,3 +6716,42 @@ issue_3297: {
     }
     expect_stdout: "true"
 }
+
+drop_side_effect_free: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a = 123;
+        "" + (a && (a.b = 0) || a);
+        console.log(a);
+    }
+    expect: {
+        var a = 123;
+        a.b = 0;
+        console.log(a);
+    }
+    expect_stdout: "123"
+}
+
+issue_3377: {
+    options = {
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function f() {
+            return f[0], (f = 42);
+        }());
+    }
+    expect: {
+        console.log(function f() {
+            return f[0], (f = 42);
+        }());
+    }
+    expect_stdout: "42"
+}

test/compress/sequences.js

@@ -702,7 +702,7 @@ side_effects_cascade_3: {
     }
     expect: {
         function f(a, b) {
-            !(b += a) && ((b = a) || (b -= a, b ^= a)),
+            (b += a) || (b = a) || (b -= a, b ^= a),
             a--;
         }
     }
@@ -924,14 +924,14 @@ call: {
         b.c = function() {
             console.log(this === b ? "bar" : "baz");
         },
-        a, b(),
+        b(),
         (a, b.c)(),
-        a, function() {
+        function() {
             console.log(this === a);
         }(),
-        a, new b(),
+        new b(),
-        a, new b.c(),
+        new b.c(),
-        a, new function() {
+        new function() {
             console.log(this === a);
         }();
     }
@@ -944,3 +944,23 @@ call: {
         "false",
     ]
 }
+
+missing_link: {
+    options = {
+        conditionals: true,
+        evaluate: true,
+        sequences: true,
+    }
+    input: {
+        var a = 100;
+        a;
+        a++ + (0 ? 2 : 1);
+        console.log(a);
+    }
+    expect: {
+        var a = 100;
+        a,
+        a++,
+        console.log(a);
+    }
+}

test/exports.js

@@ -1,7 +1,5 @@
-exports["base54"] = base54;
 exports["Compressor"] = Compressor;
 exports["defaults"] = defaults;
-exports["is_identifier"] = is_identifier;
 exports["JS_Parse_Error"] = JS_Parse_Error;
 exports["mangle_properties"] = mangle_properties;
 exports["minify"] = minify;
@@ -9,7 +7,6 @@ exports["OutputStream"] = OutputStream;
 exports["parse"] = parse;
 exports["push_uniq"] = push_uniq;
 exports["reserve_quoted_keys"] = reserve_quoted_keys;
-exports["SourceMap"] = SourceMap;
 exports["string_template"] = string_template;
 exports["tokenizer"] = tokenizer;
 exports["TreeTransformer"] = TreeTransformer;

test/jetstream.js

@@ -3,7 +3,7 @@
 
 "use strict";
 
-var site = "https://browserbench.org/JetStream";
+var site = "https://browserbench.org/JetStream1.1";
 if (typeof phantom == "undefined") {
     require("../tools/exit");
     var args = process.argv.slice(2);

test/mocha/cli.js

@@ -1,6 +1,7 @@
 var assert = require("assert");
 var exec = require("child_process").exec;
 var fs = require("fs");
+var run_code = require("../sandbox").run_code;
 
 function read(path) {
     return fs.readFileSync(path, "utf8");
@@ -714,4 +715,32 @@ describe("bin/uglifyjs", function() {
             done();
         });
     });
+    it("Should compress swarm of unused variables with reasonable performance", function(done) {
+        var code = [
+            "console.log(function() {",
+        ];
+        for (var i = 0; i < 10000; i++) {
+            code.push("var obj" + i + " = {p: " + i + "};");
+        }
+        code.push("var map = {");
+        for (var i = 0; i < 10000; i++) {
+            code.push("obj" + i + ": obj" + i + ",");
+        }
+        code = code.concat([
+            "};",
+            "return obj25.p + obj121.p + obj1024.p;",
+            "}());",
+        ]).join("\n");
+        exec(uglifyjscmd + " -mc", function(err, stdout) {
+            if (err) throw err;
+            assert.strictEqual(stdout, [
+                "console.log(function(){",
+                "var p={p:25},n={p:121},o={p:1024};",
+                "return p.p+n.p+o.p",
+                "}());\n",
+            ].join(""));
+            assert.strictEqual(run_code(stdout), run_code(code));
+            done();
+        }).stdin.end(code);
+    });
 });

test/sandbox.js

@@ -73,8 +73,10 @@ exports.run_code = function(code, reuse) {
         process.stdout.write = original_write;
         if (!reuse || code.indexOf(".prototype") >= 0) {
             context = null;
-        } else for (var key in context) {
+        } else {
-            delete context[key];
+            vm.runInContext(Object.keys(context).map(function(name) {
+                return "delete " + name;
+            }).join("\n"), context);
         }
     }
 };

tools/props.html

@@ -1,61 +1,540 @@
+<!doctype html>
 <html>
-  <head>
+<body>
-  </head>
+    <script>
-  <body>
+        !function() {
-    <script>(function(){
+            var names = [];
-      var props = {};
+            var scanned = [];
+            var to_scan = [];
 
-      function addObject(obj) {
+            function scan(obj) {
-        if (obj == null) return;
+                if (obj && typeof obj == "object" && !~scanned.indexOf(obj)) {
-        try {
+                    scanned.push(obj);
-          Object.getOwnPropertyNames(obj).forEach(add);
+                    to_scan.push(obj);
-        } catch(ex) {}
+                }
-        if (obj.prototype) {
+            }
-          Object.getOwnPropertyNames(obj.prototype).forEach(add);
-        }
-        if (typeof obj == "function") {
-          try {
-            Object.getOwnPropertyNames(new obj).forEach(add);
-          } catch(ex) {}
-        }
-      }
 
-      function add(name) {
+            scan(self);
-        props[name] = true;
+            [
-      }
+                "a",
+                "abbr",
+                "acronym",
+                "address",
+                "applet",
+                "area",
+                "article",
+                "aside",
+                "audio",
+                "b",
+                "base",
+                "basefont",
+                "bdi",
+                "bdo",
+                "bgsound",
+                "big",
+                "blink",
+                "blockquote",
+                "body",
+                "br",
+                "button",
+                "canvas",
+                "caption",
+                "center",
+                "checked",
+                "cite",
+                "code",
+                "col",
+                "colgroup",
+                "command",
+                "comment",
+                "compact",
+                "content",
+                "data",
+                "datalist",
+                "dd",
+                "declare",
+                "defer",
+                "del",
+                "details",
+                "dfn",
+                "dialog",
+                "dir",
+                "disabled",
+                "div",
+                "dl",
+                "dt",
+                "element",
+                "em",
+                "embed",
+                "fieldset",
+                "figcaption",
+                "figure",
+                "font",
+                "footer",
+                "form",
+                "frame",
+                "frameset",
+                "h1",
+                "h2",
+                "h3",
+                "h4",
+                "h5",
+                "h6",
+                "head",
+                "header",
+                "hgroup",
+                "hr",
+                "html",
+                "i",
+                "iframe",
+                "image",
+                "img",
+                "input",
+                "ins",
+                "isindex",
+                "ismap",
+                "kbd",
+                "keygen",
+                "label",
+                "legend",
+                "li",
+                "link",
+                "listing",
+                "main",
+                "map",
+                "mark",
+                "marquee",
+                "math",
+                "menu",
+                "menuitem",
+                "meta",
+                "meter",
+                "multicol",
+                "multiple",
+                "nav",
+                "nobr",
+                "noembed",
+                "noframes",
+                "nohref",
+                "noresize",
+                "noscript",
+                "noshade",
+                "nowrap",
+                "object",
+                "ol",
+                "optgroup",
+                "option",
+                "output",
+                "p",
+                "param",
+                "picture",
+                "plaintext",
+                "pre",
+                "progress",
+                "q",
+                "rb",
+                "readonly",
+                "rp",
+                "rt",
+                "rtc",
+                "ruby",
+                "s",
+                "samp",
+                "script",
+                "section",
+                "select",
+                "selected",
+                "shadow",
+                "small",
+                "source",
+                "spacer",
+                "span",
+                "strike",
+                "strong",
+                "style",
+                "sub",
+                "summary",
+                "sup",
+                "svg",
+                "table",
+                "tbody",
+                "td",
+                "template",
+                "textarea",
+                "tfoot",
+                "th",
+                "thead",
+                "time",
+                "title",
+                "tr",
+                "track",
+                "tt",
+                "u",
+                "ul",
+                "var",
+                "video",
+                "wbr",
+                "xmp",
+                "XXX",
+            ].forEach(function(tag) {
+                scan(document.createElement(tag));
+            });
+            [
+                "abort",
+                "absolutedeviceorientation",
+                "activate",
+                "active",
+                "addsourcebuffer",
+                "addstream",
+                "addtrack",
+                "afterprint",
+                "afterscriptexecute",
+                "afterupdate",
+                "animationcancel",
+                "animationend",
+                "animationiteration",
+                "animationstart",
+                "appinstalled",
+                "audioend",
+                "audioprocess",
+                "audiostart",
+                "autocomplete",
+                "autocompleteerror",
+                "auxclick",
+                "beforeactivate",
+                "beforecopy",
+                "beforecut",
+                "beforedeactivate",
+                "beforeeditfocus",
+                "beforeinstallprompt",
+                "beforepaste",
+                "beforeprint",
+                "beforescriptexecute",
+                "beforeunload",
+                "beforeupdate",
+                "blocked",
+                "blur",
+                "bounce",
+                "boundary",
+                "cached",
+                "cancel",
+                "candidatewindowhide",
+                "candidatewindowshow",
+                "candidatewindowupdate",
+                "canplay",
+                "canplaythrough",
+                "cellchange",
+                "change",
+                "chargingchange",
+                "chargingtimechange",
+                "checking",
+                "click",
+                "close",
+                "compassneedscalibration",
+                "complete",
+                "connect",
+                "connecting",
+                "connectionstatechange",
+                "contextmenu",
+                "controllerchange",
+                "controlselect",
+                "copy",
+                "cuechange",
+                "cut",
+                "dataavailable",
+                "datachannel",
+                "datasetchanged",
+                "datasetcomplete",
+                "dblclick",
+                "deactivate",
+                "devicechange",
+                "devicelight",
+                "devicemotion",
+                "deviceorientation",
+                "deviceorientationabsolute",
+                "deviceproximity",
+                "dischargingtimechange",
+                "disconnect",
+                "display",
+                "downloading",
+                "drag",
+                "dragend",
+                "dragenter",
+                "dragexit",
+                "dragleave",
+                "dragover",
+                "dragstart",
+                "drop",
+                "durationchange",
+                "emptied",
+                "encrypted",
+                "end",
+                "ended",
+                "enter",
+                "enterpictureinpicture",
+                "error",
+                "errorupdate",
+                "exit",
+                "filterchange",
+                "finish",
+                "focus",
+                "focusin",
+                "focusout",
+                "freeze",
+                "fullscreenchange",
+                "fullscreenerror",
+                "gesturechange",
+                "gestureend",
+                "gesturestart",
+                "gotpointercapture",
+                "hashchange",
+                "help",
+                "icecandidate",
+                "iceconnectionstatechange",
+                "icegatheringstatechange",
+                "inactive",
+                "input",
+                "invalid",
+                "keydown",
+                "keypress",
+                "keyup",
+                "languagechange",
+                "layoutcomplete",
+                "leavepictureinpicture",
+                "levelchange",
+                "load",
+                "loadeddata",
+                "loadedmetadata",
+                "loadend",
+                "loading",
+                "loadingdone",
+                "loadingerror",
+                "loadstart",
+                "losecapture",
+                "lostpointercapture",
+                "mark",
+                "message",
+                "messageerror",
+                "mousedown",
+                "mouseenter",
+                "mouseleave",
+                "mousemove",
+                "mouseout",
+                "mouseover",
+                "mouseup",
+                "mousewheel",
+                "move",
+                "moveend",
+                "movestart",
+                "mozfullscreenchange",
+                "mozfullscreenerror",
+                "mozorientationchange",
+                "mozpointerlockchange",
+                "mozpointerlockerror",
+                "mscontentzoom",
+                "msfullscreenchange",
+                "msfullscreenerror",
+                "msgesturechange",
+                "msgesturedoubletap",
+                "msgestureend",
+                "msgesturehold",
+                "msgesturestart",
+                "msgesturetap",
+                "msgotpointercapture",
+                "msinertiastart",
+                "mslostpointercapture",
+                "msmanipulationstatechanged",
+                "msneedkey",
+                "msorientationchange",
+                "mspointercancel",
+                "mspointerdown",
+                "mspointerenter",
+                "mspointerhover",
+                "mspointerleave",
+                "mspointermove",
+                "mspointerout",
+                "mspointerover",
+                "mspointerup",
+                "mssitemodejumplistitemremoved",
+                "msthumbnailclick",
+                "negotiationneeded",
+                "nomatch",
+                "noupdate",
+                "obsolete",
+                "offline",
+                "online",
+                "open",
+                "orientationchange",
+                "pagechange",
+                "pagehide",
+                "pageshow",
+                "paste",
+                "pause",
+                "play",
+                "playing",
+                "pluginstreamstart",
+                "pointercancel",
+                "pointerdown",
+                "pointerenter",
+                "pointerleave",
+                "pointerlockchange",
+                "pointerlockerror",
+                "pointermove",
+                "pointerout",
+                "pointerover",
+                "pointerup",
+                "popstate",
+                "progress",
+                "propertychange",
+                "ratechange",
+                "reading",
+                "readystatechange",
+                "rejectionhandled",
+                "removesourcebuffer",
+                "removestream",
+                "removetrack",
+                "reset",
+                "resize",
+                "resizeend",
+                "resizestart",
+                "resourcetimingbufferfull",
+                "result",
+                "resume",
+                "rowenter",
+                "rowexit",
+                "rowsdelete",
+                "rowsinserted",
+                "scroll",
+                "search",
+                "seeked",
+                "seeking",
+                "select",
+                "selectionchange",
+                "selectstart",
+                "show",
+                "signalingstatechange",
+                "soundend",
+                "soundstart",
+                "sourceclose",
+                "sourceclosed",
+                "sourceended",
+                "sourceopen",
+                "speechend",
+                "speechstart",
+                "stalled",
+                "start",
+                "statechange",
+                "stop",
+                "storage",
+                "storagecommit",
+                "submit",
+                "success",
+                "suspend",
+                "textinput",
+                "timeout",
+                "timeupdate",
+                "toggle",
+                "touchcancel",
+                "touchend",
+                "touchmove",
+                "touchstart",
+                "track",
+                "transitioncancel",
+                "transitionend",
+                "transitionrun",
+                "transitionstart",
+                "unhandledrejection",
+                "unload",
+                "updateready",
+                "upgradeneeded",
+                "userproximity",
+                "versionchange",
+                "visibilitychange",
+                "voiceschanged",
+                "volumechange",
+                "vrdisplayactivate",
+                "vrdisplayconnect",
+                "vrdisplaydeactivate",
+                "vrdisplaydisconnect",
+                "vrdisplaypresentchange",
+                "waiting",
+                "waitingforkey",
+                "warning",
+                "webkitanimationend",
+                "webkitanimationiteration",
+                "webkitanimationstart",
+                "webkitcurrentplaybacktargetiswirelesschanged",
+                "webkitfullscreenchange",
+                "webkitfullscreenerror",
+                "webkitkeyadded",
+                "webkitkeyerror",
+                "webkitkeymessage",
+                "webkitneedkey",
+                "webkitorientationchange",
+                "webkitplaybacktargetavailabilitychanged",
+                "webkitpointerlockchange",
+                "webkitpointerlockerror",
+                "webkitresourcetimingbufferfull",
+                "webkittransitionend",
+                "wheel",
+                "zoom",
+            ].forEach(function(type) {
+                [
+                    "beforeunloadevent",
+                    "compositionevent",
+                    "customevent",
+                    "devicemotionevent",
+                    "deviceorientationevent",
+                    "dragevent",
+                    "event",
+                    "events",
+                    "focusevent",
+                    "hashchangeevent",
+                    "htmlevents",
+                    "keyboardevent",
+                    "messageevent",
+                    "mouseevent",
+                    "mouseevents",
+                    "storageevent",
+                    "svgevents",
+                    "textevent",
+                    "touchevent",
+                    "uievent",
+                    "uievents",
+                ].forEach(function(interface) {
+                    try {
+                        var event = document.createEvent(interface);
+                        event.initEvent(type, true, true);
+                        scan(event);
+                    } catch (e) {}
+                });
+            });
 
-      Object.getOwnPropertyNames(window).forEach(function(thing){
+            var obj;
-        addObject(window[thing]);
+            while (obj = to_scan.shift()) {
-      });
+                var proto = obj;
-
+                do {
-      try {
+                    Object.getOwnPropertyNames(proto).forEach(function(name) {
-        addObject(new Event("click"));
+                        var visited = ~names.indexOf(name);
-        addObject(new Event("contextmenu"));
+                        if (!visited) names.push(name);
-        addObject(new Event("mouseup"));
+                        try {
-        addObject(new Event("mousedown"));
+                            scan(obj[name]);
-        addObject(new Event("keydown"));
+                            if (visited) return;
-        addObject(new Event("keypress"));
+                            if (/^create/.test(name)) {
-        addObject(new Event("keyup"));
+                                scan(obj[name]());
-      } catch(ex) {}
+                            }
-
+                            if (/^[A-Z]/.test(name)) {
-      var ta = document.createElement("textarea");
+                                scan(new obj[name]());
-      ta.style.width = "100%";
+                            }
-      ta.style.height = "20em";
+                        } catch (e) {}
-      ta.style.boxSizing = "border-box";
+                    });
-      <!-- ta.value = Object.keys(props).sort(cmp).map(function(name){ -->
+                } while (proto = Object.getPrototypeOf(proto));
-      <!--   return JSON.stringify(name); -->
+            }
-      <!-- }).join(",\n"); -->
+            names.sort();
-      ta.value = JSON.stringify({
+            document.write('<pre>[\n    "');
-        vars: [],
+            document.write(names.join('",\n    "'));
-        props: Object.keys(props).sort(cmp)
+            document.write('"\n]</pre>');
-      }, null, 2);
+        }();
-      document.body.appendChild(ta);
+    </script>
-
+</body>
-      function cmp(a, b) {
-        a = a.toLowerCase();
-        b = b.toLowerCase();
-        return a < b ? -1 : a > b ? 1 : 0;
-      }
-    })();</script>
-  </body>
 </html>