diff --git a/README.md b/README.md index 1cf44629..c57e658a 100644 --- a/README.md +++ b/README.md @@ -298,27 +298,64 @@ like this: var UglifyJS = require("uglify-es"); ``` -There is a single high level minification function, `minify(files, options)`, which will +There is a single high level minification function, `minify(code, options)`, which will performs all the steps in a configurable manner. Example: ```javascript -var result = UglifyJS.minify("var b = function() {};"); -console.log(result.code); // minified output -console.log(result.error); // runtime error +var code = "function add(first, second) { return first + second; }"; +var result = UglifyJS.minify(code); +console.log(result.error); // runtime error, or `undefined` if no error +console.log(result.code); // minified output: function add(n,d){return n+d} ``` You can also compress multiple files: ```javascript -var result = UglifyJS.minify({ - "file1.js": "var a = function() {};", - "file2.js": "var b = function() {};" -}); -console.log(result.code); +var code = { + "file1.js": "function add(first, second) { return first + second; }", + "file2.js": "console.log(add(1 + 2, 3 + 4));" +}; +var result = UglifyJS.minify(code); +console.log(result.code); // function add(d,n){return d+n}console.log(add(3,7)); +``` + +The `toplevel` option: +```javascript +var code = { + "file1.js": "function add(first, second) { return first + second; }", + "file2.js": "console.log(add(1 + 2, 3 + 4));" +}; +var options = { toplevel: true }; +var result = UglifyJS.minify(code, options); +console.log(result.code); // console.log(function(n,o){return n+o}(3,7)); +``` + +To produce warnings: +```javascript +var code = "function f(){ var u; return 2 + 3; }"; +var options = { warnings: true }; +var result = UglifyJS.minify(code, options); +console.log(result.error); // runtime error, `undefined` in this case +console.log(result.warnings); // [ 'Dropping unused variable u [0:1,18]' ] +console.log(result.code); // function f(){return 5} +``` + +An error example: +```javascript +var result = UglifyJS.minify({"foo.js" : "if (0) else console.log(1);"}); +console.log(JSON.stringify(result.error)); +// {"message":"Unexpected token: keyword (else)","filename":"foo.js","line":1,"col":7,"pos":7} +``` +Note: unlike `uglify-js@2.x`, the `3.x` API does not throw errors. To +achieve a similar effect one could do the following: +```javascript +var result = UglifyJS.minify(code, options); +if (result.error) throw result.error; ``` ## Minify options -- `warnings` (default `false`) — pass `true` to display compressor warnings. +- `warnings` (default `false`) — pass `true` to return compressor warnings + in `result.warnings`. Use the value `"verbose"` for more detailed warnings. - `parse` (default `{}`) — pass an object if you wish to specify some additional [parse options](#parse-options). @@ -344,7 +381,7 @@ console.log(result.code); - `ie8` (default `false`) - set to `true` to support IE8. -## Minify option structure +## Minify options structure ```javascript { @@ -499,8 +536,8 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u - `cascade` -- small optimization for sequences, transform `x, x` into `x` and `x = something(), x` into `x = something()` -- `collapse_vars` -- Collapse single-use `var` and `const` definitions - when possible. +- `collapse_vars` -- Collapse single-use non-constant variables - side + effects permitting. - `reduce_vars` -- Improve optimization on variables assigned with and used as constant values. @@ -725,8 +762,8 @@ Another way of doing that is to declare your globals as constants in a separate file and include it into the build. For example you can have a `build/defines.js` file with the following: ```javascript -const DEBUG = false; -const PRODUCTION = true; +var DEBUG = false; +var PRODUCTION = true; // etc. ``` diff --git a/lib/compress.js b/lib/compress.js index 33bb8f57..28534247 100644 --- a/lib/compress.js +++ b/lib/compress.js @@ -940,12 +940,12 @@ merge(Compressor.prototype, { continue loop; case stat instanceof AST_If: if (stat.body instanceof AST_Return) { + var value = stat.body.value; //--- // pretty silly case, but: // if (foo()) return; return; ==> foo(); return; - if (((in_lambda && ret.length == 0) - || (ret[0] instanceof AST_Return && !ret[0].value)) - && !stat.body.value && !stat.alternative) { + if ((in_lambda && ret.length == 0 || ret[0] instanceof AST_Return && !ret[0].value) + && !value && !stat.alternative) { CHANGED = true; var cond = make_node(AST_SimpleStatement, stat.condition, { body: stat.condition @@ -955,7 +955,7 @@ merge(Compressor.prototype, { } //--- // if (foo()) return x; return y; ==> return foo() ? x : y; - if (ret[0] instanceof AST_Return && stat.body.value && ret[0].value && !stat.alternative) { + if (ret[0] instanceof AST_Return && value && ret[0].value && !stat.alternative) { CHANGED = true; stat = stat.clone(); stat.alternative = ret[0]; @@ -965,7 +965,7 @@ merge(Compressor.prototype, { //--- // if (foo()) return x; [ return ; ] ==> return foo() ? x : undefined; if (multiple_if_returns && (ret.length == 0 || ret[0] instanceof AST_Return) - && stat.body.value && !stat.alternative && in_lambda) { + && value && !stat.alternative && in_lambda) { CHANGED = true; stat = stat.clone(); stat.alternative = ret[0] || make_node(AST_Return, stat, { @@ -975,8 +975,8 @@ merge(Compressor.prototype, { continue loop; } //--- - // if (foo()) return; [ else x... ]; y... ==> if (!foo()) { x...; y... } - if (!stat.body.value && in_lambda) { + // if (foo()) return [ void bar() ]; [ else x...; ] y... ==> if (!foo()) { x...; y... } else bar(); + if (in_lambda && (!value || value instanceof AST_UnaryPrefix && value.operator == "void")) { CHANGED = true; stat = stat.clone(); stat.condition = stat.condition.negate(compressor); @@ -985,11 +985,12 @@ merge(Compressor.prototype, { stat.body = make_node(AST_BlockStatement, stat, { body: body }); - stat.alternative = null; + stat.alternative = value ? make_node(AST_SimpleStatement, value, { + body: value.expression + }) : null; ret = funs.concat([ stat.transform(compressor) ]); continue loop; } - //--- // if (a) return b; if (c) return d; e; ==> return a ? b : c ? d : void e; // diff --git a/package.json b/package.json index 0f63b307..3a4735c0 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "homepage": "https://github.com/mishoo/UglifyJS2/tree/harmony", "author": "Mihai Bazon (http://lisperator.net/)", "license": "BSD-2-Clause", - "version": "3.0.9", + "version": "3.0.10", "engines": { "node": ">=0.8.0" }, diff --git a/test/compress/if_return.js b/test/compress/if_return.js index 0ac45c3c..c09d67b6 100644 --- a/test/compress/if_return.js +++ b/test/compress/if_return.js @@ -302,3 +302,25 @@ issue_1437_conditionals: { } } } + +issue_512: { + options = { + conditionals: true, + if_return: true, + } + input: { + function a() { + if (b()) { + c(); + return; + } + throw e; + } + } + expect: { + function a() { + if (!b()) throw e; + c(); + } + } +} diff --git a/test/mocha/cli.js b/test/mocha/cli.js index 3c673b4a..abb0f368 100644 --- a/test/mocha/cli.js +++ b/test/mocha/cli.js @@ -19,7 +19,9 @@ describe("bin/uglifyjs", function () { eval(stdout); assert.strictEqual(typeof WrappedUglifyJS, 'object'); - assert.strictEqual(WrappedUglifyJS.minify("foo([true,,2+3]);").code, "foo([!0,,5]);"); + var result = WrappedUglifyJS.minify("foo([true,,2+3]);"); + assert.strictEqual(result.error, undefined); + assert.strictEqual(result.code, "foo([!0,,5]);"); done(); }); diff --git a/test/mocha/spidermonkey.js b/test/mocha/spidermonkey.js index a8a112d0..9bddb537 100644 --- a/test/mocha/spidermonkey.js +++ b/test/mocha/spidermonkey.js @@ -15,7 +15,9 @@ describe("spidermonkey export/import sanity test", function() { eval(stdout); assert.strictEqual(typeof SpiderUglify, "object"); - assert.strictEqual(SpiderUglify.minify("foo([true,,2+3]);").code, "foo([!0,,5]);"); + var result = SpiderUglify.minify("foo([true,,2+3]);"); + assert.strictEqual(result.error, undefined); + assert.strictEqual(result.code, "foo([!0,,5]);"); done(); });