chore(i18n): 🏷️ fix t type

willin · Dec 11, 2023 · a50a15d · a50a15d
1 parent 40d5a71
commit a50a15d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/i18n/src/lib/i18n/formatter.ts b/packages/i18n/src/lib/i18n/formatter.ts
@@ -1,10 +1,11 @@
 import dlv from 'dlv';
 import templite from 'templite';
-import { derived } from 'svelte/store';
+import { derived, type Readable } from 'svelte/store';
 import { $dictionary, getMessageFromDictionary } from './dictionary.js';
 import { $locale, getCurrentLocale } from './locale.js';
+import type { MessageFormatter } from './types.js';
 
-const formatMessage = (key: string, params?: any, lang?: string): string => {
+const formatMessage: MessageFormatter = (key: string, params?: any, lang?: string): string => {
   const dict = getMessageFromDictionary(lang || (getCurrentLocale() as string));
   const val = dlv(dict as any, key, key);
   if (typeof val === 'function') return val(params) as string;
@@ -14,4 +15,4 @@ const formatMessage = (key: string, params?: any, lang?: string): string => {
   return val as string;
 };
 
-export const $t = derived([$locale, $dictionary], () => formatMessage);
+export const $t: Readable<MessageFormatter> = derived([$locale, $dictionary], () => formatMessage);
diff --git a/packages/i18n/src/lib/i18n/types.ts b/packages/i18n/src/lib/i18n/types.ts
@@ -2,3 +2,9 @@ export type Fn = (...args: any[]) => string;
 export interface I18nDict {
   [key: string]: string | number | Fn | I18nDict;
 }
+
+export type MessageFormatter = (
+  key: string,
+  params?: Record<string, unknown>,
+  lang?: string
+) => string;