simplify size calculation

timse · timse · commit 63f0930161f9 · 2017-02-14T21:16:09.000+11:00
add "moduleSize" calculator, add multiply and overhead helper
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -261,16 +261,6 @@ class Chunk {
 		this.modules.forEach(m => m.updateHash(hash));
 	}
 
-	size(options) {
-		const CHUNK_OVERHEAD = typeof options.chunkOverhead === "number" ? options.chunkOverhead : 10000;
-		const ENTRY_CHUNK_MULTIPLICATOR = options.entryChunkMultiplicator || 10;
-
-		const modulesSize = this.modules.reduce((a, b) => {
-			return a + b.size();
-		}, 0);
-		return modulesSize * (this.isInitial() ? ENTRY_CHUNK_MULTIPLICATOR : 1) + CHUNK_OVERHEAD;
-	}
-
 	canBeIntegrated(other) {
 		if(other.isInitial()) {
 			return false;
@@ -283,26 +273,33 @@ class Chunk {
 		return true;
 	}
 
+	addMultiplierAndOverhead(size, options) {
+		const overhead = typeof options.chunkOverhead === "number" ? options.chunkOverhead : 10000;
+		const multiplicator = this.isInitial() ? (options.entryChunkMultiplicator || 10) : 1;
+
+		return size * multiplicator + overhead;
+	}
+
+	modulesSize() {
+		let count = 0;
+		for(let i = 0; i < this.modules.length; i++) {
+			count += this.modules[i].size();
+		}
+		return count;
+	}
+
+	size(options) {
+		return this.addMultiplierAndOverhead(this.modulesSize(), options);
+	}
+
 	integratedSize(other, options) {
 		// Chunk if it's possible to integrate this chunk
 		if(!this.canBeIntegrated(other)) {
 			return false;
 		}
 
-		const CHUNK_OVERHEAD = typeof options.chunkOverhead === "number" ? options.chunkOverhead : 10000;
-		const ENTRY_CHUNK_MULTIPLICATOR = options.entryChunkMultiplicator || 10;
-
-		const mergedModules = this.modules.slice();
-		other.modules.forEach(m => {
-			if(this.modules.indexOf(m) < 0) {
-				mergedModules.push(m);
-			}
-		}, this);
-
-		const modulesSize = mergedModules.reduce((a, m) => {
-			return a + m.size();
-		}, 0);
-		return modulesSize * (this.isInitial() || other.isInitial() ? ENTRY_CHUNK_MULTIPLICATOR : 1) + CHUNK_OVERHEAD;
+		const modulesSize = this.modulesSize() + other.modulesSize();
+		return this.addMultiplierAndOverhead(modulesSize, options);
 	}
 
 	getChunkMaps(includeEntries, realHash) {
