From f6968a811b6a3abbd27178d4fd03f3d0acbbeba4 Mon Sep 17 00:00:00 2001
From: Magnus Jensen <magnushjensen.mail@gmail.com>
Date: Fri, 21 Feb 2025 22:51:55 +0100
Subject: [PATCH 1/4] feat: type library pages

---
 apps/app-frontend/src/pages/library/Custom.vue     | 12 +++++-------
 apps/app-frontend/src/pages/library/Downloaded.vue | 12 +++++-------
 apps/app-frontend/src/pages/library/Index.vue      | 10 ++++++----
 apps/app-frontend/src/pages/library/Overview.vue   | 12 +++++-------
 apps/app-frontend/src/pages/library/index.ts       |  6 ++++++
 5 files changed, 27 insertions(+), 25 deletions(-)
 create mode 100644 apps/app-frontend/src/pages/library/index.ts

diff --git a/apps/app-frontend/src/pages/library/Custom.vue b/apps/app-frontend/src/pages/library/Custom.vue
index 619b411130..e26bae8db0 100644
--- a/apps/app-frontend/src/pages/library/Custom.vue
+++ b/apps/app-frontend/src/pages/library/Custom.vue
@@ -1,12 +1,10 @@
-<script setup>
+<script setup lang="ts">
 import GridDisplay from '@/components/GridDisplay.vue'
+import type { GameInstance } from '@/helpers/types'
 
-defineProps({
-  instances: {
-    type: Array,
-    required: true,
-  },
-})
+defineProps<{
+  instances: GameInstance[]
+}>()
 </script>
 <template>
   <GridDisplay
diff --git a/apps/app-frontend/src/pages/library/Downloaded.vue b/apps/app-frontend/src/pages/library/Downloaded.vue
index 4fa48812c2..0d1435f436 100644
--- a/apps/app-frontend/src/pages/library/Downloaded.vue
+++ b/apps/app-frontend/src/pages/library/Downloaded.vue
@@ -1,12 +1,10 @@
-<script setup>
+<script setup lang="ts">
 import GridDisplay from '@/components/GridDisplay.vue'
+import type { GameInstance } from '@/helpers/types'
 
-defineProps({
-  instances: {
-    type: Array,
-    required: true,
-  },
-})
+defineProps<{
+  instances: GameInstance[]
+}>()
 </script>
 <template>
   <GridDisplay
diff --git a/apps/app-frontend/src/pages/library/Index.vue b/apps/app-frontend/src/pages/library/Index.vue
index 2176f8e990..d82fc0ec85 100644
--- a/apps/app-frontend/src/pages/library/Index.vue
+++ b/apps/app-frontend/src/pages/library/Index.vue
@@ -1,6 +1,6 @@
-<script setup>
+<script setup lang="ts">
 import { onUnmounted, ref, shallowRef } from 'vue'
-import { list } from '@/helpers/profile.js'
+import { list } from '@/helpers/profile'
 import { useRoute } from 'vue-router'
 import { useBreadcrumbs } from '@/store/breadcrumbs.js'
 import { profile_listener } from '@/helpers/events.js'
@@ -11,6 +11,8 @@ import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
 import { NewInstanceImage } from '@/assets/icons'
 import NavTabs from '@/components/ui/NavTabs.vue'
 
+const installationModal = ref<InstanceType<typeof InstanceCreationModal>>()
+
 const route = useRoute()
 const breadcrumbs = useBreadcrumbs()
 
@@ -46,7 +48,7 @@ onUnmounted(() => {
         { label: 'Saved', href: `/library/saved`, shown: false },
       ]"
     />
-    <template v-if="instances.length > 0">
+    <template v-if="instances && instances.length > 0">
       <RouterView :instances="instances" />
     </template>
     <div v-else class="no-instance">
@@ -54,7 +56,7 @@ onUnmounted(() => {
         <NewInstanceImage />
       </div>
       <h3>No instances found</h3>
-      <Button color="primary" :disabled="offline" @click="$refs.installationModal.show()">
+      <Button color="primary" :disabled="offline" @click="installationModal?.show()">
         <PlusIcon />
         Create new instance
       </Button>
diff --git a/apps/app-frontend/src/pages/library/Overview.vue b/apps/app-frontend/src/pages/library/Overview.vue
index 06c9bcdf4c..2b74cd89ba 100644
--- a/apps/app-frontend/src/pages/library/Overview.vue
+++ b/apps/app-frontend/src/pages/library/Overview.vue
@@ -1,12 +1,10 @@
-<script setup>
+<script setup lang="ts">
 import GridDisplay from '@/components/GridDisplay.vue'
+import type { GameInstance } from '@/helpers/types'
 
-defineProps({
-  instances: {
-    type: Array,
-    required: true,
-  },
-})
+defineProps<{
+  instances: GameInstance[]
+}>()
 </script>
 <template>
   <GridDisplay v-if="instances.length > 0" label="Instances" :instances="instances" />
diff --git a/apps/app-frontend/src/pages/library/index.ts b/apps/app-frontend/src/pages/library/index.ts
new file mode 100644
index 0000000000..2dcbd63570
--- /dev/null
+++ b/apps/app-frontend/src/pages/library/index.ts
@@ -0,0 +1,6 @@
+import Index from './Index.vue'
+import Overview from './Overview.vue'
+import Downloaded from './Downloaded.vue'
+import Custom from './Custom.vue'
+
+export { Index, Overview, Downloaded, Custom }

From 792c8419ae897f40bf05a4e089beca5b5aeb28c6 Mon Sep 17 00:00:00 2001
From: Magnus Jensen <magnushjensen.mail@gmail.com>
Date: Fri, 21 Feb 2025 22:52:06 +0100
Subject: [PATCH 2/4] feat: type profile helper

---
 .../src/components/GridDisplay.vue            |   2 +-
 .../src/components/RowDisplay.vue             |   2 +-
 .../src/components/ui/AddContentButton.vue    |   2 +-
 .../src/components/ui/ErrorModal.vue          |   2 +-
 .../src/components/ui/ExportModal.vue         |   2 +-
 .../src/components/ui/RunningAppBar.vue       |   2 +-
 apps/app-frontend/src/helpers/profile.js      | 204 -------------
 apps/app-frontend/src/helpers/profile.ts      | 274 ++++++++++++++++++
 apps/app-frontend/src/helpers/types.d.ts      |  13 +
 apps/app-frontend/src/pages/Browse.vue        |   2 +-
 apps/app-frontend/src/pages/Index.vue         |   2 +-
 apps/app-frontend/src/pages/instance/Mods.vue |   2 +-
 apps/app-frontend/src/pages/library/index.js  |   6 -
 apps/app-frontend/src/store/install.js        |   2 +-
 14 files changed, 297 insertions(+), 220 deletions(-)
 delete mode 100644 apps/app-frontend/src/helpers/profile.js
 create mode 100644 apps/app-frontend/src/helpers/profile.ts
 delete mode 100644 apps/app-frontend/src/pages/library/index.js

diff --git a/apps/app-frontend/src/components/GridDisplay.vue b/apps/app-frontend/src/components/GridDisplay.vue
index 6e5dac5d87..ccf1dabd63 100644
--- a/apps/app-frontend/src/components/GridDisplay.vue
+++ b/apps/app-frontend/src/components/GridDisplay.vue
@@ -16,7 +16,7 @@ import { Button, DropdownSelect } from '@modrinth/ui'
 import { formatCategoryHeader } from '@modrinth/utils'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import dayjs from 'dayjs'
-import { duplicate, remove } from '@/helpers/profile.js'
+import { duplicate, remove } from '@/helpers/profile'
 import { handleError } from '@/store/notifications.js'
 import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
 
diff --git a/apps/app-frontend/src/components/RowDisplay.vue b/apps/app-frontend/src/components/RowDisplay.vue
index 080301de3c..75c6423ac5 100644
--- a/apps/app-frontend/src/components/RowDisplay.vue
+++ b/apps/app-frontend/src/components/RowDisplay.vue
@@ -19,7 +19,7 @@ import ContextMenu from '@/components/ui/ContextMenu.vue'
 import ProjectCard from '@/components/ui/ProjectCard.vue'
 import { get_by_profile_path } from '@/helpers/process.js'
 import { handleError } from '@/store/notifications.js'
-import { duplicate, kill, remove, run } from '@/helpers/profile.js'
+import { duplicate, kill, remove, run } from '@/helpers/profile'
 import { useRouter } from 'vue-router'
 import { showProfileInFolder } from '@/helpers/utils.js'
 import { trackEvent } from '@/helpers/analytics'
diff --git a/apps/app-frontend/src/components/ui/AddContentButton.vue b/apps/app-frontend/src/components/ui/AddContentButton.vue
index 414634c92d..f4196edc5c 100644
--- a/apps/app-frontend/src/components/ui/AddContentButton.vue
+++ b/apps/app-frontend/src/components/ui/AddContentButton.vue
@@ -2,7 +2,7 @@
 import { DropdownIcon, PlusIcon, FolderOpenIcon } from '@modrinth/assets'
 import { ButtonStyled, OverflowMenu } from '@modrinth/ui'
 import { open } from '@tauri-apps/plugin-dialog'
-import { add_project_from_path } from '@/helpers/profile.js'
+import { add_project_from_path } from '@/helpers/profile'
 import { handleError } from '@/store/notifications.js'
 import { useRouter } from 'vue-router'
 
diff --git a/apps/app-frontend/src/components/ui/ErrorModal.vue b/apps/app-frontend/src/components/ui/ErrorModal.vue
index d9a71608d0..edc4c6f218 100644
--- a/apps/app-frontend/src/components/ui/ErrorModal.vue
+++ b/apps/app-frontend/src/components/ui/ErrorModal.vue
@@ -6,7 +6,7 @@ import { login as login_flow, set_default_user } from '@/helpers/auth.js'
 import { handleError } from '@/store/notifications.js'
 import { handleSevereError } from '@/store/error.js'
 import { cancel_directory_change } from '@/helpers/settings.js'
-import { install } from '@/helpers/profile.js'
+import { install } from '@/helpers/profile'
 import { trackEvent } from '@/helpers/analytics'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
diff --git a/apps/app-frontend/src/components/ui/ExportModal.vue b/apps/app-frontend/src/components/ui/ExportModal.vue
index 031e6dc593..bba5cf113d 100644
--- a/apps/app-frontend/src/components/ui/ExportModal.vue
+++ b/apps/app-frontend/src/components/ui/ExportModal.vue
@@ -3,7 +3,7 @@ import { XIcon, PlusIcon } from '@modrinth/assets'
 import { Button, Checkbox } from '@modrinth/ui'
 import { PackageIcon, VersionIcon } from '@/assets/icons'
 import { ref } from 'vue'
-import { export_profile_mrpack, get_pack_export_candidates } from '@/helpers/profile.js'
+import { export_profile_mrpack, get_pack_export_candidates } from '@/helpers/profile'
 import { open } from '@tauri-apps/plugin-dialog'
 import { handleError } from '@/store/notifications.js'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
diff --git a/apps/app-frontend/src/components/ui/RunningAppBar.vue b/apps/app-frontend/src/components/ui/RunningAppBar.vue
index 12e3b0dd81..e9d1104441 100644
--- a/apps/app-frontend/src/components/ui/RunningAppBar.vue
+++ b/apps/app-frontend/src/components/ui/RunningAppBar.vue
@@ -106,7 +106,7 @@ import { useRouter } from 'vue-router'
 import { progress_bars_list } from '@/helpers/state.js'
 import ProgressBar from '@/components/ui/ProgressBar.vue'
 import { handleError } from '@/store/notifications.js'
-import { get_many } from '@/helpers/profile.js'
+import { get_many } from '@/helpers/profile'
 import { trackEvent } from '@/helpers/analytics'
 
 const router = useRouter()
diff --git a/apps/app-frontend/src/helpers/profile.js b/apps/app-frontend/src/helpers/profile.js
deleted file mode 100644
index ed9741bdbc..0000000000
--- a/apps/app-frontend/src/helpers/profile.js
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
- * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
- *  and deserialized into a usable JS object.
- */
-import { invoke } from '@tauri-apps/api/core'
-import { install_to_existing_profile } from '@/helpers/pack.js'
-import { handleError } from '@/store/notifications.js'
-
-/// Add instance
-/*
-    name: String,           // the name of the profile, and relative path to create
-    game_version: String,   // the game version of the profile
-    modloader: ModLoader,   // the modloader to use
-    - ModLoader is an enum, with the following variants: Vanilla, Forge, Fabric, Quilt
-    loader_version: String, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader
-    icon: Path,  // the icon for the profile
-    - icon is a path to an image file, which will be copied into the profile directory
-*/
-
-export async function create(name, gameVersion, modloader, loaderVersion, iconPath, skipInstall) {
-  //Trim string name to avoid "Unable to find directory"
-  name = name.trim()
-  return await invoke('plugin:profile-create|profile_create', {
-    name,
-    gameVersion,
-    modloader,
-    loaderVersion,
-    iconPath,
-    skipInstall,
-  })
-}
-
-// duplicate a profile
-export async function duplicate(path) {
-  return await invoke('plugin:profile-create|profile_duplicate', { path })
-}
-
-// Remove a profile
-export async function remove(path) {
-  return await invoke('plugin:profile|profile_remove', { path })
-}
-
-// Get a profile by path
-// Returns a Profile
-export async function get(path) {
-  return await invoke('plugin:profile|profile_get', { path })
-}
-
-export async function get_many(paths) {
-  return await invoke('plugin:profile|profile_get_many', { paths })
-}
-
-// Get a profile's projects
-// Returns a map of a path to profile file
-export async function get_projects(path, cacheBehaviour) {
-  return await invoke('plugin:profile|profile_get_projects', { path, cacheBehaviour })
-}
-
-// Get a profile's full fs path
-// Returns a path
-export async function get_full_path(path) {
-  return await invoke('plugin:profile|profile_get_full_path', { path })
-}
-
-// Get's a mod's full fs path
-// Returns a path
-export async function get_mod_full_path(path, projectPath) {
-  return await invoke('plugin:profile|profile_get_mod_full_path', { path, projectPath })
-}
-
-// Get optimal java version from profile
-// Returns a java version
-export async function get_optimal_jre_key(path) {
-  return await invoke('plugin:profile|profile_get_optimal_jre_key', { path })
-}
-
-// Get a copy of the profile set
-// Returns hashmap of path -> Profile
-export async function list() {
-  return await invoke('plugin:profile|profile_list')
-}
-
-export async function check_installed(path, projectId) {
-  return await invoke('plugin:profile|profile_check_installed', { path, projectId })
-}
-
-// Installs/Repairs a profile
-export async function install(path, force) {
-  return await invoke('plugin:profile|profile_install', { path, force })
-}
-
-// Updates all of a profile's projects
-export async function update_all(path) {
-  return await invoke('plugin:profile|profile_update_all', { path })
-}
-
-// Updates a specified project
-export async function update_project(path, projectPath) {
-  return await invoke('plugin:profile|profile_update_project', { path, projectPath })
-}
-
-// Add a project to a profile from a version
-// Returns a path to the new project file
-export async function add_project_from_version(path, versionId) {
-  return await invoke('plugin:profile|profile_add_project_from_version', { path, versionId })
-}
-
-// Add a project to a profile from a path + project_type
-// Returns a path to the new project file
-export async function add_project_from_path(path, projectPath, projectType) {
-  return await invoke('plugin:profile|profile_add_project_from_path', {
-    path,
-    projectPath,
-    projectType,
-  })
-}
-
-// Toggle disabling a project
-export async function toggle_disable_project(path, projectPath) {
-  return await invoke('plugin:profile|profile_toggle_disable_project', { path, projectPath })
-}
-
-// Remove a project
-export async function remove_project(path, projectPath) {
-  return await invoke('plugin:profile|profile_remove_project', { path, projectPath })
-}
-
-// Update a managed Modrinth profile to a specific version
-export async function update_managed_modrinth_version(path, versionId) {
-  return await invoke('plugin:profile|profile_update_managed_modrinth_version', { path, versionId })
-}
-
-// Repair a managed Modrinth profile
-export async function update_repair_modrinth(path) {
-  return await invoke('plugin:profile|profile_repair_managed_modrinth', { path })
-}
-
-// Export a profile to .mrpack
-/// included_overrides is an array of paths to override folders to include (ie: 'mods', 'resource_packs')
-// Version id is optional (ie: 1.1.5)
-export async function export_profile_mrpack(
-  path,
-  exportLocation,
-  includedOverrides,
-  versionId,
-  description,
-  name,
-) {
-  return await invoke('plugin:profile|profile_export_mrpack', {
-    path,
-    exportLocation,
-    includedOverrides,
-    versionId,
-    description,
-    name,
-  })
-}
-
-// Given a folder path, populate an array of all the subfolders
-// Intended to be used for finding potential override folders
-// profile
-// -- mods
-// -- resourcepacks
-// -- file1
-// => [mods, resourcepacks]
-// allows selection for 'included_overrides' in export_profile_mrpack
-export async function get_pack_export_candidates(profilePath) {
-  return await invoke('plugin:profile|profile_get_pack_export_candidates', { profilePath })
-}
-
-// Run Minecraft using a pathed profile
-// Returns PID of child
-export async function run(path) {
-  return await invoke('plugin:profile|profile_run', { path })
-}
-
-export async function kill(path) {
-  return await invoke('plugin:profile|profile_kill', { path })
-}
-
-// Edits a profile
-export async function edit(path, editProfile) {
-  return await invoke('plugin:profile|profile_edit', { path, editProfile })
-}
-
-// Edits a profile's icon
-export async function edit_icon(path, iconPath) {
-  return await invoke('plugin:profile|profile_edit_icon', { path, iconPath })
-}
-
-export async function finish_install(instance) {
-  if (instance.install_stage !== 'pack_installed') {
-    let linkedData = instance.linked_data
-    await install_to_existing_profile(
-      linkedData.project_id,
-      linkedData.version_id,
-      instance.name,
-      instance.path,
-    ).catch(handleError)
-  } else {
-    await install(instance.path, false).catch(handleError)
-  }
-}
diff --git a/apps/app-frontend/src/helpers/profile.ts b/apps/app-frontend/src/helpers/profile.ts
new file mode 100644
index 0000000000..969f4e23fa
--- /dev/null
+++ b/apps/app-frontend/src/helpers/profile.ts
@@ -0,0 +1,274 @@
+/**
+ * All theseus API calls return serialized values (both return values and errors);
+ * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ *  and deserialized into a usable JS object.
+ */
+import { invoke } from '@tauri-apps/api/core'
+import { install_to_existing_profile } from '@/helpers/pack.js'
+import { handleError } from '@/store/notifications.js'
+import type { ProcessMetadata, JavaVersion, GameInstance, InstanceLoader } from './types'
+
+/// Add instance
+/*
+    name: String,           // the name of the profile, and relative path to create
+    game_version: String,   // the game version of the profile
+    modloader: ModLoader,   // the modloader to use
+    - ModLoader is an enum, with the following variants: Vanilla, Forge, Fabric, Quilt
+    loader_version: String, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader
+    icon: Path,  // the icon for the profile
+    - icon is a path to an image file, which will be copied into the profile directory
+*/
+
+/**
+ *
+ * @param name the name of the profile, and relative path to create
+ * @param gameVersion the game version of the profile
+ * @param modLoader the modloader to use
+ * @param loaderVersion the modlader version to use, set to "latest", "stable", or the ID of your chosen loader
+ * @param iconPath the icon for the profile
+ * @param skipInstall
+ * @returns
+ */
+
+export async function create(
+  name: string,
+  gameVersion: string,
+  modLoader: InstanceLoader,
+  loaderVersion?: string,
+  iconPath?: string,
+  skipInstall?: boolean,
+) {
+  //Trim string name to avoid "Unable to find directory"
+  name = name.trim()
+  return await invoke<string>('plugin:profile-create|profile_create', {
+    name,
+    gameVersion,
+    modLoader,
+    loaderVersion,
+    iconPath,
+    skipInstall,
+  })
+}
+
+// duplicate a profile
+export async function duplicate(path: string) {
+  return await invoke<string>('plugin:profile-create|profile_duplicate', { path })
+}
+
+// Remove a profile
+export async function remove(path: string): Promise<void> {
+  await invoke('plugin:profile|profile_remove', { path })
+}
+
+// Get a profile by path
+// Returns a Profile
+export async function get(path: string) {
+  const res = await invoke<GameInstance | undefined>('plugin:profile|profile_get', { path })
+  console.log('PROFILE GET', res)
+  return res
+}
+
+export async function get_many(paths: string[]) {
+  return await invoke<GameInstance[]>('plugin:profile|profile_get_many', { paths })
+}
+
+type CacheBehaviour =
+  | 'stale_while_revalidate_skip_offline'
+  | 'stale_while_revalidate'
+  | 'must_revalidate'
+  | 'bypass'
+
+// Get a profile's projects
+// Returns a map of a path to profile file
+export async function get_projects(path: string, cacheBehaviour?: CacheBehaviour) {
+  return await invoke('plugin:profile|profile_get_projects', { path, cacheBehaviour })
+}
+
+// Get a profile's full fs path
+// Returns a path
+export async function get_full_path(path: string) {
+  return await invoke<string>('plugin:profile|profile_get_full_path', { path })
+}
+
+// Get's a mod's full fs path
+// Returns a path
+export async function get_mod_full_path(path: string, projectPath: string) {
+  return await invoke<string>('plugin:profile|profile_get_mod_full_path', { path, projectPath })
+}
+
+// Get optimal java version from profile
+// Returns a java version
+export async function get_optimal_jre_key(path: string) {
+  return await invoke<JavaVersion | undefined>('plugin:profile|profile_get_optimal_jre_key', {
+    path,
+  })
+}
+
+// Get a copy of the profile set
+// Returns hashmap of path -> Profile
+export async function list(): Promise<GameInstance[]> {
+  return await invoke('plugin:profile|profile_list')
+}
+
+export async function check_installed(path: string, projectId: string) {
+  return await invoke<boolean>('plugin:profile|profile_check_installed', { path, projectId })
+}
+
+// Installs/Repairs a profile
+export async function install(path: string, force: boolean): Promise<void> {
+  await invoke('plugin:profile|profile_install', { path, force })
+}
+
+// Updates all of a profile's projects
+export async function update_all(path: string) {
+  return await invoke<Record<string, string>>('plugin:profile|profile_update_all', { path })
+}
+
+// Updates a specified project
+export async function update_project(path: string, projectPath: string) {
+  return await invoke<string>('plugin:profile|profile_update_project', { path, projectPath })
+}
+
+// Add a project to a profile from a version
+// Returns a path to the new project file
+export async function add_project_from_version(path: string, versionId: string) {
+  return await invoke<string>('plugin:profile|profile_add_project_from_version', {
+    path,
+    versionId,
+  })
+}
+
+type ProjectType = 'mod' | 'datapack' | 'resourcepack' | 'shaderpack'
+
+// Add a project to a profile from a path + project_type
+// Returns a path to the new project file
+export async function add_project_from_path(
+  path: string,
+  projectPath: string,
+  projectType?: ProjectType,
+) {
+  return await invoke<string>('plugin:profile|profile_add_project_from_path', {
+    path,
+    projectPath,
+    projectType,
+  })
+}
+
+// Toggle disabling a project
+export async function toggle_disable_project(path: string, projectPath: string) {
+  return await invoke<string>('plugin:profile|profile_toggle_disable_project', {
+    path,
+    projectPath,
+  })
+}
+
+// Remove a project
+export async function remove_project(path: string, projectPath: string): Promise<void> {
+  return await invoke('plugin:profile|profile_remove_project', { path, projectPath })
+}
+
+// Update a managed Modrinth profile to a specific version
+export async function update_managed_modrinth_version(
+  path: string,
+  versionId: string,
+): Promise<void> {
+  return await invoke('plugin:profile|profile_update_managed_modrinth_version', { path, versionId })
+}
+
+// Repair a managed Modrinth profile
+export async function update_repair_modrinth(path: string): Promise<void> {
+  return await invoke('plugin:profile|profile_repair_managed_modrinth', { path })
+}
+
+// Export a profile to .mrpack
+/// included_overrides is an array of paths to override folders to include (ie: 'mods', 'resource_packs')
+// Version id is optional (ie: 1.1.5)
+export async function export_profile_mrpack(
+  path: string,
+  exportLocation: string,
+  includedOverrides: string[],
+  versionId?: string,
+  description?: string,
+  name?: string,
+): Promise<void> {
+  return await invoke('plugin:profile|profile_export_mrpack', {
+    path,
+    exportLocation,
+    includedOverrides,
+    versionId,
+    description,
+    name,
+  })
+}
+
+// Given a folder path, populate an array of all the subfolders
+// Intended to be used for finding potential override folders
+// profile
+// -- mods
+// -- resourcepacks
+// -- file1
+// => [mods, resourcepacks]
+// allows selection for 'included_overrides' in export_profile_mrpack
+export async function get_pack_export_candidates(profilePath: string) {
+  return await invoke<string[]>('plugin:profile|profile_get_pack_export_candidates', {
+    profilePath,
+  })
+}
+
+// Run Minecraft using a pathed profile
+// Returns PID of child
+export async function run(path: string) {
+  return await invoke<ProcessMetadata>('plugin:profile|profile_run', { path })
+}
+
+export async function kill(path: string): Promise<void> {
+  return await invoke('plugin:profile|profile_kill', { path })
+}
+
+type EditProfile = Partial<
+  Pick<
+    GameInstance,
+    | 'name'
+    | 'game_version'
+    | 'loader'
+    | 'loader_version'
+    | 'groups'
+    | 'linked_data'
+    | 'java_path'
+    | 'extra_launch_args'
+    | 'custom_env_vars'
+    | 'memory'
+    | 'force_fullscreen'
+    | 'game_resolution'
+    | 'hooks'
+  >
+>
+
+// Edits a profile
+export async function edit(path: string, editProfile: EditProfile): Promise<void> {
+  return await invoke('plugin:profile|profile_edit', { path, editProfile })
+}
+
+// Edits a profile's icon
+export async function edit_icon(path: string, iconPath?: string): Promise<void> {
+  return await invoke('plugin:profile|profile_edit_icon', { path, iconPath })
+}
+
+export async function finish_install(instance: GameInstance): Promise<void> {
+  if (instance.install_stage !== 'pack_installed') {
+    const linkedData = instance.linked_data
+    if (!linkedData) {
+      handleError('No linked data found for instance')
+      return
+    }
+
+    await install_to_existing_profile(
+      linkedData.project_id,
+      linkedData.version_id,
+      instance.name,
+      instance.path,
+    ).catch(handleError)
+  } else {
+    await install(instance.path, false).catch(handleError)
+  }
+}
diff --git a/apps/app-frontend/src/helpers/types.d.ts b/apps/app-frontend/src/helpers/types.d.ts
index 1007744d0f..0d15a15b67 100644
--- a/apps/app-frontend/src/helpers/types.d.ts
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -113,3 +113,16 @@ export type InstanceSettingsTabProps = {
   instance: GameInstance
   offline?: boolean
 }
+
+export type JavaVersion = {
+  major_version: number
+  version: string
+  architecture: string
+  path: string
+}
+
+export type ProcessMetadata = {
+  uuid: string
+  profile_path: string
+  start_time: Date
+}
diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue
index a57b2fddd2..45270a2a96 100644
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
@@ -19,7 +19,7 @@ import { get_categories, get_game_versions, get_loaders } from '@/helpers/tags'
 import type { LocationQuery } from 'vue-router'
 import { useRoute, useRouter } from 'vue-router'
 import SearchCard from '@/components/ui/SearchCard.vue'
-import { get as getInstance, get_projects as getInstanceProjects } from '@/helpers/profile.js'
+import { get as getInstance, get_projects as getInstanceProjects } from '@/helpers/profile'
 import { get_search_results } from '@/helpers/cache.js'
 import NavTabs from '@/components/ui/NavTabs.vue'
 import type Instance from '@/components/ui/Instance.vue'
diff --git a/apps/app-frontend/src/pages/Index.vue b/apps/app-frontend/src/pages/Index.vue
index 9d9064eb5c..91ee4edc71 100644
--- a/apps/app-frontend/src/pages/Index.vue
+++ b/apps/app-frontend/src/pages/Index.vue
@@ -2,7 +2,7 @@
 import { ref, onUnmounted, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import RowDisplay from '@/components/RowDisplay.vue'
-import { list } from '@/helpers/profile.js'
+import { list } from '@/helpers/profile'
 import { profile_listener } from '@/helpers/events'
 import { useBreadcrumbs } from '@/store/breadcrumbs'
 import { handleError } from '@/store/notifications.js'
diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/Mods.vue
index e49f2d9c7c..a2a644a568 100644
--- a/apps/app-frontend/src/pages/instance/Mods.vue
+++ b/apps/app-frontend/src/pages/instance/Mods.vue
@@ -285,7 +285,7 @@ import {
   toggle_disable_project,
   update_all,
   update_project,
-} from '@/helpers/profile.js'
+} from '@/helpers/profile'
 import { handleError } from '@/store/notifications.js'
 import { trackEvent } from '@/helpers/analytics'
 import { highlightModInProfile } from '@/helpers/utils.js'
diff --git a/apps/app-frontend/src/pages/library/index.js b/apps/app-frontend/src/pages/library/index.js
deleted file mode 100644
index 2dcbd63570..0000000000
--- a/apps/app-frontend/src/pages/library/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Index from './Index.vue'
-import Overview from './Overview.vue'
-import Downloaded from './Downloaded.vue'
-import Custom from './Custom.vue'
-
-export { Index, Overview, Downloaded, Custom }
diff --git a/apps/app-frontend/src/store/install.js b/apps/app-frontend/src/store/install.js
index 90ca66cd0e..dad17dbd1f 100644
--- a/apps/app-frontend/src/store/install.js
+++ b/apps/app-frontend/src/store/install.js
@@ -6,7 +6,7 @@ import {
   get_projects,
   list,
   remove_project,
-} from '@/helpers/profile.js'
+} from '@/helpers/profile'
 import { handleError } from '@/store/notifications.js'
 import { get_project, get_version_many } from '@/helpers/cache.js'
 import { create_profile_and_install as packInstall } from '@/helpers/pack.js'

From e88ead37bccc08861835c454486b59bf7639a419 Mon Sep 17 00:00:00 2001
From: Magnus Jensen <magnushjensen.mail@gmail.com>
Date: Mon, 24 Feb 2025 18:32:00 +0100
Subject: [PATCH 3/4] feat: auto-generate app TS types

---
 Cargo.lock                                    | 27 +++++++++++
 apps/app-frontend/eslint.config.mjs           |  4 +-
 .../ui/instance_settings/GeneralSettings.vue  |  5 +-
 apps/app-frontend/src/helpers/api-types.d.ts  |  8 ++++
 apps/app-frontend/src/helpers/lib-types.d.ts  | 36 ++++++++++++++
 apps/app-frontend/src/helpers/profile.ts      | 40 ++++------------
 apps/app-frontend/src/helpers/types.d.ts      | 48 +------------------
 .../app-frontend/src/pages/library/Custom.vue |  4 +-
 .../src/pages/library/Downloaded.vue          |  4 +-
 .../src/pages/library/Overview.vue            |  4 +-
 apps/app/Cargo.toml                           |  5 ++
 apps/app/src/api/profile.rs                   |  4 +-
 packages/app-lib/Cargo.toml                   |  5 ++
 packages/app-lib/src/state/cache.rs           |  7 ++-
 packages/app-lib/src/state/java_globals.rs    |  7 ++-
 packages/app-lib/src/state/process.rs         |  7 ++-
 packages/app-lib/src/state/profiles.rs        | 43 ++++++++++++++---
 packages/app-lib/src/state/settings.rs        | 19 ++++++--
 turbo.json                                    |  7 +++
 19 files changed, 183 insertions(+), 101 deletions(-)
 create mode 100644 apps/app-frontend/src/helpers/api-types.d.ts
 create mode 100644 apps/app-frontend/src/helpers/lib-types.d.ts

diff --git a/Cargo.lock b/Cargo.lock
index 02385145ad..10265c47f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8911,6 +8911,7 @@ dependencies = [
  "tracing",
  "tracing-error",
  "tracing-subscriber",
+ "ts-rs",
  "url",
  "urlencoding",
  "uuid 1.10.0",
@@ -8954,6 +8955,7 @@ dependencies = [
  "tokio 1.42.0",
  "tracing",
  "tracing-error",
+ "ts-rs",
  "url",
  "uuid 1.10.0",
  "window-shadows",
@@ -9586,6 +9588,31 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
+[[package]]
+name = "ts-rs"
+version = "10.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e640d9b0964e9d39df633548591090ab92f7a4567bc31d3891af23471a3365c6"
+dependencies = [
+ "chrono",
+ "lazy_static",
+ "thiserror 2.0.7",
+ "ts-rs-macros",
+ "uuid 1.10.0",
+]
+
+[[package]]
+name = "ts-rs-macros"
+version = "10.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e9d8656589772eeec2cf7a8264d9cda40fb28b9bc53118ceb9e8c07f8f38730"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "termcolor",
+]
+
 [[package]]
 name = "tungstenite"
 version = "0.23.0"
diff --git a/apps/app-frontend/eslint.config.mjs b/apps/app-frontend/eslint.config.mjs
index 05f559424b..8f48f6aead 100644
--- a/apps/app-frontend/eslint.config.mjs
+++ b/apps/app-frontend/eslint.config.mjs
@@ -19,4 +19,6 @@ export default createConfigForNuxt().append([
       'vue/multi-word-component-names': 'off',
     },
   },
-])
+], {
+  ignores: ["src/helpers/*-types.d.ts"]
+})
diff --git a/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
index 6d035dce6d..ec01412bf7 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
@@ -10,7 +10,8 @@ import { open } from '@tauri-apps/plugin-dialog'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 import { useRouter } from 'vue-router'
 import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
-import type { InstanceSettingsTabProps, GameInstance } from '../../../helpers/types'
+import type { InstanceSettingsTabProps } from '../../../helpers/types'
+import type { Profile } from '@/helpers/lib-types'
 
 const { formatMessage } = useVIntl()
 const router = useRouter()
@@ -35,7 +36,7 @@ async function duplicateProfile() {
   })
 }
 
-const allInstances = ref((await list()) as GameInstance[])
+const allInstances = ref((await list()) as Profile[])
 const availableGroups = computed(() => [
   ...new Set([...allInstances.value.flatMap((instance) => instance.groups), ...groups.value]),
 ])
diff --git a/apps/app-frontend/src/helpers/api-types.d.ts b/apps/app-frontend/src/helpers/api-types.d.ts
new file mode 100644
index 0000000000..0486f07ced
--- /dev/null
+++ b/apps/app-frontend/src/helpers/api-types.d.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Hooks } from "./lib-types.d";
+import type { LinkedData } from "./lib-types.d";
+import type { MemorySettings } from "./lib-types.d";
+import type { ModLoader } from "./lib-types.d";
+import type { WindowSize } from "./lib-types.d";
+
+export type EditProfile = { name: string | null, game_version: string | null, loader: ModLoader | null, loader_version: string | null | null, groups: Array<string> | null, linked_data: LinkedData | null | null, java_path: string | null | null, extra_launch_args: Array<string> | null | null, custom_env_vars: Array<[string, string]> | null | null, memory: MemorySettings | null | null, force_fullscreen: boolean | null | null, game_resolution: WindowSize | null | null, hooks: Hooks | null, };
diff --git a/apps/app-frontend/src/helpers/lib-types.d.ts b/apps/app-frontend/src/helpers/lib-types.d.ts
new file mode 100644
index 0000000000..2ddaad087a
--- /dev/null
+++ b/apps/app-frontend/src/helpers/lib-types.d.ts
@@ -0,0 +1,36 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type CacheBehaviour = "stale_while_revalidate_skip_offline" | "stale_while_revalidate" | "must_revalidate" | "bypass";
+
+export type FileMetadata = { project_id: string, version_id: string, };
+
+/**
+ * Game initialization hooks
+ */
+export type Hooks = { pre_launch: string | null, wrapper: string | null, post_exit: string | null, };
+
+export type JavaVersion = { major_version: number, version: string, architecture: string, path: string, };
+
+export type LinkedData = { project_id: string, version_id: string, locked: boolean, };
+
+/**
+ * Minecraft memory settings
+ */
+export type MemorySettings = { maximum: number, };
+
+export type ModLoader = "vanilla" | "forge" | "fabric" | "quilt" | "neoforge";
+
+export type ProcessMetadata = { uuid: string, profile_path: string, start_time: string, };
+
+export type Profile = { path: string, install_stage: ProfileInstallStage, name: string, icon_path: string | null, game_version: string, loader: ModLoader, loader_version: string | null, groups: Array<string>, linked_data: LinkedData | null, created: string, modified: string, last_played: string | null, submitted_time_played: bigint, recent_time_played: bigint, java_path: string | null, extra_launch_args: Array<string> | null, custom_env_vars: Array<[string, string]> | null, memory: MemorySettings | null, force_fullscreen: boolean | null, game_resolution: WindowSize | null, hooks: Hooks, };
+
+export type ProfileFile = { hash: string, file_name: string, size: bigint, metadata: FileMetadata | null, update_version_id: string | null, project_type: ProjectType, };
+
+export type ProfileInstallStage = "installed" | "minecraft_installing" | "pack_installed" | "pack_installing" | "not_installed";
+
+export type ProjectType = "mod" | "datapack" | "resourcepack" | "shaderpack";
+
+/**
+ * Game window size
+ */
+export type WindowSize = [number, number];
diff --git a/apps/app-frontend/src/helpers/profile.ts b/apps/app-frontend/src/helpers/profile.ts
index 969f4e23fa..c855970c8d 100644
--- a/apps/app-frontend/src/helpers/profile.ts
+++ b/apps/app-frontend/src/helpers/profile.ts
@@ -6,7 +6,8 @@
 import { invoke } from '@tauri-apps/api/core'
 import { install_to_existing_profile } from '@/helpers/pack.js'
 import { handleError } from '@/store/notifications.js'
-import type { ProcessMetadata, JavaVersion, GameInstance, InstanceLoader } from './types'
+import type { CacheBehaviour, JavaVersion, ModLoader, ProcessMetadata, Profile } from './lib-types'
+import type { EditProfile } from './api-types'
 
 /// Add instance
 /*
@@ -33,7 +34,7 @@ import type { ProcessMetadata, JavaVersion, GameInstance, InstanceLoader } from
 export async function create(
   name: string,
   gameVersion: string,
-  modLoader: InstanceLoader,
+  modLoader: ModLoader,
   loaderVersion?: string,
   iconPath?: string,
   skipInstall?: boolean,
@@ -63,21 +64,15 @@ export async function remove(path: string): Promise<void> {
 // Get a profile by path
 // Returns a Profile
 export async function get(path: string) {
-  const res = await invoke<GameInstance | undefined>('plugin:profile|profile_get', { path })
+  const res = await invoke<Profile | undefined>('plugin:profile|profile_get', { path })
   console.log('PROFILE GET', res)
   return res
 }
 
 export async function get_many(paths: string[]) {
-  return await invoke<GameInstance[]>('plugin:profile|profile_get_many', { paths })
+  return await invoke<Profile[]>('plugin:profile|profile_get_many', { paths })
 }
 
-type CacheBehaviour =
-  | 'stale_while_revalidate_skip_offline'
-  | 'stale_while_revalidate'
-  | 'must_revalidate'
-  | 'bypass'
-
 // Get a profile's projects
 // Returns a map of a path to profile file
 export async function get_projects(path: string, cacheBehaviour?: CacheBehaviour) {
@@ -106,7 +101,7 @@ export async function get_optimal_jre_key(path: string) {
 
 // Get a copy of the profile set
 // Returns hashmap of path -> Profile
-export async function list(): Promise<GameInstance[]> {
+export async function list(): Promise<Profile[]> {
   return await invoke('plugin:profile|profile_list')
 }
 
@@ -225,27 +220,8 @@ export async function kill(path: string): Promise<void> {
   return await invoke('plugin:profile|profile_kill', { path })
 }
 
-type EditProfile = Partial<
-  Pick<
-    GameInstance,
-    | 'name'
-    | 'game_version'
-    | 'loader'
-    | 'loader_version'
-    | 'groups'
-    | 'linked_data'
-    | 'java_path'
-    | 'extra_launch_args'
-    | 'custom_env_vars'
-    | 'memory'
-    | 'force_fullscreen'
-    | 'game_resolution'
-    | 'hooks'
-  >
->
-
 // Edits a profile
-export async function edit(path: string, editProfile: EditProfile): Promise<void> {
+export async function edit(path: string, editProfile: Partial<EditProfile>): Promise<void> {
   return await invoke('plugin:profile|profile_edit', { path, editProfile })
 }
 
@@ -254,7 +230,7 @@ export async function edit_icon(path: string, iconPath?: string): Promise<void>
   return await invoke('plugin:profile|profile_edit_icon', { path, iconPath })
 }
 
-export async function finish_install(instance: GameInstance): Promise<void> {
+export async function finish_install(instance: Profile): Promise<void> {
   if (instance.install_stage !== 'pack_installed') {
     const linkedData = instance.linked_data
     if (!linkedData) {
diff --git a/apps/app-frontend/src/helpers/types.d.ts b/apps/app-frontend/src/helpers/types.d.ts
index 0d15a15b67..ad65ebc1bf 100644
--- a/apps/app-frontend/src/helpers/types.d.ts
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -1,36 +1,5 @@
 import type { ModrinthId } from '@modrinth/utils'
-
-type GameInstance = {
-  path: string
-  install_stage: InstallStage
-
-  name: string
-  icon_path?: string
-
-  game_version: string
-  loader: InstanceLoader
-  loader_version?: string
-
-  groups: string[]
-
-  linked_data?: LinkedData
-
-  created: Date
-  modified: Date
-  last_played?: Date
-
-  submitted_time_played: number
-  recent_time_played: number
-
-  java_path?: string
-  extra_launch_args?: string[]
-  custom_env_vars?: [string, string][]
-
-  memory?: MemorySettings
-  force_fullscreen?: boolean
-  game_resolution?: [number, number]
-  hooks: Hooks
-}
+import type { Profile } from './lib-types'
 
 type InstallStage =
   | 'installed'
@@ -110,19 +79,6 @@ type AppSettings = {
 }
 
 export type InstanceSettingsTabProps = {
-  instance: GameInstance
+  instance: Profile
   offline?: boolean
 }
-
-export type JavaVersion = {
-  major_version: number
-  version: string
-  architecture: string
-  path: string
-}
-
-export type ProcessMetadata = {
-  uuid: string
-  profile_path: string
-  start_time: Date
-}
diff --git a/apps/app-frontend/src/pages/library/Custom.vue b/apps/app-frontend/src/pages/library/Custom.vue
index e26bae8db0..4739a1a5a8 100644
--- a/apps/app-frontend/src/pages/library/Custom.vue
+++ b/apps/app-frontend/src/pages/library/Custom.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import GridDisplay from '@/components/GridDisplay.vue'
-import type { GameInstance } from '@/helpers/types'
+import type { Profile } from '@/helpers/lib-types';
 
 defineProps<{
-  instances: GameInstance[]
+  instances: Profile[]
 }>()
 </script>
 <template>
diff --git a/apps/app-frontend/src/pages/library/Downloaded.vue b/apps/app-frontend/src/pages/library/Downloaded.vue
index 0d1435f436..63314e7e4a 100644
--- a/apps/app-frontend/src/pages/library/Downloaded.vue
+++ b/apps/app-frontend/src/pages/library/Downloaded.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import GridDisplay from '@/components/GridDisplay.vue'
-import type { GameInstance } from '@/helpers/types'
+import type { Profile } from '@/helpers/lib-types';
 
 defineProps<{
-  instances: GameInstance[]
+  instances: Profile[]
 }>()
 </script>
 <template>
diff --git a/apps/app-frontend/src/pages/library/Overview.vue b/apps/app-frontend/src/pages/library/Overview.vue
index 2b74cd89ba..3b0662e1bf 100644
--- a/apps/app-frontend/src/pages/library/Overview.vue
+++ b/apps/app-frontend/src/pages/library/Overview.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import GridDisplay from '@/components/GridDisplay.vue'
-import type { GameInstance } from '@/helpers/types'
+import type { Profile } from '@/helpers/lib-types';
 
 defineProps<{
-  instances: GameInstance[]
+  instances: Profile[]
 }>()
 </script>
 <template>
diff --git a/apps/app/Cargo.toml b/apps/app/Cargo.toml
index 0e3bc20b3b..353e90c36c 100644
--- a/apps/app/Cargo.toml
+++ b/apps/app/Cargo.toml
@@ -51,6 +51,8 @@ opener = { version = "0.7.2", features = ["reveal", "dbus-vendored"] }
 
 native-dialog = "0.7.0"
 
+ts-rs = { version = "10.1", features = [ "chrono-impl", "uuid-impl" ] }
+
 [target.'cfg(not(target_os = "linux"))'.dependencies]
 window-shadows = "0.2.1"
 
@@ -70,3 +72,6 @@ default = ["custom-protocol"]
 # DO NOT remove this
 custom-protocol = ["tauri/custom-protocol"]
 updater = []
+
+[env]
+TS_RS_EXPORT_DIR = { value = "../../app-frontend/src/helpers/", relative = true }
\ No newline at end of file
diff --git a/apps/app/src/api/profile.rs b/apps/app/src/api/profile.rs
index 18e3831d35..ee91734dcb 100644
--- a/apps/app/src/api/profile.rs
+++ b/apps/app/src/api/profile.rs
@@ -4,6 +4,7 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use theseus::prelude::*;
+use ts_rs::TS;
 
 pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new("profile")
@@ -276,7 +277,8 @@ pub async fn profile_kill(path: &str) -> Result<()> {
     Ok(())
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, TS)]
+#[ts(export, export_to = "../../app-frontend/src/helpers/api-types.d.ts")]
 pub struct EditProfile {
     pub name: Option<String>,
 
diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml
index 4e2d837502..a513fa704c 100644
--- a/packages/app-lib/Cargo.toml
+++ b/packages/app-lib/Cargo.toml
@@ -62,9 +62,14 @@ base64 = "0.22.0"
 
 sqlx = { version = "0.8.2", features = [ "runtime-tokio", "sqlite", "macros" ] }
 
+ts-rs = { version = "10.1", features = [ "chrono-impl", "uuid-impl" ] }
+
 [target.'cfg(windows)'.dependencies]
 winreg = "0.52.0"
 
 [features]
 tauri = ["dep:tauri"]
 cli = ["dep:indicatif"]
+
+[env]
+TS_RS_EXPORT_DIR = { value = "../../../apps/app-frontend/src/helpers/", relative = false }
diff --git a/packages/app-lib/src/state/cache.rs b/packages/app-lib/src/state/cache.rs
index 000ff4eea9..5099e11ee3 100644
--- a/packages/app-lib/src/state/cache.rs
+++ b/packages/app-lib/src/state/cache.rs
@@ -11,6 +11,7 @@ use std::collections::HashMap;
 use std::fmt::Display;
 use std::hash::Hash;
 use std::path::{Path, PathBuf};
+use ts_rs::TS;
 
 // 1 day
 const DEFAULT_ID: &str = "0";
@@ -520,7 +521,11 @@ impl CacheValue {
     }
 }
 
-#[derive(Deserialize, Serialize, PartialEq, Eq, Debug, Copy, Clone)]
+#[derive(Deserialize, Serialize, PartialEq, Eq, Debug, Copy, Clone, TS)]
+#[ts(
+    export,
+    export_to = "../../../apps/app-frontend/src/helpers/lib-types.d.ts"
+)]
 #[serde(rename_all = "snake_case")]
 pub enum CacheBehaviour {
     /// Serve expired data. If fetch fails / launcher is offline, errors are ignored
diff --git a/packages/app-lib/src/state/java_globals.rs b/packages/app-lib/src/state/java_globals.rs
index e1fd2a0797..8189d84c35 100644
--- a/packages/app-lib/src/state/java_globals.rs
+++ b/packages/app-lib/src/state/java_globals.rs
@@ -1,8 +1,13 @@
 use dashmap::DashMap;
 use futures::TryStreamExt;
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
-#[derive(Debug, PartialEq, Eq, Hash, Serialize, Deserialize, Clone)]
+#[derive(Debug, PartialEq, Eq, Hash, Serialize, Deserialize, Clone, TS)]
+#[ts(
+    export,
+    export_to = "../../../apps/app-frontend/src/helpers/lib-types.d.ts"
+)]
 pub struct JavaVersion {
     pub major_version: u32,
     pub version: String,
diff --git a/packages/app-lib/src/state/process.rs b/packages/app-lib/src/state/process.rs
index cfce1fd90e..51278d0e5c 100644
--- a/packages/app-lib/src/state/process.rs
+++ b/packages/app-lib/src/state/process.rs
@@ -8,6 +8,7 @@ use serde::Deserialize;
 use serde::Serialize;
 use std::process::ExitStatus;
 use tokio::process::{Child, Command};
+use ts_rs::TS;
 use uuid::Uuid;
 
 pub struct ProcessManager {
@@ -107,7 +108,11 @@ impl ProcessManager {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, Clone)]
+#[derive(Debug, Deserialize, Serialize, Clone, TS)]
+#[ts(
+    export,
+    export_to = "../../../apps/app-frontend/src/helpers/lib-types.d.ts"
+)]
 pub struct ProcessMetadata {
     pub uuid: Uuid,
     pub profile_path: String,
diff --git a/packages/app-lib/src/state/profiles.rs b/packages/app-lib/src/state/profiles.rs
index 4cebf4c067..b4a63921d1 100644
--- a/packages/app-lib/src/state/profiles.rs
+++ b/packages/app-lib/src/state/profiles.rs
@@ -12,9 +12,14 @@ use sqlx::SqlitePool;
 use std::convert::TryFrom;
 use std::convert::TryInto;
 use std::path::Path;
+use ts_rs::TS;
 
 // Represent a Minecraft instance.
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug, TS)]
+#[ts(
+    export,
+    export_to = "../../../apps/app-frontend/src/helpers/lib-types.d.ts"
+)]
 pub struct Profile {
     pub path: String,
     pub install_stage: ProfileInstallStage,
@@ -47,7 +52,11 @@ pub struct Profile {
     pub hooks: Hooks,
 }
 
-#[derive(Serialize, Deserialize, Clone, Copy, Debug, Eq, PartialEq)]
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, Eq, PartialEq, TS)]
+#[ts(
+    export,
+    export_to = "../../../apps/app-frontend/src/helpers/lib-types.d.ts"
+)]
 #[serde(rename_all = "snake_case")]
 pub enum ProfileInstallStage {
     /// Profile is installed
@@ -86,7 +95,11 @@ impl ProfileInstallStage {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug, TS)]
+#[ts(
+    export,
+    export_to = "../../../apps/app-frontend/src/helpers/lib-types.d.ts"
+)]
 pub struct LinkedData {
     pub project_id: String,
     pub version_id: String,
@@ -94,7 +107,11 @@ pub struct LinkedData {
     pub locked: bool,
 }
 
-#[derive(Debug, Eq, PartialEq, Clone, Copy, Deserialize, Serialize)]
+#[derive(Debug, Eq, PartialEq, Clone, Copy, Deserialize, Serialize, TS)]
+#[ts(
+    export,
+    export_to = "../../../apps/app-frontend/src/helpers/lib-types.d.ts"
+)]
 #[serde(rename_all = "lowercase")]
 pub enum ModLoader {
     Vanilla,
@@ -137,7 +154,11 @@ impl ModLoader {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize, Deserialize, Clone, TS)]
+#[ts(
+    export,
+    export_to = "../../../apps/app-frontend/src/helpers/lib-types.d.ts"
+)]
 pub struct ProfileFile {
     pub hash: String,
     pub file_name: String,
@@ -147,13 +168,21 @@ pub struct ProfileFile {
     pub project_type: ProjectType,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize, Deserialize, Clone, TS)]
+#[ts(
+    export,
+    export_to = "../../../apps/app-frontend/src/helpers/lib-types.d.ts"
+)]
 pub struct FileMetadata {
     pub project_id: String,
     pub version_id: String,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, Copy, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Clone, Debug, Copy, PartialEq, Eq, TS)]
+#[ts(
+    export,
+    export_to = "../../../apps/app-frontend/src/helpers/lib-types.d.ts"
+)]
 #[serde(rename_all = "lowercase")]
 pub enum ProjectType {
     Mod,
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 5c3b00740d..0bd445971c 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -2,6 +2,7 @@
 
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
+use ts_rs::TS;
 
 // Types
 /// Global Theseus settings
@@ -234,17 +235,29 @@ impl Theme {
 }
 
 /// Minecraft memory settings
-#[derive(Serialize, Deserialize, Debug, Clone, Copy)]
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, TS)]
+#[ts(
+    export,
+    export_to = "../../../apps/app-frontend/src/helpers/lib-types.d.ts"
+)]
 pub struct MemorySettings {
     pub maximum: u32,
 }
 
 /// Game window size
-#[derive(Serialize, Deserialize, Debug, Clone, Copy)]
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, TS)]
+#[ts(
+    export,
+    export_to = "../../../apps/app-frontend/src/helpers/lib-types.d.ts"
+)]
 pub struct WindowSize(pub u16, pub u16);
 
 /// Game initialization hooks
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, TS)]
+#[ts(
+    export,
+    export_to = "../../../apps/app-frontend/src/helpers/lib-types.d.ts"
+)]
 pub struct Hooks {
     pub pre_launch: Option<String>,
     pub wrapper: Option<String>,
diff --git a/turbo.json b/turbo.json
index 71cd9ce3b8..1558e70ffc 100644
--- a/turbo.json
+++ b/turbo.json
@@ -35,6 +35,13 @@
     "test": {
       "env": ["SQLX_OFFLINE", "DATABASE_URL"]
     },
+    "@modrinth/app-lib#test": {
+      "env": [
+        "SQLX_OFFLINE",
+        "DATABASE_URL"
+      ],
+      "dependsOn": ["@modrinth/app#test"]
+    },
     "fix": {
       "cache": false
     }

From a5acdfaec15f5aedac3d602ad29bf0561b5adb43 Mon Sep 17 00:00:00 2001
From: Magnus Jensen <magnushjensen.mail@gmail.com>
Date: Sun, 2 Mar 2025 12:22:06 +0100
Subject: [PATCH 4/4] fix: lint and formatting

---
 Cargo.lock                                    |  2 +-
 apps/app-frontend/.prettierignore             |  1 +
 apps/app-frontend/eslint.config.mjs           | 35 ++++++++++---------
 .../app-frontend/src/pages/library/Custom.vue |  2 +-
 .../src/pages/library/Downloaded.vue          |  2 +-
 .../src/pages/library/Overview.vue            |  2 +-
 6 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8015faf88a..9cb3f787b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9644,7 +9644,7 @@ dependencies = [
  "lazy_static",
  "thiserror 2.0.7",
  "ts-rs-macros",
- "uuid 1.10.0",
+ "uuid 1.12.0",
 ]
 
 [[package]]
diff --git a/apps/app-frontend/.prettierignore b/apps/app-frontend/.prettierignore
index 581edad3d9..8dbe7d0fb3 100644
--- a/apps/app-frontend/.prettierignore
+++ b/apps/app-frontend/.prettierignore
@@ -1 +1,2 @@
 **/dist
+src/helpers/*-types.d.ts
\ No newline at end of file
diff --git a/apps/app-frontend/eslint.config.mjs b/apps/app-frontend/eslint.config.mjs
index 8f48f6aead..3b987a709e 100644
--- a/apps/app-frontend/eslint.config.mjs
+++ b/apps/app-frontend/eslint.config.mjs
@@ -2,23 +2,26 @@ import { createConfigForNuxt } from '@nuxt/eslint-config/flat'
 import { fixupPluginRules } from '@eslint/compat'
 import turboPlugin from 'eslint-plugin-turbo'
 
-export default createConfigForNuxt().append([
-  {
-    name: 'turbo',
-    plugins: {
-      turbo: fixupPluginRules(turboPlugin),
+export default createConfigForNuxt().append(
+  [
+    {
+      name: 'turbo',
+      plugins: {
+        turbo: fixupPluginRules(turboPlugin),
+      },
+      rules: {
+        'turbo/no-undeclared-env-vars': 'error',
+      },
     },
-    rules: {
-      'turbo/no-undeclared-env-vars': 'error',
+    {
+      name: 'modrinth',
+      rules: {
+        'vue/html-self-closing': 'off',
+        'vue/multi-word-component-names': 'off',
+      },
     },
-  },
+  ],
   {
-    name: 'modrinth',
-    rules: {
-      'vue/html-self-closing': 'off',
-      'vue/multi-word-component-names': 'off',
-    },
+    ignores: ['src/helpers/*-types.d.ts'],
   },
-], {
-  ignores: ["src/helpers/*-types.d.ts"]
-})
+)
diff --git a/apps/app-frontend/src/pages/library/Custom.vue b/apps/app-frontend/src/pages/library/Custom.vue
index 4739a1a5a8..2c2f93d4a8 100644
--- a/apps/app-frontend/src/pages/library/Custom.vue
+++ b/apps/app-frontend/src/pages/library/Custom.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import GridDisplay from '@/components/GridDisplay.vue'
-import type { Profile } from '@/helpers/lib-types';
+import type { Profile } from '@/helpers/lib-types'
 
 defineProps<{
   instances: Profile[]
diff --git a/apps/app-frontend/src/pages/library/Downloaded.vue b/apps/app-frontend/src/pages/library/Downloaded.vue
index 63314e7e4a..4169fc6c06 100644
--- a/apps/app-frontend/src/pages/library/Downloaded.vue
+++ b/apps/app-frontend/src/pages/library/Downloaded.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import GridDisplay from '@/components/GridDisplay.vue'
-import type { Profile } from '@/helpers/lib-types';
+import type { Profile } from '@/helpers/lib-types'
 
 defineProps<{
   instances: Profile[]
diff --git a/apps/app-frontend/src/pages/library/Overview.vue b/apps/app-frontend/src/pages/library/Overview.vue
index 3b0662e1bf..21ac0982d9 100644
--- a/apps/app-frontend/src/pages/library/Overview.vue
+++ b/apps/app-frontend/src/pages/library/Overview.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import GridDisplay from '@/components/GridDisplay.vue'
-import type { Profile } from '@/helpers/lib-types';
+import type { Profile } from '@/helpers/lib-types'
 
 defineProps<{
   instances: Profile[]