WIP: move index and index2 calculation

sokra · sokra · commit 822099da83fc · 2018-05-14T21:31:29.000+02:00
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -257,8 +257,6 @@ class Compilation extends Tapable {
 		this._modules = new Map();
 		this.cache = null;
 		this.records = null;
-		this.nextFreeModuleIndex = undefined;
-		this.nextFreeModuleIndex2 = undefined;
 		this.additionalChunkAssets = [];
 		this.assets = {};
 		this.errors = [];
@@ -853,8 +851,6 @@ class Compilation extends Tapable {
 		}
 		this.hooks.afterOptimizeDependencies.call(this.modules);
 
-		this.nextFreeModuleIndex = 0;
-		this.nextFreeModuleIndex2 = 0;
 		for (const preparedEntrypoint of this._preparedEntrypoints) {
 			const module = preparedEntrypoint.module;
 			const name = preparedEntrypoint.name;
@@ -1067,67 +1063,7 @@ class Compilation extends Tapable {
 	}
 
 	assignIndex(module) {
-		const assignIndexToModule = module => {
-			// enter module
-			if (typeof module.index !== "number") {
-				module.index = this.nextFreeModuleIndex++;
-
-				// leave module
-				queue.push(() => (module.index2 = this.nextFreeModuleIndex2++));
-
-				// enter it as block
-				assignIndexToDependencyBlock(module);
-			}
-		};
-
-		const assignIndexToDependency = dependency => {
-			if (dependency.module) {
-				queue.push(() => assignIndexToModule(dependency.module));
-			}
-		};
-
-		const assignIndexToDependencyBlock = block => {
-			let allDependencies = [];
-
-			const iteratorDependency = d => allDependencies.push(d);
-
-			const iteratorBlock = b =>
-				queue.push(() => assignIndexToDependencyBlock(b));
-
-			if (block.variables) {
-				iterationBlockVariable(block.variables, iteratorDependency);
-			}
-
-			if (block.dependencies) {
-				iterationOfArrayCallback(block.dependencies, iteratorDependency);
-			}
-			if (block.blocks) {
-				const blocks = block.blocks;
-				let indexBlock = blocks.length;
-				while (indexBlock--) {
-					iteratorBlock(blocks[indexBlock]);
-				}
-			}
-
-			let indexAll = allDependencies.length;
-			while (indexAll--) {
-				iteratorAllDependencies(allDependencies[indexAll]);
-			}
-		};
-
-		const queue = [
-			() => {
-				assignIndexToModule(module);
-			}
-		];
-
-		const iteratorAllDependencies = d => {
-			queue.push(() => assignIndexToDependency(d));
-		};
-
-		while (queue.length) {
-			queue.pop()();
-		}
+		
 	}
 
 	assignDepth(module) {
@@ -1263,12 +1199,21 @@ class Compilation extends Tapable {
 
 		// PART ONE
 
+		/** @type {Set<Module>} */
+		const alreadyEntered = new Set();
+
+		/** @type {Set<Module>} */
+		const alreadyLeaved = new Set();
+
 		/** @type {Map<ChunkGroup, { index: number, index2: number }>} */
 		const chunkGroupCounters = new Map();
 		for (const chunkGroup of inputChunkGroups) {
 			chunkGroupCounters.set(chunkGroup, { index: 0, index2: 0 });
 		}
 
+		let nextFreeModuleIndex = 0;
+		let nextFreeModuleIndex2 = 0;
+
 		const blockChunkGroups = new Map();
 
 		const ENTER = 0;
@@ -1380,6 +1325,10 @@ class Compilation extends Tapable {
 								);
 							}
 						}
+
+						if (module.index === undefined) {
+							module.index = nextFreeModuleIndex++;
+						}
 					}
 					// fallthrough
 					case ASYNC: {
@@ -1418,6 +1367,10 @@ class Compilation extends Tapable {
 								);
 							}
 						}
+
+						if (module.index2 === undefined) {
+							module.index2 = nextFreeModuleIndex2++;
+						}
 						break;
 					}
 				}
