@dune2/tools 0.4.15 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dune2/tools",
-  "version": "0.4.15",
+  "version": "0.5.1",
   "description": "",
   "keywords": [
     "i18n"

package/src/i18n/compile.ts

@@ -74,3 +74,23 @@ export function compileMessage(
     return message;
   }
 }
+
+/**
+ * 编译消息函数
+ * 使用建议：
+ * 1. 在 rsc 中直接使用，会减少 client 端的打包大小
+ * 2. 在 spa 中直接使用，会增加 client 端的打包大小
+ */
+export function compileMessages(msgs: Record<string, string>) {
+  // 创建一个空对象用于存储编译后的消息
+  const compiled: Record<string, any> = {};
+
+  // 遍历输入的消息对象的键
+  Object.keys(msgs).forEach((k) => {
+    // 将编译后的消息存入 compiled 对象
+    compiled[k] = compileMessage(msgs[k] || k);
+  });
+
+  // 返回编译后的消息对象
+  return compiled;
+}

package/src/i18n/duneI18n.ts

@@ -6,7 +6,7 @@ import {
   fromUrl,
 } from "@lingui/detect-locale";
 import type { EventEmitter } from "./EventEmitterType";
-import { compileMessage } from "./compile";
+
 import { LocalesEnum } from "./enums";
 import type { Config } from "./shared";
 
@@ -163,8 +163,10 @@ export class DuneI18n {
 
   //#region 注册语言包，并不一定会加载
   private messageLoader: Record<string, MsgLoader> = {};
-  // 后续需要暴露给 浏览器插件读取，方便做反查翻译
-  messageLoadResult: Record<string, BaseMsg> = {};
+  get messageLoadResult() {
+    //@ts-expect-error 内部属性
+    return this.baseI18n._messages;
+  }
   register(locale: LocalesEnum, message: MsgLoader) {
     this.messageLoader[locale] = message;
     this.log("register ", locale, message);
@@ -174,14 +176,8 @@ export class DuneI18n {
    * 外部可以直接调用，加载语言包
    * 这是一个同步方法
    */
-  loadMessage(locale: string, message: BaseMsg[] | BaseMsg) {
-    const messages = Array.isArray(message) ? message : [message];
-    const { compiled, raw } = this.compileMessage(messages);
-    this.messageLoadResult[locale] = Object.assign(
-      this.messageLoadResult[locale] || {},
-      raw,
-    );
-    this.baseI18n.load(locale, compiled);
+  loadMessage(locale: string, message: BaseMsg) {
+    this.baseI18n.load(locale, message);
   }
 
   // 这里不能变成 async 方法，因为在 ssg 时，需要同步加载语言包
@@ -192,69 +188,25 @@ export class DuneI18n {
     if (!loader) {
       return;
     }
-    // case: i18n.register(LocalesEnum.zh, [{},{}]);
+    // case: i18n.register(LocalesEnum.zh, {});
     if (typeof loader === "object") {
       this.loadMessage(locale, loader);
       return;
     }
-
-    const p = (() => {
-      try {
-        return loader();
-      } catch (e) {
-        console.error(`load ${locale} translate failed`);
-        console.error(e);
-        return [];
-      }
-    })();
-    if (!isAsyncMsg(p)) {
-      // case: i18n.register(LocalesEnum.zh, () => [{},{}]);
-      return this.tryLoadMessage(locale, p);
-    }
-    // case: i18n.register(LocalesEnum.zh, () => [Promise.resolve({})]);
-    // case: i18n.register(LocalesEnum.zh, () => [import('./i18n.json')]);
-    return Promise.allSettled(p).then((res) => {
-      const loadSuccess = res.reduce((acc, v) => {
-        if (v.status === "rejected") {
-          console.error(`load ${locale} translate failed: `, v.reason);
-          return acc;
-        }
-        return [...acc, v.value];
-      }, [] as BaseMsg[]);
-      return this.tryLoadMessage(locale, loadSuccess);
+    // case: i18n.register(LocalesEnum.zh, () => import("./zh.json"));
+    return loader().then((res) => {
+      this.tryLoadMessage(locale, res);
     });
   }
 
-  /**
-   * 将多个语言包合并成一个
-   */
-  private compileMessage(messages: BaseMsg[]) {
-    const compiled: BaseMsg = {};
-    const raw: BaseMsg = {};
-    messages.forEach((msg) => {
-      Object.keys(msg).forEach((k) => {
-        const v = msg[k];
-        raw[k] = v;
-        if (typeof v === "string") {
-          compiled[k] = compileMessage(v || k);
-        }
-      });
-    });
-    return { compiled, raw };
-  }
   //#endregion
 }
 
 export type BaseMsg = Record<string, any>;
 
-export type MsgLoader = BaseMsg[] | (() => Promise<BaseMsg>[] | BaseMsg[]);
-
-const isAsyncMsg = (
-  p: Promise<BaseMsg>[] | BaseMsg[],
-): p is Promise<BaseMsg>[] => {
-  let first = Array.isArray(p) ? p[0] : p;
-  return typeof first?.then === "function";
-};
+export type MsgLoader =
+  | Record<string, unknown>
+  | (() => Promise<Record<string, unknown>>);
 
 export const i18n = new DuneI18n();
 

package/src/i18n/enums.ts

@@ -19,4 +19,6 @@ export enum LocalesEnum {
   ja = "ja",
   // 土耳其 Turkish
   tr = "tr",
+  // 韩国 Korean
+  ko = "ko",
 }

package/src/i18n/index.ts

@@ -6,7 +6,6 @@ export type { I18nContext, I18nProviderProps } from "@lingui/react";
 export { I18nProvider } from "./I18nProvider";
 export { i18n } from "./duneI18n";
 export { LocalesEnum } from "./enums";
-export { loadPlatformLocaleResource } from "./loadPlatformLocaleResource";
 export { msg } from "./msg";
 export { t } from "./t";
 export { useLocale } from "./useLocale";

package/src/i18n/loadPlatformLocaleResource.ts

@@ -1,72 +0,0 @@
-import { i18n } from "./duneI18n";
-
-type Data = Record<string, Record<string, string>>;
-
-let cache = {
-  time: 0,
-  data: {} as Data,
-  dataPromise: null as Promise<Data | void> | null,
-};
-
-async function initFetch(opts: Opts): Promise<Data | void> {
-  const urlObj = new URL(opts.url);
-  urlObj.searchParams.set("projectName", opts.projectName);
-  try {
-    const res = await fetch(urlObj.toString()).then((res) => res.json());
-    if (res.code !== 200) {
-      console.error(`load translate failed: `, res);
-      return;
-    }
-    return res.data;
-  } catch (e) {
-    console.error(`load translate error: `, e);
-    return;
-  }
-}
-
-interface Opts {
-  /**
-   * 语言
-   */
-  locale: string;
-  /**
-   * 项目名称
-   */
-  projectName: string;
-  /**
-   * 翻译平台地址接口地址
-   */
-  url: string;
-  /**
-   * 缓存时间 5s
-   * @default 5 * 1000
-   */
-  cacheTime?: number;
-}
-
-/**
- * 从翻译平台加载翻译资源
- */
-export async function loadPlatformLocaleResource(opts: Opts) {
-  const locale = opts.locale;
-  const now = Date.now();
-  const cacheTime = opts.cacheTime || 5 * 1000;
-
-  // 有缓存且未过期
-  if (cache.data[locale] && now - cache.time < cacheTime) {
-    i18n.loadMessage(locale, cache.data[locale]);
-    return;
-  }
-
-  if (!cache.dataPromise) {
-    cache.dataPromise = initFetch(opts);
-  }
-  const data = await cache.dataPromise;
-  // 用完后需要清空，否则会一直缓存
-  cache.dataPromise = null;
-  if (data) {
-    cache.data = data;
-    cache.time = Date.now();
-    i18n.loadMessage(locale, data[locale]);
-  }
-}