@eslint-react/var 3.0.0-next.65 → 3.0.0-next.67

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import { Scope } from "@typescript-eslint/scope-manager";
 import { TSESTree } from "@typescript-eslint/types";
 import { RuleContext } from "@eslint-react/shared";
 
@@ -69,12 +68,12 @@ declare function isAssignmentTargetEqual(context: RuleContext, a: TSESTree.Node,
 //#region src/is-value-equal.d.ts
 /**
  * Determine whether node value equals to another node value
+ * @param context rule context
  * @param a node to compare
  * @param b node to compare
- * @param initialScopes initial scopes of the two nodes
  * @returns `true` if node value equal
  */
-declare function isValueEqual(a: TSESTree.Node, b: TSESTree.Node, initialScopes: [aScope: Scope, bScope: Scope]): boolean;
+declare function isValueEqual(context: RuleContext, a: TSESTree.Node, b: TSESTree.Node): boolean;
 //#endregion
 //#region src/resolve.d.ts
 /**
@@ -99,13 +98,17 @@ declare function isValueEqual(a: TSESTree.Node, b: TSESTree.Node, initialScopes:
  *
  * @param context The ESLint rule context used for scope lookup.
  * @param node The identifier to resolve.
- * @param at Which definition to use when multiple exist (default: `0`; pass `-1` for the last).
- * @param localOnly When `true`, look up the variable only in the node's own scope (faster, but
+ * @param options Optional settings:
+ * - `at`: Index of the definition to resolve (default: `0` for the first definition).
+ * - `localOnly`: If `true`, only consider variables declared in the same scope as the identifier
  *   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.
  * @returns The resolved node, or `null` if the identifier cannot be resolved to a value node.
  */
-declare function resolve(context: RuleContext, node: TSESTree.Identifier, at?: number, localOnly?: boolean): TSESTree.Node | null;
+declare function resolve(context: RuleContext, node: TSESTree.Identifier, options?: Partial<{
+  at: number;
+  localOnly: boolean;
+}>): TSESTree.Node | null;
 //#endregion
 export { AssignmentTarget, ObjectType, computeObjectType, findEnclosingAssignmentTarget, isAssignmentTargetEqual, isValueEqual, resolve };

package/dist/index.js

@@ -26,14 +26,16 @@ import { findVariable, getStaticValue } from "@typescript-eslint/utils/ast-utils
 *
 * @param context The ESLint rule context used for scope lookup.
 * @param node The identifier to resolve.
-* @param at Which definition to use when multiple exist (default: `0`; pass `-1` for the last).
-* @param localOnly When `true`, look up the variable only in the node's own scope (faster, but
+* @param options Optional settings:
+* - `at`: Index of the definition to resolve (default: `0` for the first definition).
+* - `localOnly`: If `true`, only consider variables declared in the same scope as the identifier
 *   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.
 * @returns The resolved node, or `null` if the identifier cannot be resolved to a value node.
 */
-function resolve(context, node, at = 0, localOnly = false) {
+function resolve(context, node, options) {
+	const { at = 0, localOnly = false } = options ?? {};
 	const scope = context.sourceCode.getScope(node);
 	const variable = localOnly ? scope.set.get(node.name) : findVariable(scope, node);
 	if (variable == null) return null;
@@ -107,7 +109,10 @@ function computeObjectType(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, -1, true);
+			const initNode = resolve(context, node, {
+				at: -1,
+				localOnly: true
+			});
 			if (initNode == null) return null;
 			return computeObjectType(context, initNode);
 		}
@@ -163,15 +168,15 @@ const thisBlockTypes = [
 ];
 /**
 * Determine whether node value equals to another node value
+* @param context rule context
 * @param a node to compare
 * @param b node to compare
-* @param initialScopes initial scopes of the two nodes
 * @returns `true` if node value equal
 */
-function isValueEqual(a, b, initialScopes) {
+function isValueEqual(context, a, b) {
 	a = ast.isTypeExpression(a) ? ast.getUnderlyingExpression(a) : a;
 	b = ast.isTypeExpression(b) ? ast.getUnderlyingExpression(b) : b;
-	const [aScope, bScope] = initialScopes;
+	const [aScope, bScope] = [context.sourceCode.getScope(a), context.sourceCode.getScope(b)];
 	switch (true) {
 		case a === b: return true;
 		case a.type === AST_NODE_TYPES.Literal && b.type === AST_NODE_TYPES.Literal: return a.value === b.value;
@@ -218,7 +223,7 @@ function isValueEqual(a, b, initialScopes) {
 				default: return aVar != null && bVar != null && aVar === bVar;
 			}
 		}
-		case a.type === AST_NODE_TYPES.MemberExpression && b.type === AST_NODE_TYPES.MemberExpression: return ast.isNodeEqual(a.property, b.property) && isValueEqual(a.object, b.object, initialScopes);
+		case a.type === AST_NODE_TYPES.MemberExpression && b.type === AST_NODE_TYPES.MemberExpression: return ast.isNodeEqual(a.property, b.property) && isValueEqual(context, a.object, b.object);
 		case a.type === AST_NODE_TYPES.ThisExpression && b.type === AST_NODE_TYPES.ThisExpression:
 			if (aScope.block === bScope.block) return true;
 			return ast.findParentNode(a, ast.isOneOf(thisBlockTypes)) === ast.findParentNode(b, ast.isOneOf(thisBlockTypes));
@@ -242,7 +247,7 @@ function isValueEqual(a, b, initialScopes) {
 * @internal
 */
 function isAssignmentTargetEqual(context, a, b) {
-	return ast.isNodeEqual(a, b) || isValueEqual(a, b, [context.sourceCode.getScope(a), context.sourceCode.getScope(b)]);
+	return ast.isNodeEqual(a, b) || isValueEqual(context, a, b);
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "3.0.0-next.65",
+  "version": "3.0.0-next.67",
   "description": "ESLint React's TSESTree AST utility module for static analysis of variables.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -34,9 +34,9 @@
     "@typescript-eslint/types": "canary",
     "@typescript-eslint/utils": "canary",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "3.0.0-next.65",
-    "@eslint-react/eff": "3.0.0-next.65",
-    "@eslint-react/shared": "3.0.0-next.65"
+    "@eslint-react/ast": "3.0.0-next.67",
+    "@eslint-react/eff": "3.0.0-next.67",
+    "@eslint-react/shared": "3.0.0-next.67"
   },
   "devDependencies": {
     "@typescript-eslint/typescript-estree": "canary",