diff options
| author | 2026-01-21 20:21:32 +0800 | |
|---|---|---|
| committer | 2026-01-21 20:21:32 +0800 | |
| commit | cef90795b844a8c5a9cbc4f037a0b11c4d2918fc (patch) | |
| tree | 917b210e7f093a5e997addf069eaa876edaec0b5 /src-tauri/src/core | |
| parent | 19296bbf330d4569a7c4bf6032f554ef21c9bd36 (diff) | |
| download | DropOut-cef90795b844a8c5a9cbc4f037a0b11c4d2918fc.tar.gz DropOut-cef90795b844a8c5a9cbc4f037a0b11c4d2918fc.zip | |
feat(ts-bindings): fix ts bindings naming convention
Diffstat (limited to 'src-tauri/src/core')
| -rw-r--r-- | src-tauri/src/core/assistant.rs | 11 | ||||
| -rw-r--r-- | src-tauri/src/core/auth.rs | 27 | ||||
| -rw-r--r-- | src-tauri/src/core/config.rs | 6 | ||||
| -rw-r--r-- | src-tauri/src/core/downloader.rs | 14 | ||||
| -rw-r--r-- | src-tauri/src/core/fabric.rs | 18 | ||||
| -rw-r--r-- | src-tauri/src/core/forge.rs | 4 | ||||
| -rw-r--r-- | src-tauri/src/core/game_version.rs | 29 | ||||
| -rw-r--r-- | src-tauri/src/core/instance.rs | 6 | ||||
| -rw-r--r-- | src-tauri/src/core/java.rs | 22 | ||||
| -rw-r--r-- | src-tauri/src/core/manifest.rs | 12 |
10 files changed, 70 insertions, 79 deletions
diff --git a/src-tauri/src/core/assistant.rs b/src-tauri/src/core/assistant.rs index 7adf713..32d2925 100644 --- a/src-tauri/src/core/assistant.rs +++ b/src-tauri/src/core/assistant.rs @@ -7,7 +7,10 @@ use tauri::{Emitter, Window}; use ts_rs::TS; #[derive(Debug, Clone, Serialize, Deserialize, TS)] -#[ts(export, export_to = "../../packages/ui/src/types/generated/Message.ts")] +#[ts( + export, + export_to = "../../packages/ui-new/src/types/bindings/assistant.ts" +)] pub struct Message { pub role: String, pub content: String, @@ -56,7 +59,7 @@ pub struct OllamaTagsResponse { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/ModelInfo.ts" + export_to = "../../packages/ui-new/src/types/bindings/assistant.ts" )] pub struct ModelInfo { pub id: String, @@ -111,7 +114,7 @@ pub struct OpenAIModelsResponse { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/GenerationStats.ts" + export_to = "../../packages/ui-new/src/types/bindings/assistant.ts" )] pub struct GenerationStats { pub total_duration: u64, @@ -125,7 +128,7 @@ pub struct GenerationStats { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/StreamChunk.ts" + export_to = "../../packages/ui-new/src/types/bindings/assistant.ts" )] pub struct StreamChunk { pub content: String, diff --git a/src-tauri/src/core/auth.rs b/src-tauri/src/core/auth.rs index b8158eb..478d549 100644 --- a/src-tauri/src/core/auth.rs +++ b/src-tauri/src/core/auth.rs @@ -17,7 +17,7 @@ fn get_client() -> reqwest::Client { #[ts( export, tag = "type", - export_to = "../../packages/ui/src/types/generated/Account.ts" + export_to = "../../packages/ui-new/src/types/bindings/auth.ts" )] pub enum Account { Offline(OfflineAccount), @@ -48,20 +48,14 @@ impl Account { } #[derive(Debug, Clone, Serialize, Deserialize, TS)] -#[ts( - export, - export_to = "../../packages/ui/src/types/generated/OfflineAccount.ts" -)] +#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/auth.ts")] pub struct OfflineAccount { pub username: String, pub uuid: String, } #[derive(Debug, Clone, Serialize, Deserialize, TS)] -#[ts( - export, - export_to = "../../packages/ui/src/types/generated/MicrosoftAccount.ts" -)] +#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/auth.ts")] pub struct MicrosoftAccount { pub username: String, pub uuid: String, @@ -91,10 +85,7 @@ const CLIENT_ID: &str = "fe165602-5410-4441-92f7-326e10a7cb82"; const SCOPE: &str = "XboxLive.SignIn XboxLive.offline_access"; #[derive(Debug, Serialize, Deserialize, TS)] -#[ts( - export, - export_to = "../../packages/ui/src/types/generated/DeviceCodeResponse.ts" -)] +#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/auth.ts")] pub struct DeviceCodeResponse { pub user_code: String, pub device_code: String, @@ -105,10 +96,7 @@ pub struct DeviceCodeResponse { } #[derive(Debug, Serialize, Deserialize, TS)] -#[ts( - export, - export_to = "../../packages/ui/src/types/generated/TokenResponse.ts" -)] +#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/auth.ts")] pub struct TokenResponse { pub access_token: String, pub refresh_token: Option<String>, @@ -231,10 +219,7 @@ pub struct MinecraftAuthResponse { } #[derive(Debug, Serialize, Deserialize, TS)] -#[ts( - export, - export_to = "../../packages/ui/src/types/generated/MinecraftProfile.ts" -)] +#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/auth.ts")] pub struct MinecraftProfile { pub id: String, pub name: String, diff --git a/src-tauri/src/core/config.rs b/src-tauri/src/core/config.rs index 2c72928..e22e56a 100644 --- a/src-tauri/src/core/config.rs +++ b/src-tauri/src/core/config.rs @@ -8,7 +8,7 @@ use ts_rs::TS; #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/AssistantConfig.ts" + export_to = "../../packages/ui-new/src/types/bindings/config.ts" )] #[serde(default)] pub struct AssistantConfig { @@ -51,7 +51,7 @@ impl Default for AssistantConfig { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/FeatureFlags.ts" + export_to = "../../packages/ui-new/src/types/bindings/config.ts" )] #[serde(default)] pub struct FeatureFlags { @@ -82,7 +82,7 @@ impl Default for FeatureFlags { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/LauncherConfig.ts" + export_to = "../../packages/ui-new/src/types/bindings/config.ts" )] #[serde(default)] pub struct LauncherConfig { diff --git a/src-tauri/src/core/downloader.rs b/src-tauri/src/core/downloader.rs index cc83078..99a641c 100644 --- a/src-tauri/src/core/downloader.rs +++ b/src-tauri/src/core/downloader.rs @@ -12,7 +12,7 @@ use ts_rs::TS; #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/DownloadTask.ts" + export_to = "../../packages/ui-new/src/types/bindings/downloader.ts" )] pub struct DownloadTask { pub url: String, @@ -27,7 +27,7 @@ pub struct DownloadTask { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/DownloadMetadata.ts" + export_to = "../../packages/ui-new/src/types/bindings/downloader.ts" )] pub struct DownloadMetadata { pub url: String, @@ -43,7 +43,7 @@ pub struct DownloadMetadata { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/DownloadSegment.ts" + export_to = "../../packages/ui-new/src/types/bindings/downloader.ts" )] pub struct DownloadSegment { pub start: u64, @@ -56,7 +56,7 @@ pub struct DownloadSegment { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/JavaDownloadProgress.ts" + export_to = "../../packages/ui-new/src/types/bindings/downloader.ts" )] pub struct JavaDownloadProgress { pub file_name: String, @@ -72,7 +72,7 @@ pub struct JavaDownloadProgress { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/PendingJavaDownload.ts" + export_to = "../../packages/ui-new/src/types/bindings/downloader.ts" )] pub struct PendingJavaDownload { pub major_version: u32, @@ -89,7 +89,7 @@ pub struct PendingJavaDownload { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/DownloadQueue.ts" + export_to = "../../packages/ui-new/src/types/bindings/downloader.ts" )] pub struct DownloadQueue { pub pending_downloads: Vec<PendingJavaDownload>, @@ -447,7 +447,7 @@ fn create_new_metadata( #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/ProgressEvent.ts" + export_to = "../../packages/ui/src/types/generated/downloader.ts" )] pub struct ProgressEvent { pub file: String, diff --git a/src-tauri/src/core/fabric.rs b/src-tauri/src/core/fabric.rs index 15ea6f3..4e63bce 100644 --- a/src-tauri/src/core/fabric.rs +++ b/src-tauri/src/core/fabric.rs @@ -16,7 +16,7 @@ const FABRIC_META_URL: &str = "https://meta.fabricmc.net/v2"; #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/FabricLoaderVersion.ts" + export_to = "../../packages/ui-new/src/types/bindings/fabric.ts" )] pub struct FabricLoaderVersion { pub separator: String, @@ -30,7 +30,7 @@ pub struct FabricLoaderVersion { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/FabricIntermediaryVersion.ts" + export_to = "../../packages/ui-new/src/types/bindings/fabric.ts" )] pub struct FabricIntermediaryVersion { pub maven: String, @@ -42,7 +42,7 @@ pub struct FabricIntermediaryVersion { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/FabricLoaderEntry.ts" + export_to = "../../packages/ui-new/src/types/bindings/fabric.ts" )] pub struct FabricLoaderEntry { pub loader: FabricLoaderVersion, @@ -55,7 +55,7 @@ pub struct FabricLoaderEntry { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/FabricLauncherMeta.ts" + export_to = "../../packages/ui-new/src/types/bindings/fabric.ts" )] pub struct FabricLauncherMeta { pub version: i32, @@ -68,7 +68,7 @@ pub struct FabricLauncherMeta { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/FabricLibraries.ts" + export_to = "../../packages/ui-new/src/types/bindings/fabric.ts" )] pub struct FabricLibraries { pub client: Vec<FabricLibrary>, @@ -80,7 +80,7 @@ pub struct FabricLibraries { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/FabricLibrary.ts" + export_to = "../../packages/ui-new/src/types/bindings/fabric.ts" )] pub struct FabricLibrary { pub name: String, @@ -92,7 +92,7 @@ pub struct FabricLibrary { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/FabricMainClass.ts", + export_to = "../../packages/ui-new/src/types/bindings/fabric.ts", untagged )] #[serde(untagged)] @@ -122,7 +122,7 @@ impl FabricMainClass { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/FabricGameVersion.ts" + export_to = "../../packages/ui-new/src/types/bindings/fabric.ts" )] pub struct FabricGameVersion { pub version: String, @@ -133,7 +133,7 @@ pub struct FabricGameVersion { #[derive(Debug, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/InstalledFabricVersion.ts" + export_to = "../../packages/ui-new/src/types/bindings/fabric.ts" )] pub struct InstalledFabricVersion { pub id: String, diff --git a/src-tauri/src/core/forge.rs b/src-tauri/src/core/forge.rs index 2ef8d75..9f0215f 100644 --- a/src-tauri/src/core/forge.rs +++ b/src-tauri/src/core/forge.rs @@ -23,7 +23,7 @@ const FORGE_FILES_URL: &str = "https://files.minecraftforge.net/"; #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/ForgeVersion.ts" + export_to = "../../packages/ui-new/src/types/bindings/forge.ts" )] pub struct ForgeVersion { pub version: String, @@ -44,7 +44,7 @@ struct ForgePromotions { #[derive(Debug, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/InstalledForgeVersion.ts" + export_to = "../../packages/ui-new/src/types/bindings/forge.ts" )] pub struct InstalledForgeVersion { pub id: String, diff --git a/src-tauri/src/core/game_version.rs b/src-tauri/src/core/game_version.rs index 0f8f939..7df631a 100644 --- a/src-tauri/src/core/game_version.rs +++ b/src-tauri/src/core/game_version.rs @@ -6,7 +6,7 @@ use ts_rs::TS; #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/GameVersion.ts" + export_to = "../../packages/ui-new/src/types/bindings/game_version.ts" )] pub struct GameVersion { pub id: String, @@ -36,7 +36,7 @@ pub struct GameVersion { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/Downloads.ts" + export_to = "../../packages/ui-new/src/types/bindings/game_version.ts" )] pub struct Downloads { pub client: DownloadArtifact, @@ -46,7 +46,7 @@ pub struct Downloads { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/DownloadArtifact.ts" + export_to = "../../packages/ui-new/src/types/bindings/game_version.ts" )] pub struct DownloadArtifact { pub sha1: Option<String>, @@ -58,7 +58,7 @@ pub struct DownloadArtifact { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/AssetIndex.ts" + export_to = "../../packages/ui-new/src/types/bindings/game_version.ts" )] pub struct AssetIndex { pub id: String, @@ -70,7 +70,10 @@ pub struct AssetIndex { } #[derive(Debug, Deserialize, Serialize, Clone, TS)] -#[ts(export, export_to = "../../packages/ui/src/types/generated/Library.ts")] +#[ts( + export, + export_to = "../../packages/ui-new/src/types/bindings/game_version.ts" +)] pub struct Library { pub downloads: Option<LibraryDownloads>, pub name: String, @@ -82,7 +85,10 @@ pub struct Library { } #[derive(Debug, Deserialize, Serialize, Clone, TS)] -#[ts(export, export_to = "../../packages/ui/src/types/generated/Rule.ts")] +#[ts( + export, + export_to = "../../packages/ui-new/src/types/bindings/game_version.ts" +)] pub struct Rule { pub action: String, // "allow" or "disallow" pub os: Option<OsRule>, @@ -91,7 +97,10 @@ pub struct Rule { } #[derive(Debug, Deserialize, Serialize, Clone, TS)] -#[ts(export, export_to = "../../packages/ui/src/types/generated/OsRule.ts")] +#[ts( + export, + export_to = "../../packages/ui-new/src/types/bindings/game_version.ts" +)] pub struct OsRule { pub name: Option<String>, // "linux", "osx", "windows" pub version: Option<String>, // Regex @@ -101,7 +110,7 @@ pub struct OsRule { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/LibraryDownloads.ts" + export_to = "../../packages/ui-new/src/types/bindings/game_version.ts" )] pub struct LibraryDownloads { pub artifact: Option<DownloadArtifact>, @@ -112,7 +121,7 @@ pub struct LibraryDownloads { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/Arguments.ts" + export_to = "../../packages/ui-new/src/types/bindings/game_version.ts" )] pub struct Arguments { #[ts(type = "Record<string, unknown>")] @@ -124,7 +133,7 @@ pub struct Arguments { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/JavaVersion.ts" + export_to = "../../packages/ui-new/src/types/bindings/game_version.ts" )] pub struct JavaVersion { pub component: String, diff --git a/src-tauri/src/core/instance.rs b/src-tauri/src/core/instance.rs index 43d4719..131d696 100644 --- a/src-tauri/src/core/instance.rs +++ b/src-tauri/src/core/instance.rs @@ -17,7 +17,7 @@ use ts_rs::TS; #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/Instance.ts" + export_to = "../../packages/ui-new/src/types/bindings/instance.ts" )] pub struct Instance { pub id: String, // 唯一标识符(UUID) @@ -39,7 +39,7 @@ pub struct Instance { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/MemoryOverride.ts" + export_to = "../../packages/ui-new/src/types/bindings/instance.ts" )] pub struct MemoryOverride { pub min: u32, // MB @@ -50,7 +50,7 @@ pub struct MemoryOverride { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/InstanceConfig.ts" + export_to = "../../packages/ui-new/src/types/bindings/instance.ts" )] pub struct InstanceConfig { pub instances: Vec<Instance>, diff --git a/src-tauri/src/core/java.rs b/src-tauri/src/core/java.rs index cde5879..ddcbdbd 100644 --- a/src-tauri/src/core/java.rs +++ b/src-tauri/src/core/java.rs @@ -27,10 +27,7 @@ fn strip_unc_prefix(path: PathBuf) -> PathBuf { } #[derive(Debug, Clone, Serialize, Deserialize, TS)] -#[ts( - export, - export_to = "../../packages/ui/src/types/generated/JavaInstallation.ts" -)] +#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/java.ts")] pub struct JavaInstallation { pub path: String, pub version: String, @@ -42,7 +39,7 @@ pub struct JavaInstallation { #[ts( export, rename_all = "lowercase", - export_to = "../../packages/ui/src/types/generated/ImageType.ts" + export_to = "../../packages/ui-new/src/types/bindings/java.ts" )] #[serde(rename_all = "lowercase")] pub enum ImageType { @@ -67,10 +64,7 @@ impl std::fmt::Display for ImageType { /// Java release information for UI display #[derive(Debug, Clone, Serialize, Deserialize, TS)] -#[ts( - export, - export_to = "../../packages/ui/src/types/generated/JavaReleaseInfo.ts" -)] +#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/java.ts")] pub struct JavaReleaseInfo { pub major_version: u32, pub image_type: String, @@ -87,10 +81,7 @@ pub struct JavaReleaseInfo { /// Java catalog containing all available versions #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] -#[ts( - export, - export_to = "../../packages/ui/src/types/generated/JavaCatalog.ts" -)] +#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/java.ts")] pub struct JavaCatalog { pub releases: Vec<JavaReleaseInfo>, pub available_major_versions: Vec<u32>, @@ -147,10 +138,7 @@ pub struct AvailableReleases { /// Java download information from Adoptium #[derive(Debug, Clone, Serialize, TS)] -#[ts( - export, - export_to = "../../packages/ui/src/types/generated/JavaDownloadInfo.ts" -)] +#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/java.ts")] pub struct JavaDownloadInfo { pub version: String, pub release_name: String, diff --git a/src-tauri/src/core/manifest.rs b/src-tauri/src/core/manifest.rs index 656b1c8..ffa1c77 100644 --- a/src-tauri/src/core/manifest.rs +++ b/src-tauri/src/core/manifest.rs @@ -8,7 +8,7 @@ use ts_rs::TS; #[derive(Debug, Deserialize, Serialize, TS)] #[ts( export, - export_to = "../../packages/ui/src/types/generated/VersionManifest.ts" + export_to = "../../packages/ui-new/src/types/bindings/manifest.ts" )] pub struct VersionManifest { pub latest: Latest, @@ -16,14 +16,20 @@ pub struct VersionManifest { } #[derive(Debug, Deserialize, Serialize, TS)] -#[ts(export, export_to = "../../packages/ui/src/types/generated/Latest.ts")] +#[ts( + export, + export_to = "../../packages/ui-new/src/types/bindings/manifest.ts" +)] pub struct Latest { pub release: String, pub snapshot: String, } #[derive(Debug, Deserialize, Serialize, TS)] -#[ts(export, export_to = "../../packages/ui/src/types/generated/Version.ts")] +#[ts( + export, + export_to = "../../packages/ui-new/src/types/bindings/manifest.ts" +)] pub struct Version { pub id: String, #[serde(rename = "type")] |