@eslint-react/core 3.0.0-next.61 → 3.0.0-next.63

package/dist/index.js

@@ -1,10 +1,9 @@
 import * as ast from "@eslint-react/ast";
 import { constFalse, constTrue, dual, flip, getOrElseUpdate, identity, unit } from "@eslint-react/eff";
-import { findVariable } from "@eslint-react/var";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
+import { findVariable, getStaticValue } from "@typescript-eslint/utils/ast-utils";
 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";
-import { getStaticValue } from "@typescript-eslint/utils/ast-utils";
 import { AST_NODE_TYPES as AST_NODE_TYPES$1 } from "@typescript-eslint/utils";
 
 //#region src/api/find-import-source.ts
@@ -34,7 +33,7 @@ function getRequireExpressionArguments(node) {
 * @returns The import source or undefined if not found
 */
 function findImportSource(name, initialScope) {
-	const latestDef = findVariable(name, initialScope)?.defs.at(-1);
+	const latestDef = findVariable(initialScope, name)?.defs.at(-1);
 	if (latestDef == null) return unit;
 	const { node, parent } = latestDef;
 	if (node.type === AST_NODE_TYPES.VariableDeclarator && node.init != null) {
@@ -412,7 +411,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 variable = findVariable(scope, attr.argument.name);
 					function resolve(v) {
 						if (v == null) return unit;
 						const def = v.defs.at(0);
@@ -655,7 +654,7 @@ function isJsxLike(code, node, hint = DEFAULT_JSX_DETECTION_HINT) {
 				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 isJsxLike(code, resolve(findVariable(code.getScope(node), name)), hint);
 		}
 	}
 	return false;
@@ -1212,7 +1211,7 @@ function isInitializedFromRef(name, initialScope) {
 * @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 ?? []) {
+	for (const { node } of findVariable(initialScope, name)?.defs ?? []) {
 		if (node.type !== AST_NODE_TYPES$1.VariableDeclarator) continue;
 		const init = node.init;
 		if (init == null) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "3.0.0-next.61",
+  "version": "3.0.0-next.63",
   "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.61",
-    "@eslint-react/eff": "3.0.0-next.61",
-    "@eslint-react/shared": "3.0.0-next.61",
-    "@eslint-react/var": "3.0.0-next.61"
+    "@eslint-react/shared": "3.0.0-next.63",
+    "@eslint-react/ast": "3.0.0-next.63",
+    "@eslint-react/var": "3.0.0-next.63",
+    "@eslint-react/eff": "3.0.0-next.63"
   },
   "devDependencies": {
     "tsdown": "^0.21.0-beta.2",