allow a['b'] instead of a.b

sokra · sokra · commit 7af71d4a6943 · 2016-06-04T12:06:10.000+02:00
fixed webpack#2228
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -234,8 +234,10 @@ Parser.prototype.initializeEvaluating = function() {
 	this.plugin("evaluate MemberExpression", function(expression) {
 		var expr = expression;
 		var exprName = [];
-		while(expr.type === "MemberExpression" && !expr.computed) {
-			exprName.unshift(expr.property.name);
+		while(expr.type === "MemberExpression" &&
+			expr.property.type === (expr.computed ? "Literal" : "Identifier")
+		) {
+			exprName.unshift(expr.property.name || expr.property.value);
 			expr = expr.object;
 		}
 		if(expr.type === "Identifier") {
@@ -255,10 +257,11 @@ Parser.prototype.initializeEvaluating = function() {
 	});
 	this.plugin("evaluate CallExpression", function(expr) {
 		if(expr.callee.type !== "MemberExpression") return;
-		if(expr.callee.computed) return;
+		if(expr.callee.property.type !== (expr.callee.computed ? "Literal" : "Identifier")) return;
 		var param = this.evaluateExpression(expr.callee.object);
 		if(!param) return;
-		return this.applyPluginsBailResult("evaluate CallExpression ." + expr.callee.property.name, expr, param);
+		var property = expr.callee.property.name || expr.callee.property.value;
+		return this.applyPluginsBailResult("evaluate CallExpression ." + property, expr, param);
 	});
 	this.plugin("evaluate CallExpression .replace", function(expr, param) {
 		if(!param.isString()) return;
@@ -683,8 +686,10 @@ Parser.prototype.walkUnaryExpression = function walkUnaryExpression(expression)
 	if(expression.operator === "typeof") {
 		var expr = expression.argument;
 		var exprName = [];
-		while(expr.type === "MemberExpression" && !expr.computed) {
-			exprName.unshift(expr.property.name);
+		while(expr.type === "MemberExpression" &&
+			expr.property.type === (expr.computed ? "Literal" : "Identifier")
+		) {
+			exprName.unshift(expr.property.name || expr.property.value);
 			expr = expr.object;
 		}
 		if(expr.type === "Identifier" && this.scope.definitions.indexOf(expr.name) === -1) {
@@ -821,8 +826,10 @@ Parser.prototype.walkCallExpression = function walkCallExpression(expression) {
 Parser.prototype.walkMemberExpression = function walkMemberExpression(expression) {
 	var expr = expression;
 	var exprName = [];
-	while(expr.type === "MemberExpression" && !expr.computed) {
-		exprName.unshift(expr.property.name);
+	while(expr.type === "MemberExpression" &&
+		expr.property.type === (expr.computed ? "Literal" : "Identifier")
+	) {
+		exprName.unshift(expr.property.name || expr.property.value);
 		expr = expr.object;
 	}
 	if(expr.type === "Identifier" && this.scope.definitions.indexOf(expr.name) === -1) {
diff --git a/test/Parser.test.js b/test/Parser.test.js
@@ -19,13 +19,27 @@ describe("Parser", function() {
 				cdeabc: ["membertest"]
 			}
 		],
+		"call member using bracket notation": [
+			function() {
+				cde["abc"]("membertest");
+			}, {
+				cdeabc: ["membertest"]
+			}
+		],
 		"call inner member": [
 			function() {
 				cde.ddd.abc("inner");
 			}, {
 				cdedddabc: ["inner"]
 			}
 		],
+		"call inner member using bracket notation": [
+			function() {
+				cde.ddd["abc"]("inner");
+			}, {
+				cdedddabc: ["inner"]
+			}
+		],
 		"expression": [
 			function() {
 				fgh;
@@ -227,10 +241,13 @@ describe("Parser", function() {
 			"typeof 'str'": "string=string",
 			"typeof aString": "string=string",
 			"typeof b.Number": "string=number",
+			"typeof b['Number']": "string=number",
 			"typeof b[Number]": "",
 			"b.Number": "number=123",
+			"b['Number']": "number=123",
 			"b[Number]": "",
 			"'abc'.substr(1)": "string=bc",
+			"'abc'[\"substr\"](1)": "string=bc",
 			"'abc'[substr](1)": "",
 		};
 
