Merge remote-tracking branch 'upstream/master' into fix-lat-long-vali…

…dation
validatorjs · Aug 2, 2019 · 1a5fe9a · 1a5fe9a
2 parents 6a1d78d + 1ce76a1
commit 1a5fe9a
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 17 deletions.
diff --git a/lib/isLatLong.js b/lib/isLatLong.js
@@ -16,7 +16,7 @@ function _default(str) {
   (0, _assertString.default)(str);
   if (!str.includes(',')) return false;
   var pair = str.split(',');
-  if (pair[0].charAt(0) === '(' && pair[1].charAt(pair[1].length - 1) !== ')' || pair[1].charAt(pair[1].length - 1) === ')' && pair[0].charAt(0) !== '(') return false;
+  if (pair[0].startsWith('(') && !pair[1].endsWith(')') || pair[1].endsWith(')') && !pair[0].startsWith('(')) return false;
   return lat.test(pair[0]) && long.test(pair[1]);
 }
 

diff --git a/lib/isLength.js b/lib/isLength.js
@@ -22,7 +22,7 @@ function isLength(str, options) {
     max = options.max;
   } else {
     // backwards compatibility: isLength(str, min [, max])
-    min = arguments[1];
+    min = arguments[1] || 0;
     max = arguments[2];
   }
 

diff --git a/lib/isMobilePhone.js b/lib/isMobilePhone.js
@@ -68,7 +68,7 @@ var phones = {
   'hu-HU': /^(\+?36)(20|30|70)\d{7}$/,
   'id-ID': /^(\+?62|0)8(1[123456789]|2[1238]|3[1238]|5[12356789]|7[78]|9[56789]|8[123456789])([\s?|\d]{5,11})$/,
   'it-IT': /^(\+?39)?\s?3\d{2} ?\d{6,7}$/,
-  'ja-JP': /^(\+?81|0)[789]0[ \-]?[1-9]\d{2}[ \-]?\d{5}$/,
+  'ja-JP': /^(\+?81|0)[6789]0[ \-]?\d{4}[ \-]?\d{4}$/,
   'kk-KZ': /^(\+?7|8)?7\d{9}$/,
   'kl-GL': /^(\+?299)?\s?\d{2}\s?\d{2}\s?\d{2}$/,
   'ko-KR': /^((\+?82)[ \-]?)?0?1([0|1|6|7|8|9]{1})[ \-]?\d{3,4}[ \-]?\d{4}$/,

diff --git a/src/lib/isLatLong.js b/src/lib/isLatLong.js
@@ -7,9 +7,7 @@ export default function (str) {
   assertString(str);
   if (!str.includes(',')) return false;
   const pair = str.split(',');
-  if (
-    (pair[0].charAt(0) === '(' && pair[1].charAt(pair[1].length - 1) !== ')') ||
-    (pair[1].charAt(pair[1].length - 1) === ')' && pair[0].charAt(0) !== '(')
-  ) return false;
+  if ((pair[0].startsWith('(') && !pair[1].endsWith(')'))
+    || (pair[1].endsWith(')') && !pair[0].startsWith('('))) return false;
   return lat.test(pair[0]) && long.test(pair[1]);
 }
diff --git a/src/lib/isLength.js b/src/lib/isLength.js
@@ -9,7 +9,7 @@ export default function isLength(str, options) {
     min = options.min || 0;
     max = options.max;
   } else { // backwards compatibility: isLength(str, min [, max])
-    min = arguments[1];
+    min = arguments[1] || 0;
     max = arguments[2];
   }
   const surrogatePairs = str.match(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g) || [];

diff --git a/src/lib/isMobilePhone.js b/src/lib/isMobilePhone.js
@@ -58,7 +58,7 @@ const phones = {
   'hu-HU': /^(\+?36)(20|30|70)\d{7}$/,
   'id-ID': /^(\+?62|0)8(1[123456789]|2[1238]|3[1238]|5[12356789]|7[78]|9[56789]|8[123456789])([\s?|\d]{5,11})$/,
   'it-IT': /^(\+?39)?\s?3\d{2} ?\d{6,7}$/,
-  'ja-JP': /^(\+?81|0)[789]0[ \-]?[1-9]\d{2}[ \-]?\d{5}$/,
+  'ja-JP': /^(\+?81|0)[6789]0[ \-]?\d{4}[ \-]?\d{4}$/,
   'kk-KZ': /^(\+?7|8)?7\d{9}$/,
   'kl-GL': /^(\+?299)?\s?\d{2}\s?\d{2}\s?\d{2}$/,
   'ko-KR': /^((\+?82)[ \-]?)?0?1([0|1|6|7|8|9]{1})[ \-]?\d{3,4}[ \-]?\d{4}$/,

diff --git a/test/validators.js b/test/validators.js
@@ -2795,6 +2795,10 @@ describe('Validators', () => {
       valid: [''],
       invalid: ['a', 'ab'],
     });
+    test({
+      validator: 'isLength',
+      valid: ['a', '', 'asds'],
+    });
   });
 
   it('should validate strings by byte length', () => {
@@ -4779,9 +4783,12 @@ describe('Validators', () => {
       {
         locale: 'ja-JP',
         valid: [
-          '09012345688',
-          '090 123 45678',
-          '+8190-123-45678',
+          '09012345678',
+          '08012345678',
+          '07012345678',
+          '06012345678',
+          '090 1234 5678',
+          '+8190-1234-5678',
         ],
         invalid: [
           '12345',
@@ -4794,7 +4801,6 @@ describe('Validators', () => {
           '03_1234_5689',
           '0312345678',
           '0721234567',
-          '08002345678',
           '06 1234 5678',
           '072 123 4567',
           '0729 12 3456',

diff --git a/validator.js b/validator.js
@@ -1007,7 +1007,7 @@ function isLength(str, options) {
     max = options.max;
   } else {
     // backwards compatibility: isLength(str, min [, max])
-    min = arguments[1];
+    min = arguments[1] || 0;
     max = arguments[2];
   }
 
@@ -1399,7 +1399,7 @@ var phones = {
   'hu-HU': /^(\+?36)(20|30|70)\d{7}$/,
   'id-ID': /^(\+?62|0)8(1[123456789]|2[1238]|3[1238]|5[12356789]|7[78]|9[56789]|8[123456789])([\s?|\d]{5,11})$/,
   'it-IT': /^(\+?39)?\s?3\d{2} ?\d{6,7}$/,
-  'ja-JP': /^(\+?81|0)[789]0[ \-]?[1-9]\d{2}[ \-]?\d{5}$/,
+  'ja-JP': /^(\+?81|0)[6789]0[ \-]?\d{4}[ \-]?\d{4}$/,
   'kk-KZ': /^(\+?7|8)?7\d{9}$/,
   'kl-GL': /^(\+?299)?\s?\d{2}\s?\d{2}\s?\d{2}$/,
   'ko-KR': /^((\+?82)[ \-]?)?0?1([0|1|6|7|8|9]{1})[ \-]?\d{3,4}[ \-]?\d{4}$/,
@@ -1739,7 +1739,7 @@ var isLatLong = function (str) {
   assertString(str);
   if (!str.includes(',')) return false;
   var pair = str.split(',');
-  if (pair[0].charAt(0) === '(' && pair[1].charAt(pair[1].length - 1) !== ')' || pair[1].charAt(pair[1].length - 1) === ')' && pair[0].charAt(0) !== '(') return false;
+  if (pair[0].startsWith('(') && !pair[1].endsWith(')') || pair[1].endsWith(')') && !pair[0].startsWith('(')) return false;
   return lat.test(pair[0]) && _long.test(pair[1]);
 };
 

diff --git a/validator.min.js b/validator.min.js