Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions src/commands/fix/git.mts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ import type { GhsaDetails } from '../../utils/github.mts'

const GITHUB_ADVISORIES_URL = 'https://github.com/advisories'

/**
* Extract unique package names with ecosystems from vulnerability details.
*/
function getUniquePackages(details: GhsaDetails): string[] {
return [
...new Set(
details.vulnerabilities.nodes.map(
v => `${v.package.name} (${v.package.ecosystem})`,
),
),
]
}

export type SocketFixBranchParser = (
branch: string,
) => SocketFixBranchParseResult | undefined
Expand Down Expand Up @@ -60,9 +73,7 @@ export function getSocketFixPullRequestBody(
if (!details) {
return body
}
const packages = details.vulnerabilities.nodes.map(
v => `${v.package.name} (${v.package.ecosystem})`,
)
const packages = getUniquePackages(details)
return [
body,
'',
Expand All @@ -82,9 +93,7 @@ export function getSocketFixPullRequestBody(
const details = ghsaDetails?.get(id)
const item = `- [${id}](${GITHUB_ADVISORIES_URL}/${id})`
if (details) {
const packages = details.vulnerabilities.nodes.map(
v => `${v.package.name}`,
)
const packages = getUniquePackages(details)
return `${item} - ${details.summary} (${joinAnd(packages)})`
}
return item
Expand Down