util-helpers 5.0.1 → 5.0.3

package/esm/VERSION.js

@@ -1,4 +1,4 @@
-var VERSION = "5.0.1";
+var VERSION = "5.0.3";
 var VERSION$1 = VERSION;
 
 export { VERSION$1 as default };

package/esm/findTreeNode.js

@@ -1,17 +1,11 @@
-import { __values } from 'tslib';
-import { isArray, isObject } from 'ut2';
+import { isArray, forEach, isObject } from 'ut2';
 
 function findTreeNode(tree, predicate, childrenField) {
-    var e_1, _a;
     if (childrenField === void 0) { childrenField = 'children'; }
     var stack = [];
     var node;
-    if (!isArray(tree)) {
-        return node;
-    }
-    try {
-        for (var tree_1 = __values(tree), tree_1_1 = tree_1.next(); !tree_1_1.done; tree_1_1 = tree_1.next()) {
-            var item = tree_1_1.value;
+    if (isArray(tree)) {
+        forEach(tree, function (item) {
             stack.push(item);
             while (stack.length) {
                 var temp = stack.pop();
@@ -29,16 +23,9 @@ function findTreeNode(tree, predicate, childrenField) {
                 }
             }
             if (node) {
-                break;
+                return false;
             }
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (tree_1_1 && !tree_1_1.done && (_a = tree_1.return)) _a.call(tree_1);
-        }
-        finally { if (e_1) throw e_1.error; }
+        });
     }
     return node;
 }

package/esm/findTreeNodes.js

@@ -1,17 +1,11 @@
-import { __values } from 'tslib';
-import { isArray, isObject } from 'ut2';
+import { isArray, forEach, isObject } from 'ut2';
 
 function findTreeNodes(tree, predicate, childrenField) {
-    var e_1, _a;
     if (childrenField === void 0) { childrenField = 'children'; }
     var stack = [];
     var nodes = [];
-    if (!isArray(tree)) {
-        return nodes;
-    }
-    try {
-        for (var tree_1 = __values(tree), tree_1_1 = tree_1.next(); !tree_1_1.done; tree_1_1 = tree_1.next()) {
-            var item = tree_1_1.value;
+    if (isArray(tree)) {
+        forEach(tree, function (item) {
             stack.push(item);
             while (stack.length) {
                 var temp = stack.pop();
@@ -27,14 +21,7 @@ function findTreeNodes(tree, predicate, childrenField) {
                     }
                 }
             }
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (tree_1_1 && !tree_1_1.done && (_a = tree_1.return)) _a.call(tree_1);
-        }
-        finally { if (e_1) throw e_1.error; }
+        });
     }
     return nodes;
 }

package/esm/findTreeSelect.js

@@ -1,39 +1,29 @@
-import { __values } from 'tslib';
-import { isArray, isObject } from 'ut2';
+import { isArray, forEach, isObject } from 'ut2';
 
 function internalFindTreeSelect(tree, predicate, childrenField, path) {
-    var e_1, _a;
     if (path === void 0) { path = []; }
-    if (!isArray(tree)) {
-        return [];
-    }
-    try {
-        for (var tree_1 = __values(tree), tree_1_1 = tree_1.next(); !tree_1_1.done; tree_1_1 = tree_1.next()) {
-            var item = tree_1_1.value;
+    var result = [];
+    if (isArray(tree)) {
+        forEach(tree, function (item) {
             path.push(item);
             if (predicate(item)) {
-                return path;
+                result = path;
+                return false;
             }
             if (isObject(item)) {
                 var childs = item[childrenField];
                 if (isArray(childs) && childs.length > 0) {
                     var findChildren = internalFindTreeSelect(childs, predicate, childrenField, path);
                     if (findChildren.length > 0) {
-                        return findChildren;
+                        result = findChildren;
+                        return false;
                     }
                 }
             }
             path.pop();
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (tree_1_1 && !tree_1_1.done && (_a = tree_1.return)) _a.call(tree_1);
-        }
-        finally { if (e_1) throw e_1.error; }
+        });
     }
-    return [];
+    return result;
 }
 function findTreeSelect(tree, predicate, childrenField) {
     if (childrenField === void 0) { childrenField = 'children'; }

package/esm/loadImageWithBlob.js

@@ -1,23 +1,11 @@
-import { createObjectURL, revokeObjectURL } from './utils/native.js';
 import getFileBlob from './getFileBlob.js';
+import loadImage from './loadImage.js';
 
 function loadImageWithBlob(img, ajaxOptions) {
-    return new Promise(function (resolve, reject) {
-        getFileBlob(img, ajaxOptions)
-            .then(function (blob) {
-            var url = createObjectURL(blob);
-            var image = new Image();
-            image.onload = function () {
-                resolve({ blob: blob, image: image });
-            };
-            image.onerror = function (err) {
-                revokeObjectURL(url);
-                console.error("[loadImageWithBlob] The image load failed, '".concat(img, "'."));
-                reject(err);
-            };
-            image.src = url;
-        })
-            .catch(reject);
+    return getFileBlob(img, ajaxOptions).then(function (blob) {
+        return loadImage(blob).then(function (image) {
+            return { blob: blob, image: image };
+        });
     });
 }
 

package/lib/VERSION.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var VERSION = "5.0.1";
+var VERSION = "5.0.3";
 var VERSION$1 = VERSION;
 
 module.exports = VERSION$1;

package/lib/findTreeNode.js

@@ -1,19 +1,13 @@
 'use strict';
 
-var tslib = require('tslib');
 var ut2 = require('ut2');
 
 function findTreeNode(tree, predicate, childrenField) {
-    var e_1, _a;
     if (childrenField === void 0) { childrenField = 'children'; }
     var stack = [];
     var node;
-    if (!ut2.isArray(tree)) {
-        return node;
-    }
-    try {
-        for (var tree_1 = tslib.__values(tree), tree_1_1 = tree_1.next(); !tree_1_1.done; tree_1_1 = tree_1.next()) {
-            var item = tree_1_1.value;
+    if (ut2.isArray(tree)) {
+        ut2.forEach(tree, function (item) {
             stack.push(item);
             while (stack.length) {
                 var temp = stack.pop();
@@ -31,16 +25,9 @@ function findTreeNode(tree, predicate, childrenField) {
                 }
             }
             if (node) {
-                break;
+                return false;
             }
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (tree_1_1 && !tree_1_1.done && (_a = tree_1.return)) _a.call(tree_1);
-        }
-        finally { if (e_1) throw e_1.error; }
+        });
     }
     return node;
 }

package/lib/findTreeNodes.js

@@ -1,19 +1,13 @@
 'use strict';
 
-var tslib = require('tslib');
 var ut2 = require('ut2');
 
 function findTreeNodes(tree, predicate, childrenField) {
-    var e_1, _a;
     if (childrenField === void 0) { childrenField = 'children'; }
     var stack = [];
     var nodes = [];
-    if (!ut2.isArray(tree)) {
-        return nodes;
-    }
-    try {
-        for (var tree_1 = tslib.__values(tree), tree_1_1 = tree_1.next(); !tree_1_1.done; tree_1_1 = tree_1.next()) {
-            var item = tree_1_1.value;
+    if (ut2.isArray(tree)) {
+        ut2.forEach(tree, function (item) {
             stack.push(item);
             while (stack.length) {
                 var temp = stack.pop();
@@ -29,14 +23,7 @@ function findTreeNodes(tree, predicate, childrenField) {
                     }
                 }
             }
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (tree_1_1 && !tree_1_1.done && (_a = tree_1.return)) _a.call(tree_1);
-        }
-        finally { if (e_1) throw e_1.error; }
+        });
     }
     return nodes;
 }

package/lib/findTreeSelect.js

@@ -1,41 +1,31 @@
 'use strict';
 
-var tslib = require('tslib');
 var ut2 = require('ut2');
 
 function internalFindTreeSelect(tree, predicate, childrenField, path) {
-    var e_1, _a;
     if (path === void 0) { path = []; }
-    if (!ut2.isArray(tree)) {
-        return [];
-    }
-    try {
-        for (var tree_1 = tslib.__values(tree), tree_1_1 = tree_1.next(); !tree_1_1.done; tree_1_1 = tree_1.next()) {
-            var item = tree_1_1.value;
+    var result = [];
+    if (ut2.isArray(tree)) {
+        ut2.forEach(tree, function (item) {
             path.push(item);
             if (predicate(item)) {
-                return path;
+                result = path;
+                return false;
             }
             if (ut2.isObject(item)) {
                 var childs = item[childrenField];
                 if (ut2.isArray(childs) && childs.length > 0) {
                     var findChildren = internalFindTreeSelect(childs, predicate, childrenField, path);
                     if (findChildren.length > 0) {
-                        return findChildren;
+                        result = findChildren;
+                        return false;
                     }
                 }
             }
             path.pop();
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (tree_1_1 && !tree_1_1.done && (_a = tree_1.return)) _a.call(tree_1);
-        }
-        finally { if (e_1) throw e_1.error; }
+        });
     }
-    return [];
+    return result;
 }
 function findTreeSelect(tree, predicate, childrenField) {
     if (childrenField === void 0) { childrenField = 'children'; }

package/lib/loadImageWithBlob.js

@@ -1,25 +1,13 @@
 'use strict';
 
-var native = require('./utils/native.js');
 var getFileBlob = require('./getFileBlob.js');
+var loadImage = require('./loadImage.js');
 
 function loadImageWithBlob(img, ajaxOptions) {
-    return new Promise(function (resolve, reject) {
-        getFileBlob(img, ajaxOptions)
-            .then(function (blob) {
-            var url = native.createObjectURL(blob);
-            var image = new Image();
-            image.onload = function () {
-                resolve({ blob: blob, image: image });
-            };
-            image.onerror = function (err) {
-                native.revokeObjectURL(url);
-                console.error("[loadImageWithBlob] The image load failed, '".concat(img, "'."));
-                reject(err);
-            };
-            image.src = url;
-        })
-            .catch(reject);
+    return getFileBlob(img, ajaxOptions).then(function (blob) {
+        return loadImage(blob).then(function (image) {
+            return { blob: blob, image: image };
+        });
     });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -63,8 +63,8 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/jest": "^29.5.12",
-    "@typescript-eslint/eslint-plugin": "^7.13.0",
-    "@typescript-eslint/parser": "^7.13.0",
+    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/parser": "^7.14.1",
     "babel-jest": "^29.7.0",
     "babel-plugin-minify-replace": "^0.5.0",
     "commitizen": "^4.3.0",
@@ -80,7 +80,7 @@
     "lint-staged": "^13.3.0",
     "prettier": "^3.3.2",
     "rollup": "^4.18.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
   },
   "lint-staged": {
     "**/*.ts": "eslint",
@@ -95,7 +95,7 @@
     "cache2": "^3.0.0",
     "emitter-pro": "^1.2.1",
     "tslib": "^2.6.3",
-    "ut2": "^1.9.1"
+    "ut2": "^1.9.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/types/loadImageWithBlob.d.ts

@@ -33,7 +33,7 @@ import getFileBlob from './getFileBlob';
  *
  */
 declare function loadImageWithBlob(img: string | Blob, ajaxOptions?: Parameters<typeof getFileBlob>[1]): Promise<{
-    image: HTMLImageElement;
     blob: Blob;
+    image: HTMLImageElement;
 }>;
 export default loadImageWithBlob;

package/types/transformObjectValue.d.ts

@@ -1,9 +1,8 @@
-type PropertyName = string | symbol;
 interface TransformObjectValue {
-    <V>(arr: V[], fn: (value: V, index: number) => any, deep: false): any[];
-    <V>(arr: V[], fn: (value: any, index: number) => any, deep?: boolean): any[];
-    <T extends object>(obj: T, fn: (value: T[keyof T], key: keyof T) => any, deep: false): Record<PropertyName, any>;
-    <T extends object>(obj: T, fn: (value: T[keyof T] extends object ? any : T[keyof T], key: T[keyof T] extends object ? any : keyof T) => any, deep?: boolean): Record<PropertyName, any>;
+    <V, R>(arr: V[], fn: (value: V, index: number) => R, deep: false): R[];
+    <V, R>(arr: V[], fn: (value: any, index: number) => R, deep?: boolean): R[];
+    <T extends object, R>(obj: T, fn: (value: T[keyof T], key: keyof T) => R, deep: false): Record<keyof T, R>;
+    <T extends object, R>(obj: T, fn: (value: T[keyof T] extends object ? any : T[keyof T], key: T[keyof T] extends object ? any : keyof T) => R, deep?: boolean): Record<keyof T, R>;
     <T>(obj: T, fn: (...args: any[]) => any): T;
 }
 /**