refactor: receive variable in upstream functions

Author: NickvanDyke

src/no-chain-state-updates.js

@@ -37,7 +37,7 @@ export const rule = {
       if (!effectFnRefs || !depsRefs) return;
 
       const isAllDepsInternal = depsRefs
-        .flatMap((ref) => getUpstreamReactVariables(context, ref.identifier))
+        .flatMap((ref) => getUpstreamReactVariables(context, ref.resolved))
         .notEmptyEvery(
           (variable) =>
             isState(variable) || (isProp(variable) && !isHOCProp(variable)),
@@ -56,9 +56,7 @@ export const rule = {
 
           const argsUpstreamVariables = callExpr.arguments
             .flatMap((arg) => getDownstreamRefs(context, arg))
-            .flatMap((ref) =>
-              getUpstreamReactVariables(context, ref.identifier),
-            );
+            .flatMap((ref) => getUpstreamReactVariables(context, ref.resolved));
           const isAllArgsInternal = argsUpstreamVariables.notEmptyEvery(
             (variable) =>
               isState(variable) || (isProp(variable) && !isHOCProp(variable)),

src/no-derived-state.js

@@ -52,7 +52,7 @@ export const rule = {
             getDownstreamRefs(context, arg),
           );
           const argsUpstreamVariables = argsRefs.flatMap((ref) =>
-            getUpstreamReactVariables(context, ref.identifier),
+            getUpstreamReactVariables(context, ref.resolved),
           );
           const isAllArgsInternal = argsUpstreamVariables.notEmptyEvery(
             (variable) =>
@@ -65,8 +65,8 @@ export const rule = {
             .notEmptyEvery((argRef) =>
               depsRefs.some((depRef) =>
                 arraysEqual(
-                  getUpstreamReactVariables(context, argRef.identifier),
-                  getUpstreamReactVariables(context, depRef.identifier),
+                  getUpstreamReactVariables(context, argRef.resolved),
+                  getUpstreamReactVariables(context, depRef.resolved),
                 ),
               ),
             );

src/no-event-handler.js

@@ -36,9 +36,7 @@ export const rule = {
         .filter((ifNode) => !ifNode.alternate)
         .filter((ifNode) =>
           getDownstreamRefs(context, ifNode.test)
-            .flatMap((ref) =>
-              getUpstreamReactVariables(context, ref.identifier),
-            )
+            .flatMap((ref) => getUpstreamReactVariables(context, ref.resolved))
             // TODO: Should flag props too, but maybe with a different message?
             .notEmptyEvery((variable) => isState(variable)),
         )

src/no-pass-data-to-parent.js

@@ -46,9 +46,7 @@ export const rule = {
           const callExpr = getCallExpr(ref);
           const argsUpstreamVariables = callExpr.arguments
             .flatMap((arg) => getDownstreamRefs(context, arg))
-            .flatMap((ref) =>
-              getUpstreamReactVariables(context, ref.identifier),
-            );
+            .flatMap((ref) => getUpstreamReactVariables(context, ref.resolved));
 
           if (
             callExpr.arguments.some((arg) => arg.type === "Literal") ||

src/no-pass-live-state-to-parent.js

@@ -46,9 +46,7 @@ export const rule = {
           const callExpr = getCallExpr(ref);
           const argsUpstreamVariables = callExpr.arguments
             .flatMap((arg) => getDownstreamRefs(context, arg))
-            .flatMap((ref) =>
-              getUpstreamReactVariables(context, ref.identifier),
-            );
+            .flatMap((ref) => getUpstreamReactVariables(context, ref.resolved));
 
           if (argsUpstreamVariables.some((variable) => isState(variable))) {
             context.report({

src/util/ast.js

@@ -33,31 +33,28 @@ export const findDownstreamNodes = (context, topNode, type) => {
 
 export const getUpstreamVariables = (
   context,
-  node,
+  variable,
   filter,
   visited = new Set(),
 ) => {
-  if (visited.has(node)) {
+  if (visited.has(variable)) {
     return [];
   }
 
-  visited.add(node);
+  visited.add(variable);
 
-  const variable = findVariable(context.sourceCode.getScope(node), node);
-  if (!variable) {
+  const upstreamVariables = variable.defs
+    .filter((def) => !!def.node.init)
+    .filter((def) => filter(def.node))
+    .flatMap((def) => getDownstreamRefs(context, def.node.init))
+    .map((ref) => ref.resolved)
     // I think this only happens when:
     // 1. There's genuinely no variable, i.e. `node` is a literal
     // 2. Import statement is missing
     // 3. ESLint globals are misconfigured
-    return [];
-  }
-
-  const upstreamVariables = variable.defs
-    .filter((def) => !!def.node.init)
-    .filter((def) => filter(def.node))
-    .flatMap((def) => findDownstreamNodes(context, def.node.init, "Identifier"))
-    .flatMap((identifier) =>
-      getUpstreamVariables(context, identifier, filter, visited),
+    .filter(Boolean)
+    .flatMap((variable) =>
+      getUpstreamVariables(context, variable, filter, visited),
     );
 
   // Ultimately return only leaf variables

src/util/react.js

@@ -117,12 +117,12 @@ export const isFnRef = (ref) => getCallExpr(ref) !== undefined;
 // And in the case of a prop, we can't differentiate state mutations from callbacks anyway.
 export const isStateSetter = (context, ref) =>
   isFnRef(ref) &&
-  getUpstreamReactVariables(context, ref.identifier).notEmptyEvery((variable) =>
+  getUpstreamReactVariables(context, ref.resolved).notEmptyEvery((variable) =>
     isState(variable),
   );
 export const isPropCallback = (context, ref) =>
   isFnRef(ref) &&
-  getUpstreamReactVariables(context, ref.identifier).notEmptyEvery((variable) =>
+  getUpstreamReactVariables(context, ref.resolved).notEmptyEvery((variable) =>
     isProp(variable),
   );
 
@@ -153,7 +153,7 @@ const getDeclNode = (node) =>
     : node;
 
 export const getUseStateNode = (context, ref) => {
-  return getUpstreamReactVariables(context, ref.identifier)
+  return getUpstreamReactVariables(context, ref.resolved)
     .find((variable) => isState(variable))
     ?.defs.find((def) => isUseState(def.node))?.node;
 };
@@ -260,10 +260,10 @@ const findContainingNode = (node) => {
   }
 };
 
-export const getUpstreamReactVariables = (context, node) =>
+export const getUpstreamReactVariables = (context, variable) =>
   getUpstreamVariables(
     context,
-    node,
+    variable,
     // Stop at the *usage* of `useState` - don't go up to the `useState` variable.
     // Not needed for props - they don't go "too far".
     // We could remove this and check for the `useState` variable instead,