@utiliread/primitives 1.0.0-65 → 1.0.0-66
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/cjs/number-formatter.js +15 -11
- package/dist/cjs/number-formatter.js.map +1 -1
- package/dist/cjs/number-formatter.spec.js +5 -1
- package/dist/cjs/number-formatter.spec.js.map +1 -1
- package/dist/esm/number-formatter.d.ts +5 -5
- package/dist/esm/number-formatter.js +15 -11
- package/dist/esm/number-formatter.js.map +1 -1
- package/dist/esm/number-formatter.spec.js +5 -1
- package/dist/esm/number-formatter.spec.js.map +1 -1
- package/package.json +2 -2
- package/src/number-formatter.spec.ts +105 -99
- package/src/number-formatter.ts +95 -88
|
@@ -4,7 +4,13 @@ exports.NumberFormatter = exports.localeDecimalSeparator = exports.invariantDeci
|
|
|
4
4
|
exports.invariantDecimalSeparator = (0.1).toString()[1];
|
|
5
5
|
exports.localeDecimalSeparator = (0.1).toLocaleString()[1];
|
|
6
6
|
class Formatter {
|
|
7
|
-
toPrecision(value, precision) {
|
|
7
|
+
toPrecision(value, precision, maxDecimals) {
|
|
8
|
+
const absValue = Math.abs(value);
|
|
9
|
+
const noOfIntegerDigits = Math.round(absValue).toString().length;
|
|
10
|
+
// Adjust precision to maxDecimals
|
|
11
|
+
if (maxDecimals !== undefined) {
|
|
12
|
+
precision = Math.min(precision, noOfIntegerDigits + maxDecimals);
|
|
13
|
+
}
|
|
8
14
|
if (value === 0) {
|
|
9
15
|
// (0).toPrecision(1) == "0"
|
|
10
16
|
// (0).toPrecision(2) == "0.0"
|
|
@@ -15,21 +21,19 @@ class Formatter {
|
|
|
15
21
|
// Formatter.toPrecision(0, 2) == "0.00"
|
|
16
22
|
return value.toPrecision(precision + 1);
|
|
17
23
|
}
|
|
18
|
-
const absValue = Math.abs(value);
|
|
19
24
|
if (absValue < 1) {
|
|
20
25
|
return value.toPrecision(precision);
|
|
21
26
|
}
|
|
22
|
-
const noOfIntegerDigits = Math.round(absValue).toString().length;
|
|
23
27
|
return precision >= noOfIntegerDigits
|
|
24
28
|
? value.toFixed(precision - noOfIntegerDigits)
|
|
25
29
|
: value.toPrecision(precision);
|
|
26
30
|
}
|
|
27
|
-
toLocalePrecision(value, precision) {
|
|
28
|
-
return this.toPrecision(value, precision)
|
|
31
|
+
toLocalePrecision(value, precision, maxDecimals) {
|
|
32
|
+
return this.toPrecision(value, precision, maxDecimals)
|
|
29
33
|
.replace(exports.invariantDecimalSeparator, exports.localeDecimalSeparator);
|
|
30
34
|
}
|
|
31
|
-
toFixed(value, precision) {
|
|
32
|
-
const parts = this.getParts(value, precision);
|
|
35
|
+
toFixed(value, precision, maxDecimals) {
|
|
36
|
+
const parts = this.getParts(value, precision, maxDecimals);
|
|
33
37
|
if (parts.noOfCoefficientDecimals < parts.exponent) {
|
|
34
38
|
const number = parts.invariantCoefficientString.replace(exports.invariantDecimalSeparator, "");
|
|
35
39
|
const zeros = parts.exponent - parts.noOfCoefficientDecimals;
|
|
@@ -39,12 +43,12 @@ class Formatter {
|
|
|
39
43
|
return parts.invariantPrecisionString;
|
|
40
44
|
}
|
|
41
45
|
}
|
|
42
|
-
toLocaleFixed(value, precision) {
|
|
43
|
-
return this.toFixed(value, precision)
|
|
46
|
+
toLocaleFixed(value, precision, maxDecimals) {
|
|
47
|
+
return this.toFixed(value, precision, maxDecimals)
|
|
44
48
|
.replace(exports.invariantDecimalSeparator, exports.localeDecimalSeparator);
|
|
45
49
|
}
|
|
46
|
-
getParts(value, precision) {
|
|
47
|
-
const precisionString = this.toPrecision(value, precision);
|
|
50
|
+
getParts(value, precision, maxDecimals) {
|
|
51
|
+
const precisionString = this.toPrecision(value, precision, maxDecimals);
|
|
48
52
|
if (precisionString.indexOf("e") >= 0) {
|
|
49
53
|
const match = /(.*)e([\+-]\d+)$/.exec(precisionString);
|
|
50
54
|
const coefficientString = match[1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"number-formatter.js","sourceRoot":"","sources":["../../src/number-formatter.ts"],"names":[],"mappings":";;;AAAa,QAAA,yBAAyB,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;AAChD,QAAA,sBAAsB,GAAG,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC;AAShE,MAAM,SAAS;IACJ,WAAW,CAAC,KAAa,EAAE,SAAiB;
|
|
1
|
+
{"version":3,"file":"number-formatter.js","sourceRoot":"","sources":["../../src/number-formatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const chai_1 = require("chai");
|
|
4
3
|
const number_formatter_1 = require("./number-formatter");
|
|
4
|
+
const chai_1 = require("chai");
|
|
5
5
|
describe("toParts and toPrecision", () => {
|
|
6
6
|
it("should format correctly", () => {
|
|
7
7
|
const data = [
|
|
@@ -90,5 +90,9 @@ describe("toLocaleFixed", () => {
|
|
|
90
90
|
it("should format correctly", () => {
|
|
91
91
|
(0, chai_1.expect)(number_formatter_1.NumberFormatter.toLocaleFixed(400, 2)).to.equal("400");
|
|
92
92
|
});
|
|
93
|
+
it("should format correctly with max decimals", () => {
|
|
94
|
+
(0, chai_1.expect)(number_formatter_1.NumberFormatter.toLocaleFixed(35.123456, 8, 2)).to.equal("35.12");
|
|
95
|
+
(0, chai_1.expect)(number_formatter_1.NumberFormatter.toLocaleFixed(35.129999, 8, 2)).to.equal("35.13");
|
|
96
|
+
});
|
|
93
97
|
});
|
|
94
98
|
//# sourceMappingURL=number-formatter.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"number-formatter.spec.js","sourceRoot":"","sources":["../../src/number-formatter.spec.ts"],"names":[],"mappings":";;AAAA
|
|
1
|
+
{"version":3,"file":"number-formatter.spec.js","sourceRoot":"","sources":["../../src/number-formatter.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,11 @@ export interface Parts {
|
|
|
7
7
|
noOfCoefficientDecimals: number;
|
|
8
8
|
}
|
|
9
9
|
declare class Formatter {
|
|
10
|
-
toPrecision(value: number, precision: number): string;
|
|
11
|
-
toLocalePrecision(value: number, precision: number): string;
|
|
12
|
-
toFixed(value: number, precision: number): string;
|
|
13
|
-
toLocaleFixed(value: number, precision: number): string;
|
|
14
|
-
getParts(value: number, precision: number): Parts;
|
|
10
|
+
toPrecision(value: number, precision: number, maxDecimals?: number): string;
|
|
11
|
+
toLocalePrecision(value: number, precision: number, maxDecimals?: number): string;
|
|
12
|
+
toFixed(value: number, precision: number, maxDecimals?: number): string;
|
|
13
|
+
toLocaleFixed(value: number, precision: number, maxDecimals?: number): string;
|
|
14
|
+
getParts(value: number, precision: number, maxDecimals?: number): Parts;
|
|
15
15
|
}
|
|
16
16
|
export declare const NumberFormatter: Formatter;
|
|
17
17
|
export {};
|
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
export const invariantDecimalSeparator = (0.1).toString()[1];
|
|
2
2
|
export const localeDecimalSeparator = (0.1).toLocaleString()[1];
|
|
3
3
|
class Formatter {
|
|
4
|
-
toPrecision(value, precision) {
|
|
4
|
+
toPrecision(value, precision, maxDecimals) {
|
|
5
|
+
const absValue = Math.abs(value);
|
|
6
|
+
const noOfIntegerDigits = Math.round(absValue).toString().length;
|
|
7
|
+
// Adjust precision to maxDecimals
|
|
8
|
+
if (maxDecimals !== undefined) {
|
|
9
|
+
precision = Math.min(precision, noOfIntegerDigits + maxDecimals);
|
|
10
|
+
}
|
|
5
11
|
if (value === 0) {
|
|
6
12
|
// (0).toPrecision(1) == "0"
|
|
7
13
|
// (0).toPrecision(2) == "0.0"
|
|
@@ -12,21 +18,19 @@ class Formatter {
|
|
|
12
18
|
// Formatter.toPrecision(0, 2) == "0.00"
|
|
13
19
|
return value.toPrecision(precision + 1);
|
|
14
20
|
}
|
|
15
|
-
const absValue = Math.abs(value);
|
|
16
21
|
if (absValue < 1) {
|
|
17
22
|
return value.toPrecision(precision);
|
|
18
23
|
}
|
|
19
|
-
const noOfIntegerDigits = Math.round(absValue).toString().length;
|
|
20
24
|
return precision >= noOfIntegerDigits
|
|
21
25
|
? value.toFixed(precision - noOfIntegerDigits)
|
|
22
26
|
: value.toPrecision(precision);
|
|
23
27
|
}
|
|
24
|
-
toLocalePrecision(value, precision) {
|
|
25
|
-
return this.toPrecision(value, precision)
|
|
28
|
+
toLocalePrecision(value, precision, maxDecimals) {
|
|
29
|
+
return this.toPrecision(value, precision, maxDecimals)
|
|
26
30
|
.replace(invariantDecimalSeparator, localeDecimalSeparator);
|
|
27
31
|
}
|
|
28
|
-
toFixed(value, precision) {
|
|
29
|
-
const parts = this.getParts(value, precision);
|
|
32
|
+
toFixed(value, precision, maxDecimals) {
|
|
33
|
+
const parts = this.getParts(value, precision, maxDecimals);
|
|
30
34
|
if (parts.noOfCoefficientDecimals < parts.exponent) {
|
|
31
35
|
const number = parts.invariantCoefficientString.replace(invariantDecimalSeparator, "");
|
|
32
36
|
const zeros = parts.exponent - parts.noOfCoefficientDecimals;
|
|
@@ -36,12 +40,12 @@ class Formatter {
|
|
|
36
40
|
return parts.invariantPrecisionString;
|
|
37
41
|
}
|
|
38
42
|
}
|
|
39
|
-
toLocaleFixed(value, precision) {
|
|
40
|
-
return this.toFixed(value, precision)
|
|
43
|
+
toLocaleFixed(value, precision, maxDecimals) {
|
|
44
|
+
return this.toFixed(value, precision, maxDecimals)
|
|
41
45
|
.replace(invariantDecimalSeparator, localeDecimalSeparator);
|
|
42
46
|
}
|
|
43
|
-
getParts(value, precision) {
|
|
44
|
-
const precisionString = this.toPrecision(value, precision);
|
|
47
|
+
getParts(value, precision, maxDecimals) {
|
|
48
|
+
const precisionString = this.toPrecision(value, precision, maxDecimals);
|
|
45
49
|
if (precisionString.indexOf("e") >= 0) {
|
|
46
50
|
const match = /(.*)e([\+-]\d+)$/.exec(precisionString);
|
|
47
51
|
const coefficientString = match[1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"number-formatter.js","sourceRoot":"","sources":["../../src/number-formatter.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC;AAShE,MAAM,SAAS;IACJ,WAAW,CAAC,KAAa,EAAE,SAAiB;
|
|
1
|
+
{"version":3,"file":"number-formatter.js","sourceRoot":"","sources":["../../src/number-formatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import { NumberFormatter, invariantDecimalSeparator, localeDecimalSeparator } from './number-formatter';
|
|
1
2
|
import { expect } from 'chai';
|
|
2
|
-
import { NumberFormatter, localeDecimalSeparator, invariantDecimalSeparator } from './number-formatter';
|
|
3
3
|
describe("toParts and toPrecision", () => {
|
|
4
4
|
it("should format correctly", () => {
|
|
5
5
|
const data = [
|
|
@@ -88,5 +88,9 @@ describe("toLocaleFixed", () => {
|
|
|
88
88
|
it("should format correctly", () => {
|
|
89
89
|
expect(NumberFormatter.toLocaleFixed(400, 2)).to.equal("400");
|
|
90
90
|
});
|
|
91
|
+
it("should format correctly with max decimals", () => {
|
|
92
|
+
expect(NumberFormatter.toLocaleFixed(35.123456, 8, 2)).to.equal("35.12");
|
|
93
|
+
expect(NumberFormatter.toLocaleFixed(35.129999, 8, 2)).to.equal("35.13");
|
|
94
|
+
});
|
|
91
95
|
});
|
|
92
96
|
//# sourceMappingURL=number-formatter.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"number-formatter.spec.js","sourceRoot":"","sources":["../../src/number-formatter.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"number-formatter.spec.js","sourceRoot":"","sources":["../../src/number-formatter.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@utiliread/primitives",
|
|
3
|
-
"version": "1.0.0-
|
|
3
|
+
"version": "1.0.0-66",
|
|
4
4
|
"main": "dist/cjs/index.js",
|
|
5
5
|
"module": "dist/esm/index.js",
|
|
6
6
|
"types": "dist/esm/index.d.ts",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"karma-typescript": "^5.5.1",
|
|
28
28
|
"luxon": "^3.0.4",
|
|
29
29
|
"mocha": "^10.0.0",
|
|
30
|
-
"rimraf": "^
|
|
30
|
+
"rimraf": "^4.1.1",
|
|
31
31
|
"typescript": "^4.1.5"
|
|
32
32
|
},
|
|
33
33
|
"peerDependencies": {
|
|
@@ -1,99 +1,105 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
[0
|
|
9
|
-
[
|
|
10
|
-
[77.1274,
|
|
11
|
-
[77.1274,
|
|
12
|
-
[77.1274,
|
|
13
|
-
[77.1274,
|
|
14
|
-
[77.1274,
|
|
15
|
-
[77.1274,
|
|
16
|
-
[77.1274,
|
|
17
|
-
[77.1274,
|
|
18
|
-
[77.1274,
|
|
19
|
-
[77.1274,
|
|
20
|
-
[77.1274,
|
|
21
|
-
[77.1274,
|
|
22
|
-
[
|
|
23
|
-
[0.
|
|
24
|
-
[0.
|
|
25
|
-
[
|
|
26
|
-
[
|
|
27
|
-
[
|
|
28
|
-
[
|
|
29
|
-
[0
|
|
30
|
-
[0.000001,
|
|
31
|
-
[0.
|
|
32
|
-
[0.
|
|
33
|
-
[0.00000000001,
|
|
34
|
-
[
|
|
35
|
-
[55,
|
|
36
|
-
[
|
|
37
|
-
[-55,
|
|
38
|
-
[
|
|
39
|
-
[9.59,
|
|
40
|
-
[9.
|
|
41
|
-
[9.
|
|
42
|
-
[
|
|
43
|
-
[-
|
|
44
|
-
[
|
|
45
|
-
[
|
|
46
|
-
[
|
|
47
|
-
[
|
|
48
|
-
[Number.EPSILON,
|
|
49
|
-
[Number.
|
|
50
|
-
[Number.
|
|
51
|
-
[Number.
|
|
52
|
-
[
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
expect(parts.
|
|
64
|
-
expect(parts.
|
|
65
|
-
expect(parts.
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
})
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
[0
|
|
75
|
-
[
|
|
76
|
-
[10,
|
|
77
|
-
[10,
|
|
78
|
-
[10,
|
|
79
|
-
[10
|
|
80
|
-
[10.2,
|
|
81
|
-
[10.2,
|
|
82
|
-
[10.2,
|
|
83
|
-
[
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
})
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
})
|
|
1
|
+
import { NumberFormatter, Parts, invariantDecimalSeparator, localeDecimalSeparator } from './number-formatter';
|
|
2
|
+
|
|
3
|
+
import { expect } from 'chai';
|
|
4
|
+
|
|
5
|
+
describe("toParts and toPrecision", () => {
|
|
6
|
+
it("should format correctly", () => {
|
|
7
|
+
const data: [number, number, Parts][] = [
|
|
8
|
+
[0, 0, { invariantPrecisionString: "0", invariantCoefficientString: "0", exponent: 0, noOfCoefficientDecimals: 0 }],
|
|
9
|
+
[0.0, 1, { invariantPrecisionString: "0.0", invariantCoefficientString: "0.0", exponent: 0, noOfCoefficientDecimals: 1 }],
|
|
10
|
+
[77.1274, 1, { invariantPrecisionString: "8e+1", invariantCoefficientString: "8", exponent: 1, noOfCoefficientDecimals: 0 }],
|
|
11
|
+
[77.1274, 2, { invariantPrecisionString: "77", invariantCoefficientString: "77", exponent: 0, noOfCoefficientDecimals: 0 }],
|
|
12
|
+
[77.1274, 4, { invariantPrecisionString: "77.13", invariantCoefficientString: "77.13", exponent: 0, noOfCoefficientDecimals: 2 }],
|
|
13
|
+
[77.1274, 5, { invariantPrecisionString: "77.127", invariantCoefficientString: "77.127", exponent: 0, noOfCoefficientDecimals: 3 }],
|
|
14
|
+
[77.1274, 6, { invariantPrecisionString: "77.1274", invariantCoefficientString: "77.1274", exponent: 0, noOfCoefficientDecimals: 4 }],
|
|
15
|
+
[77.1274, 7, { invariantPrecisionString: "77.12740", invariantCoefficientString: "77.12740", exponent: 0, noOfCoefficientDecimals: 5 }],
|
|
16
|
+
[77.1274, 15, { invariantPrecisionString: "77.1274000000000", invariantCoefficientString: "77.1274000000000", exponent: 0, noOfCoefficientDecimals: 13 }],
|
|
17
|
+
[77.1274, 16, { invariantPrecisionString: "77.12739999999999", invariantCoefficientString: "77.12739999999999", exponent: 0, noOfCoefficientDecimals: 14 }],
|
|
18
|
+
[77.1274, 17, { invariantPrecisionString: "77.127399999999994", invariantCoefficientString: "77.127399999999994", exponent: 0, noOfCoefficientDecimals: 15 }],
|
|
19
|
+
[77.1274, 18, { invariantPrecisionString: "77.1273999999999944", invariantCoefficientString: "77.1273999999999944", exponent: 0, noOfCoefficientDecimals: 16 }],
|
|
20
|
+
[77.1274, 19, { invariantPrecisionString: "77.12739999999999441", invariantCoefficientString: "77.12739999999999441", exponent: 0, noOfCoefficientDecimals: 17 }],
|
|
21
|
+
[77.1274, 20, { invariantPrecisionString: "77.127399999999994407", invariantCoefficientString: "77.127399999999994407", exponent: 0, noOfCoefficientDecimals: 18 }],
|
|
22
|
+
[77.1274, 21, { invariantPrecisionString: "77.1273999999999944066", invariantCoefficientString: "77.1273999999999944066", exponent: 0, noOfCoefficientDecimals: 19 }],
|
|
23
|
+
[0.00000123, 2, { invariantPrecisionString: "0.0000012", invariantCoefficientString: "0.0000012", exponent: 0, noOfCoefficientDecimals: 7 }],
|
|
24
|
+
[0.000000123, 2, { invariantPrecisionString: "1.2e-7", invariantCoefficientString: "1.2", exponent: -7, noOfCoefficientDecimals: 1 }],
|
|
25
|
+
[0.00000123, 21, { invariantPrecisionString: "0.00000123000000000000008198", invariantCoefficientString: "0.00000123000000000000008198", exponent: 0, noOfCoefficientDecimals: 26 }],
|
|
26
|
+
[123456, 3, { invariantPrecisionString: "1.23e+5", invariantCoefficientString: "1.23", exponent: 5, noOfCoefficientDecimals: 2 }],
|
|
27
|
+
[Number.MAX_VALUE, 3, { invariantPrecisionString: "1.80e+308", invariantCoefficientString: "1.80", exponent: 308, noOfCoefficientDecimals: 2 }],
|
|
28
|
+
[123456, 15, { invariantPrecisionString: "123456.000000000", invariantCoefficientString: "123456.000000000", exponent: 0, noOfCoefficientDecimals: 9 }],
|
|
29
|
+
[0, 5, { invariantPrecisionString: "0.00000", invariantCoefficientString: "0.00000", exponent: 0, noOfCoefficientDecimals: 5 }],
|
|
30
|
+
[0.000001, 1, { invariantPrecisionString: "0.000001", invariantCoefficientString: "0.000001", exponent: 0, noOfCoefficientDecimals: 6 }],
|
|
31
|
+
[0.000001, 10, { invariantPrecisionString: "0.000001000000000", invariantCoefficientString: "0.000001000000000", exponent: 0, noOfCoefficientDecimals: 15 }],
|
|
32
|
+
[0.0000001, 10, { invariantPrecisionString: "1.000000000e-7", invariantCoefficientString: "1.000000000", exponent: -7, noOfCoefficientDecimals: 9 }],
|
|
33
|
+
[0.00000000001, 1, { invariantPrecisionString: "1e-11", invariantCoefficientString: "1", exponent: -11, noOfCoefficientDecimals: 0 }],
|
|
34
|
+
[0.00000000001, 2, { invariantPrecisionString: "1.0e-11", invariantCoefficientString: "1.0", exponent: -11, noOfCoefficientDecimals: 1 }],
|
|
35
|
+
[55, 2, { invariantPrecisionString: "55", invariantCoefficientString: "55", exponent: 0, noOfCoefficientDecimals: 0 }],
|
|
36
|
+
[55, 1, { invariantPrecisionString: "6e+1", invariantCoefficientString: "6", exponent: 1, noOfCoefficientDecimals: 0 }],
|
|
37
|
+
[-55, 2, { invariantPrecisionString: "-55", invariantCoefficientString: "-55", exponent: 0, noOfCoefficientDecimals: 0 }],
|
|
38
|
+
[-55, 1, { invariantPrecisionString: "-6e+1", invariantCoefficientString: "-6", exponent: 1, noOfCoefficientDecimals: 0 }],
|
|
39
|
+
[9.59, 1, { invariantPrecisionString: "1e+1", invariantCoefficientString: "1", exponent: 1, noOfCoefficientDecimals: 0 }],
|
|
40
|
+
[9.59, 2, { invariantPrecisionString: "10", invariantCoefficientString: "10", exponent: 0, noOfCoefficientDecimals: 0 }],
|
|
41
|
+
[9.95, 2, { invariantPrecisionString: "10", invariantCoefficientString: "10", exponent: 0, noOfCoefficientDecimals: 0 }],
|
|
42
|
+
[9.96, 2, { invariantPrecisionString: "10", invariantCoefficientString: "10", exponent: 0, noOfCoefficientDecimals: 0 }],
|
|
43
|
+
[-555555555555555555555, 1, { invariantPrecisionString: "-6e+20", invariantCoefficientString: "-6", exponent: 20, noOfCoefficientDecimals: 0 }],
|
|
44
|
+
[-5555555555555555555555, 1, { invariantPrecisionString: "-6e+21", invariantCoefficientString: "-6", exponent: 21, noOfCoefficientDecimals: 0 }],
|
|
45
|
+
[18014398509482012, 21, { invariantPrecisionString: "18014398509482012.0000", invariantCoefficientString: "18014398509482012.0000", exponent: 0, noOfCoefficientDecimals: 4 }],
|
|
46
|
+
[180143985094820121234, 21, { invariantPrecisionString: "180143985094820134912", invariantCoefficientString: "180143985094820134912", exponent: 0, noOfCoefficientDecimals: 0 }],
|
|
47
|
+
[0.1, 21, { invariantPrecisionString: "0.100000000000000005551", invariantCoefficientString: "0.100000000000000005551", exponent: 0, noOfCoefficientDecimals: 21 }],
|
|
48
|
+
[Number.EPSILON, 2, { invariantPrecisionString: "2.2e-16", invariantCoefficientString: "2.2", exponent: -16, noOfCoefficientDecimals: 1 }],
|
|
49
|
+
[Number.EPSILON, 21, { invariantPrecisionString: "2.22044604925031308085e-16", invariantCoefficientString: "2.22044604925031308085", exponent: -16, noOfCoefficientDecimals: 20 }],
|
|
50
|
+
[Number.NaN, 3, { invariantPrecisionString: "NaN", invariantCoefficientString: "NaN", exponent: 0, noOfCoefficientDecimals: 0 }],
|
|
51
|
+
[Number.POSITIVE_INFINITY, 3, { invariantPrecisionString: "Infinity", invariantCoefficientString: "Infinity", exponent: 0, noOfCoefficientDecimals: 0 }],
|
|
52
|
+
[Number.NEGATIVE_INFINITY, 3, { invariantPrecisionString: "-Infinity", invariantCoefficientString: "-Infinity", exponent: 0, noOfCoefficientDecimals: 0 }],
|
|
53
|
+
[164735280, 7, { invariantPrecisionString: "1.647353e+8", invariantCoefficientString: "1.647353", exponent: 8, noOfCoefficientDecimals: 6 }],
|
|
54
|
+
];
|
|
55
|
+
|
|
56
|
+
for (const [value, precision, expectedParts] of data) {
|
|
57
|
+
expect(NumberFormatter.toPrecision(value, precision)).to.equal(expectedParts.invariantPrecisionString);
|
|
58
|
+
|
|
59
|
+
const localePrecisionString = expectedParts.invariantPrecisionString.replace(invariantDecimalSeparator, localeDecimalSeparator);
|
|
60
|
+
expect(NumberFormatter.toLocalePrecision(value, precision)).to.equal(localePrecisionString);
|
|
61
|
+
|
|
62
|
+
const parts = NumberFormatter.getParts(value, precision);
|
|
63
|
+
expect(parts.invariantPrecisionString).to.equal(expectedParts.invariantPrecisionString);
|
|
64
|
+
expect(parts.invariantCoefficientString).to.equal(expectedParts.invariantCoefficientString);
|
|
65
|
+
expect(parts.exponent).to.equal(expectedParts.exponent);
|
|
66
|
+
expect(parts.noOfCoefficientDecimals).to.equal(expectedParts.noOfCoefficientDecimals);
|
|
67
|
+
}
|
|
68
|
+
})
|
|
69
|
+
})
|
|
70
|
+
|
|
71
|
+
describe("toFixed", () => {
|
|
72
|
+
it("should format correctly", () => {
|
|
73
|
+
const data: [number, number, string][] = [
|
|
74
|
+
[0, 0, "0"],
|
|
75
|
+
[0.0, 1, "0.0"],
|
|
76
|
+
[10, 1, "10"],
|
|
77
|
+
[10, 2, "10"],
|
|
78
|
+
[10, 3, "10.0"],
|
|
79
|
+
[10, 4, "10.00"],
|
|
80
|
+
[10.2, 1, "10"],
|
|
81
|
+
[10.2, 2, "10"],
|
|
82
|
+
[10.2, 3, "10.2"],
|
|
83
|
+
[10.2, 4, "10.20"],
|
|
84
|
+
[217887000000, 6, "217887000000"],
|
|
85
|
+
];
|
|
86
|
+
|
|
87
|
+
for (const [value, precision, invariantExpected] of data) {
|
|
88
|
+
expect(NumberFormatter.toFixed(value, precision)).to.equal(invariantExpected);
|
|
89
|
+
|
|
90
|
+
const localeExpected = invariantExpected.replace(invariantDecimalSeparator, localeDecimalSeparator);
|
|
91
|
+
expect(NumberFormatter.toLocaleFixed(value, precision)).to.equal(localeExpected);
|
|
92
|
+
}
|
|
93
|
+
})
|
|
94
|
+
})
|
|
95
|
+
|
|
96
|
+
describe("toLocaleFixed", () => {
|
|
97
|
+
it("should format correctly", () => {
|
|
98
|
+
expect(NumberFormatter.toLocaleFixed(400, 2)).to.equal("400");
|
|
99
|
+
})
|
|
100
|
+
|
|
101
|
+
it("should format correctly with max decimals", () => {
|
|
102
|
+
expect(NumberFormatter.toLocaleFixed(35.123456, 8, 2)).to.equal("35.12");
|
|
103
|
+
expect(NumberFormatter.toLocaleFixed(35.129999, 8, 2)).to.equal("35.13");
|
|
104
|
+
})
|
|
105
|
+
});
|
package/src/number-formatter.ts
CHANGED
|
@@ -1,88 +1,95 @@
|
|
|
1
|
-
export const invariantDecimalSeparator = (0.1).toString()[1];
|
|
2
|
-
export const localeDecimalSeparator = (0.1).toLocaleString()[1];
|
|
3
|
-
|
|
4
|
-
export interface Parts {
|
|
5
|
-
invariantPrecisionString: string;
|
|
6
|
-
invariantCoefficientString: string;
|
|
7
|
-
exponent: number;
|
|
8
|
-
noOfCoefficientDecimals: number;
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
class Formatter {
|
|
12
|
-
public toPrecision(value: number, precision: number) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
1
|
+
export const invariantDecimalSeparator = (0.1).toString()[1];
|
|
2
|
+
export const localeDecimalSeparator = (0.1).toLocaleString()[1];
|
|
3
|
+
|
|
4
|
+
export interface Parts {
|
|
5
|
+
invariantPrecisionString: string;
|
|
6
|
+
invariantCoefficientString: string;
|
|
7
|
+
exponent: number;
|
|
8
|
+
noOfCoefficientDecimals: number;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
class Formatter {
|
|
12
|
+
public toPrecision(value: number, precision: number, maxDecimals?: number) {
|
|
13
|
+
const absValue = Math.abs(value);
|
|
14
|
+
const noOfIntegerDigits = Math.round(absValue).toString().length;
|
|
15
|
+
|
|
16
|
+
// Adjust precision to maxDecimals
|
|
17
|
+
if (maxDecimals !== undefined) {
|
|
18
|
+
precision = Math.min(precision, noOfIntegerDigits + maxDecimals);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
if (value === 0) {
|
|
22
|
+
// (0).toPrecision(1) == "0"
|
|
23
|
+
// (0).toPrecision(2) == "0.0"
|
|
24
|
+
// (0).toPrecision(3) == "0.00"
|
|
25
|
+
// However, we want:
|
|
26
|
+
// Formatter.toPrecision(0, 0) == "0"
|
|
27
|
+
// Formatter.toPrecision(0, 1) == "0.0"
|
|
28
|
+
// Formatter.toPrecision(0, 2) == "0.00"
|
|
29
|
+
return value.toPrecision(precision + 1);
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
if (absValue < 1) {
|
|
33
|
+
return value.toPrecision(precision);
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
return precision >= noOfIntegerDigits
|
|
37
|
+
? value.toFixed(precision - noOfIntegerDigits)
|
|
38
|
+
: value.toPrecision(precision);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
public toLocalePrecision(value: number, precision: number, maxDecimals?: number) {
|
|
42
|
+
return this.toPrecision(value, precision, maxDecimals)
|
|
43
|
+
.replace(invariantDecimalSeparator, localeDecimalSeparator);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
public toFixed(value: number, precision: number, maxDecimals?: number) {
|
|
47
|
+
const parts = this.getParts(value, precision, maxDecimals);
|
|
48
|
+
if (parts.noOfCoefficientDecimals < parts.exponent) {
|
|
49
|
+
const number = parts.invariantCoefficientString.replace(invariantDecimalSeparator, "");
|
|
50
|
+
const zeros = parts.exponent - parts.noOfCoefficientDecimals;
|
|
51
|
+
return `${number}${"0".repeat(zeros)}`;
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
return parts.invariantPrecisionString;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
public toLocaleFixed(value: number, precision: number, maxDecimals?: number) {
|
|
59
|
+
return this.toFixed(value, precision, maxDecimals)
|
|
60
|
+
.replace(invariantDecimalSeparator, localeDecimalSeparator);
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
public getParts(value: number, precision: number, maxDecimals?: number): Parts {
|
|
64
|
+
const precisionString = this.toPrecision(value, precision, maxDecimals);
|
|
65
|
+
if (precisionString.indexOf("e") >= 0) {
|
|
66
|
+
const match = /(.*)e([\+-]\d+)$/.exec(precisionString)!;
|
|
67
|
+
const coefficientString = match[1];
|
|
68
|
+
const exponent = parseInt(match[2]);
|
|
69
|
+
const decimalSeparatorIndex = coefficientString.indexOf(invariantDecimalSeparator);
|
|
70
|
+
const noOfCoefficientDecimals = decimalSeparatorIndex >= 0
|
|
71
|
+
? coefficientString.length - decimalSeparatorIndex - 1
|
|
72
|
+
: 0;
|
|
73
|
+
return {
|
|
74
|
+
invariantPrecisionString: precisionString,
|
|
75
|
+
invariantCoefficientString: coefficientString,
|
|
76
|
+
exponent,
|
|
77
|
+
noOfCoefficientDecimals,
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
const decimalSeparatorIndex = precisionString.indexOf(invariantDecimalSeparator);
|
|
82
|
+
const noOfCoefficientDecimals = decimalSeparatorIndex >= 0
|
|
83
|
+
? precisionString.length - decimalSeparatorIndex - 1
|
|
84
|
+
: 0;
|
|
85
|
+
return {
|
|
86
|
+
invariantPrecisionString: precisionString,
|
|
87
|
+
invariantCoefficientString: precisionString,
|
|
88
|
+
exponent: 0,
|
|
89
|
+
noOfCoefficientDecimals,
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
export const NumberFormatter = new Formatter();
|