refactor usage of this.chunk inside Chunk to use Set API

timse · timse · commit 81e5b7ce4fea · 2017-06-24T11:38:00.000+10:00
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -88,7 +88,11 @@ class Chunk {
 	}
 
 	addChunk(chunk) {
-		return this.addToCollection(this.chunks, chunk);
+		if(this._chunks.has(chunk)) {
+			return false;
+		}
+		this._chunks.add(chunk);
+		return true;
 	}
 
 	addParent(parentChunk) {
@@ -116,13 +120,13 @@ class Chunk {
 	}
 
 	removeChunk(chunk) {
-		const idx = this.chunks.indexOf(chunk);
-		if(idx >= 0) {
-			this.chunks.splice(idx, 1);
-			chunk.removeParent(this);
-			return true;
+		if(!this._chunks.has(chunk)) {
+			return false;
 		}
-		return false;
+
+		this._chunks.delete(chunk);
+		chunk.removeParent(this);
+		return true;
 	}
 
 	removeParent(chunk) {
@@ -208,13 +212,10 @@ class Chunk {
 		// cleanup parents
 		this.parents.forEach(parentChunk => {
 			// remove this chunk from its parents
-			const idx = parentChunk.chunks.indexOf(this);
-			if(idx >= 0) {
-				parentChunk.chunks.splice(idx, 1);
-			}
+			parentChunk._chunks.delete(this);
 
 			// cleanup "sub chunks"
-			this.chunks.forEach(chunk => {
+			this._chunks.forEach(chunk => {
 				/**
 				 * remove this chunk as "intermediary" and connect
 				 * it "sub chunks" and parents directly
@@ -232,7 +233,7 @@ class Chunk {
 		 * This can not be done in the above loop
 		 * as it is not garuanteed that `this.parents` contains anything.
 		 */
-		this.chunks.forEach(chunk => {
+		this._chunks.forEach(chunk => {
 			// remove this as parent of every "sub chunk"
 			const idx = chunk.parents.indexOf(this);
 			if(idx >= 0) {
@@ -261,10 +262,7 @@ class Chunk {
 	}
 
 	replaceChunk(oldChunk, newChunk) {
-		const idx = this.chunks.indexOf(oldChunk);
-		if(idx >= 0) {
-			this.chunks.splice(idx, 1);
-		}
+		this._chunks.delete(oldChunk);
 		if(this !== newChunk && newChunk.addParent(this)) {
 			this.addChunk(newChunk);
 		}
@@ -293,8 +291,8 @@ class Chunk {
 		otherChunk.parents.forEach(parentChunk => parentChunk.replaceChunk(otherChunk, this));
 		otherChunk.parents.length = 0;
 
-		otherChunk.chunks.forEach(chunk => chunk.replaceParentChunk(otherChunk, this));
-		otherChunk.chunks.length = 0;
+		otherChunk._chunks.forEach(chunk => chunk.replaceParentChunk(otherChunk, this));
+		otherChunk._chunks.clear();
 
 		otherChunk.blocks.forEach(b => {
 			b.chunks = b.chunks ? b.chunks.map(c => {
@@ -315,9 +313,8 @@ class Chunk {
 				origin.reasons.unshift(reason);
 			}
 		});
-		this.chunks = this.chunks.filter(chunk => {
-			return chunk !== otherChunk && chunk !== this;
-		});
+		this._chunks.delete(otherChunk);
+		this._chunks.delete(this);
 		this.parents = this.parents.filter(parentChunk => {
 			return parentChunk !== otherChunk && parentChunk !== this;
 		});
@@ -329,12 +326,12 @@ class Chunk {
 			newChunk.blocks.push(block);
 			block.chunks.push(newChunk);
 		});
-		this.chunks.forEach(chunk => {
-			newChunk.chunks.push(chunk);
+		this._chunks.forEach(chunk => {
+			newChunk.addChunk(chunk);
 			chunk.parents.push(newChunk);
 		});
 		this.parents.forEach(parentChunk => {
-			parentChunk.chunks.push(newChunk);
+			parentChunk.addChunk(newChunk);
 			newChunk.parents.push(parentChunk);
 		});
 		this.entrypoints.forEach(entrypoint => {
@@ -413,7 +410,7 @@ class Chunk {
 				if(chunk.name)
 					chunkNameMap[chunk.id] = chunk.name;
 			}
-			chunk.chunks.forEach(addChunk);
+			chunk._chunks.forEach(addChunk);
 		}(this));
 		return {
 			hash: chunkHashMap,
@@ -435,7 +432,7 @@ class Chunk {
 				origin.reasons.sort();
 		});
 		this.parents.sort(sortById);
-		this.chunks.sort(sortById);
+		this._chunks = new Set(Array.from(this._chunks).sort(sortById));
 	}
 
 	toString() {
@@ -444,16 +441,16 @@ class Chunk {
 
 	checkConstraints() {
 		const chunk = this;
-		chunk.chunks.forEach((child, idx) => {
-			if(chunk.chunks.indexOf(child) !== idx)
+		chunk._chunks.forEach((child, idx) => {
+			if(Array.from(chunk._chunks).indexOf(child) !== idx)
 				throw new Error(`checkConstraints: duplicate child in chunk ${chunk.debugId} ${child.debugId}`);
 			if(child.parents.indexOf(chunk) < 0)
 				throw new Error(`checkConstraints: child missing parent ${chunk.debugId} -> ${child.debugId}`);
 		});
 		chunk.parents.forEach((parentChunk, idx) => {
 			if(chunk.parents.indexOf(parentChunk) !== idx)
 				throw new Error(`checkConstraints: duplicate parent in chunk ${chunk.debugId} ${parentChunk.debugId}`);
-			if(parentChunk.chunks.indexOf(chunk) < 0)
+			if(parentChunk._chunks.indexOf(chunk) < 0)
 				throw new Error(`checkConstraints: parent missing child ${parentChunk.debugId} <- ${chunk.debugId}`);
 		});
 	}
