Update Prisma to 6.11 (#133)

* chore: update prisma to 6.11

more prisma future proofing due to experimental features

* chore: update dependencies

twemoji - new unicode update
argon2 - bux fixes
vue3-carousel - improve mobile experiance
vue-tsc - more stable

* fix: incorrect prisma version in docker

Also remove default value for BUILD_DROP_VERSION, that is now handled in nuxt config

* fix: no logging in prod

* chore: optimize docker builds even more

* fix: revert adoption of prisma driverAdapters

see: https://github.com/prisma/prisma/issues/27486

* chore: optimize dockerignore some more

* Fix `pino-pretty` not being included in build (#135)

* Remove `pino` from frontend

* Fix for downloads and removing of library source (#136)

* fix: downloads and removing library source

* fix: linting

* Fix max file size of 4GB (update droplet) (#137)

* Fix manual metadata import (#138)

* chore(deps): bump vue-i18n from 10.0.7 to 10.0.8 (#140)

Bumps [vue-i18n](https://github.com/intlify/vue-i18n/tree/HEAD/packages/vue-i18n) from 10.0.7 to 10.0.8.
- [Release notes](https://github.com/intlify/vue-i18n/releases)
- [Changelog](https://github.com/intlify/vue-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/intlify/vue-i18n/commits/v10.0.8/packages/vue-i18n)

---
updated-dependencies:
- dependency-name: vue-i18n
  dependency-version: 10.0.8
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump @intlify/core from 10.0.7 to 10.0.8 (#139)

---
updated-dependencies:
- dependency-name: "@intlify/core"
  dependency-version: 10.0.8
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Small fixes (#141)

* fix: save task as Json rather than string

* fix: pull objects before creating game in database

* fix: strips relative dirs from version information

* fix: #132

* fix: lint

* fix: news object ids and small tweaks

* fix: notification styling errors

* fix: lint

* fix: build issues by regenerating lockfile

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: DecDuck <declanahofmeyr@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.dockerignore

@@ -1,3 +1,9 @@
+Dockerfile
+.github
+.vscode
+*.md
+
+#### gitignore below
 # Nuxt dev/build outputs
 .output
 .data
@@ -24,8 +30,14 @@ logs
 .env.*
 !.env.example
 
+.data
+
+
 # deploy template
-deploy-template/
+deploy-template/*
+
+!deploy-template/compose.yml
 
 # generated prisma client
 /prisma/client
+/prisma/validate

Dockerfile

@@ -4,7 +4,7 @@
 FROM node:lts-alpine AS deps
 WORKDIR /app
 COPY package.json yarn.lock ./
-RUN yarn install --network-timeout 1000000 --ignore-scripts
+RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --network-timeout 1000000 --ignore-scripts
 
 # Build for app
 FROM node:lts-alpine AS build-system
@@ -13,6 +13,7 @@ WORKDIR /app
 
 ENV NODE_ENV=production
 ENV NUXT_TELEMETRY_DISABLED=1
+ENV YARN_CACHE_FOLDER=/root/.yarn
 
 # add git so drop can determine its git ref at build
 RUN apk add --no-cache git
@@ -21,12 +22,12 @@ RUN apk add --no-cache git
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
-ARG BUILD_DROP_VERSION="v0.0.0-unknown.1"
+ARG BUILD_DROP_VERSION
 ARG BUILD_GIT_REF
 
 # build
-RUN yarn postinstall
-RUN yarn build
+RUN --mount=type=cache,target=/root/.yarn yarn postinstall && \
+    yarn build
 
 # create run environment for Drop
 FROM node:lts-alpine AS run-system
@@ -35,7 +36,7 @@ WORKDIR /app
 ENV NODE_ENV=production
 ENV NUXT_TELEMETRY_DISABLED=1
 
-RUN yarn add --network-timeout 1000000 --no-lockfile prisma@6.7.0
+RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn add --network-timeout 1000000 --no-lockfile --ignore-scripts prisma@6.11.1
 
 COPY --from=build-system /app/package.json ./
 COPY --from=build-system /app/.output ./app

components/Auth/Simple.vue

@@ -86,7 +86,7 @@
 
 <script setup lang="ts">
 import { XCircleIcon } from "@heroicons/vue/20/solid";
-import type { User } from "~/prisma/client";
+import type { UserModel } from "~/prisma/client/models";
 
 const username = ref("");
 const password = ref("");
@@ -124,6 +124,6 @@ async function signin() {
     },
   });
   const user = useUser();
-  user.value = await $dropFetch<User | null>("/api/v1/user");
+  user.value = await $dropFetch<UserModel | null>("/api/v1/user");
 }
 </script>

components/CreateCollectionModal.vue

@@ -46,7 +46,7 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import { DialogTitle } from "@headlessui/vue";
-import type { CollectionEntry, Game } from "~/prisma/client";
+import type { CollectionEntryModel, GameModel } from "~/prisma/client/models";
 import type { SerializeObject } from "nitropack";
 
 const props = defineProps<{
@@ -79,7 +79,7 @@ async function createCollection() {
     // Add the game if provided
     if (props.gameId) {
       const entry = await $dropFetch<
-        CollectionEntry & { game: SerializeObject<Game> }
+        CollectionEntryModel & { game: SerializeObject<GameModel> }
       >(`/api/v1/collection/${response.id}/entry`, {
         method: "POST",
         body: { id: props.gameId },

components/DeleteCollectionModal.vue

@@ -35,10 +35,10 @@
 </template>
 
 <script setup lang="ts">
-import type { Collection } from "~/prisma/client";
+import type { CollectionModel } from "~/prisma/client/models";
 import { DialogTitle } from "@headlessui/vue";
 
-const collection = defineModel<Collection | undefined>();
+const collection = defineModel<CollectionModel | undefined>();
 const deleteLoading = ref(false);
 
 const collections = await useCollections();

components/DeleteUserModal.vue

@@ -36,9 +36,9 @@
 
 <script setup lang="ts">
 import { DialogTitle } from "@headlessui/vue";
-import type { User } from "~/prisma/client";
+import type { UserModel } from "~/prisma/client/models";
 
-const user = defineModel<User | undefined>();
+const user = defineModel<UserModel | undefined>();
 const deleteLoading = ref(false);
 const router = useRouter();
 const { t } = useI18n();

components/GameCarousel.vue

@@ -35,11 +35,11 @@
 </template>
 
 <script setup lang="ts">
-import type { Game } from "~/prisma/client";
+import type { GameModel } from "~/prisma/client/models";
 import type { SerializeObject } from "nitropack";
 
 const props = defineProps<{
-  items: Array<SerializeObject<Game>>;
+  items: Array<SerializeObject<GameModel>>;
   min?: number;
   width?: number;
 }>();
@@ -51,7 +51,7 @@ const { showGamePanelTextDecoration } = await $dropFetch(
 const currentComponent = ref<HTMLDivElement>();
 
 const min = computed(() => Math.max(props.min ?? 8, props.items.length));
-const games: Ref<Array<SerializeObject<Game> | undefined>> = computed(() =>
+const games: Ref<Array<SerializeObject<GameModel> | undefined>> = computed(() =>
   Array(min.value)
     .fill(0)
     .map((_, i) => props.items[i]),

components/GameEditor/Metadata.vue

@@ -274,7 +274,7 @@
       accept="image/*"
       endpoint="/api/v1/admin/game/image"
       :multiple="true"
-      @upload="(result: Game) => uploadAfterImageUpload(result)"
+      @upload="(result: GameModel) => uploadAfterImageUpload(result)"
     />
     <ModalTemplate v-model="showAddCarouselModal">
       <template #default>
@@ -440,7 +440,7 @@
 </template>
 
 <script setup lang="ts">
-import type { Game } from "~/prisma/client";
+import type { GameModel } from "~/prisma/client/models";
 import { micromark } from "micromark";
 import {
   CheckIcon,
@@ -461,7 +461,9 @@ const showAddImageDescriptionModal = ref(false);
 const showEditCoreMetadata = ref(false);
 const mobileShowFinalDescription = ref(true);
 
-const game = defineModel<SerializeObject<Game>>() as Ref<SerializeObject<Game>>;
+const game = defineModel<SerializeObject<GameModel>>() as Ref<
+  SerializeObject<GameModel>
+>;
 if (!game.value)
   throw createError({
     statusCode: 500,
@@ -563,7 +565,7 @@ const descriptionSaving = ref<DescriptionSavingState>(
 
 let savingTimeout: undefined | NodeJS.Timeout;
 
-type PatchGameBody = Partial<Game>;
+type PatchGameBody = Partial<GameModel>;
 
 watch(descriptionHTML, (_v) => {
   descriptionSaving.value = DescriptionSavingState.Waiting;
@@ -693,7 +695,7 @@ async function deleteImage(id: string) {
   }
 }
 
-async function uploadAfterImageUpload(result: Game) {
+async function uploadAfterImageUpload(result: GameModel) {
   if (!game.value) return;
   game.value.mImageLibraryObjectIds = result.mImageLibraryObjectIds;
 }

components/GameEditor/Version.vue

@@ -55,7 +55,9 @@
               class="mt-2 space-y-4"
               @update="() => updateVersionOrder()"
             >
-              <template #item="{ element: item }: { element: GameVersion }">
+              <template
+                #item="{ element: item }: { element: GameVersionModel }"
+              >
                 <div
                   class="w-full inline-flex items-center px-4 py-2 bg-zinc-800 rounded justify-between"
                 >
@@ -97,7 +99,7 @@
 </template>
 
 <script setup lang="ts">
-import type { Game, GameVersion } from "~/prisma/client";
+import type { GameModel, GameVersionModel } from "~/prisma/client/models";
 import { Bars3Icon, TrashIcon } from "@heroicons/vue/24/solid";
 import type { SerializeObject } from "nitropack";
 import type { H3Error } from "h3";
@@ -112,7 +114,7 @@ defineProps<{ unimportedVersions: string[] }>();
 
 const { t } = useI18n();
 
-type GameAndVersions = Game & { versions: GameVersion[] };
+type GameAndVersions = GameModel & { versions: GameVersionModel[] };
 const game = defineModel<SerializeObject<GameAndVersions>>() as Ref<
   SerializeObject<GameAndVersions>
 >;

components/NotificationItem.vue

@@ -44,9 +44,9 @@
 
 <script setup lang="ts">
 import { XMarkIcon } from "@heroicons/vue/24/solid";
-import type { Notification } from "~/prisma/client";
+import type { NotificationModel } from "~/prisma/client/models";
 
-const props = defineProps<{ notification: Notification }>();
+const props = defineProps<{ notification: NotificationModel }>();
 
 async function deleteMe() {
   await $dropFetch(`/api/v1/notifications/${props.notification.id}`, {

components/UserHeader/NotificationWidgetPanel.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script setup lang="ts">
-import type { Notification } from "~/prisma/client";
+import type { NotificationModel } from "~/prisma/client/models";
 
-const props = defineProps<{ notifications: Array<Notification> }>();
+const props = defineProps<{ notifications: Array<NotificationModel> }>();
 </script>

composables/collection.ts

@@ -1,8 +1,12 @@
-import type { Collection, CollectionEntry, Game } from "~/prisma/client";
+import type {
+  CollectionModel,
+  CollectionEntryModel,
+  GameModel,
+} from "~/prisma/client/models";
 import type { SerializeObject } from "nitropack";
 
-type FullCollection = Collection & {
-  entries: Array<CollectionEntry & { game: SerializeObject<Game> }>;
+type FullCollection = CollectionModel & {
+  entries: Array<CollectionEntryModel & { game: SerializeObject<GameModel> }>;
 };
 
 export const useCollections = async () => {

composables/news.ts

@@ -1,11 +1,11 @@
-import type { Article } from "~/prisma/client";
+import type { ArticleModel } from "~/prisma/client/models";
 import type { SerializeObject } from "nitropack";
 
 export const useNews = () =>
   useState<
     | Array<
         SerializeObject<
-          Article & {
+          ArticleModel & {
             tags: Array<{ id: string; name: string }>;
             author: { displayName: string; id: string } | null;
           }

composables/notifications.ts

@@ -1,12 +1,12 @@
-import type { Notification } from "~/prisma/client";
+import type { NotificationModel } from "~/prisma/client/models";
 
 const ws = new WebSocketHandler("/api/v1/notifications/ws");
 
 export const useNotifications = () =>
-  useState<Array<Notification>>("notifications", () => []);
+  useState<Array<NotificationModel>>("notifications", () => []);
 
 ws.listen((e) => {
-  const notification = JSON.parse(e) as Notification;
+  const notification = JSON.parse(e) as NotificationModel;
   const notifications = useNotifications();
   notifications.value.push(notification);
 });

composables/user.ts

@@ -1,13 +1,13 @@
-import type { User } from "~/prisma/client";
+import type { UserModel } from "~/prisma/client/models";
 
 // undefined = haven't check
 // null = check, no user
 // {} = check, user
 
-export const useUser = () => useState<User | undefined | null>(undefined);
+export const useUser = () => useState<UserModel | undefined | null>(undefined);
 export const updateUser = async () => {
   const user = useUser();
   if (user.value === null) return;
 
-  user.value = await $dropFetch<User | null>("/api/v1/user");
+  user.value = await $dropFetch<UserModel | null>("/api/v1/user");
 };

composables/users.ts

@@ -1,11 +1,12 @@
 import type { SerializeObject } from "nitropack";
-import type { User, AuthMec } from "~/prisma/client";
+import type { UserModel } from "~/prisma/client/models";
+import type { AuthMec } from "~/prisma/client/enums";
 
 export const useUsers = () =>
   useState<
     | Array<
         SerializeObject<
-          User & {
+          UserModel & {
             authMecs?: Array<{ id: string; mec: AuthMec }>;
           }
         >

nuxt.config.ts

@@ -280,7 +280,7 @@ function getDropVersion(): string {
     path.dirname(import.meta.url.replace("file://", "")),
     "package.json",
   );
-  console.log(`Reading package.json from ${packageJsonPath}`);
+
   if (!existsSync(packageJsonPath)) {
     console.error("Could not find package.json, using default version.");
     return defaultVersion;

package.json

@@ -17,7 +17,7 @@
     "lint:fix": "eslint . --fix && prettier --write --list-different ."
   },
   "dependencies": {
-    "@discordapp/twemoji": "^15.1.0",
+    "@discordapp/twemoji": "^16.0.1",
     "@drop-oss/droplet": "1.6.0",
     "@headlessui/vue": "^1.7.23",
     "@heroicons/vue": "^2.1.5",
@@ -25,9 +25,9 @@
     "@nuxt/fonts": "^0.11.0",
     "@nuxt/image": "^1.10.0",
     "@nuxtjs/i18n": "^9.5.5",
-    "@prisma/client": "^6.7.0",
+    "@prisma/client": "^6.11.1",
     "@tailwindcss/vite": "^4.0.6",
-    "argon2": "^0.41.1",
+    "argon2": "^0.43.0",
     "arktype": "^2.1.10",
     "axios": "^1.7.7",
     "bcryptjs": "^3.0.2",
@@ -43,7 +43,7 @@
     "nuxt-security": "2.2.0",
     "pino": "^9.7.0",
     "pino-pretty": "^13.0.0",
-    "prisma": "^6.7.0",
+    "prisma": "^6.11.1",
     "sanitize-filename": "^1.6.3",
     "semver": "^7.7.1",
     "stream-mime-type": "^2.0.0",
@@ -52,7 +52,7 @@
     "vite-plugin-static-copy": "^3.0.0",
     "vue": "latest",
     "vue-router": "latest",
-    "vue3-carousel": "^0.15.0",
+    "vue3-carousel": "^0.16.0",
     "vue3-carousel-nuxt": "^1.1.5",
     "vuedraggable": "^4.1.0"
   },
@@ -72,17 +72,16 @@
     "h3": "^1.15.3",
     "nitropack": "^2.11.12",
     "ofetch": "^1.4.1",
-    "postcss": "^8.4.47",
     "prettier": "^3.5.3",
     "sass": "^1.79.4",
     "tailwindcss": "^4.0.0",
     "typescript": "^5.8.3",
-    "vue-tsc": "^2.2.8"
+    "vue-tsc": "^3.0.1"
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e",
   "overrides": {
     "vue3-carousel-nuxt": {
-      "vue3-carousel": "^0.15.0"
+      "vue3-carousel": "^0.16.0"
     }
   },
   "prisma": {

pages/account/notifications.vue

@@ -92,7 +92,7 @@
 
 <script setup lang="ts">
 import { CheckIcon, TrashIcon } from "@heroicons/vue/24/outline";
-import type { Notification } from "~/prisma/client";
+import type { NotificationModel } from "~/prisma/client/models";
 import type { SerializeObject } from "nitropack";
 
 definePageMeta({
@@ -106,7 +106,7 @@ useHead({
 });
 
 // Fetch notifications
-const notifications = ref<SerializeObject<Notification>[]>([]);
+const notifications = ref<SerializeObject<NotificationModel>[]>([]);
 
 async function fetchNotifications() {
   const { data } = await useFetch("/api/v1/notifications");
@@ -120,7 +120,7 @@ await fetchNotifications();
 async function markAsRead(id: string) {
   await $dropFetch(`/api/v1/notifications/${id}/read`, { method: "POST" });
   const notification = notifications.value.find(
-    (n: SerializeObject<Notification>) => n.id === id,
+    (n: SerializeObject<NotificationModel>) => n.id === id,
   );
   if (notification) {
     notification.read = true;
@@ -130,16 +130,18 @@ async function markAsRead(id: string) {
 // Mark all notifications as read
 async function markAllAsRead() {
   await $dropFetch("/api/v1/notifications/readall", { method: "POST" });
-  notifications.value.forEach((notification: SerializeObject<Notification>) => {
-    notification.read = true;
-  });
+  notifications.value.forEach(
+    (notification: SerializeObject<NotificationModel>) => {
+      notification.read = true;
+    },
+  );
 }
 
 // Delete a notification
 async function deleteNotification(id: string) {
   await $dropFetch(`/api/v1/notifications/${id}`, { method: "DELETE" });
   const index = notifications.value.findIndex(
-    (n: SerializeObject<Notification>) => n.id === id,
+    (n: SerializeObject<NotificationModel>) => n.id === id,
   );
   if (index !== -1) {
     notifications.value.splice(index, 1);

pages/admin/library/sources/index.vue

@@ -272,7 +272,7 @@ import { XCircleIcon } from "@heroicons/vue/20/solid";
 import { CheckIcon, DocumentIcon, XMarkIcon } from "@heroicons/vue/24/outline";
 import { FetchError } from "ofetch";
 import type { Component } from "vue";
-import type { LibraryBackend } from "~/prisma/client";
+import type { LibraryBackend } from "~/prisma/client/enums";
 import type { WorkingLibrarySource } from "~/server/api/v1/admin/library/sources/index.get";
 
 definePageMeta({

pages/admin/users/auth/index.vue

@@ -116,7 +116,7 @@ import { IconsSimpleAuthenticationLogo, IconsSSOLogo } from "#components";
 import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/vue";
 import { EllipsisHorizontalIcon } from "@heroicons/vue/20/solid";
 import { CheckIcon, XMarkIcon } from "@heroicons/vue/24/solid";
-import type { AuthMec } from "~/prisma/client";
+import type { AuthMec } from "~/prisma/client/enums";
 import type { Component } from "vue";
 
 useHead({

pages/admin/users/auth/simple/index.vue

@@ -394,7 +394,7 @@ import {
 } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import { TrashIcon, XCircleIcon } from "@heroicons/vue/24/solid";
-import type { Invitation } from "~/prisma/client";
+import type { InvitationModel } from "~/prisma/client/models";
 import type { SerializeObject } from "nitropack";
 import type { DurationLike } from "luxon";
 import { DateTime } from "luxon";
@@ -410,7 +410,7 @@ useHead({
 });
 
 const data = await $dropFetch<
-  Array<SerializeObject<Invitation & { inviteUrl: string }>>
+  Array<SerializeObject<InvitationModel & { inviteUrl: string }>>
 >("/api/v1/admin/auth/invitation");
 const invitations = ref(data ?? []);
 

pages/admin/users/index.vue

@@ -144,7 +144,7 @@
 
 <script setup lang="ts">
 import { useUsers } from "~/composables/users";
-import type { User } from "~/prisma/client";
+import type { UserModel } from "~/prisma/client/models";
 
 useHead({
   title: "Users",
@@ -163,5 +163,5 @@ if (!users.value) {
 
 const userToDelete = ref();
 
-const setUserToDelete = (user: User) => (userToDelete.value = user);
+const setUserToDelete = (user: UserModel) => (userToDelete.value = user);
 </script>

pages/auth/signin.vue

@@ -43,7 +43,7 @@
 </template>
 
 <script setup lang="ts">
-import type { AuthMec } from "~/prisma/client";
+import type { AuthMec } from "~/prisma/client/enums";
 import DropLogo from "~/components/DropLogo.vue";
 
 const { t } = useI18n();

pages/library/index.vue

@@ -95,12 +95,12 @@
 
 <script setup lang="ts">
 import { TrashIcon, PlusIcon } from "@heroicons/vue/20/solid";
-import type { Collection } from "~/prisma/client";
+import type { CollectionModel } from "~/prisma/client/models";
 
 const collections = await useCollections();
 const collectionCreateOpen = ref(false);
 
-const currentlyDeleting = ref<Collection | undefined>();
+const currentlyDeleting = ref<CollectionModel | undefined>();
 
 const { t } = useI18n();
 const library = await useLibrary();

pages/news/index.vue

@@ -90,14 +90,14 @@
 
 <script setup lang="ts">
 import { DocumentIcon } from "@heroicons/vue/24/outline";
-import type { Article } from "~/prisma/client";
+import type { ArticleModel } from "~/prisma/client/models";
 import type { SerializeObject } from "nitropack/types";
 
 const { t } = useI18n();
 
 const { articles } = defineProps<{
   articles: SerializeObject<
-    Article & {
+    ArticleModel & {
       tags: Array<{ name: string; id: string }>;
       author: { displayName: string };
     }

prisma/schema.prisma

@@ -1,11 +1,12 @@
 // This is your Prisma schema file,
 // learn more about it in the docs: https://pris.ly/d/prisma-schema
 
+// see https://github.com/prisma/prisma/issues/27486 why driverAdapters can't be used
+// TLDR: vite removes it during bundling it or something like that
 generator client {
   provider        = "prisma-client"
   output          = "client"
-  moduleFormat    = "esm"
-  previewFeatures = ["fullTextSearchPostgres"]
+  previewFeatures = ["fullTextSearchPostgres", "relationJoins"]
   binaryTargets   = ["native", "debian-openssl-3.0.x"]
 }
 

server/api/v1/admin/auth/index.get.ts

@@ -1,4 +1,4 @@
-import { AuthMec } from "~/prisma/client";
+import { AuthMec } from "~/prisma/client/enums";
 import aclManager from "~/server/internal/acls";
 import authManager from "~/server/internal/auth";
 

server/api/v1/admin/game/metadata.post.ts

@@ -1,4 +1,4 @@
-import type { Prisma } from "~/prisma/client";
+import type { Prisma } from "~/prisma/client/client";
 import aclManager from "~/server/internal/acls";
 import prisma from "~/server/internal/db/database";
 import { handleFileUpload } from "~/server/internal/utils/handlefileupload";

server/api/v1/admin/library/sources/index.get.ts

@@ -1,8 +1,8 @@
-import type { Library } from "~/prisma/client";
+import type { LibraryModel } from "~/prisma/client/models";
 import aclManager from "~/server/internal/acls";
 import libraryManager from "~/server/internal/library";
 
-export type WorkingLibrarySource = Library & { working: boolean };
+export type WorkingLibrarySource = LibraryModel & { working: boolean };
 
 export default defineEventHandler(async (h3) => {
   const allowed = await aclManager.allowSystemACL(h3, ["library:sources:read"]);

server/api/v1/admin/library/sources/index.post.ts

@@ -1,6 +1,6 @@
 import { type } from "arktype";
 import { randomUUID } from "crypto";
-import { LibraryBackend } from "~/prisma/client";
+import { LibraryBackend } from "~/prisma/client/enums";
 import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
 import aclManager from "~/server/internal/acls";
 import prisma from "~/server/internal/db/database";

server/api/v1/auth/signin/simple.post.ts

@@ -1,4 +1,4 @@
-import { AuthMec } from "~/prisma/client";
+import { AuthMec } from "~/prisma/client/enums";
 import type { JsonArray } from "@prisma/client/runtime/library";
 import { type } from "arktype";
 import prisma from "~/server/internal/db/database";

server/api/v1/auth/signup/simple.post.ts

@@ -1,4 +1,4 @@
-import { AuthMec } from "~/prisma/client";
+import { AuthMec } from "~/prisma/client/enums";
 import prisma from "~/server/internal/db/database";
 import authManager, { createHashArgon2 } from "~/server/internal/auth";
 import * as jdenticon from "jdenticon";

server/api/v1/client/saves/[gameid]/[slotindex]/index.delete.ts

@@ -1,4 +1,4 @@
-import { ClientCapabilities } from "~/prisma/client";
+import { ClientCapabilities } from "~/prisma/client/enums";
 import { defineClientEventHandler } from "~/server/internal/clients/event-handler";
 import prisma from "~/server/internal/db/database";
 

server/api/v1/client/saves/[gameid]/[slotindex]/index.get.ts

@@ -1,4 +1,4 @@
-import { ClientCapabilities } from "~/prisma/client";
+import { ClientCapabilities } from "~/prisma/client/enums";
 import { defineClientEventHandler } from "~/server/internal/clients/event-handler";
 import prisma from "~/server/internal/db/database";
 

server/api/v1/client/saves/[gameid]/[slotindex]/push.post.ts

@@ -1,4 +1,4 @@
-import { ClientCapabilities } from "~/prisma/client";
+import { ClientCapabilities } from "~/prisma/client/enums";
 import { defineClientEventHandler } from "~/server/internal/clients/event-handler";
 import prisma from "~/server/internal/db/database";
 import saveManager from "~/server/internal/saves";

server/api/v1/client/saves/[gameid]/index.get.ts

@@ -1,4 +1,4 @@
-import { ClientCapabilities } from "~/prisma/client";
+import { ClientCapabilities } from "~/prisma/client/enums";
 import { defineClientEventHandler } from "~/server/internal/clients/event-handler";
 import prisma from "~/server/internal/db/database";
 

server/api/v1/client/saves/[gameid]/index.post.ts

@@ -1,4 +1,4 @@
-import { ClientCapabilities } from "~/prisma/client";
+import { ClientCapabilities } from "~/prisma/client/enums";
 import { defineClientEventHandler } from "~/server/internal/clients/event-handler";
 import { applicationSettings } from "~/server/internal/config/application-configuration";
 import prisma from "~/server/internal/db/database";

server/api/v1/client/saves/index.get.ts

@@ -1,4 +1,4 @@
-import { ClientCapabilities } from "~/prisma/client";
+import { ClientCapabilities } from "~/prisma/client/enums";
 import { defineClientEventHandler } from "~/server/internal/clients/event-handler";
 import prisma from "~/server/internal/db/database";
 

server/api/v1/client/saves/settings.get.ts

@@ -1,4 +1,4 @@
-import { ClientCapabilities } from "~/prisma/client";
+import { ClientCapabilities } from "~/prisma/client/enums";
 import { defineClientEventHandler } from "~/server/internal/clients/event-handler";
 import { applicationSettings } from "~/server/internal/config/application-configuration";
 

server/api/v1/client/user/webtoken.post.ts

@@ -1,4 +1,4 @@
-import { APITokenMode } from "~/prisma/client";
+import { APITokenMode } from "~/prisma/client/enums";
 import { DateTime } from "luxon";
 import type { UserACL } from "~/server/internal/acls";
 import { defineClientEventHandler } from "~/server/internal/clients/event-handler";

server/api/v1/user/token/[id]/index.delete.ts

@@ -1,4 +1,4 @@
-import { APITokenMode } from "~/prisma/client";
+import { APITokenMode } from "~/prisma/client/enums";
 import aclManager from "~/server/internal/acls";
 import prisma from "~/server/internal/db/database";
 

server/api/v1/user/token/index.get.ts

@@ -1,4 +1,4 @@
-import { APITokenMode } from "~/prisma/client";
+import { APITokenMode } from "~/prisma/client/enums";
 import aclManager from "~/server/internal/acls";
 import prisma from "~/server/internal/db/database";
 

server/api/v1/user/token/index.post.ts

@@ -1,4 +1,4 @@
-import { APITokenMode } from "~/prisma/client";
+import { APITokenMode } from "~/prisma/client/enums";
 import aclManager, { userACLs } from "~/server/internal/acls";
 import prisma from "~/server/internal/db/database";
 

server/internal/acls/index.ts

@@ -1,4 +1,4 @@
-import { APITokenMode } from "~/prisma/client";
+import { APITokenMode } from "~/prisma/client/enums";
 import prisma from "../db/database";
 import sessionHandler from "../session";
 import type { MinimumRequestObject } from "~/server/h3";

server/internal/auth/index.ts

@@ -1,4 +1,4 @@
-import { AuthMec } from "~/prisma/client";
+import { AuthMec } from "~/prisma/client/enums";
 import { OIDCManager } from "./oidc";
 import { logger } from "~/server/internal/logging";
 

server/internal/auth/oidc/index.ts

@@ -1,7 +1,7 @@
 import { randomUUID } from "crypto";
 import prisma from "../../db/database";
-import type { User } from "~/prisma/client";
-import { AuthMec } from "~/prisma/client";
+import type { UserModel } from "~/prisma/client/models";
+import { AuthMec } from "~/prisma/client/enums";
 import objectHandler from "../../objects";
 import type { Readable } from "stream";
 import * as jdenticon from "jdenticon";
@@ -165,7 +165,7 @@ export class OIDCManager {
   async authorize(
     code: string,
     state: string,
-  ): Promise<{ user: User; options: OIDCAuthSessionOptions } | string> {
+  ): Promise<{ user: UserModel; options: OIDCAuthSessionOptions } | string> {
     const session = this.signinStateTable[state];
     if (!session) return "Invalid state parameter";
 

server/internal/clients/capabilities.ts

@@ -1,6 +1,6 @@
 import type { EnumDictionary } from "../utils/types";
 import prisma from "../db/database";
-import { ClientCapabilities } from "~/prisma/client";
+import { ClientCapabilities } from "~/prisma/client/enums";
 
 // These values are technically mapped to the database,
 // but Typescript/Prisma doesn't let me link them

server/internal/clients/event-handler.ts

@@ -1,4 +1,4 @@
-import type { Client, User } from "~/prisma/client";
+import type { ClientModel, UserModel } from "~/prisma/client/models";
 import type { EventHandlerRequest, H3Event } from "h3";
 import droplet from "@drop-oss/droplet";
 import prisma from "../db/database";
@@ -11,8 +11,8 @@ export type EventHandlerFunction<T> = (
 
 type ClientUtils = {
   clientId: string;
-  fetchClient: () => Promise<Client>;
-  fetchUser: () => Promise<User>;
+  fetchClient: () => Promise<ClientModel>;
+  fetchUser: () => Promise<UserModel>;
 };
 
 const NONCE_LENIENCE = 30_000;

server/internal/clients/handler.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
 import prisma from "../db/database";
-import type { Platform } from "~/prisma/client";
+import type { Platform } from "~/prisma/client/enums";
 import { useCertificateAuthority } from "~/server/plugins/ca";
 import type {
   CapabilityConfiguration,

server/internal/config/application-configuration.ts

@@ -1,15 +1,15 @@
-import type { ApplicationSettings } from "~/prisma/client";
+import type { ApplicationSettingsModel } from "~/prisma/client/models";
 import prisma from "../db/database";
 
 class ApplicationConfiguration {
   // Reference to the currently selected application configuration
-  private currentApplicationSettings: ApplicationSettings | undefined =
+  private currentApplicationSettings: ApplicationSettingsModel | undefined =
     undefined;
 
   private async save() {
     await this.init();
 
-    const deepAppConfigCopy: Omit<ApplicationSettings, "timestamp"> & {
+    const deepAppConfigCopy: Omit<ApplicationSettingsModel, "timestamp"> & {
       timestamp?: Date;
     } = JSON.parse(JSON.stringify(this.currentApplicationSettings));
 
@@ -56,9 +56,9 @@ class ApplicationConfiguration {
     this.currentApplicationSettings = latestState;
   }
 
-  async set<T extends keyof ApplicationSettings>(
+  async set<T extends keyof ApplicationSettingsModel>(
     key: T,
-    value: ApplicationSettings[T],
+    value: ApplicationSettingsModel[T],
   ) {
     await this.init();
     if (!this.currentApplicationSettings)
@@ -71,9 +71,9 @@ class ApplicationConfiguration {
     }
   }
 
-  async get<T extends keyof ApplicationSettings>(
+  async get<T extends keyof ApplicationSettingsModel>(
     key: T,
-  ): Promise<ApplicationSettings[T]> {
+  ): Promise<ApplicationSettingsModel[T]> {
     await this.init();
     if (!this.currentApplicationSettings)
       throw new Error("Somehow, failed to initialise application settings");

server/internal/db/database.ts

@@ -1,7 +1,11 @@
-import { PrismaClient } from "~/prisma/client";
+import { PrismaClient } from "~/prisma/client/client";
+// import { PrismaPg } from "@prisma/adapter-pg";
 
 const prismaClientSingleton = () => {
-  return new PrismaClient({});
+  // const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL });
+  // const prisma = new PrismaClient({ adapter });
+  const prisma = new PrismaClient();
+  return prisma;
 };
 
 declare const globalThis: {

server/internal/downloads/manifest.ts

@@ -1,4 +1,4 @@
-import type { GameVersion } from "~/prisma/client";
+import type { GameVersionModel } from "~/prisma/client/models";
 import prisma from "../db/database";
 
 export type DropChunk = {
@@ -54,7 +54,7 @@ class ManifestGenerator {
 
   // Local function because eventual caching
   async generateManifest(gameId: string, versionName: string) {
-    const versions: GameVersion[] = [];
+    const versions: GameVersionModel[] = [];
 
     const baseVersion = await prisma.gameVersion.findUnique({
       where: {

server/internal/library/provider.ts

@@ -1,4 +1,4 @@
-import type { LibraryBackend } from "~/prisma/client";
+import type { LibraryBackend } from "~/prisma/client/enums";
 
 export abstract class LibraryProvider<CFG> {
   constructor(_config: CFG, _id: string) {

server/internal/library/providers/filesystem.ts

@@ -4,7 +4,7 @@ import {
   VersionNotFoundError,
   type LibraryProvider,
 } from "../provider";
-import { LibraryBackend } from "~/prisma/client";
+import { LibraryBackend } from "~/prisma/client/enums";
 import fs from "fs";
 import path from "path";
 import droplet from "@drop-oss/droplet";

server/internal/library/providers/flat.ts

@@ -1,7 +1,7 @@
 import { ArkErrors, type } from "arktype";
 import type { LibraryProvider } from "../provider";
 import { VersionNotFoundError } from "../provider";
-import { LibraryBackend } from "~/prisma/client";
+import { LibraryBackend } from "~/prisma/client/enums";
 import fs from "fs";
 import path from "path";
 import droplet from "@drop-oss/droplet";

server/internal/logging/index.ts

@@ -1,5 +1,8 @@
 import pino from "pino";
-import "pino-pretty";
+import pinoPretty from "pino-pretty";
+
+// call pino pretty so that it isn't excluded from the build
+pinoPretty();
 
 export const logger = pino({
   transport: {
@@ -9,5 +12,3 @@ export const logger = pino({
     },
   },
 });
-
-logger.child({});

server/internal/metadata/giantbomb.ts

@@ -1,4 +1,5 @@
-import { MetadataSource, type Company } from "~/prisma/client";
+import type { CompanyModel } from "~/prisma/client/models";
+import { MetadataSource } from "~/prisma/client/enums";
 import type { MetadataProvider } from ".";
 import { MissingMetadataProviderConfig } from ".";
 import type {
@@ -178,7 +179,7 @@ export class GiantBombProvider implements MetadataProvider {
       ? this.turndown.turndown(gameData.description)
       : gameData.deck;
 
-    const publishers: Company[] = [];
+    const publishers: CompanyModel[] = [];
     if (gameData.publishers) {
       for (const pub of gameData.publishers) {
         context?.logger.info(`Importing publisher "${pub.name}"`);
@@ -195,7 +196,7 @@ export class GiantBombProvider implements MetadataProvider {
 
     context?.progress(35);
 
-    const developers: Company[] = [];
+    const developers: CompanyModel[] = [];
     if (gameData.developers) {
       for (const dev of gameData.developers) {
         context?.logger.info(`Importing developer "${dev.name}"`);

server/internal/metadata/igdb.ts

@@ -1,5 +1,5 @@
-import type { Company } from "~/prisma/client";
-import { MetadataSource } from "~/prisma/client";
+import type { CompanyModel } from "~/prisma/client/models";
+import { MetadataSource } from "~/prisma/client/enums";
 import type { MetadataProvider } from ".";
 import { MissingMetadataProviderConfig } from ".";
 import type {
@@ -386,8 +386,8 @@ export class IGDBProvider implements MetadataProvider {
 
     context?.progress(20);
 
-    const publishers: Company[] = [];
-    const developers: Company[] = [];
+    const publishers: CompanyModel[] = [];
+    const developers: CompanyModel[] = [];
     for (const involvedCompany of currentGame.involved_companies ?? []) {
       // get details about the involved company
       const involved_company_response = await this.request<IGDBInvolvedCompany>(

server/internal/metadata/index.ts

@@ -1,4 +1,5 @@
-import { type Prisma, MetadataSource } from "~/prisma/client";
+import type { Prisma } from "~/prisma/client/client";
+import { MetadataSource } from "~/prisma/client/enums";
 import prisma from "../db/database";
 import type {
   _FetchGameMetadataParams,

server/internal/metadata/manual.ts

@@ -1,4 +1,4 @@
-import { MetadataSource } from "~/prisma/client";
+import { MetadataSource } from "~/prisma/client/enums";
 import type { MetadataProvider } from ".";
 import type {
   _FetchGameMetadataParams,

server/internal/metadata/pcgamingwiki.ts

@@ -1,5 +1,5 @@
-import type { Company } from "~/prisma/client";
-import { MetadataSource } from "~/prisma/client";
+import type { CompanyModel } from "~/prisma/client/models";
+import { MetadataSource } from "~/prisma/client/enums";
 import type { MetadataProvider } from ".";
 import type {
   GameMetadataSearchResult,
@@ -396,7 +396,7 @@ export class PCGamingWikiProvider implements MetadataProvider {
 
     const game = res.data.cargoquery[0].title;
 
-    const publishers: Company[] = [];
+    const publishers: CompanyModel[] = [];
     if (game.Publishers !== null) {
       context?.logger.info("Found publishers, importing...");
       const pubListClean = this.parseWikiStringArray(game.Publishers);
@@ -416,7 +416,7 @@ export class PCGamingWikiProvider implements MetadataProvider {
 
     context?.progress(40);
 
-    const developers: Company[] = [];
+    const developers: CompanyModel[] = [];
     if (game.Developers !== null) {
       context?.logger.info("Found developers, importing...");
       const devListClean = this.parseWikiStringArray(game.Developers);

server/internal/notifications/index.ts

@@ -6,7 +6,7 @@ Design goals:
 2. Real-time; use websocket listeners to keep clients up-to-date
 */
 
-import type { Notification } from "~/prisma/client";
+import type { NotificationModel } from "~/prisma/client/models";
 import prisma from "../db/database";
 import type { GlobalACL } from "../acls";
 
@@ -14,7 +14,7 @@ import type { GlobalACL } from "../acls";
 
 // TODO: document notification action format
 export type NotificationCreateArgs = Pick<
-  Notification,
+  NotificationModel,
   "title" | "description" | "actions" | "nonce"
 > & { acls: Array<GlobalACL> };
 
@@ -24,7 +24,7 @@ class NotificationSystem {
     string,
     Map<
       string,
-      { callback: (notification: Notification) => void; acls: GlobalACL[] }
+      { callback: (notification: NotificationModel) => void; acls: GlobalACL[] }
     >
   >();
 
@@ -32,7 +32,7 @@ class NotificationSystem {
     userId: string,
     acls: Array<GlobalACL>,
     id: string,
-    callback: (notification: Notification) => void,
+    callback: (notification: NotificationModel) => void,
   ) {
     if (!this.listeners.has(userId)) this.listeners.set(userId, new Map());
     // eslint-disable-next-line @typescript-eslint/no-extra-non-null-assertion
@@ -60,7 +60,10 @@ class NotificationSystem {
     }
   }
 
-  private async pushNotification(userId: string, notification: Notification) {
+  private async pushNotification(
+    userId: string,
+    notification: NotificationModel,
+  ) {
     for (const [_, listener] of this.listeners.get(userId) ?? []) {
       const hasSome =
         notification.acls.findIndex(

server/internal/utils/parseplatform.ts

@@ -1,4 +1,4 @@
-import { Platform } from "~/prisma/client";
+import { Platform } from "~/prisma/client/enums";
 
 export function parsePlatform(platform: string) {
   switch (platform.toLowerCase()) {

server/plugins/05.library-init.ts

@@ -1,4 +1,4 @@
-import { LibraryBackend } from "~/prisma/client";
+import { LibraryBackend } from "~/prisma/client/enums";
 import prisma from "../internal/db/database";
 import type { JsonValue } from "@prisma/client/runtime/library";
 import type { LibraryProvider } from "../internal/library/provider";