diff --git a/src/data/dto/auth/index.ts b/src/data/dto/auth/index.ts index d0820a15..9add076b 100644 --- a/src/data/dto/auth/index.ts +++ b/src/data/dto/auth/index.ts @@ -4,16 +4,7 @@ export * from "./auth_mode"; export * from "./auth_panel_mode"; -export * from "./facebook_login_request"; export * from "./facebook_user_data"; -export * from "./fb_id_login_request"; -export * from "./google_login_request"; -export * from "./guest_login_request"; -export * from "./guest_login_response"; -export * from "./login_request"; -export * from "./login_response"; export * from "./login_status"; -export * from "./logout_response"; -export * from "./refresh_token_request"; -export * from "./refresh_token_response"; -export * from "./register_request"; +export * from "./request"; +export * from "./response"; diff --git a/src/data/dto/auth/facebook_login_request.ts b/src/data/dto/auth/request/facebook_login_request.ts similarity index 100% rename from src/data/dto/auth/facebook_login_request.ts rename to src/data/dto/auth/request/facebook_login_request.ts diff --git a/src/data/dto/auth/fb_id_login_request.ts b/src/data/dto/auth/request/fb_id_login_request.ts similarity index 100% rename from src/data/dto/auth/fb_id_login_request.ts rename to src/data/dto/auth/request/fb_id_login_request.ts diff --git a/src/data/dto/auth/google_login_request.ts b/src/data/dto/auth/request/google_login_request.ts similarity index 100% rename from src/data/dto/auth/google_login_request.ts rename to src/data/dto/auth/request/google_login_request.ts diff --git a/src/data/dto/auth/guest_login_request.ts b/src/data/dto/auth/request/guest_login_request.ts similarity index 100% rename from src/data/dto/auth/guest_login_request.ts rename to src/data/dto/auth/request/guest_login_request.ts diff --git a/src/data/dto/auth/request/index.ts b/src/data/dto/auth/request/index.ts new file mode 100644 index 00000000..81b89442 --- /dev/null +++ b/src/data/dto/auth/request/index.ts @@ -0,0 +1,7 @@ +export * from "./facebook_login_request"; +export * from "./fb_id_login_request"; +export * from "./google_login_request"; +export * from "./guest_login_request"; +export * from "./login_request"; +export * from "./refresh_token_request"; +export * from "./register_request"; diff --git a/src/data/dto/auth/login_request.ts b/src/data/dto/auth/request/login_request.ts similarity index 100% rename from src/data/dto/auth/login_request.ts rename to src/data/dto/auth/request/login_request.ts diff --git a/src/data/dto/auth/refresh_token_request.ts b/src/data/dto/auth/request/refresh_token_request.ts similarity index 100% rename from src/data/dto/auth/refresh_token_request.ts rename to src/data/dto/auth/request/refresh_token_request.ts diff --git a/src/data/dto/auth/register_request.ts b/src/data/dto/auth/request/register_request.ts similarity index 100% rename from src/data/dto/auth/register_request.ts rename to src/data/dto/auth/request/register_request.ts diff --git a/src/data/dto/auth/guest_login_response.ts b/src/data/dto/auth/response/guest_login_response.ts similarity index 89% rename from src/data/dto/auth/guest_login_response.ts rename to src/data/dto/auth/response/guest_login_response.ts index ea9cb903..37e2f3ec 100644 --- a/src/data/dto/auth/guest_login_response.ts +++ b/src/data/dto/auth/response/guest_login_response.ts @@ -10,10 +10,7 @@ import { User } from "@/data/dto/user/user"; export class GuestLoginResponse { declare readonly token: string; - declare readonly deviceId: string; declare readonly userId: string; - declare readonly isDeviceUser: boolean; - declare readonly expiresIn: number; declare readonly user: User; private constructor(input: GuestLoginResponseInput) { diff --git a/src/data/dto/auth/response/index.ts b/src/data/dto/auth/response/index.ts new file mode 100644 index 00000000..c58e0078 --- /dev/null +++ b/src/data/dto/auth/response/index.ts @@ -0,0 +1,4 @@ +export * from "./guest_login_response"; +export * from "./login_response"; +export * from "./logout_response"; +export * from "./refresh_token_response"; diff --git a/src/data/dto/auth/login_response.ts b/src/data/dto/auth/response/login_response.ts similarity index 100% rename from src/data/dto/auth/login_response.ts rename to src/data/dto/auth/response/login_response.ts diff --git a/src/data/dto/auth/logout_response.ts b/src/data/dto/auth/response/logout_response.ts similarity index 100% rename from src/data/dto/auth/logout_response.ts rename to src/data/dto/auth/response/logout_response.ts diff --git a/src/data/dto/auth/refresh_token_response.ts b/src/data/dto/auth/response/refresh_token_response.ts similarity index 95% rename from src/data/dto/auth/refresh_token_response.ts rename to src/data/dto/auth/response/refresh_token_response.ts index 0508a305..12e46607 100644 --- a/src/data/dto/auth/refresh_token_response.ts +++ b/src/data/dto/auth/response/refresh_token_response.ts @@ -10,7 +10,6 @@ import { export class RefreshTokenResponse { declare readonly token: string; declare readonly refreshToken: string; - declare readonly userId: string; private constructor(input: RefreshTokenResponseInput) { const data = RefreshTokenResponseSchema.parse(input); diff --git a/src/data/dto/chat/index.ts b/src/data/dto/chat/index.ts index 8946ca16..6af70d90 100644 --- a/src/data/dto/chat/index.ts +++ b/src/data/dto/chat/index.ts @@ -2,13 +2,9 @@ * @file Automatically generated by barrelsby. */ -export * from "./chat_history_response"; export * from "./chat_list_item"; export * from "./chat_media"; export * from "./chat_message"; -export * from "./chat_send_response"; -export * from "./send_message_request"; +export * from "./request"; +export * from "./response"; export * from "./ui_message"; -export * from "./unlock_history_response"; -export * from "./unlock_private_request"; -export * from "./unlock_private_response"; diff --git a/src/data/dto/chat/request/index.ts b/src/data/dto/chat/request/index.ts new file mode 100644 index 00000000..40e14b5b --- /dev/null +++ b/src/data/dto/chat/request/index.ts @@ -0,0 +1,2 @@ +export * from "./send_message_request"; +export * from "./unlock_private_request"; diff --git a/src/data/dto/chat/send_message_request.ts b/src/data/dto/chat/request/send_message_request.ts similarity index 100% rename from src/data/dto/chat/send_message_request.ts rename to src/data/dto/chat/request/send_message_request.ts diff --git a/src/data/dto/chat/unlock_private_request.ts b/src/data/dto/chat/request/unlock_private_request.ts similarity index 100% rename from src/data/dto/chat/unlock_private_request.ts rename to src/data/dto/chat/request/unlock_private_request.ts diff --git a/src/data/dto/chat/chat_history_response.ts b/src/data/dto/chat/response/chat_history_response.ts similarity index 72% rename from src/data/dto/chat/chat_history_response.ts rename to src/data/dto/chat/response/chat_history_response.ts index 90926da1..80f932d2 100644 --- a/src/data/dto/chat/chat_history_response.ts +++ b/src/data/dto/chat/response/chat_history_response.ts @@ -6,17 +6,10 @@ import { type ChatHistoryResponseInput, type ChatHistoryResponseData, } from "@/data/schemas/chat/chat_history_response"; -import { ChatMessage } from "./chat_message"; +import { ChatMessage } from "../chat_message"; export class ChatHistoryResponse { declare readonly messages: ChatMessage[]; - declare readonly total: number; - declare readonly limit: number; - declare readonly offset: number; - declare readonly isVip: boolean; - declare readonly privateFreeLimit: number; - declare readonly privateUsedToday: number; - declare readonly privateCanViewFree: boolean; private constructor(input: ChatHistoryResponseInput) { const data = ChatHistoryResponseSchema.parse(input); diff --git a/src/data/dto/chat/chat_send_response.ts b/src/data/dto/chat/response/chat_send_response.ts similarity index 97% rename from src/data/dto/chat/chat_send_response.ts rename to src/data/dto/chat/response/chat_send_response.ts index eac4b79b..36bc5609 100644 --- a/src/data/dto/chat/chat_send_response.ts +++ b/src/data/dto/chat/response/chat_send_response.ts @@ -13,7 +13,6 @@ export class ChatSendResponse { declare readonly reply: string; declare readonly audioUrl: string; declare readonly messageId: string; - declare readonly isGuest: boolean; declare readonly timestamp: number; declare readonly image: ChatImageData; declare readonly lockDetail: ChatLockDetailData; diff --git a/src/data/dto/chat/response/index.ts b/src/data/dto/chat/response/index.ts new file mode 100644 index 00000000..81bd1dfb --- /dev/null +++ b/src/data/dto/chat/response/index.ts @@ -0,0 +1,4 @@ +export * from "./chat_history_response"; +export * from "./chat_send_response"; +export * from "./unlock_history_response"; +export * from "./unlock_private_response"; diff --git a/src/data/dto/chat/unlock_history_response.ts b/src/data/dto/chat/response/unlock_history_response.ts similarity index 68% rename from src/data/dto/chat/unlock_history_response.ts rename to src/data/dto/chat/response/unlock_history_response.ts index 0db61f7e..96befb68 100644 --- a/src/data/dto/chat/unlock_history_response.ts +++ b/src/data/dto/chat/response/unlock_history_response.ts @@ -11,17 +11,7 @@ import { export class UnlockHistoryResponse { declare readonly unlocked: boolean; declare readonly reason: UnlockHistoryReason; - declare readonly totalLocked: number; - declare readonly unlockedCount: number; - declare readonly privateCount: number; - declare readonly imageCount: number; - declare readonly voiceCount: number; - declare readonly requiredCredits: number; - declare readonly currentCredits: number; - declare readonly remainingCredits: number; declare readonly shortfallCredits: number; - declare readonly costsByMessage: Record; - declare readonly messageIds: string[]; private constructor(input: UnlockHistoryResponseInput) { const data = UnlockHistoryResponseSchema.parse(input); diff --git a/src/data/dto/chat/unlock_private_response.ts b/src/data/dto/chat/response/unlock_private_response.ts similarity index 100% rename from src/data/dto/chat/unlock_private_response.ts rename to src/data/dto/chat/response/unlock_private_response.ts diff --git a/src/data/dto/metrics/index.ts b/src/data/dto/metrics/index.ts index 5213df40..1ae97ec0 100644 --- a/src/data/dto/metrics/index.ts +++ b/src/data/dto/metrics/index.ts @@ -2,5 +2,4 @@ * @file Automatically generated by barrelsby. */ -export * from "./app_event"; -export * from "./pwa_event"; +export * from "./request"; diff --git a/src/data/dto/metrics/app_event.ts b/src/data/dto/metrics/request/app_event.ts similarity index 100% rename from src/data/dto/metrics/app_event.ts rename to src/data/dto/metrics/request/app_event.ts diff --git a/src/data/dto/metrics/request/index.ts b/src/data/dto/metrics/request/index.ts new file mode 100644 index 00000000..ae041a3d --- /dev/null +++ b/src/data/dto/metrics/request/index.ts @@ -0,0 +1,2 @@ +export * from "./app_event"; +export * from "./pwa_event"; diff --git a/src/data/dto/metrics/pwa_event.ts b/src/data/dto/metrics/request/pwa_event.ts similarity index 100% rename from src/data/dto/metrics/pwa_event.ts rename to src/data/dto/metrics/request/pwa_event.ts diff --git a/src/data/dto/payment/index.ts b/src/data/dto/payment/index.ts index d619320e..3c9ec8c0 100644 --- a/src/data/dto/payment/index.ts +++ b/src/data/dto/payment/index.ts @@ -2,8 +2,6 @@ * @file Payment DTO barrel. */ -export * from "./create_payment_order_request"; -export * from "./create_payment_order_response"; -export * from "./payment_order_status_response"; export * from "./payment_plan"; -export * from "./payment_plans_response"; +export * from "./request"; +export * from "./response"; diff --git a/src/data/dto/payment/create_payment_order_request.ts b/src/data/dto/payment/request/create_payment_order_request.ts similarity index 100% rename from src/data/dto/payment/create_payment_order_request.ts rename to src/data/dto/payment/request/create_payment_order_request.ts diff --git a/src/data/dto/payment/request/index.ts b/src/data/dto/payment/request/index.ts new file mode 100644 index 00000000..978d26ec --- /dev/null +++ b/src/data/dto/payment/request/index.ts @@ -0,0 +1 @@ +export * from "./create_payment_order_request"; diff --git a/src/data/dto/payment/create_payment_order_response.ts b/src/data/dto/payment/response/create_payment_order_response.ts similarity index 100% rename from src/data/dto/payment/create_payment_order_response.ts rename to src/data/dto/payment/response/create_payment_order_response.ts diff --git a/src/data/dto/payment/response/index.ts b/src/data/dto/payment/response/index.ts new file mode 100644 index 00000000..8354d4b6 --- /dev/null +++ b/src/data/dto/payment/response/index.ts @@ -0,0 +1,3 @@ +export * from "./create_payment_order_response"; +export * from "./payment_order_status_response"; +export * from "./payment_plans_response"; diff --git a/src/data/dto/payment/payment_order_status_response.ts b/src/data/dto/payment/response/payment_order_status_response.ts similarity index 90% rename from src/data/dto/payment/payment_order_status_response.ts rename to src/data/dto/payment/response/payment_order_status_response.ts index 3fc0c0df..600a3344 100644 --- a/src/data/dto/payment/payment_order_status_response.ts +++ b/src/data/dto/payment/response/payment_order_status_response.ts @@ -11,10 +11,7 @@ import { export type { PaymentOrderStatus }; export class PaymentOrderStatusResponse { - declare readonly orderId: string; declare readonly status: PaymentOrderStatus; - declare readonly orderType: string; - declare readonly planId: string; private constructor(input: PaymentOrderStatusResponseInput) { const data = PaymentOrderStatusResponseSchema.parse(input); diff --git a/src/data/dto/payment/payment_plans_response.ts b/src/data/dto/payment/response/payment_plans_response.ts similarity index 96% rename from src/data/dto/payment/payment_plans_response.ts rename to src/data/dto/payment/response/payment_plans_response.ts index ed14250a..356f148e 100644 --- a/src/data/dto/payment/payment_plans_response.ts +++ b/src/data/dto/payment/response/payment_plans_response.ts @@ -8,7 +8,7 @@ import { type PaymentPlansResponseInput, } from "@/data/schemas/payment/payment_plans_response"; -import { PaymentPlan } from "./payment_plan"; +import { PaymentPlan } from "../payment_plan"; export class PaymentPlansResponse { declare readonly isFirstRecharge: boolean; diff --git a/src/data/services/index.ts b/src/data/services/index.ts index daee86df..a39b65f9 100644 --- a/src/data/services/index.ts +++ b/src/data/services/index.ts @@ -16,24 +16,24 @@ export * from "../../core/net/interceptor/auth_refresh_interceptor"; export * from "../../core/net/interceptor/logging_interceptor"; export * from "../../core/net/interceptor/token_interceptor"; // 注：原 ./auth/* 平台适配层已删除（社交登录改由 NextAuth 处理） -export * from "../dto/auth/facebook_login_request"; export * from "../dto/auth/facebook_user_data"; -export * from "../dto/auth/fb_id_login_request"; -export * from "../dto/auth/google_login_request"; -export * from "../dto/auth/guest_login_request"; -export * from "../dto/auth/guest_login_response"; -export * from "../dto/auth/login_request"; -export * from "../dto/auth/login_response"; -export * from "../dto/auth/logout_response"; -export * from "../dto/auth/refresh_token_request"; -export * from "../dto/auth/refresh_token_response"; -export * from "../dto/auth/register_request"; -export * from "../dto/chat/chat_history_response"; +export * from "../dto/auth/request/facebook_login_request"; +export * from "../dto/auth/request/fb_id_login_request"; +export * from "../dto/auth/request/google_login_request"; +export * from "../dto/auth/request/guest_login_request"; +export * from "../dto/auth/request/login_request"; +export * from "../dto/auth/request/refresh_token_request"; +export * from "../dto/auth/request/register_request"; +export * from "../dto/auth/response/guest_login_response"; +export * from "../dto/auth/response/login_response"; +export * from "../dto/auth/response/logout_response"; +export * from "../dto/auth/response/refresh_token_response"; export * from "../dto/chat/chat_message"; -export * from "../dto/chat/chat_send_response"; -export * from "../dto/chat/send_message_request"; -export * from "../dto/metrics/app_event"; -export * from "../dto/metrics/pwa_event"; +export * from "../dto/chat/request/send_message_request"; +export * from "../dto/chat/response/chat_history_response"; +export * from "../dto/chat/response/chat_send_response"; +export * from "../dto/metrics/request/app_event"; +export * from "../dto/metrics/request/pwa_event"; export * from "../dto/user/avatar_data"; export * from "../dto/user/personality_traits"; export * from "../dto/user/recent_memory"; diff --git a/src/stores/chat/__tests__/chat-machine.helpers.test.ts b/src/stores/chat/__tests__/chat-machine.helpers.test.ts index f34b82da..164715a1 100644 --- a/src/stores/chat/__tests__/chat-machine.helpers.test.ts +++ b/src/stores/chat/__tests__/chat-machine.helpers.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from "vitest"; -import { ChatSendResponse } from "@/data/dto/chat/chat_send_response"; +import { ChatSendResponse } from "@/data/dto/chat"; import type { ChatState } from "@/stores/chat/chat-state"; import { applyHttpSendOutput, diff --git a/src/stores/chat/chat-message-mappers.ts b/src/stores/chat/chat-message-mappers.ts index bd50b0ea..b515fe33 100644 --- a/src/stores/chat/chat-message-mappers.ts +++ b/src/stores/chat/chat-message-mappers.ts @@ -1,5 +1,4 @@ -import type { UiMessage } from "@/data/dto/chat"; -import { ChatSendResponse } from "@/data/dto/chat/chat_send_response"; +import { type ChatSendResponse, type UiMessage } from "@/data/dto/chat"; import { todayString } from "@/utils"; /** diff --git a/src/stores/chat/chat-send-state.ts b/src/stores/chat/chat-send-state.ts index 04acffb6..3b1d49b5 100644 --- a/src/stores/chat/chat-send-state.ts +++ b/src/stores/chat/chat-send-state.ts @@ -1,5 +1,4 @@ -import type { UiMessage } from "@/data/dto/chat"; -import { ChatSendResponse } from "@/data/dto/chat/chat_send_response"; +import { type ChatSendResponse, type UiMessage } from "@/data/dto/chat"; import type { ChatState, ChatUpgradeReason } from "./chat-state";