allow to pass functions to rules.use and return arrays

sokra · sokra · commit 594f639282c5 · 2017-11-08T19:34:05.000+01:00
diff --git a/lib/RuleSet.js b/lib/RuleSet.js
@@ -228,6 +228,9 @@ module.exports = class RuleSet {
 	}
 
 	static normalizeUse(use, ident) {
+		if(typeof use === "function") {
+			return data => RuleSet.normalizeUse(use(data), ident);
+		}
 		if(Array.isArray(use)) {
 			return use
 				.map((item, idx) => RuleSet.normalizeUse(item, `${ident}-${idx}`))
@@ -236,14 +239,6 @@ module.exports = class RuleSet {
 		return [RuleSet.normalizeUseItem(use, ident)];
 	}
 
-	static normalizeUseItemFunction(use, data) {
-		const result = use(data);
-		if(typeof result === "string") {
-			return RuleSet.normalizeUseItem(result);
-		}
-		return result;
-	}
-
 	static normalizeUseItemString(useItemString) {
 		const idx = useItemString.indexOf("?");
 		if(idx >= 0) {
@@ -258,9 +253,6 @@ module.exports = class RuleSet {
 	}
 
 	static normalizeUseItem(item, ident) {
-		if(typeof item === "function")
-			return item;
-
 		if(typeof item === "string") {
 			return RuleSet.normalizeUseItemString(item);
 		}
@@ -385,13 +377,20 @@ module.exports = class RuleSet {
 		});
 
 		if(rule.use) {
-			rule.use.forEach((use) => {
-				result.push({
-					type: "use",
-					value: typeof use === "function" ? RuleSet.normalizeUseItemFunction(use, data) : use,
-					enforce: rule.enforce
-				});
-			});
+			const process = use => {
+				if(typeof use === "function") {
+					process(use(data));
+				} else if(Array.isArray(use)) {
+					use.forEach(process);
+				} else {
+					result.push({
+						type: "use",
+						value: use,
+						enforce: rule.enforce
+					});
+				}
+			};
+			process(rule.use);
 		}
 
 		if(rule.rules) {
diff --git a/test/configCases/rule-set/simple-use-array-fn/a.js b/test/configCases/rule-set/simple-use-array-fn/a.js
@@ -0,0 +1 @@
+module.exports = ["a"];
diff --git a/test/configCases/rule-set/simple-use-array-fn/ab.js b/test/configCases/rule-set/simple-use-array-fn/ab.js
@@ -0,0 +1 @@
+module.exports = ["ab"];
diff --git a/test/configCases/rule-set/simple-use-array-fn/b.js b/test/configCases/rule-set/simple-use-array-fn/b.js
@@ -0,0 +1,2 @@
+module.exports = [require("./a")];
+
diff --git a/test/configCases/rule-set/simple-use-array-fn/c.js b/test/configCases/rule-set/simple-use-array-fn/c.js
@@ -0,0 +1 @@
+// never used
diff --git a/test/configCases/rule-set/simple-use-array-fn/index.js b/test/configCases/rule-set/simple-use-array-fn/index.js
@@ -0,0 +1,21 @@
+it("should match only one rule in a oneOf block", function() {
+	var ab = require("./ab");
+	ab.should.be.eql([
+		"ab",
+		"?first"
+	]);
+});
+it("should match with issuer and any option value", function() {
+	var a = require("./a");
+	var b = require("./b");
+	a.should.be.eql([
+		"a",
+		"?third",
+	]);
+	b.should.be.eql([[
+		"a",
+		"second-3",
+		"?second-2",
+		"?second-1",
+	]]);
+});
diff --git a/test/configCases/rule-set/simple-use-array-fn/loader.js b/test/configCases/rule-set/simple-use-array-fn/loader.js
@@ -0,0 +1,8 @@
+module.exports = function(source) {
+	var query = this.query;
+	if(typeof query === "object" && typeof query.get === "function") {
+		query = query.get();
+	}
+	return source + "\nmodule.exports.push(" + JSON.stringify(query) + ");";
+};
+
diff --git a/test/configCases/rule-set/simple-use-array-fn/webpack.config.js b/test/configCases/rule-set/simple-use-array-fn/webpack.config.js
@@ -0,0 +1,50 @@
+module.exports = {
+	module: {
+		rules: [
+			{ oneOf: [
+				{
+					test: {
+						and: [
+							/a.\.js$/,
+							/b\.js$/
+						]
+					},
+					loader: "./loader?first"
+				},
+				{
+					test: [
+						require.resolve("./a"),
+						require.resolve("./c"),
+					],
+					issuer: require.resolve("./b"),
+					use: data => ([
+						"./loader?second-1",
+						{
+							loader: "./loader",
+							options: "second-2"
+						},
+						{
+							loader: "./loader",
+							options: {
+								get: function() {
+									return "second-3";
+								}
+							}
+						}
+					])
+				},
+				{
+					test: {
+						or: [
+							require.resolve("./a"),
+							require.resolve("./c"),
+						]
+					},
+					loader: "./loader",
+					options: "third"
+				}
+			] }
+		]
+	}
+};
+

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+module.exports = [require("./a")];`
	`2`	`+`