eslint-plugin-react-x 4.0.2-beta.5 → 4.0.3-beta.0

package/dist/index.js

@@ -2,11 +2,11 @@ import { DEFAULT_ESLINT_REACT_SETTINGS, IMPURE_CTORS, IMPURE_FUNCS, WEBSITE_URL,
 import * as ast from "@eslint-react/ast";
 import * as core from "@eslint-react/core";
 import { isUseRefCall } from "@eslint-react/core";
+import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import { ESLintUtils } from "@typescript-eslint/utils";
 import { P, isMatching, match } from "ts-pattern";
 import ts from "typescript";
 import { JsxDetectionHint, findParentAttribute, getElementFullType, hasAttribute, isJsxLike } from "@eslint-react/jsx";
-import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import { computeObjectType, findEnclosingAssignmentTarget, isAssignmentTargetEqual, resolve } from "@eslint-react/var";
 import { DefinitionType } from "@typescript-eslint/scope-manager";
 import { findVariable, getStaticValue, isIdentifier, isVariableDeclarator } from "@typescript-eslint/utils/ast-utils";
@@ -147,7 +147,7 @@ const rules$7 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "4.0.2-beta.5";
+var version = "4.0.3-beta.0";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -319,6 +319,51 @@ var component_hook_factories_default = createRule({
 	create: create$56,
 	defaultOptions: []
 });
+/**
+* Check if a function parameter name looks like a React component (PascalCase).
+*/
+function isComponentLikeParamName(name) {
+	return /^[A-Z]/.test(name);
+}
+/**
+* Check if a function parameter has a type annotation that looks like a React component type.
+* Matches types like ComponentType, React.ComponentType, FC, React.FC, etc.
+*/
+function hasComponentTypeAnnotation(param) {
+	if (param.type !== AST_NODE_TYPES.Identifier || param.typeAnnotation == null) return false;
+	const annotation = param.typeAnnotation.typeAnnotation;
+	if (annotation.type === AST_NODE_TYPES.TSTypeReference) return isComponentTypeName(annotation.typeName);
+	return false;
+}
+/**
+* Check if a type name refers to a known React component type.
+*/
+function isComponentTypeName(typeName) {
+	if (typeName.type === AST_NODE_TYPES.Identifier) return /^(ComponentType|FC|ComponentClass|FunctionComponent|Component)$/.test(typeName.name);
+	if (typeName.type === AST_NODE_TYPES.TSQualifiedName) {
+		if (typeName.left.type === AST_NODE_TYPES.Identifier && typeName.left.name === "React") return isComponentTypeName(typeName.right);
+	}
+	return false;
+}
+/**
+* Heuristically check if a function is a Higher Order Component (HOC) based on its parameters.
+* Considers a function an HOC if it takes a parameter that looks like a React component
+* (by name or type annotation). This does not validate that the function actually returns
+* a React component.
+*/
+function isHigherOrderComponent(fn) {
+	return fn.params.some((param) => {
+		if (param.type === AST_NODE_TYPES.Identifier && isComponentLikeParamName(param.name)) return true;
+		if (hasComponentTypeAnnotation(param)) return true;
+		return false;
+	});
+}
+/**
+* Check if a node is inside a test mock callback (vi.mock or jest.mock).
+*/
+function isInsideTestMockCallback(node) {
+	return ast.findParent(node, ast.isTestMockCallback) != null;
+}
 function create$56(context) {
 	const hint = core.ComponentDetectionHint.DoNotIncludeJsxWithNumberValue | core.ComponentDetectionHint.DoNotIncludeJsxWithBooleanValue | core.ComponentDetectionHint.DoNotIncludeJsxWithNullValue | core.ComponentDetectionHint.DoNotIncludeJsxWithStringValue | core.ComponentDetectionHint.DoNotIncludeJsxWithUndefinedValue | core.ComponentDetectionHint.RequireBothSidesOfLogicalExpressionToBeJsx | core.ComponentDetectionHint.RequireBothBranchesOfConditionalExpressionToBeJsx | core.ComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayPatternElement | core.ComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayExpressionElement | core.ComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayMapCallback;
 	const fCollector = core.getComponentCollector(context, { hint });
@@ -331,7 +376,10 @@ function create$56(context) {
 		const hooks = [...hCollector.api.getAllHooks(program)];
 		for (const { name, node } of fComponents) {
 			if (name == null) continue;
-			if (ast.findParent(node, ast.isFunction) == null) continue;
+			const parentFn = ast.findParent(node, ast.isFunction);
+			if (parentFn == null) continue;
+			if (isInsideTestMockCallback(node)) continue;
+			if (isHigherOrderComponent(parentFn)) continue;
 			if (reported.has(node)) continue;
 			context.report({
 				data: { name },
@@ -341,7 +389,10 @@ function create$56(context) {
 			reported.add(node);
 		}
 		for (const { name = "unknown", node } of cComponents) {
-			if (ast.findParent(node, ast.isFunction) == null) continue;
+			const parentFn = ast.findParent(node, ast.isFunction);
+			if (parentFn == null) continue;
+			if (isInsideTestMockCallback(node)) continue;
+			if (isHigherOrderComponent(parentFn)) continue;
 			context.report({
 				data: { name },
 				messageId: "component",
@@ -350,6 +401,7 @@ function create$56(context) {
 		}
 		for (const { name, node } of hooks) {
 			if (ast.findParent(node, ast.isFunction) == null) continue;
+			if (isInsideTestMockCallback(node)) continue;
 			if (reported.has(node)) continue;
 			context.report({
 				data: { name },
@@ -2952,8 +3004,8 @@ const RULE_NAME$27 = "no-nested-lazy-component-declarations";
 var no_nested_lazy_component_declarations_default = createRule({
 	meta: {
 		type: "problem",
-		docs: { description: "Disallows nesting lazy component declarations inside other components." },
-		messages: { default: "Do not declare lazy components inside other components. Instead, always declare them at the top level of your module." },
+		docs: { description: "Disallows nesting lazy component declarations inside other components or hooks." },
+		messages: { default: "Do not declare lazy components inside other components or hooks. Instead, always declare them at the top level of your module." },
 		schema: []
 	},
 	name: RULE_NAME$27,
@@ -2961,25 +3013,22 @@ var no_nested_lazy_component_declarations_default = createRule({
 	defaultOptions: []
 });
 function create$27(context) {
-	const hint = core.ComponentDetectionHint.None;
-	const collector = core.getComponentCollector(context, { hint });
-	const collectorLegacy = core.getComponentCollectorLegacy(context);
-	const lazyComponentDeclarations = /* @__PURE__ */ new Set();
-	return defineRuleListener(collector.visitor, collectorLegacy.visitor, {
+	const fCollector = core.getComponentCollector(context);
+	const cCollector = core.getComponentCollectorLegacy(context);
+	const hCollector = core.getHookCollector(context);
+	const lazyCalls = /* @__PURE__ */ new Set();
+	return defineRuleListener(fCollector.visitor, cCollector.visitor, hCollector.visitor, {
 		ImportExpression(node) {
 			const lazyCall = ast.findParent(node, (n) => core.isLazyCall(context, n));
-			if (lazyCall != null) lazyComponentDeclarations.add(lazyCall);
+			if (lazyCall != null) lazyCalls.add(lazyCall);
 		},
 		"Program:exit"(program) {
-			const functionComponents = collector.api.getAllComponents(program);
-			const classComponents = collectorLegacy.api.getAllComponents(program);
-			for (const lazy of lazyComponentDeclarations) if (ast.findParent(lazy, (n) => {
-				if (ast.isJSX(n)) return true;
-				if (n.type === AST_NODE_TYPES.CallExpression) return core.isHookCall(n) || core.isCreateElementCall(context, n) || core.isCreateContextCall(context, n);
-				if (ast.isFunction(n)) return functionComponents.some((c) => c.node === n);
-				if (ast.isClass(n)) return classComponents.some((c) => c.node === n);
-				return false;
-			}) != null) context.report({
+			const significantParents = [
+				...fCollector.api.getAllComponents(program),
+				...hCollector.api.getAllHooks(program),
+				...cCollector.api.getAllComponents(program)
+			];
+			for (const lazy of lazyCalls) if (ast.findParent(lazy, (n) => significantParents.some((p) => p.node === n))) context.report({
 				messageId: "default",
 				node: lazy
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "4.0.2-beta.5",
+  "version": "4.0.3-beta.0",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -45,11 +45,11 @@
     "string-ts": "^2.3.1",
     "ts-api-utils": "^2.5.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "4.0.2-beta.5",
-    "@eslint-react/jsx": "4.0.2-beta.5",
-    "@eslint-react/core": "4.0.2-beta.5",
-    "@eslint-react/var": "4.0.2-beta.5",
-    "@eslint-react/shared": "4.0.2-beta.5"
+    "@eslint-react/ast": "4.0.3-beta.0",
+    "@eslint-react/core": "4.0.3-beta.0",
+    "@eslint-react/shared": "4.0.3-beta.0",
+    "@eslint-react/jsx": "4.0.3-beta.0",
+    "@eslint-react/var": "4.0.3-beta.0"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",