@hairy/utils 0.7.1 → 0.7.3

package/dist/index.cjs

@@ -72,9 +72,11 @@ __export(src_exports, {
   plus: () => plus,
   riposte: () => riposte,
   unum: () => unum,
+  unwrap: () => unwrap,
   weexPlatform: () => weexPlatform,
   whenever: () => whenever,
-  zerofill: () => zerofill
+  zerofill: () => zerofill,
+  zeromove: () => zeromove
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -203,6 +205,9 @@ function riposte(...args) {
   }
   return void 0;
 }
+function unwrap(value) {
+  return typeof value === "function" ? value() : value;
+}
 
 // ../../node_modules/.pnpm/bignumber.js@9.1.2/node_modules/bignumber.js/bignumber.mjs
 var isNumeric = /^-?(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i;
@@ -1731,6 +1736,9 @@ function zerofill(value, n = 2, type = "positive") {
     return zero + value;
   return "";
 }
+function zeromove(value) {
+  return value.toString().replace(/\.?0+$/, "");
+}
 function numerfix(value) {
   const _isNaN = Number.isNaN(Number(value)) || value.toString() === "NaN";
   if (_isNaN)
@@ -1772,7 +1780,7 @@ function formatNumeric(value = "0", options) {
     decimals = 2
   } = options || {};
   const config = parseNumeric(value, delimiters || []);
-  const number = unum(value).div(config.v).toFormat(decimals, rounding, {
+  let number = unum(value).div(config.v).toFormat(decimals, rounding, {
     decimalSeparator: ".",
     groupSeparator: ",",
     groupSize: 3,
@@ -1781,6 +1789,7 @@ function formatNumeric(value = "0", options) {
     fractionGroupSize: 0,
     ...format
   });
+  number = (options == null ? void 0 : options.zeromove) ? zeromove(number) : number;
   return `${number}${config.n}`;
 }
 
@@ -1842,7 +1851,9 @@ function cover(value, mode, symbol = "*") {
   plus,
   riposte,
   unum,
+  unwrap,
   weexPlatform,
   whenever,
-  zerofill
+  zerofill,
+  zeromove
 });

package/dist/index.d.ts

@@ -119,7 +119,8 @@ declare function delay(ms: number): Promise<unknown>;
 declare function arange(x1: number, x2?: number, stp?: number, z?: number[], z0?: number): number[];
 declare function whenever<T, C extends (value: Exclude<T, null | undefined>) => any>(value: T, callback: C): ReturnType<C> | undefined;
 declare function loop<T = void>(fn: (next: (ms: number) => Promise<T>) => Promise<T>): Promise<T>;
-declare function riposte<T>(...args: [cond: boolean, value: T][]): T;
+declare function riposte<T>(...args: [cond: boolean, value: T][]): T;
+declare function unwrap<T extends object>(value: T | (() => T)): T;
 
 declare const BIG_INTS: {
     t: {
@@ -162,6 +163,7 @@ interface FormatNumericOptions {
     delimiters?: Delimiter[] | false;
     rounding?: Bignumber.RoundingMode;
     decimals?: number;
+    zeromove?: boolean;
     format?: Bignumber.Format;
 }
 declare function unum(num?: Numeric): Bignumber;
@@ -183,6 +185,7 @@ declare function percentage(total: Numeric, count: Numeric, options?: DecimalOpt
  * @param lh
  */
 declare function zerofill(value: Numberish, n?: number, type?: 'positive' | 'reverse'): Numberish;
+declare function zeromove(value: Numberish): string;
 declare function numerfix(value: any): string;
 /**
  * format as a positive integer
@@ -216,4 +219,4 @@ declare function formatNumeric(value?: Numeric, options?: FormatNumericOptions):
  */
 declare function cover(value: string, mode: [number, number, number], symbol?: string): string;
 
-export { Arrayable, Awaitable, BIG_INTS, BooleanLike, DecimalOptions, DeepKeyof, DeepPartial, DeepReadonly, DeepReplace, DeepRequired, Deferred, Delimiter, Dimension, DynamicObject, FormatGroupOptions, FormatNumericOptions, Key, NumberObject, Numberish, Numeric, NumericObject, Option, StringObject, SymbolObject, TypeofType, UA, arange, average, compose, cover, decimal, delay, formDataToObject, formatNumeric, formatSize, formatUnit, getTypeof, gt, gte, integer, isAndroid, isArray, isBrowser, isChrome, isEdge, isFF, isFormData, isIE, isIE11, isIE9, isIOS, isMobile, isNull, isNumber, isObject, isPhantomJS, isPlainObject, isString, isTypeof, isWeex, isWindow, loop, lt, lte, noop, numerfix, objectToFormData, pPipe, parseNumeric, percentage, pipe, plus, riposte, unum, weexPlatform, whenever, zerofill };
+export { Arrayable, Awaitable, BIG_INTS, BooleanLike, DecimalOptions, DeepKeyof, DeepPartial, DeepReadonly, DeepReplace, DeepRequired, Deferred, Delimiter, Dimension, DynamicObject, FormatGroupOptions, FormatNumericOptions, Key, NumberObject, Numberish, Numeric, NumericObject, Option, StringObject, SymbolObject, TypeofType, UA, arange, average, compose, cover, decimal, delay, formDataToObject, formatNumeric, formatSize, formatUnit, getTypeof, gt, gte, integer, isAndroid, isArray, isBrowser, isChrome, isEdge, isFF, isFormData, isIE, isIE11, isIE9, isIOS, isMobile, isNull, isNumber, isObject, isPhantomJS, isPlainObject, isString, isTypeof, isWeex, isWindow, loop, lt, lte, noop, numerfix, objectToFormData, pPipe, parseNumeric, percentage, pipe, plus, riposte, unum, unwrap, weexPlatform, whenever, zerofill, zeromove };

package/dist/index.mjs

@@ -123,6 +123,9 @@ function riposte(...args) {
   }
   return void 0;
 }
+function unwrap(value) {
+  return typeof value === "function" ? value() : value;
+}
 
 // ../../node_modules/.pnpm/bignumber.js@9.1.2/node_modules/bignumber.js/bignumber.mjs
 var isNumeric = /^-?(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i;
@@ -1651,6 +1654,9 @@ function zerofill(value, n = 2, type = "positive") {
     return zero + value;
   return "";
 }
+function zeromove(value) {
+  return value.toString().replace(/\.?0+$/, "");
+}
 function numerfix(value) {
   const _isNaN = Number.isNaN(Number(value)) || value.toString() === "NaN";
   if (_isNaN)
@@ -1692,7 +1698,7 @@ function formatNumeric(value = "0", options) {
     decimals = 2
   } = options || {};
   const config = parseNumeric(value, delimiters || []);
-  const number = unum(value).div(config.v).toFormat(decimals, rounding, {
+  let number = unum(value).div(config.v).toFormat(decimals, rounding, {
     decimalSeparator: ".",
     groupSeparator: ",",
     groupSize: 3,
@@ -1701,6 +1707,7 @@ function formatNumeric(value = "0", options) {
     fractionGroupSize: 0,
     ...format
   });
+  number = (options == null ? void 0 : options.zeromove) ? zeromove(number) : number;
   return `${number}${config.n}`;
 }
 
@@ -1761,7 +1768,9 @@ export {
   plus,
   riposte,
   unum,
+  unwrap,
   weexPlatform,
   whenever,
-  zerofill
+  zerofill,
+  zeromove
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hairy/utils",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "license": "MIT",
   "main": "./dist/index.cjs",
   "publishConfig": {