@eslint-react/core 2.12.4-beta.0 → 2.12.4-beta.2

package/dist/index.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;
@@ -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

@@ -47,7 +47,7 @@ function isReactAPI(api) {
 	const func = (context, node) => {
 		if (node == null) return false;
 		const getText = (n) => context.sourceCode.getText(n);
-		const name = ast.toStringFormat(node, getText);
+		const name = ast.getFullyQualifiedName(node, getText);
 		if (name === api) return true;
 		if (name.substring(name.indexOf(".") + 1) === api) return true;
 		return false;
@@ -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
@@ -283,7 +283,7 @@ function useHookCollector(context) {
 			id,
 			key,
 			kind: "function",
-			name: ast.toStringFormat(id, getText),
+			name: ast.getFullyQualifiedName(id, getText),
 			node,
 			directives: [],
 			flag: 0n,
@@ -955,7 +955,7 @@ function useComponentCollector(context, options = {}) {
 		const isExportDefault = exp != null;
 		const isExportDefaultDeclaration = exp != null && ast.getUnderlyingExpression(exp.declaration) === node;
 		const id = getFunctionComponentId(context, node);
-		const name = id == null ? unit : ast.toStringFormat(id, getText);
+		const name = id == null ? unit : ast.getFullyQualifiedName(id, getText);
 		const initPath = ast.getFunctionInitPath(node);
 		const directives = ast.getFunctionDirectives(node);
 		const entry = {
@@ -1052,7 +1052,7 @@ function useComponentCollectorLegacy(context) {
 		if (!isClassComponent(node)) return;
 		const id = ast.getClassId(node);
 		const key = idGen.next();
-		const name = id == null ? unit : ast.toStringFormat(id, getText);
+		const name = id == null ? unit : ast.getFullyQualifiedName(id, getText);
 		const flag = isPureComponent(node) ? ComponentFlag.PureComponent : ComponentFlag.None;
 		components.set(key, {
 			id,
@@ -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-beta.0",
+  "version": "2.12.4-beta.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": {
@@ -34,10 +34,10 @@
     "@typescript-eslint/types": "^8.54.0",
     "@typescript-eslint/utils": "^8.54.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/eff": "2.12.4-beta.0",
-    "@eslint-react/ast": "2.12.4-beta.0",
-    "@eslint-react/shared": "2.12.4-beta.0",
-    "@eslint-react/var": "2.12.4-beta.0"
+    "@eslint-react/ast": "2.12.4-beta.2",
+    "@eslint-react/eff": "2.12.4-beta.2",
+    "@eslint-react/shared": "2.12.4-beta.2",
+    "@eslint-react/var": "2.12.4-beta.2"
   },
   "devDependencies": {
     "tsdown": "^0.20.3",