From 4f02a8db2aa39ec7910d48f66bb602720c6fca1c Mon Sep 17 00:00:00 2001
From: LukaDev <47296785+lukadev-0@users.noreply.github.com>
Date: Sat, 24 Aug 2024 15:52:06 +0200
Subject: [PATCH] feat(website): better package layout

---
 .../[[target]] => }/+layout.server.ts         |  0
 .../packages/[scope]/[name]/+layout.svelte    | 68 +++++++++++++++++++
 .../{[[version]]/[[target]] => }/Tab.svelte   |  4 --
 .../[[version]]/[[target]]/+layout.svelte     | 45 +++---------
 .../[[target]]/TargetSelector.svelte          |  4 +-
 .../[[target]] => }/versions/+page.server.ts  |  0
 .../[[target]] => }/versions/+page.svelte     |  8 +--
 7 files changed, 83 insertions(+), 46 deletions(-)
 rename website/src/routes/packages/[scope]/[name]/{[[version]]/[[target]] => }/+layout.server.ts (100%)
 create mode 100644 website/src/routes/packages/[scope]/[name]/+layout.svelte
 rename website/src/routes/packages/[scope]/[name]/{[[version]]/[[target]] => }/Tab.svelte (84%)
 rename website/src/routes/packages/[scope]/[name]/{[[version]]/[[target]] => }/versions/+page.server.ts (100%)
 rename website/src/routes/packages/[scope]/[name]/{[[version]]/[[target]] => }/versions/+page.svelte (80%)

diff --git a/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/+layout.server.ts b/website/src/routes/packages/[scope]/[name]/+layout.server.ts
similarity index 100%
rename from website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/+layout.server.ts
rename to website/src/routes/packages/[scope]/[name]/+layout.server.ts
diff --git a/website/src/routes/packages/[scope]/[name]/+layout.svelte b/website/src/routes/packages/[scope]/[name]/+layout.svelte
new file mode 100644
index 0000000..00873b0
--- /dev/null
+++ b/website/src/routes/packages/[scope]/[name]/+layout.svelte
@@ -0,0 +1,68 @@
+<script lang="ts">
+	import { formatDistanceToNow } from "date-fns"
+	import Tab from "./Tab.svelte"
+	import { page } from "$app/stores"
+	import { onMount, setContext, untrack } from "svelte"
+
+	let { children, data } = $props()
+
+	const [scope, name] = $derived(data.pkg.name.split("/"))
+
+	let currentPkg = $state(data.pkg)
+
+	setContext("currentPkg", {
+		get value() {
+			return currentPkg
+		},
+		set value(v) {
+			currentPkg = v
+		},
+	})
+
+	const getReadme = () => {
+		console.log($page.params)
+		if ("target" in $page.params) {
+			return `${$page.params.version}/${$page.params.target}`
+		}
+		return ""
+	}
+
+	const pkgVersion = $derived(currentPkg.version)
+	const pkgDescription = $derived(currentPkg.description)
+
+	let pkgDate = $state<null | string>(null)
+	let readme = $state(getReadme())
+
+	$effect(() => {
+		pkgDate = formatDistanceToNow(new Date(currentPkg.published_at), { addSuffix: true })
+		readme = untrack(getReadme)
+	})
+
+	onMount(() => {
+		return page.subscribe((page) => {
+			if (pkgDate === null || page.params.target !== undefined) {
+				currentPkg = data.pkg
+			}
+		})
+	})
+</script>
+
+<div class="mx-auto max-w-prose px-4 py-16 lg:max-w-screen-lg">
+	<h1 class="text-3xl font-bold">
+		<span class="text-heading">{scope}/</span><span class="text-light">{name}</span>
+	</h1>
+	<div class="mb-2 font-semibold text-primary" class:invisible={pkgDate === null}>
+		v{pkgVersion} ·
+		<time datetime={data.pkg.published_at} title={new Date(data.pkg.published_at).toLocaleString()}>
+			published {pkgDate ?? "..."}
+		</time>
+	</div>
+	<p class="mb-6 max-w-prose">{pkgDescription}</p>
+
+	<nav class="flex w-full border-b-2">
+		<Tab tab={readme}>Readme</Tab>
+		<Tab tab="versions">Versions</Tab>
+	</nav>
+
+	{@render children()}
+</div>
diff --git a/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/Tab.svelte b/website/src/routes/packages/[scope]/[name]/Tab.svelte
similarity index 84%
rename from website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/Tab.svelte
rename to website/src/routes/packages/[scope]/[name]/Tab.svelte
index 9fda622..12f3bd5 100644
--- a/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/Tab.svelte
+++ b/website/src/routes/packages/[scope]/[name]/Tab.svelte
@@ -11,10 +11,6 @@
 
 	const basePath = $derived.by(() => {
 		const { scope, name } = $page.params
-		if ("target" in $page.params) {
-			const { version, target } = $page.params
-			return `/packages/${scope}/${name}/${version}/${target}`
-		}
 		return `/packages/${scope}/${name}`
 	})
 
diff --git a/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/+layout.svelte b/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/+layout.svelte
index 71249a3..e6b8a22 100644
--- a/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/+layout.svelte
+++ b/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/+layout.svelte
@@ -1,7 +1,5 @@
 <script lang="ts">
-	import { formatDistanceToNow } from "date-fns"
 	import { BinaryIcon, Icon, LibraryIcon } from "lucide-svelte"
-	import Tab from "./Tab.svelte"
 	import { page } from "$app/stores"
 	import type { TargetInfo } from "$lib/registry-api"
 	import type { ComponentType } from "svelte"
@@ -11,13 +9,13 @@
 
 	let { children, data } = $props()
 
-	const [scope, name] = $derived(data.pkg.name.split("/"))
-
 	const installCommand = $derived(`pesde add ${data.pkg.name}`)
 	const xCommand = $derived(`pesde x ${data.pkg.name}`)
 
 	const defaultTarget = $derived(
-		"target" in $page.params ? $page.params.target : data.pkg.targets[0].kind,
+		"target" in $page.params && $page.params.target !== "any"
+			? $page.params.target
+			: data.pkg.targets[0].kind,
 	)
 	const currentTarget = $derived(data.pkg.targets.find((target) => target.kind === defaultTarget))
 
@@ -42,39 +40,18 @@
 		lib: LibraryIcon,
 		bin: BinaryIcon,
 	}
+
+	const exportEntries = $derived(
+		Object.entries(exportNames).filter(([key]) => !!currentTarget?.[key as keyof TargetInfo]),
+	)
 </script>
 
-<div class="mx-auto flex max-w-prose flex-col px-4 py-16 lg:max-w-screen-lg lg:flex-row">
-	<div class="flex-grow lg:pr-4">
-		<h1 class="text-3xl font-bold">
-			<span class="text-heading">{scope}/</span><span class="text-light">{name}</span>
-		</h1>
-		<div class="mb-2 font-semibold text-primary">
-			v{data.pkg.version} ·
-			<time
-				datetime={data.pkg.published_at}
-				title={new Date(data.pkg.published_at).toLocaleString()}
-			>
-				published {formatDistanceToNow(new Date(data.pkg.published_at), {
-					addSuffix: true,
-				})}
-			</time>
-		</div>
-		<p class="mb-6 max-w-prose">{data.pkg.description}</p>
-
-		<div class="mb-12 lg:hidden">
-			<TargetSelector id="target-selector-sidebar" />
-		</div>
-
-		<nav class="flex w-full border-b-2">
-			<Tab tab="">Readme</Tab>
-			<Tab tab="versions">Versions</Tab>
-		</nav>
-
+<div class="flex flex-col lg:flex-row">
+	<div class="lg:pr-4">
 		{@render children()}
 	</div>
 	<aside
-		class="w-full flex-shrink-0 border-t pt-16 lg:ml-auto lg:max-w-[22rem] lg:border-l lg:border-t-0 lg:pl-4 lg:pt-0"
+		class="w-full flex-shrink-0 border-t pt-16 lg:ml-auto lg:max-w-[22rem] lg:border-l lg:border-t-0 lg:pl-4 lg:pt-6"
 	>
 		<h2 class="mb-1 text-lg font-semibold text-heading">Install</h2>
 		<Command command={installCommand} class="mb-4" />
@@ -111,7 +88,7 @@
 
 		<h2 class="mb-1 text-lg font-semibold text-heading">Exports</h2>
 		<ul class="mb-6 space-y-0.5">
-			{#each Object.entries(exportNames).filter(([key]) => !!currentTarget?.[key as keyof TargetInfo]) as [exportKey, exportName]}
+			{#each exportEntries as [exportKey, exportName]}
 				{@const Icon = exportIcons[exportKey as keyof TargetInfo]}
 				<li class="flex items-center">
 					<Icon class="mr-2 size-5 text-primary" />
diff --git a/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/TargetSelector.svelte b/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/TargetSelector.svelte
index bbdf131..19432e2 100644
--- a/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/TargetSelector.svelte
+++ b/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/TargetSelector.svelte
@@ -6,7 +6,9 @@
 	const { id }: { id: string } = $props()
 
 	const defaultTarget = $derived(
-		"target" in $page.params ? $page.params.target : $page.data.pkg.targets[0].kind,
+		"target" in $page.params && $page.params.target !== "any"
+			? $page.params.target
+			: $page.data.pkg.targets[0].kind,
 	)
 
 	const basePath = $derived.by(() => {
diff --git a/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/versions/+page.server.ts b/website/src/routes/packages/[scope]/[name]/versions/+page.server.ts
similarity index 100%
rename from website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/versions/+page.server.ts
rename to website/src/routes/packages/[scope]/[name]/versions/+page.server.ts
diff --git a/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/versions/+page.svelte b/website/src/routes/packages/[scope]/[name]/versions/+page.svelte
similarity index 80%
rename from website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/versions/+page.svelte
rename to website/src/routes/packages/[scope]/[name]/versions/+page.svelte
index cb323e8..d30726c 100644
--- a/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/versions/+page.svelte
+++ b/website/src/routes/packages/[scope]/[name]/versions/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import { page } from "$app/stores"
 	import { formatDistanceToNow } from "date-fns"
 
 	const { data } = $props()
@@ -8,15 +7,10 @@
 <div class="space-y-4 py-4">
 	{#each data.versions as pkg, index}
 		{@const isLatest = index === 0}
-		{@const isCurrent = $page.params.version === pkg.version}
 
 		<article
 			class={`relative overflow-hidden rounded bg-card px-5 py-4 transition hover:bg-card-hover ${
-				isLatest
-					? "ring-2 ring-inset ring-primary"
-					: isCurrent
-						? "ring-2 ring-inset ring-body/50"
-						: ""
+				isLatest ? "ring-2 ring-inset ring-primary" : ""
 			}`}
 		>
 			<h2 class="font-semibold text-heading">