make clearer what "parents" are

timse · timse · commit f062f49a7024 · 2017-02-14T21:16:10.000+11:00
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -84,8 +84,8 @@ class Chunk {
 		return this.addToCollection(this.chunks, chunk);
 	}
 
-	addParent(parent) {
-		return this.addToCollection(this.parents, parent);
+	addParent(parentChunk) {
+		return this.addToCollection(this.parents, parentChunk);
 	}
 
 	addModule(module) {
@@ -123,11 +123,11 @@ class Chunk {
 		});
 
 		// cleanup parents
-		this.parents.forEach(parent => {
+		this.parents.forEach(parentChunk => {
 			// remove this chunk from its parents
-			const idx = parent.chunks.indexOf(this);
+			const idx = parentChunk.chunks.indexOf(this);
 			if(idx >= 0) {
-				parent.chunks.splice(idx, 1);
+				parentChunk.chunks.splice(idx, 1);
 			}
 
 			// cleanup "sub chunks"
@@ -137,9 +137,9 @@ class Chunk {
 				 * it "sub chunks" and parents directly
 				 */
 				// add parent to each "sub chunk"
-				chunk.addParent(parent);
+				chunk.addParent(parentChunk);
 				// add "sub chunk" to parent
-				parent.addChunk(chunk);
+				parentChunk.addChunk(chunk);
 
 				// remove this as parent of every "sub chunk"
 				const idx = chunk.parents.indexOf(this);
@@ -179,13 +179,13 @@ class Chunk {
 		}
 	}
 
-	replaceParent(oldParent, newParent) {
-		const idx = this.parents.indexOf(oldParent);
+	replaceParentChunk(oldParentChunk, newParentChunk) {
+		const idx = this.parents.indexOf(oldParentChunk);
 		if(idx >= 0) {
 			this.parents.splice(idx, 1);
 		}
-		if(this !== newParent && newParent.addChunk(this)) {
-			this.addParent(newParent);
+		if(this !== newParentChunk && newParentChunk.addChunk(this)) {
+			this.addParent(newParentChunk);
 		}
 	}
 
@@ -198,10 +198,10 @@ class Chunk {
 		otherChunkModules.forEach(module => otherChunk.moveModule(module, this));
 		otherChunk.modules.length = 0;
 
-		otherChunk.parents.forEach(parent => parent.replaceChunk(otherChunk, this));
+		otherChunk.parents.forEach(parentChunk => parentChunk.replaceChunk(otherChunk, this));
 		otherChunk.parents.length = 0;
 
-		otherChunk.chunks.forEach(chunk => chunk.replaceParent(otherChunk, this));
+		otherChunk.chunks.forEach(chunk => chunk.replaceParentChunk(otherChunk, this));
 		otherChunk.chunks.length = 0;
 
 		otherChunk.blocks.forEach(b => {
@@ -226,8 +226,8 @@ class Chunk {
 		this.chunks = this.chunks.filter(chunk => {
 			return chunk !== otherChunk && chunk !== this;
 		});
-		this.parents = this.parents.filter(parent => {
-			return parent !== otherChunk && parent !== this;
+		this.parents = this.parents.filter(parentChunk => {
+			return parentChunk !== otherChunk && parentChunk !== this;
 		});
 		return true;
 	}
@@ -241,9 +241,9 @@ class Chunk {
 			newChunk.chunks.push(chunk);
 			chunk.parents.push(newChunk);
 		});
-		this.parents.forEach(parent => {
-			parent.chunks.push(newChunk);
-			newChunk.parents.push(parent);
+		this.parents.forEach(parentChunk => {
+			parentChunk.chunks.push(newChunk);
+			newChunk.parents.push(parentChunk);
 		});
 		this.entrypoints.forEach(entrypoint => {
 			entrypoint.insertChunk(newChunk, this);
@@ -351,11 +351,11 @@ class Chunk {
 			if(child.parents.indexOf(chunk) < 0)
 				throw new Error(`checkConstraints: child missing parent ${chunk.debugId} -> ${child.debugId}`);
 		});
-		chunk.parents.forEach((parent, idx) => {
-			if(chunk.parents.indexOf(parent) !== idx)
-				throw new Error(`checkConstraints: duplicate parent in chunk ${chunk.debugId} ${parent.debugId}`);
-			if(parent.chunks.indexOf(chunk) < 0)
-				throw new Error(`checkConstraints: parent missing child ${parent.debugId} <- ${chunk.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)
+				throw new Error(`checkConstraints: parent missing child ${parentChunk.debugId} <- ${chunk.debugId}`);
 		});
 	}
 }
