refactor ModuleFactory to take an object instead of multiple arguments

sokra · sokra · commit 711a3822fa6a · 2016-07-20T12:51:03.000+02:00
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -208,7 +208,10 @@ Compilation.prototype.addModuleDependencies = function(module, dependencies, bai
 		};
 
 		var factory = item[0];
-		factory.create(module.context, dependencies[0], function(err, dependentModule) {
+		factory.create({
+			context: module.context,
+			dependencies: dependencies
+		}, function(err, dependentModule) {
 			function isOptional() {
 				return dependencies.filter(function(d) {
 					return !d.optional;
@@ -344,7 +347,10 @@ Compilation.prototype._addModuleChain = function process(context, dependency, on
 		throw new Error("No dependency factory available for this dependency type: " + dependency.constructor.name);
 	}
 
-	moduleFactory.create(context, dependency, function(err, module) {
+	moduleFactory.create({
+		context: context,
+		dependencies: [dependency]
+	}, function(err, module) {
 		if(err) {
 			return errorAndCallback(new EntryModuleNotFoundError(err));
 		}
diff --git a/lib/ContextModuleFactory.js b/lib/ContextModuleFactory.js
@@ -18,14 +18,18 @@ module.exports = ContextModuleFactory;
 ContextModuleFactory.prototype = Object.create(Tapable.prototype);
 ContextModuleFactory.prototype.constructor = ContextModuleFactory;
 
-ContextModuleFactory.prototype.create = function(context, dependency, callback) {
+ContextModuleFactory.prototype.create = function(data, callback) {
 	var module = this;
+	var context = data.context;
+	var dependencies = data.dependencies;
+	var dependency = dependencies[0];
 	this.applyPluginsAsyncWaterfall("before-resolve", {
 		context: context,
 		request: dependency.request,
 		recursive: dependency.recursive,
 		regExp: dependency.regExp,
-		async: dependency.async
+		async: dependency.async,
+		dependencies: dependencies
 	}, function(err, result) {
 		if(err) return callback(err);
 
@@ -37,6 +41,7 @@ ContextModuleFactory.prototype.create = function(context, dependency, callback)
 		var recursive = result.recursive;
 		var regExp = result.regExp;
 		var asyncContext = result.async;
+		var dependencies = result.dependencies;
 
 		var loaders, resource, loadersPrefix = "";
 		var idx = request.lastIndexOf("!");
@@ -80,6 +85,7 @@ ContextModuleFactory.prototype.create = function(context, dependency, callback)
 				recursive: recursive,
 				regExp: regExp,
 				async: asyncContext,
+				dependencies: dependencies,
 				resolveDependencies: module.resolveDependencies.bind(module)
 			}, function(err, result) {
 				if(err) return callback(err);
diff --git a/lib/DelegatedModuleFactoryPlugin.js b/lib/DelegatedModuleFactoryPlugin.js
@@ -21,7 +21,7 @@ DelegatedModuleFactoryPlugin.prototype.apply = function(normalModuleFactory) {
 	if(scope) {
 		normalModuleFactory.plugin("factory", function(factory) {
 			return function(data, callback) {
-				var dependency = data.dependency;
+				var dependency = data.dependencies[0];
 				var request = dependency.request;
 				if(request && request.indexOf(scope + "/") === 0) {
 					var innerRequest = "." + request.substr(scope.length);
diff --git a/lib/DllModuleFactory.js b/lib/DllModuleFactory.js
@@ -13,6 +13,7 @@ module.exports = DllModuleFactory;
 DllModuleFactory.prototype = Object.create(Tapable.prototype);
 DllModuleFactory.prototype.constructor = DllModuleFactory;
 
-DllModuleFactory.prototype.create = function(context, dependency, callback) {
-	callback(null, new DllModule(context, dependency.dependencies, dependency.name, dependency.type));
+DllModuleFactory.prototype.create = function(data, callback) {
+	var dependency = data.dependencies[0];
+	callback(null, new DllModule(data.context, dependency.dependencies, dependency.name, dependency.type));
 };
diff --git a/lib/ExternalModuleFactoryPlugin.js b/lib/ExternalModuleFactoryPlugin.js
@@ -15,7 +15,7 @@ ExternalModuleFactoryPlugin.prototype.apply = function(normalModuleFactory) {
 	normalModuleFactory.plugin("factory", function(factory) {
 		return function(data, callback) {
 			var context = data.context;
-			var dependency = data.dependency;
+			var dependency = data.dependencies[0];
 
 			function handleExternal(value, type, callback) {
 				if(typeof type === "function") {
diff --git a/lib/MultiModuleFactory.js b/lib/MultiModuleFactory.js
@@ -13,6 +13,7 @@ module.exports = MultiModuleFactory;
 MultiModuleFactory.prototype = Object.create(Tapable.prototype);
 MultiModuleFactory.prototype.constructor = MultiModuleFactory;
 
-MultiModuleFactory.prototype.create = function(context, dependency, callback) {
-	callback(null, new MultiModule(context, dependency.dependencies, dependency.name));
+MultiModuleFactory.prototype.create = function(data, callback) {
+	var dependency = data.dependencies[0];
+	callback(null, new MultiModule(data.context, dependency.dependencies, dependency.name));
 };
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -135,6 +135,7 @@ function NormalModuleFactory(context, resolvers, parser, options) {
 					callback(null, {
 						context: context,
 						request: loaders.concat([resource]).join("!"),
+						dependencies: data.dependencies,
 						userRequest: userRequest,
 						rawRequest: request,
 						loaders: loaders,
@@ -151,15 +152,17 @@ module.exports = NormalModuleFactory;
 NormalModuleFactory.prototype = Object.create(Tapable.prototype);
 NormalModuleFactory.prototype.constructor = NormalModuleFactory;
 
-NormalModuleFactory.prototype.create = function(context, dependency, callback) {
+NormalModuleFactory.prototype.create = function(data, callback) {
 	var _this = this;
-	context = context || this.context;
-	var request = dependency.request;
+	var context = data.context || this.context;
+	var dependencies = data.dependencies;
+	var request = dependencies[0].request;
+	var contextInfo = data.contextInfo || {};
 	_this.applyPluginsAsyncWaterfall("before-resolve", {
-		contextInfo: {},
+		contextInfo: contextInfo,
 		context: context,
 		request: request,
-		dependency: dependency
+		dependencies: dependencies
 	}, function(err, result) {
 		if(err) return callback(err);
 
diff --git a/lib/NullFactory.js b/lib/NullFactory.js
@@ -5,6 +5,6 @@
 function NullFactory() {}
 module.exports = NullFactory;
 
-NullFactory.prototype.create = function(context, dependency, callback) {
+NullFactory.prototype.create = function(data, callback) {
 	return callback();
 };
