@fnmain/number 1.7.0 → 1.9.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 +7 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +32 -6
- package/dist/index.js.map +1 -1
- package/dist/test.js +6 -0
- package/dist/test.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +46 -11
- package/src/test.ts +16 -1
package/dist/index.d.ts
CHANGED
|
@@ -4,19 +4,21 @@ type Options = {
|
|
|
4
4
|
yiFixed?: number;
|
|
5
5
|
wanYiFixed?: number;
|
|
6
6
|
trimEndZeros?: boolean;
|
|
7
|
+
nanString?: string;
|
|
7
8
|
space?: string;
|
|
8
9
|
};
|
|
9
10
|
export declare function trimTrailingZeros(numberString: string): string;
|
|
10
|
-
export declare function toWan(value:
|
|
11
|
-
export declare function toYi(value:
|
|
12
|
-
export declare function toWanYi(value:
|
|
13
|
-
export declare function toAuto(value:
|
|
14
|
-
export declare function toPercent(value:
|
|
11
|
+
export declare function toWan(value: any, { fixed, trimEndZeros, space, nanString }?: Options): string;
|
|
12
|
+
export declare function toYi(value: any, { fixed, trimEndZeros, space, nanString }?: Options): string;
|
|
13
|
+
export declare function toWanYi(value: any, { fixed, trimEndZeros, space, nanString }?: Options): string;
|
|
14
|
+
export declare function toAuto(value: any, { fixed, wanFixed, yiFixed, wanYiFixed, trimEndZeros, space, nanString, }?: Options): string;
|
|
15
|
+
export declare function toPercent(value: any, { fixed, trimEndZeros, space, nanString }?: Options): string;
|
|
15
16
|
export declare function parseNumber(input: any): number;
|
|
16
17
|
export declare function isNumber(value: any): boolean;
|
|
17
18
|
export declare function isNotNumber(value: any): boolean;
|
|
18
19
|
export declare function formatWithCommas(value: any, { strNaN }?: {
|
|
19
20
|
strNaN: string;
|
|
20
21
|
}): string;
|
|
22
|
+
export declare function removeNumberCommas(str: string): string;
|
|
21
23
|
export {};
|
|
22
24
|
//# sourceMappingURL=index.d.ts.map
|
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,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,
|
|
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,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ9D;AAED,wBAAgB,KAAK,CACnB,KAAK,EAAE,GAAG,EACV,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,SAAiB,EAAE,GAAE,OAAY,GAC/E,MAAM,CAQR;AAED,wBAAgB,IAAI,CAClB,KAAK,EAAE,GAAG,EACV,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,SAAiB,EAAE,GAAE,OAAY,GAC/E,MAAM,CAQR;AAED,wBAAgB,OAAO,CACrB,KAAK,EAAE,GAAG,EACV,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,SAAiB,EAAE,GAAE,OAAY,GAC/E,MAAM,CAQR;AAED,wBAAgB,MAAM,CACpB,KAAK,EAAE,GAAG,EACV,EACE,KAAS,EACT,QAAQ,EACR,OAAO,EACP,UAAU,EACV,YAAoB,EACpB,KAAU,EACV,SAAiB,GAClB,GAAE,OAAY,GACd,MAAM,CAqBR;AAED,wBAAgB,SAAS,CACvB,KAAK,EAAE,GAAG,EACV,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,SAAiB,EAAE,GAAE,OAAY,GAC/E,MAAM,CAQR;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;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAItD"}
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.formatWithCommas = exports.isNotNumber = exports.isNumber = exports.parseNumber = exports.toPercent = exports.toAuto = exports.toWanYi = exports.toYi = exports.toWan = exports.trimTrailingZeros = void 0;
|
|
3
|
+
exports.removeNumberCommas = exports.formatWithCommas = exports.isNotNumber = exports.isNumber = exports.parseNumber = exports.toPercent = exports.toAuto = exports.toWanYi = exports.toYi = exports.toWan = exports.trimTrailingZeros = void 0;
|
|
4
4
|
function trimTrailingZeros(numberString) {
|
|
5
5
|
// Check if the string contains a decimal point
|
|
6
6
|
if (numberString.includes(".")) {
|
|
@@ -11,25 +11,41 @@ function trimTrailingZeros(numberString) {
|
|
|
11
11
|
return numberString;
|
|
12
12
|
}
|
|
13
13
|
exports.trimTrailingZeros = trimTrailingZeros;
|
|
14
|
-
function toWan(value, { fixed = 0, trimEndZeros = false, space = "" } = {}) {
|
|
14
|
+
function toWan(value, { fixed = 0, trimEndZeros = false, space = "", nanString = "NaN" } = {}) {
|
|
15
|
+
value = parseNumber(value);
|
|
16
|
+
if (isNaN(value)) {
|
|
17
|
+
return nanString;
|
|
18
|
+
}
|
|
15
19
|
let ret = (value / 10000).toFixed(fixed);
|
|
16
20
|
ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
|
|
17
21
|
return ret + space + "万";
|
|
18
22
|
}
|
|
19
23
|
exports.toWan = toWan;
|
|
20
|
-
function toYi(value, { fixed = 0, trimEndZeros = false, space = "" } = {}) {
|
|
24
|
+
function toYi(value, { fixed = 0, trimEndZeros = false, space = "", nanString = "NaN" } = {}) {
|
|
25
|
+
value = parseNumber(value);
|
|
26
|
+
if (isNaN(value)) {
|
|
27
|
+
return nanString;
|
|
28
|
+
}
|
|
21
29
|
let ret = (value / 100000000).toFixed(fixed);
|
|
22
30
|
ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
|
|
23
31
|
return ret + space + "亿";
|
|
24
32
|
}
|
|
25
33
|
exports.toYi = toYi;
|
|
26
|
-
function toWanYi(value, { fixed = 0, trimEndZeros = false, space = "" } = {}) {
|
|
34
|
+
function toWanYi(value, { fixed = 0, trimEndZeros = false, space = "", nanString = "NaN" } = {}) {
|
|
35
|
+
value = parseNumber(value);
|
|
36
|
+
if (isNaN(value)) {
|
|
37
|
+
return nanString;
|
|
38
|
+
}
|
|
27
39
|
let ret = (value / 1000000000000).toFixed(fixed);
|
|
28
40
|
ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
|
|
29
41
|
return ret + space + "万亿";
|
|
30
42
|
}
|
|
31
43
|
exports.toWanYi = toWanYi;
|
|
32
|
-
function toAuto(value, { fixed = 0, wanFixed, yiFixed, wanYiFixed, trimEndZeros = false, space = "" } = {}) {
|
|
44
|
+
function toAuto(value, { fixed = 0, wanFixed, yiFixed, wanYiFixed, trimEndZeros = false, space = "", nanString = "NaN", } = {}) {
|
|
45
|
+
value = parseNumber(value);
|
|
46
|
+
if (isNaN(value)) {
|
|
47
|
+
return nanString;
|
|
48
|
+
}
|
|
33
49
|
const abs = Math.abs(value);
|
|
34
50
|
if (abs < 10000) {
|
|
35
51
|
let ret = value.toFixed(fixed);
|
|
@@ -48,7 +64,11 @@ function toAuto(value, { fixed = 0, wanFixed, yiFixed, wanYiFixed, trimEndZeros
|
|
|
48
64
|
return toWanYi(value, { fixed, trimEndZeros, space });
|
|
49
65
|
}
|
|
50
66
|
exports.toAuto = toAuto;
|
|
51
|
-
function toPercent(value, { fixed = 0, trimEndZeros = false, space = "" } = {}) {
|
|
67
|
+
function toPercent(value, { fixed = 0, trimEndZeros = false, space = "", nanString = "NaN" } = {}) {
|
|
68
|
+
value = parseNumber(value);
|
|
69
|
+
if (isNaN(value)) {
|
|
70
|
+
return nanString;
|
|
71
|
+
}
|
|
52
72
|
let ret = (value * 100).toFixed(fixed);
|
|
53
73
|
ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
|
|
54
74
|
return ret + space + "%";
|
|
@@ -122,4 +142,10 @@ function formatWithCommas(value, { strNaN } = { strNaN: "NaN" }) {
|
|
|
122
142
|
return val.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
|
|
123
143
|
}
|
|
124
144
|
exports.formatWithCommas = formatWithCommas;
|
|
145
|
+
function removeNumberCommas(str) {
|
|
146
|
+
// 使用更严格的正则匹配千分位逗号
|
|
147
|
+
// 匹配规则：逗号右侧必须是3的倍数的连续数字，直到遇到非数字字符或结尾
|
|
148
|
+
return str.replace(/(?<=\d{1,3}),(?=(\d{3})+(?!\d))/g, "");
|
|
149
|
+
}
|
|
150
|
+
exports.removeNumberCommas = removeNumberCommas;
|
|
125
151
|
//# 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,6 +1,8 @@
|
|
|
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)(NaN)); // NaN
|
|
5
|
+
console.log((0, index_1.toAuto)(NaN, { nanString: "invalid" })); // invalid
|
|
4
6
|
console.log((0, index_1.toAuto)(1234)); // 1234
|
|
5
7
|
console.log((0, index_1.toAuto)(12345)); // 1万
|
|
6
8
|
console.log((0, index_1.toAuto)(123456789)); // 1亿
|
|
@@ -14,6 +16,8 @@ console.log((0, index_1.toAuto)(1.00002, { fixed: 1, trimEndZeros: true })); //
|
|
|
14
16
|
console.log((0, index_1.toPercent)(0.1234, { fixed: 1, space: " " })); // 12.3 %
|
|
15
17
|
console.log((0, index_1.toPercent)(1.23456, { trimEndZeros: true })); // 123%
|
|
16
18
|
console.log((0, index_1.toPercent)(1.9, { fixed: 4, trimEndZeros: true })); // 190%
|
|
19
|
+
console.log((0, index_1.toPercent)("1.2%", { fixed: 2, trimEndZeros: true })); // 1.2%
|
|
20
|
+
console.log((0, index_1.toPercent)("1.2%", { fixed: 2 })); // 1.20%
|
|
17
21
|
// Example usage
|
|
18
22
|
console.log((0, index_1.parseNumber)("50%")); // 0.5
|
|
19
23
|
console.log((0, index_1.parseNumber)("1e3")); // 1000
|
|
@@ -35,4 +39,6 @@ console.log((0, index_1.formatWithCommas)("12345.6789")); // 12,345.678,9
|
|
|
35
39
|
console.log((0, index_1.formatWithCommas)("123")); // 123
|
|
36
40
|
console.log((0, index_1.formatWithCommas)("abc")); // "NaN"
|
|
37
41
|
console.log((0, index_1.formatWithCommas)("abc", { strNaN: "" })); // ""
|
|
42
|
+
console.log((0, index_1.removeNumberCommas)("123,456,789")); // 123456789
|
|
43
|
+
console.log((0, index_1.removeNumberCommas)("1,23,456")); // 1,23456
|
|
38
44
|
//# 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,
|
|
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
|
@@ -4,6 +4,7 @@ type Options = {
|
|
|
4
4
|
yiFixed?: number;
|
|
5
5
|
wanYiFixed?: number;
|
|
6
6
|
trimEndZeros?: boolean;
|
|
7
|
+
nanString?: string;
|
|
7
8
|
space?: string;
|
|
8
9
|
};
|
|
9
10
|
|
|
@@ -18,36 +19,60 @@ export function trimTrailingZeros(numberString: string): string {
|
|
|
18
19
|
}
|
|
19
20
|
|
|
20
21
|
export function toWan(
|
|
21
|
-
value:
|
|
22
|
-
{ fixed = 0, trimEndZeros = false, space = "" }: Options = {}
|
|
22
|
+
value: any,
|
|
23
|
+
{ fixed = 0, trimEndZeros = false, space = "", nanString = "NaN" }: Options = {}
|
|
23
24
|
): string {
|
|
25
|
+
value = parseNumber(value);
|
|
26
|
+
if (isNaN(value)) {
|
|
27
|
+
return nanString;
|
|
28
|
+
}
|
|
24
29
|
let ret = (value / 10000).toFixed(fixed);
|
|
25
30
|
ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
|
|
26
31
|
return ret + space + "万";
|
|
27
32
|
}
|
|
28
33
|
|
|
29
34
|
export function toYi(
|
|
30
|
-
value:
|
|
31
|
-
{ fixed = 0, trimEndZeros = false, space = "" }: Options = {}
|
|
35
|
+
value: any,
|
|
36
|
+
{ fixed = 0, trimEndZeros = false, space = "", nanString = "NaN" }: Options = {}
|
|
32
37
|
): string {
|
|
38
|
+
value = parseNumber(value);
|
|
39
|
+
if (isNaN(value)) {
|
|
40
|
+
return nanString;
|
|
41
|
+
}
|
|
33
42
|
let ret = (value / 100000000).toFixed(fixed);
|
|
34
43
|
ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
|
|
35
44
|
return ret + space + "亿";
|
|
36
45
|
}
|
|
37
46
|
|
|
38
47
|
export function toWanYi(
|
|
39
|
-
value:
|
|
40
|
-
{ fixed = 0, trimEndZeros = false, space = "" }: Options = {}
|
|
48
|
+
value: any,
|
|
49
|
+
{ fixed = 0, trimEndZeros = false, space = "", nanString = "NaN" }: Options = {}
|
|
41
50
|
): string {
|
|
51
|
+
value = parseNumber(value);
|
|
52
|
+
if (isNaN(value)) {
|
|
53
|
+
return nanString;
|
|
54
|
+
}
|
|
42
55
|
let ret = (value / 1000000000000).toFixed(fixed);
|
|
43
56
|
ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
|
|
44
57
|
return ret + space + "万亿";
|
|
45
58
|
}
|
|
46
59
|
|
|
47
60
|
export function toAuto(
|
|
48
|
-
value:
|
|
49
|
-
{
|
|
61
|
+
value: any,
|
|
62
|
+
{
|
|
63
|
+
fixed = 0,
|
|
64
|
+
wanFixed,
|
|
65
|
+
yiFixed,
|
|
66
|
+
wanYiFixed,
|
|
67
|
+
trimEndZeros = false,
|
|
68
|
+
space = "",
|
|
69
|
+
nanString = "NaN",
|
|
70
|
+
}: Options = {}
|
|
50
71
|
): string {
|
|
72
|
+
value = parseNumber(value);
|
|
73
|
+
if (isNaN(value)) {
|
|
74
|
+
return nanString;
|
|
75
|
+
}
|
|
51
76
|
const abs = Math.abs(value);
|
|
52
77
|
if (abs < 10000) {
|
|
53
78
|
let ret = value.toFixed(fixed);
|
|
@@ -67,9 +92,13 @@ export function toAuto(
|
|
|
67
92
|
}
|
|
68
93
|
|
|
69
94
|
export function toPercent(
|
|
70
|
-
value:
|
|
71
|
-
{ fixed = 0, trimEndZeros = false, space = "" }: Options = {}
|
|
72
|
-
) {
|
|
95
|
+
value: any,
|
|
96
|
+
{ fixed = 0, trimEndZeros = false, space = "", nanString = "NaN" }: Options = {}
|
|
97
|
+
): string {
|
|
98
|
+
value = parseNumber(value);
|
|
99
|
+
if (isNaN(value)) {
|
|
100
|
+
return nanString;
|
|
101
|
+
}
|
|
73
102
|
let ret = (value * 100).toFixed(fixed);
|
|
74
103
|
ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
|
|
75
104
|
return ret + space + "%";
|
|
@@ -148,3 +177,9 @@ export function formatWithCommas(value: any, { strNaN } = { strNaN: "NaN" }): st
|
|
|
148
177
|
}
|
|
149
178
|
return val.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
|
|
150
179
|
}
|
|
180
|
+
|
|
181
|
+
export function removeNumberCommas(str: string): string {
|
|
182
|
+
// 使用更严格的正则匹配千分位逗号
|
|
183
|
+
// 匹配规则：逗号右侧必须是3的倍数的连续数字，直到遇到非数字字符或结尾
|
|
184
|
+
return str.replace(/(?<=\d{1,3}),(?=(\d{3})+(?!\d))/g, "");
|
|
185
|
+
}
|
package/src/test.ts
CHANGED
|
@@ -1,5 +1,15 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
formatWithCommas,
|
|
3
|
+
isNotNumber,
|
|
4
|
+
isNumber,
|
|
5
|
+
parseNumber,
|
|
6
|
+
removeNumberCommas,
|
|
7
|
+
toAuto,
|
|
8
|
+
toPercent,
|
|
9
|
+
} from "./index";
|
|
2
10
|
|
|
11
|
+
console.log(toAuto(NaN)); // NaN
|
|
12
|
+
console.log(toAuto(NaN, { nanString: "invalid" })); // invalid
|
|
3
13
|
console.log(toAuto(1234)); // 1234
|
|
4
14
|
console.log(toAuto(12345)); // 1万
|
|
5
15
|
console.log(toAuto(123456789)); // 1亿
|
|
@@ -15,6 +25,8 @@ console.log(toAuto(1.00002, { fixed: 1, trimEndZeros: true })); // 1
|
|
|
15
25
|
console.log(toPercent(0.1234, { fixed: 1, space: " " })); // 12.3 %
|
|
16
26
|
console.log(toPercent(1.23456, { trimEndZeros: true })); // 123%
|
|
17
27
|
console.log(toPercent(1.9, { fixed: 4, trimEndZeros: true })); // 190%
|
|
28
|
+
console.log(toPercent("1.2%", { fixed: 2, trimEndZeros: true })); // 1.2%
|
|
29
|
+
console.log(toPercent("1.2%", { fixed: 2 })); // 1.20%
|
|
18
30
|
|
|
19
31
|
// Example usage
|
|
20
32
|
console.log(parseNumber("50%")); // 0.5
|
|
@@ -39,3 +51,6 @@ console.log(formatWithCommas("12345.6789")); // 12,345.678,9
|
|
|
39
51
|
console.log(formatWithCommas("123")); // 123
|
|
40
52
|
console.log(formatWithCommas("abc")); // "NaN"
|
|
41
53
|
console.log(formatWithCommas("abc", { strNaN: "" })); // ""
|
|
54
|
+
|
|
55
|
+
console.log(removeNumberCommas("123,456,789")); // 123456789
|
|
56
|
+
console.log(removeNumberCommas("1,23,456")); // 1,23456
|