@eslint-react/core 3.0.0-next.60 → 3.0.0-next.62

package/dist/index.js

@@ -1,6 +1,6 @@
 import * as ast from "@eslint-react/ast";
 import { constFalse, constTrue, dual, flip, getOrElseUpdate, identity, unit } from "@eslint-react/eff";
-import { findVariable, getVariableInitializer } from "@eslint-react/var";
+import { findVariable } from "@eslint-react/var";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import { P, match } from "ts-pattern";
 import { IdGenerator, RE_ANNOTATION_JSX, RE_ANNOTATION_JSX_FRAG, RE_ANNOTATION_JSX_IMPORT_SOURCE, RE_ANNOTATION_JSX_RUNTIME, RE_COMPONENT_NAME, RE_COMPONENT_NAME_LOOSE } from "@eslint-react/shared";
@@ -412,7 +412,15 @@ 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 initNode = getVariableInitializer(findVariable(attr.argument.name, scope), 0);
+					const variable = findVariable(attr.argument.name, scope);
+					function resolve(v) {
+						if (v == null) return unit;
+						const def = v.defs.at(0);
+						if (def == null) return unit;
+						if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
+						return unit;
+					}
+					const initNode = resolve(variable);
 					if (initNode?.type === AST_NODE_TYPES.ObjectExpression) return ast.findProperty(initNode.properties, name) != null;
 					return false;
 				}
@@ -640,7 +648,14 @@ function isJsxLike(code, node, hint = DEFAULT_JSX_DETECTION_HINT) {
 			const { name } = node;
 			if (name === "undefined") return !(hint & JsxDetectionHint.DoNotIncludeJsxWithUndefinedValue);
 			if (ast.isJSXTagNameExpression(node)) return true;
-			return isJsxLike(code, getVariableInitializer(findVariable(name, code.getScope(node)), 0), hint);
+			function resolve(v) {
+				if (v == null) return unit;
+				const def = v.defs.at(0);
+				if (def == null) return unit;
+				if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
+				return unit;
+			}
+			return isJsxLike(code, resolve(findVariable(name, code.getScope(node))), hint);
 		}
 	}
 	return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "3.0.0-next.60",
+  "version": "3.0.0-next.62",
   "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": "canary",
     "@typescript-eslint/utils": "canary",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "3.0.0-next.60",
-    "@eslint-react/eff": "3.0.0-next.60",
-    "@eslint-react/shared": "3.0.0-next.60",
-    "@eslint-react/var": "3.0.0-next.60"
+    "@eslint-react/ast": "3.0.0-next.62",
+    "@eslint-react/var": "3.0.0-next.62",
+    "@eslint-react/eff": "3.0.0-next.62",
+    "@eslint-react/shared": "3.0.0-next.62"
   },
   "devDependencies": {
     "tsdown": "^0.21.0-beta.2",