allow bound function expressions in define calls

sokra · sokra · commit 6929ee0d6953 · 2013-12-31T12:20:06.000+01:00
diff --git a/lib/dependencies/AMDDefineDependencyParserPlugin.js b/lib/dependencies/AMDDefineDependencyParserPlugin.js
@@ -9,12 +9,22 @@ var ConstDependency = require("./ConstDependency");
 var AMDDefineDependency = require("./AMDDefineDependency");
 var ContextDependencyHelpers = require("./ContextDependencyHelpers");
 
+function isBoundFunctionExpression(expr) {
+	if(expr.type !== "CallExpression") return false;
+	if(expr.callee.type !== "MemberExpression") return false;
+	if(expr.callee.computed) return false;
+	if(expr.callee.object.type !== "FunctionExpression") return false;
+	if(expr.callee.property.type !== "Identifier") return false;
+	if(expr.callee.property.name !== "bind") return false;
+	return true;
+}
+
 module.exports = AbstractPlugin.create({
 	"call define": function(expr) {
 		var array, fn, obj;
 		switch(expr.arguments.length) {
 		case 1:
-			if(expr.arguments[0].type == "FunctionExpression") {
+			if(expr.arguments[0].type == "FunctionExpression" || isBoundFunctionExpression(expr.arguments[0])) {
 				// define(f() {...})
 				fn = expr.arguments[0];
 			} else if(expr.arguments[0].type === "ObjectExpression") {
@@ -29,7 +39,7 @@ module.exports = AbstractPlugin.create({
 		case 2:
 			if(expr.arguments[0].type === "Literal") {
 				// define("...", ...)
-				if(expr.arguments[1].type === "FunctionExpression") {
+				if(expr.arguments[1].type === "FunctionExpression" || isBoundFunctionExpression(expr.arguments[0])) {
 					// define("...", f() {...})
 					fn = expr.arguments[1];
 				} else if(expr.arguments[1].type === "ObjectExpression") {
@@ -69,6 +79,19 @@ module.exports = AbstractPlugin.create({
 				else
 					this.walkExpression(fn.body);
 			}.bind(this));
+		} else if(fn && isBoundFunctionExpression(fn)) {
+			var inTry = this.scope.inTry;
+			this.inScope(fn.callee.object.params.filter(function(i) {
+				return ["require", "module", "exports"].indexOf(i.name) < 0;
+			}), function() {
+				this.scope.inTry = inTry;
+				if(fn.callee.object.body.type === "BlockStatement")
+					this.walkStatement(fn.callee.object.body);
+				else
+					this.walkExpression(fn.callee.object.body);
+			}.bind(this));
+			if(fn.arguments)
+				this.walkExpressions(fn.arguments);
 		} else if(fn || obj) {
 			this.walkExpression(fn || obj);
 		}
diff --git a/test/cases/parsing/extract-amd/index.js b/test/cases/parsing/extract-amd/index.js
@@ -148,15 +148,17 @@ it("should not fail #138", function(done) {
 it("should parse a bound function expression 1", function(done) {
 	define(function(a, require, exports, module) {
 		a.should.be.eql(123);
-		require.should.be.type("function");
+		(typeof require).should.be.eql("function");
+		require("./a").should.be.eql("a");
 		done();
 	}.bind(null, 123));
 });
 
 it("should parse a bound function expression 2", function(done) {
 	define("name", function(a, require, exports, module) {
 		a.should.be.eql(123);
-		require.should.be.type("function");
+		(typeof require).should.be.eql("function");
+		require("./a").should.be.eql("a");
 		done();
 	}.bind(null, 123));
 });
