From 82baeb909a8e054d95eed1294e6b72d4b26e69b6 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Sat, 5 Apr 2025 09:40:05 +1100
Subject: [PATCH] feat: add `yarn typecheck` and fix all types

---
 components/CreateCollectionModal.vue          |  2 +-
 components/Docs/Sidebar.vue                   | 50 -------------------
 components/Docs/SidebarNavItem.vue            | 30 -----------
 components/PlatformSelector.vue               | 16 ++++--
 components/UploadFileDialog.vue               |  2 +-
 nuxt.config.ts                                | 10 ++++
 package.json                                  |  3 +-
 server/api/v1/admin/news/index.get.ts         |  2 +-
 server/api/v1/admin/news/index.post.ts        |  2 +-
 server/api/v1/client/game/versions.get.ts     | 13 +----
 server/api/v1/client/metadata/versions.get.ts | 12 +----
 server/api/v1/client/news/index.get.ts        |  2 +-
 server/api/v1/news/index.get.ts               |  2 +-
 server/internal/news/index.ts                 |  2 +-
 server/internal/utils/prioritylist.ts         |  4 +-
 server/routes/signout.get.ts                  |  2 +-
 16 files changed, 37 insertions(+), 117 deletions(-)
 delete mode 100644 components/Docs/Sidebar.vue
 delete mode 100644 components/Docs/SidebarNavItem.vue

diff --git a/components/CreateCollectionModal.vue b/components/CreateCollectionModal.vue
index b84e90b..e749d0b 100644
--- a/components/CreateCollectionModal.vue
+++ b/components/CreateCollectionModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <ModalTemplate v-model="open">
+  <ModalTemplate v-model="!!open">
     <template #default>
       <div>
         <DialogTitle as="h3" class="text-lg font-medium leading-6 text-white">
diff --git a/components/Docs/Sidebar.vue b/components/Docs/Sidebar.vue
deleted file mode 100644
index a8d1ed1..0000000
--- a/components/Docs/Sidebar.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-    <div
-        v-if="user"
-        class="flex grow flex-col gap-y-5 overflow-y-auto bg-zinc-900 px-6 pb-4 ring-1 ring-white/10"
-    >
-        <div class="flex h-16 shrink-0 items-center">
-            <Wordmark />
-        </div>
-
-        <nav class="flex flex-1 flex-col">
-            <ul role="list" class="flex flex-1 flex-col gap-y-7">
-                <li>
-                    <ul role="list" class="-mx-2 space-y-1">
-                        <DocsSidebarNavItem
-                            v-for="item in unwrappedNavigation ?? navigation"
-                            :key="item.name"
-                            :nav="item"
-                        />
-                    </ul>
-                </li>
-                <li class="mt-auto flex items-center">
-                    <div class="inline-flex items-center w-full text-zinc-300">
-                        <img
-                            :src="useObject(user.profilePicture)"
-                            class="w-5 h-5 rounded-sm"
-                        />
-                        <span class="ml-3 text-sm font-bold">{{
-                            user.displayName
-                        }}</span>
-                    </div>
-                    <NuxtLink
-                        href="/"
-                        class="ml-auto rounded bg-blue-600 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-blue-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600"
-                    >
-                        &larr;&nbsp;Home
-                    </NuxtLink>
-                </li>
-            </ul>
-        </nav>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { fetchContentNavigation, useObject, useUser } from "#imports";
-
-const user = useUser();
-
-const navigation = await fetchContentNavigation();
-const unwrappedNavigation = navigation[0]?.children;
-</script>
diff --git a/components/Docs/SidebarNavItem.vue b/components/Docs/SidebarNavItem.vue
deleted file mode 100644
index ae6e96a..0000000
--- a/components/Docs/SidebarNavItem.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-<template>
-    <NuxtLink
-        :href="props.nav._path"
-        :class="[
-            current
-                ? 'text-zinc-100'
-                : 'text-zinc-400 hover:text-zinc-100 hover:bg-zinc-900',
-            ' group flex gap-x-3 rounded-md px-2 text-sm font-semibold leading-6',
-        ]"
-    >
-        {{ props.nav.title }}
-    </NuxtLink>
-    <ul class="pl-3 flex flex-col" v-if="children">
-        <li v-for="child in children" class="inline-flex items-center">
-            <ChevronDownIcon class="w-4 h-4 text-zinc-600 rotate-45" />
-            <DocsSidebarNavItem :nav="child" :key="child._path" />
-        </li>
-    </ul>
-</template>
-
-<script setup lang="ts">
-import { ChevronDownIcon } from "@heroicons/vue/24/solid";
-
-type NavItem = { title: string; _path: string; children?: NavItem[] };
-const props = defineProps<{ nav: NavItem }>();
-const children = props.nav.children?.filter((e) => e._path != props.nav._path);
-
-const route = useRoute();
-const current = computed(() => route.path.trim() == props.nav._path.trim());
-</script>
diff --git a/components/PlatformSelector.vue b/components/PlatformSelector.vue
index 859effa..f0f4d8f 100644
--- a/components/PlatformSelector.vue
+++ b/components/PlatformSelector.vue
@@ -1,5 +1,5 @@
 <template>
-  <Listbox as="div" v-model="model">
+  <Listbox as="div" v-model="typedModel">
     <ListboxLabel class="block text-sm font-medium leading-6 text-zinc-100"
       ><slot
     /></ListboxLabel>
@@ -74,7 +74,6 @@
 </template>
 
 <script setup lang="ts">
-import { IconsLinuxLogo, IconsMacLogo, IconsWindowsLogo } from "#components";
 import {
   Listbox,
   ListboxButton,
@@ -83,9 +82,18 @@ import {
   ListboxOptions,
 } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import type { Component } from "vue";
 
-const model = defineModel<PlatformClient>();
+const model = defineModel<PlatformClient | undefined>();
+
+const typedModel = computed<PlatformClient | null>({
+  get() {
+    return model.value || null;
+  },
+  set(v) {
+    if (v === null) return (model.value = undefined);
+    model.value = v;
+  },
+});
 
 const values = Object.fromEntries(Object.entries(PlatformClient));
 </script>
diff --git a/components/UploadFileDialog.vue b/components/UploadFileDialog.vue
index e74cf6e..240eb5a 100644
--- a/components/UploadFileDialog.vue
+++ b/components/UploadFileDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <TransitionRoot as="template" :show="open">
+  <TransitionRoot as="template" :show="!!open">
     <Dialog class="relative z-50" @close="open = false">
       <TransitionChild
         as="template"
diff --git a/nuxt.config.ts b/nuxt.config.ts
index d4d9d77..83c7cdd 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -45,6 +45,16 @@ export default defineNuxtConfig({
     compressPublicAssets: true,
   },
 
+  typescript: {
+    tsConfig: {
+      compilerOptions: {
+        verbatimModuleSyntax: false,
+        skipDefaultLibCheck: true,
+        skipLibCheck: true,
+      },
+    },
+  },
+
   extends: ["./drop-base"],
 
   // Module config from here down
diff --git a/package.json b/package.json
index 8cfe6b2..3c0962b 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,8 @@
     "dev": "nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
-    "postinstall": "nuxt prepare"
+    "postinstall": "nuxt prepare",
+    "typecheck": "nuxi typecheck"
   },
   "dependencies": {
     "@drop-oss/droplet": "^0.7.2",
diff --git a/server/api/v1/admin/news/index.get.ts b/server/api/v1/admin/news/index.get.ts
index f314917..392f4b7 100644
--- a/server/api/v1/admin/news/index.get.ts
+++ b/server/api/v1/admin/news/index.get.ts
@@ -27,7 +27,7 @@ export default defineEventHandler(async (h3) => {
     take: parseInt(query.limit as string),
     skip: parseInt(query.skip as string),
     orderBy: orderBy,
-    tags: tags?.map((e) => e.toString()),
+    ...(tags && { tags: tags.map((e) => e.toString()) }),
     search: query.search as string,
   };
 
diff --git a/server/api/v1/admin/news/index.post.ts b/server/api/v1/admin/news/index.post.ts
index 2e6b640..bc9d620 100644
--- a/server/api/v1/admin/news/index.post.ts
+++ b/server/api/v1/admin/news/index.post.ts
@@ -41,7 +41,7 @@ export default defineEventHandler(async (h3) => {
 
     tags: tags,
 
-    image: imageId,
+    ...(imageId && { image: imageId }),
     authorId: "system",
   });
 
diff --git a/server/api/v1/client/game/versions.get.ts b/server/api/v1/client/game/versions.get.ts
index 40437e3..8b63a19 100644
--- a/server/api/v1/client/game/versions.get.ts
+++ b/server/api/v1/client/game/versions.get.ts
@@ -23,18 +23,9 @@ export default defineClientEventHandler(async (h3, {}) => {
   const mappedVersions = versions
     .map((version) => {
       if (!version.dropletManifest) return undefined;
-      const manifest = JSON.parse(
-        version.dropletManifest.toString()
-      ) as DropManifest;
-
-      /*
-      TODO: size estimates
-      They are a little complicated because of delta versions
-      Manifests need to be generated with the manifest generator and then
-      added up. I'm a little busy right now to implement this, though.
-      */
-
+      
       const newVersion = { ...version, dropletManifest: undefined };
+      // @ts-expect-error
       delete newVersion.dropletManifest;
       return {
         ...newVersion,
diff --git a/server/api/v1/client/metadata/versions.get.ts b/server/api/v1/client/metadata/versions.get.ts
index 40437e3..f1bb47a 100644
--- a/server/api/v1/client/metadata/versions.get.ts
+++ b/server/api/v1/client/metadata/versions.get.ts
@@ -23,18 +23,8 @@ export default defineClientEventHandler(async (h3, {}) => {
   const mappedVersions = versions
     .map((version) => {
       if (!version.dropletManifest) return undefined;
-      const manifest = JSON.parse(
-        version.dropletManifest.toString()
-      ) as DropManifest;
-
-      /*
-      TODO: size estimates
-      They are a little complicated because of delta versions
-      Manifests need to be generated with the manifest generator and then
-      added up. I'm a little busy right now to implement this, though.
-      */
-
       const newVersion = { ...version, dropletManifest: undefined };
+      // @ts-expect-error
       delete newVersion.dropletManifest;
       return {
         ...newVersion,
diff --git a/server/api/v1/client/news/index.get.ts b/server/api/v1/client/news/index.get.ts
index bee24c3..8ab6e13 100644
--- a/server/api/v1/client/news/index.get.ts
+++ b/server/api/v1/client/news/index.get.ts
@@ -20,7 +20,7 @@ export default defineClientEventHandler(async (h3) => {
     take: parseInt(query.limit as string),
     skip: parseInt(query.skip as string),
     orderBy: orderBy,
-    tags: tags?.map((e) => e.toString()),
+    ...(tags && { tags: tags.map((e) => e.toString()) }),
     search: query.search as string,
   };
 
diff --git a/server/api/v1/news/index.get.ts b/server/api/v1/news/index.get.ts
index 5f846f2..e5b6aac 100644
--- a/server/api/v1/news/index.get.ts
+++ b/server/api/v1/news/index.get.ts
@@ -28,7 +28,7 @@ export default defineEventHandler(async (h3) => {
     take: parseInt(query.limit as string),
     skip: parseInt(query.skip as string),
     orderBy: orderBy,
-    tags: tags?.map((e) => e.toString()),
+    ...(tags && { tags: tags.map((e) => e.toString()) }),
     search: query.search as string,
   };
 
diff --git a/server/internal/news/index.ts b/server/internal/news/index.ts
index 68385bf..f47cb9a 100644
--- a/server/internal/news/index.ts
+++ b/server/internal/news/index.ts
@@ -24,7 +24,7 @@ class NewsManager {
           })),
         },
 
-        image: data.image,
+        ...(data.image && { image: data.image }),
         author: {
           connect: {
             id: data.authorId,
diff --git a/server/internal/utils/prioritylist.ts b/server/internal/utils/prioritylist.ts
index 0fd5e73..b39c447 100644
--- a/server/internal/utils/prioritylist.ts
+++ b/server/internal/utils/prioritylist.ts
@@ -67,14 +67,14 @@ export class PriorityListIndexed<T> extends PriorityList<T> {
         return index as string;
     }
 
-    push(item: T, priority?: number): void {
+    override push(item: T, priority?: number): void {
         const index = this.getIndex(item);
         this.indexMap[index] = item;
 
         super.push(item, priority);
     }
 
-    pop(position?: number): PriorityTagged<T> {
+    override pop(position?: number): PriorityTagged<T> {
         const value = super.pop(position);
 
         const index = this.getIndex(value.object);
diff --git a/server/routes/signout.get.ts b/server/routes/signout.get.ts
index b1158df..08e7673 100644
--- a/server/routes/signout.get.ts
+++ b/server/routes/signout.get.ts
@@ -1,7 +1,7 @@
 import sessionHandler from "../internal/session";
 
 export default defineEventHandler(async (h3) => {
-  await sessionHandler.clearSession(h3);
+  await sessionHandler.signout(h3);
 
   return sendRedirect(h3, "/auth/signin");
 });