fixes

Author: tranhl

src/main.ts

@@ -46,9 +46,57 @@ export async function main({
     repoGraph.mergeDirectedEdge(pullRequest.base.ref, pullRequest.head.ref)
   })
 
+  const terminatingRefs = [mainBranch, ...perennialBranches]
+
+  const getStackGraph = (anchorPullRequest: PullRequest) => {
+    const stackGraph = repoGraph.copy() as MultiDirectedGraph<StackNodeAttributes>
+    stackGraph.setNodeAttribute(anchorPullRequest.head.ref, 'isCurrent', true)
+
+    bfsFromNode(
+      repoGraph,
+      anchorPullRequest.head.ref,
+      (ref, attributes) => {
+        if (
+          attributes.type === 'pull-request' &&
+          !terminatingRefs.includes(attributes.base.ref)
+        ) {
+          stackGraph.setNodeAttribute(ref, 'shouldPrint', true)
+          stackGraph.setNodeAttribute(attributes.base.ref, 'shouldPrint', true)
+
+          return false
+        }
+
+        return attributes.type === 'perennial'
+      },
+      {
+        mode: 'inbound',
+      }
+    )
+
+    dfsFromNode(
+      stackGraph,
+      anchorPullRequest.head.ref,
+      (ref) => {
+        stackGraph.setNodeAttribute(ref, 'shouldPrint', true)
+      },
+      { mode: 'outbound' }
+    )
+
+    stackGraph.forEachNode((node, attributes) => {
+      if (!attributes.shouldPrint) {
+        try {
+          stackGraph.dropNode(node)
+        } catch {
+          // Do nothing
+        }
+      }
+    })
+
+    return stackGraph
+  }
+
   const getOutput = (graph: MultiDirectedGraph<StackNodeAttributes>) => {
     const lines: string[] = []
-    const terminatingRefs = [mainBranch, ...perennialBranches]
 
     dfs(
       graph,
@@ -82,7 +130,7 @@ export async function main({
 
   const jobs: Array<() => Promise<void>> = []
 
-  const stackGraph = getStackGraph(repoGraph, currentPullRequest)
+  const stackGraph = getStackGraph(currentPullRequest)
 
   const shouldSkip = () => {
     const neighbors = stackGraph.neighbors(currentPullRequest.head.ref)
@@ -109,7 +157,7 @@ export async function main({
     jobs.push(async () => {
       core.info(`Updating stack details for PR #${stackNode.number}`)
 
-      const stackGraph = getStackGraph(repoGraph, stackNode)
+      const stackGraph = getStackGraph(stackNode)
       // const output = getOutput(stackGraph)
 
       console.log(stackGraph.inspect())
@@ -131,43 +179,6 @@ 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.head.ref, 'isCurrent', true)
-
-  bfsFromNode(
-    repoGraph,
-    pullRequest.head.ref,
-    (ref, attributes) => {
-      stackGraph.setNodeAttribute(ref, 'shouldPrint', true)
-      return attributes.type === 'perennial'
-    },
-    {
-      mode: 'inbound',
-    }
-  )
-
-  dfsFromNode(
-    stackGraph,
-    pullRequest.head.ref,
-    (ref) => {
-      stackGraph.setNodeAttribute(ref, 'shouldPrint', true)
-    },
-    { mode: 'outbound' }
-  )
-
-  stackGraph.forEachNode((node, attributes) => {
-    if (!attributes.shouldPrint) {
-      stackGraph.dropNode(node)
-    }
-  })
-
-  return stackGraph
-}
-
 export function updateDescription({
   description,
   output,