webpack 5.107.1 → 5.108.0

package/lib/serialization/DateObjectSerializer.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-/** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext<[number]>} ObjectDeserializerContext */
+/** @typedef {import("./ObjectMiddleware").ObjectSerializerContext<[number]>} ObjectSerializerContext */
 
 class DateObjectSerializer {
 	/**

package/lib/serialization/ErrorObjectSerializer.js

@@ -4,8 +4,9 @@
 
 "use strict";
 
-/** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./types").ComplexSerializableType} ComplexSerializableType */
+/** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext<ComplexSerializableType[]>} ObjectDeserializerContext */
+/** @typedef {import("./ObjectMiddleware").ObjectSerializerContext<ComplexSerializableType[]>} ObjectSerializerContext */
 
 /** @typedef {Error & { cause?: unknown }} ErrorWithCause */
 
@@ -27,8 +28,8 @@ class ErrorObjectSerializer {
 		context.write(obj.message);
 		context.write(obj.stack);
 		context.write(
-			/** @type {ErrorWithCause} */
-			(obj).cause
+			/** @type {ComplexSerializableType} */
+			(/** @type {ErrorWithCause} */ (obj).cause)
 		);
 	}
 
@@ -40,8 +41,8 @@ class ErrorObjectSerializer {
 	deserialize(context) {
 		const err = new this.Type();
 
-		err.message = context.read();
-		err.stack = context.read();
+		err.message = /** @type {string} */ (context.read());
+		err.stack = /** @type {string | undefined} */ (context.read());
 		/** @type {ErrorWithCause} */
 		(err).cause = context.read();
 

package/lib/serialization/MapObjectSerializer.js

@@ -4,15 +4,12 @@
 
 "use strict";
 
-/** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-
 class MapObjectSerializer {
 	/**
 	 * Serializes this instance into the provided serializer context.
 	 * @template K, V
 	 * @param {Map<K, V>} obj map
-	 * @param {ObjectSerializerContext} context context
+	 * @param {import("./ObjectMiddleware").ObjectSerializerContext<(number | K | V)[]>} context context
 	 */
 	serialize(obj, context) {
 		context.write(obj.size);
@@ -27,21 +24,20 @@ class MapObjectSerializer {
 	/**
 	 * Restores this instance from the provided deserializer context.
 	 * @template K, V
-	 * @param {ObjectDeserializerContext} context context
+	 * @param {import("./ObjectMiddleware").ObjectDeserializerContext<(number | K | V)[]>} context context
 	 * @returns {Map<K, V>} map
 	 */
 	deserialize(context) {
-		/** @type {number} */
-		const size = context.read();
+		const size = /** @type {number} */ (context.read());
 		/** @type {Map<K, V>} */
 		const map = new Map();
 		/** @type {K[]} */
 		const keys = [];
 		for (let i = 0; i < size; i++) {
-			keys.push(context.read());
+			keys.push(/** @type {K} */ (context.read()));
 		}
 		for (let i = 0; i < size; i++) {
-			map.set(keys[i], context.read());
+			map.set(keys[i], /** @type {V} */ (context.read()));
 		}
 		return map;
 	}

package/lib/serialization/NullPrototypeObjectSerializer.js

@@ -4,9 +4,6 @@
 
 "use strict";
 
-/** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-
 /** @typedef {string[]} Keys */
 
 class NullPrototypeObjectSerializer {
@@ -14,7 +11,7 @@ class NullPrototypeObjectSerializer {
 	 * Serializes this instance into the provided serializer context.
 	 * @template {object} T
 	 * @param {T} obj null object
-	 * @param {ObjectSerializerContext} context context
+	 * @param {import("./ObjectMiddleware").ObjectSerializerContext<(string | null | T[keyof T])[]>} context context
 	 */
 	serialize(obj, context) {
 		/** @type {Keys} */
@@ -31,7 +28,7 @@ class NullPrototypeObjectSerializer {
 	/**
 	 * Restores this instance from the provided deserializer context.
 	 * @template {object} T
-	 * @param {ObjectDeserializerContext} context context
+	 * @param {import("./ObjectMiddleware").ObjectDeserializerContext<(string | null | T[keyof T])[]>} context context
 	 * @returns {T} null object
 	 */
 	deserialize(context) {
@@ -39,14 +36,15 @@ class NullPrototypeObjectSerializer {
 		const obj = Object.create(null);
 		/** @type {Keys} */
 		const keys = [];
-		/** @type {Keys[number] | null} */
-		let key = context.read();
+		let key = /** @type {string | null} */ (context.read());
 		while (key !== null) {
 			keys.push(key);
-			key = context.read();
+			key = /** @type {string | null} */ (context.read());
 		}
 		for (const key of keys) {
-			obj[/** @type {keyof T} */ (key)] = context.read();
+			obj[/** @type {keyof T} */ (key)] = /** @type {T[keyof T]} */ (
+				context.read()
+			);
 		}
 		return obj;
 	}

package/lib/serialization/ObjectMiddleware.js

@@ -60,10 +60,24 @@ Technically any value can be used.
 
 /** @typedef {EXPECTED_OBJECT | string} ReferenceableItem */
 
+/**
+ * First tuple element; element type for an open array; `EXPECTED_ANY` once exhausted.
+ * @template {readonly EXPECTED_ANY[]} T
+ * @typedef {T extends readonly [infer H, ...EXPECTED_ANY[]] ? H : T extends readonly [] ? EXPECTED_ANY : T extends readonly (infer E)[] ? E : never} Head
+ */
+
+/**
+ * Tuple without its first element; unchanged when `T` is an open array.
+ * @template {readonly EXPECTED_ANY[]} T
+ * @typedef {T extends readonly [EXPECTED_ANY, ...infer R] ? R : T} Tail
+ */
+
 /**
  * Defines the object serializer context type used by this module.
+ * `T` is the tuple of values written in order; each `write` consumes the head.
+ * @template {readonly EXPECTED_ANY[]} [T=readonly EXPECTED_ANY[]]
  * @typedef {object} ObjectSerializerContext
- * @property {(value: EXPECTED_ANY) => void} write
+ * @property {(value: Head<T>) => ObjectSerializerContext<Tail<T>>} write
  * @property {(value: ReferenceableItem) => void} setCircularReference
  * @property {() => ObjectSerializerSnapshot} snapshot
  * @property {(snapshot: ObjectSerializerSnapshot) => void} rollback
@@ -73,16 +87,20 @@ Technically any value can be used.
 
 /**
  * Defines the object deserializer context type used by this module.
+ * `T` is the tuple of values read in order: `read` returns the head, and `rest`
+ * re-types the same context to `Tail<T>` so successive reads stay positional.
+ * @template {readonly EXPECTED_ANY[]} [T=readonly EXPECTED_ANY[]]
  * @typedef {object} ObjectDeserializerContext
- * @property {() => EXPECTED_ANY} read
+ * @property {() => Head<T>} read
+ * @property {ObjectDeserializerContext<Tail<T>>} rest
  * @property {(value: ReferenceableItem) => void} setCircularReference
  */
 
 /**
  * Defines the object serializer type used by this module.
  * @typedef {object} ObjectSerializer
- * @property {(value: EXPECTED_ANY, context: ObjectSerializerContext) => void} serialize
- * @property {(context: ObjectDeserializerContext) => EXPECTED_ANY} deserialize
+ * @property {(value: EXPECTED_ANY, context: ObjectSerializerContext<EXPECTED_ANY>) => void} serialize
+ * @property {(context: ObjectDeserializerContext<EXPECTED_ANY>) => EXPECTED_ANY} deserialize
  */
 
 /**
@@ -214,7 +232,7 @@ const loaders = new Map();
 /** @typedef {PrimitiveSerializableType[]} SerializedType */
 /** @typedef {{ logger: Logger }} Context */
 
-/** @typedef {(context: ObjectSerializerContext | ObjectDeserializerContext) => void} ExtendContext */
+/** @typedef {(context: ObjectSerializerContext<EXPECTED_ANY> | ObjectDeserializerContext<EXPECTED_ANY>) => void} ExtendContext */
 
 /**
  * Represents ObjectMiddleware.
@@ -506,11 +524,11 @@ class ObjectMiddleware extends SerializerMiddleware {
 		};
 		/** @type {undefined | WeakSet<Error>} */
 		let hasDebugInfoAttached;
-		/** @type {ObjectSerializerContext} */
+		/** @type {ObjectSerializerContext<EXPECTED_ANY>} */
 		let ctx = {
 			write(value) {
 				try {
-					process(value);
+					process(/** @type {ComplexSerializableType} */ (value));
 				} catch (err) {
 					if (err !== NOT_SERIALIZABLE) {
 						if (hasDebugInfoAttached === undefined) {
@@ -518,12 +536,14 @@ class ObjectMiddleware extends SerializerMiddleware {
 						}
 						if (!hasDebugInfoAttached.has(/** @type {Error} */ (err))) {
 							/** @type {Error} */
-							(err).message += `\nwhile serializing ${stackToString(value)}`;
+							(err).message +=
+								`\nwhile serializing ${stackToString(/** @type {ComplexSerializableType} */ (value))}`;
 							hasDebugInfoAttached.add(/** @type {Error} */ (err));
 						}
 					}
 					throw err;
 				}
+				return ctx;
 			},
 			setCircularReference(ref) {
 				addReferenceable(ref);
@@ -625,8 +645,19 @@ class ObjectMiddleware extends SerializerMiddleware {
 					// check if we can emit a reference
 					const ref = referenceable.get(item);
 					if (ref !== undefined) {
-						result.push(ESCAPE, ref - currentPos);
-						return;
+						const offset = ref - currentPos;
+						if (
+							// One far ref → 5 bytes (`null` + offset), one near ref -> 2/3 bytes
+							offset >= -32768 ||
+							// long enough that the ref wins, keep it
+							item.length >= 4 ||
+							// multibyte → inline would be even bigger, keep it
+							Buffer.byteLength(item) !== item.length
+						) {
+							// A back-reference is `null` + the offset.
+							result.push(ESCAPE, offset);
+							return;
+						}
 					}
 					addReferenceable(item);
 				}
@@ -736,10 +767,14 @@ class ObjectMiddleware extends SerializerMiddleware {
 		let objectTypeLookup = [];
 		/** @type {ComplexSerializableType[]} */
 		let result = [];
-		/** @type {ObjectDeserializerContext} */
+		/** @type {ObjectDeserializerContext<EXPECTED_ANY>} */
 		let ctx = {
 			read() {
-				return decodeValue();
+				return /** @type {EXPECTED_ANY} */ (decodeValue());
+			},
+			// type-only cursor advance; same object, retyped to the tuple tail
+			get rest() {
+				return ctx;
 			},
 			setCircularReference(ref) {
 				addReferenceable(ref);
@@ -859,7 +894,9 @@ class ObjectMiddleware extends SerializerMiddleware {
 				}
 
 				return item;
-			} else if (Buffer.isBuffer(item)) {
+			} else if (typeof item === "object") {
+				// Only non-null objects reach here (ESCAPE/null handled above), and
+				// the stream's only object type is Buffer — avoids a Buffer.isBuffer call
 				addReferenceable(item);
 
 				return item;

package/lib/serialization/PlainObjectSerializer.js

@@ -4,9 +4,6 @@
 
 "use strict";
 
-/** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-
 /** @typedef {EXPECTED_FUNCTION} CacheAssoc */
 
 /**
@@ -78,7 +75,7 @@ class PlainObjectSerializer {
 	 * Serializes this instance into the provided serializer context.
 	 * @template {object} T
 	 * @param {T} obj plain object
-	 * @param {ObjectSerializerContext} context context
+	 * @param {import("./ObjectMiddleware").ObjectSerializerContext<((keyof T)[] | keyof T | null | T[keyof T])[]>} context context
 	 */
 	serialize(obj, context) {
 		const keys = /** @type {(keyof T)[]} */ (Object.keys(obj));
@@ -106,18 +103,22 @@ class PlainObjectSerializer {
 	/**
 	 * Restores this instance from the provided deserializer context.
 	 * @template {object} T
-	 * @param {ObjectDeserializerContext} context context
+	 * @param {import("./ObjectMiddleware").ObjectDeserializerContext<((keyof T)[] | keyof T | null | T[keyof T])[]>} context context
 	 * @returns {T} plain object
 	 */
 	deserialize(context) {
-		const keys = context.read();
+		const keys = /** @type {(keyof T)[] | keyof T | null} */ (context.read());
 		const obj = /** @type {T} */ ({});
 		if (Array.isArray(keys)) {
 			for (const key of keys) {
-				obj[/** @type {keyof T} */ (key)] = context.read();
+				obj[/** @type {keyof T} */ (key)] = /** @type {T[keyof T]} */ (
+					context.read()
+				);
 			}
 		} else if (keys !== null) {
-			obj[/** @type {keyof T} */ (keys)] = context.read();
+			obj[/** @type {keyof T} */ (keys)] = /** @type {T[keyof T]} */ (
+				context.read()
+			);
 		}
 		return obj;
 	}

package/lib/serialization/RegExpObjectSerializer.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-/** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext<[string, string]>} ObjectDeserializerContext */
+/** @typedef {import("./ObjectMiddleware").ObjectSerializerContext<[string, string]>} ObjectSerializerContext */
 
 class RegExpObjectSerializer {
 	/**

package/lib/serialization/Serializer.js

@@ -25,6 +25,7 @@ class Serializer {
 	constructor(middlewares, context) {
 		this.serializeMiddlewares = [...middlewares];
 		this.deserializeMiddlewares = [...middlewares].reverse();
+		/** @type {Context | undefined} */
 		this.context = context;
 	}
 

package/lib/serialization/SetObjectSerializer.js

@@ -4,15 +4,12 @@
 
 "use strict";
 
-/** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-
 class SetObjectSerializer {
 	/**
 	 * Serializes this instance into the provided serializer context.
 	 * @template T
 	 * @param {Set<T>} obj set
-	 * @param {ObjectSerializerContext} context context
+	 * @param {import("./ObjectMiddleware").ObjectSerializerContext<(number | T)[]>} context context
 	 */
 	serialize(obj, context) {
 		context.write(obj.size);
@@ -24,16 +21,15 @@ class SetObjectSerializer {
 	/**
 	 * Restores this instance from the provided deserializer context.
 	 * @template T
-	 * @param {ObjectDeserializerContext} context context
+	 * @param {import("./ObjectMiddleware").ObjectDeserializerContext<(number | T)[]>} context context
 	 * @returns {Set<T>} date
 	 */
 	deserialize(context) {
-		/** @type {number} */
-		const size = context.read();
+		const size = /** @type {number} */ (context.read());
 		/** @type {Set<T>} */
 		const set = new Set();
 		for (let i = 0; i < size; i++) {
-			set.add(context.read());
+			set.add(/** @type {T} */ (context.read()));
 		}
 		return set;
 	}

package/lib/sharing/ConsumeSharedModule.js

@@ -39,8 +39,8 @@ const fallbackModuleCache = new WeakMap();
 /** @typedef {import("../Module").ExportsType} ExportsType */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[ConsumeOptions]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[ConsumeOptions]>} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("../util/semver").SemVerRange} SemVerRange */
@@ -68,6 +68,7 @@ class ConsumeSharedModule extends Module {
 	 */
 	constructor(context, options) {
 		super(WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE, context);
+		/** @type {ConsumeOptions} */
 		this.options = options;
 	}
 
@@ -335,8 +336,7 @@ class ConsumeSharedModule extends Module {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.options);
+		context.write(this.options);
 		super.serialize(context);
 	}
 
@@ -345,9 +345,8 @@ class ConsumeSharedModule extends Module {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.options = read();
-		super.deserialize(context);
+		this.options = context.read();
+		super.deserialize(context.rest);
 	}
 }
 

package/lib/sharing/ConsumeSharedPlugin.js

@@ -41,6 +41,7 @@ class ConsumeSharedPlugin {
 	 * @param {ConsumeSharedPluginOptions} options options
 	 */
 	constructor(options) {
+		/** @type {ConsumeSharedPluginOptions} */
 		this.options = options;
 	}