util-helpers 5.7.4 → 5.7.5

package/esm/VERSION.js

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

package/esm/loadScript.js

@@ -1,16 +1,20 @@
-import { __rest, __assign } from 'tslib';
+import { __assign, __rest } from 'tslib';
 import { objectKeys } from './utils/native.js';
 
-function loadScript(src, options) {
+var loadScript = function (_src, options) {
+    var finalOptions;
+    if (typeof _src === 'object') {
+        finalOptions = _src;
+    }
+    else if (typeof _src === 'string') {
+        finalOptions = __assign({ src: _src }, options);
+    }
     return new Promise(function (resolve, reject) {
         var container = document.head || document.getElementsByTagName('head')[0] || document.body;
         var script = document.createElement('script');
-        var _a = options || {}, attrs = _a.attrs, _b = _a.destroyOnError, destroyOnError = _b === void 0 ? true : _b, restOptions = __rest(_a, ["attrs", "destroyOnError"]);
-        var props = __assign(__assign({ async: true, type: 'text/javascript' }, restOptions), { src: src });
+        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 props = __assign({ async: true, type: 'text/javascript' }, restOptions);
         for (var key in props) {
-            if (key === 'onload' || key === 'onerror') {
-                continue;
-            }
             script[key] = props[key];
         }
         if (typeof attrs === 'object') {
@@ -18,23 +22,26 @@ function loadScript(src, options) {
                 script.setAttribute(key, attrs[key]);
             });
         }
-        script.onload = function (ev) {
-            var _a;
-            this.onerror = this.onload = null;
-            (_a = props.onload) === null || _a === void 0 ? void 0 : _a.call(this, ev);
-            resolve(script);
-        };
-        script.onerror = function (ev) {
-            var _a;
-            this.onerror = this.onload = null;
-            (_a = props.onerror) === null || _a === void 0 ? void 0 : _a.call(this, ev);
-            if (destroyOnError) {
-                container.removeChild(script);
-            }
-            reject(new URIError('Failed to load ' + this.src));
-        };
+        if (src) {
+            script.src = src;
+            script.onload = function (ev) {
+                onload === null || onload === void 0 ? void 0 : onload.call(this, ev);
+                resolve(script);
+            };
+            script.onerror = function (ev) {
+                this.onerror = this.onload = null;
+                onerror === null || onerror === void 0 ? void 0 : onerror.call(this, ev);
+                if (destroyOnError) {
+                    container.removeChild(script);
+                }
+                reject(new URIError('Failed to load ' + this.src));
+            };
+        }
         container.appendChild(script);
+        if (!src) {
+            resolve(script);
+        }
     });
-}
+};
 
 export { loadScript as default };

package/lib/VERSION.js

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

package/lib/loadScript.js

@@ -3,16 +3,20 @@
 var tslib = require('tslib');
 var native = require('./utils/native.js');
 
-function loadScript(src, options) {
+var loadScript = function (_src, options) {
+    var finalOptions;
+    if (typeof _src === 'object') {
+        finalOptions = _src;
+    }
+    else if (typeof _src === 'string') {
+        finalOptions = tslib.__assign({ src: _src }, options);
+    }
     return new Promise(function (resolve, reject) {
         var container = document.head || document.getElementsByTagName('head')[0] || document.body;
         var script = document.createElement('script');
-        var _a = options || {}, attrs = _a.attrs, _b = _a.destroyOnError, destroyOnError = _b === void 0 ? true : _b, restOptions = tslib.__rest(_a, ["attrs", "destroyOnError"]);
-        var props = tslib.__assign(tslib.__assign({ async: true, type: 'text/javascript' }, restOptions), { src: src });
+        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 props = tslib.__assign({ async: true, type: 'text/javascript' }, restOptions);
         for (var key in props) {
-            if (key === 'onload' || key === 'onerror') {
-                continue;
-            }
             script[key] = props[key];
         }
         if (typeof attrs === 'object') {
@@ -20,23 +24,26 @@ function loadScript(src, options) {
                 script.setAttribute(key, attrs[key]);
             });
         }
-        script.onload = function (ev) {
-            var _a;
-            this.onerror = this.onload = null;
-            (_a = props.onload) === null || _a === void 0 ? void 0 : _a.call(this, ev);
-            resolve(script);
-        };
-        script.onerror = function (ev) {
-            var _a;
-            this.onerror = this.onload = null;
-            (_a = props.onerror) === null || _a === void 0 ? void 0 : _a.call(this, ev);
-            if (destroyOnError) {
-                container.removeChild(script);
-            }
-            reject(new URIError('Failed to load ' + this.src));
-        };
+        if (src) {
+            script.src = src;
+            script.onload = function (ev) {
+                onload === null || onload === void 0 ? void 0 : onload.call(this, ev);
+                resolve(script);
+            };
+            script.onerror = function (ev) {
+                this.onerror = this.onload = null;
+                onerror === null || onerror === void 0 ? void 0 : onerror.call(this, ev);
+                if (destroyOnError) {
+                    container.removeChild(script);
+                }
+                reject(new URIError('Failed to load ' + this.src));
+            };
+        }
         container.appendChild(script);
+        if (!src) {
+            resolve(script);
+        }
     });
-}
+};
 
 module.exports = loadScript;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "5.7.4",
+  "version": "5.7.5",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -17,8 +17,8 @@
     "doc": "rm -rf docs && rm -rf docs-src && tsc -p tsconfig.build.json -t esnext --outDir docs-src && jsdoc -c conf.json && rm -rf docs-src",
     "doc:open": "open ./docs/index.html",
     "prettier": "prettier -w **/*",
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
-    "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
+    "lint": "eslint .",
+    "lint:fix": "npm run lint -- --fix",
     "commit": "cz",
     "prepublishOnly": "npm test && npm run build",
     "tsc": "tsc --noEmit",
@@ -49,32 +49,32 @@
   },
   "homepage": "https://doly-dev.github.io/util-helpers/index.html",
   "devDependencies": {
-    "@commitlint/cli": "^17.8.1",
-    "@commitlint/config-conventional": "^17.8.1",
-    "@commitlint/cz-commitlint": "^17.8.1",
-    "@rollup/plugin-commonjs": "^25.0.8",
-    "@rollup/plugin-node-resolve": "^15.3.1",
-    "@rollup/plugin-replace": "^5.0.7",
+    "@commitlint/cli": "^19.8.1",
+    "@commitlint/config-conventional": "^19.8.1",
+    "@commitlint/cz-commitlint": "^19.8.1",
+    "@eslint/js": "^9.39.1",
+    "@rollup/plugin-commonjs": "^28.0.9",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-replace": "^6.0.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^11.1.6",
-    "@types/jest": "^29.5.14",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@rollup/plugin-typescript": "^12.3.0",
+    "@types/jest": "^30.0.0",
     "commitizen": "^4.3.1",
     "cross-env": "^7.0.3",
     "docdash": "^2.0.2",
-    "eslint": "^8.57.1",
+    "eslint": "^9.39.1",
+    "globals": "^16.5.0",
     "husky": "^9.1.7",
-    "inquirer": "^8.2.6",
-    "jest": "^29.7.0",
+    "jest": "^30.2.0",
     "jest-canvas-mock": "^2.5.2",
-    "jest-environment-jsdom": "^29.7.0",
-    "jsdoc": "^4.0.4",
-    "lint-staged": "^13.3.0",
-    "prettier": "^3.5.3",
-    "rollup": "^4.36.0",
-    "ts-jest": "^29.2.6",
-    "typescript": "^5.8.2"
+    "jest-environment-jsdom": "^30.2.0",
+    "jsdoc": "^4.0.5",
+    "lint-staged": "^15.5.2",
+    "prettier": "^3.7.4",
+    "rollup": "^4.53.3",
+    "ts-jest": "^29.4.6",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.48.1"
   },
   "lint-staged": {
     "**/*.ts": "eslint",
@@ -88,7 +88,7 @@
   "dependencies": {
     "cache2": "^3.1.2",
     "tslib": "^2.8.1",
-    "ut2": "^1.17.0"
+    "ut2": "^1.20.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/types/filterTree.d.ts

@@ -25,5 +25,5 @@ type NodeAssign = 'spread' | 'self';
  * filterTree(menus, item=>item.id === 'not found');
  * // []
  */
-declare function filterTree<T extends any, F extends (item: T) => boolean>(tree: T[], predicate: F, childrenField?: string, nodeAssign?: NodeAssign): T[];
+declare function filterTree<T, F extends (item: T) => boolean>(tree: T[], predicate: F, childrenField?: string, nodeAssign?: NodeAssign): T[];
 export default filterTree;

package/types/findTreeNode.d.ts

@@ -19,5 +19,5 @@
  * findTreeNode(menus, item=>item.id === 'not found');
  * // undefined
  */
-declare function findTreeNode<T extends any, F extends (item: T) => boolean>(tree: T[], predicate: F, childrenField?: string): T | undefined;
+declare function findTreeNode<T, F extends (item: T) => boolean>(tree: T[], predicate: F, childrenField?: string): T | undefined;
 export default findTreeNode;

package/types/findTreeNodes.d.ts

@@ -22,5 +22,5 @@
  * findTreeNodes(menus, item=>item.id === 'not found');
  * // []
  */
-declare function findTreeNodes<T extends any, F extends (item: T) => boolean>(tree: T[], predicate: F, childrenField?: string): T[];
+declare function findTreeNodes<T, F extends (item: T) => boolean>(tree: T[], predicate: F, childrenField?: string): T[];
 export default findTreeNodes;

package/types/findTreeSelect.d.ts

@@ -19,5 +19,5 @@
  * findTreeSelect(menus, item => item.id === 'not found');
  * // []
  */
-declare function findTreeSelect<T extends any, F extends (item: T) => boolean>(tree: T[], predicate: F, childrenField?: string): T[];
+declare function findTreeSelect<T, F extends (item: T) => boolean>(tree: T[], predicate: F, childrenField?: string): T[];
 export default findTreeSelect;

package/types/getMimeType.d.ts

@@ -5,6 +5,7 @@
  * @since 5.2.0
  * @see {@link https://developer.mozilla.org/zh-CN/docs/Web/HTTP/MIME_types MIME 类型（IANA 媒体类型）}
  * @see {@link https://www.iana.org/assignments/media-types/media-types.xhtml Media Types}
+ * @see 如果需要完整的MIME类型，推荐使用 {@link https://www.npmjs.com/package/mime-type | mime-type}
  * @param {string} fileName 文件名。
  * @returns 如果找到，返回 MIME 类型字符串，否则返回 `undefined`。
  * @example

package/types/isEmail.d.ts

@@ -7,9 +7,15 @@
  * @returns {boolean} 值是否为Email
  * @example
  *
- * isEmail('1232@qq.com'); // true
+ * isEmail('123@qq.com'); // true
+ * isEmail('1-23@qq.com'); // true
  * isEmail('123@'); // false
  *
+ * // 包含非法字符（除 -、_、. 以外的符号）
+ * isEmail('1 23@qq.com'); // false
+ * isEmail('1&23@qq.com'); // false
+ * isEmail('1%23@qq.com'); // false
+ *
  */
 declare function isEmail(value: any): boolean;
 export default isEmail;

package/types/listToTree.d.ts

@@ -38,5 +38,5 @@ type Options = {
  * // [{id:'1',name:'首页',code:'trade',pid:null},{id:'2',name:'交易管理',code:'trade',pid:null,childs:[{id:'3',name:'交易查询',code:'trade-1',pid:'2',childs:[{id:'4',name:'交易查询-查询操作',code:'trade-1-1',pid:'3'}]}]},{id:'5',name:'权限管理',code:'authorization',pid:null,childs:[{id:'6',name:'角色管理',code:'authorization-1',pid:'5'},{id:'7',name:'用户管理',code:'authorization-2',pid:'5'}]}]
  *
  */
-declare function listToTree<T extends Record<string, any> = Record<string, any>, R extends unknown = T & Record<string, any>>(list: T[], options?: Options): R[];
+declare function listToTree<T extends Record<string, any> = Record<string, any>, R = T & Record<string, any>>(list: T[], options?: Options): R[];
 export default listToTree;

package/types/loadScript.d.ts

@@ -2,6 +2,12 @@ type ScriptAttribute = Pick<HTMLScriptElement, 'async' | 'crossOrigin' | 'defer'
     attrs: Record<string, string>;
     destroyOnError: boolean;
 };
+interface LoadScript {
+    (src: string, options?: Partial<ScriptAttribute>): Promise<HTMLScriptElement>;
+    (options?: Partial<ScriptAttribute & {
+        src?: string;
+    }>): Promise<HTMLScriptElement>;
+}
 /**
  * 加载 js 文件。
  *
@@ -9,7 +15,7 @@ type ScriptAttribute = Pick<HTMLScriptElement, 'async' | 'crossOrigin' | 'defer'
  *
  * @alias module:Browser.loadScript
  * @since 4.19.0
- * @param {string} src  js 地址。
+ * @param {string} [src]  js 地址。
  * @param {Object} [options] script 标签属性。比如 `defer` `onload` `onerror` `id` 等，下面列举部分带有默认值或额外扩展的配置。
  * @param {boolean} [options.destroyOnError=true] 如果加载失败或错误，自动删除 dom 中的 script 标签。默认`true`
  * @param {Object} [options.attrs] 自定义 script 属性，通过 script.setAttribute 设置。
@@ -26,6 +32,13 @@ type ScriptAttribute = Pick<HTMLScriptElement, 'async' | 'crossOrigin' | 'defer'
  *   // do something
  * })
  *
+ * // 注入 script
+ * loadScript({
+ *   text: 'console.log("hello world");'
+ * }).then(script=>{
+ *   // do something
+ * })
+ *
  */
-declare function loadScript(src: string, options?: Partial<ScriptAttribute>): Promise<HTMLScriptElement>;
+declare const loadScript: LoadScript;
 export default loadScript;

package/types/transformFieldNames.d.ts

@@ -1,8 +1,8 @@
 type NodeAssign = 'spread' | 'self';
-type ExchangeFieldNames<D extends any, F extends Record<string, keyof D>> = Omit<D, F[keyof F]> & {
+type ExchangeFieldNames<D, F extends Record<string, keyof D>> = Omit<D, F[keyof F]> & {
     [P in keyof F]: D[F[P]];
 };
-type TransformFieldNames<D extends any, F extends Record<string, any>, C extends string> = (C extends keyof D ? ExchangeFieldNames<Omit<D, C> & Record<C, TransformFieldNames<D, F, C>>, F> : ExchangeFieldNames<D, F>)[];
+type TransformFieldNames<D, F extends Record<string, any>, C extends string> = (C extends keyof D ? ExchangeFieldNames<Omit<D, C> & Record<C, TransformFieldNames<D, F, C>>, F> : ExchangeFieldNames<D, F>)[];
 /**
  * 转换字段名，返回一个转换字段后的值，不改变原值。
  *
@@ -32,5 +32,5 @@ type TransformFieldNames<D extends any, F extends Record<string, any>, C extends
  * const newOptions4 = transformFieldNames(options3, {label: 'name', value: 'code', children: 'childs'}, 'childs');
  * // [{value: '1', label: 'one'},{value:'2', label:'two', children: [{value: '2-1', label:'two-one'}]}]
  */
-declare function transformFieldNames<D extends any, F extends Record<string, keyof D>, C extends string>(data: D[], fieldNames: F, childrenField?: C, nodeAssign?: NodeAssign): TransformFieldNames<D, F, C>;
+declare function transformFieldNames<D, F extends Record<string, keyof D>, C extends string>(data: D[], fieldNames: F, childrenField?: C, nodeAssign?: NodeAssign): TransformFieldNames<D, F, C>;
 export default transformFieldNames;