@fnmain/number 1.6.0 → 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +4 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -2
- package/dist/index.js.map +1 -1
- package/dist/test.js +16 -13
- package/dist/test.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +8 -2
- package/src/test.ts +16 -13
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
type Options = {
|
|
2
2
|
fixed?: number;
|
|
3
|
+
wanFixed?: number;
|
|
4
|
+
yiFixed?: number;
|
|
5
|
+
wanYiFixed?: number;
|
|
3
6
|
trimEndZeros?: boolean;
|
|
4
7
|
space?: string;
|
|
5
8
|
};
|
|
@@ -7,7 +10,7 @@ export declare function trimTrailingZeros(numberString: string): string;
|
|
|
7
10
|
export declare function toWan(value: number, { fixed, trimEndZeros, space }?: Options): string;
|
|
8
11
|
export declare function toYi(value: number, { fixed, trimEndZeros, space }?: Options): string;
|
|
9
12
|
export declare function toWanYi(value: number, { fixed, trimEndZeros, space }?: Options): string;
|
|
10
|
-
export declare function toAuto(value: number, { fixed, trimEndZeros, space }?: Options): string;
|
|
13
|
+
export declare function toAuto(value: number, { fixed, wanFixed, yiFixed, wanYiFixed, trimEndZeros, space }?: Options): string;
|
|
11
14
|
export declare function toPercent(value: number, { fixed, trimEndZeros, space }?: Options): string;
|
|
12
15
|
export declare function parseNumber(input: any): number;
|
|
13
16
|
export declare function isNumber(value: any): boolean;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GAAG;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ9D;AAED,wBAAgB,KAAK,CACnB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,GAC5D,MAAM,CAIR;AAED,wBAAgB,IAAI,CAClB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,GAC5D,MAAM,CAIR;AAED,wBAAgB,OAAO,CACrB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,GAC5D,MAAM,CAIR;AAED,wBAAgB,MAAM,CACpB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GAAG;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ9D;AAED,wBAAgB,KAAK,CACnB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,GAC5D,MAAM,CAIR;AAED,wBAAgB,IAAI,CAClB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,GAC5D,MAAM,CAIR;AAED,wBAAgB,OAAO,CACrB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,GAC5D,MAAM,CAIR;AAED,wBAAgB,MAAM,CACpB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,GAC3F,MAAM,CAiBR;AAED,wBAAgB,SAAS,CACvB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,UAK9D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,CAwD9C;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAE5C;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAE/C;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE;;CAAoB,GAAG,MAAM,CAMnF"}
|
package/dist/index.js
CHANGED
|
@@ -29,7 +29,7 @@ function toWanYi(value, { fixed = 0, trimEndZeros = false, space = "" } = {}) {
|
|
|
29
29
|
return ret + space + "万亿";
|
|
30
30
|
}
|
|
31
31
|
exports.toWanYi = toWanYi;
|
|
32
|
-
function toAuto(value, { fixed = 0, trimEndZeros = false, space = "" } = {}) {
|
|
32
|
+
function toAuto(value, { fixed = 0, wanFixed, yiFixed, wanYiFixed, trimEndZeros = false, space = "" } = {}) {
|
|
33
33
|
const abs = Math.abs(value);
|
|
34
34
|
if (abs < 10000) {
|
|
35
35
|
let ret = value.toFixed(fixed);
|
|
@@ -37,11 +37,14 @@ function toAuto(value, { fixed = 0, trimEndZeros = false, space = "" } = {}) {
|
|
|
37
37
|
return ret;
|
|
38
38
|
}
|
|
39
39
|
if (abs < 100000000) {
|
|
40
|
+
fixed = (isNumber(wanFixed) && wanFixed) || fixed;
|
|
40
41
|
return toWan(value, { fixed, trimEndZeros, space });
|
|
41
42
|
}
|
|
42
43
|
if (abs < 1000000000000) {
|
|
44
|
+
fixed = (isNumber(yiFixed) && yiFixed) || fixed;
|
|
43
45
|
return toYi(value, { fixed, trimEndZeros, space });
|
|
44
46
|
}
|
|
47
|
+
fixed = (isNumber(wanYiFixed) && wanYiFixed) || fixed;
|
|
45
48
|
return toWanYi(value, { fixed, trimEndZeros, space });
|
|
46
49
|
}
|
|
47
50
|
exports.toAuto = toAuto;
|
|
@@ -116,7 +119,7 @@ function formatWithCommas(value, { strNaN } = { strNaN: "NaN" }) {
|
|
|
116
119
|
if (isNaN(val)) {
|
|
117
120
|
return strNaN;
|
|
118
121
|
}
|
|
119
|
-
return val.toString().replace(
|
|
122
|
+
return val.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
|
|
120
123
|
}
|
|
121
124
|
exports.formatWithCommas = formatWithCommas;
|
|
122
125
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/test.js
CHANGED
|
@@ -1,17 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const index_1 = require("./index");
|
|
4
|
-
console.log((0, index_1.toAuto)(1234));
|
|
5
|
-
console.log((0, index_1.toAuto)(12345));
|
|
6
|
-
console.log((0, index_1.toAuto)(123456789));
|
|
7
|
-
console.log((0, index_1.toAuto)(1234, { fixed: 1 }));
|
|
8
|
-
console.log((0, index_1.toAuto)(12345, { fixed: 1 }));
|
|
9
|
-
console.log((0, index_1.toAuto)(
|
|
10
|
-
console.log((0, index_1.toAuto)(
|
|
11
|
-
console.log((0, index_1.toAuto)(
|
|
12
|
-
console.log((0, index_1.
|
|
13
|
-
console.log((0, index_1.
|
|
14
|
-
console.log((0, index_1.toPercent)(
|
|
4
|
+
console.log((0, index_1.toAuto)(1234)); // 1234
|
|
5
|
+
console.log((0, index_1.toAuto)(12345)); // 1万
|
|
6
|
+
console.log((0, index_1.toAuto)(123456789)); // 1亿
|
|
7
|
+
console.log((0, index_1.toAuto)(1234, { fixed: 1 })); // 1234.0
|
|
8
|
+
console.log((0, index_1.toAuto)(12345, { fixed: 1 })); // 1.2万
|
|
9
|
+
console.log((0, index_1.toAuto)(12345, { wanFixed: 2 })); // 1.23万
|
|
10
|
+
console.log((0, index_1.toAuto)(123456789, { fixed: 2, space: " " })); // 1.23 亿
|
|
11
|
+
console.log((0, index_1.toAuto)(123456789, { yiFixed: 3, space: " " })); // 1.235 亿
|
|
12
|
+
console.log((0, index_1.toAuto)(12.3 * 10000 * 10000 * 10000, { fixed: 1, space: " " })); // 12.3 万亿
|
|
13
|
+
console.log((0, index_1.toAuto)(1.00002, { fixed: 1, trimEndZeros: true })); // 1
|
|
14
|
+
console.log((0, index_1.toPercent)(0.1234, { fixed: 1, space: " " })); // 12.3 %
|
|
15
|
+
console.log((0, index_1.toPercent)(1.23456, { trimEndZeros: true })); // 123%
|
|
16
|
+
console.log((0, index_1.toPercent)(1.9, { fixed: 4, trimEndZeros: true })); // 190%
|
|
15
17
|
// Example usage
|
|
16
18
|
console.log((0, index_1.parseNumber)("50%")); // 0.5
|
|
17
19
|
console.log((0, index_1.parseNumber)("1e3")); // 1000
|
|
@@ -28,8 +30,9 @@ console.log((0, index_1.parseNumber)("abc")); // NaN
|
|
|
28
30
|
console.log((0, index_1.parseNumber)("1,000,000")); // 1000000
|
|
29
31
|
console.log((0, index_1.isNumber)(null)); // false
|
|
30
32
|
console.log((0, index_1.isNotNumber)(null)); // true
|
|
31
|
-
console.log((0, index_1.formatWithCommas)(12345.6789)); // 12,345.
|
|
32
|
-
console.log((0, index_1.formatWithCommas)("12345.6789")); // 12,345.
|
|
33
|
+
console.log((0, index_1.formatWithCommas)(12345.6789)); // 12,345.678,9
|
|
34
|
+
console.log((0, index_1.formatWithCommas)("12345.6789")); // 12,345.678,9
|
|
35
|
+
console.log((0, index_1.formatWithCommas)("123")); // 123
|
|
33
36
|
console.log((0, index_1.formatWithCommas)("abc")); // "NaN"
|
|
34
37
|
console.log((0, index_1.formatWithCommas)("abc", { strNaN: "" })); // ""
|
|
35
38
|
//# sourceMappingURL=test.js.map
|
package/dist/test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";;AAAA,mCAAkG;AAElG,OAAO,CAAC,GAAG,CAAC,IAAA,cAAM,EAAC,IAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
type Options = {
|
|
2
2
|
fixed?: number;
|
|
3
|
+
wanFixed?: number;
|
|
4
|
+
yiFixed?: number;
|
|
5
|
+
wanYiFixed?: number;
|
|
3
6
|
trimEndZeros?: boolean;
|
|
4
7
|
space?: string;
|
|
5
8
|
};
|
|
@@ -43,7 +46,7 @@ export function toWanYi(
|
|
|
43
46
|
|
|
44
47
|
export function toAuto(
|
|
45
48
|
value: number,
|
|
46
|
-
{ fixed = 0, trimEndZeros = false, space = "" }: Options = {}
|
|
49
|
+
{ fixed = 0, wanFixed, yiFixed, wanYiFixed, trimEndZeros = false, space = "" }: Options = {}
|
|
47
50
|
): string {
|
|
48
51
|
const abs = Math.abs(value);
|
|
49
52
|
if (abs < 10000) {
|
|
@@ -52,11 +55,14 @@ export function toAuto(
|
|
|
52
55
|
return ret;
|
|
53
56
|
}
|
|
54
57
|
if (abs < 100000000) {
|
|
58
|
+
fixed = (isNumber(wanFixed) && wanFixed) || fixed;
|
|
55
59
|
return toWan(value, { fixed, trimEndZeros, space });
|
|
56
60
|
}
|
|
57
61
|
if (abs < 1000000000000) {
|
|
62
|
+
fixed = (isNumber(yiFixed) && yiFixed) || fixed;
|
|
58
63
|
return toYi(value, { fixed, trimEndZeros, space });
|
|
59
64
|
}
|
|
65
|
+
fixed = (isNumber(wanYiFixed) && wanYiFixed) || fixed;
|
|
60
66
|
return toWanYi(value, { fixed, trimEndZeros, space });
|
|
61
67
|
}
|
|
62
68
|
|
|
@@ -140,5 +146,5 @@ export function formatWithCommas(value: any, { strNaN } = { strNaN: "NaN" }): st
|
|
|
140
146
|
if (isNaN(val)) {
|
|
141
147
|
return strNaN;
|
|
142
148
|
}
|
|
143
|
-
return val.toString().replace(
|
|
149
|
+
return val.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
|
|
144
150
|
}
|
package/src/test.ts
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
import { formatWithCommas, isNotNumber, isNumber, parseNumber, toAuto, toPercent } from "./index";
|
|
2
2
|
|
|
3
|
-
console.log(toAuto(1234));
|
|
4
|
-
console.log(toAuto(12345));
|
|
5
|
-
console.log(toAuto(123456789));
|
|
3
|
+
console.log(toAuto(1234)); // 1234
|
|
4
|
+
console.log(toAuto(12345)); // 1万
|
|
5
|
+
console.log(toAuto(123456789)); // 1亿
|
|
6
6
|
|
|
7
|
-
console.log(toAuto(1234, { fixed: 1 }));
|
|
8
|
-
console.log(toAuto(12345, { fixed: 1 }));
|
|
9
|
-
console.log(toAuto(
|
|
10
|
-
console.log(toAuto(
|
|
11
|
-
console.log(toAuto(
|
|
7
|
+
console.log(toAuto(1234, { fixed: 1 })); // 1234.0
|
|
8
|
+
console.log(toAuto(12345, { fixed: 1 })); // 1.2万
|
|
9
|
+
console.log(toAuto(12345, { wanFixed: 2 })); // 1.23万
|
|
10
|
+
console.log(toAuto(123456789, { fixed: 2, space: " " })); // 1.23 亿
|
|
11
|
+
console.log(toAuto(123456789, { yiFixed: 3, space: " " })); // 1.235 亿
|
|
12
|
+
console.log(toAuto(12.3 * 10000 * 10000 * 10000, { fixed: 1, space: " " })); // 12.3 万亿
|
|
13
|
+
console.log(toAuto(1.00002, { fixed: 1, trimEndZeros: true })); // 1
|
|
12
14
|
|
|
13
|
-
console.log(toPercent(0.1234, { fixed: 1, space: " " }));
|
|
14
|
-
console.log(toPercent(1.23456, { trimEndZeros: true }));
|
|
15
|
-
console.log(toPercent(1.9, { fixed: 4, trimEndZeros: true }));
|
|
15
|
+
console.log(toPercent(0.1234, { fixed: 1, space: " " })); // 12.3 %
|
|
16
|
+
console.log(toPercent(1.23456, { trimEndZeros: true })); // 123%
|
|
17
|
+
console.log(toPercent(1.9, { fixed: 4, trimEndZeros: true })); // 190%
|
|
16
18
|
|
|
17
19
|
// Example usage
|
|
18
20
|
console.log(parseNumber("50%")); // 0.5
|
|
@@ -32,7 +34,8 @@ console.log(parseNumber("1,000,000")); // 1000000
|
|
|
32
34
|
console.log(isNumber(null)); // false
|
|
33
35
|
console.log(isNotNumber(null)); // true
|
|
34
36
|
|
|
35
|
-
console.log(formatWithCommas(12345.6789)); // 12,345.
|
|
36
|
-
console.log(formatWithCommas("12345.6789")); // 12,345.
|
|
37
|
+
console.log(formatWithCommas(12345.6789)); // 12,345.678,9
|
|
38
|
+
console.log(formatWithCommas("12345.6789")); // 12,345.678,9
|
|
39
|
+
console.log(formatWithCommas("123")); // 123
|
|
37
40
|
console.log(formatWithCommas("abc")); // "NaN"
|
|
38
41
|
console.log(formatWithCommas("abc", { strNaN: "" })); // ""
|