@eslint-react/var 1.26.3-next.8 → 1.27.0-beta.1

package/dist/index.d.mts

@@ -13,6 +13,8 @@ declare function getChidScopes(scope: Scope): readonly Scope[];
 
 declare function getVariableDeclaratorId(node: TSESTree.Node | _, prev?: TSESTree.Node): TSESTree.BindingName | TSESTree.Expression | _;
 
+declare function getVariableId(node: TSESTree.Node, prev?: TSESTree.Node): TSESTree.Identifier | TSESTree.ArrayExpression | TSESTree.ArrayPattern | TSESTree.ArrowFunctionExpression | TSESTree.AssignmentExpression | TSESTree.AwaitExpression | TSESTree.BinaryExpression | TSESTree.CallExpression | TSESTree.ChainExpression | TSESTree.ClassExpression | TSESTree.ConditionalExpression | TSESTree.FunctionExpression | TSESTree.ImportExpression | TSESTree.JSXElement | TSESTree.JSXFragment | TSESTree.BigIntLiteral | TSESTree.BooleanLiteral | TSESTree.NullLiteral | TSESTree.NumberLiteral | TSESTree.RegExpLiteral | TSESTree.StringLiteral | TSESTree.TemplateLiteral | TSESTree.LogicalExpression | TSESTree.MemberExpressionComputedName | TSESTree.MemberExpressionNonComputedName | TSESTree.MetaProperty | TSESTree.NewExpression | TSESTree.ObjectExpression | TSESTree.ObjectPattern | TSESTree.SequenceExpression | TSESTree.Super | TSESTree.TaggedTemplateExpression | TSESTree.ThisExpression | TSESTree.TSAsExpression | TSESTree.TSInstantiationExpression | TSESTree.TSNonNullExpression | TSESTree.TSSatisfiesExpression | TSESTree.TSTypeAssertion | TSESTree.UnaryExpression | TSESTree.UpdateExpression | TSESTree.YieldExpression | TSESTree.PrivateIdentifier | undefined;
+
 declare function getVariableNode(variable: Variable | _, at: number): _ | TSESTree.ClassDeclaration | TSESTree.ClassDeclarationWithName | TSESTree.ClassDeclarationWithOptionalName | TSESTree.Expression | TSESTree.FunctionDeclaration | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName;
 
 /**
@@ -43,6 +45,11 @@ declare function isNodeValueEqual(a: TSESTree.Node, b: TSESTree.Node, initialSco
     bScope: Scope
 ]): boolean;
 
+declare function isVariableIdEqual(a: TSESTree.Node, b: TSESTree.Node, initialScopes: [
+    aScope: Scope,
+    bScope: Scope
+]): boolean;
+
 type LazyValue = {
     kind: "lazy";
     node: TSESTree.Node;
@@ -110,4 +117,4 @@ declare const ValueConstructionHint: {
  */
 declare function getValueConstruction(node: TSESTree.Node | _, initialScope: Scope, hint?: bigint): ValueConstruction | _;
 
-export { type LazyValue, type ValueConstruction, ValueConstructionHint, findPropertyInProperties, findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, toStaticValue };
+export { type LazyValue, type ValueConstruction, ValueConstructionHint, findPropertyInProperties, findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, isVariableIdEqual, toStaticValue };

package/dist/index.d.ts

@@ -13,6 +13,8 @@ declare function getChidScopes(scope: Scope): readonly Scope[];
 
 declare function getVariableDeclaratorId(node: TSESTree.Node | _, prev?: TSESTree.Node): TSESTree.BindingName | TSESTree.Expression | _;
 
+declare function getVariableId(node: TSESTree.Node, prev?: TSESTree.Node): TSESTree.Identifier | TSESTree.ArrayExpression | TSESTree.ArrayPattern | TSESTree.ArrowFunctionExpression | TSESTree.AssignmentExpression | TSESTree.AwaitExpression | TSESTree.BinaryExpression | TSESTree.CallExpression | TSESTree.ChainExpression | TSESTree.ClassExpression | TSESTree.ConditionalExpression | TSESTree.FunctionExpression | TSESTree.ImportExpression | TSESTree.JSXElement | TSESTree.JSXFragment | TSESTree.BigIntLiteral | TSESTree.BooleanLiteral | TSESTree.NullLiteral | TSESTree.NumberLiteral | TSESTree.RegExpLiteral | TSESTree.StringLiteral | TSESTree.TemplateLiteral | TSESTree.LogicalExpression | TSESTree.MemberExpressionComputedName | TSESTree.MemberExpressionNonComputedName | TSESTree.MetaProperty | TSESTree.NewExpression | TSESTree.ObjectExpression | TSESTree.ObjectPattern | TSESTree.SequenceExpression | TSESTree.Super | TSESTree.TaggedTemplateExpression | TSESTree.ThisExpression | TSESTree.TSAsExpression | TSESTree.TSInstantiationExpression | TSESTree.TSNonNullExpression | TSESTree.TSSatisfiesExpression | TSESTree.TSTypeAssertion | TSESTree.UnaryExpression | TSESTree.UpdateExpression | TSESTree.YieldExpression | TSESTree.PrivateIdentifier | undefined;
+
 declare function getVariableNode(variable: Variable | _, at: number): _ | TSESTree.ClassDeclaration | TSESTree.ClassDeclarationWithName | TSESTree.ClassDeclarationWithOptionalName | TSESTree.Expression | TSESTree.FunctionDeclaration | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName;
 
 /**
@@ -43,6 +45,11 @@ declare function isNodeValueEqual(a: TSESTree.Node, b: TSESTree.Node, initialSco
     bScope: Scope
 ]): boolean;
 
+declare function isVariableIdEqual(a: TSESTree.Node, b: TSESTree.Node, initialScopes: [
+    aScope: Scope,
+    bScope: Scope
+]): boolean;
+
 type LazyValue = {
     kind: "lazy";
     node: TSESTree.Node;
@@ -110,4 +117,4 @@ declare const ValueConstructionHint: {
  */
 declare function getValueConstruction(node: TSESTree.Node | _, initialScope: Scope, hint?: bigint): ValueConstruction | _;
 
-export { type LazyValue, type ValueConstruction, ValueConstructionHint, findPropertyInProperties, findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, toStaticValue };
+export { type LazyValue, type ValueConstruction, ValueConstructionHint, findPropertyInProperties, findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, isVariableIdEqual, toStaticValue };

package/dist/index.js

@@ -110,6 +110,20 @@ function getVariableDeclaratorId(node, prev) {
       return getVariableDeclaratorId(node.parent, node);
   }
 }
+function getVariableId(node, prev) {
+  switch (true) {
+    case (node.type === types.AST_NODE_TYPES.VariableDeclarator && node.init === prev):
+      return node.id;
+    case (node.type === types.AST_NODE_TYPES.AssignmentExpression && node.right === prev):
+      return node.left;
+    case (node.type === types.AST_NODE_TYPES.PropertyDefinition && node.value === prev):
+      return node.key;
+    case (node.type === types.AST_NODE_TYPES.BlockStatement || node.type === types.AST_NODE_TYPES.Program || node.parent === node):
+      return eff._;
+    default:
+      return getVariableId(node.parent, node);
+  }
+}
 function getVariables(initialScope) {
   let scope = initialScope;
   const variables = [...scope.variables];
@@ -236,6 +250,9 @@ function isNodeValueEqual(a, b, initialScopes) {
     }
   }
 }
+function isVariableIdEqual(a, b, initialScopes) {
+  return AST3__namespace.isNodeEqual(a, b) || isNodeValueEqual(a, b, initialScopes);
+}
 var ValueConstructionHint = {
   None: 0n,
   StrictCallExpression: 1n << 0n
@@ -289,7 +306,7 @@ function getValueConstruction(node, initialScope, hint = ValueConstructionHint.N
       return getValueConstruction(node.alternate, initialScope, hint);
     }
     case types.AST_NODE_TYPES.Identifier: {
-      if (!("name" in node && typeof node.name === "string")) {
+      if (!("name" in node) || typeof node.name !== "string") {
         return eff._;
       }
       const variable = initialScope.set.get(node.name);
@@ -303,7 +320,7 @@ function getValueConstruction(node, initialScope, hint = ValueConstructionHint.N
       return eff._;
     }
     default: {
-      if (!("expression" in node && typeof node.expression === "object")) {
+      if (!("expression" in node) || typeof node.expression !== "object") {
         return eff._;
       }
       return getValueConstruction(node.expression, initialScope, hint);
@@ -317,8 +334,10 @@ exports.findVariable = findVariable2;
 exports.getChidScopes = getChidScopes;
 exports.getValueConstruction = getValueConstruction;
 exports.getVariableDeclaratorId = getVariableDeclaratorId;
+exports.getVariableId = getVariableId;
 exports.getVariableNode = getVariableNode;
 exports.getVariables = getVariables;
 exports.isInitializedFromSource = isInitializedFromSource;
 exports.isNodeValueEqual = isNodeValueEqual;
+exports.isVariableIdEqual = isVariableIdEqual;
 exports.toStaticValue = toStaticValue;

package/dist/index.mjs

@@ -88,6 +88,20 @@ function getVariableDeclaratorId(node, prev) {
       return getVariableDeclaratorId(node.parent, node);
   }
 }
+function getVariableId(node, prev) {
+  switch (true) {
+    case (node.type === AST_NODE_TYPES.VariableDeclarator && node.init === prev):
+      return node.id;
+    case (node.type === AST_NODE_TYPES.AssignmentExpression && node.right === prev):
+      return node.left;
+    case (node.type === AST_NODE_TYPES.PropertyDefinition && node.value === prev):
+      return node.key;
+    case (node.type === AST_NODE_TYPES.BlockStatement || node.type === AST_NODE_TYPES.Program || node.parent === node):
+      return _;
+    default:
+      return getVariableId(node.parent, node);
+  }
+}
 function getVariables(initialScope) {
   let scope = initialScope;
   const variables = [...scope.variables];
@@ -214,6 +228,9 @@ function isNodeValueEqual(a, b, initialScopes) {
     }
   }
 }
+function isVariableIdEqual(a, b, initialScopes) {
+  return AST3.isNodeEqual(a, b) || isNodeValueEqual(a, b, initialScopes);
+}
 var ValueConstructionHint = {
   None: 0n,
   StrictCallExpression: 1n << 0n
@@ -267,7 +284,7 @@ function getValueConstruction(node, initialScope, hint = ValueConstructionHint.N
       return getValueConstruction(node.alternate, initialScope, hint);
     }
     case AST_NODE_TYPES.Identifier: {
-      if (!("name" in node && typeof node.name === "string")) {
+      if (!("name" in node) || typeof node.name !== "string") {
         return _;
       }
       const variable = initialScope.set.get(node.name);
@@ -281,7 +298,7 @@ function getValueConstruction(node, initialScope, hint = ValueConstructionHint.N
       return _;
     }
     default: {
-      if (!("expression" in node && typeof node.expression === "object")) {
+      if (!("expression" in node) || typeof node.expression !== "object") {
         return _;
       }
       return getValueConstruction(node.expression, initialScope, hint);
@@ -289,4 +306,4 @@ function getValueConstruction(node, initialScope, hint = ValueConstructionHint.N
   }
 }
 
-export { ValueConstructionHint, findPropertyInProperties, findVariable2 as findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, toStaticValue };
+export { ValueConstructionHint, findPropertyInProperties, findVariable2 as findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, isVariableIdEqual, toStaticValue };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "1.26.3-next.8",
+  "version": "1.27.0-beta.1",
   "description": "ESLint React's TSESTree AST utility module for static analysis of variables.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -35,13 +35,13 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.23.0",
-    "@typescript-eslint/types": "^8.23.0",
-    "@typescript-eslint/utils": "^8.23.0",
+    "@typescript-eslint/scope-manager": "^8.24.1",
+    "@typescript-eslint/types": "^8.24.1",
+    "@typescript-eslint/utils": "^8.24.1",
     "string-ts": "^2.2.1",
     "ts-pattern": "^5.6.2",
-    "@eslint-react/ast": "1.26.3-next.8",
-    "@eslint-react/eff": "1.26.3-next.8"
+    "@eslint-react/ast": "1.27.0-beta.1",
+    "@eslint-react/eff": "1.27.0-beta.1"
   },
   "devDependencies": {
     "tsup": "^8.3.6",
@@ -54,6 +54,6 @@
   "scripts": {
     "build": "tsup",
     "lint:publish": "publint",
-    "lint:type": "tsc --noEmit"
+    "lint:ts": "tsc --noEmit"
   }
 }