webpack 5.59.0 → 5.94.0

package/lib/util/numberHash.js

@@ -5,41 +5,91 @@
 
 "use strict";
 
-const SAFE_LIMIT = 0x80000000;
-const SAFE_PART = SAFE_LIMIT - 1;
-const COUNT = 4;
-const arr = [0, 0, 0, 0, 0];
-const primes = [3, 7, 17, 19];
+/**
+ * Threshold for switching from 32-bit to 64-bit hashing. This is selected to ensure that the bias towards lower modulo results when using 32-bit hashing is <0.5%.
+ * @type {number}
+ */
+const FNV_64_THRESHOLD = 1 << 24;
 
-module.exports = (str, range) => {
-	arr.fill(0);
-	for (let i = 0; i < str.length; i++) {
-		const c = str.charCodeAt(i);
-		for (let j = 0; j < COUNT; j++) {
-			const p = (j + COUNT - 1) % COUNT;
-			arr[j] = (arr[j] + c * primes[j] + arr[p]) & SAFE_PART;
-		}
-		for (let j = 0; j < COUNT; j++) {
-			const q = arr[j] % COUNT;
-			arr[j] = arr[j] ^ (arr[q] >> 1);
-		}
+/**
+ * The FNV-1a offset basis for 32-bit hash values.
+ * @type {number}
+ */
+const FNV_OFFSET_32 = 2166136261;
+/**
+ * The FNV-1a prime for 32-bit hash values.
+ * @type {number}
+ */
+const FNV_PRIME_32 = 16777619;
+/**
+ * The mask for a positive 32-bit signed integer.
+ * @type {number}
+ */
+const MASK_31 = 0x7fffffff;
+
+/**
+ * The FNV-1a offset basis for 64-bit hash values.
+ * @type {bigint}
+ */
+const FNV_OFFSET_64 = BigInt("0xCBF29CE484222325");
+/**
+ * The FNV-1a prime for 64-bit hash values.
+ * @type {bigint}
+ */
+const FNV_PRIME_64 = BigInt("0x100000001B3");
+
+/**
+ * Computes a 32-bit FNV-1a hash value for the given string.
+ * See https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+ * @param {string} str The input string to hash
+ * @returns {number} - The computed hash value.
+ */
+function fnv1a32(str) {
+	let hash = FNV_OFFSET_32;
+	for (let i = 0, len = str.length; i < len; i++) {
+		hash ^= str.charCodeAt(i);
+		// Use Math.imul to do c-style 32-bit multiplication and keep only the 32 least significant bits
+		hash = Math.imul(hash, FNV_PRIME_32);
 	}
-	if (range <= SAFE_PART) {
-		let sum = 0;
-		for (let j = 0; j < COUNT; j++) {
-			sum = (sum + arr[j]) % range;
-		}
-		return sum;
-	} else {
-		let sum1 = 0;
-		let sum2 = 0;
-		const rangeExt = Math.floor(range / SAFE_LIMIT);
-		for (let j = 0; j < COUNT; j += 2) {
-			sum1 = (sum1 + arr[j]) & SAFE_PART;
-		}
-		for (let j = 1; j < COUNT; j += 2) {
-			sum2 = (sum2 + arr[j]) % rangeExt;
-		}
-		return (sum2 * SAFE_LIMIT + sum1) % range;
+	// Force the result to be positive
+	return hash & MASK_31;
+}
+
+/**
+ * Computes a 64-bit FNV-1a hash value for the given string.
+ * See https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+ * @param {string} str The input string to hash
+ * @returns {bigint} - The computed hash value.
+ */
+function fnv1a64(str) {
+	let hash = FNV_OFFSET_64;
+	for (let i = 0, len = str.length; i < len; i++) {
+		hash ^= BigInt(str.charCodeAt(i));
+		hash = BigInt.asUintN(64, hash * FNV_PRIME_64);
+	}
+	return hash;
+}
+
+/**
+ * Computes a hash value for the given string and range. This hashing algorithm is a modified
+ * version of the [FNV-1a algorithm](https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function).
+ * It is optimized for speed and does **not** generate a cryptographic hash value.
+ *
+ * We use `numberHash` in `lib/ids/IdHelpers.js` to generate hash values for the module identifier. The generated
+ * hash is used as a prefix for the module id's to avoid collisions with other modules.
+ * @param {string} str The input string to hash.
+ * @param {number} range The range of the hash value (0 to range-1).
+ * @returns {number} - The computed hash value.
+ * @example
+ * ```js
+ * const numberHash = require("webpack/lib/util/numberHash");
+ * numberHash("hello", 1000); // 73
+ * numberHash("hello world"); // 72
+ * ```
+ */
+module.exports = (str, range) => {
+	if (range < FNV_64_THRESHOLD) {
+		return fnv1a32(str) % range;
 	}
+	return Number(fnv1a64(str) % BigInt(range));
 };

package/lib/util/objectToMap.js

@@ -6,7 +6,6 @@
 
 /**
  * Convert an object into an ES6 map
- *
  * @param {object} obj any object type that works with Object.entries()
  * @returns {Map<string, any>} an ES6 Map of KV pairs
  */

package/lib/util/processAsyncTree.js

@@ -21,6 +21,9 @@ const processAsyncTree = (items, concurrency, processor, callback) => {
 	let finished = false;
 	let processScheduled = true;
 
+	/**
+	 * @param {T} item item
+	 */
 	const push = item => {
 		queue.push(item);
 		if (!processScheduled && processing < concurrency) {
@@ -29,6 +32,9 @@ const processAsyncTree = (items, concurrency, processor, callback) => {
 		}
 	};
 
+	/**
+	 * @param {E | null | undefined} err error
+	 */
 	const processorCallback = err => {
 		processing--;
 		if (err && !finished) {
@@ -46,7 +52,7 @@ const processAsyncTree = (items, concurrency, processor, callback) => {
 		if (finished) return;
 		while (processing < concurrency && queue.length > 0) {
 			processing++;
-			const item = queue.pop();
+			const item = /** @type {T} */ (queue.pop());
 			processor(item, push, processorCallback);
 		}
 		processScheduled = false;

package/lib/util/propertyAccess.js

@@ -5,66 +5,18 @@
 
 "use strict";
 
-const SAFE_IDENTIFIER = /^[_a-zA-Z$][_a-zA-Z$0-9]*$/;
-const RESERVED_IDENTIFIER = new Set([
-	"break",
-	"case",
-	"catch",
-	"class",
-	"const",
-	"continue",
-	"debugger",
-	"default",
-	"delete",
-	"do",
-	"else",
-	"export",
-	"extends",
-	"finally",
-	"for",
-	"function",
-	"if",
-	"import",
-	"in",
-	"instanceof",
-	"new",
-	"return",
-	"super",
-	"switch",
-	"this",
-	"throw",
-	"try",
-	"typeof",
-	"var",
-	"void",
-	"while",
-	"with",
-	"enum",
-	// strict mode
-	"implements",
-	"interface",
-	"let",
-	"package",
-	"private",
-	"protected",
-	"public",
-	"static",
-	"yield",
-	"yield",
-	// module code
-	"await",
-	// skip future reserved keywords defined under ES1 till ES3
-	// additional
-	"null",
-	"true",
-	"false"
-]);
+const { SAFE_IDENTIFIER, RESERVED_IDENTIFIER } = require("./propertyName");
 
+/**
+ * @param {ArrayLike<string>} properties properties
+ * @param {number} start start index
+ * @returns {string} chain of property accesses
+ */
 const propertyAccess = (properties, start = 0) => {
 	let str = "";
 	for (let i = start; i < properties.length; i++) {
 		const p = properties[i];
-		if (`${+p}` === p) {
+		if (`${Number(p)}` === p) {
 			str += `[${p}]`;
 		} else if (SAFE_IDENTIFIER.test(p) && !RESERVED_IDENTIFIER.has(p)) {
 			str += `.${p}`;

package/lib/util/propertyName.js

@@ -0,0 +1,77 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const SAFE_IDENTIFIER = /^[_a-zA-Z$][_a-zA-Z$0-9]*$/;
+const RESERVED_IDENTIFIER = new Set([
+	"break",
+	"case",
+	"catch",
+	"class",
+	"const",
+	"continue",
+	"debugger",
+	"default",
+	"delete",
+	"do",
+	"else",
+	"export",
+	"extends",
+	"finally",
+	"for",
+	"function",
+	"if",
+	"import",
+	"in",
+	"instanceof",
+	"new",
+	"return",
+	"super",
+	"switch",
+	"this",
+	"throw",
+	"try",
+	"typeof",
+	"var",
+	"void",
+	"while",
+	"with",
+	"enum",
+	// strict mode
+	"implements",
+	"interface",
+	"let",
+	"package",
+	"private",
+	"protected",
+	"public",
+	"static",
+	"yield",
+	"yield",
+	// module code
+	"await",
+	// skip future reserved keywords defined under ES1 till ES3
+	// additional
+	"null",
+	"true",
+	"false"
+]);
+
+/**
+ * @summary Returns a valid JS property name for the given property.
+ * Certain strings like "default", "null", and names with whitespace are not
+ * valid JS property names, so they are returned as strings.
+ * @param {string} prop property name to analyze
+ * @returns {string} valid JS property name
+ */
+const propertyName = prop => {
+	if (SAFE_IDENTIFIER.test(prop) && !RESERVED_IDENTIFIER.has(prop)) {
+		return prop;
+	}
+	return JSON.stringify(prop);
+};
+
+module.exports = { SAFE_IDENTIFIER, RESERVED_IDENTIFIER, propertyName };

package/lib/util/registerExternalSerializer.js

@@ -9,7 +9,7 @@ const { register } = require("./serialization");
 
 const Position = /** @type {TODO} */ (require("acorn")).Position;
 const SourceLocation = require("acorn").SourceLocation;
-const ValidationError = require("schema-utils/dist/ValidationError").default;
+const ValidationError = require("schema-utils").ValidationError;
 const {
 	CachedSource,
 	ConcatSource,
@@ -26,7 +26,7 @@ const {
 /** @typedef {import("./serialization").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("./serialization").ObjectSerializerContext} ObjectSerializerContext */
 
-/** @typedef {ObjectSerializerContext & { writeLazy?: (any) => void }} WebpackObjectSerializerContext */
+/** @typedef {ObjectSerializerContext & { writeLazy?: (value: any) => void }} WebpackObjectSerializerContext */
 
 const CURRENT_MODULE = "webpack/lib/util/registerExternalSerializer";