@eslint-react/core 2.3.10 → 2.3.11-beta.0

package/dist/index.d.ts

@@ -138,7 +138,7 @@ declare namespace useComponentCollector {
   };
   type ReturnType = {
     ctx: {
-      getAllComponents: (node: TSESTree.Program) => Map<string, FunctionComponent>;
+      getAllComponents: (node: TSESTree.Program) => FunctionComponent[];
       getCurrentEntries: () => FunctionEntry[];
       getCurrentEntry: () => FunctionEntry | unit;
     };
@@ -157,7 +157,7 @@ declare function useComponentCollector(context: RuleContext, options?: useCompon
 declare namespace useComponentCollectorLegacy {
   type ReturnType = {
     ctx: {
-      getAllComponents: (node: TSESTree$1.Program) => Map<string, ClassComponent>;
+      getAllComponents: (node: TSESTree$1.Program) => ClassComponent[];
     };
     listeners: ESLintUtils.RuleListener;
   };
@@ -350,7 +350,7 @@ interface Hook extends SemanticNode {
 declare namespace useHookCollector {
   type ReturnType = {
     ctx: {
-      getAllHooks(node: TSESTree$1.Program): Map<string, Hook>;
+      getAllHooks(node: TSESTree$1.Program): Hook[];
     };
     listeners: ESLintUtils.RuleListener;
   };

package/dist/index.js

@@ -230,7 +230,7 @@ function useHookCollector() {
 	};
 	return {
 		ctx: { getAllHooks(node) {
-			return hooks;
+			return [...hooks.values()];
 		} },
 		listeners: {
 			":function[type]": onFunctionEnter,
@@ -901,8 +901,8 @@ const idGen$1 = new IdGenerator("function_component_");
 */
 function useComponentCollector(context, options = {}) {
 	const { collectDisplayName = false, collectHookCalls = false, hint = DEFAULT_COMPONENT_DETECTION_HINT } = options;
-	const components = /* @__PURE__ */ new Map();
 	const functionEntries = [];
+	const components = /* @__PURE__ */ new Map();
 	const getCurrentEntry = () => functionEntries.at(-1);
 	const onFunctionEnter = (node) => {
 		const key = idGen$1.next();
@@ -914,24 +914,12 @@ function useComponentCollector(context, options = {}) {
 		});
 	};
 	const onFunctionExit = () => {
-		const entry = functionEntries.at(-1);
-		if (entry == null) return;
-		if (!entry.isComponent) return functionEntries.pop();
-		const rets = AST.getNestedReturnStatements(entry.node.body);
-		for (let i = rets.length - 1; i >= 0; i--) {
-			const ret = rets[i];
-			if (ret == null) continue;
-			if (context.sourceCode.getScope(ret).block === entry.node && ret.argument != null && !isJsxLike(context.sourceCode, ret.argument, hint)) {
-				components.delete(entry.key);
-				break;
-			}
-		}
 		return functionEntries.pop();
 	};
 	return {
 		ctx: {
 			getAllComponents(node) {
-				return components;
+				return [...components.values()];
 			},
 			getCurrentEntries() {
 				return [...functionEntries];
@@ -984,10 +972,11 @@ function useComponentCollector(context, options = {}) {
 				entry.isComponent = true;
 				const initPath = AST.getFunctionInitPath(entry.node);
 				const id = getFunctionComponentId(context, entry.node);
+				const key = entry.key;
 				const name = getComponentNameFromId(id);
-				components.set(entry.key, {
+				components.set(key, {
 					id,
-					key: entry.key,
+					key,
 					kind: "function",
 					name,
 					node: entry.node,
@@ -1012,7 +1001,7 @@ const idGen = new IdGenerator("class_component_");
 function useComponentCollectorLegacy() {
 	const components = /* @__PURE__ */ new Map();
 	const ctx = { getAllComponents(node) {
-		return components;
+		return [...components.values()];
 	} };
 	const collect = (node) => {
 		if (!isClassComponent(node)) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "2.3.10",
+  "version": "2.3.11-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": {
@@ -35,17 +35,17 @@
     "@typescript-eslint/utils": "^8.48.0",
     "birecord": "^0.1.1",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "2.3.10",
-    "@eslint-react/eff": "2.3.10",
-    "@eslint-react/var": "2.3.10",
-    "@eslint-react/shared": "2.3.10"
+    "@eslint-react/ast": "2.3.11-beta.0",
+    "@eslint-react/eff": "2.3.11-beta.0",
+    "@eslint-react/var": "2.3.11-beta.0",
+    "@eslint-react/shared": "2.3.11-beta.0"
   },
   "peerDependencies": {
     "eslint": "^8.57.0 || ^9.0.0",
     "typescript": ">=4.8.4 <6.0.0"
   },
   "devDependencies": {
-    "tsdown": "^0.17.0-beta.4",
+    "tsdown": "^0.17.0-beta.5",
     "@local/configs": "0.0.0"
   },
   "engines": {