From 0990d16291209d556e8db06e7b6cacdac46535d4 Mon Sep 17 00:00:00 2001 From: Gaetan Leerman Date: Thu, 25 Aug 2016 13:34:25 +0200 Subject: [PATCH 1/2] Added support for Belgian phone numbers --- README.md | 2 +- lib/isMobilePhone.js | 4 +++- src/lib/isMobilePhone.js | 2 ++ test/validators.js | 48 ++++++++++++++++++++++++++++++++++++++++ validator.js | 4 +++- validator.min.js | 2 +- 6 files changed, 58 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 911d3b530..33564996a 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Passing anything other than a string is an error. - **equals(str, comparison)** - check if the string matches the comparison. - **isAfter(str [, date])** - check if the string is a date that's after the specified date (defaults to now). - **isAlpha(str [, locale])** - check if the string contains only letters (a-zA-Z). Locale is one of `['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG', 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE', 'cs-CZ', 'de-DE', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR', 'hu-HU', 'nl-NL', 'pl-PL', 'pt-PT', 'ru-RU', 'tr-TR']`) and defaults to `en-US`. -- **isAlphanumeric(str [, locale])** - check if the string contains only letters and numbers. Locale is one of `['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG', 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE', 'cs-CZ', 'de-DE', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR', 'hu-HU', 'nl-NL', 'pl-PL', 'pt-PT', 'ru-RU', 'tr-TR']`) and defaults to `en-US`. +- **isAlphanumeric(str [, locale])** - check if the string contains only letters and numbers. Locale is one of `['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG', 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE', 'cs-CZ', 'de-DE', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR', 'fr-BE', 'hu-HU', 'nl-BE', 'nl-NL', 'pl-PL', 'pt-PT', 'ru-RU', 'tr-TR']`) and defaults to `en-US`. - **isAscii(str)** - check if the string contains ASCII chars only. - **isBase64(str)** - check if a string is base64 encoded. - **isBefore(str [, date])** - check if the string is a date that's before the specified date. diff --git a/lib/isMobilePhone.js b/lib/isMobilePhone.js index 95b460484..87799342f 100644 --- a/lib/isMobilePhone.js +++ b/lib/isMobilePhone.js @@ -34,6 +34,7 @@ var phones = { 'hu-HU': /^(\+?36)(20|30|70)\d{7}$/, 'ms-MY': /^(\+?6?01){1}(([145]{1}(\-|\s)?\d{7,8})|([236789]{1}(\s|\-)?\d{7}))$/, 'nb-NO': /^(\+?47)?[49]\d{7}$/, + 'nl-BE': /^(\+?32|0)4?\d{8}$/, 'nn-NO': /^(\+?47)?[49]\d{7}$/, 'pl-PL': /^(\+?48)? ?[5-8]\d ?\d{3} ?\d{2} ?\d{2}$/, 'pt-BR': /^(\+?55|0)\-?[1-9]{2}\-?[2-9]{1}\d{3,4}\-?\d{4}$/, @@ -48,6 +49,7 @@ var phones = { // aliases phones['en-CA'] = phones['en-US']; +phones['fr-BE'] = phones['nl-BE']; function isMobilePhone(str, locale) { (0, _assertString2.default)(str); @@ -56,4 +58,4 @@ function isMobilePhone(str, locale) { } return false; } -module.exports = exports['default']; \ No newline at end of file +module.exports = exports['default']; diff --git a/src/lib/isMobilePhone.js b/src/lib/isMobilePhone.js index 42db9c959..0a40f47a7 100644 --- a/src/lib/isMobilePhone.js +++ b/src/lib/isMobilePhone.js @@ -23,6 +23,7 @@ const phones = { 'hu-HU': /^(\+?36)(20|30|70)\d{7}$/, 'ms-MY': /^(\+?6?01){1}(([145]{1}(\-|\s)?\d{7,8})|([236789]{1}(\s|\-)?\d{7}))$/, 'nb-NO': /^(\+?47)?[49]\d{7}$/, + 'nl-BE': /^(\+?32|0)4?\d{8}$/, 'nn-NO': /^(\+?47)?[49]\d{7}$/, 'pl-PL': /^(\+?48)? ?[5-8]\d ?\d{3} ?\d{2} ?\d{2}$/, 'pt-BR': /^(\+?55|0)\-?[1-9]{2}\-?[2-9]{1}\d{3,4}\-?\d{4}$/, @@ -37,6 +38,7 @@ const phones = { // aliases phones['en-CA'] = phones['en-US']; +phones['fr-BE'] = phones['nl-BE']; export default function isMobilePhone(str, locale) { assertString(str); diff --git a/test/validators.js b/test/validators.js index d77b0ca7b..eb5ae5ede 100644 --- a/test/validators.js +++ b/test/validators.js @@ -2348,6 +2348,54 @@ describe('Validators', function () { ], args: ['ms-MY'], }); + + test({ + validator: 'isMobilePhone', + valid: [ + '0470123456', + '+32470123456', + '32470123456', + '021234567', + '+3221234567', + '3221234567', + ], + invalid: [ + '12345', + '+3212345', + '3212345', + '04701234567', + '+3204701234567', + '3204701234567', + '0212345678', + '+320212345678', + '320212345678' + ], + args: ['fr-BE'], + }); + + test({ + validator: 'isMobilePhone', + valid: [ + '0470123456', + '+32470123456', + '32470123456', + '021234567', + '+3221234567', + '3221234567', + ], + invalid: [ + '12345', + '+3212345', + '3212345', + '04701234567', + '+3204701234567', + '3204701234567', + '0212345678', + '+320212345678', + '320212345678' + ], + args: ['nl-BE'], + }); }); it('should validate currency', function () { diff --git a/validator.js b/validator.js index f3f53da98..a500e15d0 100644 --- a/validator.js +++ b/validator.js @@ -888,6 +888,7 @@ 'hu-HU': /^(\+?36)(20|30|70)\d{7}$/, 'ms-MY': /^(\+?6?01){1}(([145]{1}(\-|\s)?\d{7,8})|([236789]{1}(\s|\-)?\d{7}))$/, 'nb-NO': /^(\+?47)?[49]\d{7}$/, + 'nl-BE': /^(\+?32|0)4?\d{8}$/, 'nn-NO': /^(\+?47)?[49]\d{7}$/, 'pl-PL': /^(\+?48)? ?[5-8]\d ?\d{3} ?\d{2} ?\d{2}$/, 'pt-BR': /^(\+?55|0)\-?[1-9]{2}\-?[2-9]{1}\d{3,4}\-?\d{4}$/, @@ -902,6 +903,7 @@ // aliases phones['en-CA'] = phones['en-US']; + phones['fr-BE'] = phones['nl-BE']; function isMobilePhone(str, locale) { assertString(str); @@ -1128,4 +1130,4 @@ return validator; -})); \ No newline at end of file +})); diff --git a/validator.min.js b/validator.min.js index 0d665786b..f578a9f99 100644 --- a/validator.min.js +++ b/validator.min.js @@ -20,4 +20,4 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.validator=t()}(this,function(){"use strict";function e(e){if("string"!=typeof e)throw new TypeError("This library (validator.js) validates strings only")}function t(t){return e(t),t=Date.parse(t),isNaN(t)?null:new Date(t)}function r(t){return e(t),parseFloat(t)}function n(t,r){return e(t),parseInt(t,r||10)}function i(t,r){return e(t),r?"1"===t||"true"===t:"0"!==t&&"false"!==t&&""!==t}function o(t,r){return e(t),t===r}function a(e){return"object"===("undefined"==typeof e?"undefined":de(e))&&null!==e?e="function"==typeof e.toString?e.toString():"[object Object]":(null===e||"undefined"==typeof e||isNaN(e)&&!e.length)&&(e=""),String(e)}function u(t,r){return e(t),t.indexOf(a(r))>=0}function s(t,r,n){return e(t),"[object RegExp]"!==Object.prototype.toString.call(r)&&(r=new RegExp(r,n)),r.test(t)}function l(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0],t=arguments[1];for(var r in t)"undefined"==typeof e[r]&&(e[r]=t[r]);return e}function f(t,r){e(t);var n=void 0,i=void 0;"object"===("undefined"==typeof r?"undefined":de(r))?(n=r.min||0,i=r.max):(n=arguments[1],i=arguments[2]);var o=encodeURI(t).split(/%..|./).length-1;return o>=n&&("undefined"==typeof i||o<=i)}function d(t,r){e(t),r=l(r,ce),r.allow_trailing_dot&&"."===t[t.length-1]&&(t=t.substring(0,t.length-1));var n=t.split(".");if(r.require_tld){var i=n.pop();if(!n.length||!/^([a-z\u00a1-\uffff]{2,}|xn[a-z0-9-]{2,})$/i.test(i))return!1}for(var o,a=0;au)return!1;if("::"===t)return!0;"::"===t.substr(0,2)?(i.shift(),i.shift(),o=!0):"::"===t.substr(t.length-2)&&(i.pop(),i.pop(),o=!0);for(var s=0;s0&&s=1:i.length===u}return!1}function p(t,r){if(e(t),!t||t.length>=2083||/\s/.test(t))return!1;if(0===t.indexOf("mailto:"))return!1;r=l(r,Ae);var n=void 0,i=void 0,o=void 0,a=void 0,u=void 0,s=void 0,f=void 0;if(f=t.split("#"),t=f.shift(),f=t.split("?"),t=f.shift(),f=t.split("://"),f.length>1){if(n=f.shift(),r.require_valid_protocol&&r.protocols.indexOf(n)===-1)return!1}else{if(r.require_protocol)return!1;r.allow_protocol_relative_urls&&"//"===t.substr(0,2)&&(f[0]=t.substr(2))}return t=f.join("://"),f=t.split("/"),t=f.shift(),f=t.split("@"),!(f.length>1&&(i=f.shift(),i.indexOf(":")>=0&&i.split(":").length>2))&&(a=f.join("@"),f=a.split(":"),o=f.shift(),!(f.length&&(s=f.join(":"),u=parseInt(s,10),!/^[0-9]+$/.test(s)||u<=0||u>65535))&&(!(!g(o)&&!d(o,r)&&"localhost"!==o)&&((!r.host_whitelist||r.host_whitelist.indexOf(o)!==-1)&&(!r.host_blacklist||r.host_blacklist.indexOf(o)===-1))))}function F(t){return e(t),me.test(t)}function v(t){return e(t),["true","false","1","0"].indexOf(t)>=0}function _(t){var r=arguments.length<=1||void 0===arguments[1]?"en-US":arguments[1];if(e(t),r in we)return we[r].test(t);throw new Error("Invalid locale '"+r+"'")}function h(t){var r=arguments.length<=1||void 0===arguments[1]?"en-US":arguments[1];if(e(t),r in be)return be[r].test(t);throw new Error("Invalid locale '"+r+"'")}function $(t){return e(t),Ie.test(t)}function x(t){return e(t),t===t.toLowerCase()}function A(t){return e(t),t===t.toUpperCase()}function m(t){return e(t),Oe.test(t)}function w(t){return e(t),Ce.test(t)}function b(t){return e(t),Ne.test(t)}function y(t){return e(t),Ce.test(t)&&Ne.test(t)}function D(t){return e(t),Ue.test(t)}function Z(t){return e(t),ze.test(t)}function S(t,r){e(t),r=r||{};var n=r.hasOwnProperty("allow_leading_zeroes")&&r.allow_leading_zeroes?je:Re,i=!r.hasOwnProperty("min")||t>=r.min,o=!r.hasOwnProperty("max")||t<=r.max;return n.test(t)&&i&&o}function E(t,r){return e(t),r=r||{},""!==t&&"."!==t&&(Le.test(t)&&(!r.hasOwnProperty("min")||t>=r.min)&&(!r.hasOwnProperty("max")||t<=r.max))}function I(t){return e(t),""!==t&&Be.test(t)}function O(t){return e(t),Pe.test(t)}function C(t,n){return e(t),r(t)%parseInt(n,10)===0}function N(t){return e(t),qe.test(t)}function U(t){return e(t),Te.test(t)}function z(t){e(t);try{var r=JSON.parse(t);return!!r&&"object"===("undefined"==typeof r?"undefined":de(r))}catch(e){}return!1}function R(t){return e(t),0===t.length}function j(t,r){e(t);var n=void 0,i=void 0;"object"===("undefined"==typeof r?"undefined":de(r))?(n=r.min||0,i=r.max):(n=arguments[1],i=arguments[2]);var o=t.match(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g)||[],a=t.length-o.length;return a>=n&&("undefined"==typeof i||a<=i)}function L(t){var r=arguments.length<=1||void 0===arguments[1]?"all":arguments[1];e(t);var n=Me[r];return n&&n.test(t)}function B(t){return e(t),O(t)&&24===t.length}function P(t){return e(t),He.test(t)}function q(e){var t=e.match(He),r=void 0,n=void 0,i=void 0,o=void 0;if(t){if(r=t[21],!r)return t[12]?null:0;if("z"===r||"Z"===r)return 0;n=t[22],r.indexOf(":")!==-1?(i=parseInt(t[23],10),o=parseInt(t[24],10)):(i=0,o=parseInt(t[23],10))}else{if(e=e.toLowerCase(),r=e.match(/(?:\s|gmt\s*)(-|\+)(\d{1,4})(\s|$)/),!r)return e.indexOf("gmt")!==-1?0:null;n=r[1];var a=r[2];3===a.length&&(a="0"+a),a.length<=2?(i=0,o=parseInt(a,10)):(i=parseInt(a.slice(0,2),10),o=parseInt(a.slice(2,4),10))}return(60*i+o)*("-"===n?1:-1)}function T(t){e(t);var r=new Date(Date.parse(t));if(isNaN(r))return!1;var n=q(t);if(null!==n){var i=r.getTimezoneOffset()-n;r=new Date(r.getTime()+6e4*i)}var o=String(r.getDate()),a=void 0,u=void 0,s=void 0;return!(u=t.match(/(^|[^:\d])[23]\d([^:\d]|$)/g))||(a=u.map(function(e){return e.match(/\d+/g)[0]}).join("/"),s=String(r.getFullYear()).slice(-2),a===o||a===s||(a===""+o/s||a===""+s/o))}function M(r){var n=arguments.length<=1||void 0===arguments[1]?String(new Date):arguments[1];e(r);var i=t(n),o=t(r);return!!(o&&i&&o>i)}function H(r){var n=arguments.length<=1||void 0===arguments[1]?String(new Date):arguments[1];e(r);var i=t(n),o=t(r);return!!(o&&i&&o=0}return"object"===("undefined"==typeof r?"undefined":de(r))?r.hasOwnProperty(t):!(!r||"function"!=typeof r.indexOf)&&r.indexOf(t)>=0}function Y(t){e(t);var r=t.replace(/[^0-9]+/g,"");if(!We.test(r))return!1;for(var n=0,i=void 0,o=void 0,a=void 0,u=r.length-1;u>=0;u--)i=r.substring(u,u+1),o=parseInt(i,10),a?(o*=2,n+=o>=10?o%10+1:o):n+=o,a=!a;return!(n%10!==0||!r)}function G(t){if(e(t),!Ye.test(t))return!1;for(var r=t.replace(/[A-Z]/g,function(e){return parseInt(e,36)}),n=0,i=void 0,o=void 0,a=!0,u=r.length-2;u>=0;u--)i=r.substring(u,u+1),o=parseInt(i,10),a?(o*=2,n+=o>=10?o+1:o):n+=o,a=!a;return parseInt(t.substr(t.length-1),10)===(1e4-n)%10}function K(t){var r=arguments.length<=1||void 0===arguments[1]?"":arguments[1];if(e(t),r=String(r),!r)return K(t,10)||K(t,13);var n=t.replace(/[\s-]+/g,""),i=0,o=void 0;if("10"===r){if(!Ge.test(n))return!1;for(o=0;o<9;o++)i+=(o+1)*n.charAt(o);if(i+="X"===n.charAt(9)?100:10*n.charAt(9),i%11===0)return!!n}else if("13"===r){if(!Ke.test(n))return!1;for(o=0;o<12;o++)i+=Qe[o%2]*n.charAt(o);if(n.charAt(12)-(10-i%10)%10===0)return!!n}return!1}function Q(t,r){return e(t),r in ke&&ke[r].test(t)}function k(e){var t="(\\"+e.symbol.replace(/\./g,"\\.")+")"+(e.require_symbol?"":"?"),r="-?",n="[1-9]\\d*",i="[1-9]\\d{0,2}(\\"+e.thousands_separator+"\\d{3})*",o=["0",n,i],a="("+o.join("|")+")?",u="(\\"+e.decimal_separator+"\\d{2})?",s=a+u;return e.allow_negatives&&!e.parens_for_negatives&&(e.negative_sign_after_digits?s+=r:e.negative_sign_before_digits&&(s=r+s)),e.allow_negative_sign_placeholder?s="( (?!\\-))?"+s:e.allow_space_after_symbol?s=" ?"+s:e.allow_space_after_digits&&(s+="( (?!$))?"),e.symbol_after_digits?s+=t:s=t+s,e.allow_negatives&&(e.parens_for_negatives?s="(\\("+s+"\\)|"+s+")":e.negative_sign_before_digits||e.negative_sign_after_digits||(s=r+s)),new RegExp("^(?!-? )(?=.*\\d)"+s+"$")}function J(t,r){return e(t),r=l(r,Je),k(r).test(t)}function V(t){e(t);var r=t.length;if(!r||r%4!==0||Ve.test(t))return!1;var n=t.indexOf("=");return n===-1||n===r-1||n===r-2&&"="===t[r-1]}function X(t){return e(t),Xe.test(t)}function ee(t,r){e(t);var n=r?new RegExp("^["+r+"]+","g"):/^\s+/g;return t.replace(n,"")}function te(t,r){e(t);for(var n=r?new RegExp("["+r+"]"):/\s/,i=t.length-1;i>=0&&n.test(t[i]);)i--;return i/g,">").replace(/\//g,"/").replace(/`/g,"`")}function ie(t){return e(t),t.replace(/&/g,"&").replace(/"/g,'"').replace(/'/g,"'").replace(/</g,"<").replace(/>/g,">").replace(///g,"/").replace(/`/g,"`")}function oe(t,r){return e(t),t.replace(new RegExp("["+r+"]+","g"),"")}function ae(t,r){e(t);var n=r?"\\x00-\\x09\\x0B\\x0C\\x0E-\\x1F\\x7F":"\\x00-\\x1F\\x7F";return oe(t,n)}function ue(t,r){return e(t),t.replace(new RegExp("[^"+r+"]+","g"),"")}function se(t,r){e(t);for(var n=t.length-1;n>=0;n--)if(r.indexOf(t[n])===-1)return!1;return!0}function le(e,t){if(t=l(t,et),!c(e))return!1;var r=e.split("@",2);if(r[1]=r[1].toLowerCase(),"gmail.com"===r[1]||"googlemail.com"===r[1]){if(t.remove_extension&&(r[0]=r[0].split("+")[0]),t.remove_dots&&(r[0]=r[0].replace(/\./g,"")),!r[0].length)return!1;r[0]=r[0].toLowerCase(),r[1]="gmail.com"}else t.lowercase&&(r[0]=r[0].toLowerCase());return r.join("@")}for(var fe,de="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol?"symbol":typeof e},ce={require_tld:!0,allow_underscores:!1,allow_trailing_dot:!1},ge={allow_display_name:!1,allow_utf8_local_part:!0,require_tld:!0},pe=/^[a-z\d!#\$%&'\*\+\-\/=\?\^_`{\|}~\.\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+[a-z\d!#\$%&'\*\+\-\/=\?\^_`{\|}~\.\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF\s]*<(.+)>$/i,Fe=/^[a-z\d!#\$%&'\*\+\-\/=\?\^_`{\|}~]+$/i,ve=/^([\s\x01-\x08\x0b\x0c\x0e-\x1f\x7f\x21\x23-\x5b\x5d-\x7e]|(\\[\x01-\x09\x0b\x0c\x0d-\x7f]))*$/i,_e=/^[a-z\d!#\$%&'\*\+\-\/=\?\^_`{\|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+$/i,he=/^([\s\x01-\x08\x0b\x0c\x0e-\x1f\x7f\x21\x23-\x5b\x5d-\x7e\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|(\\[\x01-\x09\x0b\x0c\x0d-\x7f\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))*$/i,$e=/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/,xe=/^[0-9A-F]{1,4}$/i,Ae={protocols:["http","https","ftp"],require_tld:!0,require_protocol:!1,require_valid_protocol:!0,allow_underscores:!1,allow_trailing_dot:!1,allow_protocol_relative_urls:!1},me=/^([0-9a-fA-F][0-9a-fA-F]:){5}([0-9a-fA-F][0-9a-fA-F])$/,we={"en-US":/^[A-Z]+$/i,"cs-CZ":/^[A-ZÁČĎÉĚÍŇÓŘŠŤÚŮÝŽ]+$/i,"de-DE":/^[A-ZÄÖÜß]+$/i,"es-ES":/^[A-ZÁÉÍÑÓÚÜ]+$/i,"fr-FR":/^[A-ZÀÂÆÇÉÈÊËÏÎÔŒÙÛÜŸ]+$/i,"nl-NL":/^[A-ZÉËÏÓÖÜ]+$/i,"hu-HU":/^[A-ZÁÉÍÓÖŐÚÜŰ]+$/i,"pl-PL":/^[A-ZĄĆĘŚŁŃÓŻŹ]+$/i,"pt-PT":/^[A-ZÃÁÀÂÇÉÊÍÕÓÔÚÜ]+$/i,"ru-RU":/^[А-ЯЁа-яё]+$/i,"tr-TR":/^[A-ZÇĞİıÖŞÜ]+$/i,ar:/^[ءآأؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهوىيًٌٍَُِّْٰ]+$/},be={"en-US":/^[0-9A-Z]+$/i,"cs-CZ":/^[0-9A-ZÁČĎÉĚÍŇÓŘŠŤÚŮÝŽ]+$/i,"de-DE":/^[0-9A-ZÄÖÜß]+$/i,"es-ES":/^[0-9A-ZÁÉÍÑÓÚÜ]+$/i,"fr-FR":/^[0-9A-ZÀÂÆÇÉÈÊËÏÎÔŒÙÛÜŸ]+$/i,"hu-HU":/^[0-9A-ZÁÉÍÓÖŐÚÜŰ]+$/i,"nl-NL":/^[0-9A-ZÉËÏÓÖÜ]+$/i,"pl-PL":/^[0-9A-ZĄĆĘŚŁŃÓŻŹ]+$/i,"pt-PT":/^[0-9A-ZÃÁÀÂÇÉÊÍÕÓÔÚÜ]+$/i,"ru-RU":/^[0-9А-ЯЁа-яё]+$/i,"tr-TR":/^[0-9A-ZÇĞİıÖŞÜ]+$/i,ar:/^[٠١٢٣٤٥٦٧٨٩0-9ءآأؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهوىيًٌٍَُِّْٰ]+$/},ye=["AU","GB","HK","IN","NZ","ZA","ZM"],De=0;De=0}function j(b,c,d){return a(b),"[object RegExp]"!==Object.prototype.toString.call(c)&&(c=new RegExp(c,d)),c.test(b)}function k(){var a=arguments.length<=0||void 0===arguments[0]?{}:arguments[0],b=arguments[1];for(var c in b)"undefined"==typeof a[c]&&(a[c]=b[c]);return a}function l(b,c){a(b);var d=void 0,e=void 0;"object"===("undefined"==typeof c?"undefined":g(c))?(d=c.min||0,e=c.max):(d=arguments[1],e=arguments[2]);var f=encodeURI(b).split(/%..|./).length-1;return f>=d&&("undefined"==typeof e||f<=e)}function n(b,c){a(b),c=k(c,m),c.allow_trailing_dot&&"."===b[b.length-1]&&(b=b.substring(0,b.length-1));var d=b.split(".");if(c.require_tld){var e=d.pop();if(!d.length||!/^([a-z\u00a1-\uffff]{2,}|xn[a-z0-9-]{2,})$/i.test(e))return!1}for(var f,g=0;gh)return!1;if("::"===b)return!0;"::"===b.substr(0,2)?(e.shift(),e.shift(),f=!0):"::"===b.substr(b.length-2)&&(e.pop(),e.pop(),f=!0);for(var i=0;i0&&i=1:e.length===h}return!1}function z(b,c){if(a(b),!b||b.length>=2083||/\s/.test(b))return!1;if(0===b.indexOf("mailto:"))return!1;c=k(c,y);var d=void 0,e=void 0,f=void 0,g=void 0,h=void 0,i=void 0,j=void 0;if(j=b.split("#"),b=j.shift(),j=b.split("?"),b=j.shift(),j=b.split("://"),j.length>1){if(d=j.shift(),c.require_valid_protocol&&c.protocols.indexOf(d)===-1)return!1}else{if(c.require_protocol)return!1;c.allow_protocol_relative_urls&&"//"===b.substr(0,2)&&(j[0]=b.substr(2))}return b=j.join("://"),j=b.split("/"),b=j.shift(),j=b.split("@"),!(j.length>1&&(e=j.shift(),e.indexOf(":")>=0&&e.split(":").length>2))&&(g=j.join("@"),j=g.split(":"),f=j.shift(),!(j.length&&(i=j.join(":"),h=parseInt(i,10),!/^[0-9]+$/.test(i)||h<=0||h>65535))&&(!(!x(f)&&!n(f,c)&&"localhost"!==f)&&((!c.host_whitelist||c.host_whitelist.indexOf(f)!==-1)&&(!c.host_blacklist||c.host_blacklist.indexOf(f)===-1))))}function B(b){return a(b),A.test(b)}function C(b){return a(b),["true","false","1","0"].indexOf(b)>=0}function L(b){var c=arguments.length<=1||void 0===arguments[1]?"en-US":arguments[1];if(a(b),c in D)return D[c].test(b);throw new Error("Invalid locale '"+c+"'")}function M(b){var c=arguments.length<=1||void 0===arguments[1]?"en-US":arguments[1];if(a(b),c in E)return E[c].test(b);throw new Error("Invalid locale '"+c+"'")}function O(b){return a(b),N.test(b)}function P(b){return a(b),b===b.toLowerCase()}function Q(b){return a(b),b===b.toUpperCase()}function S(b){return a(b),R.test(b)}function U(b){return a(b),T.test(b)}function W(b){return a(b),V.test(b)}function X(b){return a(b),T.test(b)&&V.test(b)}function Z(b){return a(b),Y.test(b)}function _(b){return a(b),$.test(b)}function ca(b,c){a(b),c=c||{};var d=c.hasOwnProperty("allow_leading_zeroes")&&c.allow_leading_zeroes?ba:aa,e=!c.hasOwnProperty("min")||b>=c.min,f=!c.hasOwnProperty("max")||b<=c.max;return d.test(b)&&e&&f}function ea(b,c){return a(b),c=c||{},""!==b&&"."!==b&&(da.test(b)&&(!c.hasOwnProperty("min")||b>=c.min)&&(!c.hasOwnProperty("max")||b<=c.max))}function ga(b){return a(b),""!==b&&fa.test(b)}function ia(b){return a(b),ha.test(b)}function ja(b,d){return a(b),c(b)%parseInt(d,10)===0}function la(b){return a(b),ka.test(b)}function na(b){return a(b),ma.test(b)}function oa(b){a(b);try{var c=JSON.parse(b);return!!c&&"object"===("undefined"==typeof c?"undefined":g(c))}catch(a){}return!1}function pa(b){return a(b),0===b.length}function qa(b,c){a(b);var d=void 0,e=void 0;"object"===("undefined"==typeof c?"undefined":g(c))?(d=c.min||0,e=c.max):(d=arguments[1],e=arguments[2]);var f=b.match(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g)||[],h=b.length-f.length;return h>=d&&("undefined"==typeof e||h<=e)}function sa(b){var c=arguments.length<=1||void 0===arguments[1]?"all":arguments[1];a(b);var d=ra[c];return d&&d.test(b)}function ta(b){return a(b),ia(b)&&24===b.length}function va(b){return a(b),ua.test(b)}function wa(a){var b=a.match(ua),c=void 0,d=void 0,e=void 0,f=void 0;if(b){if(c=b[21],!c)return b[12]?null:0;if("z"===c||"Z"===c)return 0;d=b[22],c.indexOf(":")!==-1?(e=parseInt(b[23],10),f=parseInt(b[24],10)):(e=0,f=parseInt(b[23],10))}else{if(a=a.toLowerCase(),c=a.match(/(?:\s|gmt\s*)(-|\+)(\d{1,4})(\s|$)/),!c)return a.indexOf("gmt")!==-1?0:null;d=c[1];var g=c[2];3===g.length&&(g="0"+g),g.length<=2?(e=0,f=parseInt(g,10)):(e=parseInt(g.slice(0,2),10),f=parseInt(g.slice(2,4),10))}return(60*e+f)*("-"===d?1:-1)}function xa(b){a(b);var c=new Date(Date.parse(b));if(isNaN(c))return!1;var d=wa(b);if(null!==d){var e=c.getTimezoneOffset()-d;c=new Date(c.getTime()+6e4*e)}var f=String(c.getDate()),g=void 0,h=void 0,i=void 0;return!(h=b.match(/(^|[^:\d])[23]\d([^:\d]|$)/g))||(g=h.map(function(a){return a.match(/\d+/g)[0]}).join("/"),i=String(c.getFullYear()).slice(-2),g===f||g===i||(g===""+f/i||g===""+i/f))}function ya(c){var d=arguments.length<=1||void 0===arguments[1]?String(new Date):arguments[1];a(c);var e=b(d),f=b(c);return!!(f&&e&&f>e)}function za(c){var d=arguments.length<=1||void 0===arguments[1]?String(new Date):arguments[1];a(c);var e=b(d),f=b(c);return!!(f&&e&&f=0}return"object"===("undefined"==typeof c?"undefined":g(c))?c.hasOwnProperty(b):!(!c||"function"!=typeof c.indexOf)&&c.indexOf(b)>=0}function Ca(b){a(b);var c=b.replace(/[^0-9]+/g,"");if(!Ba.test(c))return!1;for(var d=0,e=void 0,f=void 0,g=void 0,h=c.length-1;h>=0;h--)e=c.substring(h,h+1),f=parseInt(e,10),g?(f*=2,d+=f>=10?f%10+1:f):d+=f,g=!g;return!(d%10!==0||!c)}function Ea(b){if(a(b),!Da.test(b))return!1;for(var c=b.replace(/[A-Z]/g,function(a){return parseInt(a,36)}),d=0,e=void 0,f=void 0,g=!0,h=c.length-2;h>=0;h--)e=c.substring(h,h+1),f=parseInt(e,10),g?(f*=2,d+=f>=10?f+1:f):d+=f,g=!g;return parseInt(b.substr(b.length-1),10)===(1e4-d)%10}function Ia(b){var c=arguments.length<=1||void 0===arguments[1]?"":arguments[1];if(a(b),c=String(c),!c)return Ia(b,10)||Ia(b,13);var d=b.replace(/[\s-]+/g,""),e=0,f=void 0;if("10"===c){if(!Fa.test(d))return!1;for(f=0;f<9;f++)e+=(f+1)*d.charAt(f);if(e+="X"===d.charAt(9)?100:10*d.charAt(9),e%11===0)return!!d}else if("13"===c){if(!Ga.test(d))return!1;for(f=0;f<12;f++)e+=Ha[f%2]*d.charAt(f);if(d.charAt(12)-(10-e%10)%10===0)return!!d}return!1}function Ka(b,c){return a(b),c in Ja&&Ja[c].test(b)}function La(a){var b="(\\"+a.symbol.replace(/\./g,"\\.")+")"+(a.require_symbol?"":"?"),c="-?",d="[1-9]\\d*",e="[1-9]\\d{0,2}(\\"+a.thousands_separator+"\\d{3})*",f=["0",d,e],g="("+f.join("|")+")?",h="(\\"+a.decimal_separator+"\\d{2})?",i=g+h;return a.allow_negatives&&!a.parens_for_negatives&&(a.negative_sign_after_digits?i+=c:a.negative_sign_before_digits&&(i=c+i)),a.allow_negative_sign_placeholder?i="( (?!\\-))?"+i:a.allow_space_after_symbol?i=" ?"+i:a.allow_space_after_digits&&(i+="( (?!$))?"),a.symbol_after_digits?i+=b:i=b+i,a.allow_negatives&&(a.parens_for_negatives?i="(\\("+i+"\\)|"+i+")":a.negative_sign_before_digits||a.negative_sign_after_digits||(i=c+i)),new RegExp("^(?!-? )(?=.*\\d)"+i+"$")}function Na(b,c){return a(b),c=k(c,Ma),La(c).test(b)}function Pa(b){a(b);var c=b.length;if(!c||c%4!==0||Oa.test(b))return!1;var d=b.indexOf("=");return d===-1||d===c-1||d===c-2&&"="===b[c-1]}function Ra(b){return a(b),Qa.test(b)}function Sa(b,c){a(b);var d=c?new RegExp("^["+c+"]+","g"):/^\s+/g;return b.replace(d,"")}function Ta(b,c){a(b);for(var d=c?new RegExp("["+c+"]"):/\s/,e=b.length-1;e>=0&&d.test(b[e]);)e--;return e/g,">").replace(/\//g,"/").replace(/`/g,"`")}function Wa(b){return a(b),b.replace(/&/g,"&").replace(/"/g,'"').replace(/'/g,"'").replace(/</g,"<").replace(/>/g,">").replace(///g,"/").replace(/`/g,"`")}function Xa(b,c){return a(b),b.replace(new RegExp("["+c+"]+","g"),"")}function Ya(b,c){a(b);var d=c?"\\x00-\\x09\\x0B\\x0C\\x0E-\\x1F\\x7F":"\\x00-\\x1F\\x7F";return Xa(b,d)}function Za(b,c){return a(b),b.replace(new RegExp("[^"+c+"]+","g"),"")}function $a(b,c){a(b);for(var d=b.length-1;d>=0;d--)if(c.indexOf(b[d])===-1)return!1;return!0}function ab(a,b){if(b=k(b,_a),!u(a))return!1;var c=a.split("@",2);if(c[1]=c[1].toLowerCase(),"gmail.com"===c[1]||"googlemail.com"===c[1]){if(b.remove_extension&&(c[0]=c[0].split("+")[0]),b.remove_dots&&(c[0]=c[0].replace(/\./g,"")),!c[0].length)return!1;c[0]=c[0].toLowerCase(),c[1]="gmail.com"}else b.lowercase&&(c[0]=c[0].toLowerCase());return c.join("@")}for(var G,g="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(a){return typeof a}:function(a){return a&&"function"==typeof Symbol&&a.constructor===Symbol?"symbol":typeof a},m={require_tld:!0,allow_underscores:!1,allow_trailing_dot:!1},o={allow_display_name:!1,allow_utf8_local_part:!0,require_tld:!0},p=/^[a-z\d!#\$%&'\*\+\-\/=\?\^_`{\|}~\.\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+[a-z\d!#\$%&'\*\+\-\/=\?\^_`{\|}~\.\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF\s]*<(.+)>$/i,q=/^[a-z\d!#\$%&'\*\+\-\/=\?\^_`{\|}~]+$/i,r=/^([\s\x01-\x08\x0b\x0c\x0e-\x1f\x7f\x21\x23-\x5b\x5d-\x7e]|(\\[\x01-\x09\x0b\x0c\x0d-\x7f]))*$/i,s=/^[a-z\d!#\$%&'\*\+\-\/=\?\^_`{\|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+$/i,t=/^([\s\x01-\x08\x0b\x0c\x0e-\x1f\x7f\x21\x23-\x5b\x5d-\x7e\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|(\\[\x01-\x09\x0b\x0c\x0d-\x7f\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))*$/i,v=/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/,w=/^[0-9A-F]{1,4}$/i,y={protocols:["http","https","ftp"],require_tld:!0,require_protocol:!1,require_valid_protocol:!0,allow_underscores:!1,allow_trailing_dot:!1,allow_protocol_relative_urls:!1},A=/^([0-9a-fA-F][0-9a-fA-F]:){5}([0-9a-fA-F][0-9a-fA-F])$/,D={"en-US":/^[A-Z]+$/i,"cs-CZ":/^[A-ZÁČĎÉĚÍŇÓŘŠŤÚŮÝŽ]+$/i,"de-DE":/^[A-ZÄÖÜß]+$/i,"es-ES":/^[A-ZÁÉÍÑÓÚÜ]+$/i,"fr-FR":/^[A-ZÀÂÆÇÉÈÊËÏÎÔŒÙÛÜŸ]+$/i,"nl-NL":/^[A-ZÉËÏÓÖÜ]+$/i,"hu-HU":/^[A-ZÁÉÍÓÖŐÚÜŰ]+$/i,"pl-PL":/^[A-ZĄĆĘŚŁŃÓŻŹ]+$/i,"pt-PT":/^[A-ZÃÁÀÂÇÉÊÍÕÓÔÚÜ]+$/i,"ru-RU":/^[А-ЯЁа-яё]+$/i,"tr-TR":/^[A-ZÇĞİıÖŞÜ]+$/i,ar:/^[ءآأؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهوىيًٌٍَُِّْٰ]+$/},E={"en-US":/^[0-9A-Z]+$/i,"cs-CZ":/^[0-9A-ZÁČĎÉĚÍŇÓŘŠŤÚŮÝŽ]+$/i,"de-DE":/^[0-9A-ZÄÖÜß]+$/i,"es-ES":/^[0-9A-ZÁÉÍÑÓÚÜ]+$/i,"fr-FR":/^[0-9A-ZÀÂÆÇÉÈÊËÏÎÔŒÙÛÜŸ]+$/i,"hu-HU":/^[0-9A-ZÁÉÍÓÖŐÚÜŰ]+$/i,"nl-NL":/^[0-9A-ZÉËÏÓÖÜ]+$/i,"pl-PL":/^[0-9A-ZĄĆĘŚŁŃÓŻŹ]+$/i,"pt-PT":/^[0-9A-ZÃÁÀÂÇÉÊÍÕÓÔÚÜ]+$/i,"ru-RU":/^[0-9А-ЯЁа-яё]+$/i,"tr-TR":/^[0-9A-ZÇĞİıÖŞÜ]+$/i,ar:/^[٠١٢٣٤٥٦٧٨٩0-9ءآأؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهوىيًٌٍَُِّْٰ]+$/},F=["AU","GB","HK","IN","NZ","ZA","ZM"],H=0;H Date: Thu, 25 Aug 2016 13:41:06 +0200 Subject: [PATCH 2/2] Added trailing comma for Travis build validation --- test/validators.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/validators.js b/test/validators.js index eb5ae5ede..cffcfad3f 100644 --- a/test/validators.js +++ b/test/validators.js @@ -2368,7 +2368,7 @@ describe('Validators', function () { '3204701234567', '0212345678', '+320212345678', - '320212345678' + '320212345678', ], args: ['fr-BE'], }); @@ -2392,7 +2392,7 @@ describe('Validators', function () { '3204701234567', '0212345678', '+320212345678', - '320212345678' + '320212345678', ], args: ['nl-BE'], });