@eslint-react/core 2.7.3-next.4 → 2.7.4-beta.0

package/dist/index.d.ts

@@ -25,6 +25,14 @@ declare const ComponentDetectionHint: {
        * Skip function component defined on class property
        */
   readonly SkipClassProperty: bigint;
+  /**
+       * Skip function component defined in array pattern
+       */
+  readonly SkipArrayPattern: bigint;
+  /**
+       * Skip function component defined in array expression
+       */
+  readonly SkipArrayExpression: bigint;
   /**
        * Skip function component defined as array map callback
        */

package/dist/index.js

@@ -4,7 +4,7 @@ import { IdGenerator, RE_ANNOTATION_JSX, RE_ANNOTATION_JSX_FRAG, RE_ANNOTATION_J
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import { findImportSource, findProperty, findVariable, getVariableDefinitionNode, isNodeValueEqual } from "@eslint-react/var";
 import { getStaticValue } from "@typescript-eslint/utils/ast-utils";
-import { P, isMatching, match } from "ts-pattern";
+import { P, match } from "ts-pattern";
 import { AST_NODE_TYPES as AST_NODE_TYPES$1 } from "@typescript-eslint/utils";
 import birecord from "birecord";
 
@@ -687,12 +687,14 @@ const ComponentDetectionHint = {
 	SkipObjectMethod: 1n << 64n,
 	SkipClassMethod: 1n << 65n,
 	SkipClassProperty: 1n << 66n,
-	SkipArrayMapCallback: 1n << 67n
+	SkipArrayPattern: 1n << 67n,
+	SkipArrayExpression: 1n << 68n,
+	SkipArrayMapCallback: 1n << 69n
 };
 /**
 * Default component detection hint
 */
-const DEFAULT_COMPONENT_DETECTION_HINT = 0n | ComponentDetectionHint.SkipArrayMapCallback | ComponentDetectionHint.SkipBooleanLiteral | ComponentDetectionHint.SkipEmptyArray | ComponentDetectionHint.SkipNumberLiteral | ComponentDetectionHint.SkipStringLiteral | ComponentDetectionHint.SkipUndefined | ComponentDetectionHint.StrictArray | ComponentDetectionHint.StrictConditional | ComponentDetectionHint.StrictLogical;
+const DEFAULT_COMPONENT_DETECTION_HINT = 0n | ComponentDetectionHint.SkipArrayExpression | ComponentDetectionHint.SkipArrayMapCallback | ComponentDetectionHint.SkipArrayPattern | ComponentDetectionHint.SkipBooleanLiteral | ComponentDetectionHint.SkipEmptyArray | ComponentDetectionHint.SkipNumberLiteral | ComponentDetectionHint.SkipStringLiteral | ComponentDetectionHint.SkipUndefined | ComponentDetectionHint.StrictArray | ComponentDetectionHint.StrictConditional | ComponentDetectionHint.StrictLogical;
 
 //#endregion
 //#region src/component/component-is.ts
@@ -748,27 +750,6 @@ function isRenderMethodLike(node) {
 //#endregion
 //#region src/component/component-definition.ts
 /**
-* Function patterns for matching specific AST structures
-* Used to identify where a function is defined (e.g., method, property)
-*/
-const FUNCTION_PATTERNS = {
-	CLASS_METHOD: {
-		type: P.union(AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression),
-		parent: AST_NODE_TYPES.MethodDefinition
-	},
-	CLASS_PROPERTY: {
-		type: P.union(AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression),
-		parent: AST_NODE_TYPES.Property
-	},
-	OBJECT_METHOD: {
-		type: P.union(AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression),
-		parent: {
-			type: AST_NODE_TYPES.Property,
-			parent: { type: AST_NODE_TYPES.ObjectExpression }
-		}
-	}
-};
-/**
 * Checks if the given node is a function within a render method of a class component.
 *
 * @param node The AST node to check
@@ -795,9 +776,11 @@ function isRenderMethodCallback(node) {
 */
 function shouldExcludeBasedOnHint(node, hint) {
 	switch (true) {
-		case hint & ComponentDetectionHint.SkipObjectMethod && isMatching(FUNCTION_PATTERNS.OBJECT_METHOD)(node): return true;
-		case hint & ComponentDetectionHint.SkipClassMethod && isMatching(FUNCTION_PATTERNS.CLASS_METHOD)(node): return true;
-		case hint & ComponentDetectionHint.SkipClassProperty && isMatching(FUNCTION_PATTERNS.CLASS_PROPERTY)(node): return true;
+		case hint & ComponentDetectionHint.SkipObjectMethod && AST.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && node.parent.type === AST_NODE_TYPES.Property && node.parent.parent.type === AST_NODE_TYPES.ObjectExpression: return true;
+		case hint & ComponentDetectionHint.SkipClassMethod && AST.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && node.parent.type === AST_NODE_TYPES.MethodDefinition: return true;
+		case hint & ComponentDetectionHint.SkipClassProperty && AST.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && node.parent.type === AST_NODE_TYPES.Property: return true;
+		case hint & ComponentDetectionHint.SkipArrayPattern && node.parent.type === AST_NODE_TYPES.ArrayPattern: return true;
+		case hint & ComponentDetectionHint.SkipArrayExpression && node.parent.type === AST_NODE_TYPES.ArrayExpression: return true;
 		case hint & ComponentDetectionHint.SkipArrayMapCallback && 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 === "map": return true;
 	}
 	return false;
@@ -827,8 +810,6 @@ function isComponentDefinition(context, node, hint) {
 	if (isChildrenOfCreateElement(context, node) || isRenderMethodCallback(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,
@@ -837,7 +818,6 @@ function isComponentDefinition(context, node, hint) {
 	]));
 	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;
 }
 

package/package.json

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