@eslint-react/core 5.11.0 → 5.11.3

package/dist/index.d.ts

@@ -288,7 +288,7 @@ type FunctionSemanticNode = ClientFunctionSemanticNode | ServerFunctionSemanticN
  * @param node - The function node to analyze.
  * @returns The identifier node if found, `null` otherwise.
  */
-declare function getFunctionId(node: TSESTree.Expression | TSESTreeFunction): TSESTree.ArrayExpression | TSESTree.ArrayPattern | TSESTree.ArrowFunctionExpressionWithBlockBody | TSESTree.ArrowFunctionExpressionWithExpressionBody | TSESTree.AssignmentExpression | TSESTree.AwaitExpression | TSESTree.PrivateInExpression | TSESTree.SymmetricBinaryExpression | TSESTree.CallExpression | TSESTree.ChainExpression | TSESTree.ClassExpression | TSESTree.ConditionalExpression | TSESTree.FunctionExpression | TSESTree.Identifier | TSESTree.ImportExpression | TSESTree.JSXElement | TSESTree.JSXFragment | TSESTree.BigIntLiteral | TSESTree.BooleanLiteral | TSESTree.NullLiteral | TSESTree.NumberLiteral | TSESTree.RegExpLiteral | TSESTree.StringLiteral | TSESTree.TemplateLiteral | TSESTree.LogicalExpression | TSESTree.MemberExpressionComputedName | TSESTree.MemberExpressionNonComputedName | TSESTree.MetaProperty | TSESTree.NewExpression | TSESTree.ObjectExpression | TSESTree.ObjectPattern | TSESTree.SequenceExpression | TSESTree.Super | TSESTree.TaggedTemplateExpression | TSESTree.ThisExpression | TSESTree.TSAsExpression | TSESTree.TSInstantiationExpression | TSESTree.TSNonNullExpression | TSESTree.TSSatisfiesExpression | TSESTree.TSTypeAssertion | TSESTree.UnaryExpressionBitwiseNot | TSESTree.UnaryExpressionDelete | TSESTree.UnaryExpressionMinus | TSESTree.UnaryExpressionNot | TSESTree.UnaryExpressionPlus | TSESTree.UnaryExpressionTypeof | TSESTree.UnaryExpressionVoid | TSESTree.UpdateExpression | TSESTree.YieldNoStarExpression | TSESTree.YieldStarExpression | TSESTree.PrivateIdentifier | null;
+declare function getFunctionId(node: TSESTree.Expression | TSESTreeFunction): TSESTree.ArrayExpression | TSESTree.ArrayPattern | TSESTree.ArrowFunctionExpressionWithBlockBody | TSESTree.ArrowFunctionExpressionWithExpressionBody | TSESTree.AssignmentExpression | TSESTree.AwaitExpression | TSESTree.PrivateInExpression | TSESTree.SymmetricBinaryExpression | TSESTree.CallExpression | TSESTree.ChainExpression | TSESTree.ClassExpression | TSESTree.ConditionalExpression | TSESTree.FunctionExpression | TSESTree.Identifier | TSESTree.ImportExpression | TSESTree.JSXElement | TSESTree.JSXFragment | TSESTree.BigIntLiteral | TSESTree.BooleanLiteral | TSESTree.NullLiteral | TSESTree.NumberLiteral | TSESTree.RegExpLiteral | TSESTree.StringLiteral | TSESTree.LogicalExpression | TSESTree.MemberExpressionComputedName | TSESTree.MemberExpressionNonComputedName | TSESTree.MetaProperty | TSESTree.NewExpression | TSESTree.ObjectExpression | TSESTree.ObjectPattern | TSESTree.PrivateIdentifier | TSESTree.SequenceExpression | TSESTree.Super | TSESTree.TaggedTemplateExpression | TSESTree.TemplateLiteral | TSESTree.ThisExpression | TSESTree.TSAsExpression | TSESTree.TSInstantiationExpression | TSESTree.TSNonNullExpression | TSESTree.TSSatisfiesExpression | TSESTree.TSTypeAssertion | TSESTree.UnaryExpressionBitwiseNot | TSESTree.UnaryExpressionDelete | TSESTree.UnaryExpressionMinus | TSESTree.UnaryExpressionNot | TSESTree.UnaryExpressionPlus | TSESTree.UnaryExpressionTypeof | TSESTree.UnaryExpressionVoid | TSESTree.UpdateExpression | TSESTree.YieldNoStarExpression | TSESTree.YieldStarExpression | null;
 /**
  * Identifies the initialization path of a function node in the AST.
  *
@@ -451,9 +451,9 @@ declare const FunctionComponentDetectionHint: {
   readonly DoNotIncludeFunctionDefinedAsObjectMethod: bigint;
   readonly DoNotIncludeFunctionDefinedAsArrayExpressionElement: bigint;
   readonly DoNotIncludeFunctionDefinedAsArrayPatternElement: bigint;
-  readonly DoNotIncludeFunctionDefinedAsArbitraryCallExpressionCallback: bigint;
   readonly DoNotIncludeFunctionDefinedAsArrayFlatMapCallback: bigint;
   readonly DoNotIncludeFunctionDefinedAsArrayMapCallback: bigint;
+  readonly DoNotIncludeFunctionDefinedAsArbitraryCallExpressionCallback: bigint;
   readonly None: 0n;
   readonly DoNotIncludeJsxWithNullValue: bigint;
   readonly DoNotIncludeJsxWithNumberValue: bigint;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { Check, Extract, Traverse, is, isOneOf } from "@eslint-react/ast";
+import { Check, Extract, Traverse } from "@eslint-react/ast";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import { randomBytes } from "node:crypto";
 import { DEFAULT_JSX_DETECTION_HINT, JsxDetectionHint } from "@eslint-react/jsx";
@@ -312,7 +312,7 @@ const isGetDerivedStateFromError = createLifecycleChecker("getDerivedStateFromEr
 * @deprecated Class components are legacy. This function exists only to support legacy rules.
 */
 function isRenderMethodLike(node) {
-	return Check.isPropertyOrMethod(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name.startsWith("render") && isOneOf([AST_NODE_TYPES.ClassDeclaration, AST_NODE_TYPES.ClassExpression])(node.parent.parent);
+	return Check.isPropertyOrMethod(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name.startsWith("render") && Check.isOneOf([AST_NODE_TYPES.ClassDeclaration, AST_NODE_TYPES.ClassExpression])(node.parent.parent);
 }
 function isRenderMethodCallback(node) {
 	const parent = node.parent;
@@ -577,9 +577,11 @@ function getFunctionComponentId(context, node) {
 	if (functionId != null) return functionId;
 	let parent = node.parent;
 	while (Check.isTypeExpression(parent)) parent = parent.parent;
-	if (parent.type === AST_NODE_TYPES.CallExpression && isFunctionComponentWrapperCall(context, parent) && parent.parent.type === AST_NODE_TYPES.VariableDeclarator) return parent.parent.id;
-	if (parent.type === AST_NODE_TYPES.CallExpression && isFunctionComponentWrapperCall(context, parent) && parent.parent.type === AST_NODE_TYPES.CallExpression && isFunctionComponentWrapperCall(context, parent.parent) && parent.parent.parent.type === AST_NODE_TYPES.VariableDeclarator) return parent.parent.parent.id;
-	return null;
+	switch (true) {
+		case parent.type === AST_NODE_TYPES.CallExpression && isFunctionComponentWrapperCall(context, parent) && parent.parent.type === AST_NODE_TYPES.VariableDeclarator: return parent.parent.id;
+		case parent.type === AST_NODE_TYPES.CallExpression && isFunctionComponentWrapperCall(context, parent) && parent.parent.type === AST_NODE_TYPES.CallExpression && isFunctionComponentWrapperCall(context, parent.parent) && parent.parent.parent.type === AST_NODE_TYPES.VariableDeclarator: return parent.parent.parent.id;
+		default: return null;
+	}
 }
 /**
 * Check if a string matches the strict component name pattern
@@ -619,9 +621,9 @@ const FunctionComponentDetectionHint = {
 	DoNotIncludeFunctionDefinedAsObjectMethod: 1n << 13n,
 	DoNotIncludeFunctionDefinedAsArrayExpressionElement: 1n << 14n,
 	DoNotIncludeFunctionDefinedAsArrayPatternElement: 1n << 15n,
-	DoNotIncludeFunctionDefinedAsArbitraryCallExpressionCallback: 1n << 18n,
 	DoNotIncludeFunctionDefinedAsArrayFlatMapCallback: 1n << 16n,
-	DoNotIncludeFunctionDefinedAsArrayMapCallback: 1n << 17n
+	DoNotIncludeFunctionDefinedAsArrayMapCallback: 1n << 17n,
+	DoNotIncludeFunctionDefinedAsArbitraryCallExpressionCallback: 1n << 18n
 };
 /**
 * Default component detection hint
@@ -651,13 +653,13 @@ function isFunctionComponentDefinition(context, node, hint) {
 	while (Check.isTypeExpression(parent)) parent = parent.parent;
 	const parentCallee = parent.type === AST_NODE_TYPES.CallExpression ? Extract.unwrap(parent.callee) : null;
 	switch (true) {
-		case isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && parent.type === AST_NODE_TYPES.Property && parent.parent.type === AST_NODE_TYPES.ObjectExpression:
+		case Check.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && parent.type === AST_NODE_TYPES.Property && parent.parent.type === AST_NODE_TYPES.ObjectExpression:
 			if (hint & FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsObjectMethod) return false;
 			break;
-		case isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && parent.type === AST_NODE_TYPES.MethodDefinition:
+		case Check.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && parent.type === AST_NODE_TYPES.MethodDefinition:
 			if (hint & FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsClassMethod) return false;
 			break;
-		case isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && parent.type === AST_NODE_TYPES.Property:
+		case Check.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && parent.type === AST_NODE_TYPES.PropertyDefinition:
 			if (hint & FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsClassProperty) return false;
 			break;
 		case parent.type === AST_NODE_TYPES.ArrayPattern:
@@ -676,7 +678,7 @@ function isFunctionComponentDefinition(context, node, hint) {
 			if (hint & FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsArbitraryCallExpressionCallback) return false;
 			break;
 	}
-	const significantParent = Traverse.findParent(node, isOneOf([
+	const significantParent = Traverse.findParent(node, Check.isOneOf([
 		AST_NODE_TYPES.JSXExpressionContainer,
 		AST_NODE_TYPES.ArrowFunctionExpression,
 		AST_NODE_TYPES.FunctionExpression,
@@ -807,7 +809,7 @@ function isUseEffectSetupCallback(node) {
 function isUseEffectCleanupCallback(node) {
 	if (node == null) return false;
 	const expr = Extract.unwrap(node);
-	const returnStatement = Traverse.findParent(expr, is(AST_NODE_TYPES.ReturnStatement));
+	const returnStatement = Traverse.findParent(expr, Check.is(AST_NODE_TYPES.ReturnStatement));
 	const enclosingFunction = Traverse.findParent(expr, Check.isFunction);
 	if (enclosingFunction !== Traverse.findParent(returnStatement, Check.isFunction)) return false;
 	return isUseEffectSetupCallback(enclosingFunction);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "5.11.0",
+  "version": "5.11.3",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -33,11 +33,11 @@
     "@typescript-eslint/types": "^8.62.1",
     "@typescript-eslint/utils": "^8.62.1",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "5.11.0",
-    "@eslint-react/shared": "5.11.0",
-    "@eslint-react/jsx": "5.11.0",
-    "@eslint-react/var": "5.11.0",
-    "@eslint-react/eslint": "5.11.0"
+    "@eslint-react/ast": "5.11.3",
+    "@eslint-react/eslint": "5.11.3",
+    "@eslint-react/jsx": "5.11.3",
+    "@eslint-react/shared": "5.11.3",
+    "@eslint-react/var": "5.11.3"
   },
   "devDependencies": {
     "@typescript-eslint/parser": "^8.62.1",