amountutil 1.0.0 → 2.0.2

package/AmountUtil.js

@@ -2,7 +2,7 @@ class AmountUtil {
     #amount = ''
 
     constructor(amount) {
-        this.#amount = amount
+        this.#amount = amount + ''
     }
 
     #compare = (num1, num2) => {
@@ -43,6 +43,16 @@ class AmountUtil {
             return 1
         }
 
+        num1 = num1.replace(/^0+/, '')
+        num2 = num2.replace(/^0+/, '')
+
+        if (num1.includes('.')) {
+            num1 = num1.replace(/0+$/, '')
+        }
+        if (num2.includes('.')) {
+            num2 = num2.replace(/0+$/, '')
+        }
+
         if (!num1.includes('.')) {
             num1 += '.0'
         }
@@ -436,13 +446,13 @@ class AmountUtil {
             
             if (this.#compare(curDividend, divisor) === 1 || this.#compare(curDividend, divisor) === 0) {
                 let n = '1'
-                while (this.#compare(this.#multiply(divisor, n.toString()), curDividend) === -1) {
+                while (this.#compare(this.#multiply(divisor, n), curDividend) === -1) {
                     n = this.#plus(n, '1')
                 }
 
-                if (this.#compare(curDividend, divisor) === 0) {
+                if (this.#compare(curDividend, this.#multiply(divisor, n)) === 0) {
                     result += n
-                    curDividend = '0'
+                    curDividend = ''
                 } else {
                     result += this.#minus(n, '1')
                     curDividend = this.#minus(curDividend, this.#multiply(divisor, this.#minus(n, '1')))
@@ -464,8 +474,20 @@ class AmountUtil {
             result = this.#round(result, precision)
         } else {
             let decimalLength = result.match(/\.(\d+)/)[1].length
-            if (this.#compare(decimalLength, precision) === 1) {
-                result = this.#round(result, precision)
+
+            if (decimalLength !== null || decimalLength !== undefined || decimalLength !== 0) {
+                result = result.replace(/0+$/, '')
+
+                if (result[result.length - 1] === '.') result = result.slice(0, -1)
+
+                if (result.match(/\.(\d+)/)) decimalLength = result.match(/\.(\d+)/)[1].length
+                else decimalLength = 0
+            }
+
+            if (decimalLength !== null || decimalLength !== undefined || decimalLength !== 0) {
+                if (this.#compare(decimalLength, precision) === 1) {
+                    result = this.#round(result, precision)
+                }
             }
         }
 
@@ -624,7 +646,7 @@ class AmountUtil {
     }
 
     compare = (num) => {
-        return this.#compare(this.#amount, num)
+        return this.#compare(this.#amount, num.toString())
     }
 
     toFixed = (precision) => {
@@ -632,22 +654,22 @@ class AmountUtil {
     }
 
     add = (num) => {
-        this.#amount = this.#plus(this.#amount, num)
+        this.#amount = this.#plus(this.#amount, num.toString())
         return this
     }
 
     subtract = (num) => {
-        this.#amount = this.#minus(this.#amount, num)
+        this.#amount = this.#minus(this.#amount, num.toString())
         return this
     }
 
     multiply = (num) => {
-        this.#amount = this.#multiply(this.#amount, num)
+        this.#amount = this.#multiply(this.#amount, num.toString())
         return this
     }
 
     divide = (num, precision = 19, calculatedRound = false) => {
-        this.#amount = this.#divide(this.#amount, num, precision, calculatedRound)
+        this.#amount = this.#divide(this.#amount, num.toString(), precision, calculatedRound)
         return this
     }
 
@@ -659,6 +681,14 @@ class AmountUtil {
         return this.#thousandSeparator(this.#amount)
     }
 
+    static of(amount) {
+        return new AmountUtil(amount)
+    }
+    
+    static create(amount) {
+        return new AmountUtil(amount)
+    }
+
     toString = () => {
         return this.#amount
     }

package/README.md

@@ -1,26 +1,27 @@
-# AmountUtil
+# AmountUtil 金额工具
  
+这是一个可以帮助你管理金额的工具，且我们引入了一个非常强大的中文金额翻译功能。
 The util that can help you to manage about amount,we have introduced a very powerful Chinese amount translation feature.
  
-## Installation
+## Installation 安装
  
 ```bash
 npm install amountutil
 ```
 
-## Usage
+## Usage 使用
 
 ```javascript
 const AmountUtil = require('amountutil');
 
 // 转换为中文金额
-let amount = new AmountUtil(123456.78);
+let amount = AmountUtil.of(123456.78); // of方法、create方法可传入字符串，返回的是AmountUtil实例
 const chineseAmount = amount.translateAmount();
 console.log(chineseAmount); // 输出："壹拾贰万叁仟肆佰伍拾陆元柒角捌分"
 
-// 大数加减乘除
-let amount1 = new AmountUtil(123456.78);
-let sum = amount1.add(98765.43);
+// 大数加减乘除，加减乘除方法返回的是实例本身，即可以链式调用加减乘除
+let amount1 = AmountUtil.of(123456.78);
+let sum = amount1.add(AmountUtil.of(98765.43)); // 此处可以直接写数字：amount1.add(98765.43)
 console.log(sum.toString()); // 输出：222222.21
 
 let diff = amount1.subtract(98765.43);
@@ -36,4 +37,18 @@ console.log(quotient.toString()); // 输出：123456.78
 console.log(amount1.compare(98765.43)); // 输出：1
 console.log(amount1.toFixed(1)); // 输出：123456.8
 console.log(amount1.toLocaleString()); // 输出：123,456.78
+
+// 注：除法默认保留19位小数，可通过第二个参数指定保留小数位数，第三个参数指定是否四舍五入
+let amount2 = AmountUtil.create(100);
+let quotient2 = amount2.divide(10, precision = 2, true);
+console.log(quotient2.toString()); // 输出：10.00
+
+let amount3 = AmountUtil.create(100);
+let quotient3 = amount3.divide(10, precision = 2, false);
+console.log(quotient3.toString()); // 输出：10
+
+// precision用于无限循环小数的情况，对于可以整除的情况，可以考虑加入第三个参数来确定是否保留小数位数，如下
+let amount4 = AmountUtil.create(120.323);
+let quotient4 = amount4.divide(3, precision = 21); // 不传precision参数，默认保留19位小数，第三个参数默认为false，此时传递true时，不会有影响，因为precision参数已经影响了小数位数
+console.log(quotient4.toString()); // 输出：40.107666666666666666667
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amountutil",
-  "version": "1.0.0",
+  "version": "2.0.2",
   "description": "The util that can help you to manage about amount,we have introduced a very powerful Chinese amount translation feature.",
   "main": "AmountUtil.js",
   "scripts": {