[Parser] Support rename this's property for IIFE

ljqx · ljqx · commit 9bff9ac1078f · 2017-06-16T19:40:53.000+08:00
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -1059,16 +1059,18 @@ class Parser extends Tapable {
 	walkCallExpression(expression) {
 		let result;
 
-		function walkIIFE(functionExpression, options) {
-			const params = functionExpression.params;
-			const args = options.map(function(arg) {
-				const renameIdentifier = this.getRenameIdentifier(arg);
-				if(renameIdentifier && this.applyPluginsBailResult1("can-rename " + renameIdentifier, arg)) {
-					if(!this.applyPluginsBailResult1("rename " + renameIdentifier, arg))
+		function walkIIFE(functionExpression, options, currentThis) {
+			function renameArgOrThis(argOrThis) {
+				const renameIdentifier = this.getRenameIdentifier(argOrThis);
+				if(renameIdentifier && this.applyPluginsBailResult1("can-rename " + renameIdentifier, argOrThis)) {
+					if(!this.applyPluginsBailResult1("rename " + renameIdentifier, argOrThis))
 						return renameIdentifier;
 				}
-				this.walkExpression(arg);
-			}, this);
+				this.walkExpression(argOrThis);
+			}
+			const params = functionExpression.params;
+			const args = options.map(renameArgOrThis, this);
+			const renameThis = currentThis ? renameArgOrThis.call(this, currentThis) : null;
 			this.inScope(params.filter(function(identifier, idx) {
 				return !args[idx];
 			}), function() {
@@ -1078,6 +1080,9 @@ class Parser extends Tapable {
 					if(!params[i] || params[i].type !== "Identifier") continue;
 					this.scope.renames["$" + params[i].name] = param;
 				}
+				if(renameThis) {
+					this.scope.renames.$this = renameThis;
+				}
 				if(functionExpression.body.type === "BlockStatement") {
 					this.prewalkStatement(functionExpression.body);
 					this.walkStatement(functionExpression.body);
@@ -1090,11 +1095,10 @@ class Parser extends Tapable {
 			!expression.callee.computed &&
 			(["call", "bind"]).indexOf(expression.callee.property.name) >= 0 &&
 			expression.arguments &&
-			expression.arguments.length > 1
+			expression.arguments.length > 0
 		) {
 			// (function(...) { }.call/bind(?, ...))
-			walkIIFE.call(this, expression.callee.object, expression.arguments.slice(1));
-			this.walkExpression(expression.arguments[0]);
+			walkIIFE.call(this, expression.callee.object, expression.arguments.slice(1), expression.arguments[0]);
 		} else if(expression.callee.type === "FunctionExpression" && expression.arguments) {
 			// (function(...) { }(...))
 			walkIIFE.call(this, expression.callee, expression.arguments);
@@ -1134,8 +1138,13 @@ class Parser extends Tapable {
 			exprName.unshift(expr.property.name || expr.property.value);
 			expr = expr.object;
 		}
-		if(expr.type === "Identifier" && this.scope.definitions.indexOf(expr.name) === -1) {
-			exprName.unshift(this.scope.renames["$" + expr.name] || expr.name);
+		if((expr.type === "Identifier" && this.scope.definitions.indexOf(expr.name) === -1) ||
+			(expr.type === "ThisExpression" && this.scope.renames.$this)) {
+			if(expr.type === "Identifier") {
+				exprName.unshift(this.scope.renames["$" + expr.name] || expr.name);
+			} else {
+				exprName.unshift(this.scope.renames.$this);
+			}
 			let result = this.applyPluginsBailResult1("expression " + exprName.join("."), expression);
 			if(result === true)
 				return;
