@eslint-react/var 5.28.1 → 5.28.3

package/dist/index.d.ts

@@ -181,7 +181,12 @@ export declare function isValueEqual(context: RuleContext, a: TSESTree.Node, b:
  * - `localOnly`: If `true`, only consider variables declared in the same scope as the identifier
  *   (this will miss variables declared in an outer scope). When `false` (default), traverse the
  *   scope chain upward via `findVariable` so that references to outer-scope bindings are resolved
- *   correctly.
+ *   correctly. Ignored when `boundary` is set.
+ * - `boundary`: A node (typically the enclosing component or hook function) that bounds the
+ *   scope-chain traversal. The identifier is resolved only if its binding is declared in a scope
+ *   between the identifier's own scope and the boundary's scope (inclusive); bindings declared
+ *   outside the boundary (e.g. module-level constants, which are stable across renders) are
+ *   treated as unresolvable. The boundary node must be an ancestor of `node`.
  * @returns The resolved node, or `null` if the identifier cannot be resolved to a value node.
  *
  * For origin/pedigree tracking that maps destructured bindings to the declarator's
@@ -189,6 +194,7 @@ export declare function isValueEqual(context: RuleContext, a: TSESTree.Node, b:
  */
 export declare function resolve(context: RuleContext, node: TSESTree.Identifier, options?: Partial<{
   at: number;
+  boundary: TSESTree.Node;
   localOnly: boolean;
 }>): TSESTree.Node | null;
 //#endregion
@@ -227,7 +233,7 @@ export type ObjectType = {
   node: TSESTree.ObjectExpression | TSESTree.CallExpression;
 } | {
   kind: "class";
-  node: TSESTree.ClassExpression;
+  node: TSESTree.ClassDeclaration | TSESTree.ClassExpression;
 } | {
   kind: "instance";
   node: TSESTree.NewExpression | TSESTree.ThisExpression;
@@ -246,9 +252,18 @@ export type ObjectType = {
  * Resolve the object type of the node.
  * @param context The ESLint rule context.
  * @param node The node to resolve.
+ * @param options Optional settings:
+ * - `boundary`: A node (typically the enclosing component or hook function) that bounds
+ *   identifier resolution. Identifiers are resolved through their initializer only when the
+ *   binding is declared within the boundary — this catches render-scoped constructions referenced
+ *   from nested callbacks, while values declared outside the boundary (e.g. module-level
+ *   constants, which are stable across renders) are treated as unresolvable. When omitted, only
+ *   the identifier's own scope is searched.
  * @returns The object type of the node, or `null` when it cannot be resolved.
  */
-export declare function resolveObjectType(context: RuleContext, node: TSESTree.Node | null | undefined): ObjectType | null;
+export declare function resolveObjectType(context: RuleContext, node: TSESTree.Node | null | undefined, options?: Partial<{
+  boundary: TSESTree.Node;
+}>): ObjectType | null;
 //#endregion
 //#region src/resolve-origin.d.ts
 /**

package/dist/index.js

@@ -318,9 +318,9 @@ function isInitializedFromReactNative(name, initialScope, importSource = "react-
 //#endregion
 //#region src/resolve.ts
 function resolve(context, node, options) {
-	const { at = 0, localOnly = false } = options ?? {};
+	const { at = 0, boundary, localOnly = false } = options ?? {};
 	const scope = context.sourceCode.getScope(node);
-	const variable = localOnly ? scope.set.get(node.name) : findVariable(scope, node);
+	const variable = boundary != null ? findVariableWithinBoundary(scope, node.name, context.sourceCode.getScope(boundary)) : localOnly ? scope.set.get(node.name) : findVariable(scope, node);
 	if (variable == null) return null;
 	const def = variable.defs.at(at);
 	if (def == null) return null;
@@ -345,6 +345,14 @@ function resolve(context, node, options) {
 		default: return null;
 	}
 }
+function findVariableWithinBoundary(scope, name, boundaryScope) {
+	while (scope != null) {
+		const variable = scope.set.get(name);
+		if (variable != null || scope === boundaryScope) return variable ?? null;
+		scope = scope.upper;
+	}
+	return null;
+}
 //#endregion
 //#region src/resolve-enclosing-assignment-target.ts
 function resolveEnclosingAssignmentTarget(node) {
@@ -360,7 +368,7 @@ function resolveEnclosingAssignmentTarget(node) {
 }
 //#endregion
 //#region src/resolve-object-type.ts
-function resolveObjectType(context, node) {
+function resolveObjectType(context, node, options) {
 	if (node == null) return null;
 	switch (node.type) {
 		case AST_NODE_TYPES.JSXElement:
@@ -376,6 +384,7 @@ function resolveObjectType(context, node) {
 			kind: "plain",
 			node
 		};
+		case AST_NODE_TYPES.ClassDeclaration:
 		case AST_NODE_TYPES.ClassExpression: return {
 			kind: "class",
 			node
@@ -398,22 +407,24 @@ function resolveObjectType(context, node) {
 			};
 			return null;
 		case AST_NODE_TYPES.Identifier: {
-			if ((context.sourceCode.getScope(node).set.get(node.name)?.defs.at(-1))?.type === DefinitionType.Parameter) return null;
-			const initNode = resolve(context, node, {
+			const initNode = options?.boundary != null ? resolve(context, node, {
+				at: -1,
+				boundary: options.boundary
+			}) : resolve(context, node, {
 				at: -1,
 				localOnly: true
 			});
 			if (initNode == null) return null;
-			return resolveObjectType(context, initNode);
+			return resolveObjectType(context, initNode, options);
 		}
-		case AST_NODE_TYPES.MemberExpression: return resolveObjectType(context, node.object);
+		case AST_NODE_TYPES.MemberExpression: return resolveObjectType(context, node.object, options);
 		case AST_NODE_TYPES.AssignmentExpression:
-		case AST_NODE_TYPES.AssignmentPattern: return resolveObjectType(context, node.right);
-		case AST_NODE_TYPES.LogicalExpression: return resolveObjectType(context, node.left) ?? resolveObjectType(context, node.right);
-		case AST_NODE_TYPES.ConditionalExpression: return resolveObjectType(context, node.consequent) ?? resolveObjectType(context, node.alternate);
+		case AST_NODE_TYPES.AssignmentPattern: return resolveObjectType(context, node.right, options);
+		case AST_NODE_TYPES.LogicalExpression: return resolveObjectType(context, node.left, options) ?? resolveObjectType(context, node.right, options);
+		case AST_NODE_TYPES.ConditionalExpression: return resolveObjectType(context, node.consequent, options) ?? resolveObjectType(context, node.alternate, options);
 		case AST_NODE_TYPES.SequenceExpression:
 			if (node.expressions.length === 0) return null;
-			return resolveObjectType(context, node.expressions.at(-1) ?? null);
+			return resolveObjectType(context, node.expressions.at(-1) ?? null, options);
 		case AST_NODE_TYPES.CallExpression: {
 			const callee = Extract.unwrap(node.callee);
 			switch (true) {
@@ -457,7 +468,7 @@ function resolveObjectType(context, node) {
 		}
 		default:
 			if (!hasProperty(node, "expression") || typeof node.expression !== "object") return null;
-			return resolveObjectType(context, node.expression);
+			return resolveObjectType(context, node.expression, options);
 	}
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "5.28.1",
+  "version": "5.28.3",
   "description": "ESLint React's TSESTree AST utility module for static analysis of variables.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -29,11 +29,11 @@
     "dist"
   ],
   "dependencies": {
-    "@eslint-react/ast": "5.28.1",
-    "@eslint-react/eslint": "5.28.1",
-    "@typescript-eslint/scope-manager": "^8.71.2",
-    "@typescript-eslint/types": "^8.71.2",
-    "@typescript-eslint/utils": "^8.71.2",
+    "@eslint-react/ast": "5.28.3",
+    "@eslint-react/eslint": "5.28.3",
+    "@typescript-eslint/scope-manager": "^8.72.0",
+    "@typescript-eslint/types": "^8.72.0",
+    "@typescript-eslint/utils": "^8.72.0",
     "ts-pattern": "^5.9.2"
   },
   "devDependencies": {
@@ -42,7 +42,7 @@
     "@local/testkit": "0.0.0",
     "@tsconfig/node20": "^20.1.10",
     "@types/node": "^20.19.43",
-    "@typescript-eslint/typescript-estree": "^8.71.2",
+    "@typescript-eslint/typescript-estree": "^8.72.0",
     "eslint": "^10.13.0",
     "tsdown": "^0.23.1",
     "typescript": "6.0.3",