util-helpers 4.12.10 → 4.13.0

package/README.md

@@ -125,3 +125,8 @@ formatMoney('1000'); // => 1,000.00
 [npm-url]: https://npmjs.com/package/util-helpers
 [what is commitlint]: https://github.com/conventional-changelog/commitlint#what-is-commitlint
 [ua-parser-js]: https://www.npmjs.com/package/ua-parser-js
+[numeral]: http://numeraljs.com/
+[rxjs]: https://www.npmjs.com/package/rxjs
+[immutable]: https://www.npmjs.com/package/immutable
+[classnames]: https://www.npmjs.com/package/classnames
+[ramda]: https://www.npmjs.com/package/ramda

package/dist/util-helpers.js

@@ -139,7 +139,7 @@
     return convertToString(value);
   }
 
-  var reg$d = /^1[3456789]\d{9}$/;
+  var reg$c = /^1[3456789]\d{9}$/;
   /**
    * 检测值是否为手机号码
    *
@@ -157,10 +157,10 @@
 
   function isMobile(value) {
     var valueStr = normalizeString(value);
-    return reg$d.test(valueStr);
+    return reg$c.test(valueStr);
   }
 
-  var reg$c = /^(0\d{2,3}\-)?([2-9]\d{6,7})(\-\d{1,6})?$/;
+  var reg$b = /^(0\d{2,3}\-)?([2-9]\d{6,7})(\-\d{1,6})?$/;
   /**
    * 检测值是否为固定电话
    *
@@ -184,10 +184,10 @@
 
   function isTelephone(value) {
     var valueStr = normalizeString(value);
-    return reg$c.test(valueStr);
+    return reg$b.test(valueStr);
   }
 
-  var reg$b = /^\d{6}$/;
+  var reg$a = /^\d{6}$/;
   /**
    * 检测值是否为邮政编码，6位数字
    *
@@ -205,7 +205,7 @@
 
   function isPostcode(value) {
     var valueStr = normalizeString(value);
-    return reg$b.test(valueStr);
+    return reg$a.test(valueStr);
   }
 
   var regIdCard$1 = /^[1-9]\d{5}(19|20)?\d{2}((0[1-9])|(1[012]))(([0-2][1-9])|10|20|30|31)\d{3}(\d|X)?$/i;
@@ -285,7 +285,7 @@
     return false;
   }
 
-  var reg$a = /^[\da-z]+([\-\.\_]?[\da-z]+)*@[\da-z]+([\-\.]?[\da-z]+)*(\.[a-z]{2,})+$/i;
+  var reg$9 = /^[\da-z]+([\-\.\_]?[\da-z]+)*@[\da-z]+([\-\.]?[\da-z]+)*(\.[a-z]{2,})+$/i;
   /**
    * 检测值是否为Email
    *
@@ -303,10 +303,10 @@
 
   function isEmail(value) {
     var valueStr = normalizeString(value);
-    return reg$a.test(valueStr);
+    return reg$9.test(valueStr);
   }
 
-  var reg$9 = /^[1-9]\d{4,10}$/;
+  var reg$8 = /^[1-9]\d{4,10}$/;
   /**
    * 检测值是否为QQ号，非0开头，5至11位数字
    *
@@ -324,10 +324,10 @@
 
   function isQQ(value) {
     var valueStr = normalizeString(value);
-    return reg$9.test(valueStr);
+    return reg$8.test(valueStr);
   }
 
-  var reg$8 = /^[a-z]([-_a-z0-9]{5,19})+$/i;
+  var reg$7 = /^[a-z]([-_a-z0-9]{5,19})+$/i;
   /**
    * 检测值是否为微信号
    *
@@ -345,10 +345,10 @@
 
   function isWX(value) {
     var valueStr = normalizeString(value);
-    return reg$8.test(valueStr);
+    return reg$7.test(valueStr);
   }
 
-  var reg$7 = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([A-Z0-9]{4}[A-Z0-9挂学警港澳]{1})|([A-Z0-9]{5}[DF])|([DF][A-Z0-9]{5}))$/;
+  var reg$6 = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([A-Z0-9]{4}[A-Z0-9挂学警港澳]{1})|([A-Z0-9]{5}[DF])|([DF][A-Z0-9]{5}))$/;
   /**
    * 检测值是否为车牌号，支持新能源和非新能源车牌
    *
@@ -374,10 +374,10 @@
 
   function isVehicle(value) {
     var valueStr = normalizeString(value);
-    return reg$7.test(valueStr);
+    return reg$6.test(valueStr);
   }
 
-  var reg$6 = /^[1-9]\d{9,20}$/; // 8~30位数字
+  var reg$5 = /^[1-9]\d{9,20}$/; // 8~30位数字
 
   var regLoose = /^\d{8,30}$/;
   /**
@@ -430,7 +430,7 @@
         _options$luhn = options.luhn,
         luhn = _options$luhn === void 0 ? false : _options$luhn;
     var valueStr = normalizeString(value);
-    var validateResult = loose ? regLoose.test(valueStr) : reg$6.test(valueStr);
+    var validateResult = loose ? regLoose.test(valueStr) : reg$5.test(valueStr);
 
     if (validateResult && luhn) {
       var precode = valueStr.substring(0, valueStr.length - 1);
@@ -526,7 +526,7 @@
     return lastCode === checkCode;
   }
 
-  const version = "4.12.10";
+  const version = "4.13.0";
 
   // @ts-ignore
   var config = {
@@ -891,7 +891,7 @@
     }).validated;
   }
 
-  var reg$5 = /^((e[\da-z])|(de)|(se)|(pe)|([khm][\da-z]))[\da-z]{7}$/i;
+  var reg$4 = /^((e[\da-z])|(de)|(se)|(pe)|([khm][\da-z]))[\da-z]{7}$/i;
   /**
    * 检测值是否为护照号
    * 支持普通护照(E*)、外交护照(DE)、公务护照(SE)、公务普通护照(PE)、香港特区护照(K/KJ/H*)、澳门特区护照(MA/MB/M*)，注意不区分大小写
@@ -911,7 +911,7 @@
 
   function isPassport(value) {
     var valueStr = normalizeString(value);
-    return reg$5.test(valueStr);
+    return reg$4.test(valueStr);
   }
 
   var chineseDictionary = {
@@ -946,6 +946,8 @@
    * @alias module:Validator.isChinese
    * @since 1.1.0
    * @see 参考 {@link http://www.unicode.org/reports/tr38/#BlockListing|4.4 Listing of Characters Covered by the Unihan Database}
+   * @see 参考 {@link https://zh.wikipedia.org/wiki/Unicode字符平面映射|Unicode字符平面映射}
+   * @see 参考 {@link https://zh.wikipedia.org/wiki/Unicode區段|Unicode区段}
    * @param {*} value 要检测的值
    * @param {Object} [options] 配置项
    * @param {boolean} [options.loose=false] 宽松模式。如果为true，只要包含中文即为true
@@ -985,7 +987,7 @@
     return reg.test(valueStr);
   }
 
-  var reg$4 = /^((\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
+  var reg$3 = /^((\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
   /**
    * 检测值是否为ipv4
    *
@@ -1005,10 +1007,10 @@
 
   function isIPv4(value) {
     var valueStr = normalizeString(value);
-    return reg$4.test(valueStr);
+    return reg$3.test(valueStr);
   }
 
-  var reg$3 = /^((([0-9A-F]{1,4}:){7}([0-9A-F]{1,4}|:))|(([0-9A-F]{1,4}:){6}(:[0-9A-F]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3})|:))|(([0-9A-F]{1,4}:){5}(((:[0-9A-F]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3})|:))|(([0-9A-F]{1,4}:){4}(((:[0-9A-F]{1,4}){1,3})|((:[0-9A-F]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3}))|:))|(([0-9A-F]{1,4}:){3}(((:[0-9A-F]{1,4}){1,4})|((:[0-9A-F]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3}))|:))|(([0-9A-F]{1,4}:){2}(((:[0-9A-F]{1,4}){1,5})|((:[0-9A-F]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3}))|:))|(([0-9A-F]{1,4}:){1}(((:[0-9A-F]{1,4}){1,6})|((:[0-9A-F]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3}))|:))|(:(((:[0-9A-F]{1,4}){1,7})|((:[0-9A-F]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3}))|:)))(%.+)?$/i;
+  var reg$2 = /^((([0-9A-F]{1,4}:){7}([0-9A-F]{1,4}|:))|(([0-9A-F]{1,4}:){6}(:[0-9A-F]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3})|:))|(([0-9A-F]{1,4}:){5}(((:[0-9A-F]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3})|:))|(([0-9A-F]{1,4}:){4}(((:[0-9A-F]{1,4}){1,3})|((:[0-9A-F]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3}))|:))|(([0-9A-F]{1,4}:){3}(((:[0-9A-F]{1,4}){1,4})|((:[0-9A-F]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3}))|:))|(([0-9A-F]{1,4}:){2}(((:[0-9A-F]{1,4}){1,5})|((:[0-9A-F]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3}))|:))|(([0-9A-F]{1,4}:){1}(((:[0-9A-F]{1,4}){1,6})|((:[0-9A-F]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3}))|:))|(:(((:[0-9A-F]{1,4}){1,7})|((:[0-9A-F]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(\.(25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3}))|:)))(%.+)?$/i;
   /**
    * 检测值是否为ipv6
    *
@@ -1042,10 +1044,24 @@
 
   function isIPv6(value) {
     var valueStr = normalizeString(value);
-    return reg$3.test(valueStr);
+    return reg$2.test(valueStr);
   }
 
-  var reg$2 = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\*\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
+  // [协议类型]://[服务器地址]:[端口号]/[资源层级UNIX文件路径][文件名]?[查询]#[片段ID]
+  // 完整格式如下：
+  // [协议类型]://[访问资源需要的凭证信息]@[服务器地址]:[端口号]/[资源层级UNIX文件路径][文件名]?[查询]#[片段ID]
+  // 
+  // 其中[访问凭证信息]、[端口号]、[查询]、[片段ID]都属于选填项。
+
+  var protocalReg = '[\\w-.]+:\\/\\/';
+  var credentialsReg = '[-;:&=\\+\\$,\\w]+@';
+  var serverReg = 'localhost|(([^\\s:\\/]+?\\.)+?[^\\s:\\/]+)';
+  var portReg = ':\\d+';
+  var pathReg = '\\/.*';
+  var searchReg = '\\?.*';
+  var hashReg = '#.*';
+  var regWithProtocal = new RegExp("^".concat(protocalReg, "(?:").concat(credentialsReg, ")?(?:").concat(serverReg, ")(?:").concat(portReg, ")?(?:").concat(pathReg, ")*(?:").concat(searchReg, ")?(?:").concat(hashReg, ")?$"));
+  var regNonProtocal = new RegExp("^(?:".concat(serverReg, ")(?:").concat(portReg, ")?(?:").concat(pathReg, ")*(?:").concat(searchReg, ")?(?:").concat(hashReg, ")?$"));
   /**
    * 检测值是否为url
    *
@@ -1058,18 +1074,27 @@
    * @example
    *
    * isUrl(''); // false
-   * isUrl('8.8.8.8'); // false
+   * isUrl('/foo/bar'); // false
+   * 
+   * isUrl('8.8.8.8'); // true
    * isUrl('example.com'); // true
    * isUrl('http://example.com'); // true
    * isUrl('https://example.com:8080'); // true
-   * isUrl('http://www.example.com/test/123'); // true
-   * isUrl('http://www.example.com/test/123?foo=bar'); // true
+   * isUrl('https://www.example.com/test/123'); // true
+   * isUrl('https://www.example.com/test/123?foo=bar'); // true
+   * isUrl('https://www.example.com/test/123?foo=中文#id'); // true
+   * isUrl('https://www.example.com/test/123?foo=中文#测试'); // true
+   * isUrl('ftp://127.0.0.1:8080/测试.tar'); // true
+   * isUrl('a.b'); // true
+   * isUrl('a.b:8080'); // true
+   * isUrl('p://a.b'); // true
+   * isUrl('p://a.b:8888'); // true
    * 
    */
 
   function isUrl(value) {
     var valueStr = normalizeString(value);
-    return reg$2.test(valueStr);
+    return regWithProtocal.test(valueStr) || regNonProtocal.test(valueStr);
   }
 
   var baseReg = /^\d{15}$/;