From 40ac59e5160d0deecbe5dae394e94f75be44b803 Mon Sep 17 00:00:00 2001
From: Mister-Hope <mister-hope@outlook.com>
Date: Fri, 17 Jan 2025 15:00:56 +0800
Subject: [PATCH] feat(client): improve client data types

---
 packages/client/src/composables/clientData.ts      | 7 +++++--
 packages/client/src/composables/clientDataUtils.ts | 5 ++---
 packages/client/src/types/clientData.ts            | 9 ++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/composables/clientData.ts b/packages/client/src/composables/clientData.ts
index 52d21ea2c1..b5db09a92e 100644
--- a/packages/client/src/composables/clientData.ts
+++ b/packages/client/src/composables/clientData.ts
@@ -12,8 +12,11 @@ export const clientDataSymbol: InjectionKey<ClientData> = Symbol(
 /**
  * Returns client data
  */
-export const useClientData = (): ClientData => {
-  const clientData = inject(clientDataSymbol)
+export const useClientData = <
+  Frontmatter extends Record<string, unknown> = Record<string, unknown>,
+  Data extends Record<string, unknown> = Record<string, unknown>,
+>(): ClientData<Frontmatter, Data> => {
+  const clientData = inject<ClientData<Frontmatter, Data>>(clientDataSymbol)
   if (!clientData) {
     throw new Error('useClientData() is called without provider.')
   }
diff --git a/packages/client/src/composables/clientDataUtils.ts b/packages/client/src/composables/clientDataUtils.ts
index 3dc3109670..259abd464c 100644
--- a/packages/client/src/composables/clientDataUtils.ts
+++ b/packages/client/src/composables/clientDataUtils.ts
@@ -22,12 +22,11 @@ export const usePageComponent = (): PageComponentRef =>
 
 export const usePageData = <
   T extends Record<string, unknown> = Record<string, unknown>,
->(): PageDataRef<T> => useClientData().pageData as PageDataRef<T>
+>(): PageDataRef<T> => useClientData<Record<string, unknown>, T>().pageData
 
 export const usePageFrontmatter = <
   T extends Record<string, unknown> = Record<string, unknown>,
->(): PageFrontmatterRef<T> =>
-  useClientData().pageFrontmatter as PageFrontmatterRef<T>
+>(): PageFrontmatterRef<T> => useClientData<T>().pageFrontmatter
 
 export const usePageHead = (): PageHeadRef => useClientData().pageHead
 
diff --git a/packages/client/src/types/clientData.ts b/packages/client/src/types/clientData.ts
index 5107ac3067..98dd20c7c8 100644
--- a/packages/client/src/types/clientData.ts
+++ b/packages/client/src/types/clientData.ts
@@ -54,11 +54,14 @@ export type RoutesRef = Ref<Routes>
 export type SiteDataRef = Ref<SiteData>
 export type SiteLocaleDataRef = ComputedRef<SiteLocaleData>
 
-export interface ClientData {
+export interface ClientData<
+  Frontmatter extends Record<string, unknown> = Record<string, unknown>,
+  Data extends Record<string, unknown> = Record<string, unknown>,
+> {
   layouts: LayoutsRef
   pageComponent: PageComponentRef
-  pageData: PageDataRef
-  pageFrontmatter: PageFrontmatterRef
+  pageData: PageDataRef<Data>
+  pageFrontmatter: PageFrontmatterRef<Frontmatter>
   pageHead: PageHeadRef
   pageHeadTitle: PageHeadTitleRef
   pageLang: PageLangRef