@eslint-react/core 3.0.0-next.80 → 3.0.0-next.82

package/dist/index.d.ts

@@ -92,6 +92,7 @@ type ComponentDetectionHint = bigint;
  * Hints for component collector
  */
 declare const ComponentDetectionHint: {
+  readonly DoNotIncludeFunctionDefinedAsArbitraryCallExpressionCallback: bigint;
   readonly DoNotIncludeFunctionDefinedAsArrayFlatMapCallback: bigint;
   readonly DoNotIncludeFunctionDefinedAsArrayMapCallback: bigint;
   readonly DoNotIncludeFunctionDefinedInArrayExpression: bigint;

package/dist/index.js

@@ -396,11 +396,11 @@ function isUseEffectLikeCall(node, additionalEffectHooks = { test: constFalse })
 function isUseStateLikeCall(node, additionalStateHooks = { test: constFalse }) {
 	if (node == null) return false;
 	if (node.type !== AST_NODE_TYPES.CallExpression) return false;
-	return [/^use\w*State$/u, additionalStateHooks].some((regexp) => {
-		if (node.callee.type === AST_NODE_TYPES.Identifier) return regexp.test(node.callee.name);
-		if (node.callee.type === AST_NODE_TYPES.MemberExpression) return node.callee.property.type === AST_NODE_TYPES.Identifier && regexp.test(node.callee.property.name);
-		return false;
-	});
+	switch (true) {
+		case node.callee.type === AST_NODE_TYPES.Identifier: return node.callee.name === "useState" || additionalStateHooks.test(node.callee.name);
+		case node.callee.type === AST_NODE_TYPES.MemberExpression && node.callee.property.type === AST_NODE_TYPES.Identifier: return ast.getPropertyName(node.callee.property) === "useState" || additionalStateHooks.test(node.callee.property.name);
+	}
+	return false;
 }
 const isUseCall = flip(isHookCallWithName)("use");
 const isUseActionStateCall = flip(isHookCallWithName)("useActionState");
@@ -1181,6 +1181,7 @@ function isFunctionWithLooseComponentName(context, fn, allowNone = false) {
 */
 const ComponentDetectionHint = {
 	...JsxDetectionHint,
+	DoNotIncludeFunctionDefinedAsArbitraryCallExpressionCallback: 1n << 18n,
 	DoNotIncludeFunctionDefinedAsArrayFlatMapCallback: 1n << 17n,
 	DoNotIncludeFunctionDefinedAsArrayMapCallback: 1n << 16n,
 	DoNotIncludeFunctionDefinedInArrayExpression: 1n << 15n,
@@ -1192,7 +1193,7 @@ const ComponentDetectionHint = {
 /**
 * Default component detection hint
 */
-const DEFAULT_COMPONENT_DETECTION_HINT = 0n | ComponentDetectionHint.DoNotIncludeJsxWithBigIntValue | ComponentDetectionHint.DoNotIncludeJsxWithBooleanValue | ComponentDetectionHint.DoNotIncludeJsxWithNumberValue | ComponentDetectionHint.DoNotIncludeJsxWithStringValue | ComponentDetectionHint.DoNotIncludeJsxWithUndefinedValue | ComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayFlatMapCallback | ComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayMapCallback | ComponentDetectionHint.DoNotIncludeFunctionDefinedInArrayExpression | ComponentDetectionHint.DoNotIncludeFunctionDefinedInArrayPattern | ComponentDetectionHint.RequireAllArrayElementsToBeJsx | ComponentDetectionHint.RequireBothBranchesOfConditionalExpressionToBeJsx | ComponentDetectionHint.RequireBothSidesOfLogicalExpressionToBeJsx;
+const DEFAULT_COMPONENT_DETECTION_HINT = 0n | ComponentDetectionHint.DoNotIncludeJsxWithBigIntValue | ComponentDetectionHint.DoNotIncludeJsxWithBooleanValue | ComponentDetectionHint.DoNotIncludeJsxWithNumberValue | ComponentDetectionHint.DoNotIncludeJsxWithStringValue | ComponentDetectionHint.DoNotIncludeJsxWithUndefinedValue | ComponentDetectionHint.DoNotIncludeFunctionDefinedAsArbitraryCallExpressionCallback | ComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayFlatMapCallback | ComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayMapCallback | ComponentDetectionHint.DoNotIncludeFunctionDefinedInArrayExpression | ComponentDetectionHint.DoNotIncludeFunctionDefinedInArrayPattern | ComponentDetectionHint.RequireAllArrayElementsToBeJsx | ComponentDetectionHint.RequireBothBranchesOfConditionalExpressionToBeJsx | ComponentDetectionHint.RequireBothSidesOfLogicalExpressionToBeJsx;
 /**
 * Determine if a function node represents a valid React component definition
 *
@@ -1229,6 +1230,9 @@ function isComponentDefinition(context, node, hint) {
 		case node.parent.type === AST_NODE_TYPES.CallExpression && node.parent.callee.type === AST_NODE_TYPES.MemberExpression && node.parent.callee.property.type === AST_NODE_TYPES.Identifier && node.parent.callee.property.name === "flatMap":
 			if (hint & ComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayFlatMapCallback) return false;
 			break;
+		case getFunctionComponentId(context, node) == null && node.parent.type === AST_NODE_TYPES.CallExpression && !isComponentWrapperCallLoose(context, node.parent) && !isCreateElementCall(context, node.parent):
+			if (hint & ComponentDetectionHint.DoNotIncludeFunctionDefinedAsArbitraryCallExpressionCallback) return false;
+			break;
 	}
 	const significantParent = ast.findParentNode(node, ast.isOneOf([
 		AST_NODE_TYPES.JSXExpressionContainer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "3.0.0-next.80",
+  "version": "3.0.0-next.82",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -34,14 +34,14 @@
     "@typescript-eslint/types": "canary",
     "@typescript-eslint/utils": "canary",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "3.0.0-next.80",
-    "@eslint-react/shared": "3.0.0-next.80",
-    "@eslint-react/var": "3.0.0-next.80"
+    "@eslint-react/ast": "3.0.0-next.82",
+    "@eslint-react/shared": "3.0.0-next.82",
+    "@eslint-react/var": "3.0.0-next.82"
   },
   "devDependencies": {
     "tsdown": "^0.21.0",
-    "@local/configs": "0.0.0",
-    "@local/eff": "3.0.0-beta.72"
+    "@local/eff": "3.0.0-beta.72",
+    "@local/configs": "0.0.0"
   },
   "peerDependencies": {
     "eslint": "^10.0.0",