unify CLI & API under minify() (#1811)

- rename `screw_ie8` to `ie8` - rename `mangle.except` to `mangle.reserved` - rename `mangle.properties.ignore_quoted` to `mangle.properties.keep_quoted` - compact `sourceMap` options - more stringent verification on input `options` - toplevel shorthands - `ie8` - `keep_fnames` - `toplevel` - `warnings` - support arrays and unquoted string values on CLI - drop `fromString` from `minify()` - `minify()` no longer handles any `fs` operations - unify order of operations for `mangle_properties()` on CLI & API - `bin/uglifyjs` used to `mangle_properties()` before even `Compressor` - `minify()` used to `mangle_properties()` after `Compressor` but before `mangle_names()` - both will now do `Compressor`, `mangle_names()` then `mangle_properties()` - `options.parse` / `--parse` for parser options beyond `bare_returns` - add `mangle.properties.builtins` to disable built-in reserved list - disable with `--mangle-props builtins` on CLI - `warnings` now off by default - add `--warn` and `--verbose` on CLI - drop `--enclose` - drop `--export-all` - drop `--reserved-file` - use `--mangle reserved` instead - drop `--reserve-domprops` - enabled by default, disable with `--mangle-props domprops` - drop `--prefix` - use `--source-map base` instead - drop `--lint` - remove `bin/extract-props.js` - limit exposure of internal APIs - update documentations closes #96 closes #102 closes #136 closes #166 closes #243 closes #254 closes #261 closes #311 closes #700 closes #748 closes #912 closes #1072 closes #1366 fixes #101 fixes #123 fixes #124 fixes #263 fixes #379 fixes #419 fixes #423 fixes #461 fixes #465 fixes #576 fixes #737 fixes #772 fixes #958 fixes #1036 fixes #1142 fixes #1175 fixes #1220 fixes #1223 fixes #1280 fixes #1359 fixes #1368
2017-04-15 23:50:50 +08:00
parent 32deb365d5
commit ec443e422c
43 changed files with 6566 additions and 7402 deletions
--- a/test/compress/ascii.js
+++ b/test/compress/ascii.js
@@ -2,7 +2,7 @@ ascii_only_true: {
    options = {}
    beautify = {
        ascii_only : true,
-        screw_ie8  : true,
+        ie8        : false,
        beautify   : false,
    }
    input: {
@@ -20,7 +20,7 @@ ascii_only_false: {
    options = {}
    beautify = {
        ascii_only : false,
-        screw_ie8  : true,
+        ie8        : false,
        beautify   : false,
    }
    input: {
@@ -33,4 +33,3 @@ ascii_only_false: {
    }
    expect_exact: 'function f(){return"\\x000\\x001\\x007\\08\\0"+"\\0\x01\x02\x03\x04\x05\x06\x07\\b\\t\\n\\v\\f\\r\x0e\x0f"+"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"+\' !"# ... }~\x7f\x80\x81 ... \xfe\xff\u0fff\uffff\'}'
 }
-
--- a/test/compress/issue-1321.js
+++ b/test/compress/issue-1321.js
@@ -1,6 +1,6 @@
 issue_1321_no_debug: {
    mangle_props = {
-        ignore_quoted: true
+        keep_quoted: true
    }
    input: {
        var x = {};
@@ -19,7 +19,7 @@ issue_1321_no_debug: {

 issue_1321_debug: {
    mangle_props = {
-        ignore_quoted: true,
+        keep_quoted: true,
        debug: ""
    }
    input: {
@@ -39,7 +39,7 @@ issue_1321_debug: {

 issue_1321_with_quoted: {
    mangle_props = {
-        ignore_quoted: false
+        keep_quoted: false
    }
    input: {
        var x = {};
--- a/test/compress/issue-1446.js
+++ b/test/compress/issue-1446.js
@@ -23,7 +23,7 @@ typeof_eq_undefined: {
 typeof_eq_undefined_ie8: {
    options = {
        comparisons: true,
-        screw_ie8: false
+        ie8: true,
    }
    input: {
        var a = typeof b != "undefined";
--- a/test/compress/issue-1588.js
+++ b/test/compress/issue-1588.js
@@ -1,9 +1,9 @@
 screw_ie8: {
    options = {
-        screw_ie8: true,
+        ie8: false,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        try { throw "foo"; } catch (x) { console.log(x); }
@@ -16,10 +16,10 @@ screw_ie8: {

 support_ie8: {
    options = {
-        screw_ie8: false,
+        ie8: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        try { throw "foo"; } catch (x) { console.log(x); }
--- a/test/compress/issue-1704.js
+++ b/test/compress/issue-1704.js
@@ -1,10 +1,10 @@
 mangle_catch: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    input: {
@@ -22,11 +22,11 @@ mangle_catch: {

 mangle_catch_ie8: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    input: {
@@ -44,11 +44,11 @@ mangle_catch_ie8: {

 mangle_catch_var: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    input: {
@@ -66,11 +66,11 @@ mangle_catch_var: {

 mangle_catch_var_ie8: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    input: {
@@ -88,11 +88,11 @@ mangle_catch_var_ie8: {

 mangle_catch_toplevel: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    input: {
@@ -110,11 +110,11 @@ mangle_catch_toplevel: {

 mangle_catch_ie8_toplevel: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    input: {
@@ -132,11 +132,11 @@ mangle_catch_ie8_toplevel: {

 mangle_catch_var_toplevel: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    input: {
@@ -154,11 +154,11 @@ mangle_catch_var_toplevel: {

 mangle_catch_var_ie8_toplevel: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    input: {
@@ -176,11 +176,11 @@ mangle_catch_var_ie8_toplevel: {

 mangle_catch_redef_1: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    input: {
@@ -198,11 +198,11 @@ mangle_catch_redef_1: {

 mangle_catch_redef_1_ie8: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    input: {
@@ -220,11 +220,11 @@ mangle_catch_redef_1_ie8: {

 mangle_catch_redef_1_toplevel: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    input: {
@@ -242,11 +242,11 @@ mangle_catch_redef_1_toplevel: {

 mangle_catch_redef_1_ie8_toplevel: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    input: {
@@ -264,11 +264,11 @@ mangle_catch_redef_1_ie8_toplevel: {

 mangle_catch_redef_2: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    input: {
@@ -285,11 +285,11 @@ mangle_catch_redef_2: {

 mangle_catch_redef_2_ie8: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    input: {
@@ -306,11 +306,11 @@ mangle_catch_redef_2_ie8: {

 mangle_catch_redef_2_toplevel: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    input: {
@@ -327,11 +327,11 @@ mangle_catch_redef_2_toplevel: {

 mangle_catch_redef_2_ie8_toplevel: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    input: {
--- a/test/compress/issue-1733.js
+++ b/test/compress/issue-1733.js
@@ -1,6 +1,6 @@
 function_iife_catch: {
    mangle = {
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        function f(n) {
@@ -21,7 +21,7 @@ function_iife_catch: {

 function_iife_catch_ie8: {
    mangle = {
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        function f(n) {
@@ -42,7 +42,7 @@ function_iife_catch_ie8: {

 function_catch_catch: {
    mangle = {
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        var o = 0;
@@ -70,7 +70,7 @@ function_catch_catch: {

 function_catch_catch_ie8: {
    mangle = {
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        var o = 0;
--- a/test/compress/loops.js
+++ b/test/compress/loops.js
@@ -245,7 +245,7 @@ issue_1532: {
 issue_186: {
    beautify = {
        beautify: false,
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        var x = 3;
@@ -264,7 +264,7 @@ issue_186: {
 issue_186_ie8: {
    beautify = {
        beautify: false,
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        var x = 3;
@@ -283,7 +283,7 @@ issue_186_ie8: {
 issue_186_beautify: {
    beautify = {
        beautify: true,
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        var x = 3;
@@ -310,7 +310,7 @@ issue_186_beautify: {
 issue_186_beautify_ie8: {
    beautify = {
        beautify: true,
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        var x = 3;
@@ -340,7 +340,7 @@ issue_186_bracketize: {
    beautify = {
        beautify: false,
        bracketize: true,
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        var x = 3;
@@ -360,7 +360,7 @@ issue_186_bracketize_ie8: {
    beautify = {
        beautify: false,
        bracketize: true,
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        var x = 3;
@@ -380,7 +380,7 @@ issue_186_beautify_bracketize: {
    beautify = {
        beautify: true,
        bracketize: true,
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        var x = 3;
@@ -412,7 +412,7 @@ issue_186_beautify_bracketize_ie8: {
    beautify = {
        beautify: true,
        bracketize: true,
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        var x = 3;
--- a/test/compress/properties.js
+++ b/test/compress/properties.js
@@ -13,7 +13,7 @@ keep_properties: {
 dot_properties: {
    options = {
        properties: true,
-        screw_ie8: false
+        ie8: true,
    };
    input: {
        a["foo"] = "bar";
@@ -36,7 +36,7 @@ dot_properties: {
 dot_properties_es5: {
    options = {
        properties: true,
-        screw_ie8: true
+        ie8: false,
    };
    input: {
        a["foo"] = "bar";
@@ -125,7 +125,7 @@ evaluate_string_length: {

 mangle_properties: {
    mangle_props = {
-        ignore_quoted: false
+        keep_quoted: false
    };
    input: {
        a["foo"] = "bar";
@@ -148,7 +148,7 @@ mangle_unquoted_properties: {
        properties: false
    }
    mangle_props = {
-        ignore_quoted: true
+        keep_quoted: true
    }
    beautify = {
        beautify: false,
@@ -233,12 +233,12 @@ mangle_debug_suffix: {
    }
 }

-mangle_debug_suffix_ignore_quoted: {
+mangle_debug_suffix_keep_quoted: {
    options = {
        properties: false
    }
    mangle_props = {
-        ignore_quoted: true,
+        keep_quoted: true,
        debug: "XYZ",
        reserved: []
    }
--- a/test/compress/screw-ie8.js
+++ b/test/compress/screw-ie8.js
@@ -1,9 +1,9 @@
 do_screw: {
    options = {
-        screw_ie8: true,
+        ie8: false,
    }
    beautify = {
-        screw_ie8: true,
+        ie8: false,
        ascii_only: true,
    }
    input: {
@@ -14,10 +14,10 @@ do_screw: {

 dont_screw: {
    options = {
-        screw_ie8: false,
+        ie8: true,
    }
    beautify = {
-        screw_ie8: false,
+        ie8: true,
        ascii_only: true,
    }
    input: {
@@ -28,7 +28,7 @@ dont_screw: {

 do_screw_constants: {
    options = {
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        f(undefined, Infinity);
@@ -38,7 +38,7 @@ do_screw_constants: {

 dont_screw_constants: {
    options = {
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        f(undefined, Infinity);
@@ -47,9 +47,15 @@ dont_screw_constants: {
 }

 do_screw_try_catch: {
-    options = { screw_ie8: true };
-    mangle = { screw_ie8: true };
-    beautify = { screw_ie8: true };
+    options = {
+        ie8: false,
+    }
+    mangle = {
+        ie8: false,
+    }
+    beautify = {
+        ie8: false,
+    }
    input: {
        good = function(e){
            return function(error){
@@ -75,9 +81,15 @@ do_screw_try_catch: {
 }

 dont_screw_try_catch: {
-    options = { screw_ie8: false };
-    mangle = { screw_ie8: false };
-    beautify = { screw_ie8: false };
+    options = {
+        ie8: true,
+    }
+    mangle = {
+        ie8: true,
+    }
+    beautify = {
+        ie8: true,
+    }
    input: {
        bad = function(e){
            return function(error){
@@ -103,9 +115,15 @@ dont_screw_try_catch: {
 }

 do_screw_try_catch_undefined: {
-    options = { screw_ie8: true };
-    mangle = { screw_ie8: true };
-    beautify = { screw_ie8: true };
+    options = {
+        ie8: false,
+    }
+    mangle = {
+        ie8: false,
+    }
+    beautify = {
+        ie8: false,
+    }
    input: {
        function a(b){
            try {
@@ -132,9 +150,15 @@ do_screw_try_catch_undefined: {
 }

 dont_screw_try_catch_undefined: {
-    options = { screw_ie8: false };
-    mangle = { screw_ie8: false };
-    beautify = { screw_ie8: false };
+    options = {
+        ie8: true,
+    }
+    mangle = {
+        ie8: true,
+    }
+    beautify = {
+        ie8: true,
+    }
    input: {
        function a(b){
            try {
@@ -164,11 +188,11 @@ reduce_vars: {
    options = {
        evaluate: true,
        reduce_vars: true,
-        screw_ie8: false,
+        ie8: true,
        unused: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        function f() {
@@ -196,10 +220,10 @@ reduce_vars: {

 issue_1586_1: {
    options = {
-        screw_ie8: false,
+        ie8: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        function f() {
@@ -215,10 +239,10 @@ issue_1586_1: {

 issue_1586_2: {
    options = {
-        screw_ie8: true,
+        ie8: false,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        function f() {