@eslint-react/var 3.0.0-next.60 → 3.0.0-next.61

package/dist/index.d.ts

@@ -70,22 +70,6 @@ type ObjectType = {
  */
 declare function getObjectType(node: TSESTree.Node | unit, initialScope: Scope): ObjectType | unit;
 //#endregion
-//#region src/get-variable-initializer.d.ts
-/**
- * Get the initializer expression or statement of a variable definition at a specified index
- * @param variable The variable to get the initializer from
- * @param at The index of the variable definition to get the initializer from
- * @returns The initializer expression or statement of the variable definition at the specified index, or unit if not found
- */
-declare function getVariableInitializer(variable: Variable | unit, at: number): unit | TSESTree.ClassDeclaration | TSESTree.Expression | TSESTree.FunctionDeclaration;
-/**
- * Get the initializer expression or statement of a variable definition at a specified index, or the function declaration if the variable is a parameter of a function
- * @param variable The variable to get the initializer from
- * @param at The index of the variable definition to get the initializer from
- * @returns The initializer expression or statement of the variable definition at the specified index, or the function declaration if the variable is a parameter of a function, or unit if not found
- */
-declare function getVariableInitializerLoose(variable: Variable | unit, at: number): unit | TSESTree.ClassDeclaration | TSESTree.Expression | TSESTree.FunctionDeclaration;
-//#endregion
 //#region src/is-assignment-target-equal.d.ts
 /**
  * Check if two assignment targets are equal
@@ -108,4 +92,4 @@ declare function isAssignmentTargetEqual(context: RuleContext, a: TSESTree.Node,
  */
 declare function isValueEqual(a: TSESTree.Node, b: TSESTree.Node, initialScopes: [aScope: Scope, bScope: Scope]): boolean;
 //#endregion
-export { AssignmentTarget, ObjectType, findEnclosingAssignmentTarget, findVariable, getObjectType, getVariableInitializer, getVariableInitializerLoose, isAssignmentTargetEqual, isValueEqual };
+export { AssignmentTarget, ObjectType, findEnclosingAssignmentTarget, findVariable, getObjectType, isAssignmentTargetEqual, isValueEqual };

package/dist/index.js

@@ -2,8 +2,8 @@ import { dual, unit } from "@eslint-react/eff";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import * as astUtils from "@typescript-eslint/utils/ast-utils";
 import { getStaticValue } from "@typescript-eslint/utils/ast-utils";
-import * as ast from "@eslint-react/ast";
 import { DefinitionType } from "@typescript-eslint/scope-manager";
+import * as ast from "@eslint-react/ast";
 
 //#region src/find-enclosing-assignment-target.ts
 /**
@@ -39,40 +39,6 @@ const findVariable = dual(2, (nameOrNode, initialScope) => {
 	return astUtils.findVariable(initialScope, nameOrNode) ?? unit;
 });
 
-//#endregion
-//#region src/get-variable-initializer.ts
-/**
-* Get the initializer expression or statement of a variable definition at a specified index
-* @param variable The variable to get the initializer from
-* @param at The index of the variable definition to get the initializer from
-* @returns The initializer expression or statement of the variable definition at the specified index, or unit if not found
-*/
-function getVariableInitializer(variable, at) {
-	if (variable == null) return unit;
-	const def = variable.defs.at(at);
-	if (def == null) return unit;
-	switch (true) {
-		case def.type === DefinitionType.FunctionName && def.node.type === AST_NODE_TYPES.FunctionDeclaration: return def.node;
-		case def.type === DefinitionType.ClassName && def.node.type === AST_NODE_TYPES.ClassDeclaration: return def.node;
-		case "init" in def.node && def.node.init != null && !("declarations" in def.node.init): return def.node.init;
-		default: return unit;
-	}
-}
-/**
-* Get the initializer expression or statement of a variable definition at a specified index, or the function declaration if the variable is a parameter of a function
-* @param variable The variable to get the initializer from
-* @param at The index of the variable definition to get the initializer from
-* @returns The initializer expression or statement of the variable definition at the specified index, or the function declaration if the variable is a parameter of a function, or unit if not found
-*/
-function getVariableInitializerLoose(variable, at) {
-	if (variable == null) return unit;
-	const node = getVariableInitializer(variable, at);
-	if (node != null) return node;
-	const def = variable.defs.at(at);
-	if (def?.type === DefinitionType.Parameter && ast.isFunction(def.node)) return def.node;
-	return unit;
-}
-
 //#endregion
 //#region src/get-object-type.ts
 /**
@@ -118,9 +84,20 @@ function getObjectType(node, initialScope) {
 				node
 			};
 			return unit;
-		case AST_NODE_TYPES.Identifier:
-			if (!("name" in node) || typeof node.name !== "string") return unit;
-			return getObjectType(getVariableInitializer(initialScope.set.get(node.name), -1), initialScope);
+		case AST_NODE_TYPES.Identifier: {
+			function resolve(v) {
+				if (v == null) return unit;
+				const def = v.defs.at(-1);
+				if (def == null) return unit;
+				if (def.type === DefinitionType.Variable) return def.node.init;
+				if (def.type === DefinitionType.Parameter) return unit;
+				if (def.type === DefinitionType.ImportBinding) return unit;
+				return def.node;
+			}
+			const initNode = resolve(initialScope.set.get(node.name));
+			if (initNode == null) return unit;
+			return getObjectType(initNode, initialScope);
+		}
 		case AST_NODE_TYPES.MemberExpression:
 			if (!("object" in node)) return unit;
 			return getObjectType(node.object, initialScope);
@@ -170,8 +147,19 @@ function isValueEqual(a, b, initialScopes) {
 		case a.type === AST_NODE_TYPES.Identifier && b.type === AST_NODE_TYPES.Identifier: {
 			const aVar = findVariable(a, aScope);
 			const bVar = findVariable(b, bScope);
-			const aVarInit = getVariableInitializerLoose(aVar, 0);
-			const bVarInit = getVariableInitializerLoose(bVar, 0);
+			const resolve = (variable) => {
+				if (variable == null) return unit;
+				const def = variable.defs.at(0);
+				if (def != null) switch (true) {
+					case def.type === DefinitionType.FunctionName && def.node.type === AST_NODE_TYPES.FunctionDeclaration: return def.node;
+					case def.type === DefinitionType.ClassName && def.node.type === AST_NODE_TYPES.ClassDeclaration: return def.node;
+					case "init" in def.node && def.node.init != null && !("declarations" in def.node.init): return def.node.init;
+				}
+				if (def?.type === DefinitionType.Parameter && ast.isFunction(def.node)) return def.node;
+				return unit;
+			};
+			const aVarInit = resolve(aVar);
+			const bVarInit = resolve(bVar);
 			const aVarInitParent = aVarInit?.parent;
 			const bVarInitParent = bVarInit?.parent;
 			const aDef = aVar?.defs.at(0);
@@ -226,4 +214,4 @@ function isAssignmentTargetEqual(context, a, b) {
 }
 
 //#endregion
-export { findEnclosingAssignmentTarget, findVariable, getObjectType, getVariableInitializer, getVariableInitializerLoose, isAssignmentTargetEqual, isValueEqual };
+export { findEnclosingAssignmentTarget, findVariable, getObjectType, isAssignmentTargetEqual, isValueEqual };

package/package.json

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