Skip to content

Commit 267a9f2

Browse files
committed
Property coerce pnpm versions
1 parent 2f8c9ed commit 267a9f2

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/utils/alerts-map.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { detectDepTypes } from '@pnpm/lockfile.detect-dep-types'
22
import semver from 'semver'
33

4+
import { PackageURL } from '@socketregistry/packageurl-js'
45
import { arrayUnique } from '@socketsecurity/registry/lib/arrays'
6+
import { resolvePackageName } from '@socketsecurity/registry/lib/packages'
57

68
import { getDetailsFromDiff } from './arborist-helpers'
79
import { getPublicToken, setupSdk } from './sdk'
@@ -91,10 +93,9 @@ export async function getAlertsMapFromPnpmLockfile(
9193

9294
const depTypes = detectDepTypes(lockfile)
9395
const purls = Object.keys(depTypes).map(id => {
94-
const lastAtSignIndex = id.lastIndexOf('@')
95-
const name = id.slice(0, lastAtSignIndex)
96-
const version = id.slice(lastAtSignIndex + 1)
97-
return `pkg:npm/${name}@${semver.coerce(version)}`
96+
const purlObj = PackageURL.fromString(`pkg:npm/${id}`)
97+
const name = resolvePackageName(purlObj)
98+
return `pkg:npm/${name}@${semver.coerce(purlObj.version)}`
9899
})
99100

100101
return await getAlertsMapFromPurls(purls, {

0 commit comments

Comments
 (0)