@eslint-react/core 4.2.4-beta.0 → 4.2.5-beta.0

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import * as ast from "@eslint-react/ast";
 import { TSESTree } from "@typescript-eslint/types";
 import { RegExpLike, RuleContext } from "@eslint-react/shared";
-import { Scope } from "@typescript-eslint/scope-manager";
 import { ESLintUtils, TSESTree as TSESTree$1 } from "@typescript-eslint/utils";
+import { Scope } from "@typescript-eslint/scope-manager";
 
 //#region src/api/find-import-source.d.ts
 /**
@@ -520,10 +520,10 @@ interface HookSemanticNode extends SemanticNode {
   id: ast.FunctionID;
   /** The AST node of the hook */
   node: ast.TSESTreeFunction;
-  /** The name of the hook */
-  name: string;
   /** The kind of hook */
   kind: "hook";
+  /** List of expressions returned by the hook */
+  rets: TSESTree.ReturnStatement["argument"][];
   /** The other hooks called by the hook */
   hookCalls: TSESTree.CallExpression[];
   /** The directives used in the function (ex: "use strict", "use client", etc.) */

package/dist/index.js

@@ -4,6 +4,7 @@ import { findVariable } from "@typescript-eslint/utils/ast-utils";
 import { P, match } from "ts-pattern";
 import { JsxDetectionHint, isJsxLike } from "@eslint-react/jsx";
 import { IdGenerator, RE_COMPONENT_NAME, RE_COMPONENT_NAME_LOOSE } from "@eslint-react/shared";
+import { AST_NODE_TYPES as AST_NODE_TYPES$1 } from "@typescript-eslint/utils";
 
 //#region ../../.pkgs/eff/dist/index.js
 /**
@@ -473,22 +474,22 @@ function getHookCollector(context) {
 	const onFunctionEnter = (node) => {
 		const id = ast.getFunctionId(node);
 		const key = idGen$2.next();
-		functionEntries.push({
-			key,
-			node
-		});
-		if (id == null || !isHookId(id)) return;
-		hooks.set(key, {
+		const entry = {
 			id,
 			key,
 			kind: "hook",
-			name: ast.getFullyQualifiedName(id, getText),
+			name: id == null ? null : ast.getFullyQualifiedName(id, getText),
 			directives: [],
 			flag: 0n,
 			hint: 0n,
 			hookCalls: [],
-			node
-		});
+			isHookDefinition: id != null && isHookId(id),
+			node,
+			rets: []
+		};
+		functionEntries.push(entry);
+		if (!entry.isHookDefinition) return;
+		hooks.set(key, entry);
 	};
 	const onFunctionExit = () => {
 		functionEntries.pop();
@@ -500,11 +501,23 @@ function getHookCollector(context) {
 		visitor: {
 			":function": onFunctionEnter,
 			":function:exit": onFunctionExit,
+			"ArrowFunctionExpression[body.type!='BlockStatement']"() {
+				const entry = getCurrentEntry();
+				if (entry == null) return;
+				const { body } = entry.node;
+				if (body.type === AST_NODE_TYPES$1.BlockStatement) return;
+				entry.rets.push(body);
+			},
 			CallExpression(node) {
 				if (!isHookCall(node)) return;
 				const entry = getCurrentEntry();
 				if (entry == null) return;
-				hooks.get(entry.key)?.hookCalls.push(node);
+				entry.hookCalls.push(node);
+			},
+			ReturnStatement(node) {
+				const entry = getCurrentEntry();
+				if (entry == null) return;
+				entry.rets.push(node.argument);
 			}
 		}
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "4.2.4-beta.0",
+  "version": "4.2.5-beta.0",
   "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,10 +34,10 @@
     "@typescript-eslint/types": "^8.58.0",
     "@typescript-eslint/utils": "^8.58.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "4.2.4-beta.0",
-    "@eslint-react/jsx": "4.2.4-beta.0",
-    "@eslint-react/shared": "4.2.4-beta.0",
-    "@eslint-react/var": "4.2.4-beta.0"
+    "@eslint-react/ast": "4.2.5-beta.0",
+    "@eslint-react/jsx": "4.2.5-beta.0",
+    "@eslint-react/shared": "4.2.5-beta.0",
+    "@eslint-react/var": "4.2.5-beta.0"
   },
   "devDependencies": {
     "@typescript-eslint/typescript-estree": "^8.58.0",