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

package/dist/index.js

@@ -267,8 +267,7 @@ function isFunctionOfUseEffectCleanup(node) {
 	if (node == null) return false;
 	const pReturn = AST.findParentNode(node, AST.is(AST_NODE_TYPES.ReturnStatement));
 	const pFunction = AST.findParentNode(node, AST.isFunction);
-	const pFunctionOfReturn = AST.findParentNode(pReturn, AST.isFunction);
-	if (pFunction !== pFunctionOfReturn) return false;
+	if (pFunction !== AST.findParentNode(pReturn, AST.isFunction)) return false;
 	return isFunctionOfUseEffectSetup(pFunction);
 }
 
@@ -327,8 +326,7 @@ function getJsxAttribute(context, node, initialScope) {
 			if (attr.type === AST_NODE_TYPES.JSXAttribute) return getJsxAttributeName(context, attr) === name;
 			switch (attr.argument.type) {
 				case AST_NODE_TYPES.Identifier: {
-					const variable = findVariable(attr.argument.name, scope);
-					const variableNode = getVariableDefinitionNode(variable, 0);
+					const variableNode = getVariableDefinitionNode(findVariable(attr.argument.name, scope), 0);
 					if (variableNode?.type === AST_NODE_TYPES.ObjectExpression) return findProperty(name, variableNode.properties, scope) != null;
 					return false;
 				}
@@ -534,10 +532,7 @@ function isJsxLike(code, node, hint = DEFAULT_JSX_DETECTION_HINT) {
 			if (hint & JsxDetectionHint.StrictConditional) return leftHasJSX(node) && rightHasJSX(node);
 			return leftHasJSX(node) || rightHasJSX(node);
 		}
-		case AST_NODE_TYPES.SequenceExpression: {
-			const exp = node.expressions.at(-1);
-			return isJsxLike(code, exp, hint);
-		}
+		case AST_NODE_TYPES.SequenceExpression: return isJsxLike(code, node.expressions.at(-1), hint);
 		case AST_NODE_TYPES.CallExpression:
 			if (hint & JsxDetectionHint.SkipCreateElement) return false;
 			switch (node.callee.type) {
@@ -936,80 +931,78 @@ function useComponentCollector(context, options = {}) {
 		}
 		return functionEntries.pop();
 	};
-	const ctx = {
-		getAllComponents(node) {
-			return components;
-		},
-		getCurrentEntries() {
-			return [...functionEntries];
-		},
-		getCurrentEntry
-	};
-	const listeners = {
-		":function[type]": onFunctionEnter,
-		":function[type]:exit": onFunctionExit,
-		"ArrowFunctionExpression[body.type!='BlockStatement']"() {
-			const entry = getCurrentEntry();
-			if (entry == null) return;
-			const { body } = entry.node;
-			if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, body, hint) && isComponentDefinition(context, entry.node, hint))) return;
-			const initPath = AST.getFunctionInitPath(entry.node);
-			const id = getFunctionComponentId(context, entry.node);
-			const name = getComponentNameFromId(id);
-			const key = getId();
-			components.set(key, {
-				id,
-				key,
-				kind: "function",
-				name,
-				node: entry.node,
-				displayName: unit,
-				flag: getComponentFlagFromInitPath(initPath),
-				hint,
-				hookCalls: entry.hookCalls,
-				initPath
-			});
+	return {
+		ctx: {
+			getAllComponents(node) {
+				return components;
+			},
+			getCurrentEntries() {
+				return [...functionEntries];
+			},
+			getCurrentEntry
 		},
-		...collectDisplayName ? { [AST.SEL_DISPLAY_NAME_ASSIGNMENT_EXPRESSION](node) {
-			const { left, right } = node;
-			if (left.type !== AST_NODE_TYPES.MemberExpression) return;
-			const componentName = left.object.type === AST_NODE_TYPES.Identifier ? left.object.name : unit;
-			const component = [...components.values()].findLast(({ name }) => name != null && name === componentName);
-			if (component == null) return;
-			component.displayName = right;
-		} } : {},
-		...collectHookCalls ? { "CallExpression[type]:exit"(node) {
-			if (!isReactHookCall(node)) return;
-			const entry = getCurrentEntry();
-			if (entry == null) return;
-			entry.hookCalls.push(node);
-		} } : {},
-		"ReturnStatement[type]"(node) {
-			const entry = getCurrentEntry();
-			if (entry == null) return;
-			if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, node.argument, hint) && isComponentDefinition(context, entry.node, hint))) return;
-			entry.isComponent = true;
-			const initPath = AST.getFunctionInitPath(entry.node);
-			const id = getFunctionComponentId(context, entry.node);
-			const name = getComponentNameFromId(id);
-			components.set(entry.key, {
-				id,
-				key: entry.key,
-				kind: "function",
-				name,
-				node: entry.node,
-				displayName: unit,
-				flag: getComponentFlagFromInitPath(initPath),
-				hint,
-				hookCalls: entry.hookCalls,
-				initPath
-			});
+		listeners: {
+			":function[type]": onFunctionEnter,
+			":function[type]:exit": onFunctionExit,
+			"ArrowFunctionExpression[body.type!='BlockStatement']"() {
+				const entry = getCurrentEntry();
+				if (entry == null) return;
+				const { body } = entry.node;
+				if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, body, hint) && isComponentDefinition(context, entry.node, hint))) return;
+				const initPath = AST.getFunctionInitPath(entry.node);
+				const id = getFunctionComponentId(context, entry.node);
+				const name = getComponentNameFromId(id);
+				const key = getId();
+				components.set(key, {
+					id,
+					key,
+					kind: "function",
+					name,
+					node: entry.node,
+					displayName: unit,
+					flag: getComponentFlagFromInitPath(initPath),
+					hint,
+					hookCalls: entry.hookCalls,
+					initPath
+				});
+			},
+			...collectDisplayName ? { [AST.SEL_DISPLAY_NAME_ASSIGNMENT_EXPRESSION](node) {
+				const { left, right } = node;
+				if (left.type !== AST_NODE_TYPES.MemberExpression) return;
+				const componentName = left.object.type === AST_NODE_TYPES.Identifier ? left.object.name : unit;
+				const component = [...components.values()].findLast(({ name }) => name != null && name === componentName);
+				if (component == null) return;
+				component.displayName = right;
+			} } : {},
+			...collectHookCalls ? { "CallExpression[type]:exit"(node) {
+				if (!isReactHookCall(node)) return;
+				const entry = getCurrentEntry();
+				if (entry == null) return;
+				entry.hookCalls.push(node);
+			} } : {},
+			"ReturnStatement[type]"(node) {
+				const entry = getCurrentEntry();
+				if (entry == null) return;
+				if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, node.argument, hint) && isComponentDefinition(context, entry.node, hint))) return;
+				entry.isComponent = true;
+				const initPath = AST.getFunctionInitPath(entry.node);
+				const id = getFunctionComponentId(context, entry.node);
+				const name = getComponentNameFromId(id);
+				components.set(entry.key, {
+					id,
+					key: entry.key,
+					kind: "function",
+					name,
+					node: entry.node,
+					displayName: unit,
+					flag: getComponentFlagFromInitPath(initPath),
+					hint,
+					hookCalls: entry.hookCalls,
+					initPath
+				});
+			}
 		}
 	};
-	return {
-		ctx,
-		listeners
-	};
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "2.0.7-next.1",
+  "version": "2.0.7-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": {
@@ -27,16 +27,16 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.45.0",
-    "@typescript-eslint/types": "^8.45.0",
-    "@typescript-eslint/utils": "^8.45.0",
+    "@typescript-eslint/scope-manager": "^8.46.0",
+    "@typescript-eslint/types": "^8.46.0",
+    "@typescript-eslint/utils": "^8.46.0",
     "birecord": "^0.1.1",
     "ts-pattern": "^5.8.0",
-    "@eslint-react/ast": "2.0.7-next.1",
-    "@eslint-react/eff": "2.0.7-next.1",
-    "@eslint-react/kit": "2.0.7-next.1",
-    "@eslint-react/var": "2.0.7-next.1",
-    "@eslint-react/shared": "2.0.7-next.1"
+    "@eslint-react/ast": "2.0.7-next.3",
+    "@eslint-react/eff": "2.0.7-next.3",
+    "@eslint-react/shared": "2.0.7-next.3",
+    "@eslint-react/var": "2.0.7-next.3",
+    "@eslint-react/kit": "2.0.7-next.3"
   },
   "devDependencies": {
     "tsdown": "^0.15.6",