Make getActiveBranchesForPackage helper (#651)

Author: jdalton

src/commands/fix/fix-branch-helpers.mts

@@ -0,0 +1,44 @@
+import { debugFn } from '@socketsecurity/registry/lib/debug'
+
+import {
+  getSocketBranchFullNameComponent,
+  getSocketBranchPurlTypeComponent,
+} from './git.mts'
+import { getPurlObject } from '../../utils/purl.mts'
+
+import type { CiEnv } from './fix-env-helpers.mts'
+import type { SocketBranchParseResult } from './git.mts'
+import type { PrMatch } from './open-pr.mts'
+
+export function getActiveBranchesForPackage(
+  ciEnv: CiEnv | null | undefined,
+  partialPurl: string,
+  openPrs: PrMatch[],
+): SocketBranchParseResult[] {
+  if (!ciEnv) {
+    return []
+  }
+
+  const partialPurlObj = getPurlObject(partialPurl)
+  const activeBranches: SocketBranchParseResult[] = []
+  const branchFullName = getSocketBranchFullNameComponent(partialPurlObj)
+  const branchPurlType = getSocketBranchPurlTypeComponent(partialPurlObj)
+
+  for (const pr of openPrs) {
+    const parsedBranch = ciEnv.branchParser(pr.headRefName)
+    if (
+      branchPurlType === parsedBranch?.type &&
+      branchFullName === parsedBranch?.fullName
+    ) {
+      activeBranches.push(parsedBranch)
+    }
+  }
+
+  if (activeBranches.length) {
+    debugFn(`found: ${activeBranches.length} active branches\n`, activeBranches)
+  } else if (openPrs.length) {
+    debugFn('miss: 0 active branches found')
+  }
+
+  return activeBranches
+}

src/commands/fix/fix-env-helpers.mts

@@ -38,7 +38,9 @@ export function getCiEnv(): CiEnv | null {
     : null
 }
 
-export async function getOpenPrsForEnvironment(env: CiEnv): Promise<PrMatch[]> {
+export async function getOpenPrsForEnvironment(
+  env: CiEnv | null | undefined,
+): Promise<PrMatch[]> {
   return env
     ? await getOpenSocketPrs(env.repoInfo.owner, env.repoInfo.repo, {
         author: env.gitUser,

src/commands/fix/npm-fix.mts

@@ -14,11 +14,10 @@ import {
 } from '@socketsecurity/registry/lib/packages'
 import { naturalCompare } from '@socketsecurity/registry/lib/sorts'
 
+import { getActiveBranchesForPackage } from './fix-branch-helpers.mts'
 import { getCiEnv, getOpenPrsForEnvironment } from './fix-env-helpers.mts'
 import {
-  getSocketBranchFullNameComponent,
   getSocketBranchName,
-  getSocketBranchPurlTypeComponent,
   getSocketBranchWorkspaceComponent,
   getSocketCommitMessage,
   gitCreateAndPushBranch,
@@ -55,7 +54,6 @@ import { applyRange } from '../../utils/semver.mts'
 import { getCveInfoFromAlertsMap } from '../../utils/socket-package-alert.mts'
 import { idToPurl } from '../../utils/spec.mts'
 
-import type { SocketBranchParseResult } from './git.mts'
 import type {
   ArboristInstance,
   NodeClass,
@@ -199,28 +197,11 @@ export async function npmFix(
       continue infoEntriesLoop
     }
 
-    const activeBranches: SocketBranchParseResult[] = []
-    if (ciEnv) {
-      const branchFullName = getSocketBranchFullNameComponent(partialPurlObj)
-      const branchPurlType = getSocketBranchPurlTypeComponent(partialPurlObj)
-      for (const pr of openPrs) {
-        const parsedBranch = ciEnv.branchParser!(pr.headRefName)
-        if (
-          branchPurlType === parsedBranch?.type &&
-          branchFullName === parsedBranch?.fullName
-        ) {
-          activeBranches.push(parsedBranch)
-        }
-      }
-      if (activeBranches.length) {
-        debugFn(
-          `found: ${activeBranches.length} active branches\n`,
-          activeBranches,
-        )
-      } else if (openPrs.length) {
-        debugFn('miss: 0 active branches found')
-      }
-    }
+    const activeBranches = getActiveBranchesForPackage(
+      ciEnv,
+      infoEntry[0],
+      openPrs,
+    )
 
     logger.log(`Processing vulns for ${name}:`)
     logger.indent()

src/commands/fix/pnpm-fix.mts

@@ -15,11 +15,10 @@ import {
 } from '@socketsecurity/registry/lib/packages'
 import { naturalCompare } from '@socketsecurity/registry/lib/sorts'
 
+import { getActiveBranchesForPackage } from './fix-branch-helpers.mts'
 import { getCiEnv, getOpenPrsForEnvironment } from './fix-env-helpers.mts'
 import {
-  getSocketBranchFullNameComponent,
   getSocketBranchName,
-  getSocketBranchPurlTypeComponent,
   getSocketBranchWorkspaceComponent,
   getSocketCommitMessage,
   gitCreateAndPushBranch,
@@ -64,7 +63,6 @@ import { applyRange } from '../../utils/semver.mts'
 import { getCveInfoFromAlertsMap } from '../../utils/socket-package-alert.mts'
 import { idToPurl } from '../../utils/spec.mts'
 
-import type { SocketBranchParseResult } from './git.mts'
 import type { NodeClass } from '../../shadow/npm/arborist/types.mts'
 import type { CResult, StringKeyValueObject } from '../../types.mts'
 import type { EnvDetails } from '../../utils/package-environment.mts'
@@ -274,28 +272,11 @@ export async function pnpmFix(
       continue infoEntriesLoop
     }
 
-    const activeBranches: SocketBranchParseResult[] = []
-    if (ciEnv) {
-      const branchFullName = getSocketBranchFullNameComponent(partialPurlObj)
-      const branchPurlType = getSocketBranchPurlTypeComponent(partialPurlObj)
-      for (const pr of openPrs) {
-        const parsedBranch = ciEnv.branchParser!(pr.headRefName)
-        if (
-          branchPurlType === parsedBranch?.type &&
-          branchFullName === parsedBranch?.fullName
-        ) {
-          activeBranches.push(parsedBranch)
-        }
-      }
-      if (activeBranches.length) {
-        debugFn(
-          `found: ${activeBranches.length} active branches\n`,
-          activeBranches,
-        )
-      } else if (openPrs.length) {
-        debugFn('miss: 0 active branches found')
-      }
-    }
+    const activeBranches = getActiveBranchesForPackage(
+      ciEnv,
+      infoEntry[0],
+      openPrs,
+    )
 
     logger.log(`Processing vulns for ${name}:`)
     logger.indent()