@depup/webpack 5.106.1-depup.0 → 5.109.2-depup.0

package/lib/dependencies/CommonJsImportsParserPlugin.js

@@ -5,15 +5,16 @@
 
 "use strict";
 
-const CommentCompilationWarning = require("../CommentCompilationWarning");
 const RuntimeGlobals = require("../RuntimeGlobals");
-const UnsupportedFeatureWarning = require("../UnsupportedFeatureWarning");
+const CommentCompilationWarning = require("../errors/CommentCompilationWarning");
+const UnsupportedFeatureWarning = require("../errors/UnsupportedFeatureWarning");
 const {
 	evaluateToIdentifier,
 	evaluateToString,
 	expressionIsUnsupported,
 	toConstantDependency
 } = require("../javascript/JavascriptParserHelpers");
+const memoize = require("../util/memoize");
 const traverseDestructuringAssignmentProperties = require("../util/traverseDestructuringAssignmentProperties");
 const CommonJsFullRequireDependency = require("./CommonJsFullRequireDependency");
 const CommonJsRequireContextDependency = require("./CommonJsRequireContextDependency");
@@ -42,14 +43,31 @@ const RequireResolveHeaderDependency = require("./RequireResolveHeaderDependency
 /** @typedef {import("./LocalModule")} LocalModule */
 
 /**
+ * Defines the common js import settings type used by this module.
  * @typedef {object} CommonJsImportSettings
  * @property {string=} name
  * @property {string} context
  */
 
+/**
+ * Per-`const NAME = require(LITERAL)` binding state used to forward
+ * member-access references on `NAME` to the `CommonJsRequireDependency`
+ * created for the `require()` call.
+ * @typedef {object} RequireBindingData
+ * @property {RawReferencedExports | null} referencedExports mutable list, pushed to as `NAME.x.y` accesses are walked; null means the whole namespace is used. Separate from `dep` so a deferred require (walked after accesses on `NAME`) still collects them; becomes the dep's shared list on creation.
+ * @property {InstanceType<typeof import("./CommonJsRequireDependency")> | null} dep dependency for the `require()` call, null until the `require()` is walked; kept so a later whole-namespace use can null its list directly
+ */
+
+const getHarmonyImportGuard = memoize(() => require("./HarmonyImportGuard"));
+
+const REQUIRE_BINDING_TAG = Symbol(
+	"CommonJsImportsParserPlugin require binding"
+);
+
 const PLUGIN_NAME = "CommonJsImportsParserPlugin";
 
 /**
+ * Checks whether this object is require call expression.
  * @param {Expression} expression expression
  * @returns {boolean} true, when expression is `require(...)` or `module.require(...)`
  */
@@ -73,6 +91,7 @@ const isRequireCallExpression = (expression) => {
 };
 
 /**
+ * Gets require referenced exports from destructuring.
  * @param {JavascriptParser} parser parser
  * @param {CallExpression | NewExpression} expr expression
  * @returns {RawReferencedExports | null} referenced exports from destructuring
@@ -92,6 +111,7 @@ const getRequireReferencedExportsFromDestructuring = (parser, expr) => {
 };
 
 /**
+ * Creates a require cache dependency.
  * @param {JavascriptParser} parser parser
  * @returns {(expr: Expression) => boolean} handler
  */
@@ -103,6 +123,7 @@ const createRequireCacheDependency = (parser) =>
 	]);
 
 /**
+ * Creates a require as expression handler.
  * @param {JavascriptParser} parser parser
  * @param {JavascriptParserOptions} options options
  * @param {() => undefined | string} getContext context accessor
@@ -125,43 +146,63 @@ const createRequireAsExpressionHandler =
 		dep.critical =
 			options.unknownContextCritical &&
 			"require function is used in a way in which dependencies cannot be statically extracted";
-		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		dep.loc = parser.getLocation(expr);
 		dep.optional = Boolean(parser.scope.inTry);
 		parser.state.current.addDependency(dep);
 		return true;
 	};
 
 /**
+ * Creates a require call handler.
  * @param {JavascriptParser} parser parser
  * @param {JavascriptParserOptions} options options
  * @param {() => undefined | string} getContext context accessor
+ * @param {WeakMap<CallExpression, RequireBindingData>=} requireBindingData per-parser `const NAME = require(LITERAL)` binding state; only the free-`require` plugin populates it
  * @returns {(callNew: boolean) => (expr: CallExpression | NewExpression) => (boolean | void)} handler factory
  */
-const createRequireCallHandler = (parser, options, getContext) => {
+const createRequireCallHandler = (
+	parser,
+	options,
+	getContext,
+	requireBindingData
+) => {
 	/**
+	 * Process require item.
 	 * @param {CallExpression | NewExpression} expr expression
 	 * @param {BasicEvaluatedExpression} param param
 	 * @returns {boolean | void} true when handled
 	 */
 	const processRequireItem = (expr, param) => {
 		if (param.isString()) {
-			const referencedExports = getRequireReferencedExportsFromDestructuring(
+			let referencedExports = getRequireReferencedExportsFromDestructuring(
 				parser,
 				expr
 			);
+			const binding =
+				requireBindingData &&
+				requireBindingData.get(/** @type {CallExpression} */ (expr));
+			if (binding && !referencedExports) {
+				// `const NAME = require(LITERAL)` — let later member-access walks
+				// on `NAME` populate the dependency's referenced exports.
+				referencedExports = binding.referencedExports;
+			}
 			const dep = new CommonJsRequireDependency(
 				/** @type {string} */ (param.string),
 				/** @type {Range} */ (param.range),
 				getContext(),
-				referencedExports
+				referencedExports,
+				/** @type {Range} */ (expr.range)
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			if (binding) binding.dep = dep;
+			dep.loc = parser.getLocation(expr);
 			dep.optional = Boolean(parser.scope.inTry);
 			parser.state.current.addDependency(dep);
+			getHarmonyImportGuard().attachDependencyGuards(parser, dep);
 			return true;
 		}
 	};
 	/**
+	 * Process require context.
 	 * @param {CallExpression | NewExpression} expr expression
 	 * @param {BasicEvaluatedExpression} param param
 	 * @returns {boolean | void} true when handled
@@ -186,7 +227,7 @@ const createRequireCallHandler = (parser, options, getContext) => {
 			getContext()
 		);
 		if (!dep) return;
-		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		dep.loc = parser.getLocation(expr);
 		dep.optional = Boolean(parser.scope.inTry);
 		parser.state.current.addDependency(dep);
 		return true;
@@ -203,7 +244,7 @@ const createRequireCallHandler = (parser, options, getContext) => {
 					parser.state.module.addWarning(
 						new CommentCompilationWarning(
 							`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,
-							/** @type {DependencyLocation} */ (comment.loc)
+							parser.getLocation(comment)
 						)
 					);
 				}
@@ -213,7 +254,7 @@ const createRequireCallHandler = (parser, options, getContext) => {
 					parser.state.module.addWarning(
 						new UnsupportedFeatureWarning(
 							`\`webpackIgnore\` expected a boolean, but received: ${requireOptions.webpackIgnore}.`,
-							/** @type {DependencyLocation} */ (expr.loc)
+							parser.getLocation(expr)
 						)
 					);
 				} else if (requireOptions.webpackIgnore) {
@@ -241,7 +282,7 @@ const createRequireCallHandler = (parser, options, getContext) => {
 				const dep = new RequireHeaderDependency(
 					/** @type {Range} */ (expr.callee.range)
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				parser.state.module.addPresentationalDependency(dep);
 				return true;
 			}
@@ -259,7 +300,7 @@ const createRequireCallHandler = (parser, options, getContext) => {
 				/** @type {Range} */ (expr.range),
 				callNew
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			parser.state.module.addPresentationalDependency(dep);
 		} else {
 			const result = processRequireItem(expr, param);
@@ -269,7 +310,7 @@ const createRequireCallHandler = (parser, options, getContext) => {
 				const dep = new RequireHeaderDependency(
 					/** @type {Range} */ (expr.callee.range)
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				parser.state.module.addPresentationalDependency(dep);
 			}
 		}
@@ -278,6 +319,7 @@ const createRequireCallHandler = (parser, options, getContext) => {
 };
 
 /**
+ * Creates a process resolve handler.
  * @param {JavascriptParser} parser parser
  * @param {JavascriptParserOptions} options options
  * @param {() => undefined | string} getContext context accessor
@@ -285,6 +327,7 @@ const createRequireCallHandler = (parser, options, getContext) => {
  */
 const createProcessResolveHandler = (parser, options, getContext) => {
 	/**
+	 * Process resolve item.
 	 * @param {CallExpression} expr call expression
 	 * @param {BasicEvaluatedExpression} param param
 	 * @param {boolean} weak weak
@@ -297,7 +340,7 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 				/** @type {Range} */ (param.range),
 				getContext()
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			dep.optional = Boolean(parser.scope.inTry);
 			dep.weak = weak;
 			parser.state.current.addDependency(dep);
@@ -305,6 +348,7 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 		}
 	};
 	/**
+	 * Process resolve context.
 	 * @param {CallExpression} expr call expression
 	 * @param {BasicEvaluatedExpression} param param
 	 * @param {boolean} weak weak
@@ -325,7 +369,7 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 			getContext()
 		);
 		if (!dep) return;
-		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		dep.loc = parser.getLocation(expr);
 		dep.optional = Boolean(parser.scope.inTry);
 		parser.state.current.addDependency(dep);
 		return true;
@@ -342,7 +386,7 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 					parser.state.module.addWarning(
 						new CommentCompilationWarning(
 							`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,
-							/** @type {DependencyLocation} */ (comment.loc)
+							parser.getLocation(comment)
 						)
 					);
 				}
@@ -352,7 +396,7 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 					parser.state.module.addWarning(
 						new UnsupportedFeatureWarning(
 							`\`webpackIgnore\` expected a boolean, but received: ${requireOptions.webpackIgnore}.`,
-							/** @type {DependencyLocation} */ (expr.loc)
+							parser.getLocation(expr)
 						)
 					);
 				} else if (requireOptions.webpackIgnore) {
@@ -376,7 +420,7 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 			const dep = new RequireResolveHeaderDependency(
 				/** @type {Range} */ (expr.callee.range)
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			parser.state.module.addPresentationalDependency(dep);
 			return true;
 		}
@@ -387,7 +431,7 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 		const dep = new RequireResolveHeaderDependency(
 			/** @type {Range} */ (expr.callee.range)
 		);
-		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		dep.loc = parser.getLocation(expr);
 		parser.state.module.addPresentationalDependency(dep);
 		return true;
 	};
@@ -395,13 +439,16 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 
 class CommonJsImportsParserPlugin {
 	/**
+	 * Creates an instance of CommonJsImportsParserPlugin.
 	 * @param {JavascriptParserOptions} options parser options
 	 */
 	constructor(options) {
+		/** @type {JavascriptParserOptions} */
 		this.options = options;
 	}
 
 	/**
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {JavascriptParser} parser the parser
 	 * @returns {void}
 	 */
@@ -425,6 +472,7 @@ class CommonJsImportsParserPlugin {
 
 		// #region metadata
 		/**
+		 * Tap require expression.
 		 * @param {string} expression expression
 		 * @param {() => Members} getMembers get members
 		 */
@@ -454,7 +502,7 @@ class CommonJsImportsParserPlugin {
 		parser.hooks.assign.for("require").tap(PLUGIN_NAME, (expr) => {
 			// to not leak to global "require", we need to define a local require here.
 			const dep = new ConstDependency("var require;", 0);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			parser.state.module.addPresentationalDependency(dep);
 			return true;
 		});
@@ -491,6 +539,7 @@ class CommonJsImportsParserPlugin {
 
 		// #region Renaming
 		/**
+		 * Returns true when set undefined.
 		 * @param {Expression} expr expression
 		 * @returns {boolean} true when set undefined
 		 */
@@ -500,7 +549,7 @@ class CommonJsImportsParserPlugin {
 				"undefined",
 				/** @type {Range} */ (expr.range)
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			parser.state.module.addPresentationalDependency(dep);
 			return false;
 		};
@@ -516,6 +565,7 @@ class CommonJsImportsParserPlugin {
 
 		// #region Require as expression
 		/**
+		 * Require as expression handler.
 		 * @param {Expression} expr expression
 		 * @returns {boolean} true when handled
 		 */
@@ -531,13 +581,17 @@ class CommonJsImportsParserPlugin {
 
 		// #region Require
 		/**
+		 * Creates a require handler.
 		 * @param {boolean} callNew true, when require is called with new
 		 * @returns {(expr: CallExpression | NewExpression) => (boolean | void)} handler
 		 */
+		/** @type {WeakMap<CallExpression, RequireBindingData>} */
+		const requireBindingData = new WeakMap();
 		const createRequireHandler = createRequireCallHandler(
 			parser,
 			options,
-			getContext
+			getContext,
+			requireBindingData
 		);
 		parser.hooks.call
 			.for("require")
@@ -555,6 +609,7 @@ class CommonJsImportsParserPlugin {
 
 		// #region Require with property access
 		/**
+		 * Returns true when handled.
 		 * @param {Expression} expr expression
 		 * @param {CalleeMembers} calleeMembers callee members
 		 * @param {CallExpression} callExpr call expression
@@ -585,12 +640,14 @@ class CommonJsImportsParserPlugin {
 					/** @type {Range} */ (expr.range)[0]
 				);
 				dep.optional = Boolean(parser.scope.inTry);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				parser.state.current.addDependency(dep);
+				getHarmonyImportGuard().attachDependencyGuards(parser, dep);
 				return true;
 			}
 		};
 		/**
+		 * Call chain handler.
 		 * @param {CallExpression} expr expression
 		 * @param {CalleeMembers} calleeMembers callee members
 		 * @param {CallExpression} callExpr call expression
@@ -622,8 +679,9 @@ class CommonJsImportsParserPlugin {
 					/** @type {Range} */ (expr.range)[0]
 				);
 				dep.optional = Boolean(parser.scope.inTry);
-				dep.loc = /** @type {DependencyLocation} */ (expr.callee.loc);
+				dep.loc = parser.getLocation(expr.callee);
 				parser.state.current.addDependency(dep);
+				getHarmonyImportGuard().attachDependencyGuards(parser, dep);
 				parser.walkExpressions(expr.arguments);
 				return true;
 			}
@@ -642,8 +700,115 @@ class CommonJsImportsParserPlugin {
 			.tap(PLUGIN_NAME, callChainHandler);
 		// #endregion
 
+		// #region Require bound to a const variable
+		// Track `const NAME = require(LITERAL)` so that static member accesses on
+		// `NAME` (e.g. `NAME.foo`, `NAME.foo()`) are forwarded to the same
+		// `CommonJsRequireDependency` as referenced exports — enabling tree
+		// shaking of CommonJS modules that are imported into a named binding
+		// rather than destructured.
+		parser.hooks.preDeclarator.tap(PLUGIN_NAME, (declarator, statement) => {
+			if (statement.kind !== "const") return;
+			if (declarator.id.type !== "Identifier") return;
+			if (!declarator.init || declarator.init.type !== "CallExpression") {
+				return;
+			}
+			const init = declarator.init;
+			if (
+				init.callee.type !== "Identifier" ||
+				init.callee.name !== "require" ||
+				init.arguments.length !== 1
+			) {
+				return;
+			}
+			const arg = init.arguments[0];
+			if (arg.type !== "Literal" || typeof arg.value !== "string") return;
+			// Only attach binding state when `require` resolves to the free
+			// `require` (i.e. it isn't shadowed in the current scope).
+			const requireInfo = parser.getFreeInfoFromVariable("require");
+			if (!requireInfo || requireInfo.name !== "require") return;
+			/** @type {RequireBindingData} */
+			const binding = {
+				referencedExports: [],
+				dep: null
+			};
+			requireBindingData.set(init, binding);
+			parser.tagVariable(declarator.id.name, REQUIRE_BINDING_TAG, binding);
+			return true;
+		});
+
+		parser.hooks.expression.for(REQUIRE_BINDING_TAG).tap(PLUGIN_NAME, () => {
+			const binding =
+				/** @type {RequireBindingData} */
+				(parser.currentTagData);
+			if (binding) {
+				// `NAME` is read as a value (not as the object of a static member
+				// chain), so we have to assume the whole exports object is used.
+				binding.referencedExports = null;
+				if (binding.dep) {
+					binding.dep.referencedExports = null;
+				}
+			}
+			return true;
+		});
+
+		parser.hooks.expressionMemberChain
+			.for(REQUIRE_BINDING_TAG)
+			.tap(PLUGIN_NAME, (_expr, members) => {
+				const binding =
+					/** @type {RequireBindingData} */
+					(parser.currentTagData);
+				if (binding && binding.referencedExports) {
+					binding.referencedExports.push(members);
+				}
+				// Returning truthy suppresses the parser's fallback chain (which
+				// would otherwise walk `NAME` as a bare expression and trigger our
+				// `expression` hook above, marking the whole namespace as used).
+				return true;
+			});
+
+		parser.hooks.callMemberChain
+			.for(REQUIRE_BINDING_TAG)
+			.tap(PLUGIN_NAME, (expr, members) => {
+				const binding =
+					/** @type {RequireBindingData} */
+					(parser.currentTagData);
+				if (binding && binding.referencedExports) {
+					if (members.length === 0) {
+						// `NAME(...)` — calling the require result directly; the
+						// whole exports object is observable.
+						binding.referencedExports = null;
+						if (binding.dep) {
+							binding.dep.referencedExports = null;
+						}
+					} else {
+						binding.referencedExports.push(members);
+					}
+				}
+				if (expr.arguments) parser.walkExpressions(expr.arguments);
+				return true;
+			});
+
+		// Re-exporting the binding lets the require result escape, so the whole
+		// exports object is observable. Stage -10 runs before the harmony bail tap.
+		parser.hooks.exportSpecifier.tap(
+			{ name: PLUGIN_NAME, stage: -10 },
+			(_statement, id) => {
+				const binding =
+					/** @type {RequireBindingData | undefined} */
+					(parser.getTagData(id, REQUIRE_BINDING_TAG));
+				if (binding) {
+					binding.referencedExports = null;
+					if (binding.dep) {
+						binding.dep.referencedExports = null;
+					}
+				}
+			}
+		);
+		// #endregion
+
 		// #region Require.resolve
 		/**
+		 * Processes the provided expr.
 		 * @param {CallExpression} expr call expression
 		 * @param {boolean} weak weak
 		 * @returns {boolean | void} true when handled

package/lib/dependencies/CommonJsPlugin.js

@@ -44,7 +44,7 @@ const PLUGIN_NAME = "CommonJsPlugin";
 
 class CommonJsPlugin {
 	/**
-	 * Apply the plugin
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
 	 */
@@ -174,6 +174,7 @@ class CommonJsPlugin {
 					});
 
 				/**
+				 * Handles the hook callback for this code path.
 				 * @param {Parser} parser parser parser
 				 * @param {JavascriptParserOptions} parserOptions parserOptions
 				 * @returns {void}
@@ -219,7 +220,7 @@ class CommonJsPlugin {
 							const dep = new RuntimeRequirementsDependency([
 								RuntimeGlobals.moduleLoaded
 							]);
-							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+							dep.loc = parser.getLocation(expr);
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});
@@ -233,7 +234,7 @@ class CommonJsPlugin {
 							const dep = new RuntimeRequirementsDependency([
 								RuntimeGlobals.moduleId
 							]);
-							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+							dep.loc = parser.getLocation(expr);
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});
@@ -266,6 +267,7 @@ class HarmonyModuleDecoratorRuntimeModule extends RuntimeModule {
 	}
 
 	/**
+	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code
 	 */
 	generate() {
@@ -279,7 +281,7 @@ class HarmonyModuleDecoratorRuntimeModule extends RuntimeModule {
 				"Object.defineProperty(module, 'exports', {",
 				Template.indent([
 					"enumerable: true,",
-					`set: ${runtimeTemplate.basicFunction("", [
+					`${runtimeTemplate.method("set", "", [
 						"throw new Error('ES Modules may not assign module.exports or exports.*, Use ESM export syntax, instead: ' + module.id);"
 					])}`
 				]),
@@ -296,6 +298,7 @@ class NodeModuleDecoratorRuntimeModule extends RuntimeModule {
 	}
 
 	/**
+	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code
 	 */
 	generate() {

package/lib/dependencies/CommonJsRequireContextDependency.js

@@ -11,8 +11,8 @@ const ContextDependency = require("./ContextDependency");
 const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
 
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range | undefined, boolean | string | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range | undefined, boolean | string | undefined]>} ObjectSerializerContext */
 /** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */
 /** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
 /** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
@@ -21,6 +21,7 @@ const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTempl
 
 class CommonJsRequireContextDependency extends ContextDependency {
 	/**
+	 * Creates an instance of CommonJsRequireContextDependency.
 	 * @param {ContextDependencyOptions} options options for the context module
 	 * @param {Range} range location in source code
 	 * @param {Range=} valueRange location of the require call
@@ -33,6 +34,7 @@ class CommonJsRequireContextDependency extends ContextDependency {
 		this.range = range;
 		this.valueRange = valueRange;
 		// inShorthand must be serialized by subclasses that use it
+		/** @type {string | boolean | undefined} */
 		this.inShorthand = inShorthand;
 	}
 
@@ -57,29 +59,27 @@ class CommonJsRequireContextDependency extends ContextDependency {
 	}
 
 	/**
+	 * Serializes this instance into the provided serializer context.
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.range);
-		write(this.valueRange);
-		write(this.inShorthand);
+		context.write(this.range).write(this.valueRange).write(this.inShorthand);
 
 		super.serialize(context);
 	}
 
 	/**
+	 * Restores this instance from the provided deserializer context.
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.range = read();
-		this.valueRange = read();
-		this.inShorthand = read();
+		this.range = context.read();
+		const c1 = context.rest;
+		this.valueRange = c1.read();
+		const c2 = c1.rest;
+		this.inShorthand = c2.read();
 
-		super.deserialize(context);
+		super.deserialize(c2.rest);
 	}
 }