@eslint-react/core 5.21.1 → 5.21.3

package/dist/index.js

@@ -217,7 +217,7 @@ function isPureComponent(node) {
 	return false;
 }
 function createLifecycleChecker(methodName, isStatic = false) {
-	return (node) => Check.isPropertyOrMethod(node) && node.static === isStatic && Check.isIdentifier(node.key) && node.key.name === methodName;
+	return (node) => Check.isPropertyOrMethod(node) && node.static === isStatic && Check.isIdentifier(node.key, methodName);
 }
 /** @deprecated Class components are legacy. */
 const isRender = createLifecycleChecker("render");
@@ -408,7 +408,7 @@ function isCreateElementChildrenArgument(context, node) {
 function isInsideCreateElementProps(context, node) {
 	const call = Traverse.findParent(node, isCreateElementCall(context));
 	if (call == null) return false;
-	const prop = Traverse.findParent(node, Check.is(AST_NODE_TYPES.ObjectExpression));
+	const prop = Traverse.findParent(node, Check.isObjectExpression);
 	if (prop == null) return false;
 	return prop === call.arguments[1];
 }
@@ -1446,7 +1446,7 @@ function isUseEffectSetupCallback(node) {
 function isUseEffectCleanupCallback(node) {
 	if (node == null) return false;
 	const expr = Extract.unwrap(node);
-	const returnStatement = Traverse.findParent(expr, Check.is(AST_NODE_TYPES.ReturnStatement));
+	const returnStatement = Traverse.findParent(expr, Check.isReturnStatement);
 	const enclosingFunction = Traverse.findParent(expr, Check.isFunction);
 	if (enclosingFunction !== Traverse.findParent(returnStatement, Check.isFunction)) return false;
 	return isUseEffectSetupCallback(enclosingFunction);
@@ -1565,6 +1565,7 @@ function getHookCollector(context) {
 	const hooks = /* @__PURE__ */ new Map();
 	const getText = (n) => context.sourceCode.getText(n);
 	const getCurrentEntry = () => functionEntries.at(-1) ?? null;
+	const getCurrentHookEntry = () => functionEntries.findLast((entry) => entry.isHookDefinition) ?? null;
 	const onFunctionEnter = (node) => {
 		const id = getFunctionId(node);
 		const entry = {
@@ -1603,7 +1604,7 @@ function getHookCollector(context) {
 			},
 			CallExpression(node) {
 				if (!isHookCall(node)) return;
-				const entry = getCurrentEntry();
+				const entry = getCurrentHookEntry();
 				if (entry == null) return;
 				entry.hookCalls.push(node);
 			},
@@ -1614,7 +1615,7 @@ function getHookCollector(context) {
 			},
 			TaggedTemplateExpression(node) {
 				if (!isHookTag(node.tag)) return;
-				const entry = getCurrentEntry();
+				const entry = getCurrentHookEntry();
 				if (entry == null) return;
 				entry.hookCalls.push(node);
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "5.21.1",
+  "version": "5.21.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": {
@@ -29,10 +29,10 @@
     "dist"
   ],
   "dependencies": {
-    "@eslint-react/ast": "5.21.1",
-    "@eslint-react/eslint": "5.21.1",
-    "@eslint-react/shared": "5.21.1",
-    "@eslint-react/var": "5.21.1",
+    "@eslint-react/ast": "5.21.3",
+    "@eslint-react/eslint": "5.21.3",
+    "@eslint-react/shared": "5.21.3",
+    "@eslint-react/var": "5.21.3",
     "@typescript-eslint/scope-manager": "^8.70.1",
     "@typescript-eslint/types": "^8.70.1",
     "@typescript-eslint/utils": "^8.70.1",