oxlint-plugin-react-doctor 0.7.6-dev.e026a23 → 0.7.6-dev.e877ca7

package/dist/index.js

@@ -6929,30 +6929,6 @@ const corsCookieTrustRisk = defineRule({
 	})
 });
 //#endregion
-//#region src/plugin/rules/security-scan/utils/find-matching-bracket.ts
-const findMatchingBracket = (content, openIndex) => {
-	const open = content[openIndex];
-	const close = open === "(" ? ")" : open === "{" ? "}" : open === "[" ? "]" : "";
-	if (close === "") return -1;
-	let depth = 0;
-	let stringDelimiter = null;
-	for (let index = openIndex; index < content.length; index += 1) {
-		const character = content[index];
-		if (stringDelimiter !== null) {
-			if (character === "\\") index += 1;
-			else if (character === stringDelimiter) stringDelimiter = null;
-			continue;
-		}
-		if (character === "\"" || character === "'" || character === "`") stringDelimiter = character;
-		else if (character === open) depth += 1;
-		else if (character === close) {
-			depth -= 1;
-			if (depth === 0) return index;
-		}
-	}
-	return -1;
-};
-//#endregion
 //#region src/plugin/rules/security-scan/dangerous-html-sink.ts
 const DANGEROUS_HTML_PATTERN = /dangerouslySetInnerHTML|(?:\.(?:inner|outer)HTML|\[\s*["'](?:inner|outer)HTML["']\s*\])\s*[+]?=(?!=)|\.insertAdjacentHTML\s*\(|\bdocument\.write(?:ln)?\s*\(|\.(?:createContextualFragment|setHTMLUnsafe)\s*\(/;
 const HTML_VALUE_START_PATTERN = /(?:__html\s*:|(?:\.(?:inner|outer)HTML|\[\s*["'](?:inner|outer)HTML["']\s*\])\s*[+]?=(?!=)|\.insertAdjacentHTML\s*\(\s*[^,]*,|\bdocument\.write(?:ln)?\s*\(|\.(?:createContextualFragment|setHTMLUnsafe)\s*\()\s*([\s\S]*)/;
@@ -6968,7 +6944,6 @@ const I18N_VALUE_PATTERN = /\b(?:t|i18n|translate|formatMessage|intl)\s*[.(]/;
 const ESCAPING_SERIALIZER_CALL_PATTERN = /^(?:[\w$.]+\.)?(?:toHtml|render[A-Za-z]*(?:Html|HTML)|renderToString|renderToStaticMarkup|codeToHtml|codeToHast|highlight[A-Za-z]*)\s*\(/;
 const HIGHLIGHTER_LIBRARY_PATTERN = /\b(?:shiki|prism|hljs|highlightjs|getHighlighter|codeToHtml|codeToHast|refractor|lowlight|starry-night)\b|highlight\.js/i;
 const SERIALIZER_ASSIGNMENT_PATTERN = /[:=]\s*[^\n;]*(?:\b(?:katex|shiki|hljs|prism|mermaid)\b|hast-util-to-html|renderHtmlFromRichText|(?:toHtml|render[A-Za-z]*(?:Html|HTML)|renderToString|renderToStaticMarkup|codeToHtml|codeToHast)\s*\()/i;
-const SERIALIZER_CALL_PROVENANCE_PATTERN = /\b(?:(?:katex|shiki|hljs|prism|mermaid|highlighter)[\w$]*\.(?:render\w*|highlight\w*|codeTo(?:Html|Hast))|(?:toHtml|render(?:Html|HTML)[A-Za-z]*|render[A-Za-z]*(?:Html|HTML)|renderToString|renderToStaticMarkup|codeToHtml|codeToHast|highlight[A-Za-z]*))\s*\(/i;
 const BARE_IDENTIFIER_VALUE_PATTERN = /^[\w$]+\s*(?:[;,})\n]|$)/;
 const IDENTIFIER_WITH_LITERAL_FALLBACK_PATTERN = /^[\w$]+\s*(?:\|\||\?\?)\s*(?:"[^"\n]*"|'[^'\n]*'|`[^`$]*`)\s*(?:[;,})\n]|$)/;
 const MEMBER_OR_INDEX_ACCESS_VALUE_PATTERN = /^[\w$]+(?:\.[\w$]+|\[[^\]]*\])+\s*(?:[;,})\n]|$)/;
@@ -7128,66 +7103,22 @@ const findContainingBlockEndIndex = (fileContent, targetIndex) => {
 	return openingBraceIndex === void 0 ? fileContent.length : findMatchingBraceIndex(fileContent, openingBraceIndex);
 };
 const findVisibleIdentifierDeclaration = (identifier, sinkIndex, fileContent) => {
-	const initializerPattern = new RegExp(`(const|let|var)\\s+${escapeRegExp(identifier)}\\s*(?::[^=\\n]*)?=\\s*([^;\\n]+)`, "g");
+	const initializerPattern = new RegExp(`(?:const|let|var)\\s+${escapeRegExp(identifier)}\\s*(?::[^=\\n]*)?=\\s*([^;\\n]+)`, "g");
 	let nearestDeclaration = null;
 	let nearestDeclarationIndex = -1;
 	for (const match of fileContent.matchAll(initializerPattern)) {
 		const declarationIndex = match.index;
 		if (declarationIndex === void 0 || declarationIndex >= sinkIndex || declarationIndex <= nearestDeclarationIndex || findContainingBlockEndIndex(fileContent, declarationIndex) < sinkIndex) continue;
 		nearestDeclarationIndex = declarationIndex;
-		const initializer = match[2];
+		const initializer = match[1];
 		if (initializer === void 0) continue;
 		nearestDeclaration = {
-			declarationIndex,
 			initializer,
-			initializerStartIndex: declarationIndex + match[0].length - initializer.length,
-			isImmutable: match[1] === "const"
+			initializerStartIndex: declarationIndex + match[0].length - initializer.length
 		};
 	}
 	return nearestDeclaration;
 };
-const isDeclarationStable = (identifier, declaration, usageIndex, fileContent) => {
-	if (declaration.isImmutable) return true;
-	const textAfterInitializer = fileContent.slice(declaration.initializerStartIndex + declaration.initializer.length, usageIndex);
-	return !new RegExp(`(?:^|[^\\w$.])${escapeRegExp(identifier)}\\s*=(?!=)`).test(textAfterInitializer);
-};
-const isTrustedHighlighterValue = (valueExpression, fileContent, sinkIndex) => {
-	if (!/highlight/i.test(valueExpression)) return false;
-	const identifier = valueExpression.match(/^([\w$]+)/)?.[1];
-	if (identifier === void 0) return false;
-	const declaration = findVisibleIdentifierDeclaration(identifier, sinkIndex, fileContent);
-	if (declaration !== null) return isDeclarationStable(identifier, declaration, sinkIndex, fileContent) && SERIALIZER_CALL_PROVENANCE_PATTERN.test(declaration.initializer);
-	return /highlighted/i.test(valueExpression) || HIGHLIGHTER_LIBRARY_PATTERN.test(fileContent);
-};
-const isExplicitlyTrustedHtmlValue = (valueExpression, fileContent, sinkIndex, visitedIdentifiers = /* @__PURE__ */ new Set()) => {
-	const trimmedExpression = valueExpression.trim();
-	const concatenatedParts = splitTopLevelByPlus(trimmedExpression);
-	if (concatenatedParts.length > 1) return concatenatedParts.every((part) => isExplicitlyTrustedHtmlValue(part, fileContent, sinkIndex, visitedIdentifiers));
-	const interpolationParts = [...trimmedExpression.matchAll(/\$\{([^}]*)\}/g)].flatMap((match) => match[1] === void 0 ? [] : [match[1]]);
-	if (interpolationParts.length > 1) return interpolationParts.every((part) => isExplicitlyTrustedHtmlValue(part, fileContent, sinkIndex, visitedIdentifiers));
-	const identifier = trimmedExpression.match(/^([\w$]+)(?:(?:\??\.[\w$]+)|(?:\[\s*(?:"[^"\n]*"|'[^'\n]*'|\d+)\s*\]))*$/)?.[1];
-	if (identifier && !visitedIdentifiers.has(identifier)) {
-		const declaration = findVisibleIdentifierDeclaration(identifier, sinkIndex, fileContent);
-		if (declaration && isDeclarationStable(identifier, declaration, sinkIndex, fileContent)) {
-			const nextVisitedIdentifiers = new Set(visitedIdentifiers);
-			nextVisitedIdentifiers.add(identifier);
-			return isExplicitlyTrustedHtmlValue(declaration.initializer, fileContent, declaration.initializerStartIndex, nextVisitedIdentifiers);
-		}
-	}
-	if (STRING_LITERAL_VALUE_PATTERN.test(`${trimmedExpression};`) || MODULE_CONSTANT_VALUE_PATTERN.test(`${trimmedExpression};`) || SANITIZER_PATTERN.test(trimmedExpression) || ENV_CONFIG_VALUE_PATTERN.test(trimmedExpression) || I18N_VALUE_PATTERN.test(trimmedExpression) || ESCAPING_SERIALIZER_CALL_PATTERN.test(trimmedExpression) || isTrustedHighlighterValue(trimmedExpression, fileContent, sinkIndex)) return true;
-	return false;
-};
-const doesExpressionAliasIdentifier = (expression, targetIdentifier, expressionIndex, fileContent, visitedIdentifiers = /* @__PURE__ */ new Set()) => {
-	const identifier = expression.trim().match(/^([\w$]+)$/)?.[1];
-	if (!identifier) return false;
-	if (identifier === targetIdentifier) return true;
-	if (visitedIdentifiers.has(identifier)) return false;
-	const declaration = findVisibleIdentifierDeclaration(identifier, expressionIndex, fileContent);
-	if (!declaration?.isImmutable) return false;
-	const nextVisitedIdentifiers = new Set(visitedIdentifiers);
-	nextVisitedIdentifiers.add(identifier);
-	return doesExpressionAliasIdentifier(declaration.initializer, targetIdentifier, declaration.initializerStartIndex, fileContent, nextVisitedIdentifiers);
-};
 const findContainingFunctionParameterSource = (identifier, sinkIndex, fileContent) => {
 	const patterns = [/function\s+([\w$]+)\s*\(([^)]*)\)\s*\{/g, /(?:const|let|var)\s+([\w$]+)\s*=\s*(?:async\s*)?\(([^)]*)\)\s*=>\s*\{/g];
 	let closestSource = null;
@@ -7195,16 +7126,12 @@ const findContainingFunctionParameterSource = (identifier, sinkIndex, fileConten
 	for (const pattern of patterns) for (const match of fileContent.matchAll(pattern)) {
 		const matchIndex = match.index;
 		if (matchIndex === void 0 || matchIndex >= sinkIndex || matchIndex < closestStartIndex) continue;
-		const bodyEndIndex = findMatchingBraceIndex(fileContent, matchIndex + match[0].lastIndexOf("{"));
-		if (bodyEndIndex < sinkIndex) continue;
+		if (findMatchingBraceIndex(fileContent, matchIndex + match[0].lastIndexOf("{")) < sinkIndex) continue;
 		const parameterIndex = (match[2] ?? "").split(",").findIndex((parameter) => parameter.trim().match(/^(?:\.\.\.)?([\w$]+)/)?.[1] === identifier);
 		if (parameterIndex < 0) continue;
 		closestStartIndex = matchIndex;
-		const functionName = match[1] ?? "";
 		closestSource = {
-			bodyEndIndex,
-			declarationNameIndex: matchIndex + match[0].indexOf(functionName),
-			functionName,
+			functionName: match[1] ?? "",
 			parameterIndex
 		};
 	}
@@ -7235,56 +7162,28 @@ const splitTopLevelArguments = (argumentText) => {
 	argumentsList.push(argumentText.slice(startIndex).trim());
 	return argumentsList;
 };
-const isBackedByFunctionParameter = (expression, expressionIndex, fileContent, visitedIdentifiers = /* @__PURE__ */ new Set()) => {
-	const identifier = expression.trim().match(/^([\w$]+)$/)?.[1];
-	if (identifier === void 0 || visitedIdentifiers.has(identifier)) return false;
-	if (findContainingFunctionParameterSource(identifier, expressionIndex, fileContent) !== null) return true;
-	const declaration = findVisibleIdentifierDeclaration(identifier, expressionIndex, fileContent);
-	if (!declaration || !isDeclarationStable(identifier, declaration, expressionIndex, fileContent)) return false;
-	const nextVisitedIdentifiers = new Set(visitedIdentifiers);
-	nextVisitedIdentifiers.add(identifier);
-	return isBackedByFunctionParameter(declaration.initializer, declaration.initializerStartIndex, fileContent, nextVisitedIdentifiers);
-};
-const isHtmlTainted = (expression, fileContent, sinkIndex, visitedIdentifiers, visitedCallSites) => {
+const isHtmlTainted = (expression, fileContent, sinkIndex, visitedIdentifiers) => {
 	const trimmedExpression = expression.trim();
-	if (isExplicitlyTrustedHtmlValue(trimmedExpression, fileContent, sinkIndex)) return false;
-	const identifier = trimmedExpression.match(/^([\w$]+)(?:\.|\s*(?:[;,})\n]|$))/)?.[1];
-	if (identifier === void 0) return HTML_TAINT_PATTERN.test(trimmedExpression);
-	if (visitedIdentifiers.has(identifier)) return false;
+	if (STRING_LITERAL_VALUE_PATTERN.test(`${trimmedExpression};`)) return false;
+	if (MODULE_CONSTANT_VALUE_PATTERN.test(`${trimmedExpression};`)) return false;
+	if (SANITIZER_PATTERN.test(trimmedExpression)) return false;
+	if (ENV_CONFIG_VALUE_PATTERN.test(trimmedExpression)) return false;
+	if (I18N_VALUE_PATTERN.test(trimmedExpression)) return false;
+	if (ESCAPING_SERIALIZER_CALL_PATTERN.test(trimmedExpression)) return false;
+	if (HTML_TAINT_PATTERN.test(trimmedExpression)) return true;
+	const identifier = trimmedExpression.match(/^([\w$]+)\s*(?:[;,})\n]|$)/)?.[1];
+	if (identifier === void 0 || visitedIdentifiers.has(identifier)) return false;
 	visitedIdentifiers.add(identifier);
 	const declaration = findVisibleIdentifierDeclaration(identifier, sinkIndex, fileContent);
+	if (declaration !== null && isHtmlTainted(declaration.initializer, fileContent, sinkIndex, visitedIdentifiers)) return true;
 	const parameterSource = findContainingFunctionParameterSource(identifier, sinkIndex, fileContent);
-	if (declaration !== null && (parameterSource === null || declaration.declarationIndex > parameterSource.declarationNameIndex)) {
-		if (isDeclarationStable(identifier, declaration, sinkIndex, fileContent) && isExplicitlyTrustedHtmlValue(declaration.initializer, fileContent, declaration.initializerStartIndex)) return false;
-		if (!isDeclarationStable(identifier, declaration, sinkIndex, fileContent)) return true;
-		if (isHtmlTainted(declaration.initializer, fileContent, declaration.initializerStartIndex, visitedIdentifiers, visitedCallSites)) return true;
-		if (isBackedByFunctionParameter(declaration.initializer, declaration.initializerStartIndex, fileContent)) return false;
-		return HTML_TAINT_PATTERN.test(trimmedExpression);
-	}
-	if (parameterSource !== null && parameterSource.functionName.length > 0) {
-		const callPattern = new RegExp(`\\b${escapeRegExp(parameterSource.functionName)}\\s*\\(`, "g");
-		let didInspectCallArgument = false;
-		let didInspectOnlyExplicitlyTrustedArguments = true;
-		for (const callMatch of fileContent.matchAll(callPattern)) {
-			if (callMatch.index === parameterSource.declarationNameIndex || visitedCallSites.has(callMatch.index)) continue;
-			const openingParenthesisIndex = callMatch.index + callMatch[0].lastIndexOf("(");
-			const closingParenthesisIndex = findMatchingBracket(fileContent, openingParenthesisIndex);
-			if (closingParenthesisIndex < 0) continue;
-			const argument = splitTopLevelArguments(fileContent.slice(openingParenthesisIndex + 1, closingParenthesisIndex))[parameterSource.parameterIndex];
-			if (argument === void 0) continue;
-			if (callMatch.index >= parameterSource.declarationNameIndex && callMatch.index <= parameterSource.bodyEndIndex && doesExpressionAliasIdentifier(argument, identifier, callMatch.index, fileContent)) continue;
-			didInspectCallArgument = true;
-			didInspectOnlyExplicitlyTrustedArguments &&= isExplicitlyTrustedHtmlValue(argument, fileContent, callMatch.index);
-			const callVisitedIdentifiers = new Set(visitedIdentifiers);
-			callVisitedIdentifiers.delete(identifier);
-			const nextVisitedCallSites = new Set(visitedCallSites);
-			nextVisitedCallSites.add(callMatch.index);
-			if (isHtmlTainted(argument, fileContent, callMatch.index, callVisitedIdentifiers, nextVisitedCallSites)) return true;
-		}
-		if (didInspectCallArgument) return !didInspectOnlyExplicitlyTrustedArguments && HTML_TAINT_PATTERN.test(trimmedExpression);
-		return HTML_TAINT_PATTERN.test(trimmedExpression);
-	}
-	return HTML_TAINT_PATTERN.test(trimmedExpression);
+	if (parameterSource === null || parameterSource.functionName.length === 0) return false;
+	const callPattern = new RegExp(`\\b${escapeRegExp(parameterSource.functionName)}\\s*\\(([^)]*)\\)`, "g");
+	for (const callMatch of fileContent.matchAll(callPattern)) {
+		const argument = splitTopLevelArguments(callMatch[1] ?? "")[parameterSource.parameterIndex];
+		if (argument !== void 0 && isHtmlTainted(argument, fileContent, sinkIndex, new Set(visitedIdentifiers))) return true;
+	}
+	return false;
 };
 const dangerousHtmlSink = defineRule({
 	id: "dangerous-html-sink",
@@ -7323,7 +7222,7 @@ const dangerousHtmlSink = defineRule({
 			const longValueTail = HTML_VALUE_START_PATTERN.exec(lines.slice(lineIndex, lineIndex + 1 + STATIC_TEMPLATE_LOOKAHEAD_LINES).join("\n"))?.[1]?.trimStart();
 			let templateInterpolations = getTemplateInterpolations(longValueTail ?? fullValueTail);
 			const valueIdentifier = BARE_IDENTIFIER_VALUE_PATTERN.test(valueExpression) || MEMBER_OR_INDEX_ACCESS_VALUE_PATTERN.test(valueExpression) || IDENTIFIER_WITH_LITERAL_FALLBACK_PATTERN.test(valueExpression) ? valueExpression.match(/^[\w$]+/)?.[0] : void 0;
-			if (templateInterpolations === null && valueIdentifier !== void 0 && BARE_IDENTIFIER_VALUE_PATTERN.test(valueExpression) && findContainingFunctionParameterSource(valueIdentifier, sinkIndex, file.content) === null) {
+			if (templateInterpolations === null && valueIdentifier !== void 0 && BARE_IDENTIFIER_VALUE_PATTERN.test(valueExpression)) {
 				const declarationInitializer = getIdentifierDeclarationInitializer(valueIdentifier, sinkIndex, file.content);
 				if (declarationInitializer !== null) {
 					if (isPureStringLiteralConcat(declarationInitializer)) continue;
@@ -7332,23 +7231,17 @@ const dangerousHtmlSink = defineRule({
 			}
 			if (templateInterpolations === "") continue;
 			const judgedExpression = templateInterpolations ?? valueExpression;
-			const doesJudgedExpressionCombineValues = splitTopLevelByPlus(judgedExpression).length > 1 || (templateInterpolations?.match(/\$\{/g)?.length ?? 0) > 1;
-			if (!doesJudgedExpressionCombineValues && SANITIZER_PATTERN.test(judgedExpression)) continue;
-			if (!doesJudgedExpressionCombineValues && ENV_CONFIG_VALUE_PATTERN.test(judgedExpression)) continue;
-			if (!doesJudgedExpressionCombineValues && I18N_VALUE_PATTERN.test(judgedExpression)) continue;
-			if (!isHtmlTainted(judgedExpression, file.content, sinkIndex, /* @__PURE__ */ new Set(), /* @__PURE__ */ new Set())) continue;
+			if (SANITIZER_PATTERN.test(judgedExpression)) continue;
+			if (ENV_CONFIG_VALUE_PATTERN.test(judgedExpression)) continue;
+			if (I18N_VALUE_PATTERN.test(judgedExpression)) continue;
+			if (!isHtmlTainted(judgedExpression, file.content, sinkIndex, /* @__PURE__ */ new Set())) continue;
 			if (ESCAPING_SERIALIZER_CALL_PATTERN.test(valueExpression)) continue;
-			if (isTrustedHighlighterValue(valueExpression, file.content, sinkIndex)) continue;
+			if (/highlighted/i.test(valueExpression)) continue;
+			if (/highlight/i.test(valueExpression) && HIGHLIGHTER_LIBRARY_PATTERN.test(file.content)) continue;
 			if (valueIdentifier !== void 0) {
 				const escapedIdentifier = escapeRegExp(valueIdentifier);
-				const visibleDeclaration = findVisibleIdentifierDeclaration(valueIdentifier, sinkIndex, file.content);
-				const visibleInitializer = visibleDeclaration?.initializer;
-				if (!(visibleInitializer !== void 0 && (splitTopLevelByPlus(visibleInitializer).length > 1 || (visibleInitializer.match(/\$\{/g)?.length ?? 0) > 1))) {
-					const fromSerializer = new RegExp(`\\b${escapedIdentifier}\\b\\s*${SERIALIZER_ASSIGNMENT_PATTERN.source}`, "i");
-					if (visibleInitializer === void 0 ? fromSerializer.test(file.content) : visibleDeclaration !== null && isDeclarationStable(valueIdentifier, visibleDeclaration, sinkIndex, file.content) && SERIALIZER_CALL_PROVENANCE_PATTERN.test(visibleInitializer)) continue;
-					const fromSanitizer = new RegExp(`\\b${escapedIdentifier}\\b\\s*${SANITIZED_ASSIGNMENT_PATTERN.source}`, "i");
-					if (visibleInitializer === void 0 ? fromSanitizer.test(file.content) : visibleDeclaration !== null && isDeclarationStable(valueIdentifier, visibleDeclaration, sinkIndex, file.content) && SANITIZED_ASSIGNMENT_PATTERN.test(`=${visibleInitializer}`)) continue;
-				}
+				if (new RegExp(`\\b${escapedIdentifier}\\b\\s*${SERIALIZER_ASSIGNMENT_PATTERN.source}`, "i").test(file.content)) continue;
+				if (new RegExp(`\\b${escapedIdentifier}\\b\\s*${SANITIZED_ASSIGNMENT_PATTERN.source}`, "i").test(file.content)) continue;
 				if (new RegExp(`\\b${escapedIdentifier}\\b\\s*${DOM_CONTENT_ASSIGNMENT_PATTERN.source}`).test(file.content)) continue;
 				if (new RegExp(`highlight[\\w$]*\\s*\\.map\\(\\s*(?:async\\s+)?\\(?\\s*${escapedIdentifier}\\b`, "i").test(file.content) && HIGHLIGHTER_LIBRARY_PATTERN.test(file.content)) continue;
 			}
@@ -12897,6 +12790,30 @@ const insecureCryptoRisk = defineRule({
 	}
 });
 //#endregion
+//#region src/plugin/rules/security-scan/utils/find-matching-bracket.ts
+const findMatchingBracket = (content, openIndex) => {
+	const open = content[openIndex];
+	const close = open === "(" ? ")" : open === "{" ? "}" : open === "[" ? "]" : "";
+	if (close === "") return -1;
+	let depth = 0;
+	let stringDelimiter = null;
+	for (let index = openIndex; index < content.length; index += 1) {
+		const character = content[index];
+		if (stringDelimiter !== null) {
+			if (character === "\\") index += 1;
+			else if (character === stringDelimiter) stringDelimiter = null;
+			continue;
+		}
+		if (character === "\"" || character === "'" || character === "`") stringDelimiter = character;
+		else if (character === open) depth += 1;
+		else if (character === close) {
+			depth -= 1;
+			if (depth === 0) return index;
+		}
+	}
+	return -1;
+};
+//#endregion
 //#region src/plugin/rules/security-scan/insecure-session-cookie.ts
 const AUTH_COOKIE_NAME_TOKEN = `(?<![A-Za-z0-9])(?:session|sess|sid|connect\\.sid|auth|jwt|access[_-]?token|refresh[_-]?token|id[_-]?token)(?![A-Za-z0-9])`;
 const AUTH_COOKIE_NAME_LITERAL = `[\`"'][^\`"']*?${AUTH_COOKIE_NAME_TOKEN}[^\`"']*[\`"']`;
@@ -13653,28 +13570,6 @@ const jsAsyncReduceWithoutAwaitedAcc = defineRule({
 	} })
 });
 //#endregion
-//#region src/plugin/utils/unwrap-discarded-expression.ts
-const unwrapDiscardedExpression = (node) => {
-	let expression = isNodeOfType(node, "ExpressionStatement") ? node.expression : node;
-	for (;;) {
-		expression = stripParenExpression(expression);
-		if (isNodeOfType(expression, "UnaryExpression") && expression.operator === "void") {
-			expression = expression.argument;
-			continue;
-		}
-		if (isNodeOfType(expression, "SequenceExpression")) {
-			const expressions = expression.expressions ?? [];
-			const finalExpression = expressions.at(-1);
-			const prefixExpressions = expressions.slice(0, -1);
-			if (finalExpression && prefixExpressions.length > 0 && prefixExpressions.every((prefixExpression) => isNodeOfType(stripParenExpression(prefixExpression), "Literal"))) {
-				expression = finalExpression;
-				continue;
-			}
-		}
-		return expression;
-	}
-};
-//#endregion
 //#region src/plugin/rules/js-performance/js-batch-dom-css.ts
 const ITERATOR_METHOD_NAMES$2 = new Set([
 	"forEach",
@@ -13859,19 +13754,9 @@ const hasAttachmentBefore = (scopeOwner, elementName, beforeStart) => {
 	});
 	return foundAttachment;
 };
-const getStyleAssignment = (node) => {
-	if (!isNodeOfType(node, "ExpressionStatement")) return null;
-	const expression = unwrapDiscardedExpression(node);
-	if (!isNodeOfType(expression, "AssignmentExpression")) return null;
-	if (!isNodeOfType(expression.left, "MemberExpression")) return null;
-	if (!isNodeOfType(expression.left.object, "MemberExpression")) return null;
-	if (!isNodeOfType(expression.left.object.property, "Identifier")) return null;
-	return expression.left.object.property.name === "style" ? expression : null;
-};
 const isProvablyDetachedAtWrite = (styleWriteStatement) => {
-	const assignment = getStyleAssignment(styleWriteStatement);
-	if (!assignment || !isNodeOfType(assignment.left, "MemberExpression") || !isNodeOfType(assignment.left.object, "MemberExpression")) return false;
-	const elementExpression = assignment.left.object.object;
+	if (!isNodeOfType(styleWriteStatement, "ExpressionStatement") || !isNodeOfType(styleWriteStatement.expression, "AssignmentExpression") || !isNodeOfType(styleWriteStatement.expression.left, "MemberExpression") || !isNodeOfType(styleWriteStatement.expression.left.object, "MemberExpression")) return false;
+	const elementExpression = styleWriteStatement.expression.left.object.object;
 	const creationRoot = resolveDetachedCreationRoot(elementExpression, 0);
 	if (!creationRoot) return false;
 	return !hasAttachmentBefore(creationRoot.scopeOwner, creationRoot.rootName, getNodeStart$1(styleWriteStatement));
@@ -13883,17 +13768,15 @@ const jsBatchDomCss = defineRule({
 	severity: "warn",
 	recommendation: "Do all your reads first, then all your writes. Mixing them inside a loop makes the browser recalculate the layout again and again, which is slow",
 	create: (context) => {
-		const writesLayoutAffectingProperty = (node) => {
-			const assignment = getStyleAssignment(node);
-			return assignment !== null && isNodeOfType(assignment.left, "MemberExpression") && isNodeOfType(assignment.left.property, "Identifier") && !LAYOUT_NEUTRAL_STYLE_PROPERTY_NAMES.has(assignment.left.property.name);
-		};
+		const isStyleAssignment = (node) => isNodeOfType(node, "ExpressionStatement") && isNodeOfType(node.expression, "AssignmentExpression") && isNodeOfType(node.expression.left, "MemberExpression") && isNodeOfType(node.expression.left.object, "MemberExpression") && isNodeOfType(node.expression.left.object.property, "Identifier") && node.expression.left.object.property.name === "style";
+		const writesLayoutAffectingProperty = (node) => isNodeOfType(node, "ExpressionStatement") && isNodeOfType(node.expression, "AssignmentExpression") && isNodeOfType(node.expression.left, "MemberExpression") && isNodeOfType(node.expression.left.property, "Identifier") && !LAYOUT_NEUTRAL_STYLE_PROPERTY_NAMES.has(node.expression.left.property.name);
 		return { BlockStatement(node) {
 			const perIterationBody = findEnclosingPerIterationBody(node);
 			if (!perIterationBody) return;
 			const statements = node.body ?? [];
 			let layoutReads = null;
 			for (let statementIndex = 1; statementIndex < statements.length; statementIndex++) {
-				if (getStyleAssignment(statements[statementIndex]) === null || getStyleAssignment(statements[statementIndex - 1]) === null) continue;
+				if (!isStyleAssignment(statements[statementIndex]) || !isStyleAssignment(statements[statementIndex - 1])) continue;
 				if (!writesLayoutAffectingProperty(statements[statementIndex]) && !writesLayoutAffectingProperty(statements[statementIndex - 1])) continue;
 				layoutReads ??= scanPerIterationLayoutReads(perIterationBody);
 				if (!layoutReads.hasUsedLayoutRead || layoutReads.hasDeliberateForcedReflow) return;
@@ -15291,21 +15174,9 @@ const isSmallFixedListMember = (receiver) => {
 };
 const getResolvedInitializer = (receiver) => {
 	if (!isNodeOfType(receiver, "Identifier")) return null;
-	const binding = findVariableInitializer(receiver, receiver.name);
-	const initializer = binding?.initializer ?? null;
-	if (!binding || !initializer) return null;
-	const isDefault = isNodeOfType(binding.bindingIdentifier.parent, "AssignmentPattern");
-	if (isNodeOfType(initializer, "Identifier")) {
-		const aliased = findVariableInitializer(initializer, initializer.name);
-		if (aliased?.initializer) return {
-			initializer: aliased.initializer,
-			isDefault: isDefault || isNodeOfType(aliased.bindingIdentifier.parent, "AssignmentPattern")
-		};
-	}
-	return {
-		initializer,
-		isDefault
-	};
+	const initializer = findVariableInitializer(receiver, receiver.name)?.initializer ?? null;
+	if (initializer && isNodeOfType(initializer, "Identifier")) return findVariableInitializer(initializer, initializer.name)?.initializer ?? initializer;
+	return initializer;
 };
 const isSplitCall = (expression) => {
 	if (!expression) return false;
@@ -15471,8 +15342,8 @@ const isBoundedConstantCollection = (collection) => {
 	if (isScreamingSnakeCaseConstantReceiver(stripped)) return true;
 	if (isSmallInlineLiteralArray(stripped)) return true;
 	if (isNodeOfType(stripped, "Identifier")) {
-		const resolved = getResolvedInitializer(stripped);
-		if (resolved && !resolved.isDefault && isSmallInlineLiteralArray(resolved.initializer)) return true;
+		const initializer = getResolvedInitializer(stripped);
+		if (initializer && isSmallInlineLiteralArray(initializer)) return true;
 	}
 	return false;
 };
@@ -15524,8 +15395,8 @@ const jsSetMapLookups = defineRule({
 			if (isIndexedArrayElementWithStringArgument(receiver, node.arguments?.[0])) return;
 			const resolvedInitializer = getResolvedInitializer(receiver);
 			if (resolvedInitializer) {
-				if (isLikelyStringReceiver(resolvedInitializer.initializer)) return;
-				if (!resolvedInitializer.isDefault && isSmallInlineLiteralArray(resolvedInitializer.initializer)) return;
+				if (isLikelyStringReceiver(resolvedInitializer)) return;
+				if (isSmallInlineLiteralArray(resolvedInitializer)) return;
 			}
 			if (isStringElementOfSplitIteration(receiver)) return;
 			if (isReceiverDeclaredInNearestLoop(receiver, node)) return;
@@ -28921,7 +28792,7 @@ const findTopLevelEffectCalls = (componentBody) => {
 	if (!isNodeOfType(componentBody, "BlockStatement")) return effectCalls;
 	for (const statement of componentBody.body ?? []) {
 		if (!isNodeOfType(statement, "ExpressionStatement")) continue;
-		const expression = unwrapDiscardedExpression(statement);
+		const expression = statement.expression;
 		if (!isNodeOfType(expression, "CallExpression")) continue;
 		if (!isHookCall$2(expression, EFFECT_HOOK_NAMES$1)) continue;
 		effectCalls.push(expression);
@@ -33153,7 +33024,7 @@ const noMirrorPropEffect = defineRule({
 			if (mirrorBindings.length === 0) return;
 			for (const statement of componentBody.body ?? []) {
 				if (!isNodeOfType(statement, "ExpressionStatement")) continue;
-				const effectCall = unwrapDiscardedExpression(statement);
+				const effectCall = statement.expression;
 				if (!isNodeOfType(effectCall, "CallExpression")) continue;
 				if (!isHookCall$2(effectCall, EFFECT_HOOK_NAMES$1)) continue;
 				if ((effectCall.arguments?.length ?? 0) < 2) continue;
@@ -33167,7 +33038,7 @@ const noMirrorPropEffect = defineRule({
 				const bodyStatements = getCallbackStatements(callback);
 				if (bodyStatements.length !== 1) continue;
 				const onlyStatement = bodyStatements[0];
-				const expression = unwrapDiscardedExpression(onlyStatement);
+				const expression = isNodeOfType(onlyStatement, "ExpressionStatement") ? onlyStatement.expression : onlyStatement;
 				if (!isNodeOfType(expression, "CallExpression")) continue;
 				if (!isNodeOfType(expression.callee, "Identifier")) continue;
 				if (!isSetterIdentifier(expression.callee.name)) continue;
@@ -37268,7 +37139,7 @@ const isNonSettlingSetterArgument = (setterCall, stateName) => {
 	return expressionReadsStateValue(argument, stateName);
 };
 const getUnconditionalSetterCall = (statement, setterNames) => {
-	const expression = unwrapDiscardedExpression(statement);
+	const expression = stripParenExpression(isNodeOfType(statement, "ExpressionStatement") ? statement.expression : statement);
 	if (!isNodeOfType(expression, "CallExpression")) return null;
 	if (!isNodeOfType(expression.callee, "Identifier")) return null;
 	if (!setterNames.has(expression.callee.name)) return null;
@@ -37617,7 +37488,7 @@ const noSelfUpdatingEffect = defineRule({
 			const setterNames = new Set(setterNameToStateName.keys());
 			for (const statement of functionBody.body ?? []) {
 				if (!isNodeOfType(statement, "ExpressionStatement")) continue;
-				const effectCall = unwrapDiscardedExpression(statement);
+				const effectCall = statement.expression;
 				if (!isNodeOfType(effectCall, "CallExpression")) continue;
 				if (!isHookCall$2(effectCall, EFFECT_HOOK_NAMES$1)) continue;
 				if ((effectCall.arguments?.length ?? 0) < 2) continue;
@@ -46042,8 +45913,8 @@ const rnAnimationReactionAsDerived = defineRule({
 			if (statements.length !== 1) return;
 			const onlyStatement = statements[0];
 			if (!isNodeOfType(onlyStatement, "ExpressionStatement")) return;
-			singleAssignment = unwrapDiscardedExpression(onlyStatement);
-		} else if (body) singleAssignment = unwrapDiscardedExpression(body);
+			singleAssignment = onlyStatement.expression;
+		} else if (body) singleAssignment = body;
 		if (!singleAssignment) return;
 		const isValueAssignment = isNodeOfType(singleAssignment, "AssignmentExpression") && isNodeOfType(singleAssignment.left, "MemberExpression") && isNodeOfType(singleAssignment.left.object, "Identifier") && isNodeOfType(singleAssignment.left.property, "Identifier") && singleAssignment.left.property.name === "value";
 		const isSetCall = isNodeOfType(singleAssignment, "CallExpression") && isNodeOfType(singleAssignment.callee, "MemberExpression") && isNodeOfType(singleAssignment.callee.property, "Identifier") && singleAssignment.callee.property.name === "set" && (singleAssignment.arguments?.length ?? 0) === 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxlint-plugin-react-doctor",
-  "version": "0.7.6-dev.e026a23",
+  "version": "0.7.6-dev.e877ca7",
   "description": "React Doctor rules for oxlint.",
   "keywords": [
     "accessibility",