@eslint-react/var 1.17.4-next.1 → 1.17.4-next.11

package/dist/index.d.mts

@@ -452,6 +452,8 @@ declare function getChidScopes(scope: Scope, prev?: readonly Scope[]): readonly
 
 declare function getScope(node: TSESTree.Node, scopeManager: ScopeManager): _typescript_eslint_scope_manager.Scope | null;
 
+declare function getStaticValue(node: TSESTree.Node, initialScope: Scope): O.Option<unknown>;
+
 declare function getVariableDeclaratorID(node: TSESTree.Node, prev?: TSESTree.Node): O.Option<TSESTree.BindingName | TSESTree.Expression>;
 
 /**
@@ -491,6 +493,9 @@ declare function isInitializedFromSource(name: string, source: string, initialSc
  * @param initialScopes initial scopes of the two nodes
  * @returns `true` if node value equal
  */
-declare function isNodeValueEqual(a: TSESTree.Node, b: TSESTree.Node, initialScopes: [Scope, Scope]): boolean;
+declare function isNodeValueEqual(a: TSESTree.Node, b: TSESTree.Node, initialScopes: [
+    aScope: Scope,
+    bScope: Scope
+]): boolean;
 
-export { Construction, ConstructionHint, findVariable, getChidScopes, getScope, getVariableDeclaratorID, getVariableDef, getVariableNode, getVariables, inspectConstruction, isInitializedFromSource, isNodeValueEqual };
+export { Construction, ConstructionHint, findVariable, getChidScopes, getScope, getStaticValue, getVariableDeclaratorID, getVariableDef, getVariableNode, getVariables, inspectConstruction, isInitializedFromSource, isNodeValueEqual };

package/dist/index.d.ts

@@ -452,6 +452,8 @@ declare function getChidScopes(scope: Scope, prev?: readonly Scope[]): readonly
 
 declare function getScope(node: TSESTree.Node, scopeManager: ScopeManager): _typescript_eslint_scope_manager.Scope | null;
 
+declare function getStaticValue(node: TSESTree.Node, initialScope: Scope): O.Option<unknown>;
+
 declare function getVariableDeclaratorID(node: TSESTree.Node, prev?: TSESTree.Node): O.Option<TSESTree.BindingName | TSESTree.Expression>;
 
 /**
@@ -491,6 +493,9 @@ declare function isInitializedFromSource(name: string, source: string, initialSc
  * @param initialScopes initial scopes of the two nodes
  * @returns `true` if node value equal
  */
-declare function isNodeValueEqual(a: TSESTree.Node, b: TSESTree.Node, initialScopes: [Scope, Scope]): boolean;
+declare function isNodeValueEqual(a: TSESTree.Node, b: TSESTree.Node, initialScopes: [
+    aScope: Scope,
+    bScope: Scope
+]): boolean;
 
-export { Construction, ConstructionHint, findVariable, getChidScopes, getScope, getVariableDeclaratorID, getVariableDef, getVariableNode, getVariables, inspectConstruction, isInitializedFromSource, isNodeValueEqual };
+export { Construction, ConstructionHint, findVariable, getChidScopes, getScope, getStaticValue, getVariableDeclaratorID, getVariableDef, getVariableNode, getVariables, inspectConstruction, isInitializedFromSource, isNodeValueEqual };

package/dist/index.js

@@ -5,7 +5,7 @@ var tools = require('@eslint-react/tools');
 var scopeManager = require('@typescript-eslint/scope-manager');
 var types = require('@typescript-eslint/types');
 var tsPattern = require('ts-pattern');
-var astUtils = require('@typescript-eslint/utils/ast-utils');
+var ASTUtils = require('@typescript-eslint/utils/ast-utils');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -26,6 +26,7 @@ function _interopNamespace(e) {
 }
 
 var AST__namespace = /*#__PURE__*/_interopNamespace(AST);
+var ASTUtils__namespace = /*#__PURE__*/_interopNamespace(ASTUtils);
 
 // src/construction.ts
 var Construction = tools.Data.taggedEnum();
@@ -122,8 +123,8 @@ function inspectConstruction(node, initialScope, hint = ConstructionHint.None) {
   };
   return detect(node);
 }
-var findVariable = tools.F.dual(2, (nameOrNode, initialScope) => {
-  return tools.O.fromNullable(astUtils.findVariable(initialScope, nameOrNode));
+var findVariable2 = tools.F.dual(2, (nameOrNode, initialScope) => {
+  return tools.O.fromNullable(ASTUtils__namespace.findVariable(initialScope, nameOrNode));
 });
 
 // src/get-child-scopes.ts
@@ -138,6 +139,12 @@ function getScope(node, scopeManager) {
   if (parent) return getScope(parent, scopeManager);
   return null;
 }
+function getStaticValue2(node, initialScope) {
+  return tools.F.pipe(
+    tools.O.fromNullable(ASTUtils__namespace.getStaticValue(node, initialScope)),
+    tools.O.map((v) => v.value)
+  );
+}
 function getVariableDeclaratorID(node, prev) {
   switch (true) {
     case (node.type === types.AST_NODE_TYPES.VariableDeclarator && node.init === prev):
@@ -187,7 +194,7 @@ function getVariables(initialScope) {
   return variables.reverse();
 }
 function isInitializedFromSource(name, source, initialScope) {
-  const maybeLatestDef = tools.O.flatMapNullable(findVariable(name, initialScope), (v) => v.defs.at(-1));
+  const maybeLatestDef = tools.O.flatMapNullable(findVariable2(name, initialScope), (v) => v.defs.at(-1));
   if (tools.O.isNone(maybeLatestDef)) return false;
   const latestDef = maybeLatestDef.value;
   const { node, parent } = latestDef;
@@ -236,8 +243,8 @@ function isNodeValueEqual(a, b, initialScopes) {
       return a.value.cooked === b.value.cooked;
     }
     case (a.type === types.AST_NODE_TYPES.Identifier && b.type === types.AST_NODE_TYPES.Identifier): {
-      const aVar = findVariable(a, aScope);
-      const bVar = findVariable(b, bScope);
+      const aVar = findVariable2(a, aScope);
+      const bVar = findVariable2(b, bScope);
       const aVarNode = tools.O.flatMap(aVar, getVariableNode(0));
       const bVarNode = tools.O.flatMap(bVar, getVariableNode(0));
       const aVarNodeParent = tools.O.flatMapNullable(aVarNode, (n) => n.parent);
@@ -268,13 +275,16 @@ function isNodeValueEqual(a, b, initialScopes) {
         case (tools.O.exists(aDefParentParent, AST__namespace.is(types.AST_NODE_TYPES.ForOfStatement)) && tools.O.exists(bDefParentParent, AST__namespace.is(types.AST_NODE_TYPES.ForOfStatement))): {
           return tools.F.pipe(
             tools.O.Do,
+            tools.O.bind("aLeft", () => tools.O.map(aDefParentParent, (d) => d.left)),
+            tools.O.bind("bLeft", () => tools.O.map(bDefParentParent, (d) => d.left)),
+            tools.O.filter(({ aLeft, bLeft }) => aLeft.type === bLeft.type),
             tools.O.bind("aRight", () => tools.O.map(aDefParentParent, (d) => d.right)),
             tools.O.bind("bRight", () => tools.O.map(bDefParentParent, (d) => d.right)),
             tools.O.exists(({ aRight, bRight }) => AST__namespace.isNodeEqual(aRight, bRight))
           );
         }
         default: {
-          return tools.O.isSome(aVar) && tools.O.isSome(bVar) && aVar.value === bVar.value;
+          return tools.O.isSome(aVar) && tools.O.isSome(bVar) && tools.Equal.equals(aVar, bVar);
         }
       }
     }
@@ -283,23 +293,30 @@ function isNodeValueEqual(a, b, initialScopes) {
     }
     case (a.type === types.AST_NODE_TYPES.ThisExpression && b.type === types.AST_NODE_TYPES.ThisExpression): {
       if (aScope.block === bScope.block) return true;
-      const fa = AST__namespace.traverseUp(a, AST__namespace.isOneOf(thisBlockTypes));
-      const fb = AST__namespace.traverseUp(a, AST__namespace.isOneOf(thisBlockTypes));
-      return tools.O.isSome(fa) && tools.O.isSome(fb) && fa.value === fb.value;
+      return tools.F.pipe(
+        tools.O.Do,
+        tools.O.bind("aFunction", () => AST__namespace.traverseUp(a, AST__namespace.isOneOf(thisBlockTypes))),
+        tools.O.bind("bFunction", () => AST__namespace.traverseUp(b, AST__namespace.isOneOf(thisBlockTypes))),
+        tools.O.exists(({ aFunction, bFunction }) => aFunction === bFunction)
+      );
     }
     default: {
-      const aStatic = astUtils.getStaticValue(a, aScope);
-      const bStatic = astUtils.getStaticValue(b, bScope);
-      return !!aStatic && !!bStatic && aStatic.value === bStatic.value;
+      return tools.F.pipe(
+        tools.O.Do,
+        tools.O.bind("aStatic", () => getStaticValue2(a, aScope)),
+        tools.O.bind("bStatic", () => getStaticValue2(b, bScope)),
+        tools.O.exists(({ aStatic, bStatic }) => aStatic === bStatic)
+      );
     }
   }
 }
 
 exports.Construction = Construction;
 exports.ConstructionHint = ConstructionHint;
-exports.findVariable = findVariable;
+exports.findVariable = findVariable2;
 exports.getChidScopes = getChidScopes;
 exports.getScope = getScope;
+exports.getStaticValue = getStaticValue2;
 exports.getVariableDeclaratorID = getVariableDeclaratorID;
 exports.getVariableDef = getVariableDef;
 exports.getVariableNode = getVariableNode;

package/dist/index.mjs

@@ -1,9 +1,9 @@
 import * as AST from '@eslint-react/ast';
-import { Data, F, O, isString, isNullable, isObject } from '@eslint-react/tools';
+import { Data, F, O, isString, Equal, isNullable, isObject } from '@eslint-react/tools';
 import { DefinitionType, ScopeType } from '@typescript-eslint/scope-manager';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { match, isMatching } from 'ts-pattern';
-import { findVariable as findVariable$1, getStaticValue } from '@typescript-eslint/utils/ast-utils';
+import * as ASTUtils from '@typescript-eslint/utils/ast-utils';
 
 // src/construction.ts
 var Construction = Data.taggedEnum();
@@ -100,8 +100,8 @@ function inspectConstruction(node, initialScope, hint = ConstructionHint.None) {
   };
   return detect(node);
 }
-var findVariable = F.dual(2, (nameOrNode, initialScope) => {
-  return O.fromNullable(findVariable$1(initialScope, nameOrNode));
+var findVariable2 = F.dual(2, (nameOrNode, initialScope) => {
+  return O.fromNullable(ASTUtils.findVariable(initialScope, nameOrNode));
 });
 
 // src/get-child-scopes.ts
@@ -116,6 +116,12 @@ function getScope(node, scopeManager) {
   if (parent) return getScope(parent, scopeManager);
   return null;
 }
+function getStaticValue2(node, initialScope) {
+  return F.pipe(
+    O.fromNullable(ASTUtils.getStaticValue(node, initialScope)),
+    O.map((v) => v.value)
+  );
+}
 function getVariableDeclaratorID(node, prev) {
   switch (true) {
     case (node.type === AST_NODE_TYPES.VariableDeclarator && node.init === prev):
@@ -165,7 +171,7 @@ function getVariables(initialScope) {
   return variables.reverse();
 }
 function isInitializedFromSource(name, source, initialScope) {
-  const maybeLatestDef = O.flatMapNullable(findVariable(name, initialScope), (v) => v.defs.at(-1));
+  const maybeLatestDef = O.flatMapNullable(findVariable2(name, initialScope), (v) => v.defs.at(-1));
   if (O.isNone(maybeLatestDef)) return false;
   const latestDef = maybeLatestDef.value;
   const { node, parent } = latestDef;
@@ -214,8 +220,8 @@ function isNodeValueEqual(a, b, initialScopes) {
       return a.value.cooked === b.value.cooked;
     }
     case (a.type === AST_NODE_TYPES.Identifier && b.type === AST_NODE_TYPES.Identifier): {
-      const aVar = findVariable(a, aScope);
-      const bVar = findVariable(b, bScope);
+      const aVar = findVariable2(a, aScope);
+      const bVar = findVariable2(b, bScope);
       const aVarNode = O.flatMap(aVar, getVariableNode(0));
       const bVarNode = O.flatMap(bVar, getVariableNode(0));
       const aVarNodeParent = O.flatMapNullable(aVarNode, (n) => n.parent);
@@ -246,13 +252,16 @@ function isNodeValueEqual(a, b, initialScopes) {
         case (O.exists(aDefParentParent, AST.is(AST_NODE_TYPES.ForOfStatement)) && O.exists(bDefParentParent, AST.is(AST_NODE_TYPES.ForOfStatement))): {
           return F.pipe(
             O.Do,
+            O.bind("aLeft", () => O.map(aDefParentParent, (d) => d.left)),
+            O.bind("bLeft", () => O.map(bDefParentParent, (d) => d.left)),
+            O.filter(({ aLeft, bLeft }) => aLeft.type === bLeft.type),
             O.bind("aRight", () => O.map(aDefParentParent, (d) => d.right)),
             O.bind("bRight", () => O.map(bDefParentParent, (d) => d.right)),
             O.exists(({ aRight, bRight }) => AST.isNodeEqual(aRight, bRight))
           );
         }
         default: {
-          return O.isSome(aVar) && O.isSome(bVar) && aVar.value === bVar.value;
+          return O.isSome(aVar) && O.isSome(bVar) && Equal.equals(aVar, bVar);
         }
       }
     }
@@ -261,16 +270,22 @@ function isNodeValueEqual(a, b, initialScopes) {
     }
     case (a.type === AST_NODE_TYPES.ThisExpression && b.type === AST_NODE_TYPES.ThisExpression): {
       if (aScope.block === bScope.block) return true;
-      const fa = AST.traverseUp(a, AST.isOneOf(thisBlockTypes));
-      const fb = AST.traverseUp(a, AST.isOneOf(thisBlockTypes));
-      return O.isSome(fa) && O.isSome(fb) && fa.value === fb.value;
+      return F.pipe(
+        O.Do,
+        O.bind("aFunction", () => AST.traverseUp(a, AST.isOneOf(thisBlockTypes))),
+        O.bind("bFunction", () => AST.traverseUp(b, AST.isOneOf(thisBlockTypes))),
+        O.exists(({ aFunction, bFunction }) => aFunction === bFunction)
+      );
     }
     default: {
-      const aStatic = getStaticValue(a, aScope);
-      const bStatic = getStaticValue(b, bScope);
-      return !!aStatic && !!bStatic && aStatic.value === bStatic.value;
+      return F.pipe(
+        O.Do,
+        O.bind("aStatic", () => getStaticValue2(a, aScope)),
+        O.bind("bStatic", () => getStaticValue2(b, bScope)),
+        O.exists(({ aStatic, bStatic }) => aStatic === bStatic)
+      );
     }
   }
 }
 
-export { Construction, ConstructionHint, findVariable, getChidScopes, getScope, getVariableDeclaratorID, getVariableDef, getVariableNode, getVariables, inspectConstruction, isInitializedFromSource, isNodeValueEqual };
+export { Construction, ConstructionHint, findVariable2 as findVariable, getChidScopes, getScope, getStaticValue2 as getStaticValue, getVariableDeclaratorID, getVariableDef, getVariableNode, getVariables, inspectConstruction, isInitializedFromSource, isNodeValueEqual };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "1.17.4-next.1",
+  "version": "1.17.4-next.11",
   "description": "TSESTree AST utility module for static analysis of variables",
   "homepage": "https://github.com/rel1cx/eslint-react",
   "bugs": {
@@ -39,9 +39,9 @@
     "@typescript-eslint/types": "^8.17.0",
     "@typescript-eslint/utils": "^8.17.0",
     "ts-pattern": "^5.5.0",
-    "@eslint-react/ast": "1.17.4-next.1",
-    "@eslint-react/tools": "1.17.4-next.1",
-    "@eslint-react/types": "1.17.4-next.1"
+    "@eslint-react/ast": "1.17.4-next.11",
+    "@eslint-react/tools": "1.17.4-next.11",
+    "@eslint-react/types": "1.17.4-next.11"
   },
   "devDependencies": {
     "string-ts": "^2.2.0",