Skip to content

Commit 0c98215

Browse files
committed
fix: avoid duplicate name
1 parent a5f81bf commit 0c98215

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

server/api/registry/badge/[...pkg].get.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as v from 'valibot'
22
import { createError, getRouterParam, setHeader } from 'h3'
33
import { PackageRouteParamsSchema } from '#shared/schemas/package'
44
import { CACHE_MAX_AGE_ONE_HOUR } from '#shared/utils/constants'
5-
import { fetchLatestVersion } from '#server/utils/npm'
5+
import { fetchLatestVersionWithFallback } from '#server/utils/npm'
66
import { assertValidPackageName } from '#shared/utils/npm'
77
import { handleApiError } from '#server/utils/error-handler'
88

@@ -30,7 +30,8 @@ export default defineCachedEventHandler(
3030

3131
const label = `./ ${packageName}`
3232

33-
const value = requestedVersion ?? (await fetchLatestVersion(packageName)) ?? 'unknown'
33+
const value =
34+
requestedVersion ?? (await fetchLatestVersionWithFallback(packageName)) ?? 'unknown'
3435

3536
const leftWidth = measureTextWidth(label)
3637
const rightWidth = measureTextWidth(value)

server/api/registry/install-size/[...pkg].get.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default defineCachedEventHandler(
2525
// If no version specified, resolve to latest using fast-npm-meta (lightweight)
2626
let version: string | undefined = requestedVersion
2727
if (!version) {
28-
const latestVersion = await fetchLatestVersion(packageName)
28+
const latestVersion = await fetchLatestVersionWithFallback(packageName)
2929
if (!latestVersion) {
3030
throw createError({
3131
statusCode: 404,

server/api/registry/vulnerabilities/[...pkg].get.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default defineCachedEventHandler(
2222
// If no version specified, resolve to latest using fast-npm-meta (lightweight)
2323
let version: string | undefined = requestedVersion
2424
if (!version) {
25-
const latestVersion = await fetchLatestVersion(packageName)
25+
const latestVersion = await fetchLatestVersionWithFallback(packageName)
2626
if (!latestVersion) {
2727
throw createError({
2828
statusCode: 404,

server/utils/npm.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Packument } from '#shared/types'
2-
import { encodePackageName, fetchLatestVersion as _fetchLatestVersion } from '#shared/utils/npm'
2+
import { encodePackageName, fetchLatestVersion } from '#shared/utils/npm'
33
import { maxSatisfying, prerelease } from 'semver'
44
import { CACHE_MAX_AGE_FIVE_MINUTES } from '#shared/utils/constants'
55

@@ -25,8 +25,8 @@ export const fetchNpmPackage = defineCachedFunction(
2525
* @param name Package name
2626
* @returns Latest version string or null if not found
2727
*/
28-
export async function fetchLatestVersion(name: string): Promise<string | null> {
29-
const version = await _fetchLatestVersion(name)
28+
export async function fetchLatestVersionWithFallback(name: string): Promise<string | null> {
29+
const version = await fetchLatestVersion(name)
3030
if (version) return version
3131

3232
// Fallback to full packument (also cached)

0 commit comments

Comments
 (0)