Fix INT for empty string input (#146)

formulajs · Jan 25, 2023 · 96f7325 · 96f7325
1 parent e9e62d4
commit 96f7325
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/utils/common.js b/src/utils/common.js
@@ -353,15 +353,15 @@ export function parseNumber(string) {
     return string
   }
 
-  if (string === undefined || string === null || string === '') {
+  if (string === undefined || string === null) {
     return 0
   }
 
   if (typeof string === 'boolean') {
     string = +string
   }
 
-  if (!isNaN(string)) {
+  if (!isNaN(string) && string !== '') {
     return parseFloat(string)
   }
 

diff --git a/test/math-trig.js b/test/math-trig.js
@@ -372,6 +372,8 @@ describe('Math & Trig', () => {
     expect(mathTrig.INT(error.na)).to.equal(error.na)
     expect(mathTrig.INT(5.5)).to.equal(5)
     expect(mathTrig.INT('invalid')).to.equal(error.value)
+    expect(mathTrig.INT('')).to.equal(error.value)
+    expect(mathTrig.INT(true)).to.equal(1)
   })
 
   it('ISO.CEILING', () => {

diff --git a/test/utils/common.js b/test/utils/common.js
@@ -332,15 +332,15 @@ describe('Utils => Common', () => {
     it('parseNumber', () => {
       expect(utils.parseNumber()).to.equal(0)
       expect(utils.parseNumber(null)).to.equal(0)
-      expect(utils.parseNumber('')).to.equal(0)
+      expect(utils.parseNumber('')).to.equal(error.value)
       expect(utils.parseNumber(2)).to.equal(2)
       expect(utils.parseNumber(error.na)).to.equal(error.na)
       expect(utils.parseNumber('text')).to.equal(error.value)
     })
 
     it('parseNumberArray', () => {
       expect(utils.parseNumberArray()).to.equal(error.value)
-      expect(utils.parseNumberArray([2, 0, '', null, undefined])).to.eql([2, 0, 0, 0, 0])
+      expect(utils.parseNumberArray([2, 0, '', null, undefined])).to.eql(error.value)
       expect(utils.parseNumberArray([2, 'a', 1, error.na])).to.equal(error.na)
       expect(utils.parseNumberArray([2, 'a', 1])).to.equal(error.value)
     })