remove unused code

sokra · sokra · commit 020694907500 · 2018-01-21T11:12:36.000+01:00
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -403,24 +403,6 @@ class Chunk {
 		return false;
 	}
 
-	hasChunkInGraph(filterFn) {
-		const queue = new Set(this.groupsIterable);
-		const chunksProcessed = new Set();
-
-		for(const chunkGroup of queue) {
-			for(const chunk of chunkGroup.chunks) {
-				if(!chunksProcessed.has(chunk)) {
-					chunksProcessed.add(chunk);
-					if(filterFn(chunk))
-						return true;
-				}
-			}
-			for(const child of chunkGroup.childrenIterable)
-				queue.add(child);
-		}
-		return false;
-	}
-
 	toString() {
 		return `Chunk[${Array.from(this._modules).join()}]`;
 	}
diff --git a/lib/ChunkGroup.js b/lib/ChunkGroup.js
@@ -36,6 +36,7 @@ class ChunkGroup {
 		this.origins = [];
 	}
 
+	/* istanbul ignore next */
 	get debugId() {
 		return Array.from(this.chunks, x => x.debugId).join("+");
 	}
@@ -112,13 +113,6 @@ class ChunkGroup {
 		return false;
 	}
 
-	hasEntryModule() {
-		for(const chunk of this.chunks)
-			if(chunk.hasEntryModule())
-				return true;
-		return false;
-	}
-
 	addChild(chunk) {
 		if(this._children.has(chunk)) {
 			return false;
@@ -167,11 +161,6 @@ class ChunkGroup {
 			this._parents.add(p);
 	}
 
-	// TODO remove and replace calls with Array.from
-	mapParents(fn) {
-		return Array.from(this._parents, fn);
-	}
-
 	getNumberOfParents() {
 		return this._parents.size;
 	}
@@ -199,17 +188,6 @@ class ChunkGroup {
 		return this._blocks.getFromCache(getArray);
 	}
 
-	setBlocks(newBlocks) {
-		this._blocks.clear();
-		for(const p of newBlocks)
-			this._blocks.add(p);
-	}
-
-	// TODO remove and replace calls with Array.from
-	mapBlocks(fn) {
-		return Array.from(this._blocks, fn);
-	}
-
 	getNumberOfBlocks() {
 		return this._blocks.size;
 	}
@@ -289,10 +267,6 @@ class ChunkGroup {
 
 	sortItems() {
 		this.origins.sort(sortOrigin);
-		this.origins.forEach(origin => {
-			if(origin.reasons)
-				origin.reasons.sort();
-		});
 		this._parents.sort();
 		this._children.sort();
 	}
diff --git a/lib/ChunkTemplate.js b/lib/ChunkTemplate.js
@@ -31,11 +31,7 @@ module.exports = class ChunkTemplate extends Tapable {
 
 		const result = [];
 
-		let filenameTemplate;
-		if(chunk.filenameTemplate)
-			filenameTemplate = chunk.filenameTemplate;
-		else
-			filenameTemplate = outputOptions.chunkFilename;
+		const filenameTemplate = outputOptions.chunkFilename;
 
 		result.push({
 			render: () => this.renderJavascript(chunk, moduleTemplates.javascript, dependencyTemplates),
diff --git a/lib/GraphHelpers.js b/lib/GraphHelpers.js
@@ -1,44 +1,27 @@
-// TODO remove this function
-function assert(value, typeName, name) {
-	const Type = require(`./${typeName}`);
-	if(value instanceof Type) return;
-	throw new Error(`${name} is not a ${Type.name}`);
-}
-
 exports.connectChunkGroupAndChunk = (chunkGroup, chunk) => {
-	assert(chunkGroup, "ChunkGroup", "chunkGroup");
-	assert(chunk, "Chunk", "chunk");
 	if(chunkGroup.pushChunk(chunk)) {
 		chunk.addGroup(chunkGroup);
 	}
 };
 
 exports.connectChunkGroupParentAndChild = (parent, child) => {
-	assert(parent, "ChunkGroup", "parent");
-	assert(child, "ChunkGroup", "child");
 	if(parent.addChild(child)) {
 		child.addParent(parent);
 	}
 };
 
 exports.connectChunkAndModule = (chunk, module) => {
-	assert(chunk, "Chunk", "chunk");
-	assert(module, "Module", "module");
 	if(module.addChunk(chunk)) {
 		chunk.addModule(module);
 	}
 };
 
 exports.disconnectChunkAndModule = (chunk, module) => {
-	assert(chunk, "Chunk", "chunk");
-	assert(module, "Module", "module");
 	chunk.removeModule(module);
 	module.removeChunk(chunk);
 };
 
 exports.connectDependenciesBlockAndChunkGroup = (depBlock, chunkGroup) => {
-	assert(depBlock, "DependenciesBlock", "depBlock");
-	assert(chunkGroup, "ChunkGroup", "chunkGroup");
 	if(chunkGroup.addBlock(depBlock)) {
 		depBlock.chunkGroup = chunkGroup;
 	}
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
@@ -274,11 +274,6 @@ module.exports = class MainTemplate extends Tapable {
 		return this.hooks.currentHash.call(JSON.stringify(hash.substr(0, length)), length);
 	}
 
-	// TODO remove and call hasChunkInGraph directly
-	entryPointInChildren(chunk) {
-		return chunk.hasChunkInGraph(chunk => chunk.hasEntryModule());
-	}
-
 	getPublicPath(options) {
 		return this.hooks.assetPath.call(this.outputOptions.publicPath || "", options);
 	}
diff --git a/lib/Module.js b/lib/Module.js
@@ -25,6 +25,7 @@ const sortByDebugId = (a, b) => {
 
 const getFrozenArray = set => Object.freeze(Array.from(set));
 
+/* istanbul ignore next */
 const getDebugIdent = set => {
 	set.sortWith(sortByDebugId);
 	const chunks = set;
@@ -153,10 +154,6 @@ class Module extends DependenciesBlock {
 		return this._chunks.has(chunk);
 	}
 
-	getChunkIdsIdent() {
-		return this._chunks.getFromUnorderedCache(getDebugIdent);
-	}
-
 	isEntryModule() {
 		for(const chunk of this._chunks) {
 			if(chunk.entryModule === this)
diff --git a/lib/util/createHash.js b/lib/util/createHash.js
@@ -38,6 +38,7 @@ class BulkUpdateDecorator {
 	}
 }
 
+/* istanbul ignore next */
 class DebugHash {
 	constructor() {
 		this.string = "";

Original file line number	Diff line number	Diff line change
`@@ -274,11 +274,6 @@ module.exports = class MainTemplate extends Tapable {`
`274`	`274`	`return this.hooks.currentHash.call(JSON.stringify(hash.substr(0, length)), length);`
`275`	`275`	`}`
`276`	`276`
`277`		`- // TODO remove and call hasChunkInGraph directly`
`278`		`- entryPointInChildren(chunk) {`
`279`		`- return chunk.hasChunkInGraph(chunk => chunk.hasEntryModule());`
`280`		`- }`
`281`		`-`
`282`	`277`	`getPublicPath(options) {`
`283`	`278`	`return this.hooks.assetPath.call(this.outputOptions.publicPath \|\| "", options);`
`284`	`279`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ class BulkUpdateDecorator {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
	`41`	`+/* istanbul ignore next */`
`41`	`42`	`class DebugHash {`
`42`	`43`	`constructor() {`
`43`	`44`	`this.string = "";`