one-validation - npm Package Compare versions

Comparing version 0.2.9 to 0.2.10

lib/tld.js

@@ -61,10 +61,12 @@ /*global require*/
                 if (chars.length)   { results.push(prop + (chars.length > 1 ? '[' + chars.join('') + ']' : chars[0])); }
-                if (strings.length) { results.push(strings.join('|')); }
+                if (strings.length) { Array.prototype.push.apply(results, strings); }
                 if (puny.length)    { results.push('XN--(?:' + puny.join('|') + ')'); }
-                if (idn.length)     { results.push(idn.join('|')); }
+                if (idn.length)     { Array.prototype.push.apply(results, idn); }
 
-                regexes.push(results.join('|'));
+                Array.prototype.push.apply(regexes, results);
             }
 
-            var regexString = '(?:' + regexes.join('|').toLowerCase() + ')';
+            var regexString = '(?:' + regexes.sort(function (a, b) {
+                return (b.replace(/\[[^\]]*\]/g, 'a').length - a.replace(/\[[^\]]*\]/g, 'a').length) || (b < a ? -1 : (b === a ? 0 : 1));
+            }).join('|').toLowerCase() + ')';
             
@@ -71,0 +73,0 @@ var validationJsContents = fs.readFileSync(path.resolve(__dirname, 'validation.js.tpl'), 'utf-8');

package.json

@@ -14,3 +14,3 @@ {
     "description": "Regexp based validation collection for common internet validation tasks",
-    "version": "0.2.9",
+    "version": "0.2.10",
     "repository": {
@@ -17,0 +17,0 @@ "url": "git://github.com/One-com/one-validation.git"

validation.js

@@ -30,3 +30,3 @@ // THIS FILE IS AUTOGENERATED! See lib/validation.js.tpl
         fragments = {
-            tld: /(?:a[cdefgilmnoqrstuwxz]|aero|arpa|asia|b[abdefghijmnorstvwyz]|biz|c[acdfghiklmnoruvwxyz]|cat|com|coop|d[ejkmoz]|e[cegrstu]|edu|f[ijkmor]|g[abdefghilmnpqrstuwy]|gov|h[kmnrtu]|i[delmnoqrst]|info|int|j[emop]|jobs|k[eghimnprwyz]|l[abcikrstuvy]|m[acdeghklmnopqrstuvwxyz]|mil|mobi|museum|n[acefgilopruz]|name|net|om|org|p[aefghklmnrstwy]|pro|qa|r[eosuw]|s[abcdeghijklmnortuvxyz]|t[cdfghjklmnoprtvwz]|tel|travel|u[agksyz]|v[aceginu]|w[fs]|xxx|xn--(?:0zwm56d|11b5bs3a9aj6g|3e0b707e|45brj9c|80akhbyknj4f|80ao21a|90a3ac|9t4b11yi5a|clchc0ea0b2g2a9gcd|deba0ad|fiqs8s|fiqz9s|fpcrj9c3d|fzc2c9e2c|g6w251d|gecrj9c|h2brj9c|hgbk6aj7f53bba|hlcj6aya9esc7a|j6w193g|jxalpdlp|kgbechtv|kprw13d|kpry57d|lgbbat1ad8j|mgbaam7a8h|mgbayh7gpa|mgbbh1a71e|mgbc0a9azcg|mgberp4a5d4ar|o3cw4h|ogbpf8fl|p1ai|pgbs0dh|s9brj9c|wgbh1c|wgbl6a|xkc2al3hye2a|xkc2dl3a5ee0h|yfro4i67o|ygbi2ammx|zckzah)|测试|परीक्षा|한국|ভারত|испытание|қаз|срб|테스트|சிங்கப்பூர்|טעסט|中国|中國|భారత్|ලංකා|測試|ભારત|भारत|آزمایشی|பரிட்சை|香港|δοκιμή|إختبار|台湾|台灣|الجزائر|امارات|الاردن|بھارت|المغرب|السعودية|ไทย|سورية|рф|تونس|ਭਾਰਤ|مصر|قطر|இலங்கை|இந்தியா|新加坡|فلسطين|テスト|y[et]|z[amw])/i, // See /lib/tld.js
+            tld: /(?:xn--(?:0zwm56d|11b5bs3a9aj6g|3e0b707e|45brj9c|80akhbyknj4f|80ao21a|90a3ac|9t4b11yi5a|clchc0ea0b2g2a9gcd|deba0ad|fiqs8s|fiqz9s|fpcrj9c3d|fzc2c9e2c|g6w251d|gecrj9c|h2brj9c|hgbk6aj7f53bba|hlcj6aya9esc7a|j6w193g|jxalpdlp|kgbechtv|kprw13d|kpry57d|lgbbat1ad8j|mgbaam7a8h|mgbayh7gpa|mgbbh1a71e|mgbc0a9azcg|mgberp4a5d4ar|o3cw4h|ogbpf8fl|p1ai|pgbs0dh|s9brj9c|wgbh1c|wgbl6a|xkc2al3hye2a|xkc2dl3a5ee0h|yfro4i67o|ygbi2ammx|zckzah)|சிங்கப்பூர்|испытание|السعودية|பரிட்சை|இந்தியா|परीक्षा|الجزائر|آزمایشی|இலங்கை|فلسطين|امارات|المغرب|الاردن|إختبار|δοκιμή|travel|museum|భారత్|سورية|بھارت|ලංකා|ભારત|ਭਾਰਤ|ভারত|भारत|تونس|טעסט|name|mobi|jobs|info|coop|asia|arpa|aero|테스트|新加坡|テスト|ไทย|مصر|قطر|қаз|срб|xxx|tel|pro|org|net|mil|int|gov|edu|com|cat|biz|한국|香港|測試|测试|台灣|台湾|中國|中国|рф|z[amw]|y[et]|w[fs]|v[aceginu]|u[agksyz]|t[cdfghjklmnoprtvwz]|s[abcdeghijklmnortuvxyz]|r[eosuw]|qa|p[aefghklmnrstwy]|om|n[acefgilopruz]|m[acdeghklmnopqrstuvwxyz]|l[abcikrstuvy]|k[eghimnprwyz]|j[emop]|i[delmnoqrst]|h[kmnrtu]|g[abdefghilmnpqrstuwy]|f[ijkmor]|e[cegrstu]|d[ejkmoz]|c[acdfghiklmnoruvwxyz]|b[abdefghijmnorstvwyz]|a[cdefgilmnoqrstuwxz])/i, // See /lib/tld.js
             domainPart: /[a-z0-9](?:[\-a-z0-9]*[a-z0-9])?/i,
@@ -33,0 +33,0 @@ port: /\d{1,5}/,

validation.min.js

@@ -1,1 +0,1 @@
-(function(){function a(){var a="";for(var b=0;b<arguments.length;b+=1)Object.prototype.toString.call(arguments[b])==="[object RegExp]"?a+=arguments[b].source:a+=arguments[b];return a}function e(b){return new RegExp(a(b,"://","(?:",d.user,"(?::",d.password,")?@",")?",d.subdomain,"(?::",d.port,")?","(?:/",d.pathname,"(?:\\?",d.search,")?","(?:#",d.hash,")?",")?"),"i")}"use strict";var b,c={functions:{}},d={tld:/(?:a[cdefgilmnoqrstuwxz]|aero|arpa|asia|b[abdefghijmnorstvwyz]|biz|c[acdfghiklmnoruvwxyz]|cat|com|coop|d[ejkmoz]|e[cegrstu]|edu|f[ijkmor]|g[abdefghilmnpqrstuwy]|gov|h[kmnrtu]|i[delmnoqrst]|info|int|j[emop]|jobs|k[eghimnprwyz]|l[abcikrstuvy]|m[acdeghklmnopqrstuvwxyz]|mil|mobi|museum|n[acefgilopruz]|name|net|om|org|p[aefghklmnrstwy]|pro|qa|r[eosuw]|s[abcdeghijklmnortuvxyz]|t[cdfghjklmnoprtvwz]|tel|travel|u[agksyz]|v[aceginu]|w[fs]|xxx|xn--(?:0zwm56d|11b5bs3a9aj6g|3e0b707e|45brj9c|80akhbyknj4f|80ao21a|90a3ac|9t4b11yi5a|clchc0ea0b2g2a9gcd|deba0ad|fiqs8s|fiqz9s|fpcrj9c3d|fzc2c9e2c|g6w251d|gecrj9c|h2brj9c|hgbk6aj7f53bba|hlcj6aya9esc7a|j6w193g|jxalpdlp|kgbechtv|kprw13d|kpry57d|lgbbat1ad8j|mgbaam7a8h|mgbayh7gpa|mgbbh1a71e|mgbc0a9azcg|mgberp4a5d4ar|o3cw4h|ogbpf8fl|p1ai|pgbs0dh|s9brj9c|wgbh1c|wgbl6a|xkc2al3hye2a|xkc2dl3a5ee0h|yfro4i67o|ygbi2ammx|zckzah)|测试|परीक्षा|한국|ভারত|испытание|қаз|срб|테스트|சிங்கப்பூர்|טעסט|中国|中國|భారత్|ලංකා|測試|ભારત|भारत|آزمایشی|பரிட்சை|香港|δοκιμή|إختبار|台湾|台灣|الجزائر|امارات|الاردن|بھارت|المغرب|السعودية|ไทย|سورية|рф|تونس|ਭਾਰਤ|مصر|قطر|இலங்கை|இந்தியா|新加坡|فلسطين|テスト|y[et]|z[amw])/i,domainPart:/[a-z0-9](?:[\-a-z0-9]*[a-z0-9])?/i,port:/\d{1,5}/,localpart:/[a-z0-9!#$%&'*+\/=?\^_`{|}~\-]+(?:\.[a-z0-9!#$%&'*+\/=?\^_`{|}~\-]+)*/i,user:/[^:@\/]+/i,uuid:/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i,lowerCaseUuid:/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/,upperCaseUuid:/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/,password:/[^@\/]+?/i,pathname:/[\w%+@*\-\.\/\(\)&=;]*/,search:/[\w%+@*\-\.\/\(\)&=;\?]*/,hash:/[\w%+@*\-\.\/\(\)&=;\?#]*/};d.domain=new RegExp(d.domainPart.source+"\\."+d.tld.source,"i"),d.subdomain=new RegExp("(?:"+d.domainPart.source+"\\.)*"+d.domain.source,"i"),d.email=new RegExp(d.localpart.source+"@"+d.subdomain.source,"i"),d.mailtoUrl=new RegExp("mailto:"+d.email.source,"i"),d.httpUrl=e(/https?/),d.ftpUrl=e(/ftp/),d.url=d.httpUrl;for(b in d)d.hasOwnProperty(b)&&(c[b]=new RegExp("^"+d[b].source+"$","i"),c.functions[b]=function(a){return function(b){return c[a].test(b)}}(b));c.fragments=d,typeof window!="undefined"&&(window.one=window.one||{},window.one.validation=c),typeof module!="undefined"&&(module.exports=c)})();
+(function(){function a(){var a="";for(var b=0;b<arguments.length;b+=1)Object.prototype.toString.call(arguments[b])==="[object RegExp]"?a+=arguments[b].source:a+=arguments[b];return a}function e(b){return new RegExp(a(b,"://","(?:",d.user,"(?::",d.password,")?@",")?",d.subdomain,"(?::",d.port,")?","(?:/",d.pathname,"(?:\\?",d.search,")?","(?:#",d.hash,")?",")?"),"i")}"use strict";var b,c={functions:{}},d={tld:/(?:xn--(?:0zwm56d|11b5bs3a9aj6g|3e0b707e|45brj9c|80akhbyknj4f|80ao21a|90a3ac|9t4b11yi5a|clchc0ea0b2g2a9gcd|deba0ad|fiqs8s|fiqz9s|fpcrj9c3d|fzc2c9e2c|g6w251d|gecrj9c|h2brj9c|hgbk6aj7f53bba|hlcj6aya9esc7a|j6w193g|jxalpdlp|kgbechtv|kprw13d|kpry57d|lgbbat1ad8j|mgbaam7a8h|mgbayh7gpa|mgbbh1a71e|mgbc0a9azcg|mgberp4a5d4ar|o3cw4h|ogbpf8fl|p1ai|pgbs0dh|s9brj9c|wgbh1c|wgbl6a|xkc2al3hye2a|xkc2dl3a5ee0h|yfro4i67o|ygbi2ammx|zckzah)|சிங்கப்பூர்|испытание|السعودية|பரிட்சை|இந்தியா|परीक्षा|الجزائر|آزمایشی|இலங்கை|فلسطين|امارات|المغرب|الاردن|إختبار|δοκιμή|travel|museum|భారత్|سورية|بھارت|ලංකා|ભારત|ਭਾਰਤ|ভারত|भारत|تونس|טעסט|name|mobi|jobs|info|coop|asia|arpa|aero|테스트|新加坡|テスト|ไทย|مصر|قطر|қаз|срб|xxx|tel|pro|org|net|mil|int|gov|edu|com|cat|biz|한국|香港|測試|测试|台灣|台湾|中國|中国|рф|z[amw]|y[et]|w[fs]|v[aceginu]|u[agksyz]|t[cdfghjklmnoprtvwz]|s[abcdeghijklmnortuvxyz]|r[eosuw]|qa|p[aefghklmnrstwy]|om|n[acefgilopruz]|m[acdeghklmnopqrstuvwxyz]|l[abcikrstuvy]|k[eghimnprwyz]|j[emop]|i[delmnoqrst]|h[kmnrtu]|g[abdefghilmnpqrstuwy]|f[ijkmor]|e[cegrstu]|d[ejkmoz]|c[acdfghiklmnoruvwxyz]|b[abdefghijmnorstvwyz]|a[cdefgilmnoqrstuwxz])/i,domainPart:/[a-z0-9](?:[\-a-z0-9]*[a-z0-9])?/i,port:/\d{1,5}/,localpart:/[a-z0-9!#$%&'*+\/=?\^_`{|}~\-]+(?:\.[a-z0-9!#$%&'*+\/=?\^_`{|}~\-]+)*/i,user:/[^:@\/]+/i,uuid:/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i,lowerCaseUuid:/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/,upperCaseUuid:/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/,password:/[^@\/]+?/i,pathname:/[\w%+@*\-\.\/\(\)&=;]*/,search:/[\w%+@*\-\.\/\(\)&=;\?]*/,hash:/[\w%+@*\-\.\/\(\)&=;\?#]*/};d.domain=new RegExp(d.domainPart.source+"\\."+d.tld.source,"i"),d.subdomain=new RegExp("(?:"+d.domainPart.source+"\\.)*"+d.domain.source,"i"),d.email=new RegExp(d.localpart.source+"@"+d.subdomain.source,"i"),d.mailtoUrl=new RegExp("mailto:"+d.email.source,"i"),d.httpUrl=e(/https?/),d.ftpUrl=e(/ftp/),d.url=d.httpUrl;for(b in d)d.hasOwnProperty(b)&&(c[b]=new RegExp("^"+d[b].source+"$","i"),c.functions[b]=function(a){return function(b){return c[a].test(b)}}(b));c.fragments=d,typeof window!="undefined"&&(window.one=window.one||{},window.one.validation=c),typeof module!="undefined"&&(module.exports=c)})();

No alert changes

Improved metrics

Total package byte prevSize

20251

increased by1.08%

Lines of code

261

increased by0.77%

No dependency changes