@eslint-react/var 1.23.2-beta.2 → 1.23.2-beta.6

package/dist/index.js

@@ -95,9 +95,9 @@ function getVariables(initialScope) {
   return variables.reverse();
 }
 function isInitializedFromSource(name, source, initialScope) {
-  const maybeLatestDef = eff.O.flatMapNullable(findVariable2(name, initialScope), (v) => v.defs.at(-1));
-  if (eff.O.isNone(maybeLatestDef)) return false;
-  const { node, parent } = maybeLatestDef.value;
+  const latestDef = eff.O.flatMapNullable(findVariable2(name, initialScope), (v) => v.defs.at(-1));
+  if (eff.O.isNone(latestDef)) return false;
+  const { node, parent } = latestDef.value;
   if (node.type === types.AST_NODE_TYPES.VariableDeclarator && node.init) {
     const { init } = node;
     if (init.type === types.AST_NODE_TYPES.MemberExpression && init.object.type === types.AST_NODE_TYPES.Identifier) {
@@ -189,7 +189,7 @@ function isNodeValueEqual(a, b, initialScopes) {
           );
         }
         default: {
-          return eff.O.isSome(aVar) && eff.O.isSome(bVar) && eff.Equal.equals(aVar, bVar);
+          return eff.O.isSome(aVar) && eff.O.isSome(bVar) && aVar.value === bVar.value;
         }
       }
     }
@@ -200,8 +200,8 @@ function isNodeValueEqual(a, b, initialScopes) {
       if (aScope.block === bScope.block) return true;
       return eff.F.pipe(
         eff.O.Do,
-        eff.O.bind("aFunction", () => AST3__namespace.traverseUp(a, AST3__namespace.isOneOf(thisBlockTypes))),
-        eff.O.bind("bFunction", () => AST3__namespace.traverseUp(b, AST3__namespace.isOneOf(thisBlockTypes))),
+        eff.O.bind("aFunction", () => AST3__namespace.findParentNode(a, AST3__namespace.isOneOf(thisBlockTypes))),
+        eff.O.bind("bFunction", () => AST3__namespace.findParentNode(b, AST3__namespace.isOneOf(thisBlockTypes))),
         eff.O.exists(({ aFunction, bFunction }) => aFunction === bFunction)
       );
     }

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { F, O, Equal, isObject, isString } from '@eslint-react/eff';
+import { F, O, isObject, isString } from '@eslint-react/eff';
 import * as ASTUtils from '@typescript-eslint/utils/ast-utils';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import * as AST3 from '@eslint-react/ast';
@@ -72,9 +72,9 @@ function getVariables(initialScope) {
   return variables.reverse();
 }
 function isInitializedFromSource(name, source, initialScope) {
-  const maybeLatestDef = O.flatMapNullable(findVariable2(name, initialScope), (v) => v.defs.at(-1));
-  if (O.isNone(maybeLatestDef)) return false;
-  const { node, parent } = maybeLatestDef.value;
+  const latestDef = O.flatMapNullable(findVariable2(name, initialScope), (v) => v.defs.at(-1));
+  if (O.isNone(latestDef)) return false;
+  const { node, parent } = latestDef.value;
   if (node.type === AST_NODE_TYPES.VariableDeclarator && node.init) {
     const { init } = node;
     if (init.type === AST_NODE_TYPES.MemberExpression && init.object.type === AST_NODE_TYPES.Identifier) {
@@ -166,7 +166,7 @@ function isNodeValueEqual(a, b, initialScopes) {
           );
         }
         default: {
-          return O.isSome(aVar) && O.isSome(bVar) && Equal.equals(aVar, bVar);
+          return O.isSome(aVar) && O.isSome(bVar) && aVar.value === bVar.value;
         }
       }
     }
@@ -177,8 +177,8 @@ function isNodeValueEqual(a, b, initialScopes) {
       if (aScope.block === bScope.block) return true;
       return F.pipe(
         O.Do,
-        O.bind("aFunction", () => AST3.traverseUp(a, AST3.isOneOf(thisBlockTypes))),
-        O.bind("bFunction", () => AST3.traverseUp(b, AST3.isOneOf(thisBlockTypes))),
+        O.bind("aFunction", () => AST3.findParentNode(a, AST3.isOneOf(thisBlockTypes))),
+        O.bind("bFunction", () => AST3.findParentNode(b, AST3.isOneOf(thisBlockTypes))),
         O.exists(({ aFunction, bFunction }) => aFunction === bFunction)
       );
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "1.23.2-beta.2",
+  "version": "1.23.2-beta.6",
   "description": "ESLint React's TSESTree AST utility module for static analysis of variables",
   "homepage": "https://github.com/rEl1cx/eslint-react",
   "bugs": {
@@ -33,14 +33,14 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.19.0",
-    "@typescript-eslint/types": "^8.19.0",
-    "@typescript-eslint/utils": "^8.19.0",
+    "@typescript-eslint/scope-manager": "^8.19.1",
+    "@typescript-eslint/types": "^8.19.1",
+    "@typescript-eslint/utils": "^8.19.1",
     "string-ts": "^2.2.0",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.23.2-beta.2",
-    "@eslint-react/types": "1.23.2-beta.2",
-    "@eslint-react/eff": "1.23.2-beta.2"
+    "@eslint-react/ast": "1.23.2-beta.6",
+    "@eslint-react/eff": "1.23.2-beta.6",
+    "@eslint-react/types": "1.23.2-beta.6"
   },
   "devDependencies": {
     "tsup": "^8.3.5",