@eslint-react/var 1.17.2-next.7 → 1.17.3-next.0

package/dist/index.js

@@ -162,12 +162,14 @@ function getVariableNode(at) {
       tools.O.flatMap(getVariableDef(at)),
       tools.O.flatMapNullable((def) => {
         switch (true) {
-          case ("init" in def.node && def.node.init && !("declarations" in def.node.init)):
-            return def.node.init;
           case (def.type === scopeManager.DefinitionType.FunctionName && def.node.type === types.AST_NODE_TYPES.FunctionDeclaration):
             return def.node;
           case (def.type === scopeManager.DefinitionType.ClassName && def.node.type === types.AST_NODE_TYPES.ClassDeclaration):
             return def.node;
+          case (def.type === scopeManager.DefinitionType.Parameter && AST__namespace.isFunction(def.node)):
+            return def.node;
+          case ("init" in def.node && def.node.init && !("declarations" in def.node.init)):
+            return def.node.init;
           default:
             return null;
         }
@@ -236,10 +238,24 @@ function isNodeValueEqual(a, b, initialScopes) {
   if (a.type === types.AST_NODE_TYPES.Identifier && b.type === types.AST_NODE_TYPES.Identifier) {
     const va = findVariable(a, aScope);
     const vb = findVariable(b, bScope);
-    const ia = tools.O.flatMap(va, getVariableNode(0));
-    const ib = tools.O.flatMap(vb, getVariableNode(0));
-    if (tools.O.isNone(ia) || tools.O.isNone(ib)) return false;
-    return ia.value === ib.value;
+    const na = tools.O.flatMap(va, getVariableNode(0));
+    const nb = tools.O.flatMap(vb, getVariableNode(0));
+    if (tools.O.isNone(na) || tools.O.isNone(nb)) return false;
+    if (tools.O.exists(na, AST__namespace.isFunction) && tools.O.exists(nb, AST__namespace.isFunction)) {
+      const fa = na.value;
+      const fb = nb.value;
+      const pa = fa.parent;
+      const pb = fb.parent;
+      if (pa.type !== types.AST_NODE_TYPES.CallExpression || pb.type !== types.AST_NODE_TYPES.CallExpression) return false;
+      if (!AST__namespace.isNodeEqual(pa.callee, pb.callee)) return false;
+      const paramsA = fa.params;
+      const paramsB = fb.params;
+      const posA = paramsA.findIndex((p) => AST__namespace.isNodeEqual(p, a));
+      const posB = paramsB.findIndex((p) => AST__namespace.isNodeEqual(p, b));
+      if (posA === -1 || posB === -1) return false;
+      return posA === posB;
+    }
+    return na.value === nb.value;
   }
   if (a.type === types.AST_NODE_TYPES.MemberExpression && b.type === types.AST_NODE_TYPES.MemberExpression) {
     return AST__namespace.isNodeEqual(a.property, b.property) && isNodeValueEqual(a.object, b.object, initialScopes);

package/dist/index.mjs

@@ -140,12 +140,14 @@ function getVariableNode(at) {
       O.flatMap(getVariableDef(at)),
       O.flatMapNullable((def) => {
         switch (true) {
-          case ("init" in def.node && def.node.init && !("declarations" in def.node.init)):
-            return def.node.init;
           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 (def.type === DefinitionType.Parameter && AST.isFunction(def.node)):
+            return def.node;
+          case ("init" in def.node && def.node.init && !("declarations" in def.node.init)):
+            return def.node.init;
           default:
             return null;
         }
@@ -214,10 +216,24 @@ function isNodeValueEqual(a, b, initialScopes) {
   if (a.type === AST_NODE_TYPES.Identifier && b.type === AST_NODE_TYPES.Identifier) {
     const va = findVariable(a, aScope);
     const vb = findVariable(b, bScope);
-    const ia = O.flatMap(va, getVariableNode(0));
-    const ib = O.flatMap(vb, getVariableNode(0));
-    if (O.isNone(ia) || O.isNone(ib)) return false;
-    return ia.value === ib.value;
+    const na = O.flatMap(va, getVariableNode(0));
+    const nb = O.flatMap(vb, getVariableNode(0));
+    if (O.isNone(na) || O.isNone(nb)) return false;
+    if (O.exists(na, AST.isFunction) && O.exists(nb, AST.isFunction)) {
+      const fa = na.value;
+      const fb = nb.value;
+      const pa = fa.parent;
+      const pb = fb.parent;
+      if (pa.type !== AST_NODE_TYPES.CallExpression || pb.type !== AST_NODE_TYPES.CallExpression) return false;
+      if (!AST.isNodeEqual(pa.callee, pb.callee)) return false;
+      const paramsA = fa.params;
+      const paramsB = fb.params;
+      const posA = paramsA.findIndex((p) => AST.isNodeEqual(p, a));
+      const posB = paramsB.findIndex((p) => AST.isNodeEqual(p, b));
+      if (posA === -1 || posB === -1) return false;
+      return posA === posB;
+    }
+    return na.value === nb.value;
   }
   if (a.type === AST_NODE_TYPES.MemberExpression && b.type === AST_NODE_TYPES.MemberExpression) {
     return AST.isNodeEqual(a.property, b.property) && isNodeValueEqual(a.object, b.object, initialScopes);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "1.17.2-next.7",
+  "version": "1.17.3-next.0",
   "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.16.0",
     "@typescript-eslint/utils": "^8.16.0",
     "ts-pattern": "^5.5.0",
-    "@eslint-react/tools": "1.17.2-next.7",
-    "@eslint-react/ast": "1.17.2-next.7",
-    "@eslint-react/types": "1.17.2-next.7"
+    "@eslint-react/ast": "1.17.3-next.0",
+    "@eslint-react/tools": "1.17.3-next.0",
+    "@eslint-react/types": "1.17.3-next.0"
   },
   "devDependencies": {
     "string-ts": "^2.2.0",