updated directive and exported number format

Dipak Sarkar · Dipak Sarkar · commit 54b2e2a8242c · 2021-10-18T20:38:30.000+05:30
diff --git a/src/component.vue b/src/component.vue
@@ -20,9 +20,9 @@ export default {
       required: true,
       type: [Number, String]
     },
-    null_value: {
+    nullValue: {
       type: [Number, String],
-      default: () => options.null_value
+      default: () => options.nullValue
     },
     masked: {
       type: Boolean,
diff --git a/src/core.js b/src/core.js
@@ -75,9 +75,9 @@ export function updateValue(el, vnode, { emit = true, force = false, clean = fal
   oldValue = oldValue || ''
   currentValue = currentValue || ''
 
-  const number = new NumberFormat(config).clean(clean)
+  const number = new NumberFormat(config).clean(clean && !config.reverseFill)
   let masked = number.format(currentValue)
-  let unmasked = number.clean(true).unformat(currentValue)
+  let unmasked = number.clean(!config.reverseFill).unformat(currentValue)
 
   // check value with in range max and min value
   if (clean) {
@@ -90,6 +90,8 @@ export function updateValue(el, vnode, { emit = true, force = false, clean = fal
     }
   }
 
+  console.log(unmasked, masked)
+
   if (force || oldValue !== currentValue) {
     el[CONFIG_KEY].oldValue = masked
     el.unmaskedValue = unmasked
diff --git a/src/index.js b/src/index.js
@@ -1,8 +1,10 @@
 import Number from './component.vue'
 import VNumber from './directive'
 import options from './options'
+import NumberFormat from './number-format'
 
 export {
+  NumberFormat,
   Number,
   VNumber,
   options
diff --git a/src/number-format.js b/src/number-format.js
@@ -60,7 +60,13 @@ export default function NumberFormat(config = options) {
     return this.number
   }
 
-  this.realNumber = () => this.toNumber(this.numbers().toString().replace(this.options.decimal, '.'))
+  this.realNumber = () => {
+    const number = this.numbers().toString().replace(this.options.decimal, '.')
+    if (this.options.reverseFill) {
+      return number
+    }
+    return this.toNumber(number)
+  }
 
   this.parts = (number = '', decimal = this.options.decimal) => {
     var parts = number.toString().split(decimal)
@@ -91,9 +97,9 @@ export default function NumberFormat(config = options) {
    * @return {String}
    */
   this.format = (input) => {
-    if (input === '') return this.options.null_value
-    this.input = input || this.options.null_value
-    if (this.isNull()) return this.options.null_value
+    if (input === '') return this.options.nullValue
+    this.input = input || this.options.nullValue
+    if (this.isNull()) return this.options.nullValue
     return this.sign() + this.options.prefix + this.addSeparator() + this.options.suffix
   }
 
@@ -103,9 +109,9 @@ export default function NumberFormat(config = options) {
    * @return {String}
    */
   this.unformat = (input) => {
-    if (input === '') return this.options.null_value
-    this.input = input || this.options.null_value
-    if (this.isNull()) return this.options.null_value
-    return this.toNumber(this.sign() + this.realNumber())
+    if (input === '') return this.options.nullValue
+    this.input = input || this.options.nullValue
+    if (this.isNull()) return this.options.nullValue
+    return this.sign() + this.realNumber()
   }
 }
diff --git a/src/options.js b/src/options.js
@@ -8,5 +8,5 @@ export default {
   reverseFill: false,
   min: false,
   max: false,
-  null_value: ''
+  nullValue: ''
 }
diff --git a/tests/unit/number-format.custom.spec.js b/tests/unit/number-format.custom.spec.js
@@ -91,27 +91,27 @@ describe('unformat when options are default', () => {
     null_value: '',
   })
   it('unformat string value', () => {
-    expect(numberFormat.clean(true).unformat('0')).toEqual(0)
-    expect(numberFormat.clean(true).unformat('0,')).toEqual(0)
-    expect(numberFormat.clean(true).unformat('-0,0')).toEqual(0)
-    expect(numberFormat.clean(true).unformat('0,10')).toEqual(0.1)
-    expect(numberFormat.clean(true).unformat('0,0-')).toEqual(0)
-    expect(numberFormat.clean(true).unformat('0,10-')).toEqual(-0.1)
-    expect(numberFormat.clean(true).unformat('12.345,54921')).toEqual(12345.55)
-    expect(numberFormat.clean(true).unformat('--12.345,12345')).toEqual(-12345.12)
-    expect(numberFormat.clean(true).unformat('12.345.54321,12345')).toEqual(1234554321.12)
-    expect(numberFormat.clean(true).unformat('-12.345,,54321-')).toEqual(-12345.54)
+    expect(numberFormat.clean(true).unformat('0')).toEqual('0')
+    expect(numberFormat.clean(true).unformat('0,')).toEqual('0')
+    expect(numberFormat.clean(true).unformat('-0,0')).toEqual('0')
+    expect(numberFormat.clean(true).unformat('0,10')).toEqual('0.1')
+    expect(numberFormat.clean(true).unformat('0,0-')).toEqual('0')
+    expect(numberFormat.clean(true).unformat('0,10-')).toEqual('-0.1')
+    expect(numberFormat.clean(true).unformat('12.345,54921')).toEqual('12345.55')
+    expect(numberFormat.clean(true).unformat('--12.345,12345')).toEqual('-12345.12')
+    expect(numberFormat.clean(true).unformat('12.345.54321,12345')).toEqual('1234554321.12')
+    expect(numberFormat.clean(true).unformat('-12.345,,54321-')).toEqual('-12345.54')
   })
   it('unformat numerical value', () => {
     expect(numberFormat.clean(true).unformat(0)).toEqual('')
     expect(numberFormat.clean(true).unformat(0.)).toEqual('')
     expect(numberFormat.clean(true).unformat(0.0)).toEqual('')
-    expect(numberFormat.clean(true).unformat(-0.10)).toEqual(-0.1)
+    expect(numberFormat.clean(true).unformat(-0.10)).toEqual('-0.1')
     expect(numberFormat.clean(true).unformat(-0.0)).toEqual('')
-    expect(numberFormat.clean(true).unformat(0.10)).toEqual(0.1)
-    expect(numberFormat.clean(true).unformat(12345.54921)).toEqual(12345.55)
-    expect(numberFormat.clean(true).unformat(12345.12345)).toEqual(12345.12)
-    expect(numberFormat.clean(true).unformat(12345.54321)).toEqual(12345.54)
-    expect(numberFormat.clean(true).unformat(12345.54321)).toEqual(12345.54)
+    expect(numberFormat.clean(true).unformat(0.10)).toEqual('0.1')
+    expect(numberFormat.clean(true).unformat(12345.54921)).toEqual('12345.55')
+    expect(numberFormat.clean(true).unformat(12345.12345)).toEqual('12345.12')
+    expect(numberFormat.clean(true).unformat(12345.54321)).toEqual('12345.54')
+    expect(numberFormat.clean(true).unformat(12345.54321)).toEqual('12345.54')
   })
 })
diff --git a/tests/unit/number-format.default.spec.js b/tests/unit/number-format.default.spec.js
@@ -69,27 +69,27 @@ describe('format when options are default', () => {
 describe('unformat when options are default', () => {
   const numberFormat = new NumberFormat({})
   it('unformat string value', () => {
-    expect(numberFormat.clean(true).unformat('0')).toEqual(0)
-    expect(numberFormat.clean(true).unformat('0.')).toEqual(0)
-    expect(numberFormat.clean(true).unformat('-0.0')).toEqual(0)
-    expect(numberFormat.clean(true).unformat('0.10')).toEqual(0.1)
-    expect(numberFormat.clean(true).unformat('0.0-')).toEqual(0)
-    expect(numberFormat.clean(true).unformat('0.10-')).toEqual(-0.1)
-    expect(numberFormat.clean(true).unformat('12,345.54921')).toEqual(12345.55)
-    expect(numberFormat.clean(true).unformat('--12,345.12345')).toEqual(-12345.12)
-    expect(numberFormat.clean(true).unformat('12,345.54321.12345')).toEqual(12345.54)
-    expect(numberFormat.clean(true).unformat('-12,345..54321-')).toEqual(-12345.54)
+    expect(numberFormat.clean(true).unformat('0')).toEqual('0')
+    expect(numberFormat.clean(true).unformat('0.')).toEqual('0')
+    expect(numberFormat.clean(true).unformat('-0.0')).toEqual('0')
+    expect(numberFormat.clean(true).unformat('0.10')).toEqual('0.1')
+    expect(numberFormat.clean(true).unformat('0.0-')).toEqual('0')
+    expect(numberFormat.clean(true).unformat('0.10-')).toEqual('-0.1')
+    expect(numberFormat.clean(true).unformat('12,345.54921')).toEqual('12345.55')
+    expect(numberFormat.clean(true).unformat('--12,345.12345')).toEqual('-12345.12')
+    expect(numberFormat.clean(true).unformat('12,345.54321.12345')).toEqual('12345.54')
+    expect(numberFormat.clean(true).unformat('-12,345..54321-')).toEqual('-12345.54')
   })
   it('unformat numerical value', () => {
     expect(numberFormat.clean(true).unformat(0)).toEqual('')
     expect(numberFormat.clean(true).unformat(0.)).toEqual('')
     expect(numberFormat.clean(true).unformat(0.0)).toEqual('')
-    expect(numberFormat.clean(true).unformat(-0.10)).toEqual(-0.1)
+    expect(numberFormat.clean(true).unformat(-0.10)).toEqual('-0.1')
     expect(numberFormat.clean(true).unformat(-0.0)).toEqual('')
-    expect(numberFormat.clean(true).unformat(0.10)).toEqual(0.1)
-    expect(numberFormat.clean(true).unformat(12345.54921)).toEqual(12345.55)
-    expect(numberFormat.clean(true).unformat(12345.12345)).toEqual(12345.12)
-    expect(numberFormat.clean(true).unformat(12345.54321)).toEqual(12345.54)
-    expect(numberFormat.clean(true).unformat(12345.54321)).toEqual(12345.54)
+    expect(numberFormat.clean(true).unformat(0.10)).toEqual('0.1')
+    expect(numberFormat.clean(true).unformat(12345.54921)).toEqual('12345.55')
+    expect(numberFormat.clean(true).unformat(12345.12345)).toEqual('12345.12')
+    expect(numberFormat.clean(true).unformat(12345.54321)).toEqual('12345.54')
+    expect(numberFormat.clean(true).unformat(12345.54321)).toEqual('12345.54')
   })
 })
diff --git a/tests/unit/number-format.reverse-fill.spec.js b/tests/unit/number-format.reverse-fill.spec.js
@@ -11,10 +11,10 @@ describe('when enabled reverse fill', () => {
     expect(numberFormat.format('-1234.6512')).toEqual('-123,465.12')
   })
   it('should return as follows', () => {
-    expect(numberFormat.unformat('sdfgasd55468.546')).toEqual(554685.46)
-    expect(numberFormat.unformat('sdfgasd55468.546')).toEqual(554685.46)
-    expect(numberFormat.unformat('sdfgasd55468.546-')).toEqual(-554685.46)
-    expect(numberFormat.unformat('-1234.6512')).toEqual(-123465.12)
+    expect(numberFormat.unformat('sdfgasd55468.546')).toEqual('554685.46')
+    expect(numberFormat.unformat('sdfgasd55468.546')).toEqual('554685.46')
+    expect(numberFormat.unformat('sdfgasd55468.546-')).toEqual('-554685.46')
+    expect(numberFormat.unformat('-1234.6512')).toEqual('-123465.12')
   })
 })
 

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ export default {`
`8`	`8`	`reverseFill: false,`
`9`	`9`	`min: false,`
`10`	`10`	`max: false,`
`11`		`- null_value: ''`
	`11`	`+ nullValue: ''`
`12`	`12`	`}`