refactor(i18n): use @alwatr/type

Alwatr · Jan 8, 2023 · e097b99 · e097b99
1 parent bd5f11c
commit e097b99
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 23 deletions.
diff --git a/core/i18n/package.json b/core/i18n/package.json
@@ -36,5 +36,8 @@
     "@alwatr/logger": "^0.27.0",
     "@alwatr/signal": "^0.27.0",
     "tslib": "^2.4.1"
+  },
+  "devDependencies": {
+    "@alwatr/type": "^0.27.0"
   }
 }
diff --git a/core/i18n/src/i18n.ts b/core/i18n/src/i18n.ts
@@ -4,6 +4,8 @@ import {SignalInterface} from '@alwatr/signal';
 
 import type {I18nConfig, L10Resource, Locale} from './type.js';
 
+export * from './type.js';
+
 const logger = createLogger('alwatr/i18n');
 
 globalAlwatr.registeredList.push({

diff --git a/core/i18n/src/type.ts b/core/i18n/src/type.ts
@@ -1,3 +1,7 @@
+import type {L10Resource, Locale} from '@alwatr/type';
+
+export {L10Resource, Locale};
+
 declare global {
   interface AlwatrSignals {
     'locale-change': Locale;
@@ -9,29 +13,6 @@ declare global {
   }
 }
 
-export type LocalCode = `${Lowercase<string>}-${Uppercase<string>}`;
-
-export type L10Resource = Record<string, string> & {
-  _code: LocalCode;
-};
-
-export type Locale = {
-  /**
-   * fa-IR, en-US, ...
-   */
-  code: LocalCode;
-
-  /**
-   * fa, en, ...
-   */
-  language: Lowercase<string>;
-
-  /**
-   * ltr, rtl
-   */
-  direction: 'rtl' | 'ltr';
-};
-
 export type I18nConfig = {
   /**
    * Automatically fetch the localization resource from `resourcePath/localCode.json`.

diff --git a/core/i18n/tsconfig.json b/core/i18n/tsconfig.json
@@ -10,6 +10,7 @@
   "include": ["src/**/*.ts"],
   "exclude": [],
   "references": [
+    {"path": "../type"},
     {"path": "../logger"},
     {"path": "../signal"},
     {"path": "../fetch"}

diff --git a/core/type/src/i18n.ts b/core/type/src/i18n.ts
@@ -0,0 +1,22 @@
+export type LocalCode = `${Lowercase<string>}-${Uppercase<string>}`;
+
+export type L10Resource = Record<string, string> & {
+  _code: LocalCode;
+};
+
+export type Locale = {
+  /**
+   * fa-IR, en-US, ...
+   */
+  code: LocalCode;
+
+  /**
+   * fa, en, ...
+   */
+  language: Lowercase<string>;
+
+  /**
+   * ltr, rtl
+   */
+  direction: 'rtl' | 'ltr';
+};
diff --git a/core/type/src/index.ts b/core/type/src/index.ts
@@ -2,6 +2,7 @@ export * from './chat.js';
 export * from './service-response.js';
 export * from './storage.js';
 export * from './global.js';
+export * from './i18n.js';
 export * from './type-helper.js';
 
 Alwatr.registeredList.push({