Merge pull request webpack#7117 from webpack/feature/template-type-support

TheLarkInn · web-flow · commit 51fa786616b9 · 2018-05-14T08:08:09.000-07:00
Feature/template type support
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -128,6 +128,7 @@ class Chunk {
 		this.chunkReason = undefined;
 		/** @type {boolean} */
 		this.extraAsync = false;
+		this.removedModules = undefined;
 	}
 
 	/**
diff --git a/lib/Module.js b/lib/Module.js
@@ -11,8 +11,8 @@ const ModuleReason = require("./ModuleReason");
 const SortableSet = require("./util/SortableSet");
 const Template = require("./Template");
 
-/** @typedef {typeof import("./Chunk")} Chunk */
-/** @typedef {typeof import("./RequestShortener")} RequestShortener */
+/** @typedef {import("./Chunk")} Chunk */
+/** @typedef {import("./RequestShortener")} RequestShortener */
 
 const EMPTY_RESOLVE_OPTIONS = {};
 
@@ -69,7 +69,7 @@ class Module extends DependenciesBlock {
 		this._chunks = new SortableSet(undefined, sortById);
 
 		// Info from Compilation (per Compilation)
-		/** @type {number | string} */
+		/** @type {number|string} */
 		this.id = null;
 		/** @type {number} */
 		this.index = null;
diff --git a/lib/Template.js b/lib/Template.js
@@ -44,10 +44,8 @@ const stringifyIdSortPredicate = (a, b) => {
 	return 0;
 };
 
-//TODO: Change type to Module when import works
-//https://github.com/Microsoft/TypeScript/issues/23375
 /**
- * @param {HasId} module the module to compare against
+ * @param {Module} module the module to compare against
  * @returns {boolean} return true if module.id is equal to type "number"
  */
 const moduleIdIsNumber = module => {
@@ -177,17 +175,19 @@ class Template {
 
 	/**
 	 *
-	 * @param {HasId[]} modules - a collection of modules to get array bounds for
+	 * @param {Module[]} modules a collection of modules to get array bounds for
 	 * @returns {[number, number] | false} returns the upper and lower array bounds
 	 * or false if not every module has a number based id
 	 */
 	static getModulesArrayBounds(modules) {
+		// Typeguards don't work for .every() with predicate functions
+		// https://github.com/Microsoft/TypeScript/issues/23799
 		if (!modules.every(moduleIdIsNumber)) return false;
 		var maxId = -Infinity;
 		var minId = Infinity;
 		for (const module of modules) {
-			if (maxId < module.id) maxId = module.id;
-			if (minId > module.id) minId = module.id;
+			if (maxId < module.id) maxId = /** @type {number} */ (module.id);
+			if (minId > module.id) minId = /** @type {number} */ (module.id);
 		}
 		if (minId < 16 + ("" + minId).length) {
 			// add minId x ',' instead of 'Array(minId).concat(…)'
@@ -206,7 +206,6 @@ class Template {
 	}
 
 	/**
-	 *
 	 * @param {Chunk} chunk chunk whose modules will be rendered
 	 * @param {ModuleFilterPredicate} filterFn function used to filter modules from chunk to render
 	 * @param {ModuleTemplate} moduleTemplate ModuleTemplate instance used to render modules

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ class Chunk {`
`128`	`128`	`this.chunkReason = undefined;`
`129`	`129`	`/** @type {boolean} */`
`130`	`130`	`this.extraAsync = false;`
	`131`	`+ this.removedModules = undefined;`
`131`	`132`	`}`
`132`	`133`
`133`	`134`	`/**`