@eslint-react/core 2.7.1-next.1 → 2.7.1-next.2

package/dist/index.d.ts

@@ -117,6 +117,10 @@ interface FunctionComponent extends SemanticNode {
        * The initialization path of the function
        */
   initPath: unit | AST.FunctionInitPath;
+  /**
+       * Indicates if the component is exported as default
+       */
+  isExportDefault: boolean;
   /**
        * List of hook calls within the component
        */
@@ -170,6 +174,8 @@ type FunctionEntry$1 = {
   node: AST.TSESTreeFunction;
   hookCalls: TSESTree.CallExpression[];
   isComponent: boolean;
+  isComponentDefinition: boolean;
+  isExportDefault: boolean;
   rets: TSESTree.ReturnStatement["argument"][];
 };
 declare namespace useComponentCollector {

package/dist/index.js

@@ -822,13 +822,18 @@ function isComponentDefinition(context, node, hint) {
 	if (isChildrenOfCreateElement(context, node) || isFunctionOfRenderMethod(node)) return false;
 	if (shouldExcludeBasedOnHint(node, hint)) return false;
 	const significantParent = AST.findParentNode(node, AST.isOneOf([
+		AST_NODE_TYPES.ArrayPattern,
+		AST_NODE_TYPES.ArrayExpression,
 		AST_NODE_TYPES.JSXExpressionContainer,
 		AST_NODE_TYPES.ArrowFunctionExpression,
 		AST_NODE_TYPES.FunctionExpression,
 		AST_NODE_TYPES.Property,
 		AST_NODE_TYPES.ClassBody
 	]));
-	return significantParent == null || significantParent.type !== AST_NODE_TYPES.JSXExpressionContainer;
+	if (significantParent == null) return true;
+	if (significantParent.type === AST_NODE_TYPES.JSXExpressionContainer) return false;
+	if (significantParent.type === AST_NODE_TYPES.ArrayPattern || significantParent.type === AST_NODE_TYPES.ArrayExpression) return false;
+	return true;
 }
 
 //#endregion
@@ -960,6 +965,8 @@ function useComponentCollector(context, options = {}) {
 			node,
 			hookCalls: [],
 			isComponent: false,
+			isComponentDefinition: isComponentDefinition(context, node, hint),
+			isExportDefault: AST.findParentNode(node, (n) => n.type === AST_NODE_TYPES.ExportDefaultDeclaration) != null,
 			rets: []
 		});
 	};
@@ -982,9 +989,10 @@ function useComponentCollector(context, options = {}) {
 			"ArrowFunctionExpression[body.type!='BlockStatement']"() {
 				const entry = getCurrentEntry();
 				if (entry == null) return;
+				if (!entry.isComponentDefinition) return;
 				const { body } = entry.node;
 				if (body.type === AST_NODE_TYPES.BlockStatement) return;
-				if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, body, hint) && isComponentDefinition(context, entry.node, hint))) return;
+				if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, body, hint))) return;
 				const initPath = AST.getFunctionInitPath(entry.node);
 				const id = getFunctionComponentId(context, entry.node);
 				const key = entry.key;
@@ -1000,6 +1008,7 @@ function useComponentCollector(context, options = {}) {
 					hint,
 					hookCalls: entry.hookCalls,
 					initPath,
+					isExportDefault: entry.isExportDefault,
 					rets: [body]
 				});
 			},
@@ -1020,8 +1029,10 @@ function useComponentCollector(context, options = {}) {
 			"ReturnStatement[type]"(node) {
 				const entry = getCurrentEntry();
 				if (entry == null) return;
-				entry.rets.push(node.argument);
-				if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, node.argument, hint) && isComponentDefinition(context, entry.node, hint))) return;
+				if (!entry.isComponentDefinition) return;
+				const { argument } = node;
+				entry.rets.push(argument);
+				if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, argument, hint))) return;
 				entry.isComponent = true;
 				const initPath = AST.getFunctionInitPath(entry.node);
 				const id = getFunctionComponentId(context, entry.node);
@@ -1038,6 +1049,7 @@ function useComponentCollector(context, options = {}) {
 					hint,
 					hookCalls: entry.hookCalls,
 					initPath,
+					isExportDefault: entry.isExportDefault,
 					rets: entry.rets
 				});
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "2.7.1-next.1",
+  "version": "2.7.1-next.2",
   "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,10 +35,10 @@
     "@typescript-eslint/utils": "^8.53.0",
     "birecord": "^0.1.1",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "2.7.1-next.1",
-    "@eslint-react/eff": "2.7.1-next.1",
-    "@eslint-react/shared": "2.7.1-next.1",
-    "@eslint-react/var": "2.7.1-next.1"
+    "@eslint-react/ast": "2.7.1-next.2",
+    "@eslint-react/shared": "2.7.1-next.2",
+    "@eslint-react/eff": "2.7.1-next.2",
+    "@eslint-react/var": "2.7.1-next.2"
   },
   "devDependencies": {
     "tsdown": "^0.20.0-beta.3",