Skip to content

Commit c745597

Browse files
sokrasokra
committed
support for define([], obj), cs closure in r.e
fixes webpack#371 fixes webpack#407
1 parent 2f78151 commit c745597

File tree

7 files changed

+134
-81
lines changed

7 files changed

+134
-81
lines changed

‎lib/dependencies/AMDDefineDependency.js‎

Lines changed: 35 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -21,66 +21,42 @@ AMDDefineDependency.Template = function AMDRequireDependencyTemplate() {};
2121

2222
AMDDefineDependency.Template.prototype.apply = function(dep, source, outputOptions, requestShortener) {
2323
var localModuleVar = dep.localModule && dep.localModule.used && dep.localModule.variableName();
24-
if(localModuleVar) {
25-
if(dep.objectRange && !dep.functionRange) {
26-
// define("name", {...})
27-
// => var XXX; !(XXX = {...})
28-
source.insert(0, "var " + localModuleVar + ";");
29-
source.replace(dep.range[0], dep.objectRange[0]-1,
30-
"!(" + localModuleVar + " = ");
31-
source.replace(dep.objectRange[1], dep.range[1]-1, ")");
32-
} else if(!dep.arrayRange && dep.functionRange && !dep.objectRange) {
33-
// define("name", function() {...})
34-
// => var XXX; !(XXX = (function() {...}.call(exports, __webpack_require__, exports, module)))
35-
source.insert(0, "var " + localModuleVar + ";");
36-
source.replace(dep.range[0], dep.functionRange[0]-1,
37-
"!(" + localModuleVar + " = (");
38-
source.replace(dep.functionRange[1], dep.range[1]-1, ".call(exports, __webpack_require__, exports, module)))");
39-
} else if(dep.arrayRange && dep.functionRange && !dep.objectRange) {
40-
// define("name", [], function() {...})
41-
// => var __WEBPACK_AMD_DEFINE_ARRAY__, XXX; !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], XXX = (function() {...}.apply(null, __WEBPACK_AMD_DEFINE_ARRAY__)))
42-
source.insert(0, "var __WEBPACK_AMD_DEFINE_ARRAY__, " + localModuleVar + ";");
43-
source.replace(dep.range[0], dep.arrayRange[0]-1,
44-
"!(__WEBPACK_AMD_DEFINE_ARRAY__ = ");
45-
source.replace(dep.arrayRange[1], dep.functionRange[0]-1, ", " + localModuleVar + " = (");
46-
source.replace(dep.functionRange[1], dep.range[1]-1, ".apply(null, __WEBPACK_AMD_DEFINE_ARRAY__)))");
47-
} else if(dep.functionRange && dep.objectRange) {
48-
// define("name", abc)
49-
// => var __WEBPACK_AMD_DEFINE_FACTORY__, XXX; !(__WEBPACK_AMD_DEFINE_FACTORY__ = (abc), XXX = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? (__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module)) : __WEBPACK_AMD_DEFINE_FACTORY__))
50-
source.insert(0, "var __WEBPACK_AMD_DEFINE_FACTORY__, " + localModuleVar + ";");
51-
source.replace(dep.range[0], dep.functionRange[0]-1,
52-
"!(__WEBPACK_AMD_DEFINE_FACTORY__ = (");
53-
source.replace(dep.functionRange[1], dep.range[1]-1, "), " + localModuleVar + " = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? (__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module)) : __WEBPACK_AMD_DEFINE_FACTORY__))");
24+
function replace(def, text) {
25+
if(localModuleVar) text = text.replace(/XXX/g, localModuleVar.replace(/\$/g, "$$$$"));
26+
if(localModuleVar) def = def.replace(/XXX/g, localModuleVar.replace(/\$/g, "$$$$"));
27+
var texts = text.split("#");
28+
if(def)
29+
source.insert(0, def);
30+
var current = dep.range[0];
31+
if(dep.arrayRange) {
32+
source.replace(current, dep.arrayRange[0]-1, texts.shift());
33+
current = dep.arrayRange[1];
5434
}
55-
} else {
56-
if(dep.objectRange && !dep.functionRange) {
57-
// define(["name", ]{...})
58-
// => !(module.exports = {...})
59-
source.replace(dep.range[0], dep.objectRange[0]-1,
60-
"!(module.exports = ");
61-
source.replace(dep.objectRange[1], dep.range[1]-1, ")");
62-
} else if(!dep.arrayRange && dep.functionRange && !dep.objectRange) {
63-
// define(["name", ]function() {...})
64-
// => var __WEBPACK_AMD_DEFINE_RESULT__; !(__WEBPACK_AMD_DEFINE_RESULT__ = (function() {...}.call(exports, __webpack_require__, exports, module)), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))
65-
source.insert(0, "var __WEBPACK_AMD_DEFINE_RESULT__;");
66-
source.replace(dep.range[0], dep.functionRange[0]-1,
67-
"!(__WEBPACK_AMD_DEFINE_RESULT__ = (");
68-
source.replace(dep.functionRange[1], dep.range[1]-1, ".call(exports, __webpack_require__, exports, module)), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))");
69-
} else if(dep.arrayRange && dep.functionRange && !dep.objectRange) {
70-
// define(["name", ][], function() {...})
71-
// => var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__; !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_RESULT__ = (function() {...}.apply(null, __WEBPACK_AMD_DEFINE_ARRAY__)), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))
72-
source.insert(0, "var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;");
73-
source.replace(dep.range[0], dep.arrayRange[0]-1,
74-
"!(__WEBPACK_AMD_DEFINE_ARRAY__ = ");
75-
source.replace(dep.arrayRange[1], dep.functionRange[0]-1, ", __WEBPACK_AMD_DEFINE_RESULT__ = (");
76-
source.replace(dep.functionRange[1], dep.range[1]-1, ".apply(null, __WEBPACK_AMD_DEFINE_ARRAY__)), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))");
77-
} else if(dep.functionRange && dep.objectRange) {
78-
// define(["name", ]abc)
79-
// => var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__; !(__WEBPACK_AMD_DEFINE_FACTORY__ = (abc), (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? (__WEBPACK_AMD_DEFINE_RESULT__ = __WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__)) : module.exports = __WEBPACK_AMD_DEFINE_FACTORY__))
80-
source.insert(0, "var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;");
81-
source.replace(dep.range[0], dep.functionRange[0]-1,
82-
"!(__WEBPACK_AMD_DEFINE_FACTORY__ = (");
83-
source.replace(dep.functionRange[1], dep.range[1]-1, "), (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? (__WEBPACK_AMD_DEFINE_RESULT__ = __WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__)) : module.exports = __WEBPACK_AMD_DEFINE_FACTORY__))");
35+
if(dep.objectRange) {
36+
source.replace(current, dep.objectRange[0]-1, texts.shift());
37+
current = dep.objectRange[1];
38+
} else if(dep.functionRange) {
39+
source.replace(current, dep.functionRange[0]-1, texts.shift());
40+
current = dep.functionRange[1];
8441
}
42+
source.replace(current, dep.range[1]-1, texts.shift());
43+
if(texts.length > 0)
44+
throw new Error("Implementation error");
8545
}
46+
var branch = (localModuleVar ? "l" : "") + (dep.arrayRange ? "a" : "") + (dep.objectRange ? "o": "") + (dep.functionRange ? "f" : "");
47+
var defs = {
48+
f: ["var __WEBPACK_AMD_DEFINE_RESULT__;", "!(__WEBPACK_AMD_DEFINE_RESULT__ = #.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))"],
49+
o: ["", "!(module.exports = #)"],
50+
of: ["var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;", "!(__WEBPACK_AMD_DEFINE_FACTORY__ = (#), __WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? (__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))"],
51+
af: ["var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;", "!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_RESULT__ = #.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))"],
52+
ao: ["", "!(#, module.exports = #)"],
53+
aof: ["var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;", "!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_FACTORY__ = (#), __WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? (__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))"],
54+
lf: ["var XXX;", "!(XXX = #.call(exports, __webpack_require__, exports, module))"],
55+
lo: ["var XXX;", "!(XXX = #)"],
56+
lof: ["var __WEBPACK_AMD_DEFINE_FACTORY__, XXX;", "!(__WEBPACK_AMD_DEFINE_FACTORY__ = (#), XXX = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? (__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module)) : __WEBPACK_AMD_DEFINE_FACTORY__))"],
57+
laf: ["var __WEBPACK_AMD_DEFINE_ARRAY__, XXX;", "!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, XXX = (#.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)))"],
58+
lao: ["var XXX;", "!(#, XXX = #)"],
59+
laof: ["var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_FACTORY__, XXX;", "!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_FACTORY__ = (#), XXX = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? (__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__))"],
60+
};
61+
replace.apply(null, defs[branch]);
8662
};

‎lib/dependencies/AMDDefineDependencyParserPlugin.js‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ AMDDefineDependencyParserPlugin.prototype.apply = function(parser) {
4848
if(expr.arguments[0].type === "Literal") {
4949
namedModule = expr.arguments[0].value;
5050
// define("...", ...)
51-
if(expr.arguments[1].type === "FunctionExpression" || isBoundFunctionExpression(expr.arguments[0])) {
51+
if(expr.arguments[1].type === "FunctionExpression" || isBoundFunctionExpression(expr.arguments[1])) {
5252
// define("...", f() {...})
5353
fn = expr.arguments[1];
5454
} else if(expr.arguments[1].type === "ObjectExpression") {
@@ -60,16 +60,35 @@ AMDDefineDependencyParserPlugin.prototype.apply = function(parser) {
6060
obj = fn = expr.arguments[1];
6161
}
6262
} else {
63-
// define([...], f() {})
6463
array = expr.arguments[0];
65-
fn = expr.arguments[1];
64+
if(expr.arguments[1].type === "FunctionExpression" || isBoundFunctionExpression(expr.arguments[1])) {
65+
// define([...], f() {})
66+
fn = expr.arguments[1];
67+
} else if(expr.arguments[1].type === "ObjectExpression") {
68+
// define([...], {...})
69+
obj = expr.arguments[1];
70+
} else {
71+
// define([...], expr)
72+
// unclear if function or object
73+
obj = fn = expr.arguments[1];
74+
}
6675
}
6776
break;
6877
case 3:
6978
// define("...", [...], f() {...})
7079
namedModule = expr.arguments[0].value;
7180
array = expr.arguments[1];
72-
fn = expr.arguments[2];
81+
if(expr.arguments[2].type === "FunctionExpression" || isBoundFunctionExpression(expr.arguments[2])) {
82+
// define("...", [...], f() {})
83+
fn = expr.arguments[2];
84+
} else if(expr.arguments[2].type === "ObjectExpression") {
85+
// define("...", [...], {...})
86+
obj = expr.arguments[2];
87+
} else {
88+
// define("...", [...], expr)
89+
// unclear if function or object
90+
obj = fn = expr.arguments[2];
91+
}
7392
break;
7493
default: return;
7594
}

‎lib/dependencies/RequireEnsureDependenciesBlockParserPlugin.js‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
var AbstractPlugin = require("../AbstractPlugin");
66
var RequireEnsureDependenciesBlock = require("./RequireEnsureDependenciesBlock");
77
var RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
8+
var getFunctionExpression = require("./getFunctionExpression");
89

910
module.exports = AbstractPlugin.create({
1011
"call require.ensure": function(expr) {
@@ -20,20 +21,14 @@ module.exports = AbstractPlugin.create({
2021
var dependencies = null;
2122
var dependenciesExpr = this.evaluateExpression(expr.arguments[0]);
2223
if(!dependenciesExpr.isArray()) return;
23-
var fnExpression = expr.arguments[1];
24+
var fnExpressionArg = expr.arguments[1];
25+
var fnExpression = getFunctionExpression(fnExpressionArg);
2426

25-
// extract the function expression from
26-
// expresions like "<FunctionExpression>.bind(<Expression>)"
27-
if(fnExpression.type === "CallExpression" &&
28-
fnExpression.callee.type === "MemberExpression" &&
29-
fnExpression.callee.object.type === "FunctionExpression" &&
30-
fnExpression.callee.property.type === "Identifier" &&
31-
fnExpression.callee.property.name === "bind" &&
32-
fnExpression.arguments.length === 1) {
33-
this.walkExpression(fnExpression.arguments[0]);
34-
fnExpression = fnExpression.callee.object;
27+
if(fnExpression) {
28+
this.walkExpressions(fnExpression.expressions);
3529
}
36-
var dep = new RequireEnsureDependenciesBlock(expr, fnExpression, chunkName, chunkNameRange, this.state.module, expr.loc);
30+
31+
var dep = new RequireEnsureDependenciesBlock(expr, fnExpression ? fnExpression.fn : fnExpressionArg, chunkName, chunkNameRange, this.state.module, expr.loc);
3732
var old = this.state.current;
3833
this.state.current = dep;
3934
try {
@@ -52,18 +47,18 @@ module.exports = AbstractPlugin.create({
5247
if(failed) {
5348
return;
5449
}
55-
if(fnExpression.type === "FunctionExpression") {
56-
if(fnExpression.body.type === "BlockStatement")
57-
this.walkStatement(fnExpression.body);
50+
if(fnExpression) {
51+
if(fnExpression.fn.body.type === "BlockStatement")
52+
this.walkStatement(fnExpression.fn.body);
5853
else
59-
this.walkExpression(fnExpression.body);
54+
this.walkExpression(fnExpression.fn.body);
6055
}
6156
old.addBlock(dep);
6257
} finally {
6358
this.state.current = old;
6459
}
65-
if(fnExpression.type !== "FunctionExpression") {
66-
this.walkExpression(fnExpression);
60+
if(!fnExpression) {
61+
this.walkExpression(fnExpressionArg);
6762
}
6863
return true;
6964
}

‎lib/dependencies/getFunctionExpression.js‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
MIT License http://www.opensource.org/licenses/mit-license.php
3+
Author Tobias Koppers @sokra
4+
*/
5+
module.exports = function(expr) {
6+
// <FunctionExpression>
7+
if(expr.type === "FunctionExpression") {
8+
return {
9+
fn: expr,
10+
expressions: []
11+
};
12+
}
13+
// <FunctionExpression>.bind(<Expression>)
14+
if(expr.type === "CallExpression" &&
15+
expr.callee.type === "MemberExpression" &&
16+
expr.callee.object.type === "FunctionExpression" &&
17+
expr.callee.property.type === "Identifier" &&
18+
expr.callee.property.name === "bind" &&
19+
expr.arguments.length === 1) {
20+
return {
21+
fn: expr.callee.object,
22+
expressions: [expr.arguments[0]]
23+
};
24+
}
25+
// (function(_this) {return <FunctionExpression>})(this) (Coffeescript)
26+
if(expr.type === "CallExpression" &&
27+
expr.callee.type === "FunctionExpression" &&
28+
expr.callee.body.type === "BlockStatement" &&
29+
expr.arguments.length === 1 &&
30+
expr.arguments[0].type === "ThisExpression" &&
31+
expr.callee.body.body &&
32+
expr.callee.body.body.length === 1 &&
33+
expr.callee.body.body[0].type === "ReturnStatement" &&
34+
expr.callee.body.body[0].argument &&
35+
expr.callee.body.body[0].argument.type === "FunctionExpression") {
36+
return {
37+
fn: expr.callee.body.body[0].argument,
38+
expressions: []
39+
};
40+
}
41+
}

‎test/cases/parsing/chunks/file.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = "ok";

‎test/cases/parsing/chunks/index.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
it("should parse a Coffeescript style function expression in require.ensure", function(done) {
2+
require.ensure([], (function(_this) {
3+
return function(require) {
4+
require("./file").should.be.eql("ok");
5+
done();
6+
};
7+
}(this)));
8+
});
9+
10+
it("should parse a bound function expression in require.ensure", function(done) {
11+
require.ensure([], function(require) {
12+
require("./file").should.be.eql("ok");
13+
done();
14+
}.bind(this));
15+
});

‎test/cases/parsing/extract-amd/index.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,10 @@ it("should not fail issue #138 second", function() {
202202
});
203203
})(typeof define === 'function' && define.amd ? define : function (factory) { module.exports = factory(require); }, this);
204204
module.exports.should.be.eql("#138 2.");
205+
});
206+
207+
it("should parse an define with empty array and object", function() {
208+
var obj = {ok: 95476};
209+
define([], obj);
210+
module.exports.should.be.eql(obj);
205211
});

0 commit comments

Comments
 (0)