From 2a2ce4adb1e4ed65ac5776bf7929a746b11cce02 Mon Sep 17 00:00:00 2001
From: KishiTheMechanic <s.kishi@elsoul.nl>
Date: Sun, 27 Oct 2024 01:00:51 +0200
Subject: [PATCH] debug

---
 README.md             | 94 ++++++++++++++++++++++---------------------
 deno.json             |  2 +-
 src/i18nPlugin.ts     |  2 +-
 src/types.ts          |  2 +-
 src/useTranslation.ts | 14 ++++---
 5 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/README.md b/README.md
index 26d4e39..c547cd1 100644
--- a/README.md
+++ b/README.md
@@ -43,17 +43,18 @@ preferred locale based on the URL.
 
 ```typescript
 import { App, fsRoutes, staticFiles, trailingSlashes } from 'fresh'
-import { i18nPlugin, type TranslationState } from '@elsoul/fresh-i18n'
+import { i18nPlugin } from 'fresh-i18n'
+import type { ExtendedState } from '@/utils/state.ts'
 
-export const app = new App<{ state: TranslationState }>({
+export const app = new App<ExtendedState>({
   root: import.meta.url,
 })
   .use(staticFiles())
   .use(trailingSlashes('never'))
   .use(i18nPlugin({
-    languages: ['en', 'ja'], // Supported languages
-    defaultLanguage: 'en', // Default language
-    localesDir: './locales', // Path to locale JSON files
+    languages: ['en', 'ja'],
+    defaultLanguage: 'en',
+    localesDir: './locales',
   }))
 
 await fsRoutes(app, {
@@ -66,6 +67,43 @@ if (import.meta.main) {
 }
 ```
 
+#### Define an Extended State with TranslationState
+
+If you are managing additional global state in your Fresh app, such as metadata
+or theme settings, you can extend TranslationState to include your own
+properties. This extended state can then be used across your app, with
+translation data (t) accessible directly in request handlers, enabling
+Server-Side Rendering (SSR) with fully localized content.
+
+##### Example
+
+In the following example, TranslationState from @elsoul/fresh-i18n is combined
+with a custom State interface to create ExtendedState. This ExtendedState
+includes both translation data and other application-specific properties, making
+it convenient for global state management.
+
+ExtendedState can then be used in request handlers to access translation data
+directly via ctx.state.t, enabling SSR with localized data.
+
+```typescript
+import { createDefine } from 'fresh'
+import type { TranslationState } from '@elsoul/fresh-i18n'
+
+interface State {
+  title?: string
+  theme?: string
+  description?: string
+  ogImage?: string
+  noIndex?: boolean
+}
+
+// Combine TranslationState with custom State properties
+export type ExtendedState = State & TranslationState
+
+// Define the extended state for use in your Fresh app
+export const define = createDefine<ExtendedState>()
+```
+
 ### Step 2: Create Locale JSON Files
 
 Inside the `locales` directory, create subfolders for each locale and organize
@@ -109,13 +147,13 @@ translations and handle language switching dynamically.
 import { useLocale, useTranslation } from '@elsoul/fresh-i18n'
 
 export default function IslandsComponent() {
-  const { t } = useTranslation('common') // Uses "common" namespace
+  const { t } = useTranslation()
   const { locale, changeLanguage } = useLocale()
 
   return (
     <div>
-      <h1>{t('title')}</h1> {/* Outputs "Home" or "ホーム" */}
-      <p>{t('welcome')}</p> {/* Outputs "Welcome" or "ようこそ" */}
+      <h1>{t('common.title')}</h1> {/* Outputs "Home" or "ホーム" */}
+      <p>{t('common.welcome')}</p> {/* Outputs "Welcome" or "ようこそ" */}
       <p>Current language: {locale}</p>
       <button onClick={() => changeLanguage('en')}>English</button>
       <button onClick={() => changeLanguage('ja')}>日本語</button>
@@ -124,44 +162,8 @@ export default function IslandsComponent() {
 }
 ```
 
-### Define an Extended State with TranslationState
-
-If you are managing additional global state in your Fresh app, such as metadata
-or theme settings, you can extend TranslationState to include your own
-properties. This extended state can then be used across your app, with
-translation data (t) accessible directly in request handlers, enabling
-Server-Side Rendering (SSR) with fully localized content.
-
-#### Example
-
-In the following example, TranslationState from @elsoul/fresh-i18n is combined
-with a custom State interface to create ExtendedState. This ExtendedState
-includes both translation data and other application-specific properties, making
-it convenient for global state management.
-
-ExtendedState can then be used in request handlers to access translation data
-directly via ctx.state.t, enabling SSR with localized data.
-
-```typescript
-import { createDefine } from 'fresh'
-import type { TranslationState } from '@elsoul/fresh-i18n'
-
-interface State {
-  title?: string
-  lang?: string
-  theme?: string
-  description?: string
-  ogImage?: string
-  noIndex?: boolean
-}
-
-// Combine TranslationState with custom State properties
-export type ExtendedState = State & TranslationState
-
-// Define the extended state for use in your Fresh app
-export const define = createDefine<ExtendedState>()
-
-// Example usage in a route handler
+```tsx
+// Example usage in a route handler for SSR
 export const handler = define.handlers({
   GET(ctx) {
     console.log('ctx', ctx.state.t) // Access translation data directly
diff --git a/deno.json b/deno.json
index 25b25a8..b40e140 100644
--- a/deno.json
+++ b/deno.json
@@ -1,6 +1,6 @@
 {
   "name": "@elsoul/fresh-i18n",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "description": "A simple and flexible internationalization (i18n) plugin for Deno's Fresh framework.",
   "runtimes": ["deno", "browser"],
   "exports": "./mod.ts",
diff --git a/src/i18nPlugin.ts b/src/i18nPlugin.ts
index 5cdff83..6cb3317 100644
--- a/src/i18nPlugin.ts
+++ b/src/i18nPlugin.ts
@@ -54,7 +54,7 @@ export const i18nPlugin = (
       : url.pathname
 
     ctx.state.path = rootPath
-    ctx.state.lang = lang
+    ctx.state.locale = lang
 
     pathname.value = rootPath
 
diff --git a/src/types.ts b/src/types.ts
index 4b353ef..2b38449 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -34,5 +34,5 @@ export type MiddlewareFn<State> = (
 export interface TranslationState {
   t: Record<string, Record<string, string>>
   path: string
-  lang: string
+  locale: string
 }
diff --git a/src/useTranslation.ts b/src/useTranslation.ts
index 8038083..3f02f83 100644
--- a/src/useTranslation.ts
+++ b/src/useTranslation.ts
@@ -7,19 +7,21 @@ import { translationData } from '@/src/store.ts'
  */
 export function useTranslation(): { t: (key: string) => string } {
   const translate = (key: string): string => {
-    const keys = key.split('.')
-    let value: unknown = translationData.value
+    const keys = key.split('.') // Split the key by dot
+    let value: unknown = translationData.value // Get the value from translationData
+
+    console.log('Translation Data:', translationData.value) // Check translation data
 
     for (const k of keys) {
       if (value && typeof value === 'object' && k in value) {
-        value = (value as Record<string, unknown>)[k]
+        value = (value as Record<string, unknown>)[k] // Retrieve the nested key
       } else {
-        return key // Fallback to the key if the path is not found
+        return key // Return the key if not found
       }
     }
 
-    return typeof value === 'string' ? value : key
+    return typeof value === 'string' ? value : key // Return value if it's a string, otherwise return the key
   }
 
-  return { t: translate }
+  return { t: translate } // Return the translation function
 }