@dune2/tools 1.0.5 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dune2/tools",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "",
   "keywords": [
     "i18n"
@@ -33,17 +33,16 @@
     "src"
   ],
   "dependencies": {
+    "@tanstack/react-query": "^5",
     "bignumber.js": "^9.1.2",
     "es-toolkit": "^1",
     "js-cookie": "^3.0.5",
-    "store2": "^2.14.3"
+    "store2": "^2.14.3",
+    "valtio": "^2"
   },
   "devDependencies": {
-    "@tanstack/react-query": "5.51.11",
     "@types/js-cookie": "3.0.3",
-    "axios": "^1.6.8",
-    "react": "^19",
-    "valtio": "^2"
+    "react": "^19"
   },
   "publishConfig": {
     "access": "public"

package/src/numbro/index.ts

@@ -1,7 +1,5 @@
 import BigNumber from "bignumber.js";
-import { LocalesEnum } from "../i18n/enums";
-import { defaultCurrencies } from "./currencies";
-import type { CurrencyFormat, Format } from "./shared";
+import type { Format } from "./shared";
 import { RoundingMode } from "./shared";
 
 export * from "./shared";
@@ -161,68 +159,6 @@ export class Numbro {
   }
   //#endregion
 
-  //#region  currency format
-  /**
-   * currency format default
-   */
-  static locale: string = LocalesEnum.id;
-  static setLocale(locale: string) {
-    // check locale is valid
-    if (!(locale in Numbro.defaultCurrencies)) {
-      throw new Error(`在 defaultCurrencies 中，找不到 ${locale}，请先检查`);
-    }
-    Numbro.locale = locale;
-  }
-
-  /**
-   * 默认的货币格式化配置
-   * key: locale
-   * value: currency format
-   */
-  static defaultCurrencies = defaultCurrencies;
-  static setDefaultCurrencies(currencies: typeof defaultCurrencies) {
-    Numbro.defaultCurrencies = currencies;
-  }
-  formatCurrency(format: CurrencyFormat = {}) {
-    // 根据语言解析出来的默认格式
-    const defaultCurrencyFormat =
-      Numbro.defaultCurrencies[format.locale ?? Numbro.locale];
-
-    format = {
-      ...defaultCurrencyFormat,
-      ...format,
-    };
-    let {
-      position = "prefix",
-      symbol,
-      spaceSeparated,
-
-      ...rest
-    } = format;
-    // 是否强制显示正负号
-    const sign = this.getPrefixSign(rest.forceSign);
-
-    let space = spaceSeparated ? " " : "";
-    // 在 currency format 中，需要使用绝对值来格式化
-    // 方便后续添加 正负号
-    rest.absoluteValue = true;
-    rest.forceSign = false;
-    let formattedString = this.format(rest);
-
-    //#region NaN 的 fallback
-    const { NaNFormat } = this.combineFormatOptions(rest);
-    if (formattedString === NaNFormat) {
-      return formattedString;
-    }
-    //#endregion
-
-    if (position === "prefix") {
-      return `${sign}${symbol}${space}${formattedString}`;
-    }
-    return `${sign}${formattedString}${space}${symbol}`;
-  }
-  //#endregion
-
   private computeAverage(num: BigNumber) {
     const powers = {
       // 1t

package/src/numbro/shared.ts

@@ -1,5 +1,4 @@
 import BigNumber from "bignumber.js";
-import { LocalesEnum } from "../i18n/enums";
 
 export interface Format extends BigNumber.Format {
   output?: "percent";
@@ -73,30 +72,6 @@ export interface Format extends BigNumber.Format {
   absoluteValue?: boolean;
 }
 
-export interface CurrencyFormat extends Format {
-  /**
-   * 货币符号
-   */
-  symbol?: string;
-
-  /**
-   * 货币符号位置
-   */
-  position?: "prefix" | "postfix";
-
-  /**
-   * 按哪种语言格式化，会根据传入的语言去 currencies 里获取对应的配置项
-   * 一般用在以下情况：
-   * - 当前设置的语言是 en，但是需要格式化成 id 的货币
-   */
-  locale?: LocalesEnum | (string & {});
-
-  /**
-   * symbol 和 数字 之间是否需要空格
-   */
-  spaceSeparated?: boolean;
-}
-
 /**
  * 重新导出 BigNumber.RoundingMode
  * 由于项目不会使用太多的四舍五入模式，所以只导出常用的几个

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

@@ -46,7 +46,7 @@ export class RequestBuilder<Req = any, Res = any> {
    * useQuery、useMutation 内部会调用这个
    * 另外也可以直接调用这个函数来发送请求
    * @param params 请求参数 默认会根据请求方法来放到 url 上或者 body 里
-   * @param config axios 的配置，一般不需要传，内部用
+   * @param config 请求的配置，一般不需要传，内部用
    */
   request<P extends Req, T = Res>(params?: P, config?: RequestConfig) {
     const method = this.options.method!;

package/src/rq/RequestBuilder.ts

@@ -77,7 +77,7 @@ export class RequestBuilder<Req = any, Res = any> {
    * useQuery、useMutation 内部会调用这个
    * 另外也可以直接调用这个函数来发送请求
    * @param params 请求参数 默认会根据请求方法来放到 url 上或者 body 里
-   * @param config axios 的配置，一般不需要传，内部用
+   * @param config 请求的配置，一般不需要传，内部用
    */
   request<P extends Req, T = Res>(params?: P, config?: RequestConfig) {
     const method = this.options.method!;

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 字段
     method: "get",
     requestFn: (config) => {
       return requestFn(config.params) as never;

package/src/numbro/currencies.ts

@@ -1,23 +0,0 @@
-import { LocalesEnum } from "../i18n/enums";
-import type { CurrencyFormat } from "./shared";
-
-export const defaultCurrencies: Record<
-  string,
-  Omit<CurrencyFormat, "locale">
-> = {
-  [LocalesEnum.en]: {
-    symbol: "$",
-    position: "prefix",
-    mantissa: 2,
-  },
-  [LocalesEnum.id]: {
-    symbol: "Rp",
-    position: "prefix",
-    mantissa: 2,
-  },
-  [LocalesEnum.zh]: {
-    symbol: "¥",
-    position: "prefix",
-    mantissa: 2,
-  },
-};