track free vars over IIFEs

sokra · sokra · commit 783e251691f3 · 2013-12-31T12:23:58.000+01:00
webpack#138
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -549,17 +549,40 @@ Parser.prototype.walkExpression = function walkExpression(expression) {
 			this.walkExpressions(expression.arguments);
 		break;
 	case "CallExpression":
-		var callee = this.evaluateExpression(expression.callee);
-		if(callee.isIdentifier()) {
-			var result = this.applyPluginsBailResult("call " + callee.identifier, expression);
-			if(result === true)
-				break;
-		}
+		if(expression.callee.type === "FunctionExpression" && expression.arguments) {
+			// (function(...) { }(...))
+			var args = expression.arguments.map(function(arg) {
+				var result = this.evaluateExpression(arg);
+				if(!result.isIdentifier()) result = undefined;
+				if(!result) {
+					this.walkExpression(arg);
+					return;
+				}
+				return result.identifier;
+			}, this);
+			this.inScope(expression.callee.params.filter(function(identifier, idx) {
+				return identifier.name !== args[idx];
+			}), function() {
+				if(expression.callee.body.type === "BlockStatement")
+					this.walkStatement(expression.callee.body);
+				else
+					this.walkExpression(expression.callee.body);
+			}.bind(this));
 
-		if(expression.callee)
-			this.walkExpression(expression.callee);
-		if(expression.arguments)
-			this.walkExpressions(expression.arguments);
+		} else {
+
+			var callee = this.evaluateExpression(expression.callee);
+			if(callee.isIdentifier()) {
+				var result = this.applyPluginsBailResult("call " + callee.identifier, expression);
+				if(result === true)
+					break;
+			}
+
+			if(expression.callee)
+				this.walkExpression(expression.callee);
+			if(expression.arguments)
+				this.walkExpressions(expression.arguments);
+		}
 		break;
 	case "MemberExpression":
 		var expr = expression;
diff --git a/test/cases/parsing/extract-amd/index.js b/test/cases/parsing/extract-amd/index.js
@@ -178,3 +178,14 @@ it("should parse a bound function expression 4", function(done) {
 		done();
 	}.bind(null, 123));
 });
+
+it("should not fail issue #138 second", function() {
+	(function(define, global) { 'use strict';
+		define(function (require) {
+			(typeof require).should.be.eql("function");
+			require("./a").should.be.eql("a");
+			return "#138 2.";
+		});
+	})(typeof define === 'function' && define.amd ? define : function (factory) { module.exports = factory(require); }, this);
+	module.exports.should.be.eql("#138 2.");
+});
