Skip to content
Merged
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: 2 additions & 5 deletions app/utils/package-name.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import validatePackageName from 'validate-npm-package-name'
import { encodePackageName } from '#shared/utils/npm'

/**
* Normalize a package name for comparison by removing common variations.
Expand Down Expand Up @@ -77,11 +78,7 @@ export async function checkPackageExists(
options: Parameters<typeof $fetch>[1] = {},
): Promise<boolean> {
try {
const encodedName = name.startsWith('@')
? `@${encodeURIComponent(name.slice(1))}`
: encodeURIComponent(name)

await $fetch(`${NPM_REGISTRY}/${encodedName}`, {
await $fetch(`${NPM_REGISTRY}/${encodePackageName(name)}`, {
...options,
method: 'HEAD',
})
Expand Down
8 changes: 1 addition & 7 deletions server/api/registry/analysis/[...pkg].get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
ERROR_PACKAGE_ANALYSIS_FAILED,
} from '#shared/utils/constants'
import { parseRepoUrl } from '#shared/utils/git-providers'
import { encodePackageName } from '#shared/utils/npm'
import { getLatestVersion, getLatestVersionBatch } from 'fast-npm-meta'

export default defineCachedEventHandler(
Expand Down Expand Up @@ -76,13 +77,6 @@ export default defineCachedEventHandler(
},
)

function encodePackageName(name: string): string {
if (name.startsWith('@')) {
return `@${encodeURIComponent(name.slice(1))}`
}
return encodeURIComponent(name)
}

/**
* Fetch @types package info including deprecation status using fast-npm-meta.
* Returns undefined if the package doesn't exist.
Expand Down
7 changes: 2 additions & 5 deletions server/utils/dependency-resolver.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { Packument, PackumentVersion, DependencyDepth } from '#shared/types'
import { mapWithConcurrency } from '#shared/utils/async'
import { encodePackageName } from '#shared/utils/npm'
import { maxSatisfying } from 'semver'

/** Concurrency limit for fetching packuments during dependency resolution */
Expand All @@ -21,11 +22,7 @@ export const TARGET_PLATFORM = {
export const fetchPackument = defineCachedFunction(
async (name: string): Promise<Packument | null> => {
try {
const encodedName = name.startsWith('@')
? `@${encodeURIComponent(name.slice(1))}`
: encodeURIComponent(name)

return await $fetch<Packument>(`https://registry.npmjs.org/${encodedName}`)
return await $fetch<Packument>(`https://registry.npmjs.org/${encodePackageName(name)}`)
} catch (error) {
if (import.meta.dev) {
// oxlint-disable-next-line no-console -- log npm registry failures for debugging
Expand Down
Loading