util-helpers 5.7.7 → 5.7.8

package/esm/VERSION.js

@@ -1,3 +1,3 @@
-var VERSION = "5.7.7";
+var VERSION = "5.7.8";
 
 export { VERSION as default };

package/esm/isIdCard.js

@@ -1,6 +1,6 @@
 import { toString } from 'ut2';
 
-var regIdCard = /^[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;
+var regIdCard = /^[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;
 function check(id) {
     var index, sum;
     for (sum = index = 0; index < 17; index++) {
@@ -16,10 +16,16 @@ function check(id) {
 }
 function isIdCard(value, options) {
     if (options === void 0) { options = {}; }
-    var _a = options.checkCode, checkCode = _a === void 0 ? true : _a;
+    var _a = options.loose, loose = _a === void 0 ? false : _a, _b = options.checkCode, checkCode = _b === void 0 ? true : _b;
     var valueStr = toString(value);
+    if (valueStr.length === 15 && loose) {
+        return regIdCard.test(valueStr);
+    }
     if (valueStr.length === 18 && regIdCard.test(valueStr)) {
-        return checkCode ? check(valueStr) : true;
+        if (checkCode) {
+            return check(valueStr);
+        }
+        return true;
     }
     return false;
 }

package/lib/VERSION.js

@@ -1,5 +1,5 @@
 'use strict';
 
-var VERSION = "5.7.7";
+var VERSION = "5.7.8";
 
 module.exports = VERSION;

package/lib/isIdCard.js

@@ -2,7 +2,7 @@
 
 var ut2 = require('ut2');
 
-var regIdCard = /^[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;
+var regIdCard = /^[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;
 function check(id) {
     var index, sum;
     for (sum = index = 0; index < 17; index++) {
@@ -18,10 +18,16 @@ function check(id) {
 }
 function isIdCard(value, options) {
     if (options === void 0) { options = {}; }
-    var _a = options.checkCode, checkCode = _a === void 0 ? true : _a;
+    var _a = options.loose, loose = _a === void 0 ? false : _a, _b = options.checkCode, checkCode = _b === void 0 ? true : _b;
     var valueStr = ut2.toString(value);
+    if (valueStr.length === 15 && loose) {
+        return regIdCard.test(valueStr);
+    }
     if (valueStr.length === 18 && regIdCard.test(valueStr)) {
-        return checkCode ? check(valueStr) : true;
+        if (checkCode) {
+            return check(valueStr);
+        }
+        return true;
     }
     return false;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "5.7.7",
+  "version": "5.7.8",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",

package/types/ConcurrencyController.d.ts

@@ -1,9 +1,27 @@
+type AsyncFunc<T = any> = () => Promise<T>;
+/**
+ * 并发控制器
+ *
+ * @class
+ * @param {number} [maxConcurrency=2] 最大并发数量。
+ * @example
+ *
+ */
 declare class ConcurrencyController {
     private maxConcurrency;
     private runningCount;
     private queue;
-    constructor(maxConcurrency: number);
-    add(task: () => void | Promise<any>): void;
+    private isPaused;
+    constructor(maxConcurrency?: number);
+    add<T>(task: AsyncFunc<T>): Promise<T>;
     private run;
+    getStatus(): {
+        running: number;
+        waiting: number;
+        maxConcurrency: number;
+    };
+    setMaxConcurrency(maxConcurrency: number): void;
+    pause(): void;
+    resume(): void;
 }
 export default ConcurrencyController;

package/types/isIdCard.d.ts

@@ -1,4 +1,7 @@
 type Options = {
+    /**
+     * @deprecated 即将废弃。
+     */
     loose?: boolean;
     checkCode?: boolean;
 };