diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/compress.js | 39 | ||||
| -rw-r--r-- | lib/transform.js | 1 |
2 files changed, 39 insertions, 1 deletions
diff --git a/lib/compress.js b/lib/compress.js index 24cdc026..56fb6851 100644 --- a/lib/compress.js +++ b/lib/compress.js @@ -1589,6 +1589,45 @@ merge(Compressor.prototype, { operator: "+", right: make_node(AST_String, self, { value: "" }) }); + case "Function": + if (self.args[self.args.length - 1] instanceof AST_String) { + // quite a corner-case, but we can handle it: + // https://github.com/mishoo/UglifyJS2/issues/203 + // if the code argument is a constant, then we can minify it. + try { + var code = "(function(" + self.args.slice(0, -1).map(function(arg){ + return arg.value; + }).join(",") + "){" + self.args[self.args.length - 1].value + "})()"; + var ast = parse(code); + ast.figure_out_scope(); + var comp = new Compressor(compressor.options); + ast = ast.transform(comp); + ast.figure_out_scope(); + ast.mangle_names(); + var fun = ast.body[0].body.expression; + var args = fun.argnames.map(function(arg, i){ + return make_node(AST_String, self.args[i], { + value: arg.print_to_string() + }); + }); + var code = OutputStream(); + AST_BlockStatement.prototype._codegen.call(fun, fun, code); + code = code.toString().replace(/^\{|\}$/g, ""); + args.push(make_node(AST_String, self.args[self.args.length - 1], { + value: code + })); + self.args = args; + return self; + } catch(ex) { + if (ex instanceof JS_Parse_Error) { + compressor.warn("Error parsing code passed to new Function [{file}:{line},{col}]", self.args[self.args.length - 1].start); + compressor.warn(ex.toString()); + } else { + console.log(ex); + } + } + } + break; } } else if (exp instanceof AST_Dot && exp.property == "toString" && self.args.length == 0) { diff --git a/lib/transform.js b/lib/transform.js index 8b4fd9fd..7a61e5f3 100644 --- a/lib/transform.js +++ b/lib/transform.js @@ -44,7 +44,6 @@ "use strict"; // Tree transformer helpers. -// XXX: eventually I should refactor the compressor to use this infrastructure. function TreeTransformer(before, after) { TreeWalker.call(this); |