fix(tokens): setting new tokens locally should not remove defaults

Author: RonaldJerez

__tests__/masker.test.js

@@ -1,5 +1,9 @@
 import masker, { setTokens } from '../src/masker'
 
+const tokens = {
+  'F': { pattern: /[a-f0-9]/i },
+}
+
 test('no mask given', () => {
   expect(masker('123')).toMatchObject({masked: '123', raw: '123'})
 })
@@ -14,10 +18,12 @@ test('multiple mask given', () => {
   expect(masker('123', config)).toMatchObject({ masked: '12.3', raw: '123' })
 })
 
-test('should override default tokens', () => {
-  const tokens = {
-    'F': { pattern: /[a-f0-9]/i },
-  }
+test('should just append to the tokens when passing them in locally', () => {
+  expect(masker('456DDS', { mask: '###-FFFF', tokens })).toMatchObject({ masked: '456-DD', raw: '456DD' })
+})
+
+test('should override default tokens globally', () => {
   setTokens(tokens)
-  expect(masker('1DFS', { mask: '#FFFF'})).toMatchObject({ masked: '#1DF', raw: '1DF' })
-})
+  expect(masker('456DDS', { mask: '###-FFFF'})).toMatchObject({ masked: '###-456D', raw: '456D' })
+})
+

src/masker.js

@@ -29,7 +29,10 @@ export function dynamic(value, config = {}) {
 }
 
 export function formatter(value = '', config = {}) {
-  const { mask = '', tokens = tokenDefinitions, short = false } = config
+  let { mask = '', tokens, short = false } = config
+
+  // append/override global tokens instead of complete override
+  tokens = tokens ? Object.assign({}, tokenDefinitions, tokens) : tokenDefinitions
 
   // ensure we have a string
   value = value.toString()