eslint-plugin-react-x 2.6.4 → 2.6.5-beta.1

package/dist/index.js

@@ -68,7 +68,7 @@ const rules$7 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "2.6.4";
+var version = "2.6.5-beta.1";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -937,7 +937,7 @@ var no_class_component_default = createRule({
 });
 function create$45(context) {
 	if (!context.sourceCode.text.includes("Component")) return {};
-	const { ctx, listeners } = useComponentCollectorLegacy();
+	const { ctx, listeners } = useComponentCollectorLegacy(context);
 	return {
 		...listeners,
 		"Program:exit"(program) {
@@ -993,7 +993,7 @@ var no_component_will_mount_default = createRule({
 });
 function create$43(context) {
 	if (!context.sourceCode.text.includes("componentWillMount")) return {};
-	const { ctx, listeners } = useComponentCollectorLegacy();
+	const { ctx, listeners } = useComponentCollectorLegacy(context);
 	return {
 		...listeners,
 		"Program:exit"(program) {
@@ -1029,7 +1029,7 @@ var no_component_will_receive_props_default = createRule({
 });
 function create$42(context) {
 	if (!context.sourceCode.text.includes("componentWillReceiveProps")) return {};
-	const { ctx, listeners } = useComponentCollectorLegacy();
+	const { ctx, listeners } = useComponentCollectorLegacy(context);
 	return {
 		...listeners,
 		"Program:exit"(program) {
@@ -1065,7 +1065,7 @@ var no_component_will_update_default = createRule({
 });
 function create$41(context) {
 	if (!context.sourceCode.text.includes("componentWillUpdate")) return {};
-	const { ctx, listeners } = useComponentCollectorLegacy();
+	const { ctx, listeners } = useComponentCollectorLegacy(context);
 	return {
 		...listeners,
 		"Program:exit"(program) {
@@ -1733,8 +1733,8 @@ var no_nested_component_definitions_default = createRule({
 	defaultOptions: []
 });
 function create$28(context) {
-	const fCollector = useComponentCollector(context, { hint: ComponentDetectionHint.SkipArrayMapArgument | ComponentDetectionHint.SkipNullLiteral | ComponentDetectionHint.SkipUndefined | ComponentDetectionHint.SkipBooleanLiteral | ComponentDetectionHint.SkipStringLiteral | ComponentDetectionHint.SkipNumberLiteral | ComponentDetectionHint.StrictLogical | ComponentDetectionHint.StrictConditional });
-	const cCollector = useComponentCollectorLegacy();
+	const fCollector = useComponentCollector(context, { hint: ComponentDetectionHint.SkipArrayMapCallback | ComponentDetectionHint.SkipNullLiteral | ComponentDetectionHint.SkipUndefined | ComponentDetectionHint.SkipBooleanLiteral | ComponentDetectionHint.SkipStringLiteral | ComponentDetectionHint.SkipNumberLiteral | ComponentDetectionHint.StrictLogical | ComponentDetectionHint.StrictConditional });
+	const cCollector = useComponentCollectorLegacy(context);
 	return {
 		...fCollector.listeners,
 		...cCollector.listeners,
@@ -1855,7 +1855,7 @@ var no_nested_lazy_component_declarations_default = createRule({
 function create$27(context) {
 	const hint = ComponentDetectionHint.None;
 	const collector = useComponentCollector(context, { hint });
-	const collectorLegacy = useComponentCollectorLegacy();
+	const collectorLegacy = useComponentCollectorLegacy(context);
 	const lazyComponentDeclarations = /* @__PURE__ */ new Set();
 	return {
 		...collector.listeners,
@@ -1940,7 +1940,7 @@ var no_redundant_should_component_update_default = createRule({
 });
 function create$25(context) {
 	if (!context.sourceCode.text.includes("shouldComponentUpdate")) return {};
-	const { ctx, listeners } = useComponentCollectorLegacy();
+	const { ctx, listeners } = useComponentCollectorLegacy(context);
 	return {
 		...listeners,
 		"Program:exit"(program) {
@@ -2125,33 +2125,45 @@ function create$20(context) {
 		...getJsxConfigFromContext(context),
 		...getJsxConfigFromAnnotation(context)
 	};
-	return { JSXAttribute(node) {
-		if (node.name.name !== "key") return;
-		const jsxElement = node.parent.parent;
-		if (isJsxFragmentElement(context, jsxElement, jsxConfig)) return;
-		if (jsxElement.openingElement.attributes.some((attr) => attr.type === AST_NODE_TYPES.JSXSpreadAttribute)) return;
-		if (AST.findParentNode(jsxElement, (n) => isRenderFunctionLoose(context, n)) != null) return;
-		const mapCallback = AST.findParentNode(jsxElement, isArrayMethodCallback);
-		if (mapCallback == null || AST.findParentNode(jsxElement, AST.isFunction) !== mapCallback) {
-			if (!(AST.findParentNode(jsxElement, (n) => AST.isConditional(n) || AST.isControlFlow(n) || findEnclosingAssignmentTarget(n) != null) != null)) context.report({
+	const { ctx, listeners } = useComponentCollector(context);
+	const constantKeys = /* @__PURE__ */ new Set();
+	return {
+		...listeners,
+		JSXAttribute(node) {
+			if (node.name.name !== "key") return;
+			const jsxElement = node.parent.parent;
+			if (isJsxFragmentElement(context, jsxElement, jsxConfig)) return;
+			if (jsxElement.openingElement.attributes.some((attr) => attr.type === AST_NODE_TYPES.JSXSpreadAttribute)) return;
+			if (AST.findParentNode(jsxElement, (n) => isRenderFunctionLoose(context, n)) != null) return;
+			const mapCallback = AST.findParentNode(jsxElement, isArrayMethodCallback);
+			if (mapCallback == null || AST.findParentNode(jsxElement, AST.isFunction) !== mapCallback) {
+				constantKeys.add(node);
+				return;
+			}
+			if (context.sourceCode.getScope(mapCallback) !== context.sourceCode.getScope(jsxElement)) return;
+			const keyedElementOrElse = AST.findParentNode(jsxElement, (n) => {
+				if (n === mapCallback) return true;
+				return AST.isJSXElement(n) && getJsxAttribute(context, n)("key") != null;
+			});
+			if (keyedElementOrElse == null || keyedElementOrElse === mapCallback) return;
+			context.report({
 				messageId: "noUnnecessaryKey",
 				node,
-				data: { reason: "The `key` prop is not needed outside of dynamic rendering contexts." }
+				data: { reason: "A parent element already has a `key` prop in the same list rendering context." }
 			});
-			return;
+		},
+		"Program:exit"(node) {
+			const components = ctx.getAllComponents(node);
+			for (const key of constantKeys) {
+				if (AST.findParentNode(key, (n) => AST.isConditional(n) || AST.isControlFlow(n) || findEnclosingAssignmentTarget(n) != null || components.some((comp) => comp.node === n && comp.rets.length > 1)) != null) return;
+				context.report({
+					messageId: "noUnnecessaryKey",
+					node,
+					data: { reason: "The `key` prop is not needed outside of dynamic rendering contexts." }
+				});
+			}
 		}
-		if (context.sourceCode.getScope(mapCallback) !== context.sourceCode.getScope(jsxElement)) return;
-		const keyedElementOrElse = AST.findParentNode(jsxElement, (n) => {
-			if (n === mapCallback) return true;
-			return AST.isJSXElement(n) && getJsxAttribute(context, n)("key") != null;
-		});
-		if (keyedElementOrElse == null || keyedElementOrElse === mapCallback) return;
-		context.report({
-			messageId: "noUnnecessaryKey",
-			node,
-			data: { reason: "A parent element already has a `key` prop in the same list rendering context." }
-		});
-	} };
+	};
 }
 function isArrayMethodCallback(node) {
 	const parent = node.parent;
@@ -2179,16 +2191,19 @@ var no_unnecessary_use_callback_default = createRule({
 });
 function create$19(context) {
 	if (!context.sourceCode.text.includes("useCallback")) return {};
-	return { CallExpression(node) {
-		if (!isUseCallbackCall(node)) return;
-		const checkForUsageInsideUseEffectReport = checkForUsageInsideUseEffect$1(context.sourceCode, node);
-		const initialScope = context.sourceCode.getScope(node);
-		const component = context.sourceCode.getScope(node).block;
+	return { VariableDeclarator(node) {
+		const { id, init } = node;
+		if (id.type !== AST_NODE_TYPES.Identifier || init?.type !== AST_NODE_TYPES.CallExpression || !isUseCallbackCall(init)) return;
+		const [cbk, ...rest] = context.sourceCode.getDeclaredVariables(node);
+		if (cbk == null || rest.length > 0) return;
+		const checkForUsageInsideUseEffectReport = checkForUsageInsideUseEffect$1(context.sourceCode, init);
+		const scope = context.sourceCode.getScope(init);
+		const component = context.sourceCode.getScope(init).block;
 		if (!AST.isFunction(component)) return;
-		const [arg0, arg1] = node.arguments;
+		const [arg0, arg1] = init.arguments;
 		if (arg0 == null || arg1 == null) return;
 		if (!match(arg1).with({ type: AST_NODE_TYPES.ArrayExpression }, (n) => n.elements.length === 0).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			const variableNode = getVariableDefinitionNode(findVariable(n.name, initialScope), 0);
+			const variableNode = getVariableDefinitionNode(findVariable(n.name, scope), 0);
 			if (variableNode?.type !== AST_NODE_TYPES.ArrayExpression) return false;
 			return variableNode.elements.length === 0;
 		}).otherwise(() => false)) {
@@ -2199,7 +2214,7 @@ function create$19(context) {
 			if (n.body.type === AST_NODE_TYPES.ArrowFunctionExpression) return n.body;
 			return n;
 		}).with({ type: AST_NODE_TYPES.FunctionExpression }, identity).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			const variableNode = getVariableDefinitionNode(findVariable(n.name, initialScope), 0);
+			const variableNode = getVariableDefinitionNode(findVariable(n.name, scope), 0);
 			if (variableNode?.type !== AST_NODE_TYPES.ArrowFunctionExpression && variableNode?.type !== AST_NODE_TYPES.FunctionExpression) return null;
 			return variableNode;
 		}).otherwise(() => null);
@@ -2218,7 +2233,8 @@ function checkForUsageInsideUseEffect$1(sourceCode, node) {
 	if (!/use\w*Effect/u.test(sourceCode.text)) return;
 	if (!isVariableDeclarator(node.parent)) return;
 	if (!isIdentifier(node.parent.id)) return;
-	const usages = (sourceCode.getDeclaredVariables(node.parent)[0]?.references ?? []).filter((ref) => !(ref.init ?? false));
+	const usages = (sourceCode.getDeclaredVariables(node.parent)[0]?.references ?? []).filter((ref) => ref.init !== true);
+	if (usages.length === 0) return;
 	const effectSet = /* @__PURE__ */ new Set();
 	for (const usage of usages) {
 		const effect = AST.findParentNode(usage.identifier, isUseEffectLikeCall);
@@ -2252,20 +2268,23 @@ var no_unnecessary_use_memo_default = createRule({
 });
 function create$18(context) {
 	if (!context.sourceCode.text.includes("useMemo")) return {};
-	return { CallExpression(node) {
-		const initialScope = context.sourceCode.getScope(node);
-		if (!isUseMemoCall(node)) return;
-		const checkForUsageInsideUseEffectReport = checkForUsageInsideUseEffect(context.sourceCode, node);
-		const component = context.sourceCode.getScope(node).block;
+	return { VariableDeclarator(node) {
+		const { id, init } = node;
+		if (id.type !== AST_NODE_TYPES.Identifier || init?.type !== AST_NODE_TYPES.CallExpression || !isUseMemoCall(init)) return;
+		const [mem, ...rest] = context.sourceCode.getDeclaredVariables(node);
+		if (mem == null || rest.length > 0) return;
+		const checkForUsageInsideUseEffectReport = checkForUsageInsideUseEffect(context.sourceCode, init);
+		const scope = context.sourceCode.getScope(init);
+		const component = scope.block;
 		if (!AST.isFunction(component)) return;
-		const [arg0, arg1] = node.arguments;
+		const [arg0, arg1] = init.arguments;
 		if (arg0 == null || arg1 == null) return;
 		if (AST.isFunction(arg0) && [...AST.getNestedCallExpressions(arg0.body), ...AST.getNestedNewExpressions(arg0.body)].length > 0) {
 			report(context)(checkForUsageInsideUseEffectReport);
 			return;
 		}
 		if (!match(arg1).with({ type: AST_NODE_TYPES.ArrayExpression }, (n) => n.elements.length === 0).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			const variableNode = getVariableDefinitionNode(findVariable(n.name, initialScope), 0);
+			const variableNode = getVariableDefinitionNode(findVariable(n.name, scope), 0);
 			if (variableNode?.type !== AST_NODE_TYPES.ArrayExpression) return false;
 			return variableNode.elements.length === 0;
 		}).otherwise(() => false)) {
@@ -2276,7 +2295,7 @@ function create$18(context) {
 			if (n.body.type === AST_NODE_TYPES.ArrowFunctionExpression) return n.body;
 			return n;
 		}).with({ type: AST_NODE_TYPES.FunctionExpression }, identity).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			const variableNode = getVariableDefinitionNode(findVariable(n.name, initialScope), 0);
+			const variableNode = getVariableDefinitionNode(findVariable(n.name, scope), 0);
 			if (variableNode?.type !== AST_NODE_TYPES.ArrowFunctionExpression && variableNode?.type !== AST_NODE_TYPES.FunctionExpression) return null;
 			return variableNode;
 		}).otherwise(() => null);
@@ -2295,7 +2314,8 @@ function checkForUsageInsideUseEffect(sourceCode, node) {
 	if (!/use\w*Effect/u.test(sourceCode.text)) return;
 	if (!isVariableDeclarator(node.parent)) return;
 	if (!isIdentifier(node.parent.id)) return;
-	const usages = (sourceCode.getDeclaredVariables(node.parent)[0]?.references ?? []).filter((ref) => !(ref.init ?? false));
+	const usages = (sourceCode.getDeclaredVariables(node.parent)[0]?.references ?? []).filter((ref) => ref.init !== true);
+	if (usages.length === 0) return;
 	const effectSet = /* @__PURE__ */ new Set();
 	for (const usage of usages) {
 		const effect = AST.findParentNode(usage.identifier, isUseEffectLikeCall);
@@ -2329,7 +2349,7 @@ var no_unnecessary_use_prefix_default = createRule({
 	defaultOptions: []
 });
 function create$17(context) {
-	const { ctx, listeners } = useHookCollector();
+	const { ctx, listeners } = useHookCollector(context);
 	return {
 		...listeners,
 		"Program:exit"(program) {
@@ -2402,7 +2422,7 @@ var no_unsafe_component_will_mount_default = createRule({
 });
 function create$15(context) {
 	if (!context.sourceCode.text.includes("UNSAFE_componentWillMount")) return {};
-	const { ctx, listeners } = useComponentCollectorLegacy();
+	const { ctx, listeners } = useComponentCollectorLegacy(context);
 	return {
 		...listeners,
 		"Program:exit"(program) {
@@ -2433,7 +2453,7 @@ var no_unsafe_component_will_receive_props_default = createRule({
 });
 function create$14(context) {
 	if (!context.sourceCode.text.includes("UNSAFE_componentWillReceiveProps")) return {};
-	const { ctx, listeners } = useComponentCollectorLegacy();
+	const { ctx, listeners } = useComponentCollectorLegacy(context);
 	return {
 		...listeners,
 		"Program:exit"(program) {
@@ -2464,7 +2484,7 @@ var no_unsafe_component_will_update_default = createRule({
 });
 function create$13(context) {
 	if (!context.sourceCode.text.includes("UNSAFE_componentWillUpdate")) return {};
-	const { ctx, listeners } = useComponentCollectorLegacy();
+	const { ctx, listeners } = useComponentCollectorLegacy(context);
 	return {
 		...listeners,
 		"Program:exit"(program) {
@@ -2663,7 +2683,7 @@ function create$10(context) {
 	function classExit() {
 		const currentClass = classStack.pop();
 		if (currentClass == null || !isClassComponent(currentClass)) return;
-		const className = AST.getClassId(currentClass)?.name;
+		const id = AST.getClassId(currentClass);
 		const defs = propertyDefs.get(currentClass);
 		const usages = propertyUsages.get(currentClass);
 		if (defs == null) return;
@@ -2675,7 +2695,7 @@ function create$10(context) {
 				messageId: "noUnusedClassComponentMembers",
 				node: def,
 				data: {
-					className: className ?? "Component",
+					className: id != null ? context.sourceCode.getText(id) : "Component",
 					methodName
 				}
 			});
@@ -2872,13 +2892,13 @@ function create$8(context) {
 	function classExit() {
 		const currentClass = classStack.pop();
 		if (currentClass == null || !isClassComponent(currentClass)) return;
-		const className = AST.getClassId(currentClass)?.name;
+		const id = AST.getClassId(currentClass);
 		const { node: defNode, isUsed = false } = stateDefs.get(currentClass) ?? {};
 		if (defNode == null || isUsed) return;
 		context.report({
 			messageId: "noUnusedState",
 			node: defNode,
-			data: { className: className ?? "Component" }
+			data: { className: id != null ? context.sourceCode.getText(id) : "Component" }
 		});
 	}
 	function methodEnter(node) {
@@ -3242,11 +3262,13 @@ function create$4(context) {
 			}
 		},
 		"Program:exit"(program) {
-			const componentBlocks = new Set(ctx.getAllComponents(program).map((component) => component.node));
+			const components = ctx.getAllComponents(program);
 			function isFunctionComponent(block) {
-				if (!AST.isFunction(block)) return false;
-				const id = AST.getFunctionId(block);
-				return id != null && isComponentNameLoose(id.name) && componentBlocks.has(block);
+				return components.some((comp) => {
+					if (comp.node !== block) return false;
+					if (comp.name == null && AST.findParentNode(comp.node, (n) => n.type === AST_NODE_TYPES.ExportDefaultDeclaration) != null) return false;
+					return true;
+				});
 			}
 			for (const [initialScope, expr] of exprs) {
 				let scope = initialScope;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "2.6.4",
+  "version": "2.6.5-beta.1",
   "description": "A set of composable ESLint rules for for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -46,11 +46,11 @@
     "string-ts": "^2.3.1",
     "ts-api-utils": "^2.4.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "2.6.4",
-    "@eslint-react/eff": "2.6.4",
-    "@eslint-react/core": "2.6.4",
-    "@eslint-react/shared": "2.6.4",
-    "@eslint-react/var": "2.6.4"
+    "@eslint-react/ast": "2.6.5-beta.1",
+    "@eslint-react/core": "2.6.5-beta.1",
+    "@eslint-react/eff": "2.6.5-beta.1",
+    "@eslint-react/shared": "2.6.5-beta.1",
+    "@eslint-react/var": "2.6.5-beta.1"
   },
   "devDependencies": {
     "@types/react": "^19.2.8",