@pc-nexus/core 0.5.0-next.23 → 0.5.0-next.25

package/lib/i18n/main.d.ts

@@ -1,6 +1,10 @@
-import { TranslationResourceContent, TranslationResult } from "./types.js";
-export declare const i18n: {
-    translate: (i18nKey: string, args?: Record<string, number | string>, rawLocale?: string) => Promise<string | TranslationResourceContent>;
-    getTranslations: (rawLocale?: string) => Promise<TranslationResult>;
-};
+import { SupportedLocaleCode, GetTranslationsResult, Translator } from "./types.js";
+declare class I18n {
+    #private;
+    constructor();
+    getTranslations(locale?: SupportedLocaleCode): Promise<GetTranslationsResult>;
+    createTranslator(locale?: SupportedLocaleCode): Promise<Translator>;
+}
+export declare const i18n: I18n;
+export {};
 //# sourceMappingURL=main.d.ts.map

package/lib/i18n/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/lib/i18n/main.ts"],"names":[],"mappings":"AAEA,OAAO,EAA+B,0BAA0B,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAkDxG,eAAO,MAAM,IAAI;yBAhCJ,MAAM,SACR,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,cAC1B,MAAM,KACnB,OAAO,CAAC,MAAM,GAAG,0BAA0B,CAAC;kCAqBJ,MAAM,KAAG,OAAO,CAAC,iBAAiB,CAAC;CAW7E,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/lib/i18n/main.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAuD,qBAAqB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGzI,cAAM,IAAI;;;IAMO,eAAe,CAAC,MAAM,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAK7E,gBAAgB,CAAC,MAAM,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC;CA0DnF;AAED,eAAO,MAAM,IAAI,MAAa,CAAC"}

package/lib/i18n/main.js

@@ -1,40 +1,53 @@
 import { NexusCode, NexusInnerError, NexusInnerErrorType } from "@pc-nexus/internal";
 import { TranslationLoader } from "./translation-loader.js";
-import { NexusSupportLocales } from "./types.js";
+import { SUPPORTED_LOCALE_CODES } from "./types.js";
 import _ from "lodash";
-const translationsGetter = new TranslationLoader();
-const ensureLocale = (rawLocale) => {
-    if (!NexusSupportLocales.includes(rawLocale)) {
-        throw new NexusInnerError(NexusCode.invalidInput, NexusInnerErrorType.i18nTranslationLocaleInvalid, `locale "${rawLocale}" is not supported`);
+class I18n {
+    #translationsGetter;
+    constructor() {
+        this.#translationsGetter = new TranslationLoader();
     }
-    return rawLocale;
-};
-const translate = async (i18nKey, args, rawLocale) => {
-    let locale = undefined;
-    if (rawLocale) {
-        locale = ensureLocale(rawLocale);
+    async getTranslations(locale) {
+        this.#validateLocale(locale);
+        return await this.#translationsGetter.getTranslations(locale);
     }
-    const translationResult = await translationsGetter.getTranslations(locale);
-    if (!translationResult.translations) {
-        return i18nKey;
+    async createTranslator(locale) {
+        this.#validateLocale(locale);
+        const translationResult = await this.#translationsGetter.getTranslations(locale);
+        return {
+            translate: (key, params) => {
+                return this.#translate(key, translationResult.translations ?? {}, params);
+            },
+        };
     }
-    const result = _.get(translationResult.translations, i18nKey);
-    if (_.isString(result) && args) {
-        return result.replace(/\{\{\s*(.*?)\s*\}\}/g, (x, k) => {
-            const paramValue = _.get(args, k.trim());
+    #translate(key, translations, params) {
+        if (!key) {
+            throw new NexusInnerError(NexusCode.InvalidInput, NexusInnerErrorType.I18nTranslationKeyRequired, `"key" is required in i18n translate.`);
+        }
+        let value = _.get(translations, key);
+        if (value == null) {
+            return key;
+        }
+        if (typeof value === "object") {
+            return value;
+        }
+        if (typeof value !== "string") {
+            value = String(value);
+        }
+        if (!params) {
+            return value;
+        }
+        return value.replace(/\{\{\s*(.*?)\s*\}\}/g, (x, k) => {
+            const paramValue = _.get(params, k.trim());
             return paramValue != null ? String(paramValue) : `{{${k}}}`;
         });
     }
-    return result || i18nKey;
-};
-const getTranslations = async (rawLocale) => {
-    let locale = undefined;
-    if (rawLocale) {
-        locale = ensureLocale(rawLocale);
+    #validateLocale(locale) {
+        if (locale) {
+            if (!SUPPORTED_LOCALE_CODES.includes(locale)) {
+                throw new NexusInnerError(NexusCode.InvalidInput, NexusInnerErrorType.I18nTranslationLocaleInvalid, `locale "${locale}" is not supported`);
+            }
+        }
     }
-    return await translationsGetter.getTranslations(locale);
-};
-export const i18n = {
-    translate: translate,
-    getTranslations: getTranslations,
-};
+}
+export const i18n = new I18n();

package/lib/i18n/translation-loader.d.ts

@@ -1,8 +1,8 @@
-import { Locale, TranslationResult } from "./types.js";
+import { SupportedLocaleCode, GetTranslationsResult } from "./types.js";
 export declare class TranslationLoader {
     #private;
     constructor();
     reset(): Promise<void>;
-    getTranslations(locale?: Locale): Promise<TranslationResult>;
+    getTranslations(locale?: SupportedLocaleCode): Promise<GetTranslationsResult>;
 }
 //# sourceMappingURL=translation-loader.d.ts.map

package/lib/i18n/translation-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"translation-loader.d.ts","sourceRoot":"","sources":["../../../src/lib/i18n/translation-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAA8B,MAAM,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAWnF,qBAAa,iBAAiB;;;IA4Bb,KAAK;IAKL,eAAe,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAa5E"}
+{"version":3,"file":"translation-loader.d.ts","sourceRoot":"","sources":["../../../src/lib/i18n/translation-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAA+B,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAWrG,qBAAa,iBAAiB;;;IA4Bb,KAAK;IAKL,eAAe,CAAC,MAAM,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAa7F"}

package/lib/i18n/types.d.ts

@@ -1,10 +1,13 @@
-export type Locale = "en-US" | "zh-CN";
-export declare const NexusSupportLocales: Locale[];
-export declare interface TranslationResult {
-    locale: Locale;
-    translations: TranslationResourceContent | null;
+export declare const SUPPORTED_LOCALE_CODES: readonly ["zh-CN", "en-US"];
+export type SupportedLocaleCode = (typeof SUPPORTED_LOCALE_CODES)[number];
+export declare interface GetTranslationsResult {
+    locale: SupportedLocaleCode;
+    translations: TranslationsResourceContent | null;
 }
-export interface TranslationResourceContent {
-    [key: string]: string | TranslationResourceContent;
+export interface TranslationsResourceContent {
+    [key: string]: string | TranslationsResourceContent;
+}
+export interface Translator {
+    translate: (key: string, params?: Record<string, any>) => TranslationsResourceContent | string;
 }
 //# sourceMappingURL=types.d.ts.map

package/lib/i18n/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/i18n/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;AAEvC,eAAO,MAAM,mBAAmB,EAAE,MAAM,EAAuB,CAAC;AAEhE,MAAM,CAAC,OAAO,WAAW,iBAAiB;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,0BAA0B,GAAG,IAAI,CAAC;CACnD;AAED,MAAM,WAAW,0BAA0B;IACvC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,0BAA0B,CAAC;CACtD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/i18n/types.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,6BAA8B,CAAC;AAClE,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1E,MAAM,CAAC,OAAO,WAAW,qBAAqB;IAC1C,MAAM,EAAE,mBAAmB,CAAC;IAC5B,YAAY,EAAE,2BAA2B,GAAG,IAAI,CAAC;CACpD;AAED,MAAM,WAAW,2BAA2B;IACxC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,2BAA2B,CAAC;CACvD;AAED,MAAM,WAAW,UAAU;IACvB,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,2BAA2B,GAAG,MAAM,CAAC;CAClG"}

package/lib/i18n/types.js

@@ -1 +1 @@
-export const NexusSupportLocales = ["en-US", "zh-CN"];
+export const SUPPORTED_LOCALE_CODES = ["zh-CN", "en-US"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pc-nexus/core",
-  "version": "0.5.0-next.23",
+  "version": "0.5.0-next.25",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -29,7 +29,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@pc-nexus/internal": "0.5.0-next.23",
+    "@pc-nexus/internal": "0.5.0-next.25",
     "lodash": "^4.17.21"
   },
   "devDependencies": {},