@dune2/tools 0.7.3 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dune2/tools",
-  "version": "0.7.3",
+  "version": "1.0.1",
   "description": "",
   "keywords": [
     "i18n"
@@ -14,14 +14,12 @@
   "author": "",
   "exports": {
     "./factory/*": "./src/factory/*.tsx",
-    "./i18n": {
-      "react-server": "./src/i18n/index.react-server.tsx",
-      "import": "./src/i18n/index.ts",
-      "require": "./src/i18n/index.ts"
-    },
-    "./i18n/*": "./src/i18n/*",
     "./numbro": "./src/numbro/index.ts",
-    "./rq": "./src/rq/index.ts",
+    "./rq": {
+      "react-server": "./src/rq/index.react-server.ts",
+      "import": "./src/rq/index.ts",
+      "require": "./src/rq/index.ts"
+    },
     "./rq/*": "./src/rq/*.ts",
     "./shared": "./src/shared/index.ts",
     "./shared/*": "./src/shared/*.ts",
@@ -29,21 +27,16 @@
     "./storage/*": "./src/storage/*.ts",
     "./logger": "./src/logger/index.ts",
     "./logger/*": "./src/logger/*.ts",
-    "./valtio": "./src/valtio/index.ts",
-    "./valtio/*": "./src/valtio/*.ts",
     "./niceModal": "./src/niceModal/index.tsx",
     "./store": "./src/store/index.ts",
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    ".": "./src/index.ts"
   },
   "files": [
     "src"
   ],
   "dependencies": {
     "@ebay/nice-modal-react": "^1.2.13",
-    "@lingui/core": "^4.7.1",
-    "@lingui/detect-locale": "^4.7.1",
-    "@lingui/react": "^4.7.1",
-    "@messageformat/parser": "^5.1.0",
     "bignumber.js": "^9.1.2",
     "js-cookie": "^3.0.5",
     "lodash": "^4",
@@ -55,8 +48,7 @@
     "@types/lodash": "^4.17.0",
     "axios": "^1.6.8",
     "react": "^19",
-    "valtio": "^2",
-    "zx": "^7.0.8"
+    "valtio": "^2"
   },
   "publishConfig": {
     "access": "public"

package/src/index.ts

@@ -0,0 +1,2 @@
+// 让 vite 能识别成 es-module
+export default {};

package/src/niceModal/createModal.tsx

@@ -12,7 +12,7 @@ export const createModal = <P extends object, Res = unknown>(
   NiceModal.register(modalId, customModal);
   return Object.assign(customModal, {
     async show(props?: P): Promise<Res> {
-      await niceModalStore.initModal(modalId);
+      await niceModalStore.actions.initModal(modalId);
       return NiceModal.show(modalId, props);
     },
     hide() {
@@ -25,7 +25,7 @@ export const createModal = <P extends object, Res = unknown>(
      * 获取当前弹框是否打开
      */
     getVisible() {
-      return !!niceModalStore.modals[modalId]?.visible;
+      return !!niceModalStore.getState().modals[modalId]?.visible;
     },
   });
 };

package/src/niceModal/index.tsx

@@ -25,7 +25,7 @@ export function NiceModalProvider(props: PropsWithChildren) {
   const { modals } = niceModalStore.useSnapshot();
 
   return (
-    <Provider dispatch={niceModalStore.dispatch} modals={modals}>
+    <Provider dispatch={niceModalStore.actions.dispatch} modals={modals}>
       {props.children}
     </Provider>
   );

package/src/niceModal/niceModalStore.tsx

@@ -3,36 +3,38 @@ import {
   type NiceModalAction,
   type NiceModalStore,
 } from "@ebay/nice-modal-react";
-import { proxy } from "../valtio";
+import { createStore } from "../store";
 
-export const niceModalStore = proxy(
-  {
+export const niceModalStore = createStore({
+  name: "niceModalStore",
+  state: {
     modals: {} as NiceModalStore,
-    dispatch(action: NiceModalAction) {
-      niceModalStore.modals = reducer(niceModalStore.modals, action);
-    },
-    /**
-     * 为了让 modal 第一次打开的时候过渡动画存在
-     * 目前主要是兼容 mantine ui，它们使用的是 css 动画
-     * 要确保 dom 存在
-     */
-    async initModal(id: string) {
-      if (niceModalStore.modals[id]) {
-        return;
-      }
-      niceModalStore.modals = {
-        ...niceModalStore.modals,
-        [id]: {
-          id,
-          visible: false,
-          delayVisible: false,
-        },
-      };
-      // 确保下一帧调用，让 过渡动画有效果
-      return Promise.resolve();
-    },
   },
-  {
-    name: "niceModalStore",
+  actionsCreator: (state) => {
+    return {
+      dispatch(action: NiceModalAction) {
+        state.modals = reducer(state.modals, action);
+      },
+      /**
+       * 为了让 modal 第一次打开的时候过渡动画存在
+       * 目前主要是兼容 mantine ui，它们使用的是 css 动画
+       * 要确保 dom 存在
+       */
+      async initModal(id: string) {
+        if (state.modals[id]) {
+          return;
+        }
+        state.modals = {
+          ...state.modals,
+          [id]: {
+            id,
+            visible: false,
+            delayVisible: false,
+          },
+        };
+        // 确保下一帧调用，让 过渡动画有效果
+        return Promise.resolve();
+      },
+    };
   },
-);
+});

package/src/numbro/index.ts

@@ -194,7 +194,6 @@ export class Numbro {
     };
     let {
       position = "prefix",
-      currencySymbol,
       symbol,
       spaceSeparated,
 
@@ -203,10 +202,6 @@ export class Numbro {
     // 是否强制显示正负号
     const sign = this.getPrefixSign(rest.forceSign);
 
-    // TODO: 兼容之前的逻辑 后面会移除
-    if (typeof currencySymbol !== "undefined") {
-      symbol = currencySymbol;
-    }
     let space = spaceSeparated ? " " : "";
     // 在 currency format 中，需要使用绝对值来格式化
     // 方便后续添加 正负号
@@ -278,10 +273,13 @@ export class Numbro {
     }
 
     if (shouldDeleteEndZero) {
-      // 移除尾数 0
-      // outputFormat = outputFormat.replace(/\.?0+$/, "");
-      const reg = new RegExp(`\\.?0+${suffix}$`);
-      outputFormat = outputFormat.replace(reg, suffix);
+      const isDecimal = outputFormat.includes(".");
+      if (isDecimal) {
+        // 移除尾数 0
+        // outputFormat = outputFormat.replace(/\.?0+$/, "");
+        const reg = new RegExp(`\\.?0+${suffix}$`);
+        outputFormat = outputFormat.replace(reg, suffix);
+      }
     }
     return outputFormat;
   }

package/src/numbro/shared.ts

@@ -74,11 +74,6 @@ export interface Format extends BigNumber.Format {
 }
 
 export interface CurrencyFormat extends Format {
-  /**
-   * 货币符号
-   * @deprecated 请使用 symbol
-   */
-  currencySymbol?: string;
   /**
    * 货币符号
    */

package/src/rq/RequestBuilder.react-server.ts

@@ -0,0 +1,157 @@
+import type { QueryClient } from "@tanstack/react-query";
+
+import { queryClient } from "./defaultQueryClient";
+import type { Basic, RequestBuilderOptions, RequestConfig } from "./options";
+
+export class RequestBuilder<Req = any, Res = any> {
+  constructor(public options: RequestBuilderOptions<Req, Res>) {
+    this.defaultQueryFn = this.defaultQueryFn.bind(this);
+    this.request = this.request.bind(this);
+    this.requestWithConfig = this.requestWithConfig.bind(this);
+    this.options.method ??= "get";
+  }
+
+  //#region default requestFn
+  static requestFn: Basic["requestFn"] | null = null;
+  static setRequestFn(requestFn: Basic["requestFn"] | null) {
+    RequestBuilder.requestFn = requestFn;
+  }
+  //#endregion
+
+  // 这是默认的 Query Client 实例
+  static queryClient: QueryClient | null = queryClient;
+  static setQueryClient(queryClient: QueryClient | null) {
+    RequestBuilder.queryClient = queryClient;
+  }
+
+  /**
+   * 确保 queryClient 的存在
+   * 会依次从以下地方获取
+   * - options
+   * - 当前实例 options
+   * - RequestBuilder.queryClient
+   */
+  ensureQueryClient(options?: { queryClient?: QueryClient }) {
+    const queryClient =
+      options?.queryClient ??
+      this.options.queryClient ??
+      RequestBuilder.queryClient;
+    if (!queryClient) {
+      throw new Error("queryClient is not defined");
+    }
+    return queryClient;
+  }
+
+  /**
+   * 包装好的请求函数
+   * useQuery、useMutation 内部会调用这个
+   * 另外也可以直接调用这个函数来发送请求
+   * @param params 请求参数 默认会根据请求方法来放到 url 上或者 body 里
+   * @param config axios 的配置，一般不需要传，内部用
+   */
+  request<P extends Req, T = Res>(params?: P, config?: RequestConfig) {
+    const method = this.options.method!;
+    let data;
+    // 根据请求方法来放到 url 上或者 body 里
+    if (!["get", "head", "options"].includes(method)) {
+      data = params;
+      params = undefined;
+    }
+    return this.requestWithConfig<T>({
+      meta: this.options.meta,
+      ...config,
+      data,
+      params,
+    });
+  }
+
+  /**
+   * 常规情况下使用 request 方法就可以了
+   * 特殊情况，如：url 上有 query 参数，又需要传 body 参数
+   */
+  requestWithConfig<T = Res>(config: RequestConfig) {
+    const method = this.options.method!;
+    let { url } = this.options;
+    // 优先使用传入的 requestFn
+    // 其次使用实例化时候的 requestFn
+    let requestFn =
+      config.requestFn ?? this.options.requestFn ?? RequestBuilder.requestFn;
+    if (!requestFn) {
+      throw new Error("request function is not defined");
+    }
+    this.options.urlPathParams?.forEach((param) => {
+      let t = "";
+      //#region config.params || config.data 在 queryHash 之后不变的话，会保持同一个引用，这里需要做个浅拷贝，将引用打破
+      if (config.params?.[param]) {
+        config.params = { ...config.params };
+        t = config.params[param];
+        delete config.params[param];
+      } else if (config.data?.[param]) {
+        config.data = { ...config.data };
+        t = config.data[param];
+        delete config.data[param];
+      }
+      //#endregion
+      url = url.replace(`{${param}}`, t);
+    });
+    return requestFn<T>({
+      url,
+      method,
+      ...config,
+    });
+  }
+
+  //#region query
+
+  /**
+   * 获取 queryKey
+   * 通常配置 react-query 的 queryKey
+   */
+  getQueryKey(params?: Req) {
+    if (typeof params === "undefined") {
+      return [this.options.url, this.options.method];
+    }
+    return [this.options.url, this.options.method!, params] as const;
+  }
+  defaultQueryFn = throwErrorInRSC;
+
+  /**
+   * 对 useQuery 的封装
+   * 获取数据的时候可以直接调用这个
+   * @see https://tanstack.com/query/v4/docs/guides/queries
+   */
+  useQuery = throwErrorInRSC;
+
+  /**
+   * 用来预请求接口
+   * @see https://tanstack.com/query/v4/docs/guides/prefetching
+   */
+  prefetchQuery = throwErrorInRSC;
+
+  /**
+   * 用来请求接口
+   * @see https://tanstack.com/query/v4/docs/react/reference/QueryClient#queryclientfetchquery
+   */
+  fetchQuery = throwErrorInRSC;
+  invalidateQuery = throwErrorInRSC;
+  refetchQueries = throwErrorInRSC;
+
+  /**
+   * https://tanstack.com/query/v5/docs/react/reference/QueryClient#queryclientgetquerydata
+   */
+  getQueryData = throwErrorInRSC;
+
+  /**
+   * https://tanstack.com/query/v5/docs/react/reference/QueryClient#queryclientsetquerydata
+   */
+  setQueryData = throwErrorInRSC;
+  ensureQueryData = throwErrorInRSC;
+  useInfiniteQuery = throwErrorInRSC;
+
+  getMutationFn = throwErrorInRSC;
+  useMutation = throwErrorInRSC;
+}
+
+const throwErrorInRSC = () => {
+  throw new Error("This method is not supported in RSC");
+};

package/src/rq/createApi.ts

@@ -29,7 +29,7 @@ export function createApi<Req, Res>(opts: Options<Req, Res>) {
   const { requestFn, ...rest } = opts;
   const api = new RequestBuilder<Req, Res>({
     url: opts.queryKey,
-    // 给定 get 则 在 requestFn 中可以通过 params 获取到参数，否则是 data 字段。这是 axios 的规则
+    // 给定 get 则 在 requestFn 中可以通过 params 获取到参数，否则是 data 字段。这是为了对齐 axios 的规则
     method: "get",
     requestFn: (config) => {
       return requestFn(config.params) as never;

package/src/rq/index.react-server.ts

@@ -0,0 +1 @@
+export * from "./RequestBuilder.react-server";

package/src/shared/Overwrite.ts

@@ -0,0 +1 @@
+export type Overwrite<T, U> = Omit<T, keyof U> & U;

package/src/storage/index.ts

@@ -103,11 +103,14 @@ class StorageHelper<V = any> {
   useValue() {
     return useSyncExternalStore(
       this.subscribe,
-      this.useSyncExternalStoreGetSnapshot,
-      this.useSyncExternalStoreGetSnapshot,
+      this.getSnapshot,
+      this.getServerSnapshot,
     );
   }
-  private useSyncExternalStoreGetSnapshot = this.get.bind(this);
+  private getSnapshot = this.get.bind(this);
+  private getServerSnapshot = () => {
+    return this.defaultValue;
+  };
 }
 
 /**

package/src/i18n/EventEmitterType.ts

@@ -1,26 +0,0 @@
-/**
- * 这个文件重新定义 lingui 的 EventEmitter 类型
- * 为了 添加更多的事件
- */
-
-export interface EventEmitter {
-  on<E extends keyof Events>(event: E, listener: Events[E]): () => void;
-  removeListener<E extends keyof Events>(event: E, listener: Events[E]): void;
-  emit<E extends keyof Events>(event: E, ...args: Parameters<Events[E]>): void;
-}
-
-interface Events {
-  change: () => void;
-  missing: (event: MissingMessageEvent) => void;
-  /**
-   * 与 change 事件不同的是：
-   * change 事件 不管是语言切换，还是语言包更新，都会触发
-   * 而 localeChange 只有语言切换时才会触发
-   */
-  localeChange: (locale: string) => void;
-}
-
-type MissingMessageEvent = {
-  locale: string;
-  id: string;
-};

package/src/i18n/I18nProvider.tsx

@@ -1,27 +0,0 @@
-import { I18nProvider as I18nProviderRaw } from "@lingui/react";
-import type { PropsWithChildren } from "react";
-import { useEffect } from "react";
-import { i18n } from "./duneI18n";
-
-interface I18nProviderPropsCustom {
-  enableDetectLocale?: boolean;
-}
-
-/**
- * 这里封装好了 传递给 Lingui 的 i18n 实例
- * 以及在组件挂载时自动开启语言检测
- */
-export const I18nProvider = (
-  props: PropsWithChildren<I18nProviderPropsCustom>,
-) => {
-  const { enableDetectLocale = true } = props;
-  useEffect(() => {
-    if (enableDetectLocale) {
-      i18n.activate(i18n.detectLocale());
-    }
-  }, [enableDetectLocale]);
-
-  return (
-    <I18nProviderRaw i18n={i18n.baseI18n}>{props.children}</I18nProviderRaw>
-  );
-};

package/src/i18n/compile.ts

@@ -1,96 +0,0 @@
-import type { Content, Token } from "@messageformat/parser";
-import { parse } from "@messageformat/parser";
-
-export type CompiledIcuChoices = Record<string, CompiledMessage> & {
-  offset: number | undefined;
-};
-
-export type CompiledMessageToken =
-  | string
-  | [name: string, type?: string, format?: null | string | CompiledIcuChoices];
-
-export type CompiledMessage = string | CompiledMessageToken[];
-
-type MapTextFn = (value: string) => string;
-
-function processTokens(tokens: Token[], mapText: MapTextFn): CompiledMessage {
-  if (!tokens.filter((token) => token.type !== "content").length) {
-    return tokens.map((token) => mapText((token as Content).value)).join("");
-  }
-
-  return tokens.map<CompiledMessageToken>((token) => {
-    if (token.type === "content") {
-      return mapText(token.value);
-
-      // # in plural case
-    } else if (token.type === "octothorpe") {
-      return "#";
-
-      // simple argument
-    } else if (token.type === "argument") {
-      return [token.arg];
-
-      // argument with custom format (date, number)
-    } else if (token.type === "function") {
-      const _param = token?.param?.[0] as Content;
-
-      if (_param) {
-        return [token.arg, token.key, _param.value.trim()];
-      } else {
-        return [token.arg, token.key];
-      }
-    }
-
-    const offset = token.pluralOffset;
-
-    // complex argument with cases
-    const formatProps: Record<string, CompiledMessage> = {};
-    token.cases.forEach((item) => {
-      formatProps[item.key.replace(/^=(.)+/, "$1")] = processTokens(
-        item.tokens,
-        mapText,
-      );
-    });
-
-    return [
-      token.arg,
-      token.type,
-      {
-        offset,
-        ...formatProps,
-      } as CompiledIcuChoices,
-    ];
-  });
-}
-
-export function compileMessage(
-  message: string,
-  mapText: MapTextFn = (v) => v,
-): CompiledMessage {
-  try {
-    return processTokens(parse(message), mapText);
-  } catch (e) {
-    console.error(`${(e as Error).message} \n\nMessage: ${message}`);
-    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

@@ -1,222 +0,0 @@
-import { setupI18n } from "@lingui/core";
-import {
-  fromNavigator as fromNavigatorBase,
-  fromPath,
-  fromStorage,
-  fromUrl,
-} from "@lingui/detect-locale";
-import type { EventEmitter } from "./EventEmitterType";
-
-import { LocalesEnum } from "./enums";
-import type { Config } from "./shared";
-
-const isServer = typeof window === "undefined";
-
-const defaultConfig: Config = {
-  defaultLocale: LocalesEnum.en,
-  detectFromPath: false,
-  storageKey: "dune-lang",
-  queryKey: "lang",
-  supportedLocales: [],
-  debug: false,
-  navigatorMapper: [
-    ["zh-", LocalesEnum.zh],
-    ["id-", LocalesEnum.id],
-    ["en-", LocalesEnum.en],
-    ["lt-", LocalesEnum.lt],
-    ["ru-", LocalesEnum.ru],
-    ["ja-", LocalesEnum.ja],
-    ["tr-", LocalesEnum.tr],
-  ],
-};
-
-// 这个 i18n 是对 lingui/core 的封装
-export class DuneI18n {
-  baseI18n = setupI18n();
-
-  initT() {
-    return this.baseI18n.t.bind(this.baseI18n);
-  }
-  t = this.initT();
-  on = this.baseI18n.on.bind(this.baseI18n) as EventEmitter["on"];
-  emit = this.baseI18n.emit.bind(this.baseI18n) as EventEmitter["emit"];
-
-  get locale() {
-    return this.baseI18n.locale;
-  }
-
-  log(...args: any[]) {
-    if (this.config.debug) {
-      console.log(`[dune-i18n]: `, ...args);
-    }
-  }
-
-  //#region 一些配置
-  private config: Config = defaultConfig;
-  updateConfig(config: Partial<Config>) {
-    this.log("updateConfig ", config);
-    this.config = { ...this.config, ...config };
-    this.log("updateConfig result ", this.config);
-  }
-  // 主要给测试用例使用
-  resetConfig() {
-    this.config = defaultConfig;
-    this.log("reset to defaultConfig ", this.config);
-  }
-  //#endregion
-
-  //#region 支持的语言
-  // 用户可以额外设置，同时也会从已加载的语言包中获取
-  getSupportedLocales() {
-    const loadedLocales = Object.keys(this.messageLoader);
-    const r = this.config.supportedLocales.concat(loadedLocales);
-    this.log("getSupportedLocales ", r);
-    return r;
-  }
-  isSupportedLocale(locale: string) {
-    const r = this.getSupportedLocales().includes(locale);
-    this.log("isSupportedLocale ", locale, r);
-    return r;
-  }
-  //#endregion
-
-  //#region 推导语言
-  detectLocale() {
-    const { detectFromPath, storageKey, queryKey } = this.config;
-    // 判断 传过来的语言 是否可用
-    let defaultLocale = this.config.defaultLocale;
-
-    if (!isServer) {
-      const fromNavigator = () => {
-        const browserLocale = fromNavigatorBase();
-        const mappers = this.config.navigatorMapper;
-        for (let i = 0; i < mappers.length; i++) {
-          const [prefix, locale] = mappers[i];
-          if (browserLocale.startsWith(prefix)) {
-            return locale;
-          }
-        }
-      };
-
-      // fix: Failed to read the 'localStorage' property from 'Window': Access is denied for this document.
-      const safeFromStorage = () => {
-        try {
-          return fromStorage(storageKey);
-        } catch (e) {
-          console.error("fromStorage error", e);
-          return;
-        }
-      };
-      let arr = [
-        detectFromPath && fromPath(0, location),
-        fromUrl(queryKey),
-        safeFromStorage(),
-        fromNavigator(),
-      ];
-      for (let i = 0; i < arr.length; i++) {
-        const locale = arr[i];
-        if (locale && this.isSupportedLocale(locale)) {
-          defaultLocale = locale as LocalesEnum;
-          break;
-        }
-      }
-    }
-    this.log("detectLocale ", defaultLocale);
-    return defaultLocale;
-  }
-  //#endregion
-  activate = async (
-    locale:
-      | string
-      | {
-          /**
-           * 是否同步到 localStorage
-           * 在 ssg 第一次激活选中语言时，需要设置为 false，否则导致水合告警
-           * @default true
-           */
-          syncToStorage?: boolean;
-          locale: string;
-        },
-  ) => {
-    const opts = typeof locale !== "object" ? { locale } : locale;
-    this.log("activate ", opts);
-
-    const combinedLocale = opts.locale;
-    const syncToStorage = opts.syncToStorage ?? true;
-
-    // try load message
-    // 需要兼容 同步和异步加载的语言
-    // 原因是 同步的语言包不能再 下一个事件循环后再去激活语言
-    // 不然会导致 ssr 时 无法同步获取到语言
-    const loadPromise = this.tryLoadMessage(combinedLocale);
-    if (typeof loadPromise?.then === "function") {
-      await loadPromise;
-    }
-
-    this.baseI18n.activate(combinedLocale);
-    this.emit("localeChange", combinedLocale);
-    // 默认需要 同步到 localStorage
-    if (syncToStorage) {
-      //https://www.chromium.org/for-testers/bug-reporting-guidelines/uncaught-securityerror-failed-to-read-the-localstorage-property-from-window-access-is-denied-for-this-document/
-      //fix: Failed to read the 'localStorage' property from 'Window': Access is denied for this document.
-      try {
-        localStorage.setItem(this.config.storageKey, combinedLocale);
-      } catch (error) {
-        console.error("set localStorage error", error);
-      }
-    }
-  };
-
-  //#region 注册语言包，并不一定会加载
-  private messageLoader: Record<string, MsgLoader> = {};
-  get messageLoadResult() {
-    //@ts-expect-error 内部属性
-    return this.baseI18n._messages;
-  }
-  register(locale: LocalesEnum, message: MsgLoader) {
-    this.messageLoader[locale] = message;
-    this.log("register ", locale, message);
-  }
-
-  /**
-   * 外部可以直接调用，加载语言包
-   * 这是一个同步方法
-   */
-  loadMessage(locale: string, message: BaseMsg) {
-    this.baseI18n.load(locale, message);
-  }
-
-  // 这里不能变成 async 方法，因为在 ssg 时，需要同步加载语言包
-  private tryLoadMessage(
-    locale: string,
-    loader = this.messageLoader[locale],
-  ): Promise<void> | void {
-    if (!loader) {
-      return;
-    }
-    // case: i18n.register(LocalesEnum.zh, {});
-    if (typeof loader === "object") {
-      this.loadMessage(locale, loader);
-      return;
-    }
-    // case: i18n.register(LocalesEnum.zh, () => import("./zh.json"));
-    return loader().then((res) => {
-      this.tryLoadMessage(locale, res);
-    });
-  }
-
-  //#endregion
-}
-
-export type BaseMsg = Record<string, any>;
-
-export type MsgLoader =
-  | Record<string, unknown>
-  | (() => Promise<Record<string, unknown>>);
-
-export const i18n = new DuneI18n();
-
-if (typeof window !== "undefined") {
-  //@ts-ignore 暴露给浏览器插件使用
-  window["__d_i18n"] = i18n;
-}

package/src/i18n/index.react-server.tsx

@@ -1,38 +0,0 @@
-// this is rsc exports
-// will import in rsc by next.js automatically
-// see https://github.com/vercel/next.js/blob/944159a6d44b30194b45c5297be303dd20aee904/packages/next/webpack.config.js#L233
-
-import type { TransProps } from "@lingui/react";
-import { i18n } from "./duneI18n";
-
-import { TransNoContext } from "@lingui/react/server";
-import { t } from "./t";
-export * from "./enums";
-export { msg } from "./msg";
-export { i18n, t };
-
-/**
- * this use in rsc
- * @example
- * ```tsx
- * <Trans>Refresh inbox</Trans>;
- * <Trans>Attachment {name} saved.</Trans>;
- * <Trans>Attachment {props.name ?? defaultName} saved.</Trans>;
- * ```
- */
-export function Trans(props: TransProps) {
-  return (
-    <TransNoContext
-      {...props}
-      lingui={{
-        i18n: i18n.baseI18n,
-      }}
-    />
-  );
-}
-/**
- * this is use in rsc
- */
-export function useT() {
-  return t;
-}

package/src/i18n/index.ts

@@ -1,22 +0,0 @@
-"use client";
-import { Trans as TransRaw, type TransProps } from "@lingui/react";
-import { type FC } from "react";
-
-export type { I18nContext, I18nProviderProps } from "@lingui/react";
-export { I18nProvider } from "./I18nProvider";
-export { i18n } from "./duneI18n";
-export { LocalesEnum } from "./enums";
-export { msg } from "./msg";
-export { t } from "./t";
-export { useLocale } from "./useLocale";
-export { useT } from "./useT";
-
-/**
- * @example
- * ```tsx
- * <Trans>Refresh inbox</Trans>;
- * <Trans>Attachment {name} saved.</Trans>;
- * <Trans>Attachment {props.name ?? defaultName} saved.</Trans>;
- * ```
- */
-export const Trans = TransRaw as FC<Partial<TransProps>>;

package/src/i18n/msg.ts

@@ -1,45 +0,0 @@
-//#region msg fn
-import type { MessageDescriptor } from "@lingui/core";
-
-interface MsgFn {
-  (descriptor: MessageDescriptor): string;
-  (id: string): string;
-  (literals: TemplateStringsArray): string;
-}
-
-/**
- * @see https://lingui.dev/tutorials/react-patterns#lazy-translations
- * 标记需要提取的 i18n 字符串（用于提取翻译），主要给编译器用的
- * 一般用在以下场景：
- * 在组件外声明 options 需要翻译，组件外没有 t 函数
- * @example
- * ```jsx
- * const favoriteColors = [msg`Red`, msg`Orange`, msg`Yellow`, msg`Green`];
- * export default function ColorList() {
- *   const t = useT()
- *   return (
- *     <ul>
- *       {favoriteColors.map((color) => (
- *         <li>
- *           {t.ignoreExtract(color)}
- *         </li>
- *       ))}
- *     </ul>
- *   );
- * }
- * ```
- */
-export const msg: MsgFn = (...args: any[]) => {
-  if (process.env.NODE_ENV !== "development") {
-    if (args.length > 1) {
-      throw new Error("msg函数只能接受字符串常量");
-    }
-  }
-  let first = args[0];
-  if (first.raw) {
-    return first.raw[0];
-  }
-  return args[0];
-};
-
-//#endregion

package/src/i18n/readme.md

@@ -1,52 +0,0 @@
-## @dune2/i18n
-
-基于 [lingui](https://lingui.js.org/ref/macro.html) 包装的 i18n 工具。
-
-由于`next.js 12`默认使用 `swc`编译，所以`lingui`的`babel`插件有些过时，这里提供了一系列基于`swc`的工具来对齐`lingui`部分功能。
-
-- 支持`lingui`的`macro`插件中的`t`/`Trans`
-- 支持提取翻译
-
-### features
-
-**需要启用`@dune2/swc-plugin`来编译**
-
-- 提供`t`函数，用于翻译
-
-```js
-const name = "dune";
-
-// 启用 `@dune2/swc-plugin` 可以使用以下方式
-t`hello ${name}`; // hello dune
-// 编译成，也可以直接写成下面的代码
-t("hello {name}", { name }); // hello dune
-```
-
-- 提供`Trans`组件
-
-```jsx
-<Trans>Attachment {name} saved.</Trans>
-// 编译成
-<Trans id='Attachment {name} saved.' values={{name}}></Trans>
-```
-
-```jsx
-<Trans>Attachment {props.name ?? defaultName} saved.</Trans>;
-// 编译成
-<Trans
-  id="Attachment {0} saved."
-  values={{ 0: props.name ?? defaultName }}
-></Trans>;
-```
-
-```jsx
-<Trans>
-  Read the <a href="/docs">docs</a>.
-</Trans>;
-// 编译成
-<Trans id="Read the <0>docs</0>." components={{ 0: <a href="/docs" /> }} />;
-```
-
-### 配置`next.config.js`
-
-使用 `@dune2/next-plugin`来预设相关配置

package/src/i18n/shared.tsx

@@ -1,35 +0,0 @@
-import { LocalesEnum } from "./enums";
-
-export interface Config {
-  // 推导失败后的默认语言
-  defaultLocale: LocalesEnum;
-  /**
-   * 存储的 key
-   * @default dune-lang
-   */
-  storageKey: string;
-  /**
-   * 是否开启 debug 模式
-   */
-  debug: boolean;
-
-  /**
-   * url 参数
-   * @default lang
-   */
-  queryKey: string;
-
-  /**
-   * 是否从 url 中获取语言 默认为 false
-   * 在后管系统中，一般不需要
-   */
-  detectFromPath: boolean;
-
-  /**
-   * 用户可以额外设置，同时也会从已加载的语言包中获取
-   */
-  supportedLocales: string[];
-
-  // [ 浏览器语言 , dune 语言 ]
-  navigatorMapper: [string, string][];
-}

package/src/i18n/t.ts

@@ -1,69 +0,0 @@
-import { type MessageDescriptor, type MessageOptions } from "@lingui/core";
-import { i18n } from "./duneI18n";
-
-/**
- * Translates a template string using the global I18n instance
- * @example
- * ```
- * const message = t`Hello ${name}`;
- * ```
- */
-export let t = initT();
-interface TFunction {
-  (
-    id: string,
-    values?: Record<string, unknown>,
-    options?: MessageOptions,
-  ): string;
-  (descriptor: MessageDescriptor): string;
-  (literals: TemplateStringsArray, ...placeholders: any[]): string;
-
-  /**
-   * 使用这个方法将被 cli 不会提取出来翻译
-   * 一般用在 key 是后端返回的动态情况
-   * 但是这种情况下需要开发者手动将翻译填入翻译文件中
-   */
-  ignoreExtract: TFunction;
-
-  /**
-   * 翻译后端错误信息
-   *
-   * 传入错误码，会补齐 `error_` 前缀
-   * 传入对象，会使用对象的 code 字段去翻译，如果没有对应的文案，则使用 message 字段返回
-   */
-  displayError: (
-    arg:
-      | number
-      | string
-      | {
-          code?: string | number;
-          message?: string | number;
-          // 后端某些错误信息需要替换变量，这个字段用来传入变量
-          errorVars?: Record<string, string>;
-        },
-  ) => string;
-}
-
-function initT() {
-  let t = i18n.initT() as unknown as TFunction;
-  t.ignoreExtract = t;
-  t.displayError = (arg) => {
-    let normalizedArg = typeof arg === "object" ? arg : { code: arg };
-    // 修复外部可能 传入 undefined 或 null 的情况
-    if (!normalizedArg || !normalizedArg.code) {
-      return "";
-    }
-    let key = `error_${normalizedArg.code}`;
-    const translated = t(key, normalizedArg.errorVars);
-    // 如果没有对应的文案，则使用 message 字段返回
-    if (translated === key && !!normalizedArg.message) {
-      return normalizedArg.message + "";
-    }
-    return translated;
-  };
-  return t;
-}
-// 修复 更换语言的时候 t 没有重新生成，导致某些写在 useMemo 的 t 调用没有更新语言
-i18n.on("change", () => {
-  t = initT();
-});

package/src/i18n/useLocale.ts

@@ -1,19 +0,0 @@
-import { useLingui } from "@lingui/react";
-import { i18n as globalI18n } from "./duneI18n";
-import { LocalesEnum } from "./enums";
-
-/**
- * 获取当前的 语言 相关信息
- */
-export function useLocale() {
-  const { i18n } = useLingui();
-
-  return {
-    locale: i18n.locale,
-    isZH: i18n.locale === LocalesEnum.zh,
-    isID: i18n.locale === LocalesEnum.id,
-    isEn: i18n.locale === LocalesEnum.en,
-    isLt: i18n.locale === LocalesEnum.lt,
-    activate: globalI18n.activate,
-  };
-}

package/src/i18n/useT.ts

@@ -1,10 +0,0 @@
-import { useLingui } from "@lingui/react";
-import { t } from "./t";
-
-/**
- * 这个hook主要是为了解决在`jsx`使用`t`方法的时候，语言切换了并没有重新渲染的问题
- */
-export function useT() {
-  useLingui();
-  return t;
-}

package/src/valtio/index.ts

@@ -1,54 +0,0 @@
-import { snapshot, useSnapshot, proxy as valtioProxy } from "valtio";
-
-import { devtools } from "valtio/utils";
-import type { EnhancedStore } from "./shared";
-
-export { snapshot, subscribe } from "valtio";
-export { proxyMap, proxySet, subscribeKey, watch } from "valtio/utils";
-export { withAutoSet } from "./withAutoSet";
-
-const stores: any = {};
-
-if (typeof window !== "undefined") {
-  Object.defineProperty(window, "__stores", {
-    get() {
-      const r = snapshot(valtioProxy(stores));
-      return { ...r, __raw: stores };
-    },
-  });
-}
-
-/**
- * @deprecated use createStore instead
- */
-export function proxy<T extends object>(
-  initialObject: T,
-  opts: Options,
-): EnhancedStore<T> {
-  const store = valtioProxy(initialObject) as EnhancedStore<T>;
-
-  if (typeof window !== "undefined" && opts.devtools === true) {
-    devtools(store, {
-      name: opts.name,
-      enabled: opts.devtools,
-    });
-  }
-  stores[opts.name] = store;
-
-  store.useSnapshot = function useStoreSnapshot(options) {
-    return useSnapshot(options?.faker ? emptyStore : store, options) as T;
-  };
-
-  return store;
-}
-
-interface Options {
-  name: string;
-  /**
-   * false to disable devtools
-   * in development mode devtools are enabled by default
-   */
-  devtools?: boolean;
-}
-
-const emptyStore = valtioProxy({});

package/src/valtio/shared.ts

@@ -1,12 +0,0 @@
-export type EnhancedStore<T extends object> = T & {
-  useSnapshot(options?: {
-    sync?: boolean;
-    /**
-     * 性能优化，某些 store 变化很频繁
-     * 但是其中的值可能在 部分场景才用到
-     * 通过设置 faker 为 true，可以避免不必要的渲染
-     * faker = true , 时候将返回一个不变的 store，这是假的 store
-     */
-    faker?: boolean;
-  }): T;
-};

package/src/valtio/withAutoSet.ts

@@ -1,60 +0,0 @@
-import _ from "lodash";
-
-//# region 增强 set 方法
-type EnhancedWithSet<T extends object> = T & {
-  [k in NotFunctionKeys<T> as SetFnName<k> extends keyof T
-    ? never
-    : SetFnName<k>]: (v: T[k]) => void;
-};
-type SetFnName<T> = T extends string ? `set${Capitalize<T>}` : never;
-type NotFunctionKeys<T extends object> = keyof {
-  [k in keyof T as T[k] extends Function ? never : k]: T[k];
-};
-//# endregion
-
-/**
- * 为传进来的 store 增加相关属性的 set 方法
- * eg:
- *   const store = { a: 1, b: 2 };
- *   const enhancedStore = addSetMethod(store);
- * output:
- *   enhancedStore = { a: 1, b: 2, setA: (v) => { enhancedStore.a = v; }, setB: (v) => { enhancedStore.b = v; } };
- */
-export function withAutoSet<T extends object>(store: T) {
-  type Result = T & EnhancedWithSet<T>;
-
-  const enhancedStore = store as Result;
-
-  _.forEach(enhancedStore, (value, key) => {
-    if (typeof value === "function") {
-      return;
-    }
-    const setFnName = `set${_.upperFirst(key)}` as keyof Result;
-
-    if (_.has(store, setFnName)) {
-      return;
-    }
-    // @ts-expect-error need to be fixed
-    enhancedStore[setFnName] = (v) => {
-      // @ts-expect-error need to be fixed
-      enhancedStore[key] = v;
-    };
-  });
-
-  return enhancedStore;
-}
-
-//type AA33 = NotFunctionKeys<A>;
-//type A = { a: string; b: number; setA: () => void };
-//type AA2 = Omit<A, SetFnName<keyof A>>;
-//type AA3 = {
-//  [k in keyof AA2 as SetFnName<k> extends keyof A ? never : SetFnName<k>]: (
-//    v: AA2[k],
-//  ) => void;
-//} & A;
-//type StringKeys<T> = Extract<keyof T, string>;
-//type Debug<T> = {
-//  [k in keyof T]: T[k];
-//};
-//type A22 = Debug<AA3>;
-//type A222 = Debug<EnhancedWithSet<A>>;