webpack 5.59.0 → 5.76.0

package/lib/javascript/ChunkHelpers.js

@@ -0,0 +1,33 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const Entrypoint = require("../Entrypoint");
+
+/** @typedef {import("../Chunk")} Chunk */
+
+/**
+ * @param {Entrypoint} entrypoint a chunk group
+ * @param {Chunk} excludedChunk1 current chunk which is excluded
+ * @param {Chunk} excludedChunk2 runtime chunk which is excluded
+ * @returns {Set<Chunk>} chunks
+ */
+const getAllChunks = (entrypoint, excludedChunk1, excludedChunk2) => {
+	const queue = new Set([entrypoint]);
+	const chunks = new Set();
+	for (const entrypoint of queue) {
+		for (const chunk of entrypoint.chunks) {
+			if (chunk === excludedChunk1) continue;
+			if (chunk === excludedChunk2) continue;
+			chunks.add(chunk);
+		}
+		for (const parent of entrypoint.parentsIterable) {
+			if (parent instanceof Entrypoint) queue.add(parent);
+		}
+	}
+	return chunks;
+};
+exports.getAllChunks = getAllChunks;

package/lib/javascript/JavascriptGenerator.js

@@ -199,6 +199,7 @@ class JavascriptGenerator extends Generator {
 			runtime: generateContext.runtime,
 			runtimeRequirements: generateContext.runtimeRequirements,
 			concatenationScope: generateContext.concatenationScope,
+			codeGenerationResults: generateContext.codeGenerationResults,
 			initFragments
 		};
 

package/lib/javascript/JavascriptModulesPlugin.js

@@ -24,6 +24,7 @@ const { last, someInIterable } = require("../util/IterableHelpers");
 const StringXor = require("../util/StringXor");
 const { compareModulesByIdentifier } = require("../util/comparators");
 const createHash = require("../util/createHash");
+const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 const { intersectRuntime } = require("../util/runtime");
 const JavascriptGenerator = require("./JavascriptGenerator");
 const JavascriptParser = require("./JavascriptParser");
@@ -102,6 +103,7 @@ const printGeneratedCodeForStack = (module, code) => {
 /**
  * @typedef {Object} RenderBootstrapContext
  * @property {Chunk} chunk the chunk
+ * @property {CodeGenerationResults} codeGenerationResults results of code generation
  * @property {RuntimeTemplate} runtimeTemplate the runtime template
  * @property {ModuleGraph} moduleGraph the module graph
  * @property {ChunkGraph} chunkGraph the chunk graph
@@ -331,6 +333,7 @@ class JavascriptModulesPlugin {
 								{
 									hash: "0000",
 									chunk,
+									codeGenerationResults: context.codeGenerationResults,
 									chunkGraph: context.chunkGraph,
 									moduleGraph: context.moduleGraph,
 									runtimeTemplate: context.runtimeTemplate
@@ -343,6 +346,7 @@ class JavascriptModulesPlugin {
 				compilation.hooks.contentHash.tap("JavascriptModulesPlugin", chunk => {
 					const {
 						chunkGraph,
+						codeGenerationResults,
 						moduleGraph,
 						runtimeTemplate,
 						outputOptions: {
@@ -360,6 +364,7 @@ class JavascriptModulesPlugin {
 							{
 								hash: "0000",
 								chunk,
+								codeGenerationResults,
 								chunkGraph: compilation.chunkGraph,
 								moduleGraph: compilation.moduleGraph,
 								runtimeTemplate: compilation.runtimeTemplate
@@ -372,6 +377,7 @@ class JavascriptModulesPlugin {
 					}
 					hooks.chunkHash.call(chunk, hash, {
 						chunkGraph,
+						codeGenerationResults,
 						moduleGraph,
 						runtimeTemplate
 					});
@@ -398,7 +404,10 @@ class JavascriptModulesPlugin {
 						xor.updateHash(hash);
 					}
 					const digest = /** @type {string} */ (hash.digest(hashDigest));
-					chunk.contentHash.javascript = digest.substr(0, hashDigestLength);
+					chunk.contentHash.javascript = nonNumericOnlyHash(
+						digest,
+						hashDigestLength
+					);
 				});
 				compilation.hooks.additionalTreeRuntimeRequirements.tap(
 					"JavascriptModulesPlugin",
@@ -974,7 +983,13 @@ class JavascriptModulesPlugin {
 	 * @returns {{ header: string[], beforeStartup: string[], startup: string[], afterStartup: string[], allowInlineStartup: boolean }} the generated source of the bootstrap code
 	 */
 	renderBootstrap(renderContext, hooks) {
-		const { chunkGraph, moduleGraph, chunk, runtimeTemplate } = renderContext;
+		const {
+			chunkGraph,
+			codeGenerationResults,
+			moduleGraph,
+			chunk,
+			runtimeTemplate
+		} = renderContext;
 
 		const runtimeRequirements = chunkGraph.getTreeRuntimeRequirements(chunk);
 
@@ -1098,8 +1113,18 @@ class JavascriptModulesPlugin {
 						);
 						result.allowInlineStartup = false;
 					}
+
+					let data;
+					if (codeGenerationResults.has(entryModule, chunk.runtime)) {
+						const result = codeGenerationResults.get(
+							entryModule,
+							chunk.runtime
+						);
+						data = result.data;
+					}
 					if (
 						result.allowInlineStartup &&
+						(!data || !data.get("topLevelDeclarations")) &&
 						(!entryModule.buildInfo ||
 							!entryModule.buildInfo.topLevelDeclarations)
 					) {

package/lib/javascript/JavascriptParser.js

@@ -57,7 +57,7 @@ const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
 /** @typedef {{declaredScope: ScopeInfo, freeName: string | true, tagInfo: TagInfo | undefined}} VariableInfoInterface */
-/** @typedef {{ name: string | VariableInfo, rootInfo: string | VariableInfo, getMembers: () => string[] }} GetInfoResult */
+/** @typedef {{ name: string | VariableInfo, rootInfo: string | VariableInfo, getMembers: () => string[], getMembersOptionals: () => boolean[] }} GetInfoResult */
 
 const EMPTY_ARRAY = [];
 const ALLOWED_MEMBER_TYPES_CALL_EXPRESSION = 0b01;
@@ -165,6 +165,14 @@ class JavascriptParser extends Parser {
 			evaluateDefinedIdentifier: new HookMap(
 				() => new SyncBailHook(["expression"])
 			),
+			/** @type {HookMap<SyncBailHook<[NewExpressionNode], BasicEvaluatedExpression | undefined | null>>} */
+			evaluateNewExpression: new HookMap(
+				() => new SyncBailHook(["expression"])
+			),
+			/** @type {HookMap<SyncBailHook<[CallExpressionNode], BasicEvaluatedExpression | undefined | null>>} */
+			evaluateCallExpression: new HookMap(
+				() => new SyncBailHook(["expression"])
+			),
 			/** @type {HookMap<SyncBailHook<[CallExpressionNode, BasicEvaluatedExpression | undefined], BasicEvaluatedExpression | undefined | null>>} */
 			evaluateCallExpressionMember: new HookMap(
 				() => new SyncBailHook(["expression", "param"])
@@ -262,9 +270,9 @@ class JavascriptParser extends Parser {
 			/** @type {HookMap<SyncBailHook<[ExpressionNode], boolean | void>>} */
 			call: new HookMap(() => new SyncBailHook(["expression"])),
 			/** Something like "a.b()" */
-			/** @type {HookMap<SyncBailHook<[CallExpressionNode, string[]], boolean | void>>} */
+			/** @type {HookMap<SyncBailHook<[CallExpressionNode, string[], boolean[]], boolean | void>>} */
 			callMemberChain: new HookMap(
-				() => new SyncBailHook(["expression", "members"])
+				() => new SyncBailHook(["expression", "members", "membersOptionals"])
 			),
 			/** Something like "a.b().c.d" */
 			/** @type {HookMap<SyncBailHook<[ExpressionNode, string[], CallExpressionNode, string[]], boolean | void>>} */
@@ -292,11 +300,13 @@ class JavascriptParser extends Parser {
 			optionalChaining: new SyncBailHook(["optionalChaining"]),
 			/** @type {HookMap<SyncBailHook<[NewExpressionNode], boolean | void>>} */
 			new: new HookMap(() => new SyncBailHook(["expression"])),
+			/** @type {SyncBailHook<[BinaryExpressionNode], boolean | void>} */
+			binaryExpression: new SyncBailHook(["binaryExpression"]),
 			/** @type {HookMap<SyncBailHook<[ExpressionNode], boolean | void>>} */
 			expression: new HookMap(() => new SyncBailHook(["expression"])),
-			/** @type {HookMap<SyncBailHook<[ExpressionNode, string[]], boolean | void>>} */
+			/** @type {HookMap<SyncBailHook<[ExpressionNode, string[], boolean[]], boolean | void>>} */
 			expressionMemberChain: new HookMap(
-				() => new SyncBailHook(["expression", "members"])
+				() => new SyncBailHook(["expression", "members", "membersOptionals"])
 			),
 			/** @type {HookMap<SyncBailHook<[ExpressionNode, string[]], boolean | void>>} */
 			unhandledExpressionMemberChain: new HookMap(
@@ -359,9 +369,14 @@ class JavascriptParser extends Parser {
 		this.hooks.evaluate.for("NewExpression").tap("JavascriptParser", _expr => {
 			const expr = /** @type {NewExpressionNode} */ (_expr);
 			const callee = expr.callee;
-			if (
-				callee.type !== "Identifier" ||
-				callee.name !== "RegExp" ||
+			if (callee.type !== "Identifier") return;
+			if (callee.name !== "RegExp") {
+				return this.callHooksForName(
+					this.hooks.evaluateNewExpression,
+					callee.name,
+					expr
+				);
+			} else if (
 				expr.arguments.length > 2 ||
 				this.getVariableInfo("RegExp") !== "RegExp"
 			)
@@ -416,7 +431,6 @@ class JavascriptParser extends Parser {
 				const expr = /** @type {LogicalExpressionNode} */ (_expr);
 
 				const left = this.evaluateExpression(expr.left);
-				if (!left) return;
 				let returnRight = false;
 				/** @type {boolean|undefined} */
 				let allowedRight;
@@ -437,7 +451,6 @@ class JavascriptParser extends Parser {
 					returnRight = true;
 				} else return;
 				const right = this.evaluateExpression(expr.right);
-				if (!right) return;
 				if (returnRight) {
 					if (left.couldHaveSideEffects()) right.setSideEffects();
 					return right.setRange(expr.range);
@@ -486,10 +499,10 @@ class JavascriptParser extends Parser {
 
 				const handleConstOperation = fn => {
 					const left = this.evaluateExpression(expr.left);
-					if (!left || !left.isCompileTimeValue()) return;
+					if (!left.isCompileTimeValue()) return;
 
 					const right = this.evaluateExpression(expr.right);
-					if (!right || !right.isCompileTimeValue()) return;
+					if (!right.isCompileTimeValue()) return;
 
 					const result = fn(
 						left.asCompileTimeValue(),
@@ -545,9 +558,7 @@ class JavascriptParser extends Parser {
 
 				const handleStrictEqualityComparison = eql => {
 					const left = this.evaluateExpression(expr.left);
-					if (!left) return;
 					const right = this.evaluateExpression(expr.right);
-					if (!right) return;
 					const res = new BasicEvaluatedExpression();
 					res.setRange(expr.range);
 
@@ -600,9 +611,7 @@ class JavascriptParser extends Parser {
 
 				const handleAbstractEqualityComparison = eql => {
 					const left = this.evaluateExpression(expr.left);
-					if (!left) return;
 					const right = this.evaluateExpression(expr.right);
-					if (!right) return;
 					const res = new BasicEvaluatedExpression();
 					res.setRange(expr.range);
 
@@ -635,9 +644,7 @@ class JavascriptParser extends Parser {
 
 				if (expr.operator === "+") {
 					const left = this.evaluateExpression(expr.left);
-					if (!left) return;
 					const right = this.evaluateExpression(expr.right);
-					if (!right) return;
 					const res = new BasicEvaluatedExpression();
 					if (left.isString()) {
 						if (right.isString()) {
@@ -816,7 +823,7 @@ class JavascriptParser extends Parser {
 
 				const handleConstOperation = fn => {
 					const argument = this.evaluateExpression(expr.argument);
-					if (!argument || !argument.isCompileTimeValue()) return;
+					if (!argument.isCompileTimeValue()) return;
 					const result = fn(argument.asCompileTimeValue());
 					return valueAsExpression(
 						result,
@@ -915,7 +922,6 @@ class JavascriptParser extends Parser {
 					}
 				} else if (expr.operator === "!") {
 					const argument = this.evaluateExpression(expr.argument);
-					if (!argument) return;
 					const bool = argument.asBool();
 					if (typeof bool !== "boolean") return;
 					return new BasicEvaluatedExpression()
@@ -935,6 +941,13 @@ class JavascriptParser extends Parser {
 				.setString("undefined")
 				.setRange(expr.range);
 		});
+		this.hooks.evaluate.for("Identifier").tap("JavascriptParser", expr => {
+			if (/** @type {IdentifierNode} */ (expr).name === "undefined") {
+				return new BasicEvaluatedExpression()
+					.setUndefined()
+					.setRange(expr.range);
+			}
+		});
 		/**
 		 * @param {string} exprType expression type name
 		 * @param {function(ExpressionNode): GetInfoResult | undefined} getInfo get info
@@ -973,7 +986,12 @@ class JavascriptParser extends Parser {
 					const info = cachedExpression === expr ? cachedInfo : getInfo(expr);
 					if (info !== undefined) {
 						return new BasicEvaluatedExpression()
-							.setIdentifier(info.name, info.rootInfo, info.getMembers)
+							.setIdentifier(
+								info.name,
+								info.rootInfo,
+								info.getMembers,
+								info.getMembersOptionals
+							)
 							.setRange(expr.range);
 					}
 				});
@@ -990,7 +1008,12 @@ class JavascriptParser extends Parser {
 				typeof info === "string" ||
 				(info instanceof VariableInfo && typeof info.freeName === "string")
 			) {
-				return { name: info, rootInfo: info, getMembers: () => [] };
+				return {
+					name: info,
+					rootInfo: info,
+					getMembers: () => [],
+					getMembersOptionals: () => []
+				};
 			}
 		});
 		tapEvaluateWithVariableInfo("ThisExpression", expr => {
@@ -999,7 +1022,12 @@ class JavascriptParser extends Parser {
 				typeof info === "string" ||
 				(info instanceof VariableInfo && typeof info.freeName === "string")
 			) {
-				return { name: info, rootInfo: info, getMembers: () => [] };
+				return {
+					name: info,
+					rootInfo: info,
+					getMembers: () => [],
+					getMembersOptionals: () => []
+				};
 			}
 		});
 		this.hooks.evaluate.for("MetaProperty").tap("JavascriptParser", expr => {
@@ -1021,25 +1049,28 @@ class JavascriptParser extends Parser {
 		this.hooks.evaluate.for("CallExpression").tap("JavascriptParser", _expr => {
 			const expr = /** @type {CallExpressionNode} */ (_expr);
 			if (
-				expr.callee.type !== "MemberExpression" ||
-				expr.callee.property.type !==
+				expr.callee.type === "MemberExpression" &&
+				expr.callee.property.type ===
 					(expr.callee.computed ? "Literal" : "Identifier")
 			) {
-				return;
-			}
-
-			// type Super also possible here
-			const param = this.evaluateExpression(
-				/** @type {ExpressionNode} */ (expr.callee.object)
-			);
-			if (!param) return;
-			const property =
-				expr.callee.property.type === "Literal"
-					? `${expr.callee.property.value}`
-					: expr.callee.property.name;
-			const hook = this.hooks.evaluateCallExpressionMember.get(property);
-			if (hook !== undefined) {
-				return hook.call(expr, param);
+				// type Super also possible here
+				const param = this.evaluateExpression(
+					/** @type {ExpressionNode} */ (expr.callee.object)
+				);
+				const property =
+					expr.callee.property.type === "Literal"
+						? `${expr.callee.property.value}`
+						: expr.callee.property.name;
+				const hook = this.hooks.evaluateCallExpressionMember.get(property);
+				if (hook !== undefined) {
+					return hook.call(expr, param);
+				}
+			} else if (expr.callee.type === "Identifier") {
+				return this.callHooksForName(
+					this.hooks.evaluateCallExpression,
+					expr.callee.name,
+					expr
+				);
 			}
 		});
 		this.hooks.evaluateCallExpressionMember
@@ -1189,14 +1220,15 @@ class JavascriptParser extends Parser {
 				const node = /** @type {TaggedTemplateExpressionNode} */ (_node);
 				const tag = this.evaluateExpression(node.tag);
 
-				if (tag.isIdentifier() && tag.identifier !== "String.raw") return;
-				const { quasis, parts } = getSimplifiedTemplateResult(
-					"raw",
-					node.quasi
-				);
-				return new BasicEvaluatedExpression()
-					.setTemplateString(quasis, parts, "raw")
-					.setRange(node.range);
+				if (tag.isIdentifier() && tag.identifier === "String.raw") {
+					const { quasis, parts } = getSimplifiedTemplateResult(
+						"raw",
+						node.quasi
+					);
+					return new BasicEvaluatedExpression()
+						.setTemplateString(quasis, parts, "raw")
+						.setRange(node.range);
+				}
 			});
 
 		this.hooks.evaluateCallExpressionMember
@@ -1298,7 +1330,6 @@ class JavascriptParser extends Parser {
 				if (conditionValue === undefined) {
 					const consequent = this.evaluateExpression(expr.consequent);
 					const alternate = this.evaluateExpression(expr.alternate);
-					if (!consequent || !alternate) return;
 					res = new BasicEvaluatedExpression();
 					if (consequent.isConditional()) {
 						res.setOptions(consequent.options);
@@ -1372,7 +1403,7 @@ class JavascriptParser extends Parser {
 					const expression = optionalExpressionsStack.pop();
 					const evaluated = this.evaluateExpression(expression);
 
-					if (evaluated && evaluated.asNullish()) {
+					if (evaluated.asNullish()) {
 						return evaluated.setRange(_expr.range);
 					}
 				}
@@ -1382,7 +1413,7 @@ class JavascriptParser extends Parser {
 
 	getRenameIdentifier(expr) {
 		const result = this.evaluateExpression(expr);
-		if (result && result.isIdentifier()) {
+		if (result.isIdentifier()) {
 			return result.identifier;
 		}
 	}
@@ -1416,6 +1447,11 @@ class JavascriptParser extends Parser {
 							this.walkExpression(classElement.value);
 							this.scope.topLevelScope = wasTopLevel;
 						}
+					} else if (classElement.type === "StaticBlock") {
+						const wasTopLevel = this.scope.topLevelScope;
+						this.scope.topLevelScope = false;
+						this.walkBlockStatement(classElement);
+						this.scope.topLevelScope = wasTopLevel;
 					}
 				}
 			}
@@ -1872,7 +1908,7 @@ class JavascriptParser extends Parser {
 						!this.hooks.importSpecifier.call(
 							statement,
 							source,
-							specifier.imported.name,
+							specifier.imported.name || specifier.imported.value,
 							name
 						)
 					) {
@@ -1942,7 +1978,7 @@ class JavascriptParser extends Parser {
 				const specifier = statement.specifiers[specifierIndex];
 				switch (specifier.type) {
 					case "ExportSpecifier": {
-						const name = specifier.exported.name;
+						const name = specifier.exported.name || specifier.exported.value;
 						if (source) {
 							this.hooks.exportImportSpecifier.call(
 								statement,
@@ -2449,7 +2485,9 @@ class JavascriptParser extends Parser {
 	}
 
 	walkBinaryExpression(expression) {
-		this.walkLeftRightExpression(expression);
+		if (this.hooks.binaryExpression.call(expression) === undefined) {
+			this.walkLeftRightExpression(expression);
+		}
 	}
 
 	walkLogicalExpression(expression) {
@@ -2484,7 +2522,9 @@ class JavascriptParser extends Parser {
 					) {
 						this.setVariable(
 							expression.left.name,
-							this.getVariableInfo(renameIdentifier)
+							typeof renameIdentifier === "string"
+								? this.getVariableInfo(renameIdentifier)
+								: renameIdentifier
 						);
 					}
 					return;
@@ -2619,7 +2659,9 @@ class JavascriptParser extends Parser {
 							argOrThis
 						)
 					) {
-						return this.getVariableInfo(renameIdentifier);
+						return typeof renameIdentifier === "string"
+							? this.getVariableInfo(renameIdentifier)
+							: renameIdentifier;
 					}
 				}
 			}
@@ -2719,7 +2761,10 @@ class JavascriptParser extends Parser {
 					this.hooks.callMemberChain,
 					callee.rootInfo,
 					expression,
-					callee.getMembers()
+					callee.getMembers(),
+					callee.getMembersOptionals
+						? callee.getMembersOptionals()
+						: callee.getMembers().map(() => false)
 				);
 				if (result1 === true) return;
 				const result2 = this.callHooksForInfo(
@@ -2759,11 +2804,13 @@ class JavascriptParser extends Parser {
 					);
 					if (result1 === true) return;
 					const members = exprInfo.getMembers();
+					const membersOptionals = exprInfo.getMembersOptionals();
 					const result2 = this.callHooksForInfo(
 						this.hooks.expressionMemberChain,
 						exprInfo.rootInfo,
 						expression,
-						members
+						members,
+						membersOptionals
 					);
 					if (result2 === true) return;
 					this.walkMemberExpressionWithExpressionName(
@@ -3159,17 +3206,15 @@ class JavascriptParser extends Parser {
 
 	/**
 	 * @param {ExpressionNode} expression expression node
-	 * @returns {BasicEvaluatedExpression | undefined} evaluation result
+	 * @returns {BasicEvaluatedExpression} evaluation result
 	 */
 	evaluateExpression(expression) {
 		try {
 			const hook = this.hooks.evaluate.get(expression.type);
 			if (hook !== undefined) {
 				const result = hook.call(expression);
-				if (result !== undefined) {
-					if (result) {
-						result.setExpression(expression);
-					}
+				if (result !== undefined && result !== null) {
+					result.setExpression(expression);
 					return result;
 				}
 			}
@@ -3340,6 +3385,10 @@ class JavascriptParser extends Parser {
 		return state;
 	}
 
+	/**
+	 * @param {string} source source code
+	 * @returns {BasicEvaluatedExpression} evaluation result
+	 */
 	evaluate(source) {
 		const ast = JavascriptParser._parse("(" + source + ")", {
 			sourceType: this.sourceType,
@@ -3576,23 +3625,37 @@ class JavascriptParser extends Parser {
 		}
 	}
 
+	evaluatedVariable(tagInfo) {
+		return new VariableInfo(this.scope, undefined, tagInfo);
+	}
+
 	parseCommentOptions(range) {
 		const comments = this.getComments(range);
 		if (comments.length === 0) {
 			return EMPTY_COMMENT_OPTIONS;
 		}
 		let options = {};
+		/** @type {unknown[]} */
 		let errors = [];
 		for (const comment of comments) {
 			const { value } = comment;
 			if (value && webpackCommentRegExp.test(value)) {
 				// try compile only if webpack options comment is present
 				try {
-					const val = vm.runInNewContext(`(function(){return {${value}};})()`);
-					Object.assign(options, val);
+					for (let [key, val] of Object.entries(
+						vm.runInNewContext(`(function(){return {${value}};})()`)
+					)) {
+						if (typeof val === "object" && val !== null) {
+							if (val.constructor.name === "RegExp") val = new RegExp(val);
+							else val = JSON.parse(JSON.stringify(val));
+						}
+						options[key] = val;
+					}
 				} catch (e) {
-					e.comment = comment;
-					errors.push(e);
+					const newErr = new Error(String(e.message));
+					newErr.stack = String(e.stack);
+					Object.assign(newErr, { comment });
+					errors.push(newErr);
 				}
 			}
 		}
@@ -3601,12 +3664,13 @@ class JavascriptParser extends Parser {
 
 	/**
 	 * @param {MemberExpressionNode} expression a member expression
-	 * @returns {{ members: string[], object: ExpressionNode | SuperNode }} member names (reverse order) and remaining object
+	 * @returns {{ members: string[], object: ExpressionNode | SuperNode, membersOptionals: boolean[] }} member names (reverse order) and remaining object
 	 */
 	extractMemberExpressionChain(expression) {
 		/** @type {AnyNode} */
 		let expr = expression;
 		const members = [];
+		const membersOptionals = [];
 		while (expr.type === "MemberExpression") {
 			if (expr.computed) {
 				if (expr.property.type !== "Literal") break;
@@ -3615,10 +3679,13 @@ class JavascriptParser extends Parser {
 				if (expr.property.type !== "Identifier") break;
 				members.push(expr.property.name);
 			}
+			membersOptionals.push(expr.optional);
 			expr = expr.object;
 		}
+
 		return {
 			members,
+			membersOptionals,
 			object: expr
 		};
 	}
@@ -3641,8 +3708,8 @@ class JavascriptParser extends Parser {
 		return { info, name };
 	}
 
-	/** @typedef {{ type: "call", call: CallExpressionNode, calleeName: string, rootInfo: string | VariableInfo, getCalleeMembers: () => string[], name: string, getMembers: () => string[]}} CallExpressionInfo */
-	/** @typedef {{ type: "expression", rootInfo: string | VariableInfo, name: string, getMembers: () => string[]}} ExpressionExpressionInfo */
+	/** @typedef {{ type: "call", call: CallExpressionNode, calleeName: string, rootInfo: string | VariableInfo, getCalleeMembers: () => string[], name: string, getMembers: () => string[], getMembersOptionals: () => boolean[]}} CallExpressionInfo */
+	/** @typedef {{ type: "expression", rootInfo: string | VariableInfo, name: string, getMembers: () => string[], getMembersOptionals: () => boolean[]}} ExpressionExpressionInfo */
 
 	/**
 	 * @param {MemberExpressionNode} expression a member expression
@@ -3650,7 +3717,8 @@ class JavascriptParser extends Parser {
 	 * @returns {CallExpressionInfo | ExpressionExpressionInfo | undefined} expression info
 	 */
 	getMemberExpressionInfo(expression, allowedTypes) {
-		const { object, members } = this.extractMemberExpressionChain(expression);
+		const { object, members, membersOptionals } =
+			this.extractMemberExpressionChain(expression);
 		switch (object.type) {
 			case "CallExpression": {
 				if ((allowedTypes & ALLOWED_MEMBER_TYPES_CALL_EXPRESSION) === 0)
@@ -3674,7 +3742,8 @@ class JavascriptParser extends Parser {
 					rootInfo,
 					getCalleeMembers: memoize(() => rootMembers.reverse()),
 					name: objectAndMembersToName(`${calleeName}()`, members),
-					getMembers: memoize(() => members.reverse())
+					getMembers: memoize(() => members.reverse()),
+					getMembersOptionals: memoize(() => membersOptionals.reverse())
 				};
 			}
 			case "Identifier":
@@ -3692,7 +3761,8 @@ class JavascriptParser extends Parser {
 					type: "expression",
 					name: objectAndMembersToName(resolvedRoot, members),
 					rootInfo,
-					getMembers: memoize(() => members.reverse())
+					getMembers: memoize(() => members.reverse()),
+					getMembersOptionals: memoize(() => membersOptionals.reverse())
 				};
 			}
 		}