fix: add remote branches to repo graph

Author: tranhl

dist/index.js

@@ -42837,53 +42837,36 @@ async function main({
   currentPullRequest,
   pullRequests,
   mainBranch,
+  remoteBranches,
   perennialBranches,
   skipSingleStacks
 }) {
   const repoGraph = new import_graphology.MultiDirectedGraph();
-  repoGraph.addNode(mainBranch, {
+  remoteBranches.forEach((remoteBranch) => {
+    repoGraph.mergeNode(remoteBranch, {
+      type: "branch",
+      ref: remoteBranch
+    });
+  });
+  repoGraph.mergeNode(mainBranch, {
     type: "perennial",
     ref: mainBranch
   });
   perennialBranches.forEach((perennialBranch) => {
-    repoGraph.addNode(perennialBranch, {
+    repoGraph.mergeNode(perennialBranch, {
       type: "perennial",
       ref: perennialBranch
     });
   });
   pullRequests.forEach((pullRequest) => {
-    repoGraph.addNode(pullRequest.headRefName, {
+    repoGraph.mergeNode(pullRequest.headRefName, {
       type: "pull-request",
       ...pullRequest
     });
   });
   pullRequests.forEach((pullRequest) => {
-    repoGraph.addDirectedEdge(pullRequest.baseRefName, pullRequest.headRefName);
+    repoGraph.mergeDirectedEdge(pullRequest.baseRefName, pullRequest.headRefName);
   });
-  const getStackGraph = (pullRequest) => {
-    const stackGraph2 = repoGraph.copy();
-    stackGraph2.setNodeAttribute(pullRequest.headRefName, "isCurrent", true);
-    (0, import_graphology_traversal.bfsFromNode)(
-      stackGraph2,
-      pullRequest.headRefName,
-      (ref, attributes) => {
-        stackGraph2.setNodeAttribute(ref, "shouldPrint", true);
-        return attributes.type === "perennial";
-      },
-      {
-        mode: "inbound"
-      }
-    );
-    (0, import_graphology_traversal.dfsFromNode)(
-      stackGraph2,
-      pullRequest.headRefName,
-      (ref) => {
-        stackGraph2.setNodeAttribute(ref, "shouldPrint", true);
-      },
-      { mode: "outbound" }
-    );
-    return stackGraph2;
-  };
   const getOutput = (graph) => {
     const lines = [];
     const terminatingRefs = [mainBranch, ...perennialBranches];
@@ -42911,7 +42894,7 @@ async function main({
     return lines.join("\n");
   };
   const jobs = [];
-  const stackGraph = getStackGraph(currentPullRequest);
+  const stackGraph = getStackGraph(repoGraph, currentPullRequest);
   const shouldSkip = () => {
     const neighbors = stackGraph.neighbors(currentPullRequest.headRefName);
     const allPerennialBranches = stackGraph.filterNodes(
@@ -42928,7 +42911,7 @@ async function main({
     }
     jobs.push(async () => {
       core.info(`Updating stack details for PR #${stackNode.number}`);
-      const stackGraph2 = getStackGraph(stackNode);
+      const stackGraph2 = getStackGraph(repoGraph, stackNode);
       const output = getOutput(stackGraph2);
       let description = stackNode.body ?? "";
       description = updateDescription({
@@ -42944,6 +42927,30 @@ async function main({
   });
   await Promise.allSettled(jobs.map((job) => job()));
 }
+function getStackGraph(repoGraph, pullRequest) {
+  const stackGraph = repoGraph.copy();
+  stackGraph.setNodeAttribute(pullRequest.headRefName, "isCurrent", true);
+  (0, import_graphology_traversal.bfsFromNode)(
+    stackGraph,
+    pullRequest.headRefName,
+    (ref, attributes) => {
+      stackGraph.setNodeAttribute(ref, "shouldPrint", true);
+      return attributes.type === "perennial";
+    },
+    {
+      mode: "inbound"
+    }
+  );
+  (0, import_graphology_traversal.dfsFromNode)(
+    stackGraph,
+    pullRequest.headRefName,
+    (ref) => {
+      stackGraph.setNodeAttribute(ref, "shouldPrint", true);
+    },
+    { mode: "outbound" }
+  );
+  return stackGraph;
+}
 function updateDescription({
   description,
   output

src/main.ts

@@ -10,62 +10,42 @@ export async function main({
   currentPullRequest,
   pullRequests,
   mainBranch,
+  remoteBranches,
   perennialBranches,
   skipSingleStacks,
 }: Context) {
   const repoGraph = new MultiDirectedGraph<StackNodeAttributes>()
 
-  repoGraph.addNode(mainBranch, {
+  remoteBranches.forEach((remoteBranch) => {
+    repoGraph.mergeNode(remoteBranch, {
+      type: 'branch',
+      ref: remoteBranch,
+    })
+  })
+
+  repoGraph.mergeNode(mainBranch, {
     type: 'perennial',
     ref: mainBranch,
   })
 
   perennialBranches.forEach((perennialBranch) => {
-    repoGraph.addNode(perennialBranch, {
+    repoGraph.mergeNode(perennialBranch, {
       type: 'perennial',
       ref: perennialBranch,
     })
   })
 
   pullRequests.forEach((pullRequest) => {
-    repoGraph.addNode(pullRequest.headRefName, {
+    repoGraph.mergeNode(pullRequest.headRefName, {
       type: 'pull-request',
       ...pullRequest,
     })
   })
 
   pullRequests.forEach((pullRequest) => {
-    repoGraph.addDirectedEdge(pullRequest.baseRefName, pullRequest.headRefName)
+    repoGraph.mergeDirectedEdge(pullRequest.baseRefName, pullRequest.headRefName)
   })
 
-  const getStackGraph = (pullRequest: PullRequest) => {
-    const stackGraph = repoGraph.copy() as MultiDirectedGraph<StackNodeAttributes>
-    stackGraph.setNodeAttribute(pullRequest.headRefName, 'isCurrent', true)
-
-    bfsFromNode(
-      stackGraph,
-      pullRequest.headRefName,
-      (ref, attributes) => {
-        stackGraph.setNodeAttribute(ref, 'shouldPrint', true)
-        return attributes.type === 'perennial'
-      },
-      {
-        mode: 'inbound',
-      }
-    )
-
-    dfsFromNode(
-      stackGraph,
-      pullRequest.headRefName,
-      (ref) => {
-        stackGraph.setNodeAttribute(ref, 'shouldPrint', true)
-      },
-      { mode: 'outbound' }
-    )
-
-    return stackGraph
-  }
-
   const getOutput = (graph: MultiDirectedGraph<StackNodeAttributes>) => {
     const lines: string[] = []
     const terminatingRefs = [mainBranch, ...perennialBranches]
@@ -102,7 +82,7 @@ export async function main({
 
   const jobs: Array<() => Promise<void>> = []
 
-  const stackGraph = getStackGraph(currentPullRequest)
+  const stackGraph = getStackGraph(repoGraph, currentPullRequest)
 
   const shouldSkip = () => {
     const neighbors = stackGraph.neighbors(currentPullRequest.headRefName)
@@ -129,7 +109,7 @@ export async function main({
     jobs.push(async () => {
       core.info(`Updating stack details for PR #${stackNode.number}`)
 
-      const stackGraph = getStackGraph(stackNode)
+      const stackGraph = getStackGraph(repoGraph, stackNode)
       const output = getOutput(stackGraph)
 
       let description = stackNode.body ?? ''
@@ -149,6 +129,37 @@ export async function main({
   await Promise.allSettled(jobs.map((job) => job()))
 }
 
+function getStackGraph(
+  repoGraph: MultiDirectedGraph<StackNodeAttributes>,
+  pullRequest: PullRequest
+) {
+  const stackGraph = repoGraph.copy() as MultiDirectedGraph<StackNodeAttributes>
+  stackGraph.setNodeAttribute(pullRequest.headRefName, 'isCurrent', true)
+
+  bfsFromNode(
+    stackGraph,
+    pullRequest.headRefName,
+    (ref, attributes) => {
+      stackGraph.setNodeAttribute(ref, 'shouldPrint', true)
+      return attributes.type === 'perennial'
+    },
+    {
+      mode: 'inbound',
+    }
+  )
+
+  dfsFromNode(
+    stackGraph,
+    pullRequest.headRefName,
+    (ref) => {
+      stackGraph.setNodeAttribute(ref, 'shouldPrint', true)
+    },
+    { mode: 'outbound' }
+  )
+
+  return stackGraph
+}
+
 export function updateDescription({
   description,
   output,

src/types.ts

@@ -17,11 +17,16 @@ export type Context = {
   mainBranch: string
   currentPullRequest: PullRequest
   pullRequests: PullRequest[]
+  remoteBranches: string[]
   perennialBranches: string[]
   skipSingleStacks: boolean
 }
 
 export type StackNode =
+  | {
+      type: 'branch'
+      ref: string
+    }
   | {
       type: 'perennial'
       ref: string