Throw error if mask is not an array (text-mask#779)

RxLightningInc · Apr 27, 2018 · 0ab0256 · 0ab0256
1 parent bc45546
commit 0ab0256
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/core/src/conformToMask.js b/core/src/conformToMask.js
@@ -1,9 +1,16 @@
-import {convertMaskToPlaceholder} from './utilities'
+import {convertMaskToPlaceholder, isArray} from './utilities'
 import {placeholderChar as defaultPlaceholderChar} from './constants'
 
+const emptyArray = []
 const emptyString = ''
 
-export default function conformToMask(rawValue = emptyString, mask = emptyString, config = {}) {
+export default function conformToMask(rawValue = emptyString, mask = emptyArray, config = {}) {
+  if (!isArray(mask)) {
+    throw new Error(
+      'Text-mask:conformToMask; The mask property must be an array.'
+    )
+  }
+
   // These configurations tell us how to conform the mask
   const {
     guide = true,

diff --git a/core/src/utilities.js b/core/src/utilities.js
@@ -3,6 +3,12 @@ import {placeholderChar as defaultPlaceholderChar} from './constants'
 const emptyArray = []
 
 export function convertMaskToPlaceholder(mask = emptyArray, placeholderChar = defaultPlaceholderChar) {
+  if (!isArray(mask)) {
+    throw new Error(
+      'Text-mask:convertMaskToPlaceholder; The mask property must be an array.'
+    )
+  }
+
   if (mask.indexOf(placeholderChar) !== -1) {
     throw new Error(
       'Placeholder character must not be used as part of the mask. Please specify a character ' +
@@ -17,6 +23,10 @@ export function convertMaskToPlaceholder(mask = emptyArray, placeholderChar = de
   }).join('')
 }
 
+export function isArray(value) {
+  return (Array.isArray && Array.isArray(value)) || value instanceof Array
+}
+
 export function isString(value) {
   return typeof value === 'string' || value instanceof String
 }