replace isEqualResource with more performance implementation

sokra · sokra · commit 93171b979577 · 2017-11-19T00:22:38.000+01:00
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -206,15 +206,20 @@ class Compilation extends Tapable {
 	}
 
 	processModuleDependencies(module, callback) {
-		const dependencies = [];
+		const dependencies = new Map();
 
 		const addDependency = dep => {
-			for(let i = 0; i < dependencies.length; i++) {
-				if(dep.isEqualResource(dependencies[i][0])) {
-					return dependencies[i].push(dep);
-				}
+			const resourceIdent = dep.getResourceIdentifier();
+			if(resourceIdent) {
+				const factory = this.dependencyFactories.get(dep.constructor);
+				let innerMap = dependencies.get(factory);
+				if(innerMap === undefined)
+					dependencies.set(factory, innerMap = new Map());
+				let list = innerMap.get(resourceIdent);
+				if(list === undefined)
+					innerMap.set(resourceIdent, list = []);
+				list.push(dep);
 			}
-			dependencies.push([dep]);
 		};
 
 		const addDependenciesBlock = block => {
@@ -230,23 +235,27 @@ class Compilation extends Tapable {
 		};
 
 		addDependenciesBlock(module);
-		this.addModuleDependencies(module, dependencies, this.bail, null, true, callback);
+
+		const sortedDependencies = [];
+
+		for(const pair1 of dependencies) {
+			for(const pair2 of pair1[1]) {
+				sortedDependencies.push({
+					factory: pair1[0],
+					dependencies: pair2[1]
+				});
+			}
+		}
+
+		this.addModuleDependencies(module, sortedDependencies, this.bail, null, true, callback);
 	}
 
 	addModuleDependencies(module, dependencies, bail, cacheGroup, recursive, callback) {
 		let _this = this;
 		const start = _this.profile && Date.now();
 
-		const factories = [];
-		for(let i = 0; i < dependencies.length; i++) {
-			const factory = _this.dependencyFactories.get(dependencies[i][0].constructor);
-			if(!factory) {
-				return callback(new Error(`No module factory available for dependency type: ${dependencies[i][0].constructor.name}`));
-			}
-			factories[i] = [factory, dependencies[i]];
-		}
-		asyncLib.forEach(factories, (item, callback) => {
-			const dependencies = item[1];
+		asyncLib.forEach(dependencies, (item, callback) => {
+			const dependencies = item.dependencies;
 
 			const errorAndCallback = err => {
 				err.origin = module;
@@ -267,7 +276,7 @@ class Compilation extends Tapable {
 			semaphore.acquire(() => {
 				if(_this === null) return semaphore.release();
 
-				const factory = item[0];
+				const factory = item.factory;
 				factory.create({
 					contextInfo: {
 						issuer: module.nameForCondition && module.nameForCondition(),
diff --git a/lib/Dependency.js b/lib/Dependency.js
@@ -12,8 +12,8 @@ class Dependency {
 		this.optional = false;
 	}
 
-	isEqualResource() {
-		return false;
+	getResourceIdentifier() {
+		return null;
 	}
 
 	// Returns the referenced module and export
diff --git a/lib/dependencies/ContextDependency.js b/lib/dependencies/ContextDependency.js
@@ -12,6 +12,8 @@ const equalRegExp = (a, b) => {
 	return a + "" === b + "";
 };
 
+const regExpToString = r => r ? r + "" : "";
+
 class ContextDependency extends Dependency {
 	// options: { request, recursive, regExp, include, exclude, mode, chunkName }
 	constructor(options) {
@@ -25,17 +27,10 @@ class ContextDependency extends Dependency {
 		}
 	}
 
-	isEqualResource(other) {
-		if(!(other instanceof ContextDependency))
-			return false;
-
-		return this.options.request === other.options.request &&
-			this.options.recursive === other.options.recursive &&
-			equalRegExp(this.options.regExp, other.options.regExp) &&
-			equalRegExp(this.options.include, other.options.include) &&
-			equalRegExp(this.options.exclude, other.options.exclude) &&
-			this.options.mode === other.options.mode &&
-			this.options.chunkName === other.options.chunkName;
+	getResourceIdentifier() {
+		return `context${this.options.request} ${this.options.recursive} ` +
+			`${regExpToString(this.options.regExp)} ${regExpToString(this.options.include)} ${regExpToString(this.options.exclude)} ` +
+			`${this.options.mode} ${this.options.chunkName}`;
 	}
 
 	getWarnings() {
diff --git a/lib/dependencies/ModuleDependency.js b/lib/dependencies/ModuleDependency.js
@@ -12,11 +12,8 @@ class ModuleDependency extends Dependency {
 		this.userRequest = request;
 	}
 
-	isEqualResource(other) {
-		if(!(other instanceof ModuleDependency))
-			return false;
-
-		return this.request === other.request;
+	getResourceIdentifier() {
+		return `module${this.request}`;
 	}
 }
 
diff --git a/lib/dependencies/NullDependency.js b/lib/dependencies/NullDependency.js
@@ -10,10 +10,6 @@ class NullDependency extends Dependency {
 		return "null";
 	}
 
-	isEqualResource() {
-		return false;
-	}
-
 	updateHash() {}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ class Dependency {`
`12`	`12`	`this.optional = false;`
`13`	`13`	`}`
`14`	`14`
`15`		`- isEqualResource() {`
`16`		`- return false;`
	`15`	`+ getResourceIdentifier() {`
	`16`	`+ return null;`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`// Returns the referenced module and export`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,8 @@ class ModuleDependency extends Dependency {`
`12`	`12`	`this.userRequest = request;`
`13`	`13`	`}`
`14`	`14`
`15`		`- isEqualResource(other) {`
`16`		`- if(!(other instanceof ModuleDependency))`
`17`		`- return false;`
`18`		`-`
`19`		`- return this.request === other.request;`
	`15`	`+ getResourceIdentifier() {`
	`16`	+ return `module${this.request}`;
`20`	`17`	`}`
`21`	`18`	`}`
`22`	`19`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,6 @@ class NullDependency extends Dependency {`
`10`	`10`	`return "null";`
`11`	`11`	`}`
`12`	`12`
`13`		`- isEqualResource() {`
`14`		`- return false;`
`15`		`- }`
`16`		`-`
`17`	`13`	`updateHash() {}`
`18`	`14`	`}`
`19`	`15`