feat(macros): sort client api

3 files changed, 198 insertions, 199 deletions

diff --git a/crates/macros/src/lib.rs b/crates/macros/src/lib.rs
index 21c8bf7..d32ab69 100644
--- a/crates/macros/src/lib.rs
+++ b/crates/macros/src/lib.rs
@@ -216,12 +216,6 @@ pub fn api(attr: TokenStream, item: TokenStream) -> TokenStream {
 
     // Return type
     let (return_ts_promise, return_imports) = get_return_ts(&input_fn.sig.output);
-    eprintln!(
-        "return {} from {} of {}",
-        return_ts_promise,
-        return_imports.iter().cloned().collect::<Vec<_>>().join(","),
-        fn_name
-    );
     import_types.extend(return_imports);
 
     // Prepare test mod name
diff --git a/packages/ui-new/src/client.ts b/packages/ui-new/src/client.ts
index 9f4ccf0..572cdd9 100644
--- a/packages/ui-new/src/client.ts
+++ b/packages/ui-new/src/client.ts
@@ -25,165 +25,207 @@ import type {
   VersionMetadata,
 } from "@/types";
 
-export function setActiveInstance(instanceId: string): Promise<void> {
-  return invoke<void>("set_active_instance", {
-    instanceId,
+export function assistantChat(messages: Message[]): Promise<Message> {
+  return invoke<Message>("assistant_chat", {
+    messages,
   });
 }
 
-export function refreshAccount(): Promise<Account> {
-  return invoke<Account>("refresh_account");
+export function assistantChatStream(messages: Message[]): Promise<string> {
+  return invoke<string>("assistant_chat_stream", {
+    messages,
+  });
 }
 
-export function getFabricGameVersions(): Promise<FabricGameVersion[]> {
-  return invoke<FabricGameVersion[]>("get_fabric_game_versions");
+export function assistantCheckHealth(): Promise<boolean> {
+  return invoke<boolean>("assistant_check_health");
 }
 
-export function deleteInstance(instanceId: string): Promise<void> {
-  return invoke<void>("delete_instance", {
+export function cancelJavaDownload(): Promise<void> {
+  return invoke<void>("cancel_java_download");
+}
+
+export function checkVersionInstalled(
+  instanceId: string,
+  versionId: string,
+): Promise<boolean> {
+  return invoke<boolean>("check_version_installed", {
     instanceId,
+    versionId,
   });
 }
 
-export function listOllamaModels(endpoint: string): Promise<ModelInfo[]> {
-  return invoke<ModelInfo[]>("list_ollama_models", {
-    endpoint,
+export function completeMicrosoftLogin(deviceCode: string): Promise<Account> {
+  return invoke<Account>("complete_microsoft_login", {
+    deviceCode,
   });
 }
 
-export function getForgeVersionsForGame(
-  gameVersion: string,
-): Promise<ForgeVersion[]> {
-  return invoke<ForgeVersion[]>("get_forge_versions_for_game", {
-    gameVersion,
+export function createInstance(name: string): Promise<Instance> {
+  return invoke<Instance>("create_instance", {
+    name,
   });
 }
 
-export function getVersionMetadata(
+export function deleteInstance(instanceId: string): Promise<void> {
+  return invoke<void>("delete_instance", {
+    instanceId,
+  });
+}
+
+export function deleteInstanceFile(path: string): Promise<void> {
+  return invoke<void>("delete_instance_file", {
+    path,
+  });
+}
+
+export function deleteVersion(
   instanceId: string,
   versionId: string,
-): Promise<VersionMetadata> {
-  return invoke<VersionMetadata>("get_version_metadata", {
+): Promise<void> {
+  return invoke<void>("delete_version", {
     instanceId,
     versionId,
   });
 }
 
-export function migrateSharedCaches(): Promise<MigrationResult> {
-  return invoke<MigrationResult>("migrate_shared_caches");
+export function detectAllJavaInstallations(): Promise<JavaInstallation[]> {
+  return invoke<JavaInstallation[]>("detect_all_java_installations");
 }
 
-export function getInstance(instanceId: string): Promise<Instance> {
-  return invoke<Instance>("get_instance", {
-    instanceId,
+export function detectJava(): Promise<JavaInstallation[]> {
+  return invoke<JavaInstallation[]>("detect_java");
+}
+
+export function downloadAdoptiumJava(
+  majorVersion: number,
+  imageType: string,
+  customPath: string | null,
+): Promise<JavaInstallation> {
+  return invoke<JavaInstallation>("download_adoptium_java", {
+    majorVersion,
+    imageType,
+    customPath,
   });
 }
 
-export function getVersions(instanceId: string): Promise<Version[]> {
-  return invoke<Version[]>("get_versions", {
+export function duplicateInstance(
+  instanceId: string,
+  newName: string,
+): Promise<Instance> {
+  return invoke<Instance>("duplicate_instance", {
     instanceId,
+    newName,
   });
 }
 
-export function refreshJavaCatalog(): Promise<JavaCatalog> {
-  return invoke<JavaCatalog>("refresh_java_catalog");
+export function fetchAdoptiumJava(
+  majorVersion: number,
+  imageType: string,
+): Promise<JavaDownloadInfo> {
+  return invoke<JavaDownloadInfo>("fetch_adoptium_java", {
+    majorVersion,
+    imageType,
+  });
+}
+
+export function fetchAvailableJavaVersions(): Promise<number[]> {
+  return invoke<number[]>("fetch_available_java_versions");
+}
+
+export function fetchJavaCatalog(): Promise<JavaCatalog> {
+  return invoke<JavaCatalog>("fetch_java_catalog");
 }
 
 export function getActiveAccount(): Promise<Account | null> {
   return invoke<Account | null>("get_active_account");
 }
 
-export function getConfigPath(): Promise<string> {
-  return invoke<string>("get_config_path");
+export function getActiveInstance(): Promise<Instance | null> {
+  return invoke<Instance | null>("get_active_instance");
 }
 
-export function getForgeGameVersions(): Promise<string[]> {
-  return invoke<string[]>("get_forge_game_versions");
+export function getConfigPath(): Promise<string> {
+  return invoke<string>("get_config_path");
 }
 
-export function getPendingJavaDownloads(): Promise<PendingJavaDownload[]> {
-  return invoke<PendingJavaDownload[]>("get_pending_java_downloads");
+export function getFabricGameVersions(): Promise<FabricGameVersion[]> {
+  return invoke<FabricGameVersion[]>("get_fabric_game_versions");
 }
 
-export function listOpenaiModels(): Promise<ModelInfo[]> {
-  return invoke<ModelInfo[]>("list_openai_models");
+export function getFabricLoaderVersions(): Promise<FabricLoaderVersion[]> {
+  return invoke<FabricLoaderVersion[]>("get_fabric_loader_versions");
 }
 
-export function getRecommendedJava(
-  requiredMajorVersion: number | null,
-): Promise<JavaInstallation | null> {
-  return invoke<JavaInstallation | null>("get_recommended_java", {
-    requiredMajorVersion,
+export function getFabricLoadersForVersion(
+  gameVersion: string,
+): Promise<FabricLoaderEntry[]> {
+  return invoke<FabricLoaderEntry[]>("get_fabric_loaders_for_version", {
+    gameVersion,
   });
 }
 
-export function fetchAvailableJavaVersions(): Promise<number[]> {
-  return invoke<number[]>("fetch_available_java_versions");
+export function getForgeGameVersions(): Promise<string[]> {
+  return invoke<string[]>("get_forge_game_versions");
 }
 
-export function listInstanceDirectory(
-  instanceId: string,
-  folder: string,
-): Promise<FileInfo[]> {
-  return invoke<FileInfo[]>("list_instance_directory", {
-    instanceId,
-    folder,
+export function getForgeVersionsForGame(
+  gameVersion: string,
+): Promise<ForgeVersion[]> {
+  return invoke<ForgeVersion[]>("get_forge_versions_for_game", {
+    gameVersion,
   });
 }
 
-export function detectJava(): Promise<JavaInstallation[]> {
-  return invoke<JavaInstallation[]>("detect_java");
+export function getGithubReleases(): Promise<GithubRelease[]> {
+  return invoke<GithubRelease[]>("get_github_releases");
 }
 
-export function openFileExplorer(path: string): Promise<void> {
-  return invoke<void>("open_file_explorer", {
-    path,
+export function getInstance(instanceId: string): Promise<Instance> {
+  return invoke<Instance>("get_instance", {
+    instanceId,
   });
 }
 
-export function completeMicrosoftLogin(deviceCode: string): Promise<Account> {
-  return invoke<Account>("complete_microsoft_login", {
-    deviceCode,
+export function getPendingJavaDownloads(): Promise<PendingJavaDownload[]> {
+  return invoke<PendingJavaDownload[]>("get_pending_java_downloads");
+}
+
+export function getRecommendedJava(
+  requiredMajorVersion: number | null,
+): Promise<JavaInstallation | null> {
+  return invoke<JavaInstallation | null>("get_recommended_java", {
+    requiredMajorVersion,
   });
 }
 
-export function startMicrosoftLogin(): Promise<DeviceCodeResponse> {
-  return invoke<DeviceCodeResponse>("start_microsoft_login");
+export function getSettings(): Promise<LauncherConfig> {
+  return invoke<LauncherConfig>("get_settings");
 }
 
-export function deleteVersion(
+export function getVersionJavaVersion(
   instanceId: string,
   versionId: string,
-): Promise<void> {
-  return invoke<void>("delete_version", {
+): Promise<number | null> {
+  return invoke<number | null>("get_version_java_version", {
     instanceId,
     versionId,
   });
 }
 
-export function checkVersionInstalled(
+export function getVersionMetadata(
   instanceId: string,
   versionId: string,
-): Promise<boolean> {
-  return invoke<boolean>("check_version_installed", {
+): Promise<VersionMetadata> {
+  return invoke<VersionMetadata>("get_version_metadata", {
     instanceId,
     versionId,
   });
 }
 
-export function uploadToPastebin(content: string): Promise<PastebinResponse> {
-  return invoke<PastebinResponse>("upload_to_pastebin", {
-    content,
-  });
-}
-
-export function getGithubReleases(): Promise<GithubRelease[]> {
-  return invoke<GithubRelease[]>("get_github_releases");
-}
-
-export function assistantChat(messages: Message[]): Promise<Message> {
-  return invoke<Message>("assistant_chat", {
-    messages,
+export function getVersions(instanceId: string): Promise<Version[]> {
+  return invoke<Version[]>("get_versions", {
+    instanceId,
   });
 }
 
@@ -199,8 +241,16 @@ export function installFabric(
   });
 }
 
-export function assistantCheckHealth(): Promise<boolean> {
-  return invoke<boolean>("assistant_check_health");
+export function installForge(
+  instanceId: string,
+  gameVersion: string,
+  forgeVersion: string,
+): Promise<InstalledForgeVersion> {
+  return invoke<InstalledForgeVersion>("install_forge", {
+    instanceId,
+    gameVersion,
+    forgeVersion,
+  });
 }
 
 export function installVersion(
@@ -213,14 +263,6 @@ export function installVersion(
   });
 }
 
-export function listInstalledVersions(
-  instanceId: string,
-): Promise<InstalledVersion[]> {
-  return invoke<InstalledVersion[]>("list_installed_versions", {
-    instanceId,
-  });
-}
-
 export function isFabricInstalled(
   instanceId: string,
   gameVersion: string,
@@ -233,46 +275,44 @@ export function isFabricInstalled(
   });
 }
 
-export function createInstance(name: string): Promise<Instance> {
-  return invoke<Instance>("create_instance", {
-    name,
+export function listInstalledFabricVersions(
+  instanceId: string,
+): Promise<string[]> {
+  return invoke<string[]>("list_installed_fabric_versions", {
+    instanceId,
   });
 }
 
-export function getVersionJavaVersion(
+export function listInstalledVersions(
   instanceId: string,
-  versionId: string,
-): Promise<number | null> {
-  return invoke<number | null>("get_version_java_version", {
+): Promise<InstalledVersion[]> {
+  return invoke<InstalledVersion[]>("list_installed_versions", {
     instanceId,
-    versionId,
   });
 }
 
-export function getFabricLoadersForVersion(
-  gameVersion: string,
-): Promise<FabricLoaderEntry[]> {
-  return invoke<FabricLoaderEntry[]>("get_fabric_loaders_for_version", {
-    gameVersion,
+export function listInstanceDirectory(
+  instanceId: string,
+  folder: string,
+): Promise<FileInfo[]> {
+  return invoke<FileInfo[]>("list_instance_directory", {
+    instanceId,
+    folder,
   });
 }
 
-export function cancelJavaDownload(): Promise<void> {
-  return invoke<void>("cancel_java_download");
-}
-
-export function resumeJavaDownloads(): Promise<JavaInstallation[]> {
-  return invoke<JavaInstallation[]>("resume_java_downloads");
+export function listInstances(): Promise<Instance[]> {
+  return invoke<Instance[]>("list_instances");
 }
 
-export function updateInstance(instance: Instance): Promise<void> {
-  return invoke<void>("update_instance", {
-    instance,
+export function listOllamaModels(endpoint: string): Promise<ModelInfo[]> {
+  return invoke<ModelInfo[]>("list_ollama_models", {
+    endpoint,
   });
 }
 
-export function getFabricLoaderVersions(): Promise<FabricLoaderVersion[]> {
-  return invoke<FabricLoaderVersion[]>("get_fabric_loader_versions");
+export function listOpenaiModels(): Promise<ModelInfo[]> {
+  return invoke<ModelInfo[]>("list_openai_models");
 }
 
 export function loginOffline(username: string): Promise<Account> {
@@ -281,76 +321,34 @@ export function loginOffline(username: string): Promise<Account> {
   });
 }
 
-export function installForge(
-  instanceId: string,
-  gameVersion: string,
-  forgeVersion: string,
-): Promise<InstalledForgeVersion> {
-  return invoke<InstalledForgeVersion>("install_forge", {
-    instanceId,
-    gameVersion,
-    forgeVersion,
-  });
-}
-
-export function detectAllJavaInstallations(): Promise<JavaInstallation[]> {
-  return invoke<JavaInstallation[]>("detect_all_java_installations");
-}
-
-export function downloadAdoptiumJava(
-  majorVersion: number,
-  imageType: string,
-  customPath: string | null,
-): Promise<JavaInstallation> {
-  return invoke<JavaInstallation>("download_adoptium_java", {
-    majorVersion,
-    imageType,
-    customPath,
-  });
+export function logout(): Promise<void> {
+  return invoke<void>("logout");
 }
 
-export function startGame(
-  instanceId: string,
-  versionId: string,
-): Promise<string> {
-  return invoke<string>("start_game", {
-    instanceId,
-    versionId,
-  });
+export function migrateSharedCaches(): Promise<MigrationResult> {
+  return invoke<MigrationResult>("migrate_shared_caches");
 }
 
-export function saveSettings(config: LauncherConfig): Promise<void> {
-  return invoke<void>("save_settings", {
-    config,
+export function openFileExplorer(path: string): Promise<void> {
+  return invoke<void>("open_file_explorer", {
+    path,
   });
 }
 
-export function getSettings(): Promise<LauncherConfig> {
-  return invoke<LauncherConfig>("get_settings");
-}
-
-export function duplicateInstance(
-  instanceId: string,
-  newName: string,
-): Promise<Instance> {
-  return invoke<Instance>("duplicate_instance", {
-    instanceId,
-    newName,
-  });
+export function readRawConfig(): Promise<string> {
+  return invoke<string>("read_raw_config");
 }
 
-export function listInstances(): Promise<Instance[]> {
-  return invoke<Instance[]>("list_instances");
+export function refreshAccount(): Promise<Account> {
+  return invoke<Account>("refresh_account");
 }
 
-export function readRawConfig(): Promise<string> {
-  return invoke<string>("read_raw_config");
+export function refreshJavaCatalog(): Promise<JavaCatalog> {
+  return invoke<JavaCatalog>("refresh_java_catalog");
 }
 
-export function assistantChatStream(messages: Message[]): Promise<string> {
-  return invoke<string>("assistant_chat_stream", {
-    messages,
-  });
+export function resumeJavaDownloads(): Promise<JavaInstallation[]> {
+  return invoke<JavaInstallation[]>("resume_java_downloads");
 }
 
 export function saveRawConfig(content: string): Promise<void> {
@@ -359,38 +357,40 @@ export function saveRawConfig(content: string): Promise<void> {
   });
 }
 
-export function fetchAdoptiumJava(
-  majorVersion: number,
-  imageType: string,
-): Promise<JavaDownloadInfo> {
-  return invoke<JavaDownloadInfo>("fetch_adoptium_java", {
-    majorVersion,
-    imageType,
+export function saveSettings(config: LauncherConfig): Promise<void> {
+  return invoke<void>("save_settings", {
+    config,
   });
 }
 
-export function deleteInstanceFile(path: string): Promise<void> {
-  return invoke<void>("delete_instance_file", {
-    path,
+export function setActiveInstance(instanceId: string): Promise<void> {
+  return invoke<void>("set_active_instance", {
+    instanceId,
   });
 }
 
-export function getActiveInstance(): Promise<Instance | null> {
-  return invoke<Instance | null>("get_active_instance");
+export function startGame(
+  instanceId: string,
+  versionId: string,
+): Promise<string> {
+  return invoke<string>("start_game", {
+    instanceId,
+    versionId,
+  });
 }
 
-export function fetchJavaCatalog(): Promise<JavaCatalog> {
-  return invoke<JavaCatalog>("fetch_java_catalog");
+export function startMicrosoftLogin(): Promise<DeviceCodeResponse> {
+  return invoke<DeviceCodeResponse>("start_microsoft_login");
 }
 
-export function logout(): Promise<void> {
-  return invoke<void>("logout");
+export function updateInstance(instance: Instance): Promise<void> {
+  return invoke<void>("update_instance", {
+    instance,
+  });
 }
 
-export function listInstalledFabricVersions(
-  instanceId: string,
-): Promise<string[]> {
-  return invoke<string[]>("list_installed_fabric_versions", {
-    instanceId,
+export function uploadToPastebin(content: string): Promise<PastebinResponse> {
+  return invoke<PastebinResponse>("upload_to_pastebin", {
+    content,
   });
 }
diff --git a/src-tauri/src/utils/api.rs b/src-tauri/src/utils/api.rs
index 0d5a925..92e8ab9 100644
--- a/src-tauri/src/utils/api.rs
+++ b/src-tauri/src/utils/api.rs
@@ -13,13 +13,18 @@ pub struct ApiInfo {
 
 inventory::collect!(ApiInfo);
 
+fn sort_api_infos(api_infos: &mut [&ApiInfo]) {
+    api_infos.sort_by(|a, b| a.fn_name.cmp(b.fn_name));
+}
+
 pub fn export_api_bindings(import_from: &str, export_to: &str) {
     use std::collections::BTreeMap;
 
-    let api_infos = inventory::iter::<ApiInfo>.into_iter().collect::<Vec<_>>();
+    let mut api_infos = inventory::iter::<ApiInfo>.into_iter().collect::<Vec<_>>();
     if api_infos.is_empty() {
         return;
     }
+    sort_api_infos(&mut api_infos);
 
     let mut ts_lines = Vec::new();
     ts_lines.push(r#"import { invoke } from "@tauri-apps/api/core""#.to_string());