Skip to content

Commit a0acb85

Browse files
committed
refactor: simplify
1 parent 25253d8 commit a0acb85

7 files changed

Lines changed: 13 additions & 13 deletions

File tree

app/components/PackageCard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const emit = defineEmits<{
2727
class="font-mono text-sm sm:text-base font-medium text-fg group-hover:text-fg transition-colors duration-200 min-w-0 break-all"
2828
>
2929
<NuxtLink
30-
:to="{ name: 'package', params: parsePackageRouteParams(result.package.name) }"
30+
:to="{ name: 'package', params: getPackagePageParams(result.package.name) }"
3131
:prefetch-on="prefetch ? 'visibility' : 'interaction'"
3232
class="focus-visible:outline-none decoration-none scroll-mt-48 scroll-mb-6 after:content-[''] after:absolute after:inset-0"
3333
:data-result-index="index"

app/components/PackageDependencies.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const sortedOptionalDependencies = computed(() => {
5959
class="flex items-center justify-between py-1 text-sm gap-2"
6060
>
6161
<NuxtLink
62-
:to="{ name: 'package', params: parsePackageRouteParams(dep) }"
62+
:to="{ name: 'package', params: getPackagePageParams(dep) }"
6363
class="font-mono text-fg-muted hover:text-fg transition-colors duration-200 truncate min-w-0"
6464
>
6565
{{ dep }}
@@ -75,7 +75,7 @@ const sortedOptionalDependencies = computed(() => {
7575
<span class="i-carbon-warning-alt w-3 h-3 block" />
7676
</span>
7777
<NuxtLink
78-
:to="{ name: 'package', params: { ...parsePackageRouteParams(dep), version } }"
78+
:to="{ name: 'package', params: getPackagePageParams(dep, version) }"
7979
class="font-mono text-xs text-right truncate"
8080
:class="getVersionClass(outdatedDeps[dep])"
8181
:title="outdatedDeps[dep] ? getOutdatedTooltip(outdatedDeps[dep]) : version"
@@ -114,7 +114,7 @@ const sortedOptionalDependencies = computed(() => {
114114
>
115115
<div class="flex items-center gap-2 min-w-0">
116116
<NuxtLink
117-
:to="{ name: 'package', params: parsePackageRouteParams(peer.name) }"
117+
:to="{ name: 'package', params: getPackagePageParams(peer.name) }"
118118
class="font-mono text-fg-muted hover:text-fg transition-colors duration-200 truncate"
119119
>
120120
{{ peer.name }}
@@ -130,7 +130,7 @@ const sortedOptionalDependencies = computed(() => {
130130
<NuxtLink
131131
:to="{
132132
name: 'package',
133-
params: { ...parsePackageRouteParams(peer.name), version: peer.version },
133+
params: getPackagePageParams(peer.name, peer.version),
134134
}"
135135
class="font-mono text-xs text-fg-subtle max-w-[40%] text-right truncate"
136136
:title="peer.version"
@@ -170,13 +170,13 @@ const sortedOptionalDependencies = computed(() => {
170170
class="flex items-center justify-between py-1 text-sm gap-2"
171171
>
172172
<NuxtLink
173-
:to="{ name: 'package', params: parsePackageRouteParams(dep) }"
173+
:to="{ name: 'package', params: getPackagePageParams(dep) }"
174174
class="font-mono text-fg-muted hover:text-fg transition-colors duration-200 truncate min-w-0"
175175
>
176176
{{ dep }}
177177
</NuxtLink>
178178
<NuxtLink
179-
:to="{ name: 'package', params: { ...parsePackageRouteParams(dep), version } }"
179+
:to="{ name: 'package', params: getPackagePageParams(dep, version) }"
180180
class="font-mono text-xs text-fg-subtle max-w-[50%] text-right truncate"
181181
:title="version"
182182
>

app/components/PackageInstallScripts.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const isExpanded = shallowRef(false)
6969
class="flex items-center justify-between py-0.5 text-sm gap-2"
7070
>
7171
<NuxtLink
72-
:to="{ name: 'package', params: parsePackageRouteParams(dep) }"
72+
:to="{ name: 'package', params: getPackagePageParams(dep) }"
7373
class="font-mono text-fg-muted hover:text-fg transition-colors duration-200 truncate min-w-0"
7474
>
7575
{{ dep }}

app/components/PackageVersions.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function hasProvenance(version: PackumentVersion | undefined): boolean {
4040
function versionRoute(version: string): RouteLocationRaw {
4141
return {
4242
name: 'package',
43-
params: { ...parsePackageRouteParams(props.packageName), version },
43+
params: getPackagePageParams(props.packageName, version),
4444
}
4545
}
4646

app/composables/usePackageRoute.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
export function parsePackageRouteParams(pkg: string) {
1+
export function getPackagePageParams(pkg: string, version: string | null = null) {
22
const [org, name] = pkg.startsWith('@') ? pkg.split('/') : [null, pkg]
33

4-
return { org, name }
4+
return { org, name, version }
55
}

app/pages/code/[...path].vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ const orgName = computed(() => {
222222
function packageRoute(ver?: string | null) {
223223
return {
224224
name: 'package' as const,
225-
params: { ...parsePackageRouteParams(packageName.value), version: ver },
225+
params: getPackagePageParams(packageName.value, ver),
226226
}
227227
}
228228

app/pages/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ defineOgImageComponent('Default')
9696
:key="pkg"
9797
>
9898
<NuxtLink
99-
:to="{ name: 'package', params: parsePackageRouteParams(pkg) }"
99+
:to="{ name: 'package', params: getPackagePageParams(pkg) }"
100100
class="link-subtle font-mono text-sm inline-flex items-center gap-2 group"
101101
>
102102
<span

0 commit comments

Comments
 (0)