Skip to content

Commit 66aa0ff

Browse files
committed
chore: check route details
1 parent b3586a4 commit 66aa0ff

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

app/pages/package/[[org]]/[name].vue

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ defineOgImageComponent('Package', {
2727
})
2828
2929
const router = useRouter()
30+
const route = useRoute()
3031
3132
const header = useTemplateRef('header')
3233
const isHeaderPinned = shallowRef(false)
@@ -94,8 +95,9 @@ const navExtraOffsetStyle = computed(() => ({
9495
9596
const { packageName, requestedVersion, orgName } = usePackageRoute()
9697
98+
console.log(packageName.value, JSON.stringify({...route, requestedVersion: requestedVersion.value, orgName: orgName.value}))
9799
if (import.meta.server) {
98-
assertValidPackageName(packageName.value)
100+
assertValidPackageName(packageName.value, JSON.stringify({...route, requestedVersion: requestedVersion.value, orgName: orgName.value}))
99101
}
100102
101103
// Fetch README for specific version if requested, otherwise latest
@@ -206,9 +208,10 @@ if (
206208
versionError.value.statusCode >= 400 &&
207209
versionError.value.statusCode < 500
208210
) {
211+
// pass information to client somehow
209212
throw createError({
210213
statusCode: 404,
211-
statusMessage: $t('package.not_found'),
214+
statusMessage: $t('package.not_found'), // todo22 add more detailed for stages
212215
message: $t('package.not_found_message'),
213216
})
214217
}
@@ -218,6 +221,7 @@ const {
218221
status,
219222
error,
220223
} = usePackage(packageName, () => resolvedVersion.value ?? requestedVersion.value)
224+
console.log(resolvedVersion.value, requestedVersion.value, pkg.value);
221225
const displayVersion = computed(() => pkg.value?.requestedVersion ?? null)
222226
const versionSecurityMetadata = computed<PackageVersionInfo[]>(() => {
223227
if (!pkg.value) return []
@@ -254,7 +258,7 @@ const { copied: copiedVersion, copy: copyVersion } = useClipboard({
254258
// This is the same composable used by PackageVulnerabilityTree and PackageDeprecatedTree
255259
const { data: vulnTree, status: vulnTreeStatus } = useDependencyAnalysis(
256260
packageName,
257-
() => resolvedVersion.value ?? '',
261+
() => resolvedVersion.value ?? '', // todo22 check early run
258262
)
259263
260264
const {
@@ -1102,7 +1106,7 @@ const showSkeleton = shallowRef(false)
11021106
{{ $t('package.stats.published') }}
11031107
</dt>
11041108
<dd class="font-mono text-sm text-fg">
1105-
<DateTime :datetime="pkg.time[resolvedVersion]!" date-style="medium" />
1109+
<DateTime v-if="resolvedVersion" :datetime="pkg.time[resolvedVersion]!" date-style="medium" />
11061110
</dd>
11071111
</div>
11081112
</dl>
@@ -1385,6 +1389,7 @@ const showSkeleton = shallowRef(false)
13851389
<PackageCompatibility :engines="displayVersion?.engines" />
13861390

13871391
<!-- Versions (grouped by release channel) -->
1392+
<!-- todo22 check condition -->
13881393
<PackageVersions
13891394
v-if="pkg.versions && Object.keys(pkg.versions).length > 0"
13901395
:package-name="pkg.name"

shared/utils/npm.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ export async function fetchLatestVersion(name: string): Promise<string | null> {
3737
* Validate an npm package name and throw an HTTP error if invalid.
3838
* Uses validate-npm-package-name to check against npm naming rules.
3939
*/
40-
export function assertValidPackageName(name: string): void {
40+
export function assertValidPackageName(name: string, meta: string = ""): void {
4141
const result = validatePackageName(name)
4242
if (!result.validForNewPackages && !result.validForOldPackages) {
4343
const errors = [...(result.errors ?? []), ...(result.warnings ?? [])]
4444
throw createError({
4545
// TODO: throwing 404 rather than 400 as it's cacheable
4646
statusCode: 404,
47-
message: `Invalid package name: ${errors[0] ?? 'unknown error'}`,
47+
message: `Invalid package name: ${errors[0] ?? 'unknown error'}\n${meta}`,
4848
})
4949
}
5050
}

0 commit comments

Comments
 (0)