From e87d097060e41b89d4c68285c103cf96b2dd9449 Mon Sep 17 00:00:00 2001 From: HsiangNianian Date: Wed, 21 Jan 2026 10:52:34 +0800 Subject: fix: Update TypeScript export paths to reflect new directory structure --- src-tauri/src/core/assistant.rs | 11 +++++++---- src-tauri/src/core/auth.rs | 12 ++++++------ src-tauri/src/core/config.rs | 6 +++--- src-tauri/src/core/downloader.rs | 14 +++++++------- src-tauri/src/core/fabric.rs | 18 +++++++++--------- src-tauri/src/core/forge.rs | 4 ++-- src-tauri/src/core/game_version.rs | 29 +++++++++++++++++++---------- src-tauri/src/core/instance.rs | 9 ++++++--- src-tauri/src/core/java.rs | 10 +++++----- src-tauri/src/core/manifest.rs | 6 +++--- src-tauri/src/main.rs | 15 +++++++++------ 11 files changed, 76 insertions(+), 58 deletions(-) (limited to 'src-tauri') diff --git a/src-tauri/src/core/assistant.rs b/src-tauri/src/core/assistant.rs index 987dc41..7adf713 100644 --- a/src-tauri/src/core/assistant.rs +++ b/src-tauri/src/core/assistant.rs @@ -7,7 +7,7 @@ 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/src/types/generated/Message.ts")] pub struct Message { pub role: String, pub content: String, @@ -54,7 +54,10 @@ pub struct OllamaTagsResponse { // Simplified model info for frontend #[derive(Debug, Clone, Serialize, Deserialize, TS)] -#[ts(export, export_to = "../packages/ui/src/types/generated/ModelInfo.ts")] +#[ts( + export, + export_to = "../../packages/ui/src/types/generated/ModelInfo.ts" +)] pub struct ModelInfo { pub id: String, pub name: String, @@ -108,7 +111,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/src/types/generated/GenerationStats.ts" )] pub struct GenerationStats { pub total_duration: u64, @@ -122,7 +125,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/src/types/generated/StreamChunk.ts" )] pub struct StreamChunk { pub content: String, diff --git a/src-tauri/src/core/auth.rs b/src-tauri/src/core/auth.rs index 62f8c69..7fa8cd0 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/src/types/generated/Account.ts" )] pub enum Account { Offline(OfflineAccount), @@ -50,7 +50,7 @@ impl Account { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/OfflineAccount.ts" + export_to = "../../packages/ui/src/types/generated/OfflineAccount.ts" )] pub struct OfflineAccount { pub username: String, @@ -60,7 +60,7 @@ pub struct OfflineAccount { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/MicrosoftAccount.ts" + export_to = "../../packages/ui/src/types/generated/MicrosoftAccount.ts" )] pub struct MicrosoftAccount { pub username: String, @@ -94,7 +94,7 @@ const SCOPE: &str = "XboxLive.SignIn XboxLive.offline_access"; #[derive(Debug, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/DeviceCodeResponse.ts" + export_to = "../../packages/ui/src/types/generated/DeviceCodeResponse.ts" )] pub struct DeviceCodeResponse { pub user_code: String, @@ -108,7 +108,7 @@ pub struct DeviceCodeResponse { #[derive(Debug, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/TokenResponse.ts" + export_to = "../../packages/ui/src/types/generated/TokenResponse.ts" )] pub struct TokenResponse { pub access_token: String, @@ -234,7 +234,7 @@ pub struct MinecraftAuthResponse { #[derive(Debug, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/MinecraftProfile.ts" + export_to = "../../packages/ui/src/types/generated/MinecraftProfile.ts" )] pub struct MinecraftProfile { pub id: String, diff --git a/src-tauri/src/core/config.rs b/src-tauri/src/core/config.rs index b31e0ce..2c72928 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/src/types/generated/AssistantConfig.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/src/types/generated/FeatureFlags.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/src/types/generated/LauncherConfig.ts" )] #[serde(default)] pub struct LauncherConfig { diff --git a/src-tauri/src/core/downloader.rs b/src-tauri/src/core/downloader.rs index 0a3590e..cc83078 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/src/types/generated/DownloadTask.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/src/types/generated/DownloadMetadata.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/src/types/generated/DownloadSegment.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/src/types/generated/JavaDownloadProgress.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/src/types/generated/PendingJavaDownload.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/src/types/generated/DownloadQueue.ts" )] pub struct DownloadQueue { pub pending_downloads: Vec, @@ -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/ProgressEvent.ts" )] pub struct ProgressEvent { pub file: String, diff --git a/src-tauri/src/core/fabric.rs b/src-tauri/src/core/fabric.rs index feadd6b..375786c 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/src/types/generated/FabricLoaderVersion.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/src/types/generated/FabricIntermediaryVersion.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/src/types/generated/FabricLoaderEntry.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/src/types/generated/FabricLauncherMeta.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/src/types/generated/FabricLibraries.ts" )] pub struct FabricLibraries { pub client: Vec, @@ -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/src/types/generated/FabricLibrary.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/src/types/generated/FabricMainClass.ts" )] #[serde(untagged)] pub enum FabricMainClass { @@ -121,7 +121,7 @@ impl FabricMainClass { #[derive(Debug, Deserialize, Serialize, Clone, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/FabricGameVersion.ts" + export_to = "../../packages/ui/src/types/generated/FabricGameVersion.ts" )] pub struct FabricGameVersion { pub version: String, @@ -132,7 +132,7 @@ pub struct FabricGameVersion { #[derive(Debug, Serialize, Clone, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/InstalledFabricVersion.ts" + export_to = "../../packages/ui/src/types/generated/InstalledFabricVersion.ts" )] pub struct InstalledFabricVersion { pub id: String, diff --git a/src-tauri/src/core/forge.rs b/src-tauri/src/core/forge.rs index a256add..2ef8d75 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/src/types/generated/ForgeVersion.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/src/types/generated/InstalledForgeVersion.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 52c7da3..0f8f939 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/src/types/generated/GameVersion.ts" )] pub struct GameVersion { pub id: String, @@ -34,7 +34,10 @@ pub struct GameVersion { } #[derive(Debug, Deserialize, Serialize, Clone, TS)] -#[ts(export, export_to = "../packages/ui/src/types/generated/Downloads.ts")] +#[ts( + export, + export_to = "../../packages/ui/src/types/generated/Downloads.ts" +)] pub struct Downloads { pub client: DownloadArtifact, pub server: Option, @@ -43,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/src/types/generated/DownloadArtifact.ts" )] pub struct DownloadArtifact { pub sha1: Option, @@ -53,7 +56,10 @@ pub struct DownloadArtifact { } #[derive(Debug, Deserialize, Serialize, Clone, TS)] -#[ts(export, export_to = "../packages/ui/src/types/generated/AssetIndex.ts")] +#[ts( + export, + export_to = "../../packages/ui/src/types/generated/AssetIndex.ts" +)] pub struct AssetIndex { pub id: String, pub sha1: String, @@ -64,7 +70,7 @@ 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/src/types/generated/Library.ts")] pub struct Library { pub downloads: Option, pub name: String, @@ -76,7 +82,7 @@ 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/src/types/generated/Rule.ts")] pub struct Rule { pub action: String, // "allow" or "disallow" pub os: Option, @@ -85,7 +91,7 @@ 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/src/types/generated/OsRule.ts")] pub struct OsRule { pub name: Option, // "linux", "osx", "windows" pub version: Option, // Regex @@ -95,7 +101,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/src/types/generated/LibraryDownloads.ts" )] pub struct LibraryDownloads { pub artifact: Option, @@ -104,7 +110,10 @@ pub struct LibraryDownloads { } #[derive(Debug, Deserialize, Serialize, Clone, TS)] -#[ts(export, export_to = "../packages/ui/src/types/generated/Arguments.ts")] +#[ts( + export, + export_to = "../../packages/ui/src/types/generated/Arguments.ts" +)] pub struct Arguments { #[ts(type = "Record")] pub game: Option, @@ -115,7 +124,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/src/types/generated/JavaVersion.ts" )] pub struct JavaVersion { pub component: String, diff --git a/src-tauri/src/core/instance.rs b/src-tauri/src/core/instance.rs index a281968..43d4719 100644 --- a/src-tauri/src/core/instance.rs +++ b/src-tauri/src/core/instance.rs @@ -15,7 +15,10 @@ use ts_rs::TS; /// Represents a game instance/profile #[derive(Debug, Clone, Serialize, Deserialize, TS)] -#[ts(export, export_to = "../packages/ui/src/types/generated/Instance.ts")] +#[ts( + export, + export_to = "../../packages/ui/src/types/generated/Instance.ts" +)] pub struct Instance { pub id: String, // 唯一标识符（UUID） pub name: String, // 显示名称 @@ -36,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/src/types/generated/MemoryOverride.ts" )] pub struct MemoryOverride { pub min: u32, // MB @@ -47,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/src/types/generated/InstanceConfig.ts" )] pub struct InstanceConfig { pub instances: Vec, diff --git a/src-tauri/src/core/java.rs b/src-tauri/src/core/java.rs index 245c496..cde5879 100644 --- a/src-tauri/src/core/java.rs +++ b/src-tauri/src/core/java.rs @@ -29,7 +29,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" + export_to = "../../packages/ui/src/types/generated/JavaInstallation.ts" )] pub struct JavaInstallation { pub path: String, @@ -42,7 +42,7 @@ pub struct JavaInstallation { #[ts( export, rename_all = "lowercase", - export_to = "../packages/ui/src/types/generated/ImageType.ts" + export_to = "../../packages/ui/src/types/generated/ImageType.ts" )] #[serde(rename_all = "lowercase")] pub enum ImageType { @@ -69,7 +69,7 @@ impl std::fmt::Display for ImageType { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/JavaReleaseInfo.ts" + export_to = "../../packages/ui/src/types/generated/JavaReleaseInfo.ts" )] pub struct JavaReleaseInfo { pub major_version: u32, @@ -89,7 +89,7 @@ pub struct JavaReleaseInfo { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/JavaCatalog.ts" + export_to = "../../packages/ui/src/types/generated/JavaCatalog.ts" )] pub struct JavaCatalog { pub releases: Vec, @@ -149,7 +149,7 @@ pub struct AvailableReleases { #[derive(Debug, Clone, Serialize, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/JavaDownloadInfo.ts" + export_to = "../../packages/ui/src/types/generated/JavaDownloadInfo.ts" )] pub struct JavaDownloadInfo { pub version: String, diff --git a/src-tauri/src/core/manifest.rs b/src-tauri/src/core/manifest.rs index 5382259..656b1c8 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/src/types/generated/VersionManifest.ts" )] pub struct VersionManifest { pub latest: Latest, @@ -16,14 +16,14 @@ 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/src/types/generated/Latest.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/src/types/generated/Version.ts")] pub struct Version { pub id: String, #[serde(rename = "type")] diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index e9a24fb..dfd2535 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -1753,7 +1753,7 @@ async fn get_version_java_version( #[derive(serde::Serialize, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/VersionMetadata.ts" + export_to = "../../packages/ui/src/types/generated/VersionMetadata.ts" )] struct VersionMetadata { id: String, @@ -1907,7 +1907,7 @@ async fn get_version_metadata( #[derive(serde::Serialize, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/InstalledVersion.ts" + export_to = "../../packages/ui/src/types/generated/InstalledVersion.ts" )] struct InstalledVersion { id: String, @@ -2140,7 +2140,7 @@ async fn install_forge( #[derive(serde::Serialize, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/GithubRelease.ts" + export_to = "../../packages/ui/src/types/generated/GithubRelease.ts" )] struct GithubRelease { tag_name: String, @@ -2190,7 +2190,7 @@ async fn get_github_releases() -> Result, String> { #[derive(Serialize, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/PastebinResponse.ts" + export_to = "../../packages/ui/src/types/generated/PastebinResponse.ts" )] struct PastebinResponse { url: String, @@ -2402,7 +2402,7 @@ async fn assistant_chat_stream( #[derive(Serialize, TS)] #[ts( export, - export_to = "../packages/ui/src/types/generated/MigrationResult.ts" + export_to = "../../packages/ui/src/types/generated/MigrationResult.ts" )] struct MigrationResult { moved_files: usize, @@ -2453,7 +2453,10 @@ async fn migrate_shared_caches( /// File information for instance file browser #[derive(Debug, Clone, Serialize, Deserialize, TS)] -#[ts(export, export_to = "../packages/ui/src/types/generated/FileInfo.ts")] +#[ts( + export, + export_to = "../../packages/ui/src/types/generated/FileInfo.ts" +)] struct FileInfo { name: String, path: String, -- cgit v1.2.3-70-g09d2