@eslint-react/core 2.12.4-next.1 → 2.12.4-next.3

package/dist/index.d.ts

@@ -544,7 +544,7 @@ type FindEnclosingComponentOrHookFilter = (n: TSESTree.Node, name: string | null
  * @param test Optional test function to customize component or hook identification
  * @returns The enclosing component or hook node, or `null` if none is ASAST.
  */
-declare function findEnclosingComponentOrHook(node: TSESTree.Node | unit, test?: FindEnclosingComponentOrHookFilter): TSESTree.ArrowFunctionExpression | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName | TSESTree.FunctionExpression | undefined;
+declare function findEnclosingComponentOrHook(node: TSESTree.Node | unit, test?: FindEnclosingComponentOrHookFilter): TSESTree.ArrowFunctionExpression | TSESTree.FunctionExpression | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName | undefined;
 //#endregion
 //#region src/hierarchy/is-inside-component-or-hook.d.ts
 /**
@@ -561,7 +561,7 @@ declare function isInsideComponentOrHook(node: TSESTree.Node | unit): boolean;
  */
 declare function isUseEffectSetupCallback(node: TSESTree.Node | unit): boolean;
 /**
- * Determine if a node is the cleanup function returned by a useEffect-like hook's setup function.
+ * Determine if a node is the cleanup function returned by a useEffect-like hook's setup function
  * @param node The AST node to check
  */
 declare function isUseEffectCleanupCallback(node: TSESTree.Node | unit): boolean;
@@ -742,7 +742,7 @@ declare function resolveJsxAttributeValue(context: RuleContext, attribute: ast.T
   readonly toStatic: () => string | number | bigint | boolean | RegExp | null;
 } | {
   readonly kind: "expression";
-  readonly node: TSESTree.JSXEmptyExpression | TSESTree.Expression;
+  readonly node: TSESTree.Expression | TSESTree.JSXEmptyExpression;
   readonly toStatic: () => unknown;
 } | {
   readonly kind: "element";
@@ -750,7 +750,7 @@ declare function resolveJsxAttributeValue(context: RuleContext, attribute: ast.T
   readonly toStatic: () => undefined;
 } | {
   readonly kind: "spreadChild";
-  readonly node: TSESTree.JSXEmptyExpression | TSESTree.Expression;
+  readonly node: TSESTree.Expression | TSESTree.JSXEmptyExpression;
   readonly toStatic: () => undefined;
 } | {
   readonly kind: "spreadProps";
@@ -901,7 +901,7 @@ declare function isInitializedFromRef(name: string, initialScope: Scope): boolea
  * Get the init expression of a ref variable
  * @param name The variable name
  * @param initialScope The initial scope
- * @returns The init expression node if the variable is derived from a ref, or null otherwise
+ * @returns The init expression node if the variable is derived from a ref, or undefined otherwise
  */
 declare function getRefInit(name: string, initialScope: Scope): TSESTree$1.Expression | unit;
 //#endregion

package/dist/index.js

@@ -232,15 +232,15 @@ function isUseEffectSetupCallback(node) {
 	return node.parent?.type === AST_NODE_TYPES.CallExpression && node.parent.arguments.at(0) === node && isUseEffectLikeCall(node.parent);
 }
 /**
-* Determine if a node is the cleanup function returned by a useEffect-like hook's setup function.
+* Determine if a node is the cleanup function returned by a useEffect-like hook's setup function
 * @param node The AST node to check
 */
 function isUseEffectCleanupCallback(node) {
 	if (node == null) return false;
-	const pReturn = ast.findParentNode(node, ast.is(AST_NODE_TYPES.ReturnStatement));
-	const pFunction = ast.findParentNode(node, ast.isFunction);
-	if (pFunction !== ast.findParentNode(pReturn, ast.isFunction)) return false;
-	return isUseEffectSetupCallback(pFunction);
+	const returnStatement = ast.findParentNode(node, ast.is(AST_NODE_TYPES.ReturnStatement));
+	const enclosingFunction = ast.findParentNode(node, ast.isFunction);
+	if (enclosingFunction !== ast.findParentNode(returnStatement, ast.isFunction)) return false;
+	return isUseEffectSetupCallback(enclosingFunction);
 }
 
 //#endregion
@@ -1274,7 +1274,7 @@ function isInitializedFromRef(name, initialScope) {
 * Get the init expression of a ref variable
 * @param name The variable name
 * @param initialScope The initial scope
-* @returns The init expression node if the variable is derived from a ref, or null otherwise
+* @returns The init expression node if the variable is derived from a ref, or undefined otherwise
 */
 function getRefInit(name, initialScope) {
 	for (const { node } of findVariable(initialScope)(name)?.defs ?? []) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "2.12.4-next.1",
+  "version": "2.12.4-next.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": {
@@ -30,14 +30,14 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.54.0",
-    "@typescript-eslint/types": "^8.54.0",
-    "@typescript-eslint/utils": "^8.54.0",
+    "@typescript-eslint/scope-manager": "^8.55.0",
+    "@typescript-eslint/types": "^8.55.0",
+    "@typescript-eslint/utils": "^8.55.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "2.12.4-next.1",
-    "@eslint-react/eff": "2.12.4-next.1",
-    "@eslint-react/shared": "2.12.4-next.1",
-    "@eslint-react/var": "2.12.4-next.1"
+    "@eslint-react/ast": "2.12.4-next.3",
+    "@eslint-react/shared": "2.12.4-next.3",
+    "@eslint-react/var": "2.12.4-next.3",
+    "@eslint-react/eff": "2.12.4-next.3"
   },
   "devDependencies": {
     "tsdown": "^0.20.3",