@eslint-react/var 3.0.0-next.53 → 3.0.0-next.55

package/dist/index.d.ts

@@ -52,13 +52,10 @@ declare function getVariableInitializer(variable: Variable | unit, at: number):
  */
 declare function getVariableInitializerLoose(variable: Variable | unit, at: number): unit | TSESTree.ClassDeclaration | TSESTree.Expression | TSESTree.FunctionDeclaration;
 //#endregion
-//#region src/scope.d.ts
-/**
- * Get all variables from the given scope up to the global scope
- * @param initialScope The scope to start from
- * @returns All variables from the given scope up to the global scope
- */
-declare function getVariables(initialScope: Scope): Variable[];
+//#region src/binding-kind.d.ts
+type BindingKind = "var" | "let" | "const" | "module" | "hoisted" | "param" | "local" | "unknown";
+//#endregion
+//#region src/helper.d.ts
 /**
  * Find a variable by name or identifier node in the scope chain
  * @param initialScope The scope to start searching from
@@ -72,12 +69,6 @@ declare const findVariable: {
   (initialScope: Scope): (nameOrNode: string | TSESTree.Identifier | unit) => Variable | unit;
   (nameOrNode: string | TSESTree.Identifier | unit, initialScope: Scope): Variable | unit;
 };
-/**
- * Get all child scopes recursively from a given scope
- * @param scope The scope to get child scopes from
- * @returns Array of all child scopes including the input scope
- */
-declare function getChildScopes(scope: Scope): readonly Scope[];
 //#endregion
 //#region src/value-equality.d.ts
 /**
@@ -139,4 +130,4 @@ type ObjectType = {
  */
 declare function getObjectType(node: TSESTree.Node | unit, initialScope: Scope): ObjectType | unit;
 //#endregion
-export { AssignmentTarget, ObjectType, findEnclosingAssignmentTarget, findImportSource, findProperty, findVariable, getChildScopes, getObjectType, getVariableInitializer, getVariableInitializerLoose, getVariables, isAssignmentTargetEqual, isValueEqual };
+export { AssignmentTarget, BindingKind, ObjectType, findEnclosingAssignmentTarget, findImportSource, findProperty, findVariable, getObjectType, getVariableInitializer, getVariableInitializerLoose, isAssignmentTargetEqual, isValueEqual };

package/dist/index.js

@@ -3,7 +3,7 @@ import { dual, identity, 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 { DefinitionType, ScopeType } from "@typescript-eslint/scope-manager";
+import { DefinitionType } from "@typescript-eslint/scope-manager";
 import { P, match } from "ts-pattern";
 
 //#region src/binding-initializer.ts
@@ -40,21 +40,7 @@ function getVariableInitializerLoose(variable, at) {
 }
 
 //#endregion
-//#region src/scope.ts
-/**
-* Get all variables from the given scope up to the global scope
-* @param initialScope The scope to start from
-* @returns All variables from the given scope up to the global scope
-*/
-function getVariables(initialScope) {
-	let scope = initialScope;
-	const variables = [...scope.variables];
-	while (scope.type !== ScopeType.global) {
-		scope = scope.upper;
-		variables.push(...scope.variables);
-	}
-	return variables.reverse();
-}
+//#region src/helper.ts
 /**
 * Find a variable by name or identifier node in the scope chain
 * @param initialScope The scope to start searching from
@@ -68,16 +54,6 @@ const findVariable = dual(2, (nameOrNode, initialScope) => {
 	if (nameOrNode == null) return unit;
 	return astUtils.findVariable(initialScope, nameOrNode) ?? unit;
 });
-/**
-* Get all child scopes recursively from a given scope
-* @param scope The scope to get child scopes from
-* @returns Array of all child scopes including the input scope
-*/
-function getChildScopes(scope) {
-	const scopes = [scope];
-	for (const childScope of scope.childScopes) scopes.push(...getChildScopes(childScope));
-	return scopes;
-}
 
 //#endregion
 //#region src/value-equality.ts
@@ -105,19 +81,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 aVarNode = getVariableInitializerLoose(aVar, 0);
-			const bVarNode = getVariableInitializerLoose(bVar, 0);
-			const aVarNodeParent = aVarNode?.parent;
-			const bVarNodeParent = bVarNode?.parent;
+			const aVarInit = getVariableInitializerLoose(aVar, 0);
+			const bVarInit = getVariableInitializerLoose(bVar, 0);
+			const aVarInitParent = aVarInit?.parent;
+			const bVarInitParent = bVarInit?.parent;
 			const aDef = aVar?.defs.at(0);
 			const bDef = bVar?.defs.at(0);
 			const aDefParentParent = aDef?.parent?.parent;
 			const bDefParentParent = bDef?.parent?.parent;
 			switch (true) {
-				case aVarNodeParent?.type === AST_NODE_TYPES.CallExpression && bVarNodeParent?.type === AST_NODE_TYPES.CallExpression && ast.isFunction(aVarNode) && ast.isFunction(bVarNode): {
-					if (!ast.isNodeEqual(aVarNodeParent.callee, bVarNodeParent.callee)) return false;
-					const aParams = aVarNode.params;
-					const bParams = bVarNode.params;
+				case aVarInitParent?.type === AST_NODE_TYPES.CallExpression && bVarInitParent?.type === AST_NODE_TYPES.CallExpression && ast.isFunction(aVarInit) && ast.isFunction(bVarInit): {
+					if (!ast.isNodeEqual(aVarInitParent.callee, bVarInitParent.callee)) return false;
+					const aParams = aVarInit.params;
+					const bParams = bVarInit.params;
 					const aPos = aParams.findIndex((x) => ast.isNodeEqual(x, a));
 					const bPos = bParams.findIndex((x) => ast.isNodeEqual(x, b));
 					return aPos !== -1 && bPos !== -1 && aPos === bPos;
@@ -322,4 +298,4 @@ function getObjectType(node, initialScope) {
 }
 
 //#endregion
-export { findEnclosingAssignmentTarget, findImportSource, findProperty, findVariable, getChildScopes, getObjectType, getVariableInitializer, getVariableInitializerLoose, getVariables, isAssignmentTargetEqual, isValueEqual };
+export { findEnclosingAssignmentTarget, findImportSource, findProperty, findVariable, getObjectType, getVariableInitializer, getVariableInitializerLoose, isAssignmentTargetEqual, isValueEqual };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "3.0.0-next.53",
+  "version": "3.0.0-next.55",
   "description": "ESLint React's TSESTree AST utility module for static analysis of variables.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -34,12 +34,12 @@
     "@typescript-eslint/types": "canary",
     "@typescript-eslint/utils": "canary",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "3.0.0-next.53",
-    "@eslint-react/eff": "3.0.0-next.53",
-    "@eslint-react/shared": "3.0.0-next.53"
+    "@eslint-react/ast": "3.0.0-next.55",
+    "@eslint-react/eff": "3.0.0-next.55",
+    "@eslint-react/shared": "3.0.0-next.55"
   },
   "devDependencies": {
-    "tsdown": "^0.20.3",
+    "tsdown": "^0.21.0-beta.1",
     "@local/configs": "0.0.0"
   },
   "peerDependencies": {