From 0c10313443c58e93955d47dd4f5c12520cdd8a1e Mon Sep 17 00:00:00 2001 From: Mohamed Heiba Date: Wed, 13 Mar 2019 22:43:38 +0300 Subject: [PATCH 1/2] Added the Bahrain locale (ar-BH). --- lib/isMobilePhone.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/isMobilePhone.js b/lib/isMobilePhone.js index b72cddadc..e9a1f0452 100644 --- a/lib/isMobilePhone.js +++ b/lib/isMobilePhone.js @@ -13,6 +13,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de /* eslint-disable max-len */ var phones = { 'ar-AE': /^((\+?971)|0)?5[024568]\d{7}$/, + 'ar-BH': /^(\+?973)?3[0-9]\d{6}$/, 'ar-DZ': /^(\+?213|0)(5|6|7)\d{8}$/, 'ar-EG': /^((\+?20)|0)?1[012]\d{8}$/, 'ar-IQ': /^(\+?964|0)?7[0-9]\d{8}$/, @@ -129,4 +130,4 @@ function isMobilePhone(str, locale, options) { } var locales = Object.keys(phones); -exports.locales = locales; \ No newline at end of file +exports.locales = locales; From ab8222862a7bfbada4b5b83b8ccc114fa912ba88 Mon Sep 17 00:00:00 2001 From: Mohamed Heiba Date: Wed, 13 Mar 2019 22:47:31 +0300 Subject: [PATCH 2/2] npm test caused the deletion of prototype functions in validator.js file --- validator.js | 185 --------------------------------------------------- 1 file changed, 185 deletions(-) diff --git a/validator.js b/validator.js index 7a32e3bb2..20c944b64 100644 --- a/validator.js +++ b/validator.js @@ -40,191 +40,6 @@ function _typeof(obj) { return _typeof(obj); } -function _toArray(arr) { - return _arrayWithHoles(arr) || _iterableToArray(arr) || _nonIterableRest(); -} - -function _arrayWithHoles(arr) { - if (Array.isArray(arr)) return arr; -} - -function _iterableToArray(iter) { - if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); -} - -function _nonIterableRest() { - throw new TypeError("Invalid attempt to destructure non-iterable instance"); -} - -function _toPrimitive(input, hint) { - if (typeof input !== "object" || input === null) return input; - var prim = input[Symbol.toPrimitive]; - - if (prim !== undefined) { - var res = prim.call(input, hint || "default"); - if (typeof res !== "object") return res; - throw new TypeError("@@toPrimitive must return a primitive value."); - } - - return (hint === "string" ? String : Number)(input); -} - -function _toPropertyKey(arg) { - var key = _toPrimitive(arg, "string"); - - return typeof key === "symbol" ? key : String(key); -} - -function _addElementPlacement(element, placements, silent) { - var keys = placements[element.placement]; - - if (!silent && keys.indexOf(element.key) !== -1) { - throw new TypeError("Duplicated element (" + element.key + ")"); - } - - keys.push(element.key); -} - -function _fromElementDescriptor(element) { - var obj = { - kind: element.kind, - key: element.key, - placement: element.placement, - descriptor: element.descriptor - }; - var desc = { - value: "Descriptor", - configurable: true - }; - Object.defineProperty(obj, Symbol.toStringTag, desc); - if (element.kind === "field") obj.initializer = element.initializer; - return obj; -} - -function _toElementDescriptors(elementObjects) { - if (elementObjects === undefined) return; - return _toArray(elementObjects).map(function (elementObject) { - var element = _toElementDescriptor(elementObject); - - _disallowProperty(elementObject, "finisher", "An element descriptor"); - - _disallowProperty(elementObject, "extras", "An element descriptor"); - - return element; - }); -} - -function _toElementDescriptor(elementObject) { - var kind = String(elementObject.kind); - - if (kind !== "method" && kind !== "field") { - throw new TypeError('An element descriptor\'s .kind property must be either "method" or' + ' "field", but a decorator created an element descriptor with' + ' .kind "' + kind + '"'); - } - - var key = _toPropertyKey(elementObject.key); - - var placement = String(elementObject.placement); - - if (placement !== "static" && placement !== "prototype" && placement !== "own") { - throw new TypeError('An element descriptor\'s .placement property must be one of "static",' + ' "prototype" or "own", but a decorator created an element descriptor' + ' with .placement "' + placement + '"'); - } - - var descriptor = elementObject.descriptor; - - _disallowProperty(elementObject, "elements", "An element descriptor"); - - var element = { - kind: kind, - key: key, - placement: placement, - descriptor: Object.assign({}, descriptor) - }; - - if (kind !== "field") { - _disallowProperty(elementObject, "initializer", "A method descriptor"); - } else { - _disallowProperty(descriptor, "get", "The property descriptor of a field descriptor"); - - _disallowProperty(descriptor, "set", "The property descriptor of a field descriptor"); - - _disallowProperty(descriptor, "value", "The property descriptor of a field descriptor"); - - element.initializer = elementObject.initializer; - } - - return element; -} - -function _toElementFinisherExtras(elementObject) { - var element = _toElementDescriptor(elementObject); - - var finisher = _optionalCallableProperty(elementObject, "finisher"); - - var extras = _toElementDescriptors(elementObject.extras); - - return { - element: element, - finisher: finisher, - extras: extras - }; -} - -function _fromClassDescriptor(elements) { - var obj = { - kind: "class", - elements: elements.map(_fromElementDescriptor) - }; - var desc = { - value: "Descriptor", - configurable: true - }; - Object.defineProperty(obj, Symbol.toStringTag, desc); - return obj; -} - -function _toClassDescriptor(obj) { - var kind = String(obj.kind); - - if (kind !== "class") { - throw new TypeError('A class descriptor\'s .kind property must be "class", but a decorator' + ' created a class descriptor with .kind "' + kind + '"'); - } - - _disallowProperty(obj, "key", "A class descriptor"); - - _disallowProperty(obj, "placement", "A class descriptor"); - - _disallowProperty(obj, "descriptor", "A class descriptor"); - - _disallowProperty(obj, "initializer", "A class descriptor"); - - _disallowProperty(obj, "extras", "A class descriptor"); - - var finisher = _optionalCallableProperty(obj, "finisher"); - - var elements = _toElementDescriptors(obj.elements); - - return { - elements: elements, - finisher: finisher - }; -} - -function _disallowProperty(obj, name, objectType) { - if (obj[name] !== undefined) { - throw new TypeError(objectType + " can't have a ." + name + " property."); - } -} - -function _optionalCallableProperty(obj, name) { - var value = obj[name]; - - if (value !== undefined && typeof value !== "function") { - throw new TypeError("Expected '" + name + "' to be a function"); - } - - return value; -} - function assertString(input) { var isString = typeof input === 'string' || input instanceof String;