Merge branch 'master' into next

sokra · sokra · commit 758f1eb464c4 · 2017-12-12T14:45:09.000+01:00
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -278,6 +278,15 @@ class Parser extends Tapable {
 				res.setNumber(left.number / right.number);
 				res.setRange(expr.range);
 				return res;
+			} else if(expr.operator === "**") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(Math.pow(left.number, right.number));
+				res.setRange(expr.range);
+				return res;
 			} else if(expr.operator === "==" || expr.operator === "===") {
 				left = this.evaluateExpression(expr.left);
 				right = this.evaluateExpression(expr.right);
@@ -304,6 +313,60 @@ class Parser extends Tapable {
 				} else if(left.isBoolean() && right.isBoolean()) {
 					return res.setBoolean(left.bool !== right.bool);
 				}
+			} else if(expr.operator === "&") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number & right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === "|") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number | right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === "^") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number ^ right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === ">>>") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number >>> right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === ">>") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number >> right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === "<<") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number << right.number);
+				res.setRange(expr.range);
+				return res;
 			}
 		});
 		this.plugin("evaluate UnaryExpression", expr => {
@@ -352,6 +415,14 @@ class Parser extends Tapable {
 				} else if(argument.isNumber()) {
 					return new BasicEvaluatedExpression().setBoolean(!argument.number).setRange(expr.range);
 				}
+			} else if(expr.operator === "~") {
+				const argument = this.evaluateExpression(expr.argument);
+				if(!argument) return;
+				if(!argument.isNumber()) return;
+				const res = new BasicEvaluatedExpression();
+				res.setNumber(~argument.number);
+				res.setRange(expr.range);
+				return res;
 			}
 		});
 		this.plugin("evaluate typeof undefined", expr => {
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -1006,6 +1006,10 @@
                 }
               ]
             },
+            "ident": {
+              "description": "Unique loader identifier",
+              "type": "string"
+            },
             "query": {
               "description": "Loader query",
               "anyOf": [
diff --git a/test/Parser.unittest.js b/test/Parser.unittest.js
@@ -311,6 +311,16 @@ describe("Parser", () => {
 			"1": "number=1",
 			"1 + 3": "number=4",
 			"3 - 1": "number=2",
+			"2 * 3": "number=6",
+			"8 / 2": "number=4",
+			"2 ** 3": "number=8",
+			"12 & 5": "number=4",
+			"12 | 5": "number=13",
+			"12 ^ 5": "number=9",
+			"9 >>> 2": "number=2",
+			"9 >> 2": "number=2",
+			"9 << 2": "number=36",
+			"~3": "number=-4",
 			"1 == 1": "bool=true",
 			"1 === 1": "bool=true",
 			"3 != 1": "bool=true",
diff --git a/test/configCases/loaders/remaining-request/webpack.config.js b/test/configCases/loaders/remaining-request/webpack.config.js
@@ -7,8 +7,8 @@ module.exports = {
 					"./loader1",
 					{
 						loader: "./loader2",
+						ident: "loader2",
 						options: {
-							ident: "loader2",
 							f: function() {
 								return "ok";
 							}

Original file line number	Diff line number	Diff line change
`@@ -1006,6 +1006,10 @@`
`1006`	`1006`	`}`
`1007`	`1007`	`]`
`1008`	`1008`	`},`
	`1009`	`+ "ident": {`
	`1010`	`+ "description": "Unique loader identifier",`
	`1011`	`+ "type": "string"`
	`1012`	`+ },`
`1009`	`1013`	`"query": {`
`1010`	`1014`	`"description": "Loader query",`
`1011`	`1015`	`"anyOf": [`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ module.exports = {`
`7`	`7`	`"./loader1",`
`8`	`8`	`{`
`9`	`9`	`loader: "./loader2",`
	`10`	`+ ident: "loader2",`
`10`	`11`	`options: {`
`11`		`- ident: "loader2",`
`12`	`12`	`f: function() {`
`13`	`13`	`return "ok";`
`14`	`14`	`}`