@blocklet/aigne-hub 0.7.12 → 0.7.14

package/lib/cjs/utils/util.js

@@ -3,25 +3,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CREDIT_DISPLAY_DECIMAL_PLACES = void 0;
 exports.formatNumber = formatNumber;
 const trimEnd_1 = __importDefault(require("lodash/trimEnd"));
 const numbro_1 = __importDefault(require("numbro"));
-// Decimal places for credit display in UI (different from backend calculation precision)
-exports.CREDIT_DISPLAY_DECIMAL_PLACES = 6;
-function formatNumber(n, precision = 6, trim = true, thousandSeparated = true) {
-    if (!n || n === '0') {
+function formatNumber(n, precision = 2, trim = false, thousandSeparated = true, maxPrecision = 6) {
+    const num = (0, numbro_1.default)(n || 0);
+    const value = num.value();
+    if (!value) {
         return '0';
     }
-    const num = (0, numbro_1.default)(n);
-    const options = {
-        thousandSeparated,
-        ...((precision || precision === 0) && { mantissa: precision }),
+    const trimZeros = (valueString) => {
+        const [left, right] = valueString.split('.');
+        return right ? [left, (0, trimEnd_1.default)(right, '0')].filter(Boolean).join('.') : left;
     };
-    const result = num.format(options);
+    const isZeroString = (valueString) => {
+        const trimmed = trimZeros(valueString);
+        return trimmed === '0' || trimmed === '-0';
+    };
+    let result = value.toString();
+    for (let p = precision; p <= Math.max(precision, maxPrecision); p += 1) {
+        result = num.format({
+            thousandSeparated,
+            mantissa: p,
+            roundingFunction: (n) => (n < 0 ? Math.ceil(n) : Math.floor(n)),
+        });
+        if (!isZeroString(result))
+            break;
+    }
     if (!trim) {
         return result;
     }
-    const [left, right] = result.split('.');
-    return right ? [left, (0, trimEnd_1.default)(right, '0')].filter(Boolean).join('.') : left;
+    return trimZeros(result);
 }

package/lib/esm/utils/util.js

@@ -1,20 +1,31 @@
 import trimEnd from 'lodash/trimEnd';
 import numbro from 'numbro';
-// Decimal places for credit display in UI (different from backend calculation precision)
-export const CREDIT_DISPLAY_DECIMAL_PLACES = 6;
-export function formatNumber(n, precision = 6, trim = true, thousandSeparated = true) {
-    if (!n || n === '0') {
+export function formatNumber(n, precision = 2, trim = false, thousandSeparated = true, maxPrecision = 6) {
+    const num = numbro(n || 0);
+    const value = num.value();
+    if (!value) {
         return '0';
     }
-    const num = numbro(n);
-    const options = {
-        thousandSeparated,
-        ...((precision || precision === 0) && { mantissa: precision }),
+    const trimZeros = (valueString) => {
+        const [left, right] = valueString.split('.');
+        return right ? [left, trimEnd(right, '0')].filter(Boolean).join('.') : left;
     };
-    const result = num.format(options);
+    const isZeroString = (valueString) => {
+        const trimmed = trimZeros(valueString);
+        return trimmed === '0' || trimmed === '-0';
+    };
+    let result = value.toString();
+    for (let p = precision; p <= Math.max(precision, maxPrecision); p += 1) {
+        result = num.format({
+            thousandSeparated,
+            mantissa: p,
+            roundingFunction: (n) => (n < 0 ? Math.ceil(n) : Math.floor(n)),
+        });
+        if (!isZeroString(result))
+            break;
+    }
     if (!trim) {
         return result;
     }
-    const [left, right] = result.split('.');
-    return right ? [left, trimEnd(right, '0')].filter(Boolean).join('.') : left;
+    return trimZeros(result);
 }

package/lib/types/utils/util.d.ts

@@ -1,2 +1 @@
-export declare const CREDIT_DISPLAY_DECIMAL_PLACES = 6;
-export declare function formatNumber(n: number | string, precision?: number, trim?: boolean, thousandSeparated?: boolean): string | undefined;
+export declare function formatNumber(n: number | string, precision?: number, trim?: boolean, thousandSeparated?: boolean, maxPrecision?: number): string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/aigne-hub",
-  "version": "0.7.12",
+  "version": "0.7.14",
   "description": "The react.js component library for AIGNE Hub",
   "publishConfig": {
     "access": "public"
@@ -100,8 +100,8 @@
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@arcblock/did": "^1.27.16",
-    "@arcblock/ux": "^3.3.8",
+    "@arcblock/did": "^1.28.0",
+    "@arcblock/ux": "^3.3.10",
     "@blocklet/error": "0.3.5",
     "@blocklet/logger": "^1.17.7",
     "@blocklet/payment-js": "^1.23.7",
@@ -113,8 +113,8 @@
     "@mui/lab": "^7.0.0-beta.14",
     "@mui/material": "^7.2.0",
     "@mui/system": "^7.2.0",
-    "@ocap/mcrypto": "^1.27.16",
-    "@ocap/util": "^1.27.16",
+    "@ocap/mcrypto": "^1.28.0",
+    "@ocap/util": "^1.28.0",
     "@types/express": "^5.0.3",
     "ahooks": "^3.8.1",
     "axios": "^1.7.4",