util-helpers 5.7.6 → 5.7.7

package/esm/VERSION.js

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

package/esm/isHMCard.js

@@ -1,6 +1,6 @@
 import { toString } from 'ut2';
 
-var regHMCard = /^[hm]{1}([0-9]{10}|[0-9]{8})$/i;
+var regHMCard = /^[hm]{1}[0-9]{8}$/i;
 function isHMCard(value) {
     var valueStr = toString(value);
     return regHMCard.test(valueStr);

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

package/esm/loadScript.js

@@ -1,18 +1,22 @@
 import { __assign, __rest } from 'tslib';
+import { isObject } from 'ut2';
 import { objectKeys } from './utils/native.js';
 
 var loadScript = function (_src, options) {
     var finalOptions;
-    if (typeof _src === 'object') {
+    if (isObject(_src)) {
         finalOptions = _src;
     }
     else if (typeof _src === 'string') {
         finalOptions = __assign({ src: _src }, options);
     }
+    else {
+        finalOptions = options || {};
+    }
     return new Promise(function (resolve, reject) {
         var container = document.head || document.getElementsByTagName('head')[0] || document.body;
         var script = document.createElement('script');
-        var _a = finalOptions || {}, src = _a.src, attrs = _a.attrs, _b = _a.destroyOnError, destroyOnError = _b === void 0 ? true : _b, onload = _a.onload, onerror = _a.onerror, restOptions = __rest(_a, ["src", "attrs", "destroyOnError", "onload", "onerror"]);
+        var src = finalOptions.src, attrs = finalOptions.attrs, _a = finalOptions.destroyOnError, destroyOnError = _a === void 0 ? true : _a, onload = finalOptions.onload, onerror = finalOptions.onerror, restOptions = __rest(finalOptions, ["src", "attrs", "destroyOnError", "onload", "onerror"]);
         var props = __assign({ async: true, type: 'text/javascript' }, restOptions);
         for (var key in props) {
             script[key] = props[key];

package/lib/VERSION.js

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

package/lib/isHMCard.js

@@ -2,7 +2,7 @@
 
 var ut2 = require('ut2');
 
-var regHMCard = /^[hm]{1}([0-9]{10}|[0-9]{8})$/i;
+var regHMCard = /^[hm]{1}[0-9]{8}$/i;
 function isHMCard(value) {
     var valueStr = ut2.toString(value);
     return regHMCard.test(valueStr);

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

package/lib/loadScript.js

@@ -1,20 +1,24 @@
 'use strict';
 
 var tslib = require('tslib');
+var ut2 = require('ut2');
 var native = require('./utils/native.js');
 
 var loadScript = function (_src, options) {
     var finalOptions;
-    if (typeof _src === 'object') {
+    if (ut2.isObject(_src)) {
         finalOptions = _src;
     }
     else if (typeof _src === 'string') {
         finalOptions = tslib.__assign({ src: _src }, options);
     }
+    else {
+        finalOptions = options || {};
+    }
     return new Promise(function (resolve, reject) {
         var container = document.head || document.getElementsByTagName('head')[0] || document.body;
         var script = document.createElement('script');
-        var _a = finalOptions || {}, src = _a.src, attrs = _a.attrs, _b = _a.destroyOnError, destroyOnError = _b === void 0 ? true : _b, onload = _a.onload, onerror = _a.onerror, restOptions = tslib.__rest(_a, ["src", "attrs", "destroyOnError", "onload", "onerror"]);
+        var src = finalOptions.src, attrs = finalOptions.attrs, _a = finalOptions.destroyOnError, destroyOnError = _a === void 0 ? true : _a, onload = finalOptions.onload, onerror = finalOptions.onerror, restOptions = tslib.__rest(finalOptions, ["src", "attrs", "destroyOnError", "onload", "onerror"]);
         var props = tslib.__assign({ async: true, type: 'text/javascript' }, restOptions);
         for (var key in props) {
             script[key] = props[key];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "5.7.6",
+  "version": "5.7.7",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -53,7 +53,7 @@
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
     "@commitlint/cz-commitlint": "^19.8.1",
-    "@eslint/js": "^9.39.1",
+    "@eslint/js": "^9.39.2",
     "@rollup/plugin-commonjs": "^28.0.9",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-replace": "^6.0.3",
@@ -63,7 +63,7 @@
     "commitizen": "^4.3.1",
     "cross-env": "^7.0.3",
     "docdash": "^2.0.2",
-    "eslint": "^9.39.1",
+    "eslint": "^9.39.2",
     "globals": "^16.5.0",
     "husky": "^9.1.7",
     "jest": "^30.2.0",
@@ -71,11 +71,11 @@
     "jest-environment-jsdom": "^30.2.0",
     "jsdoc": "^4.0.5",
     "lint-staged": "^15.5.2",
-    "prettier": "^3.7.4",
-    "rollup": "^4.53.3",
+    "prettier": "^3.8.1",
+    "rollup": "^4.56.0",
     "ts-jest": "^29.4.6",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.48.1"
+    "typescript-eslint": "^8.54.0"
   },
   "lint-staged": {
     "**/*.ts": "eslint",
@@ -87,9 +87,9 @@
     }
   },
   "dependencies": {
-    "cache2": "^3.1.2",
+    "cache2": "^3.1.3",
     "tslib": "^2.8.1",
-    "ut2": "^1.20.1"
+    "ut2": "^1.21.4"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/types/ConcurrencyController.d.ts

@@ -0,0 +1,9 @@
+declare class ConcurrencyController {
+    private maxConcurrency;
+    private runningCount;
+    private queue;
+    constructor(maxConcurrency: number);
+    add(task: () => void | Promise<any>): void;
+    private run;
+}
+export default ConcurrencyController;

package/types/isHMCard.d.ts

@@ -7,13 +7,7 @@
  * @param {*} value 要检测的值
  * @returns {boolean} 是否为港澳居民来往内地通行证
  * @example
- * // 第一代 11 位
- * isHMCard('h3203117707'); // true
- * isHMCard('H3203117707'); // true
- * isHMCard('m3203117707'); // true
- * isHMCard('M3203117707'); // true
- *
- * // 第二代 9 位
+ * // H或M开头 + 8位数字
  * isHMCard('h32031177'); // true
  * isHMCard('H32031177'); // true
  * isHMCard('m32031177'); // true

package/types/isIdCard.d.ts

@@ -5,16 +5,13 @@ type Options = {
 /**
  * 检测值是否为18位身份证号码。
  *
- * 宽松模式下，支持15位身份证号码。
- *
  * @alias module:Validator.isIdCard
  * @since 1.1.0
  * @see {@link https://zh.wikipedia.org/wiki/中华人民共和国公民身份号码 中华人民共和国公民身份号码}
  * @see {@link https://baike.baidu.com/item/居民身份证号码 居民身份证号码}
  * @param {*} value 要检测的值
  * @param {Object} [options] 配置项
- * @param {boolean} [options.loose=false] 宽松模式，默认`false`。如果为`true`，支持15位身份证号码
- * @param {boolean} [options.checkCode=true] 是否校验最后一位校验码，默认`true`。仅在`loose=false`时生效
+ * @param {boolean} [options.checkCode=true] 是否校验最后一位校验码，默认`true`。
  * @returns {boolean} 值是否为身份证号
  * @example
  *
@@ -24,12 +21,6 @@ type Options = {
  * // 不校验校验码
  * isIdCard('13070119931030228X', { checkCode: false }); // true
  *
- * // 默认不支持15位身份证号码
- * isIdCard('320311770706001'); // false
- *
- * // 宽松模式，支持15位身份证号
- * isIdCard('320311770706001', { loose: true }); // true
- *
  */
 declare function isIdCard(value: any, options?: Options): boolean;
 export default isIdCard;