oxlint-plugin-react-doctor 0.7.6-dev.8c9a6c4 → 0.7.6-dev.a8cd24e

package/dist/index.js

@@ -6021,7 +6021,7 @@ const isPureEventBlockerHandler = (attribute) => {
 //#endregion
 //#region src/plugin/utils/resolve-const-identifier-alias.ts
 const resolveConstIdentifierAlias = (identifier, scopes) => {
-	if (!isNodeOfType(identifier, "Identifier")) return null;
+	if (!isNodeOfType(identifier, "Identifier") && !isNodeOfType(identifier, "JSXIdentifier")) return null;
 	const visitedSymbolIds = /* @__PURE__ */ new Set();
 	let symbol = scopes.symbolFor(identifier);
 	while (symbol?.kind === "const") {
@@ -6296,6 +6296,131 @@ const isGlobalMethodCall = (node, objectName, methodName) => {
 	return isNodeOfType(receiver, "Identifier") && receiver.name === objectName && isNodeOfType(callee.property, "Identifier") && callee.property.name === methodName;
 };
 //#endregion
+//#region src/plugin/utils/collect-safely-validated-local-storage-keys.ts
+const isLocalStorageCall = (node, methodName) => {
+	if (!isNodeOfType(node, "CallExpression")) return false;
+	const callee = stripParenExpression(node.callee);
+	if (!isNodeOfType(callee, "MemberExpression")) return false;
+	const receiver = stripParenExpression(callee.object);
+	return isNodeOfType(receiver, "Identifier") && receiver.name === "localStorage" && isNodeOfType(callee.property, "Identifier") && callee.property.name === methodName;
+};
+const catchReturnsFallback = (tryStatement) => {
+	const handler = tryStatement.handler;
+	if (!handler) return false;
+	let hasReturn = false;
+	let hasThrow = false;
+	walkAst(handler.body, (child) => {
+		if (isFunctionLike$1(child)) return false;
+		if (isNodeOfType(child, "ReturnStatement")) hasReturn = true;
+		if (isNodeOfType(child, "ThrowStatement")) hasThrow = true;
+	});
+	return hasReturn && !hasThrow;
+};
+const resolveValidatorFunction = (callee, scopes) => {
+	const unwrappedCallee = stripParenExpression(callee);
+	if (!isNodeOfType(unwrappedCallee, "Identifier")) return null;
+	const symbol = scopes.symbolFor(unwrappedCallee);
+	if (!symbol) return null;
+	const candidate = symbol.kind === "function" ? symbol.declarationNode : symbol.initializer;
+	return isFunctionLike$1(candidate) ? candidate : null;
+};
+const validatorChecksPayloadProperties = (validatorFunction, scopes) => {
+	if (!isFunctionLike$1(validatorFunction)) return false;
+	const firstParameter = validatorFunction.params?.[0];
+	if (!firstParameter || !isNodeOfType(firstParameter, "Identifier")) return false;
+	const parameterSymbol = scopes.symbolFor(firstParameter);
+	if (!parameterSymbol) return false;
+	const payloadSymbolIds = new Set([parameterSymbol.id]);
+	let hasPropertyTypeCheck = false;
+	walkAst(validatorFunction.body, (child) => {
+		if (isFunctionLike$1(child)) return false;
+		if (isNodeOfType(child, "VariableDeclarator") && isNodeOfType(child.id, "Identifier") && child.init) {
+			const initializer = stripParenExpression(child.init);
+			if (isNodeOfType(initializer, "Identifier")) {
+				const initializerSymbol = scopes.symbolFor(initializer);
+				if (initializerSymbol && payloadSymbolIds.has(initializerSymbol.id)) {
+					const aliasSymbol = scopes.symbolFor(child.id);
+					if (aliasSymbol) payloadSymbolIds.add(aliasSymbol.id);
+				}
+			}
+		}
+		if (!isNodeOfType(child, "UnaryExpression") || child.operator !== "typeof") return;
+		const checkedValue = stripParenExpression(child.argument);
+		if (!isNodeOfType(checkedValue, "MemberExpression")) return;
+		const receiver = stripParenExpression(checkedValue.object);
+		if (!isNodeOfType(receiver, "Identifier")) return;
+		const receiverSymbol = scopes.symbolFor(receiver);
+		if (receiverSymbol && payloadSymbolIds.has(receiverSymbol.id)) hasPropertyTypeCheck = true;
+	});
+	return hasPropertyTypeCheck;
+};
+const incrementCount = (counts, keyValue) => {
+	counts.set(keyValue, (counts.get(keyValue) ?? 0) + 1);
+};
+const isReturnedExpression = (expression) => {
+	const parent = expression.parent;
+	return Boolean(parent && isNodeOfType(parent, "ReturnStatement") && parent.argument === expression);
+};
+const collectSafelyValidatedLocalStorageKeys = ({ programNode, scopes, resolveKey }) => {
+	const readCountsByKey = /* @__PURE__ */ new Map();
+	const safeReadCountsByKey = /* @__PURE__ */ new Map();
+	const safeReadSymbolIds = /* @__PURE__ */ new Set();
+	walkAst(programNode, (child) => {
+		if (!isNodeOfType(child, "CallExpression") || !isLocalStorageCall(child, "getItem")) return;
+		const keyArgument = child.arguments?.[0];
+		if (!keyArgument) return;
+		const keyValue = resolveKey(keyArgument);
+		if (keyValue !== null) incrementCount(readCountsByKey, keyValue);
+	});
+	walkAst(programNode, (child) => {
+		if (!isNodeOfType(child, "TryStatement") || !catchReturnsFallback(child)) return;
+		const rawValueKeys = /* @__PURE__ */ new Map();
+		const parsedValueSources = /* @__PURE__ */ new Map();
+		walkAst(child.block, (tryChild) => {
+			if (isFunctionLike$1(tryChild)) return false;
+			if (isNodeOfType(tryChild, "VariableDeclarator") && isNodeOfType(tryChild.id, "Identifier") && tryChild.init) {
+				const initializer = stripParenExpression(tryChild.init);
+				if (isNodeOfType(initializer, "CallExpression") && isLocalStorageCall(initializer, "getItem")) {
+					const keyArgument = initializer.arguments?.[0];
+					const bindingSymbol = scopes.symbolFor(tryChild.id);
+					if (keyArgument && bindingSymbol) {
+						const keyValue = resolveKey(keyArgument);
+						if (keyValue !== null) rawValueKeys.set(bindingSymbol.id, keyValue);
+					}
+				}
+				if (isNodeOfType(initializer, "CallExpression") && isGlobalMethodCall(initializer, "JSON", "parse")) {
+					const rawValueArgument = initializer.arguments?.[0];
+					const parsedValueSymbol = scopes.symbolFor(tryChild.id);
+					if (rawValueArgument && isNodeOfType(rawValueArgument, "Identifier") && parsedValueSymbol) {
+						const rawValueSymbol = scopes.symbolFor(rawValueArgument);
+						if (rawValueSymbol && rawValueKeys.has(rawValueSymbol.id)) parsedValueSources.set(parsedValueSymbol.id, rawValueSymbol.id);
+					}
+				}
+			}
+			if (!isNodeOfType(tryChild, "ConditionalExpression") || !isReturnedExpression(tryChild)) return;
+			const test = stripParenExpression(tryChild.test);
+			if (!isNodeOfType(test, "CallExpression")) return;
+			const testedValue = test.arguments?.[0];
+			if (!testedValue || !isNodeOfType(testedValue, "Identifier")) return;
+			const parsedValueSymbol = scopes.symbolFor(testedValue);
+			if (!parsedValueSymbol) return;
+			const rawValueSymbolId = parsedValueSources.get(parsedValueSymbol.id);
+			if (rawValueSymbolId === void 0) return;
+			const returnedValue = stripParenExpression(tryChild.consequent);
+			if (!isNodeOfType(returnedValue, "Identifier") || scopes.symbolFor(returnedValue)?.id !== parsedValueSymbol.id) return;
+			const validatorFunction = resolveValidatorFunction(test.callee, scopes);
+			if (!validatorFunction || !validatorChecksPayloadProperties(validatorFunction, scopes)) return;
+			const keyValue = rawValueKeys.get(rawValueSymbolId);
+			if (keyValue === void 0 || safeReadSymbolIds.has(rawValueSymbolId)) return;
+			safeReadSymbolIds.add(rawValueSymbolId);
+			incrementCount(safeReadCountsByKey, keyValue);
+		});
+	});
+	const safeKeys = /* @__PURE__ */ new Set();
+	for (const [keyValue, readCount] of readCountsByKey) if (safeReadCountsByKey.get(keyValue) === readCount) safeKeys.add(keyValue);
+	return safeKeys;
+};
+//#endregion
 //#region src/plugin/rules/client/client-localstorage-no-version.ts
 const VERSIONED_KEY_PATTERN = /(?:[._:-]v\d+|@\d+|\bv\d+\b)/i;
 const CAMEL_CASE_VERSIONED_KEY_PATTERN = /[a-z]V\d+/;
@@ -6317,26 +6442,39 @@ const clientLocalstorageNoVersion = defineRule({
 	severity: "warn",
 	category: "Correctness",
 	recommendation: "Put a version in the storage key (e.g. \"myKey:v1\"). If you change the data shape later, old saved data can be ignored instead of crashing the app.",
-	create: (context) => ({ CallExpression(node) {
-		if (!isNodeOfType(node.callee, "MemberExpression")) return;
-		const receiver = stripParenExpression(node.callee.object);
-		if (!isNodeOfType(receiver, "Identifier")) return;
-		if (receiver.name !== "localStorage") return;
-		if (!isNodeOfType(node.callee.property, "Identifier")) return;
-		if (node.callee.property.name !== "setItem") return;
-		const keyArg = node.arguments?.[0];
-		if (!keyArg) return;
-		const keyValue = resolveStringKey(keyArg, context);
-		if (keyValue === null) return;
-		if (isVersionedKey(keyValue)) return;
-		const valueArg = node.arguments?.[1];
-		if (!valueArg) return;
-		if (!isJsonStringifyCall(valueArg)) return;
-		context.report({
-			node: keyArg,
-			message: `${receiver.name}.setItem("${keyValue}", JSON.stringify(...)) has no version, so changing the data shape later crashes your users' saved sessions. Add one to the key (e.g. "${keyValue}:v1").`
-		});
-	} })
+	create: (context) => {
+		let safelyValidatedStorageKeys = /* @__PURE__ */ new Set();
+		return {
+			Program(node) {
+				safelyValidatedStorageKeys = collectSafelyValidatedLocalStorageKeys({
+					programNode: node,
+					scopes: context.scopes,
+					resolveKey: (keyNode) => resolveStringKey(keyNode, context)
+				});
+			},
+			CallExpression(node) {
+				if (!isNodeOfType(node.callee, "MemberExpression")) return;
+				const receiver = stripParenExpression(node.callee.object);
+				if (!isNodeOfType(receiver, "Identifier")) return;
+				if (receiver.name !== "localStorage") return;
+				if (!isNodeOfType(node.callee.property, "Identifier")) return;
+				if (node.callee.property.name !== "setItem") return;
+				const keyArg = node.arguments?.[0];
+				if (!keyArg) return;
+				const keyValue = resolveStringKey(keyArg, context);
+				if (keyValue === null) return;
+				if (isVersionedKey(keyValue)) return;
+				if (safelyValidatedStorageKeys.has(keyValue)) return;
+				const valueArg = node.arguments?.[1];
+				if (!valueArg) return;
+				if (!isJsonStringifyCall(valueArg)) return;
+				context.report({
+					node: keyArg,
+					message: `${receiver.name}.setItem("${keyValue}", JSON.stringify(...)) has no version, so changing the data shape later crashes your users' saved sessions. Add one to the key (e.g. "${keyValue}:v1").`
+				});
+			}
+		};
+	}
 });
 //#endregion
 //#region src/plugin/rules/client/client-passive-event-listeners.ts
@@ -15972,14 +16110,21 @@ const jsxFilenameExtension = defineRule({
 });
 //#endregion
 //#region src/plugin/utils/is-jsx-fragment-element.ts
-const isJsxFragmentElement = (node) => {
+const isJsxFragmentElement = (node, scopes) => {
 	if (!isNodeOfType(node, "JSXOpeningElement")) return false;
 	const elementName = node.name;
-	if (isNodeOfType(elementName, "JSXIdentifier")) return elementName.name === "Fragment";
+	if (isNodeOfType(elementName, "JSXIdentifier")) {
+		if (!scopes) return elementName.name === "Fragment";
+		const symbol = resolveConstIdentifierAlias(elementName, scopes);
+		if (!symbol) return elementName.name === "Fragment" && scopes.isGlobalReference(elementName);
+		return isImportedFromReact(symbol) && getImportedName(symbol.declarationNode) === "Fragment";
+	}
 	if (isNodeOfType(elementName, "JSXMemberExpression")) {
 		if (!isNodeOfType(elementName.object, "JSXIdentifier")) return false;
-		if (elementName.object.name !== "React") return false;
-		return elementName.property.name === "Fragment";
+		if (elementName.property.name !== "Fragment") return false;
+		if (!scopes) return elementName.object.name === "React";
+		if (isReactNamespaceImport(elementName.object, scopes)) return true;
+		return elementName.object.name === "React" && scopes.isGlobalReference(elementName.object);
 	}
 	return false;
 };
@@ -16005,7 +16150,7 @@ const jsxFragments = defineRule({
 				if (mode !== "syntax") return;
 				if (!node.closingElement) return;
 				const openingElement = node.openingElement;
-				if (!isJsxFragmentElement(openingElement)) return;
+				if (!isJsxFragmentElement(openingElement, context.scopes)) return;
 				if (openingElement.attributes.length > 0) return;
 				context.report({
 					node: openingElement,
@@ -19146,7 +19291,7 @@ const jsxNoUselessFragment = defineRule({
 		return {
 			JSXElement(node) {
 				const openingElement = node.openingElement;
-				if (!isJsxFragmentElement(openingElement)) return;
+				if (!isJsxFragmentElement(openingElement, context.scopes)) return;
 				if (hasJsxKeyAttribute(openingElement)) return;
 				if (checkChildren(node, openingElement, node.children)) return;
 				if (isChildOfHtmlElement(node)) context.report({
@@ -26060,6 +26205,56 @@ const noBarrelImport = defineRule({
 	}
 });
 //#endregion
+//#region src/plugin/utils/function-returns-matching-expression.ts
+const collectReturnedExpressions = (functionNode) => {
+	if (!isFunctionLike$1(functionNode)) return [];
+	const body = functionNode.body;
+	if (!body) return [];
+	if (!isNodeOfType(body, "BlockStatement")) return [body];
+	const returnedExpressions = [];
+	walkAst(body, (node) => {
+		if (node !== body && (isFunctionLike$1(node) || isNodeOfType(node, "ClassDeclaration") || isNodeOfType(node, "ClassExpression"))) return false;
+		if (isNodeOfType(node, "ReturnStatement") && node.argument) returnedExpressions.push(node.argument);
+	});
+	return returnedExpressions;
+};
+const functionReturnsMatchingExpression = (functionNode, scopes, matchesExpression) => {
+	const visitedExpressions = /* @__PURE__ */ new Set();
+	const visitedFunctions = /* @__PURE__ */ new Set();
+	const functionMatches = (candidateFunction) => {
+		if (visitedFunctions.has(candidateFunction)) return false;
+		visitedFunctions.add(candidateFunction);
+		return collectReturnedExpressions(candidateFunction).some(expressionMatches);
+	};
+	const expressionMatches = (expression) => {
+		const unwrappedExpression = stripParenExpression(expression);
+		if (visitedExpressions.has(unwrappedExpression)) return false;
+		visitedExpressions.add(unwrappedExpression);
+		if (matchesExpression(unwrappedExpression)) return true;
+		if (isNodeOfType(unwrappedExpression, "Identifier")) {
+			const symbol = scopes.symbolFor(unwrappedExpression);
+			if (!symbol || symbol.kind !== "const" || !symbol.initializer) return false;
+			const initializer = stripParenExpression(symbol.initializer);
+			if (isFunctionLike$1(initializer)) return false;
+			return expressionMatches(initializer);
+		}
+		if (isNodeOfType(unwrappedExpression, "CallExpression")) {
+			if (unwrappedExpression.arguments.length !== 0) return false;
+			if (!isNodeOfType(unwrappedExpression.callee, "Identifier")) return false;
+			const symbol = scopes.symbolFor(unwrappedExpression.callee);
+			if (!symbol || symbol.kind !== "const" && symbol.kind !== "function") return false;
+			const initializer = symbol.initializer ? stripParenExpression(symbol.initializer) : null;
+			const candidateFunction = isFunctionLike$1(initializer) ? initializer : isFunctionLike$1(symbol.declarationNode) ? symbol.declarationNode : null;
+			if (!candidateFunction || candidateFunction.async || candidateFunction.generator || candidateFunction.params.length !== 0) return false;
+			return functionMatches(candidateFunction);
+		}
+		if (isNodeOfType(unwrappedExpression, "ConditionalExpression")) return expressionMatches(unwrappedExpression.consequent) || expressionMatches(unwrappedExpression.alternate);
+		if (isNodeOfType(unwrappedExpression, "LogicalExpression")) return expressionMatches(unwrappedExpression.left) || expressionMatches(unwrappedExpression.right);
+		return false;
+	};
+	return functionMatches(functionNode);
+};
+//#endregion
 //#region src/plugin/utils/function-contains-react-render-output.ts
 const NESTED_RENDER_EVIDENCE_BOUNDARY_TYPES = new Set([
 	"FunctionDeclaration",
@@ -26079,12 +26274,13 @@ const isCallArgumentFunctionExpression = (node) => {
 	return parent.arguments.some((argumentNode) => argumentNode === node);
 };
 const isNestedRenderEvidenceBoundary = (node) => NESTED_RENDER_EVIDENCE_BOUNDARY_TYPES.has(node.type) && !isCallArgumentFunctionExpression(node);
+const isRenderOutputExpression = (node, scopes) => node.type === "JSXElement" || node.type === "JSXFragment" || isReactApiCall(node, "createElement", scopes, REACT_CREATE_ELEMENT_OPTIONS);
 const containsRenderOutput$1 = (rootNode, scopes) => {
 	let hasRenderOutput = false;
 	walkAst(rootNode, (node) => {
 		if (hasRenderOutput) return false;
 		if (node !== rootNode && isNestedRenderEvidenceBoundary(node)) return false;
-		if (node.type === "JSXElement" || node.type === "JSXFragment" || isReactApiCall(node, "createElement", scopes, REACT_CREATE_ELEMENT_OPTIONS)) {
+		if (isRenderOutputExpression(node, scopes)) {
 			hasRenderOutput = true;
 			return false;
 		}
@@ -26095,7 +26291,7 @@ const renderOutputCache = /* @__PURE__ */ new WeakMap();
 const functionContainsReactRenderOutput = (functionNode, scopes) => {
 	const cachedEntry = renderOutputCache.get(functionNode);
 	if (cachedEntry && cachedEntry.scopes === scopes) return cachedEntry.hasRenderOutput;
-	const hasRenderOutput = containsRenderOutput$1(functionNode, scopes);
+	const hasRenderOutput = containsRenderOutput$1(functionNode, scopes) || functionReturnsMatchingExpression(functionNode, scopes, (expression) => isRenderOutputExpression(expression, scopes));
 	renderOutputCache.set(functionNode, {
 		scopes,
 		hasRenderOutput
@@ -40123,20 +40319,21 @@ const expressionContainsJsxOrCreateElement = (root) => {
 	});
 	return found;
 };
+const functionContainsJsxOrCreateElement = (functionNode, scopes) => expressionContainsJsxOrCreateElement(functionNode) || functionReturnsMatchingExpression(functionNode, scopes, expressionContainsJsxOrCreateElement);
 const isReactClassComponent = (classNode) => {
 	if (isEs6Component(classNode)) return true;
 	return expressionContainsJsxOrCreateElement(classNode);
 };
-const findEnclosingComponent = (node) => {
+const findEnclosingComponent = (node, scopes) => {
 	let walker = node.parent;
 	while (walker) {
 		if (isFunctionLike$1(walker)) {
 			const componentName = inferFunctionLikeName(walker);
-			if (componentName && isReactComponentName(componentName) && expressionContainsJsxOrCreateElement(walker)) return {
+			if (componentName && isReactComponentName(componentName) && functionContainsJsxOrCreateElement(walker, scopes)) return {
 				component: walker,
 				name: componentName
 			};
-			if (!componentName && expressionContainsJsxOrCreateElement(walker) && walker.parent && isNodeOfType(walker.parent, "ExportDefaultDeclaration")) return {
+			if (!componentName && functionContainsJsxOrCreateElement(walker, scopes) && walker.parent && isNodeOfType(walker.parent, "ExportDefaultDeclaration")) return {
 				component: walker,
 				name: null
 			};
@@ -40375,7 +40572,7 @@ const noUnstableNestedComponents = defineRule({
 				if (renderPropRegex.test(propInfo.propName)) return;
 				if (settings.allowAsProps) return;
 			}
-			const enclosing = findEnclosingComponent(candidateNode);
+			const enclosing = findEnclosingComponent(candidateNode, context.scopes);
 			if (!enclosing) return;
 			const gatedName = propInfo ? null : requiredInstantiationName;
 			queuedReports.push({
@@ -40386,7 +40583,7 @@ const noUnstableNestedComponents = defineRule({
 			});
 		};
 		const checkFunctionLike = (node) => {
-			if (!expressionContainsJsxOrCreateElement(node)) return;
+			if (!functionContainsJsxOrCreateElement(node, context.scopes)) return;
 			const inferredName = inferFunctionLikeName(node);
 			const propInfo = isComponentDeclaredInProp(node);
 			const isObjectCallback = isObjectCallbackCandidate(node);
@@ -45416,14 +45613,10 @@ const rerenderLazyStateInit = defineRule({
 //#endregion
 //#region src/plugin/rules/performance/rerender-memo-before-early-return.ts
 const isJsxExpression = (node) => Boolean(node && isJsxElementOrFragment(stripParenExpression(node)));
-const callbackReturnsJsx = (callback) => {
+const callbackReturnsJsx = (callback, scopes) => {
 	if (!callback) return false;
 	if (!isNodeOfType(callback, "ArrowFunctionExpression") && !isNodeOfType(callback, "FunctionExpression")) return false;
-	const body = callback.body;
-	if (isJsxExpression(body)) return true;
-	if (!isNodeOfType(body, "BlockStatement")) return false;
-	for (const stmt of body.body ?? []) if (isNodeOfType(stmt, "ReturnStatement") && isJsxExpression(stmt.argument)) return true;
-	return false;
+	return functionReturnsMatchingExpression(callback, scopes, isJsxExpression);
 };
 const returnArgumentUsesAnyName = (returnStatement, names) => {
 	if (!isNodeOfType(returnStatement, "ReturnStatement") || !returnStatement.argument) return false;
@@ -45501,7 +45694,7 @@ const rerenderMemoBeforeEarlyReturn = defineRule({
 					if (!isNodeOfType(stmt, "VariableDeclaration")) continue;
 					for (const declarator of stmt.declarations ?? []) {
 						const init = declarator.init;
-						if (isNodeOfType(init, "CallExpression") && isHookCall$2(init, "useMemo") && callbackReturnsJsx(init.arguments?.[0])) {
+						if (isNodeOfType(init, "CallExpression") && isHookCall$2(init, "useMemo") && callbackReturnsJsx(init.arguments?.[0], context.scopes)) {
 							memoNode = declarator;
 							callbackGuardTests = collectLeadingCallbackGuardTests(init.arguments?.[0]);
 							if (isNodeOfType(declarator.id, "Identifier")) memoConsumerNames.add(declarator.id.name);

package/package.json

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