Skip to content
Open
Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion server/utils/parse-package-params.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ export function parsePackageParams(segments: string[]): {
rawPackageName: string
rawVersion: string | undefined
} {
const vIndex = segments.indexOf('v')
let vIndex = segments.indexOf('v')

// If we encounter ".../v/v/...", treat the second "v" as the version delimiter.
if (segments[vIndex] === 'v' && segments[vIndex + 1] === 'v') {
vIndex++
}

if (vIndex !== -1 && vIndex < segments.length - 1) {
return {
Expand Down
7 changes: 6 additions & 1 deletion shared/utils/parse-package-param.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ export interface ParsedPackageParams {
*/
export function parsePackageParam(pkgParam: string): ParsedPackageParams {
const segments = pkgParam.split('/')
const vIndex = segments.indexOf('v')
let vIndex = segments.indexOf('v')

// If we encounter ".../v/v/...", treat the second "v" as the version delimiter.
if (segments[vIndex] === 'v' && segments[vIndex + 1] === 'v') {
vIndex++
}

if (vIndex !== -1 && vIndex < segments.length - 1) {
return {
Expand Down
9 changes: 9 additions & 0 deletions test/unit/server/utils/parse-package-params.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,14 @@ describe('parsePackageParams', () => {
rawVersion: '1.0.0',
})
})

it('parses scoped package names whose package segment is literally v', () => {
const segments = ['@scope', 'v', 'v', '1.2.3']
const result = parsePackageParams(segments)
expect(result).toEqual({
rawPackageName: '@scope/v',
rawVersion: '1.2.3',
})
})
})
})
9 changes: 9 additions & 0 deletions test/unit/shared/utils/parse-package-param.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@ describe('parsePackageParam', () => {
rest: [],
})
})

it('parses scoped package names whose package segment is literally v', () => {
const result = parsePackageParam('@scope/v/v/1.2.3/dist/index.js')
expect(result).toEqual({
packageName: '@scope/v',
version: '1.2.3',
rest: ['dist', 'index.js'],
})
})
})

describe('edge cases', () => {
Expand Down
Loading