oxlint-plugin-react-doctor 0.9.2-dev.c126684 → 0.9.2-dev.c6bdd2d

package/dist/index.js

@@ -665,6 +665,19 @@ const TRIVIAL_INITIALIZER_NAMES = new Set([
 	"parseInt",
 	"parseFloat"
 ]);
+const TRIVIAL_CONSTRUCTOR_NAMES = new Set([
+	"Date",
+	"Map",
+	"Set",
+	"WeakMap",
+	"WeakSet",
+	"WeakRef",
+	"RegExp",
+	"Error",
+	"URL",
+	"URLSearchParams",
+	"AbortController"
+]);
 const SETTER_PATTERN = /^set[A-Z]/;
 const RENDER_FUNCTION_PATTERN = /^render[A-Z]/;
 const UPPERCASE_PATTERN = /^[A-Z]/;
@@ -29461,11 +29474,6 @@ const jsCacheStorage = defineRule({
 });
 //#endregion
 //#region src/plugin/rules/js-performance/js-combine-iterations.ts
-const SMALL_ARRAY_NON_MUTATING_METHODS = new Set([
-	...CHAINABLE_ITERATION_METHODS,
-	"find",
-	"some"
-]);
 const isIteratorProducingCall = (callExpression, generatorNamesInFile) => {
 	const callee = callExpression.callee;
 	if (isNodeOfType(callee, "MemberExpression")) {
@@ -29577,34 +29585,21 @@ const isStringSplitRootedChain = (receiverNode) => {
 	return false;
 };
 const isSmallLiteralArray = (node) => {
-	const arrayNode = stripParenExpression(node);
-	if (!isNodeOfType(arrayNode, "ArrayExpression")) return false;
-	const elements = arrayNode.elements ?? [];
-	if (elements.length === 0 || elements.length > 9) return false;
+	if (!isNodeOfType(node, "ArrayExpression")) return false;
+	const elements = node.elements ?? [];
+	if (elements.length === 0 || elements.length > 8) return false;
 	for (const element of elements) {
 		if (!element) continue;
 		if (isNodeOfType(element, "SpreadElement")) return false;
 	}
 	return true;
 };
-const isNonMutatingSmallArrayMethodReference = (identifier) => {
-	const identifierRoot = findTransparentExpressionRoot(identifier);
-	const memberExpression = identifierRoot.parent;
-	if (!isNodeOfType(memberExpression, "MemberExpression") || memberExpression.object !== identifierRoot || !isNodeOfType(memberExpression.property, "Identifier") || !SMALL_ARRAY_NON_MUTATING_METHODS.has(memberExpression.property.name)) return false;
-	const callExpression = memberExpression.parent;
-	return isNodeOfType(callExpression, "CallExpression") && callExpression.callee === memberExpression;
-};
-const isSmallLiteralArrayRootedChain = (receiverNode, scopes) => {
+const isSmallLiteralArrayRootedChain = (receiverNode, smallConstArrayNames) => {
 	let cursor = receiverNode;
 	while (cursor) {
 		cursor = stripParenExpression(cursor);
 		if (isNodeOfType(cursor, "ArrayExpression")) return isSmallLiteralArray(cursor);
-		if (isNodeOfType(cursor, "Identifier")) {
-			const symbol = scopes.symbolFor(cursor);
-			if (!symbol?.initializer || !isSmallLiteralArray(symbol.initializer)) return false;
-			if (!isNodeOfType(symbol.declarationNode, "VariableDeclarator") || !isNodeOfType(symbol.declarationNode.id, "Identifier")) return false;
-			return (symbol.kind === "const" || symbol.kind === "let" || symbol.kind === "var") && symbol.references.every((reference) => reference.flag === "read" && isNonMutatingSmallArrayMethodReference(reference.identifier));
-		}
+		if (isNodeOfType(cursor, "Identifier")) return smallConstArrayNames.has(cursor.name);
 		if (!isNodeOfType(cursor, "CallExpression")) return false;
 		if (!isChainPassThroughCall(cursor)) return false;
 		const nextCallee = cursor.callee;
@@ -29613,6 +29608,22 @@ const isSmallLiteralArrayRootedChain = (receiverNode, scopes) => {
 	}
 	return false;
 };
+const collectSmallConstArrayNames = (programNode) => {
+	const names = /* @__PURE__ */ new Set();
+	const statements = programNode.body ?? [];
+	for (const statement of statements) {
+		const declaration = isNodeOfType(statement, "ExportNamedDeclaration") ? statement.declaration : statement;
+		if (!declaration || !isNodeOfType(declaration, "VariableDeclaration")) continue;
+		if (declaration.kind !== "const") continue;
+		for (const declarator of declaration.declarations ?? []) {
+			if (!isNodeOfType(declarator, "VariableDeclarator")) continue;
+			if (!isNodeOfType(declarator.id, "Identifier")) continue;
+			if (!declarator.init || !isSmallLiteralArray(declarator.init)) continue;
+			names.add(declarator.id.name);
+		}
+	}
+	return names;
+};
 const collectGeneratorNames = (programNode) => {
 	const generatorNames = /* @__PURE__ */ new Set();
 	walkAst(programNode, (child) => {
@@ -29633,11 +29644,16 @@ const jsCombineIterations = defineRule({
 	create: (context) => {
 		let programNode = null;
 		let generatorNamesInFile = null;
+		let smallConstArrayNames = null;
 		const coveredChainCalls = /* @__PURE__ */ new WeakSet();
 		const getGeneratorNamesInFile = () => {
 			generatorNamesInFile ??= programNode ? collectGeneratorNames(programNode) : /* @__PURE__ */ new Set();
 			return generatorNamesInFile;
 		};
+		const getSmallConstArrayNames = () => {
+			smallConstArrayNames ??= programNode ? collectSmallConstArrayNames(programNode) : /* @__PURE__ */ new Set();
+			return smallConstArrayNames;
+		};
 		return {
 			Program(node) {
 				programNode = node;
@@ -29667,7 +29683,7 @@ const jsCombineIterations = defineRule({
 					if (isTypePredicateArrow(filterArgument)) return;
 				}
 				if (isReceiverChainIteratorRooted(innerCall.callee.object, getGeneratorNamesInFile())) return;
-				if (isSmallLiteralArrayRootedChain(innerCall.callee.object, context.scopes)) return;
+				if (isSmallLiteralArrayRootedChain(innerCall.callee.object, getSmallConstArrayNames())) return;
 				if (isStringSplitRootedChain(innerCall.callee.object)) return;
 				coveredChainCalls.add(innerCall);
 				context.report({
@@ -56087,9 +56103,6 @@ const isInitialOnlyPropName = (propName) => {
 	return /^initial[A-Z]/.test(propName) || /^default[A-Z]/.test(propName) || /^seed[A-Z]/.test(propName) || /^starting[A-Z]/.test(propName) || /^baseline[A-Z]/.test(propName) || /^preset[A-Z]/.test(propName);
 };
 //#endregion
-//#region src/plugin/utils/nextjs-page-data-export-names.ts
-const NEXTJS_PAGE_DATA_EXPORT_NAMES = new Set(["getServerSideProps", "getStaticProps"]);
-//#endregion
 //#region src/plugin/rules/state-and-effects/no-derived-use-state.ts
 const isInitialOnlySeedName = (propName) => isInitialOnlyPropName(propName) || propName === "initial" || propName === "autoFocus" || propName === "autoPlay" || propName === "startOpen" || /^initially[A-Z]/.test(propName) || /Initial([A-Z]|$)/.test(propName);
 const SNAPSHOT_STATE_NAME_PATTERN = /^(initial|previous|prev|preserved|saved|original|cached|snapshot|prior|debounced|deferred)([A-Z_]|$)/;
@@ -56246,6 +56259,7 @@ const isDraftCommittedToParent = (componentFunction, stateValueName, isPropName)
 	});
 	return isCommitted;
 };
+const NEXTJS_PAGE_DATA_EXPORT_NAMES = new Set(["getServerSideProps", "getStaticProps"]);
 const isNextjsDataFetchingPage = (node) => {
 	const program = findProgramRoot(node);
 	if (!program) return false;
@@ -67190,124 +67204,6 @@ const isInsideSnapshotHelper = (node) => {
 	}
 	return false;
 };
-const findEnclosingNextjsPageDataFunction = (node) => {
-	let outermostFunction = null;
-	let cursor = node.parent;
-	while (cursor) {
-		if (isFunctionLike$1(cursor)) outermostFunction = cursor;
-		if (isNodeOfType(cursor, "Program")) {
-			if (!outermostFunction) return null;
-			for (const exportName of NEXTJS_PAGE_DATA_EXPORT_NAMES) {
-				const exportedValue = findExportedValue(cursor, exportName);
-				if (exportedValue && isAstDescendant(outermostFunction, exportedValue)) return outermostFunction;
-			}
-			return null;
-		}
-		cursor = cursor.parent ?? null;
-	}
-	return null;
-};
-const findConditionalReturnExpressionRoot = (node) => {
-	let expressionRoot = findTransparentExpressionRoot(node);
-	while (expressionRoot.parent && isNodeOfType(expressionRoot.parent, "ConditionalExpression") && (expressionRoot.parent.consequent === expressionRoot || expressionRoot.parent.alternate === expressionRoot)) expressionRoot = findTransparentExpressionRoot(expressionRoot.parent);
-	return expressionRoot;
-};
-const isReturnedPageDataResultBinding = (returnExpression, pageDataFunction, context) => {
-	const declarator = returnExpression.parent;
-	if (!isNodeOfType(declarator, "VariableDeclarator") || declarator.init !== returnExpression || !isNodeOfType(declarator.id, "Identifier") || findEnclosingFunction$1(declarator) !== pageDataFunction) return false;
-	const bindingSymbol = context.scopes.symbolFor(declarator.id);
-	if (!bindingSymbol || bindingSymbol.references.length !== 1) return false;
-	const referenceRoot = findTransparentExpressionRoot(bindingSymbol.references[0].identifier);
-	const returnStatement = referenceRoot.parent;
-	return isNodeOfType(returnStatement, "ReturnStatement") && returnStatement.argument === referenceRoot && findEnclosingFunction$1(returnStatement) === pageDataFunction;
-};
-const isSameShorthandPropertyValue = (node, property) => property.shorthand && (node === property.key || node === property.value);
-const isValueForwardedThroughLiteralStructure = (node, structure) => {
-	const strippedNode = stripParenExpression(node);
-	const strippedStructure = stripParenExpression(structure);
-	if (strippedNode === strippedStructure) return true;
-	if (isNodeOfType(strippedStructure, "ConditionalExpression")) return isValueForwardedThroughLiteralStructure(strippedNode, strippedStructure.consequent) || isValueForwardedThroughLiteralStructure(strippedNode, strippedStructure.alternate);
-	if (isNodeOfType(strippedStructure, "ArrayExpression")) return strippedStructure.elements.some((element) => element && !isNodeOfType(element, "SpreadElement") && isValueForwardedThroughLiteralStructure(strippedNode, element));
-	if (!isNodeOfType(strippedStructure, "ObjectExpression")) return false;
-	return strippedStructure.properties.some((property) => {
-		if (isNodeOfType(property, "SpreadElement")) return isValueForwardedThroughLiteralStructure(strippedNode, property.argument);
-		if (!isNodeOfType(property, "Property")) return false;
-		if (isValueForwardedThroughLiteralStructure(strippedNode, property.value)) return true;
-		return isSameShorthandPropertyValue(strippedNode, property);
-	});
-};
-const isValueForwardedToPropertyValue = (node, property) => {
-	const directValue = findConditionalReturnExpressionRoot(node);
-	if (isValueForwardedThroughLiteralStructure(directValue, property.value)) return true;
-	return isSameShorthandPropertyValue(directValue, property);
-};
-const isInsideReturnedNextjsProps = (node, pageDataFunction, context) => {
-	let cursor = node.parent;
-	while (cursor && cursor !== pageDataFunction) {
-		if (isNodeOfType(cursor, "Property") && getStaticPropertyKeyName(cursor, { allowComputedString: true }) === "props" && isValueForwardedToPropertyValue(node, cursor)) {
-			const propertyContainer = cursor.parent;
-			if (!propertyContainer) return false;
-			const returnExpression = findConditionalReturnExpressionRoot(propertyContainer);
-			const returnStatement = returnExpression.parent;
-			if (isNodeOfType(returnStatement, "ReturnStatement") && findEnclosingFunction$1(returnStatement) === pageDataFunction) return true;
-			if (isNodeOfType(pageDataFunction, "ArrowFunctionExpression") && !isNodeOfType(pageDataFunction.body, "BlockStatement") && stripParenExpression(pageDataFunction.body) === stripParenExpression(returnExpression)) return true;
-			if (isReturnedPageDataResultBinding(returnExpression, pageDataFunction, context)) return true;
-		}
-		cursor = cursor.parent ?? null;
-	}
-	return false;
-};
-const isExpressionReturnedByFunction = (node, functionNode) => {
-	const returnExpression = findConditionalReturnExpressionRoot(node);
-	if (isNodeOfType(functionNode, "ArrowFunctionExpression") && !isNodeOfType(functionNode.body, "BlockStatement")) return stripParenExpression(functionNode.body) === stripParenExpression(returnExpression);
-	const returnStatement = returnExpression.parent;
-	return isNodeOfType(returnStatement, "ReturnStatement") && returnStatement.argument === returnExpression && findEnclosingFunction$1(returnStatement) === functionNode;
-};
-const isValueForwardedToBindingInitializer = (node, bindingInitializer) => {
-	if (isValueForwardedThroughLiteralStructure(findConditionalReturnExpressionRoot(node), bindingInitializer)) return true;
-	const initializer = stripParenExpression(bindingInitializer);
-	if (!isNodeOfType(initializer, "CallExpression")) return false;
-	const callee = stripParenExpression(initializer.callee);
-	return isFunctionLike$1(callee) && isExpressionReturnedByFunction(node, callee);
-};
-const findPageDataResultBinding = (node) => {
-	let cursor = node.parent;
-	while (cursor) {
-		if (isNodeOfType(cursor, "VariableDeclarator")) {
-			if (cursor.init && isNodeOfType(cursor.id, "Identifier") && isValueForwardedToBindingInitializer(node, cursor.init)) return cursor.id;
-			return null;
-		}
-		cursor = cursor.parent ?? null;
-	}
-	return null;
-};
-const isUsedToSerializeNextjsPageProps = (node, context) => {
-	if (!isInProjectDirectory(context, "pages") || isInProjectDirectory(context, "pages/api")) return false;
-	const pageDataFunction = findEnclosingNextjsPageDataFunction(node);
-	if (!pageDataFunction) return false;
-	if (isInsideReturnedNextjsProps(node, pageDataFunction, context)) return true;
-	const bindingIdentifier = findPageDataResultBinding(node);
-	const bindingSymbol = bindingIdentifier ? context.scopes.symbolFor(bindingIdentifier) : null;
-	if (!bindingSymbol) return false;
-	const aliasSymbols = collectConstAliasSymbols(bindingSymbol, context.scopes);
-	const aliasSymbolIds = new Set(aliasSymbols.map((aliasSymbol) => aliasSymbol.id));
-	let hasPagePropsReference = false;
-	for (const aliasSymbol of aliasSymbols) for (const reference of aliasSymbol.references) {
-		if (findEnclosingFunction$1(reference.identifier) !== pageDataFunction) return false;
-		if (isInsideReturnedNextjsProps(reference.identifier, pageDataFunction, context)) {
-			hasPagePropsReference = true;
-			continue;
-		}
-		const referenceRoot = findTransparentExpressionRoot(reference.identifier);
-		const declarator = referenceRoot.parent;
-		if (isNodeOfType(declarator, "VariableDeclarator") && declarator.init === referenceRoot && isNodeOfType(declarator.id, "Identifier")) {
-			const aliasSymbolForReference = context.scopes.symbolFor(declarator.id);
-			if (aliasSymbolForReference && aliasSymbolIds.has(aliasSymbolForReference.id)) continue;
-		}
-		return false;
-	}
-	return hasPagePropsReference;
-};
 const noJsonParseStringifyClone = defineRule({
 	id: "no-json-parse-stringify-clone",
 	title: "JSON parse/stringify deep clone",
@@ -67325,7 +67221,6 @@ const noJsonParseStringifyClone = defineRule({
 		if (isInsideSnapshotHelper(node)) return;
 		if (isAssignedToNormalizationBinding(node)) return;
 		if (isCatchParameterRoundTrip(firstArgument)) return;
-		if (isUsedToSerializeNextjsPageProps(node, context)) return;
 		context.report({
 			node,
 			message: MESSAGE$35
@@ -68741,77 +68636,6 @@ const isCancellationGuardTest = (test) => {
 	});
 	return matches;
 };
-const getReactRefCurrent = (expression, context) => {
-	const stripped = stripParenExpression(expression);
-	if (!isNodeOfType(stripped, "MemberExpression") || getStaticPropertyName(stripped) !== "current") return null;
-	const receiver = stripParenExpression(stripped.object);
-	if (!isNodeOfType(receiver, "Identifier")) return null;
-	const binding = findVariableInitializer(receiver, receiver.name);
-	const initializer = binding?.initializer ? stripParenExpression(binding.initializer) : null;
-	return initializer && isNodeOfType(initializer, "CallExpression") && isReactApiCall(initializer, USE_REF_HOOK_NAMES$1, context.scopes, {
-		allowGlobalReactNamespace: true,
-		allowUnboundBareCalls: true
-	}) ? stripped : null;
-};
-const getStableOwnershipToken = (expression, context) => {
-	const stripped = stripParenExpression(expression);
-	if (!isNodeOfType(stripped, "Identifier")) return null;
-	const symbol = context.scopes.symbolFor(stripped);
-	const initializer = symbol?.initializer ? stripParenExpression(symbol.initializer) : null;
-	const isStableAsyncIdentity = Boolean(initializer && isNodeOfType(initializer, "ObjectExpression")) || Boolean(initializer && getReactRefCurrent(initializer, context)) || Boolean(initializer && isNodeOfType(initializer, "UpdateExpression") && initializer.operator === "++" && getReactRefCurrent(initializer.argument, context));
-	return symbol && symbol.kind === "const" && symbol.references.every((reference) => reference.flag === "read") && isStableAsyncIdentity ? stripped : null;
-};
-const getAsyncOwnershipComparison = (test, context) => {
-	const stripped = stripParenExpression(test);
-	if (!isNodeOfType(stripped, "BinaryExpression")) return null;
-	const leftRef = getReactRefCurrent(stripped.left, context);
-	const rightRef = getReactRefCurrent(stripped.right, context);
-	const leftToken = getStableOwnershipToken(stripped.left, context);
-	const rightToken = getStableOwnershipToken(stripped.right, context);
-	if (stripped.operator === "===" || stripped.operator === "==") {
-		if (leftRef && rightToken) return {
-			refCurrent: leftRef,
-			token: rightToken,
-			mode: "owns",
-			isOrdered: false
-		};
-		if (rightRef && leftToken) return {
-			refCurrent: rightRef,
-			token: leftToken,
-			mode: "owns",
-			isOrdered: false
-		};
-		return null;
-	}
-	if (stripped.operator === "!==" || stripped.operator === "!=") {
-		if (leftRef && rightToken) return {
-			refCurrent: leftRef,
-			token: rightToken,
-			mode: "lost",
-			isOrdered: false
-		};
-		if (rightRef && leftToken) return {
-			refCurrent: rightRef,
-			token: leftToken,
-			mode: "lost",
-			isOrdered: false
-		};
-		return null;
-	}
-	if (stripped.operator === "<=" && leftRef && rightToken) return {
-		refCurrent: leftRef,
-		token: rightToken,
-		mode: "owns",
-		isOrdered: true
-	};
-	if (stripped.operator === ">=" && rightRef && leftToken) return {
-		refCurrent: rightRef,
-		token: leftToken,
-		mode: "owns",
-		isOrdered: true
-	};
-	return null;
-};
 const dedupeCatchPathStates = (states) => {
 	const statesByKey = /* @__PURE__ */ new Map();
 	for (const state of states) statesByKey.set(`${Number(state.isCleared)}:${Number(state.isCancellationPath)}`, state);
@@ -69144,221 +68968,7 @@ const isInsideTryFinalizer = (node, tryStatement) => {
 	}
 	return false;
 };
-const getDirectBlockEntry = (node, functionNode) => {
-	let entry = node;
-	let cursor = node.parent;
-	while (cursor && cursor !== functionNode) {
-		if (isNodeOfType(cursor, "BlockStatement")) return {
-			block: cursor,
-			entry
-		};
-		entry = cursor;
-		cursor = cursor.parent ?? null;
-	}
-	return null;
-};
-const claimPrecedesTruthySet = (claimNode, truthySet, firstRiskyAwait, functionNode, context) => {
-	const claimStart = getNodeStart$1(claimNode);
-	if (claimStart === null || claimStart >= firstRiskyAwait.start || truthySet.start >= firstRiskyAwait.start) return false;
-	const claimEntry = getDirectBlockEntry(claimNode, functionNode);
-	const truthyEntry = getDirectBlockEntry(truthySet.node, functionNode);
-	if (!claimEntry || !truthyEntry || claimEntry.block !== truthyEntry.block) return false;
-	let claimCursor = claimNode.parent;
-	while (claimCursor && claimCursor !== claimEntry.block) {
-		if (isNodeOfType(claimCursor, "IfStatement") || isNodeOfType(claimCursor, "SwitchCase") || isNodeOfType(claimCursor, "ConditionalExpression") || isNodeOfType(claimCursor, "LogicalExpression") || isNodeOfType(claimCursor, "ForStatement") || isNodeOfType(claimCursor, "ForInStatement") || isNodeOfType(claimCursor, "ForOfStatement") || isNodeOfType(claimCursor, "WhileStatement") || isNodeOfType(claimCursor, "DoWhileStatement")) return false;
-		claimCursor = claimCursor.parent ?? null;
-	}
-	const claimIndex = claimEntry.block.body.findIndex((statement) => statement === claimEntry.entry);
-	const truthyIndex = claimEntry.block.body.findIndex((statement) => statement === truthyEntry.entry);
-	if (claimIndex === -1 || truthyIndex === -1 || claimIndex >= truthyIndex) return false;
-	return claimEntry.block.body.slice(claimIndex + 1, truthyIndex).every((statement) => !subtreeHasAbruptSynchronousOperation(statement, functionNode, context));
-};
-const getOwningFunction = (functionNode) => {
-	let ownerFunction = functionNode;
-	let cursor = functionNode.parent;
-	while (cursor) {
-		if (isFunctionLike$1(cursor)) ownerFunction = cursor;
-		cursor = cursor.parent ?? null;
-	}
-	return ownerFunction;
-};
-const isEffectInvalidationPairedWithReset = (writeNode, truthySets, context) => {
-	const truthyCall = truthySets[0]?.node;
-	if (!truthyCall || !isNodeOfType(truthyCall, "CallExpression")) return false;
-	const setter = getSetterBooleanValue(truthyCall, context);
-	if (!setter) return false;
-	let effectCallback = writeNode.parent;
-	while (effectCallback && !isFunctionLike$1(effectCallback)) effectCallback = effectCallback.parent ?? null;
-	if (!effectCallback || !isEffectCallback(effectCallback, context)) return false;
-	if (!isUnconditionallyExecutedWithinFunction(writeNode, effectCallback, context)) return false;
-	const writeEntry = getDirectBlockEntry(writeNode, effectCallback);
-	if (!writeEntry) return false;
-	let isPaired = false;
-	walkOwnFunctionScope(effectCallback, (candidate) => {
-		if (isPaired || !isNodeOfType(candidate, "CallExpression")) return;
-		const candidateSetter = getSetterBooleanValue(candidate, context);
-		if (candidateSetter?.setterKey !== setter.setterKey || candidateSetter.value || !isUnconditionallyExecutedWithinFunction(candidate, effectCallback, context)) return;
-		const resetEntry = getDirectBlockEntry(candidate, effectCallback);
-		if (!resetEntry || resetEntry.block !== writeEntry.block) return;
-		const writeIndex = writeEntry.block.body.findIndex((statement) => statement === writeEntry.entry);
-		const resetIndex = resetEntry.block.body.findIndex((statement) => statement === resetEntry.entry);
-		if (writeIndex === -1 || resetIndex === -1) return;
-		if (resetIndex <= writeIndex) {
-			isPaired = true;
-			return false;
-		}
-		isPaired = writeEntry.block.body.slice(writeIndex + 1, resetIndex).every((statement) => !subtreeHasAbruptSynchronousOperation(statement, effectCallback, context));
-		return isPaired ? false : void 0;
-	});
-	return isPaired;
-};
-const isUnconditionalReturnBranch = (statement) => {
-	if (isNodeOfType(statement, "ReturnStatement")) return true;
-	return Boolean(isNodeOfType(statement, "BlockStatement") && statement.body.length === 1 && isNodeOfType(statement.body[0], "ReturnStatement"));
-};
-const findSingleFlightSnapshotClaim = (tokenInitializer, functionNode, truthySets, firstRiskyAwait, resetNode, context) => {
-	const snapshotEntry = getDirectBlockEntry(tokenInitializer, functionNode);
-	const resetEntry = getDirectBlockEntry(resetNode, functionNode);
-	if (!snapshotEntry || !resetEntry) return null;
-	const claimCandidates = [];
-	const releaseCandidates = [];
-	walkOwnFunctionScope(functionNode, (candidate) => {
-		if (!isNodeOfType(candidate, "AssignmentExpression") || candidate.operator !== "=" || !getReactRefCurrent(candidate.left, context)) return;
-		const assignedValue = stripParenExpression(candidate.right);
-		if (!isNodeOfType(assignedValue, "Literal") || typeof assignedValue.value !== "boolean") return;
-		const candidateKey = serializeReferenceKey({
-			node: candidate.left,
-			scopes: context.scopes
-		});
-		if (!candidateKey) return;
-		if (!assignedValue.value) {
-			if (getDirectBlockEntry(candidate, functionNode)?.block === resetEntry.block) releaseCandidates.push(candidate);
-			return;
-		}
-		if (!truthySets.some((truthySet) => claimPrecedesTruthySet(candidate, truthySet, firstRiskyAwait, functionNode, context))) return;
-		const candidateEntry = getDirectBlockEntry(candidate, functionNode);
-		if (!candidateEntry || candidateEntry.block !== snapshotEntry.block) return;
-		const candidateIndex = candidateEntry.block.body.findIndex((statement) => statement === candidateEntry.entry);
-		const snapshotIndex = candidateEntry.block.body.findIndex((statement) => statement === snapshotEntry.entry);
-		if (candidateIndex === -1 || snapshotIndex === -1 || candidateIndex >= snapshotIndex) return;
-		const guardIndex = candidateEntry.block.body.findLastIndex((statement, statementIndex) => {
-			if (statementIndex >= candidateIndex || !isNodeOfType(statement, "IfStatement") || statement.alternate !== null || !isUnconditionalReturnBranch(statement.consequent)) return false;
-			return serializeReferenceKey({
-				node: stripParenExpression(statement.test),
-				scopes: context.scopes
-			}) === candidateKey;
-		});
-		if (guardIndex === -1 || !candidateEntry.block.body.slice(guardIndex + 1, candidateIndex).every((statement) => !subtreeHasAbruptSynchronousOperation(statement, functionNode, context))) return;
-		claimCandidates.push(candidate);
-	});
-	const claim = claimCandidates.find((claimCandidate) => {
-		const candidateKey = serializeReferenceKey({
-			node: claimCandidate.left,
-			scopes: context.scopes
-		});
-		return releaseCandidates.some((releaseCandidate) => serializeReferenceKey({
-			node: releaseCandidate.left,
-			scopes: context.scopes
-		}) === candidateKey);
-	});
-	if (!claim) return null;
-	const claimKey = serializeReferenceKey({
-		node: claim.left,
-		scopes: context.scopes
-	});
-	const release = releaseCandidates.find((releaseCandidate) => serializeReferenceKey({
-		node: releaseCandidate.left,
-		scopes: context.scopes
-	}) === claimKey);
-	if (!claimKey || !release) return null;
-	const releaseEntry = getDirectBlockEntry(release, functionNode);
-	if (!releaseEntry || releaseEntry.block !== resetEntry.block) return null;
-	const releaseIndex = resetEntry.block.body.findIndex((statement) => statement === releaseEntry.entry);
-	const resetIndex = resetEntry.block.body.findIndex((statement) => statement === resetEntry.entry);
-	if (releaseIndex === -1 || resetIndex === -1 || !resetEntry.block.body.slice(Math.min(releaseIndex, resetIndex) + 1, Math.max(releaseIndex, resetIndex)).every((statement) => !subtreeHasAbruptSynchronousOperation(statement, functionNode, context))) return null;
-	let didFindUnsafeWrite = false;
-	walkAst(getOwningFunction(functionNode), (candidate) => {
-		if (didFindUnsafeWrite || candidate === claim || candidate === release) return;
-		const writeTarget = isNodeOfType(candidate, "AssignmentExpression") ? candidate.left : isNodeOfType(candidate, "UpdateExpression") || isNodeOfType(candidate, "UnaryExpression") && candidate.operator === "delete" ? candidate.argument : null;
-		if (writeTarget && serializeReferenceKey({
-			node: writeTarget,
-			scopes: context.scopes
-		}) === claimKey && !isEffectInvalidationPairedWithReset(candidate, truthySets, context)) didFindUnsafeWrite = true;
-	});
-	return didFindUnsafeWrite ? null : claim;
-};
-const findOwnershipClaim = (comparison, functionNode, truthySets, firstRiskyAwait, resetNode, context) => {
-	const refKey = serializeReferenceKey({
-		node: comparison.refCurrent,
-		scopes: context.scopes
-	});
-	const tokenKey = serializeReferenceKey({
-		node: comparison.token,
-		scopes: context.scopes
-	});
-	if (!refKey || !tokenKey) return null;
-	const candidates = [];
-	const tokenSymbol = context.scopes.symbolFor(comparison.token);
-	const tokenInitializer = tokenSymbol?.initializer ? stripParenExpression(tokenSymbol.initializer) : null;
-	if (comparison.isOrdered && !isNodeOfType(tokenInitializer, "UpdateExpression")) return null;
-	if (tokenInitializer && isNodeOfType(tokenInitializer, "UpdateExpression") && tokenInitializer.operator === "++" && serializeReferenceKey({
-		node: tokenInitializer.argument,
-		scopes: context.scopes
-	}) === refKey) candidates.push(tokenInitializer);
-	if (tokenInitializer && getReactRefCurrent(tokenInitializer, context) && serializeReferenceKey({
-		node: tokenInitializer,
-		scopes: context.scopes
-	}) === refKey) {
-		const singleFlightClaim = findSingleFlightSnapshotClaim(tokenInitializer, functionNode, truthySets, firstRiskyAwait, resetNode, context);
-		if (singleFlightClaim) candidates.push(singleFlightClaim);
-	}
-	if (tokenInitializer && isNodeOfType(tokenInitializer, "UpdateExpression")) {
-		const generationKey = serializeReferenceKey({
-			node: tokenInitializer.argument,
-			scopes: context.scopes
-		});
-		if (generationKey && generationKey === refKey) {
-			const ownerFunction = getOwningFunction(functionNode);
-			let didFindOtherGenerationWrite = false;
-			walkAst(ownerFunction, (candidate) => {
-				if (didFindOtherGenerationWrite || candidate === tokenInitializer) return;
-				const writeTarget = isNodeOfType(candidate, "AssignmentExpression") ? candidate.left : isNodeOfType(candidate, "UpdateExpression") || isNodeOfType(candidate, "UnaryExpression") && candidate.operator === "delete" ? candidate.argument : null;
-				if (writeTarget && serializeReferenceKey({
-					node: writeTarget,
-					scopes: context.scopes
-				}) === generationKey && !isEffectInvalidationPairedWithReset(candidate, truthySets, context)) didFindOtherGenerationWrite = true;
-			});
-			if (didFindOtherGenerationWrite) return null;
-		}
-	}
-	walkOwnFunctionScope(functionNode, (candidate) => {
-		if (!isNodeOfType(candidate, "AssignmentExpression") || candidate.operator !== "=") return;
-		if (serializeReferenceKey({
-			node: candidate.left,
-			scopes: context.scopes
-		}) === refKey && serializeReferenceKey({
-			node: candidate.right,
-			scopes: context.scopes
-		}) === tokenKey) candidates.push(candidate);
-	});
-	const claim = candidates.find((candidate) => truthySets.some((truthySet) => claimPrecedesTruthySet(candidate, truthySet, firstRiskyAwait, functionNode, context)));
-	if (!claim) return null;
-	let didFindOtherWrite = false;
-	walkAst(getOwningFunction(functionNode), (candidate) => {
-		if (didFindOtherWrite || candidate === claim) return;
-		const writeTarget = isNodeOfType(candidate, "AssignmentExpression") ? candidate.left : isNodeOfType(candidate, "UpdateExpression") || isNodeOfType(candidate, "UnaryExpression") && candidate.operator === "delete" ? candidate.argument : null;
-		if (writeTarget && serializeReferenceKey({
-			node: writeTarget,
-			scopes: context.scopes
-		}) === refKey && !isEffectInvalidationPairedWithReset(candidate, truthySets, context)) didFindOtherWrite = true;
-	});
-	return didFindOtherWrite ? null : claim;
-};
-const isClaimedOwnershipComparison = (test, expectedMode, functionNode, truthySets, firstRiskyAwait, resetNode, context) => {
-	const comparison = getAsyncOwnershipComparison(test, context);
-	return Boolean(comparison && comparison.mode === expectedMode && findOwnershipClaim(comparison, functionNode, truthySets, firstRiskyAwait, resetNode, context));
-};
-const hasLifecycleGuardWriteOutsideCleanup = (effectCallback, guardKey, acceptedAssignments, context) => {
+const hasLifecycleGuardWriteOutsideCleanup = (effectCallback, guardKey, acceptedCleanupAssignments, context) => {
 	let didFindOtherWrite = false;
 	walkAst(effectCallback, (candidate) => {
 		if (didFindOtherWrite) return false;
@@ -69366,7 +68976,7 @@ const hasLifecycleGuardWriteOutsideCleanup = (effectCallback, guardKey, accepted
 			if (serializeReferenceKey({
 				node: candidate.left,
 				scopes: context.scopes
-			}) === guardKey && !acceptedAssignments.has(candidate)) {
+			}) === guardKey && !acceptedCleanupAssignments.has(candidate)) {
 				didFindOtherWrite = true;
 				return false;
 			}
@@ -69382,103 +68992,48 @@ const hasLifecycleGuardWriteOutsideCleanup = (effectCallback, guardKey, accepted
 	});
 	return didFindOtherWrite;
 };
-const collectCleanupBackedLifecycleAssignments = (effectCallback, guardKey, context) => {
-	const acceptedAssignments = /* @__PURE__ */ new Set();
-	for (const cleanupFunction of collectReturnedCleanupFunctions(effectCallback, context.scopes)) walkOwnFunctionScope(cleanupFunction, (cleanupNode) => {
-		const assignedValue = isNodeOfType(cleanupNode, "AssignmentExpression") ? stripParenExpression(cleanupNode.right) : null;
-		if (!isNodeOfType(cleanupNode, "AssignmentExpression") || cleanupNode.operator !== "=" || !isNodeOfType(assignedValue, "Literal") || assignedValue.value !== false || serializeReferenceKey({
-			node: cleanupNode.left,
-			scopes: context.scopes
-		}) !== guardKey || !isUnconditionallyExecutedWithinFunction(cleanupNode, cleanupFunction, context)) return;
-		acceptedAssignments.add(cleanupNode);
-	});
-	if (acceptedAssignments.size === 0) return null;
-	walkOwnFunctionScope(effectCallback, (effectNode) => {
-		const assignedValue = isNodeOfType(effectNode, "AssignmentExpression") ? stripParenExpression(effectNode.right) : null;
-		if (isNodeOfType(effectNode, "AssignmentExpression") && effectNode.operator === "=" && isNodeOfType(assignedValue, "Literal") && assignedValue.value === true && serializeReferenceKey({
-			node: effectNode.left,
-			scopes: context.scopes
-		}) === guardKey && isUnconditionallyExecutedWithinFunction(effectNode, effectCallback, context)) acceptedAssignments.add(effectNode);
-	});
-	return acceptedAssignments;
-};
-const isEffectCallback = (node, context) => {
-	const callbackRoot = findTransparentExpressionRoot(node);
-	const callbackCall = callbackRoot.parent;
-	return Boolean(callbackCall && isNodeOfType(callbackCall, "CallExpression") && callbackCall.arguments[0] === callbackRoot && isReactApiCall(callbackCall, EFFECT_HOOK_NAMES$6, context.scopes, {
-		allowGlobalReactNamespace: true,
-		allowUnboundBareCalls: true
-	}));
-};
-const isCleanupBackedLifecycleGuard = (guardExpression, functionNode, context) => {
-	const guardKey = serializeReferenceKey({
-		node: guardExpression,
-		scopes: context.scopes
-	});
-	if (!guardKey || !isInitiallyActiveLifecycleGuard(guardExpression, context)) return false;
-	let ownerFunction = functionNode.parent;
-	while (ownerFunction && !isFunctionLike$1(ownerFunction)) ownerFunction = ownerFunction.parent ?? null;
-	if (!ownerFunction) return false;
-	const effectCallbacks = [];
-	if (isEffectCallback(ownerFunction, context)) effectCallbacks.push(ownerFunction);
-	walkOwnFunctionScope(ownerFunction, (candidate) => {
-		if (!isNodeOfType(candidate, "CallExpression")) return;
-		if (!isReactApiCall(candidate, EFFECT_HOOK_NAMES$6, context.scopes, {
-			allowGlobalReactNamespace: true,
-			allowUnboundBareCalls: true
-		})) return;
-		const effectCallback = candidate.arguments[0];
-		if (effectCallback && isFunctionLike$1(effectCallback)) effectCallbacks.push(effectCallback);
-	});
-	const acceptedAssignments = /* @__PURE__ */ new Set();
-	for (const effectCallback of effectCallbacks) {
-		const effectAssignments = collectCleanupBackedLifecycleAssignments(effectCallback, guardKey, context);
-		if (!effectAssignments) continue;
-		for (const assignment of effectAssignments) acceptedAssignments.add(assignment);
-	}
-	return Boolean(acceptedAssignments.size > 0 && !hasLifecycleGuardWriteOutsideCleanup(ownerFunction, guardKey, acceptedAssignments, context));
-};
-const collectLogicalOperands = (expression, operator) => {
-	const stripped = stripParenExpression(expression);
-	if (isNodeOfType(stripped, "LogicalExpression") && stripped.operator === operator) return [...collectLogicalOperands(stripped.left, operator), ...collectLogicalOperands(stripped.right, operator)];
-	return [stripped];
-};
-const collectFinalizerGuardExpressions = (resetNode, protectingTry) => {
-	const positive = [];
-	const negative = [];
+const isResetGuardedByCleanupBackedLifecycle = (resetNode, functionNode, context) => {
 	let child = resetNode;
 	let cursor = resetNode.parent;
-	while (cursor && cursor !== protectingTry) {
-		if (isNodeOfType(cursor, "IfStatement")) {
-			if (cursor.consequent !== child || cursor.alternate !== null) return null;
-			positive.push(...collectLogicalOperands(cursor.test, "&&"));
-		} else if (isNodeOfType(cursor, "LogicalExpression")) {
-			if (cursor.operator !== "&&" || cursor.right !== child) return null;
-			positive.push(...collectLogicalOperands(cursor.left, "&&"));
-		} else if (isNodeOfType(cursor, "BlockStatement")) {
-			const childIndex = cursor.body.findIndex((statement) => statement === child);
-			if (childIndex !== -1) for (const statement of cursor.body.slice(0, childIndex)) {
-				if (!isNodeOfType(statement, "IfStatement") || statement.alternate !== null || !isUnconditionalReturnBranch(statement.consequent)) continue;
-				negative.push(...collectLogicalOperands(statement.test, "||"));
-			}
-		} else if (isNodeOfType(cursor, "SwitchCase") || isNodeOfType(cursor, "ConditionalExpression") || isNodeOfType(cursor, "ForStatement") || isNodeOfType(cursor, "ForInStatement") || isNodeOfType(cursor, "ForOfStatement") || isNodeOfType(cursor, "WhileStatement") || isNodeOfType(cursor, "DoWhileStatement")) return null;
+	let guardKey = null;
+	let guardExpression = null;
+	while (cursor && cursor !== functionNode) {
+		if (isNodeOfType(cursor, "IfStatement") && cursor.consequent === child && cursor.alternate === null) {
+			guardExpression = cursor.test;
+			guardKey = serializeReferenceKey({
+				node: cursor.test,
+				scopes: context.scopes
+			});
+			break;
+		}
 		child = cursor;
 		cursor = cursor.parent ?? null;
 	}
-	return cursor === protectingTry && positive.length + negative.length > 0 ? {
-		positive,
-		negative
-	} : null;
-};
-const isPositiveFinalizerGuard = (expression, resetNode, functionNode, truthySets, firstRiskyAwait, context) => isCleanupBackedLifecycleGuard(expression, functionNode, context) || isClaimedOwnershipComparison(expression, "owns", functionNode, truthySets, firstRiskyAwait, resetNode, context);
-const isNegativeFinalizerGuard = (expression, resetNode, functionNode, truthySets, firstRiskyAwait, context) => {
-	const stripped = stripParenExpression(expression);
-	if (isNodeOfType(stripped, "UnaryExpression") && stripped.operator === "!") return isPositiveFinalizerGuard(stripped.argument, resetNode, functionNode, truthySets, firstRiskyAwait, context);
-	return isClaimedOwnershipComparison(stripped, "lost", functionNode, truthySets, firstRiskyAwait, resetNode, context);
-};
-const isFinalizerResetProvablyGuarded = (resetNode, protectingTry, functionNode, truthySets, firstRiskyAwait, context) => {
-	const guards = collectFinalizerGuardExpressions(resetNode, protectingTry);
-	return Boolean(guards && guards.positive.every((guard) => isPositiveFinalizerGuard(guard, resetNode, functionNode, truthySets, firstRiskyAwait, context)) && guards.negative.every((guard) => isNegativeFinalizerGuard(guard, resetNode, functionNode, truthySets, firstRiskyAwait, context)));
+	if (!guardKey || !guardExpression || !isInitiallyActiveLifecycleGuard(guardExpression, context)) return false;
+	cursor = functionNode.parent;
+	while (cursor) {
+		if (isFunctionLike$1(cursor)) {
+			const callbackRoot = findTransparentExpressionRoot(cursor);
+			const callbackCall = callbackRoot.parent;
+			if (Boolean(callbackCall && isNodeOfType(callbackCall, "CallExpression") && callbackCall.arguments[0] === callbackRoot && isReactApiCall(callbackCall, EFFECT_HOOK_NAMES$6, context.scopes, {
+				allowGlobalReactNamespace: true,
+				allowUnboundBareCalls: true
+			}))) {
+				const acceptedCleanupAssignments = /* @__PURE__ */ new Set();
+				for (const cleanupFunction of collectReturnedCleanupFunctions(cursor, context.scopes)) walkOwnFunctionScope(cleanupFunction, (cleanupNode) => {
+					const assignedValue = isNodeOfType(cleanupNode, "AssignmentExpression") ? stripParenExpression(cleanupNode.right) : null;
+					if (!isNodeOfType(cleanupNode, "AssignmentExpression") || cleanupNode.operator !== "=" || !isNodeOfType(assignedValue, "Literal") || assignedValue.value !== false || serializeReferenceKey({
+						node: cleanupNode.left,
+						scopes: context.scopes
+					}) !== guardKey || !isUnconditionallyExecutedWithinFunction(cleanupNode, cleanupFunction, context)) return;
+					acceptedCleanupAssignments.add(cleanupNode);
+				});
+				if (acceptedCleanupAssignments.size > 0 && !hasLifecycleGuardWriteOutsideCleanup(cursor, guardKey, acceptedCleanupAssignments, context)) return true;
+			}
+		}
+		cursor = cursor.parent ?? null;
+	}
+	return false;
 };
 const isAwaitInsideProtectedTry = (awaitNode, tryStatement) => {
 	let child = awaitNode;
@@ -69584,13 +69139,7 @@ const analyzeFunction = (functionNode, context) => {
 		const exceptionallyProtectedAwaits = collectExceptionallyProtectedAwaits(awaitSites, calls);
 		const riskyAwaitsWithTruthySet = awaitSites.filter((awaitSite) => rejectingAwaitNodes.has(awaitSite.node) && !exceptionallyProtectedAwaits.has(awaitSite.node) && truthySets.some((truthySet) => truthySet.start < awaitSite.start && !areOnExclusiveBranches(truthySet.node, awaitSite.node, functionNode)));
 		if (riskyAwaitsWithTruthySet.length === 0) continue;
-		const conditionalExceptionalResets = calls.filter((call) => {
-			if (call.value || call.context === "plain" || call.isUnconditional || call.protectingTry === null) return false;
-			const protectingTry = call.protectingTry;
-			if (!isInsideTryFinalizer(call.node, protectingTry)) return true;
-			const firstRiskyAwait = riskyAwaitsWithTruthySet.find((awaitSite) => isAwaitInsideProtectedTry(awaitSite.node, protectingTry));
-			return !(firstRiskyAwait && isFinalizerResetProvablyGuarded(call.node, protectingTry, functionNode, truthySets, firstRiskyAwait, context));
-		});
+		const conditionalExceptionalResets = calls.filter((call) => !call.value && call.context !== "plain" && !call.isUnconditional && call.protectingTry !== null && !(isInsideTryFinalizer(call.node, call.protectingTry) && isResetGuardedByCleanupBackedLifecycle(call.node, functionNode, context)));
 		for (const reset of conditionalExceptionalResets) {
 			const catchHandler = reset.protectingTry?.handler;
 			if (catchHandler && !catchHandlerCanBypassReset(catchHandler, functionNode, setterKey, context, false)) continue;
@@ -79951,23 +79500,16 @@ const MAX_INITIATOR_RESOLUTION_DEPTH = 3;
 const STATE_DISPATCHER_HOOK_NAMES = new Set(["useState", "useReducer"]);
 const REF_HOOK_NAMES = new Set(["useRef"]);
 const MESSAGE$26 = "This promise chain runs in an effect, ends in a `.then` that sets state or mutates a ref, and has no `.catch` or enclosing try/catch, so a rejection leaves the state unset and surfaces as an unhandled rejection. Add a `.catch` handler on the chain (`.finally` does not count).";
-const isKnownNonRejectingHandlerReturn = (expression, context, visitedBindingIdentifiers = /* @__PURE__ */ new Set()) => {
+const isKnownNonThenableHandlerReturn = (expression, context, visitedBindingIdentifiers = /* @__PURE__ */ new Set()) => {
 	const strippedExpression = stripParenExpression(expression);
 	if (isDefinitelyNonThenableValue(strippedExpression)) return true;
-	if (isNodeOfType(strippedExpression, "CallExpression") && isNodeOfType(strippedExpression.callee, "MemberExpression")) {
-		const receiver = stripParenExpression(strippedExpression.callee.object);
-		if (isNodeOfType(receiver, "Identifier") && receiver.name === "Promise" && context.scopes.isGlobalReference(receiver) && getStaticPropertyName(strippedExpression.callee) === "resolve") {
-			const resolvedValue = strippedExpression.arguments[0];
-			return !resolvedValue || !isNodeOfType(resolvedValue, "SpreadElement") && isKnownNonRejectingHandlerReturn(resolvedValue, context, visitedBindingIdentifiers);
-		}
-	}
 	if (!isNodeOfType(strippedExpression, "Identifier")) return false;
 	if (strippedExpression.name === "undefined" && context.scopes.isGlobalReference(strippedExpression)) return true;
 	const symbol = context.scopes.symbolFor(strippedExpression);
 	if (!symbol || visitedBindingIdentifiers.has(symbol.bindingIdentifier)) return false;
 	visitedBindingIdentifiers.add(symbol.bindingIdentifier);
 	const initializer = getDirectUnreassignedInitializer(symbol);
-	return Boolean(initializer && isKnownNonRejectingHandlerReturn(initializer, context, visitedBindingIdentifiers));
+	return Boolean(initializer && isKnownNonThenableHandlerReturn(initializer, context, visitedBindingIdentifiers));
 };
 const isKnownNonRejectingHandler = (argument, context) => {
 	if (!argument) return false;
@@ -79982,7 +79524,7 @@ const isKnownNonRejectingHandler = (argument, context) => {
 			canReject = true;
 			return false;
 		}
-		if (isNodeOfType(child, "ReturnStatement") && child.argument && !isKnownNonRejectingHandlerReturn(child.argument, context)) {
+		if (isNodeOfType(child, "ReturnStatement") && child.argument && !isKnownNonThenableHandlerReturn(child.argument, context)) {
 			if (!isNodeOfType(stripParenExpression(child.argument), "CallExpression")) {
 				canReject = true;
 				return false;
@@ -80031,28 +79573,6 @@ const handlerHasPotentiallyThrowingMemberRead = (argument, context) => {
 	});
 	return hasPotentiallyThrowingMemberRead;
 };
-const hasRejectionHandler = (chain, argument, context, allowTerminalCatchBlock) => {
-	if (!argument) return false;
-	if (!handlerHasPotentiallyThrowingMemberRead(argument, context) && (chainCarriesRejectionHandler(chain, context.scopes) || isKnownNonRejectingHandler(argument, context))) return true;
-	if (!allowTerminalCatchBlock) return false;
-	const candidate = stripParenExpression(argument);
-	const handler = isNodeOfType(candidate, "Identifier") ? resolveExactLocalFunction(candidate, context.scopes) : candidate;
-	if (!handler || !isFunctionLike$1(handler)) return isNodeOfType(candidate, "MemberExpression") || isNodeOfType(candidate, "Identifier") && candidate.name !== "undefined";
-	if (!isNodeOfType(handler.body, "BlockStatement")) return false;
-	let doesExplicitlyReject = false;
-	walkOwnFunctionScope(handler, (child) => {
-		if (doesExplicitlyReject) return false;
-		if (isNodeOfType(child, "ThrowStatement") || isNodeOfType(child, "AwaitExpression")) {
-			doesExplicitlyReject = true;
-			return false;
-		}
-		if (isNodeOfType(child, "ReturnStatement") && child.argument && !isKnownNonRejectingHandlerReturn(child.argument, context)) {
-			doesExplicitlyReject = true;
-			return false;
-		}
-	});
-	return !doesExplicitlyReject;
-};
 const walkPromiseChain = (chainExpression, context) => {
 	let cursor = stripParenExpression(chainExpression);
 	let hasCatch = false;
@@ -80064,9 +79584,10 @@ const walkPromiseChain = (chainExpression, context) => {
 	while (isNodeOfType(cursor, "CallExpression") && isNodeOfType(cursor.callee, "MemberExpression") && PROMISE_METHOD_NAMES.has(getStaticPropertyName(cursor.callee) ?? "")) {
 		const methodName = getStaticPropertyName(cursor.callee);
 		const rejectionHandlerArgument = methodName === "catch" ? cursor.arguments[0] : cursor.arguments[1];
-		if (!didReachTerminalThen && methodName === "catch" && hasRejectionHandler(cursor, rejectionHandlerArgument, context, true)) hasCatch = true;
+		const hasAbsorbingRejectionHandler = !handlerHasPotentiallyThrowingMemberRead(rejectionHandlerArgument, context) && (chainCarriesRejectionHandler(cursor, context.scopes) || isKnownNonRejectingHandler(rejectionHandlerArgument, context));
+		if (!didReachTerminalThen && methodName === "catch" && hasAbsorbingRejectionHandler) hasCatch = true;
 		if (methodName === "then") {
-			if (!didReachTerminalThen && hasRejectionHandler(cursor, rejectionHandlerArgument, context, false)) hasRejectionHandlerArgument = true;
+			if (!didReachTerminalThen && hasAbsorbingRejectionHandler) hasRejectionHandlerArgument = true;
 			didReachTerminalThen = true;
 			sawThen = true;
 			const callbackArgument = cursor.arguments[0];
@@ -82393,45 +81914,6 @@ const noRefCallbackCleanupBeforeReact19 = defineRule({
 	} })
 });
 //#endregion
-//#region src/plugin/utils/contains-non-deterministic-source.ts
-const NON_DETERMINISTIC_MEMBER_CALLS = new Set([
-	"Math.random",
-	"Date.now",
-	"performance.now",
-	"crypto.randomUUID",
-	"crypto.getRandomValues"
-]);
-const NON_DETERMINISTIC_ID_GENERATOR_NAMES = new Set([
-	"nanoid",
-	"uuid",
-	"cuid",
-	"ulid",
-	"createId"
-]);
-const isZeroArgDateConstruction = (node) => isNodeOfType(node, "NewExpression") && isNodeOfType(node.callee, "Identifier") && node.callee.name === "Date" && (node.arguments?.length ?? 0) === 0;
-const containsNonDeterministicSource = (root) => {
-	let found = false;
-	walkAst(root, (child) => {
-		if (found) return false;
-		if (isFunctionLike$1(child)) return false;
-		if (isZeroArgDateConstruction(child)) {
-			found = true;
-			return false;
-		}
-		if (!isNodeOfType(child, "CallExpression")) return;
-		const callee = child.callee;
-		if (isNodeOfType(callee, "Identifier") && NON_DETERMINISTIC_ID_GENERATOR_NAMES.has(callee.name)) {
-			found = true;
-			return false;
-		}
-		if (isNodeOfType(callee, "MemberExpression") && isNodeOfType(callee.object, "Identifier") && isNodeOfType(callee.property, "Identifier") && NON_DETERMINISTIC_MEMBER_CALLS.has(`${callee.object.name}.${callee.property.name}`)) {
-			found = true;
-			return false;
-		}
-	});
-	return found;
-};
-//#endregion
 //#region src/plugin/rules/state-and-effects/no-ref-current-in-render.ts
 const REPEATED_ANCESTOR_TYPES = new Set([
 	"DoWhileStatement",
@@ -82462,75 +81944,45 @@ const resolveImmutableInitializationValue = (node, scopes, visitedSymbolIds = /*
 };
 const isProvablyTruthyInitializationValue = (node, scopes) => {
 	const expression = resolveImmutableInitializationValue(node, scopes);
-	if (!expression) return false;
-	if (isNodeOfType(expression, "CallExpression")) {
-		const callee = stripParenExpression(expression.callee);
-		return isNodeOfType(callee, "Identifier") && callee.name.startsWith("create");
-	}
-	return isNodeOfType(expression, "NewExpression") || isNodeOfType(expression, "ObjectExpression") || isNodeOfType(expression, "ArrayExpression") || isNodeOfType(expression, "ArrowFunctionExpression") || isNodeOfType(expression, "FunctionExpression") || isNodeOfType(expression, "ClassExpression");
+	return Boolean(expression && (isNodeOfType(expression, "NewExpression") || isNodeOfType(expression, "ObjectExpression") || isNodeOfType(expression, "ArrayExpression") || isNodeOfType(expression, "ArrowFunctionExpression") || isNodeOfType(expression, "FunctionExpression") || isNodeOfType(expression, "ClassExpression")));
 };
-const getInitializationValueName = (node, scopes) => {
+const getInitializationConstructorName = (node, scopes) => {
 	const expression = resolveImmutableInitializationValue(node, scopes);
 	if (!expression) return null;
-	if (isNodeOfType(expression, "NewExpression") || isNodeOfType(expression, "CallExpression")) {
+	if (isNodeOfType(expression, "NewExpression")) {
 		const callee = stripParenExpression(expression.callee);
-		if (!isNodeOfType(callee, "Identifier")) return null;
-		return callee.name.startsWith("create") && callee.name.length > 6 ? callee.name.slice(6) : callee.name;
+		return isNodeOfType(callee, "Identifier") ? callee.name : null;
 	}
 	return null;
 };
-const isMatchingReturnType = (typeNode, initializationValue, scopes) => {
-	if (!isNodeOfType(typeNode, "TSTypeReference")) return false;
-	const typeName = typeNode.typeName;
-	if (!isNodeOfType(typeName, "Identifier") || typeName.name !== "ReturnType") return false;
-	const [returnTypeArgument] = typeNode.typeArguments?.params ?? [];
-	if (!returnTypeArgument || !isNodeOfType(returnTypeArgument, "TSTypeQuery")) return false;
-	const queriedName = returnTypeArgument.exprName;
-	const expression = stripParenExpression(initializationValue);
-	if (!isNodeOfType(queriedName, "Identifier") || !isNodeOfType(expression, "CallExpression")) return false;
-	const callee = stripParenExpression(expression.callee);
-	if (!isNodeOfType(callee, "Identifier")) return false;
-	const queriedSymbol = scopes.symbolFor(queriedName);
-	const calleeSymbol = scopes.symbolFor(callee);
-	return queriedSymbol && calleeSymbol ? queriedSymbol.id === calleeSymbol.id : queriedName.name === callee.name;
-};
 const isClosedTruthyTypeDomain = (typeNode, initializationValue, scopes) => {
 	const initializationExpression = stripParenExpression(initializationValue);
 	if (isNodeOfType(typeNode, "TSTypeLiteral")) return isNodeOfType(initializationExpression, "ObjectExpression");
 	if (isNodeOfType(typeNode, "TSArrayType") || isNodeOfType(typeNode, "TSTupleType")) return isNodeOfType(initializationExpression, "ArrayExpression");
 	if (isNodeOfType(typeNode, "TSFunctionType") || isNodeOfType(typeNode, "TSConstructorType")) return isNodeOfType(initializationExpression, "ArrowFunctionExpression") || isNodeOfType(initializationExpression, "FunctionExpression") || isNodeOfType(initializationExpression, "ClassExpression");
 	if (isNodeOfType(typeNode, "TSObjectKeyword")) return true;
-	if (isNodeOfType(typeNode, "TSIndexedAccessType")) return isNodeOfType(initializationExpression, "ObjectExpression");
 	if (!isNodeOfType(typeNode, "TSTypeReference")) return false;
 	const typeName = typeNode.typeName;
-	if (isNodeOfType(initializationExpression, "ObjectExpression") || isMatchingReturnType(typeNode, initializationExpression, scopes)) return true;
-	return isNodeOfType(typeName, "Identifier") && typeName.name === getInitializationValueName(initializationExpression, scopes);
+	return isNodeOfType(typeName, "Identifier") && typeName.name === getInitializationConstructorName(initializationExpression, scopes);
 };
 const refHasClosedFalsySentinelDomain = (refSymbol, initializationValue, scopes) => {
 	const initializer = refSymbol.initializer ? stripParenExpression(refSymbol.initializer) : null;
 	if (!initializer || !isNodeOfType(initializer, "CallExpression")) return false;
 	const [initialValue] = initializer.arguments ?? [];
-	if (initialValue && isNodeOfType(initialValue, "SpreadElement") || initialValue && !isEmptySentinel(initialValue, scopes)) return false;
+	if (!initialValue || isNodeOfType(initialValue, "SpreadElement") || !isEmptySentinel(initialValue, scopes)) return false;
 	const [declaredType] = initializer.typeArguments?.params ?? [];
-	if (!declaredType) return false;
-	const domainTypes = isNodeOfType(declaredType, "TSUnionType") ? declaredType.types : [declaredType];
+	if (!declaredType || !isNodeOfType(declaredType, "TSUnionType")) return false;
+	let hasEmptySentinel = false;
 	let hasTruthyDomain = false;
-	for (const memberType of domainTypes) {
-		if (isNodeOfType(memberType, "TSNullKeyword") || isNodeOfType(memberType, "TSUndefinedKeyword")) continue;
+	for (const memberType of declaredType.types ?? []) {
+		if (isNodeOfType(memberType, "TSNullKeyword") || isNodeOfType(memberType, "TSUndefinedKeyword")) {
+			hasEmptySentinel = true;
+			continue;
+		}
 		if (!isClosedTruthyTypeDomain(memberType, initializationValue, scopes)) return false;
 		hasTruthyDomain = true;
 	}
-	return hasTruthyDomain;
-};
-const refHasEmptySentinelInitializer = (refSymbol, scopes) => {
-	const initializer = refSymbol.initializer ? stripParenExpression(refSymbol.initializer) : null;
-	if (!initializer || !isNodeOfType(initializer, "CallExpression")) return false;
-	const [initialValue] = initializer.arguments ?? [];
-	return Boolean(!initialValue || !isNodeOfType(initialValue, "SpreadElement") && isEmptySentinel(initialValue, scopes));
-};
-const refHasDeclaredType = (refSymbol) => {
-	const initializer = refSymbol.initializer ? stripParenExpression(refSymbol.initializer) : null;
-	return Boolean(initializer && isNodeOfType(initializer, "CallExpression") && (initializer.typeArguments?.params.length ?? 0) > 0);
+	return hasEmptySentinel && hasTruthyDomain;
 };
 const isSafeRefIdentifierUse = (identifier) => {
 	const expressionRoot = findTransparentExpressionRoot(identifier);
@@ -82562,40 +82014,25 @@ const expressionContainsRefCurrent = (expression, refSymbol, scopes) => {
 	});
 	return didFindRefCurrent;
 };
-const isEmptySentinel = (node, scopes) => {
-	const expression = stripParenExpression(node);
-	return isNodeOfType(expression, "Literal") && expression.value === null || isNodeOfType(expression, "Identifier") && expression.name === "undefined" && scopes.isGlobalReference(expression);
-};
-const isInitializationInputIndependent = (node, renderOwner, scopes, visitedSymbolIds = /* @__PURE__ */ new Set()) => {
-	let isInputIndependent = true;
-	walkAst(node, (child) => {
-		if (!isInputIndependent) return false;
-		if (resolveReactRefSymbol(child, scopes)) return false;
-		if (!isNodeOfType(child, "Identifier")) return;
-		const symbol = scopes.symbolFor(child);
-		if (!symbol) return;
-		if (symbol.kind === "import") return false;
-		if (symbol.kind === "let" || symbol.kind === "var" || symbol.kind === "using") {
-			isInputIndependent = false;
-			return false;
+const hasNoCompetingRefCurrentWrite = (branchRoot, assignmentExpression, refSymbol, scopes) => {
+	let writeCount = 0;
+	walkAst(branchRoot, (child) => {
+		if (writeCount > 1) return false;
+		if (isNodeOfType(child, "AssignmentExpression")) {
+			if (expressionContainsRefCurrent(child.left, refSymbol, scopes)) writeCount++;
+			return;
 		}
-		if (isOutsideAllFunctions(symbol)) return false;
-		if (symbol.kind === "parameter") {
-			if (symbol.scope.node === renderOwner) isInputIndependent = false;
-			return false;
+		if (isNodeOfType(child, "UpdateExpression") || isNodeOfType(child, "UnaryExpression") && child.operator === "delete") {
+			if (expressionContainsRefCurrent(child.argument, refSymbol, scopes)) writeCount++;
+			return;
 		}
-		if (!symbol.initializer || symbol.references.some((reference) => reference.flag !== "read")) {
-			isInputIndependent = false;
-			return false;
+		if (isNodeOfType(child, "ForInStatement") || isNodeOfType(child, "ForOfStatement")) {
+			if (expressionContainsRefCurrent(child.left, refSymbol, scopes)) writeCount++;
 		}
-		if (visitedSymbolIds.has(symbol.id)) return false;
-		visitedSymbolIds.add(symbol.id);
-		if (!isInitializationInputIndependent(symbol.initializer, renderOwner, scopes, visitedSymbolIds)) isInputIndependent = false;
-		return false;
 	});
-	return isInputIndependent;
+	return writeCount === 1 && expressionContainsRefCurrent(assignmentExpression.left, refSymbol, scopes);
 };
-const isPredictableInitializationValue = (node, refSymbol, renderOwner, scopes, requiresClosedTruthyDomain) => isInitializationInputIndependent(node, renderOwner, scopes) && !containsNonDeterministicSource(node) && (isProvablyTruthyInitializationValue(node, scopes) && (!requiresClosedTruthyDomain || !refHasDeclaredType(refSymbol)) || refHasClosedFalsySentinelDomain(refSymbol, node, scopes));
+const isEmptySentinel = (node, scopes) => isNodeOfType(node, "Literal") && node.value === null || isNodeOfType(node, "Identifier") && node.name === "undefined" && scopes.isGlobalReference(node);
 const hasRepeatedExecutionAncestor = (node, stop) => {
 	let ancestor = node.parent;
 	while (ancestor && ancestor !== stop) {
@@ -82625,27 +82062,6 @@ const canExecuteTogether = (firstConstraints, secondConstraints) => {
 	}
 	return true;
 };
-const hasNoCoExecutableCompetingWrite = (assignmentExpression, renderOwner, refSymbol, scopes) => {
-	const assignmentConstraints = getBranchConstraints(assignmentExpression, renderOwner);
-	const synchronouslyInvokedFunctions = collectSynchronouslyEffectInvokedFunctions(renderOwner, scopes);
-	let hasCompetingWrite = false;
-	walkAst(renderOwner, (child) => {
-		if (hasCompetingWrite) return false;
-		let writtenExpression = null;
-		if (isNodeOfType(child, "AssignmentExpression")) {
-			if (child === assignmentExpression) return;
-			writtenExpression = child.left;
-		} else if (isNodeOfType(child, "UpdateExpression") || isNodeOfType(child, "UnaryExpression") && child.operator === "delete") writtenExpression = child.argument;
-		else if (isNodeOfType(child, "ForInStatement") || isNodeOfType(child, "ForOfStatement")) writtenExpression = child.left;
-		const deferredExecutionBoundary = findDeferredExecutionBoundary(child);
-		const deferredWriteValue = isNodeOfType(child, "AssignmentExpression") && child.operator === "=" ? resolveImmutableInitializationValue(child.right, scopes) : null;
-		const isDeferredTruthyWrite = deferredExecutionBoundary !== null && deferredExecutionBoundary !== renderOwner && !synchronouslyInvokedFunctions.has(deferredExecutionBoundary) && !executesDuringRender(deferredExecutionBoundary, scopes) && deferredWriteValue !== null && !isNodeOfType(deferredWriteValue, "CallExpression") && isProvablyTruthyInitializationValue(deferredWriteValue, scopes);
-		if (!writtenExpression || isDeferredTruthyWrite || !expressionContainsRefCurrent(writtenExpression, refSymbol, scopes) || !canExecuteTogether(assignmentConstraints, getBranchConstraints(child, renderOwner))) return;
-		hasCompetingWrite = true;
-		return false;
-	});
-	return !hasCompetingWrite;
-};
 const hasNoPriorCoExecutableWrite = (assignmentExpression, branchRoot, refSymbol, scopes) => {
 	const assignmentConstraints = getBranchConstraints(assignmentExpression, branchRoot);
 	const assignmentStart = getRangeStart(assignmentExpression);
@@ -82661,17 +82077,16 @@ const hasNoPriorCoExecutableWrite = (assignmentExpression, branchRoot, refSymbol
 	});
 	return !hasCoExecutableWrite;
 };
-const isPredictableGuardedInitialization = (assignmentExpression, guardedBranch, renderOwner, refSymbol, scopes, requiresClosedTruthyDomain) => refHasEmptySentinelInitializer(refSymbol, scopes) && isPredictableInitializationValue(assignmentExpression.right, refSymbol, renderOwner, scopes, requiresClosedTruthyDomain) && !hasRepeatedExecutionAncestor(assignmentExpression, guardedBranch) && (guardedBranch === renderOwner || !hasRepeatedExecutionAncestor(guardedBranch, renderOwner)) && hasNoPriorCoExecutableWrite(assignmentExpression, renderOwner, refSymbol, scopes) && hasNoCoExecutableCompetingWrite(assignmentExpression, renderOwner, refSymbol, scopes) && refDoesNotEscape(renderOwner, refSymbol, scopes);
 const isDocumentedLazyInitialization = (assignmentExpression, refSymbol, scopes) => {
+	if (assignmentExpression.operator === "??=" || assignmentExpression.operator === "||=") return true;
+	if (assignmentExpression.operator !== "=") return false;
 	const renderOwner = findRenderPhaseComponentOrHook(assignmentExpression, scopes);
 	if (!renderOwner) return false;
-	if (assignmentExpression.operator === "??=" || assignmentExpression.operator === "||=") return isPredictableGuardedInitialization(assignmentExpression, renderOwner, renderOwner, refSymbol, scopes, assignmentExpression.operator === "||=");
-	if (assignmentExpression.operator !== "=") return false;
 	let descendant = assignmentExpression;
 	let ancestor = descendant.parent;
 	while (ancestor) {
 		const test = isNodeOfType(ancestor, "IfStatement") ? stripParenExpression(ancestor.test) : null;
-		if (isNodeOfType(ancestor, "IfStatement") && test && isNodeOfType(test, "UnaryExpression") && test.operator === "!" && isSameRefCurrentAlias(test.argument, refSymbol, scopes) && ancestor.consequent === descendant && isPredictableGuardedInitialization(assignmentExpression, ancestor.consequent, renderOwner, refSymbol, scopes, true)) return true;
+		if (isNodeOfType(ancestor, "IfStatement") && test && isNodeOfType(test, "UnaryExpression") && test.operator === "!" && isSameRefCurrentAlias(test.argument, refSymbol, scopes) && ancestor.consequent === descendant && isProvablyTruthyInitializationValue(assignmentExpression.right, scopes) && refHasClosedFalsySentinelDomain(refSymbol, assignmentExpression.right, scopes) && !hasRepeatedExecutionAncestor(assignmentExpression, ancestor.consequent) && !hasRepeatedExecutionAncestor(ancestor, renderOwner) && hasNoPriorCoExecutableWrite(assignmentExpression, ancestor.consequent, refSymbol, scopes) && hasNoCompetingRefCurrentWrite(renderOwner, assignmentExpression, refSymbol, scopes) && refDoesNotEscape(renderOwner, refSymbol, scopes)) return true;
 		if (isNodeOfType(ancestor, "IfStatement") && isNodeOfType(test, "BinaryExpression") && [
 			"===",
 			"==",
@@ -82681,7 +82096,7 @@ const isDocumentedLazyInitialization = (assignmentExpression, refSymbol, scopes)
 			const { left, right } = test;
 			const comparesEmptySentinel = isSameRefCurrentAlias(left, refSymbol, scopes) && isEmptySentinel(right, scopes) || isSameRefCurrentAlias(right, refSymbol, scopes) && isEmptySentinel(left, scopes);
 			const guardedBranch = test.operator === "===" || test.operator === "==" ? ancestor.consequent : ancestor.alternate;
-			if (comparesEmptySentinel && guardedBranch === descendant && guardedBranch && isPredictableGuardedInitialization(assignmentExpression, guardedBranch, renderOwner, refSymbol, scopes, false)) return true;
+			if (comparesEmptySentinel && guardedBranch === descendant && guardedBranch && !hasRepeatedExecutionAncestor(assignmentExpression, guardedBranch) && hasNoPriorCoExecutableWrite(assignmentExpression, guardedBranch, refSymbol, scopes)) return true;
 		}
 		descendant = ancestor;
 		ancestor = descendant.parent;
@@ -110488,6 +109903,9 @@ const rerenderFunctionalSetstate = defineRule({
 	} })
 });
 //#endregion
+//#region src/plugin/utils/is-trivial-built-in-construction.ts
+const isTrivialBuiltInConstruction = (expression) => isNodeOfType(expression, "NewExpression") && isNodeOfType(expression.callee, "Identifier") && TRIVIAL_CONSTRUCTOR_NAMES.has(expression.callee.name) && (expression.arguments ?? []).length === 0;
+//#endregion
 //#region src/plugin/rules/state-and-effects/rerender-lazy-ref-init.ts
 const rerenderLazyRefInit = defineRule({
 	id: "rerender-lazy-ref-init",
@@ -110506,6 +109924,7 @@ const rerenderLazyRefInit = defineRule({
 		const memberPropertyName = isNodeOfType(callee, "MemberExpression") && (isNodeOfType(callee.property, "Identifier") || isNodeOfType(callee.property, "PrivateIdentifier")) ? callee.property.name : null;
 		const calleeName = isNodeOfType(callee, "Identifier") ? callee.name : memberPropertyName ?? "fn";
 		if (TRIVIAL_INITIALIZER_NAMES.has(calleeName)) return;
+		if (isTrivialBuiltInConstruction(initializer)) return;
 		if (isPlainCall && isReactHookName(calleeName)) return;
 		const callShape = isNewCall ? `new ${calleeName}()` : `${calleeName}()`;
 		context.report({

package/package.json

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