cache contextify and pass associatedObjectForCache to all calls

sokra · sokra · commit d40f7b264211 · 2019-01-19T12:40:00.000+01:00
diff --git a/lib/ContextModule.js b/lib/ContextModule.js
@@ -213,15 +213,23 @@ class ContextModule extends Module {
 	 * @returns {string | null} an identifier for library inclusion
 	 */
 	libIdent(options) {
-		let identifier = contextify(options.context, this.context);
+		let identifier = contextify(
+			options.context,
+			this.context,
+			options.associatedObjectForCache
+		);
 		if (this.options.mode) {
 			identifier += ` ${this.options.mode}`;
 		}
 		if (this.options.recursive) {
 			identifier += " recursive";
 		}
 		if (this.options.addon) {
-			identifier += ` ${contextify(options.context, this.options.addon)}`;
+			identifier += ` ${contextify(
+				options.context,
+				this.options.addon,
+				options.associatedObjectForCache
+			)}`;
 		}
 		if (this.options.regExp) {
 			identifier += ` ${this.prettyRegExp(this.options.regExp + "")}`;
diff --git a/lib/DelegatedModuleFactoryPlugin.js b/lib/DelegatedModuleFactoryPlugin.js
@@ -12,6 +12,7 @@ const DelegatedModule = require("./DelegatedModule");
 // options.context
 // options.scope
 // options.content
+// options.associatedObjectForCache
 class DelegatedModuleFactoryPlugin {
 	constructor(options) {
 		this.options = options;
diff --git a/lib/DelegatedPlugin.js b/lib/DelegatedPlugin.js
@@ -38,7 +38,14 @@ class DelegatedPlugin {
 		);
 
 		compiler.hooks.compile.tap("DelegatedPlugin", ({ normalModuleFactory }) => {
-			new DelegatedModuleFactoryPlugin(this.options).apply(normalModuleFactory);
+			new DelegatedModuleFactoryPlugin(
+				Object.assign(
+					{
+						associatedObjectForCache: compiler.root
+					},
+					this.options
+				)
+			).apply(normalModuleFactory);
 		});
 	}
 }
diff --git a/lib/DllReferencePlugin.js b/lib/DllReferencePlugin.js
@@ -122,7 +122,8 @@ class DllReferencePlugin {
 				scope: this.options.scope,
 				context: this.options.context || compiler.options.context,
 				content,
-				extensions: this.options.extensions
+				extensions: this.options.extensions,
+				associatedObjectForCache: compiler.root
 			}).apply(normalModuleFactory);
 		});
 
diff --git a/lib/LibManifestPlugin.js b/lib/LibManifestPlugin.js
@@ -67,7 +67,8 @@ class LibManifestPlugin {
 										return;
 									}
 									const ident = module.libIdent({
-										context: this.options.context || compiler.options.context
+										context: this.options.context || compiler.options.context,
+										associatedObjectForCache: compiler.root
 									});
 									if (ident) {
 										const providedExports = moduleGraph.getProvidedExports(
diff --git a/lib/Module.js b/lib/Module.js
@@ -37,6 +37,7 @@ const makeSerializable = require("./util/makeSerializable");
 /**
  * @typedef {Object} LibIdentOptions
  * @property {string} context absolute context path to which lib ident is relative to
+ * @property {Object=} associatedObjectForCache object for caching
  */
 
 /**
diff --git a/lib/ids/IdHelpers.js b/lib/ids/IdHelpers.js
@@ -85,10 +85,13 @@ const shortenLongString = (string, delimiter) => {
 /**
  * @param {Module} module the module
  * @param {string} context context directory
+ * @param {Object=} associatedObjectForCache an object to which the cache will be attached
  * @returns {string} short module name
  */
-const getShortModuleName = (module, context) => {
-	return avoidNumber(module.libIdent({ context }) || "");
+const getShortModuleName = (module, context, associatedObjectForCache) => {
+	return avoidNumber(
+		module.libIdent({ context, associatedObjectForCache }) || ""
+	);
 };
 exports.getShortModuleName = getShortModuleName;
 
@@ -130,12 +133,19 @@ exports.getFullModuleName = getFullModuleName;
  * @param {ChunkGraph} chunkGraph the chunk grph
  * @param {string} context context directory
  * @param {string} delimiter delimiter for names
+ * @param {Object=} associatedObjectForCache an object to which the cache will be attached
  * @returns {string} short chunk name
  */
-const getShortChunkName = (chunk, chunkGraph, context, delimiter) => {
+const getShortChunkName = (
+	chunk,
+	chunkGraph,
+	context,
+	delimiter,
+	associatedObjectForCache
+) => {
 	const modules = chunkGraph.getChunkRootModules(chunk);
 	const shortModuleNames = modules.map(m =>
-		requestToId(getShortModuleName(m, context))
+		requestToId(getShortModuleName(m, context, associatedObjectForCache))
 	);
 	chunk.idNameHints.sort();
 	const chunkName = Array.from(chunk.idNameHints)
@@ -162,7 +172,7 @@ const getLongChunkName = (
 ) => {
 	const modules = chunkGraph.getChunkRootModules(chunk);
 	const shortModuleNames = modules.map(m =>
-		requestToId(getShortModuleName(m, context))
+		requestToId(getShortModuleName(m, context, associatedObjectForCache))
 	);
 	const longModuleNames = modules.map(m =>
 		requestToId(getLongModuleName("", m, context, associatedObjectForCache))
diff --git a/lib/ids/NamedChunkIdsPlugin.js b/lib/ids/NamedChunkIdsPlugin.js
@@ -43,7 +43,14 @@ class NamedChunkIdsPlugin {
 						}
 						return chunk.id === null;
 					}),
-					chunk => getShortChunkName(chunk, chunkGraph, context, delimiter),
+					chunk =>
+						getShortChunkName(
+							chunk,
+							chunkGraph,
+							context,
+							delimiter,
+							compiler.root
+						),
 					chunk =>
 						getLongChunkName(
 							chunk,
diff --git a/lib/ids/NamedModuleIdsPlugin.js b/lib/ids/NamedModuleIdsPlugin.js
@@ -39,7 +39,7 @@ class NamedModuleIdsPlugin {
 						if (chunkGraph.getNumberOfModuleChunks(module) === 0) return false;
 						return chunkGraph.getModuleId(module) === null;
 					}),
-					m => getShortModuleName(m, context),
+					m => getShortModuleName(m, context, compiler.root),
 					(m, shortName) =>
 						getLongModuleName(shortName, m, context, compiler.root),
 					compareModulesByIdentifier,
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -468,7 +468,7 @@ class ConcatenatedModule extends Module {
 				}
 			}
 		}
-		this._identifier = this._createIdentifier();
+		this._identifier = this._createIdentifier(compilation.compiler.root);
 	}
 
 	get modules() {
@@ -595,13 +595,14 @@ class ConcatenatedModule extends Module {
 		return list;
 	}
 
-	_createIdentifier() {
+	_createIdentifier(associatedObjectForCache) {
 		let orderedConcatenationListIdentifiers = "";
 		for (let i = 0; i < this._orderedConcatenationList.length; i++) {
 			if (this._orderedConcatenationList[i].type === "concatenated") {
 				orderedConcatenationListIdentifiers += contextify(
 					this.rootModule.context,
-					this._orderedConcatenationList[i].module.identifier()
+					this._orderedConcatenationList[i].module.identifier(),
+					associatedObjectForCache
 				);
 				orderedConcatenationListIdentifiers += " ";
 			}
diff --git a/lib/optimize/SplitChunksPlugin.js b/lib/optimize/SplitChunksPlugin.js
@@ -513,6 +513,7 @@ module.exports = class SplitChunksPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		const associatedObjectForCache = compiler.root;
 		compiler.hooks.thisCompilation.tap("SplitChunksPlugin", compilation => {
 			let alreadyOptimized = false;
 			compilation.hooks.unseal.tap("SplitChunksPlugin", () => {
@@ -1151,12 +1152,17 @@ module.exports = class SplitChunksPlugin {
 							getKey(module) {
 								const ident = contextify(
 									compilation.options.context,
-									module.identifier()
+									module.identifier(),
+									associatedObjectForCache
 								);
 								const nameForCondition =
 									module.nameForCondition && module.nameForCondition();
 								const name = nameForCondition
-									? contextify(compilation.options.context, nameForCondition)
+									? contextify(
+											compilation.options.context,
+											nameForCondition,
+											associatedObjectForCache
+									  )
 									: ident.replace(/^.*!|\?[^?!]*$/g, "");
 								const fullKey =
 									name + automaticNameDelimiter + hashFilename(ident);
diff --git a/lib/util/identifier.js b/lib/util/identifier.js
@@ -67,6 +67,45 @@ const absoluteToRequest = (context, maybeAbsolutePath) => {
 	return maybeAbsolutePath;
 };
 
+const makeCacheable = fn => {
+	/** @type {WeakMap<Object, Map<string, Map<string, string>>>} */
+	const cache = new WeakMap();
+
+	/**
+	 * @param {string} context context used to create relative path
+	 * @param {string} identifier identifier used to create relative path
+	 * @param {Object=} associatedObjectForCache an object to which the cache will be attached
+	 * @returns {string} the returned relative path
+	 */
+	const cachedFn = (context, identifier, associatedObjectForCache) => {
+		if (!associatedObjectForCache) return fn(context, identifier);
+
+		let innerCache = cache.get(associatedObjectForCache);
+		if (innerCache === undefined) {
+			innerCache = new Map();
+			cache.set(associatedObjectForCache, innerCache);
+		}
+
+		let cachedResult;
+		let innerSubCache = innerCache.get(context);
+		if (innerSubCache === undefined) {
+			innerCache.set(context, (innerSubCache = new Map()));
+		} else {
+			cachedResult = innerSubCache.get(identifier);
+		}
+
+		if (cachedResult !== undefined) {
+			return cachedResult;
+		} else {
+			const result = fn(context, identifier);
+			innerSubCache.set(identifier, result);
+			return result;
+		}
+	};
+
+	return cachedFn;
+};
+
 /**
  *
  * @param {string} context context for relative path
@@ -80,50 +119,18 @@ const _makePathsRelative = (context, identifier) => {
 		.join("");
 };
 
-const makePathsRelativeCache = new WeakMap();
-
-/**
- *
- * @param {string} context context used to create relative path
- * @param {string} identifier identifier used to create relative path
- * @param {Object=} associatedObjectForCache an object to which the cache will be attached
- * @returns {string} the returned relative path
- */
-exports.makePathsRelative = (context, identifier, associatedObjectForCache) => {
-	if (!associatedObjectForCache) return _makePathsRelative(context, identifier);
-
-	let relativePaths = makePathsRelativeCache.get(associatedObjectForCache);
-	if (relativePaths === undefined) {
-		relativePaths = new Map();
-		makePathsRelativeCache.set(associatedObjectForCache, relativePaths);
-	}
-
-	let cachedResult;
-	let contextCache = relativePaths.get(context);
-	if (contextCache === undefined) {
-		relativePaths.set(context, (contextCache = new Map()));
-	} else {
-		cachedResult = contextCache.get(identifier);
-	}
-
-	if (cachedResult !== undefined) {
-		return cachedResult;
-	} else {
-		const relativePath = _makePathsRelative(context, identifier);
-		contextCache.set(identifier, relativePath);
-		return relativePath;
-	}
-};
+exports.makePathsRelative = makeCacheable(_makePathsRelative);
 
 /**
  * @param {string} context absolute context path
  * @param {string} request any request string may containing absolute paths, query string, etc.
  * @returns {string} a new request string avoiding absolute paths when possible
  */
-const contextify = (context, request) => {
+const _contextify = (context, request) => {
 	return request
 		.split("!")
 		.map(r => absoluteToRequest(context, r))
 		.join("!");
 };
-exports.contextify = contextify;
+
+exports.contextify = makeCacheable(_contextify);

Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ class ConcatenatedModule extends Module {`
`468`	`468`	`}`
`469`	`469`	`}`
`470`	`470`	`}`
`471`		`- this._identifier = this._createIdentifier();`
	`471`	`+ this._identifier = this._createIdentifier(compilation.compiler.root);`
`472`	`472`	`}`
`473`	`473`
`474`	`474`	`get modules() {`
`@@ -595,13 +595,14 @@ class ConcatenatedModule extends Module {`
`595`	`595`	`return list;`
`596`	`596`	`}`
`597`	`597`
`598`		`- _createIdentifier() {`
	`598`	`+ _createIdentifier(associatedObjectForCache) {`
`599`	`599`	`let orderedConcatenationListIdentifiers = "";`
`600`	`600`	`for (let i = 0; i < this._orderedConcatenationList.length; i++) {`
`601`	`601`	`if (this._orderedConcatenationList[i].type === "concatenated") {`
`602`	`602`	`orderedConcatenationListIdentifiers += contextify(`
`603`	`603`	`this.rootModule.context,`
`604`		`- this._orderedConcatenationList[i].module.identifier()`
	`604`	`+ this._orderedConcatenationList[i].module.identifier(),`
	`605`	`+ associatedObjectForCache`
`605`	`606`	`);`
`606`	`607`	`orderedConcatenationListIdentifiers += " ";`
`607`	`608`	`}`