From 3bd962a6d7f61239c020e2dbbeb7341e5b842dd1 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期二, 21 四月 2026 11:46:41 +0800
Subject: [PATCH] 推送
---
node_modules/webpack/lib/optimize/RealContentHashPlugin.js | 81 ++++++++++++++++++++++++++--------------
1 files changed, 53 insertions(+), 28 deletions(-)
diff --git a/node_modules/webpack/lib/optimize/RealContentHashPlugin.js b/node_modules/webpack/lib/optimize/RealContentHashPlugin.js
index a26f5e6..a6280fb 100644
--- a/node_modules/webpack/lib/optimize/RealContentHashPlugin.js
+++ b/node_modules/webpack/lib/optimize/RealContentHashPlugin.js
@@ -20,9 +20,17 @@
/** @typedef {import("../Compiler")} Compiler */
/** @typedef {typeof import("../util/Hash")} Hash */
+/**
+ * Defines the comparator type used by this module.
+ * @template T
+ * @typedef {import("../util/comparators").Comparator<T>} Comparator
+ */
+
+/** @type {Hashes} */
const EMPTY_SET = new Set();
/**
+ * Adds the provided item or item to this object.
* @template T
* @param {T | T[]} itemOrItems item or items
* @param {Set<T>} list list
@@ -38,6 +46,7 @@
};
/**
+ * Map and deduplicate buffers.
* @template T
* @param {T[]} input list
* @param {(item: T) => Buffer} fn map function
@@ -47,6 +56,7 @@
// Buffer.equals compares size first so this should be efficient enough
// If it becomes a performance problem we can use a map and group by size
// instead of looping over all assets.
+ /** @type {Buffer[]} */
const result = [];
outer: for (const value of input) {
const buf = fn(value);
@@ -65,9 +75,11 @@
*/
const quoteMeta = (str) => str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
+/** @type {WeakMap<Source, CachedSource>} */
const cachedSourceMap = new WeakMap();
/**
+ * Returns cached source.
* @param {Source} source source
* @returns {CachedSource} cached source
*/
@@ -82,11 +94,10 @@
return newSource;
};
-/** @typedef {Set<string>} OwnHashes */
-/** @typedef {Set<string>} ReferencedHashes */
/** @typedef {Set<string>} Hashes */
/**
+ * Defines the asset info for real content hash type used by this module.
* @typedef {object} AssetInfoForRealContentHash
* @property {string} name
* @property {AssetInfo} info
@@ -94,14 +105,15 @@
* @property {RawSource | undefined} newSource
* @property {RawSource | undefined} newSourceWithoutOwn
* @property {string} content
- * @property {OwnHashes | undefined} ownHashes
+ * @property {Hashes | undefined} ownHashes
* @property {Promise<void> | undefined} contentComputePromise
* @property {Promise<void> | undefined} contentComputeWithoutOwnPromise
- * @property {ReferencedHashes | undefined} referencedHashes
+ * @property {Hashes | undefined} referencedHashes
* @property {Hashes} hashes
*/
/**
+ * Defines the compilation hooks type used by this module.
* @typedef {object} CompilationHooks
* @property {SyncBailHook<[Buffer[], string], string | void>} updateHash
*/
@@ -110,6 +122,7 @@
const compilationHooksMap = new WeakMap();
/**
+ * Defines the real content hash plugin options type used by this module.
* @typedef {object} RealContentHashPluginOptions
* @property {HashFunction} hashFunction the hash function to use
* @property {HashDigest} hashDigest the hash digest to use
@@ -119,6 +132,7 @@
class RealContentHashPlugin {
/**
+ * Returns the attached hooks.
* @param {Compilation} compilation the compilation
* @returns {CompilationHooks} the attached hooks
*/
@@ -139,15 +153,18 @@
}
/**
+ * Creates an instance of RealContentHashPlugin.
* @param {RealContentHashPluginOptions} options options
*/
constructor({ hashFunction, hashDigest }) {
+ /** @type {HashFunction} */
this._hashFunction = hashFunction;
+ /** @type {HashDigest} */
this._hashDigest = hashDigest;
}
/**
- * Apply the plugin
+ * Applies the plugin by registering its hooks on the compiler.
* @param {Compiler} compiler the compiler instance
* @returns {void}
*/
@@ -220,7 +237,9 @@
);
[asset.referencedHashes, asset.ownHashes] =
await cacheAnalyse.providePromise(name, etag, () => {
+ /** @type {Hashes} */
const referencedHashes = new Set();
+ /** @type {Hashes} */
const ownHashes = new Set();
const inContent = content.match(hashRegExp);
if (inContent) {
@@ -237,16 +256,15 @@
})
);
/**
+ * Returns the referenced hashes.
* @param {string} hash the hash
- * @returns {undefined | ReferencedHashes} the referenced hashes
+ * @returns {undefined | Hashes} the referenced hashes
*/
const getDependencies = (hash) => {
const assets = hashToAssets.get(hash);
if (!assets) {
const referencingAssets = assetsWithInfo.filter((asset) =>
- /** @type {ReferencedHashes} */ (asset.referencedHashes).has(
- hash
- )
+ /** @type {Hashes} */ (asset.referencedHashes).has(hash)
);
const err = new WebpackError(`RealContentHashPlugin
Some kind of unexpected caching problem occurred.
@@ -264,22 +282,22 @@
compilation.errors.push(err);
return;
}
+ /** @type {Hashes} */
const hashes = new Set();
for (const { referencedHashes, ownHashes } of assets) {
- if (!(/** @type {OwnHashes} */ (ownHashes).has(hash))) {
- for (const hash of /** @type {OwnHashes} */ (ownHashes)) {
+ if (!(/** @type {Hashes} */ (ownHashes).has(hash))) {
+ for (const hash of /** @type {Hashes} */ (ownHashes)) {
hashes.add(hash);
}
}
- for (const hash of /** @type {ReferencedHashes} */ (
- referencedHashes
- )) {
+ for (const hash of /** @type {Hashes} */ (referencedHashes)) {
hashes.add(hash);
}
}
return hashes;
};
/**
+ * Returns the hash info.
* @param {string} hash the hash
* @returns {string} the hash info
*/
@@ -290,10 +308,11 @@
(a) => a.name
)})`;
};
- /** @type {Set<string>} */
+ /** @type {Hashes} */
const hashesInOrder = new Set();
for (const hash of hashToAssets.keys()) {
/**
+ * Processes the provided hash.
* @param {string} hash the hash
* @param {Set<string>} stack stack of hashes
*/
@@ -322,6 +341,7 @@
/** @type {Map<string, string>} */
const hashToNewHash = new Map();
/**
+ * Returns etag.
* @param {AssetInfoForRealContentHash} asset asset info
* @returns {Etag} etag
*/
@@ -329,11 +349,12 @@
cacheGenerate.mergeEtags(
cacheGenerate.getLazyHashedEtag(asset.source),
Array.from(
- /** @type {ReferencedHashes} */ (asset.referencedHashes),
+ /** @type {Hashes} */ (asset.referencedHashes),
(hash) => hashToNewHash.get(hash)
).join("|")
);
/**
+ * Compute new content.
* @param {AssetInfoForRealContentHash} asset asset info
* @returns {Promise<void>}
*/
@@ -341,10 +362,10 @@
if (asset.contentComputePromise) return asset.contentComputePromise;
return (asset.contentComputePromise = (async () => {
if (
- /** @type {OwnHashes} */ (asset.ownHashes).size > 0 ||
- [
- .../** @type {ReferencedHashes} */ (asset.referencedHashes)
- ].some((hash) => hashToNewHash.get(hash) !== hash)
+ /** @type {Hashes} */ (asset.ownHashes).size > 0 ||
+ [.../** @type {Hashes} */ (asset.referencedHashes)].some(
+ (hash) => hashToNewHash.get(hash) !== hash
+ )
) {
const identifier = asset.name;
const etag = getEtag(asset);
@@ -363,6 +384,7 @@
})());
};
/**
+ * Compute new content without own.
* @param {AssetInfoForRealContentHash} asset asset info
* @returns {Promise<void>}
*/
@@ -372,10 +394,10 @@
}
return (asset.contentComputeWithoutOwnPromise = (async () => {
if (
- /** @type {OwnHashes} */ (asset.ownHashes).size > 0 ||
- [
- .../** @type {ReferencedHashes} */ (asset.referencedHashes)
- ].some((hash) => hashToNewHash.get(hash) !== hash)
+ /** @type {Hashes} */ (asset.ownHashes).size > 0 ||
+ [.../** @type {Hashes} */ (asset.referencedHashes)].some(
+ (hash) => hashToNewHash.get(hash) !== hash
+ )
) {
const identifier = `${asset.name}|without-own`;
const etag = getEtag(asset);
@@ -387,7 +409,7 @@
hashRegExp,
(hash) => {
if (
- /** @type {OwnHashes} */
+ /** @type {Hashes} */
(asset.ownHashes).has(hash)
) {
return "";
@@ -401,6 +423,7 @@
}
})());
};
+ /** @type {Comparator<AssetInfoForRealContentHash>} */
const comparator = compareSelect((a) => a.name, compareStrings);
for (const oldHash of hashesInOrder) {
const assets =
@@ -409,13 +432,13 @@
assets.sort(comparator);
await Promise.all(
assets.map((asset) =>
- /** @type {OwnHashes} */ (asset.ownHashes).has(oldHash)
+ /** @type {Hashes} */ (asset.ownHashes).has(oldHash)
? computeNewContentWithoutOwn(asset)
: computeNewContent(asset)
)
);
const assetsContent = mapAndDeduplicateBuffers(assets, (asset) => {
- if (/** @type {OwnHashes} */ (asset.ownHashes).has(oldHash)) {
+ if (/** @type {Hashes} */ (asset.ownHashes).has(oldHash)) {
return asset.newSourceWithoutOwn
? asset.newSourceWithoutOwn.buffer()
: asset.source.buffer();
@@ -447,7 +470,9 @@
);
const infoUpdate = {};
- const hash = /** @type {string} */ (asset.info.contenthash);
+ const hash =
+ /** @type {Exclude<AssetInfo["contenthash"], undefined>} */
+ (asset.info.contenthash);
infoUpdate.contenthash = Array.isArray(hash)
? hash.map(
(hash) => /** @type {string} */ (hashToNewHash.get(hash))
--
Gitblit v1.9.3