util-helpers 5.8.0 → 5.8.1

package/esm/VERSION.js

@@ -1,3 +1,3 @@
-var VERSION = "5.8.0";
+var VERSION = "5.8.1";
 
 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 reg = /^[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++) {
@@ -19,9 +19,9 @@ function isIdCard(value, options) {
     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);
+        return reg.test(valueStr);
     }
-    if (valueStr.length === 18 && regIdCard.test(valueStr)) {
+    if (valueStr.length === 18 && reg.test(valueStr)) {
         if (checkCode) {
             return check(valueStr);
         }

package/esm/randomString.js

@@ -18,7 +18,10 @@ function internalRandomString(len, pool, prefix) {
 var randomString = function (len, pool) {
     if (len === void 0) { len = 0; }
     var _pool;
-    if (typeof pool !== 'string') {
+    if (Array.isArray(pool)) {
+        _pool = pool.map(function (p) { return chars[p]; }).join('');
+    }
+    else if (typeof pool !== 'string') {
         _pool = allChars;
     }
     else if (chars[pool]) {

package/lib/VERSION.js

@@ -1,5 +1,5 @@
 'use strict';
 
-var VERSION = "5.8.0";
+var VERSION = "5.8.1";
 
 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 reg = /^[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++) {
@@ -21,9 +21,9 @@ function isIdCard(value, options) {
     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);
+        return reg.test(valueStr);
     }
-    if (valueStr.length === 18 && regIdCard.test(valueStr)) {
+    if (valueStr.length === 18 && reg.test(valueStr)) {
         if (checkCode) {
             return check(valueStr);
         }

package/lib/randomString.js

@@ -20,7 +20,10 @@ function internalRandomString(len, pool, prefix) {
 var randomString = function (len, pool) {
     if (len === void 0) { len = 0; }
     var _pool;
-    if (typeof pool !== 'string') {
+    if (Array.isArray(pool)) {
+        _pool = pool.map(function (p) { return chars[p]; }).join('');
+    }
+    else if (typeof pool !== 'string') {
         _pool = allChars;
     }
     else if (chars[pool]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "5.8.0",
+  "version": "5.8.1",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -9,9 +9,9 @@
   "sideEffects": false,
   "types": "types/index.d.ts",
   "scripts": {
-    "test": "jest --verbose",
-    "test:coverage": "jest --coverage",
-    "test:coverage:local": "cross-env COVERAGE_LOCAL=1 jest --coverage && open ./coverage/lcov-report/index.html",
+    "test": "jest --verbose --maxWorkers=50%",
+    "test:coverage": "jest --coverage --maxWorkers=50%",
+    "test:coverage:local": "cross-env COVERAGE_LOCAL=1 jest --coverage --maxWorkers=50% && open ./coverage/lcov-report/index.html",
     "build": "rm -rf esm lib dist && rollup -c && npm run build:types",
     "build:types": "rm -rf types && tsc -p tsconfig.build.json -d --outDir types --emitDeclarationOnly",
     "build:doc": "npm run doc",

package/types/isIdCard.d.ts

@@ -1,6 +1,6 @@
 type Options = {
     /**
-     * @deprecated 即将废弃。
+     * @deprecated 即将废弃，使用`checkCode`参数替代。
      */
     loose?: boolean;
     checkCode?: boolean;

package/types/randomString.d.ts

@@ -1,6 +1,12 @@
+declare const chars: {
+    number: string;
+    lower: string;
+    upper: string;
+};
 interface RandomString {
-    (len: number, poll: 'number' | 'lower' | 'upper'): string;
+    <T extends keyof typeof chars>(len: number, poll: T): string;
     (len: number, poll?: string): string;
+    <T extends keyof typeof chars>(len: number, poll: Array<T>): string;
 }
 /**
  * 生成随机字符串
@@ -9,7 +15,7 @@ interface RandomString {
  * @alias module:Other.randomString
  * @since 4.8.0
  * @param {number} [len=0] 长度，默认`0`
- * @param {'number' | 'lower' | 'upper' | string} [pool='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'] 字符池，默认为数字和大小写字母。支持设置类型`number` `lower` `upper` 或字符串。
+ * @param {'number' | 'lower' | 'upper' | string | Array<'number' | 'lower' | 'upper'>} [pool='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'] 字符池，默认为数字和大小写字母。支持设置类型`number` `lower` `upper` 或字符串，也支持数组组合。
  * @returns {string} 随机字符串
  * @example
  *
@@ -20,6 +26,10 @@ interface RandomString {
  * randomString(5, 'abc'); // ccbcb
  * randomString(8, 'abcefg'); // bcgcfabg
  *
+ * // 使用数组组合
+ * randomString(5, ['number', 'lower']); // 1a2b3
+ * randomString(8, ['upper', 'number']); // A1B2C3D4
+ *
  */
 declare const randomString: RandomString;
 export default randomString;