sculp-js 1.11.1-alpha.3 → 1.13.0

package/lib/cjs/array.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/async.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -58,6 +58,37 @@ function asyncMap(list, mapper, concurrency = Infinity) {
         }
     });
 }
+/**
+ * Execute a promise safely
+ *
+ * @param { Promise } promise
+ * @param { Object= } errorExt - Additional Information you can pass safeAwait the err object
+ * @return { Promise }
+ * @example
+ * async function asyncTaskWithCb(cb) {
+     let err, user, savedTask, notification;
+
+     [ err, user ] = await safeAwait(UserModel.findById(1));
+     if(!user) return cb('No user found');
+
+     [ err, savedTask ] = await safeAwait(TaskModel({userId: user.id, name: 'Demo Task'}));
+     if(err) return cb('Error occurred while saving task')
+
+    cb(null, savedTask);
+}
+ */
+function safeAwait(promise, errorExt) {
+    return promise
+        .then((data) => [null, data])
+        .catch((err) => {
+        if (errorExt) {
+            const parsedError = Object.assign({}, err, errorExt);
+            return [parsedError, undefined];
+        }
+        return [err, undefined];
+    });
+}
 
 exports.asyncMap = asyncMap;
+exports.safeAwait = safeAwait;
 exports.wait = wait;

package/lib/cjs/base64.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/clipboard.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -10,9 +10,11 @@ var dom = require('./dom.js');
 var type = require('./type.js');
 
 /**
- * 复制文本，优先使用navigator.clipboard，若不支持则回退使用execCommand方式
+ * 复制文本，优先使用navigator.clipboard，仅在安全上下文(HTTPS/localhost)下生效，若不支持则回退使用execCommand方式
  * @param {string} text
- * @param {AsyncCallback} options 可选参数：成功回调、失败回调、容器元素
+ * @param {CopyTextOptions} options 可选参数：成功回调successCallback、失败回调failCallback、容器元素container
+ *                      （默认document.body, 当不支持clipboard时必须传复制按钮元素，包裹模拟选择操作的临时元素，
+ *                        解决脱离文档流的元素无法复制的问题，如Modal内复制操作)
  */
 function copyText(text, options) {
     const { successCallback = void 0, failCallback = void 0 } = type.isNullOrUnDef(options) ? {} : options;

package/lib/cjs/cloneDeep.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/cookie.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/date.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/dom.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/download.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/easing.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/file.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/func.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/index.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -118,6 +118,7 @@ exports.urlParse = url.urlParse;
 exports.urlSetParams = url.urlSetParams;
 exports.urlStringify = url.urlStringify;
 exports.asyncMap = async.asyncMap;
+exports.safeAwait = async.safeAwait;
 exports.wait = async.wait;
 exports.chooseLocalFile = file.chooseLocalFile;
 exports.compressImg = file.compressImg;

package/lib/cjs/isEqual.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/math.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/number.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/object.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/path.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/qs.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/random.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/string.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/tooltip.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/tree.js

@@ -1,12 +1,11 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
 
 'use strict';
 
-var array = require('./array.js');
 var object = require('./object.js');
 var type = require('./type.js');
 
@@ -18,58 +17,126 @@ const defaultSearchTreeOptions = {
     ignoreCase: true
 };
 /**
- * 深度优先遍历函数(支持continue和break操作), 可用于insert tree item 和 remove tree item
+ * 树遍历函数(支持continue和break操作), 可用于insert tree item 和 remove tree item
  * @param {ArrayLike<V>} tree  树形数据
  * @param {Function} iterator  迭代函数, 返回值为true时continue, 返回值为false时break
- * @param {string} children 定制子元素的key
- * @param {boolean} isReverse  是否反向遍历
+ * @param {options} options 支持定制子元素名称、反向遍历、广度优先遍历，默认{
+    childField: 'children',
+    reverse: false,
+    breadthFirst: false
+  }
  * @returns {*}
  */
-function forEachDeep(tree, iterator, children = 'children', isReverse = false) {
+function forEachDeep(tree, iterator, options = {
+    childField: 'children',
+    reverse: false,
+    breadthFirst: false
+}) {
+    const { childField = 'children', reverse = false, breadthFirst = false } = type.isObject(options) ? options : {};
     let isBreak = false;
+    const queue = [];
     const walk = (arr, parent, level = 0) => {
-        if (isReverse) {
-            for (let i = arr.length - 1; i >= 0; i--) {
+        if (reverse) {
+            for (let index = arr.length - 1; index >= 0; index--) {
                 if (isBreak) {
                     break;
                 }
-                const re = iterator(arr[i], i, arr, tree, parent, level);
-                if (re === false) {
-                    isBreak = true;
-                    break;
+                const item = arr[index];
+                // 广度优先
+                if (breadthFirst) {
+                    queue.push({ item, index, array: arr, tree, parent, level });
                 }
-                else if (re === true) {
-                    continue;
+                else {
+                    const re = iterator(item, index, arr, tree, parent, level);
+                    if (re === false) {
+                        isBreak = true;
+                        break;
+                    }
+                    else if (re === true) {
+                        continue;
+                    }
+                    // @ts-ignore
+                    if (item && Array.isArray(item[childField])) {
+                        // @ts-ignore
+                        walk(item[childField], item, level + 1);
+                    }
                 }
-                // @ts-ignore
-                if (arr[i] && Array.isArray(arr[i][children])) {
+            }
+            if (breadthFirst) {
+                // Process queue
+                while (!isBreak) {
+                    const current = queue.shift();
+                    // iterate(info);
+                    // @ts-ignore
+                    const { item, index, array, tree, parent, level } = current;
+                    const re = iterator(item, index, array, tree, parent, level);
+                    if (re === false) {
+                        isBreak = true;
+                        break;
+                    }
+                    else if (re === true) {
+                        continue;
+                    }
                     // @ts-ignore
-                    walk(arr[i][children], arr[i], level + 1);
+                    if (item && Array.isArray(item[childField])) {
+                        // @ts-ignore
+                        walk(item[childField], item, level + 1);
+                    }
                 }
             }
         }
         else {
-            for (let i = 0, len = arr.length; i < len; i++) {
+            for (let index = 0, len = arr.length; index < len; index++) {
                 if (isBreak) {
                     break;
                 }
-                const re = iterator(arr[i], i, arr, tree, parent, level);
-                if (re === false) {
-                    isBreak = true;
-                    break;
+                const item = arr[index];
+                if (breadthFirst) {
+                    // 广度优先
+                    queue.push({ item, index: index, array: arr, tree, parent, level });
                 }
-                else if (re === true) {
-                    continue;
+                else {
+                    // 深度优先
+                    const re = iterator(item, index, arr, tree, parent, level);
+                    if (re === false) {
+                        isBreak = true;
+                        break;
+                    }
+                    else if (re === true) {
+                        continue;
+                    }
+                    // @ts-ignore
+                    if (item && Array.isArray(item[childField])) {
+                        // @ts-ignore
+                        walk(item[childField], item, level + 1);
+                    }
                 }
-                // @ts-ignore
-                if (arr[i] && Array.isArray(arr[i][children])) {
+            }
+            if (breadthFirst) {
+                while (!isBreak) {
+                    const current = queue.shift();
+                    if (!current)
+                        break;
+                    // @ts-ignore
+                    const { item, index, array, tree, parent, level } = current;
+                    const re = iterator(item, index, array, tree, parent, level);
+                    if (re === false) {
+                        isBreak = true;
+                        break;
+                    }
+                    else if (re === true) {
+                        continue;
+                    }
                     // @ts-ignore
-                    walk(arr[i][children], arr[i], level + 1);
+                    if (item && Array.isArray(item[childField])) {
+                        // @ts-ignore
+                        walk(item[childField], item, level + 1);
+                    }
                 }
             }
         }
     };
-    walk(tree, null);
+    walk(tree, null, 0);
     // @ts-ignore
     tree = null;
 }
@@ -181,17 +248,20 @@ function searchTreeById(tree, nodeId, config) {
 /**
  * 扁平化数组转换成树
  * @param {any[]} list
- * @param {IFieldOptions} options
+ * @param {IFieldOptions} options 定制id字段名，子元素字段名，父元素字段名，默认
+ *        { keyField: 'key', childField: 'children', pidField: 'pid' }
  * @returns {any[]}
  */
 function formatTree(list, options = defaultFieldOptions) {
-    const { keyField, childField, pidField } = options;
+    const { keyField = 'key', childField = 'children', pidField = 'pid' } = type.isObject(options) ? options : {};
     const treeArr = [];
     const sourceMap = {};
-    array.arrayEach(list, item => {
+    for (let i = 0, len = list.length; i < len; i++) {
+        const item = list[i];
         sourceMap[item[keyField]] = item;
-    });
-    array.arrayEach(list, item => {
+    }
+    for (let i = 0, len = list.length; i < len; i++) {
+        const item = list[i];
         const parent = sourceMap[item[pidField]];
         if (parent) {
             (parent[childField] || (parent[childField] = [])).push(item);
@@ -199,21 +269,23 @@ function formatTree(list, options = defaultFieldOptions) {
         else {
             treeArr.push(item);
         }
-    });
+    }
     // @ts-ignore
     list = null;
     return treeArr;
 }
 /**
  * 树形结构转扁平化
- * @param {any} treeList
- * @param {IFieldOptions} options
- * @returns {*}
+ * @param {any[]} treeList
+ * @param {IFieldOptions} options 定制id字段名，子元素字段名，父元素字段名，默认
+ *        { keyField: 'key', childField: 'children', pidField: 'pid' }
+ * @returns {any[]}
  */
 function flatTree(treeList, options = defaultFieldOptions) {
-    const { childField, keyField, pidField } = options;
+    const { keyField = 'key', childField = 'children', pidField = 'pid' } = type.isObject(options) ? options : {};
     let res = [];
-    array.arrayEach(treeList, node => {
+    for (let i = 0, len = treeList.length; i < len; i++) {
+        const node = treeList[i];
         const item = {
             ...node,
             [childField]: [] // 清空子级
@@ -227,7 +299,7 @@ function flatTree(treeList, options = defaultFieldOptions) {
             }));
             res = res.concat(flatTree(children, options));
         }
-    });
+    }
     return res;
 }
 /**
@@ -241,7 +313,12 @@ function flatTree(treeList, options = defaultFieldOptions) {
  * 2. 若无任何过滤条件或keyword模式匹配且keyword为空串，返回原对象；其他情况返回新数组
  * @param {V[]} nodes
  * @param {IFilterCondition} filterCondition
- * @param {ISearchTreeOpts} options
+ * @param {ISearchTreeOpts} options 默认配置项 {
+      childField: 'children',
+      nameField: 'name',
+      removeEmptyChild: false,
+      ignoreCase: true
+    }
  * @returns {V[]}
  */
 function fuzzySearchTree(nodes, filterCondition, options = defaultSearchTreeOptions) {
@@ -250,7 +327,8 @@ function fuzzySearchTree(nodes, filterCondition, options = defaultSearchTreeOpti
         return nodes;
     }
     const result = [];
-    array.arrayEach(nodes, node => {
+    for (let i = 0, len = nodes.length; i < len; i++) {
+        const node = nodes[i];
         // 递归检查子节点是否匹配
         const matchedChildren = node[options.childField] && node[options.childField].length > 0
             ? fuzzySearchTree(node[options.childField] || [], filterCondition, options)
@@ -271,26 +349,22 @@ function fuzzySearchTree(nodes, filterCondition, options = defaultSearchTreeOpti
                     });
                 }
                 else if (options.removeEmptyChild) {
-                    node[options.childField] && delete node[options.childField];
-                    result.push({
-                        ...node
-                    });
+                    const { [options.childField]: _, ...other } = node;
+                    result.push(other);
                 }
                 else {
                     result.push({
                         ...node,
-                        ...{ [options.childField]: [] }
+                        [options.childField]: []
                     });
                 }
             }
             else {
-                node[options.childField] && delete node[options.childField];
-                result.push({
-                    ...node
-                });
+                const { [options.childField]: _, ...other } = node;
+                result.push(other);
             }
         }
-    });
+    }
     return result;
 }
 

package/lib/cjs/type.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/unique.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/url.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/validator.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/variable.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/watermark.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/cjs/we-decode.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/array.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/async.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -56,5 +56,35 @@ function asyncMap(list, mapper, concurrency = Infinity) {
         }
     });
 }
+/**
+ * Execute a promise safely
+ *
+ * @param { Promise } promise
+ * @param { Object= } errorExt - Additional Information you can pass safeAwait the err object
+ * @return { Promise }
+ * @example
+ * async function asyncTaskWithCb(cb) {
+     let err, user, savedTask, notification;
+
+     [ err, user ] = await safeAwait(UserModel.findById(1));
+     if(!user) return cb('No user found');
+
+     [ err, savedTask ] = await safeAwait(TaskModel({userId: user.id, name: 'Demo Task'}));
+     if(err) return cb('Error occurred while saving task')
+
+    cb(null, savedTask);
+}
+ */
+function safeAwait(promise, errorExt) {
+    return promise
+        .then((data) => [null, data])
+        .catch((err) => {
+        if (errorExt) {
+            const parsedError = Object.assign({}, err, errorExt);
+            return [parsedError, undefined];
+        }
+        return [err, undefined];
+    });
+}
 
-export { asyncMap, wait };
+export { asyncMap, safeAwait, wait };

package/lib/es/base64.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/clipboard.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.11.1-alpha.3
+ * sculp-js v1.13.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -8,9 +8,11 @@ import { select } from './dom.js';
 import { isFunction, isNullOrUnDef } from './type.js';
 
 /**
- * 复制文本，优先使用navigator.clipboard，若不支持则回退使用execCommand方式
+ * 复制文本，优先使用navigator.clipboard，仅在安全上下文(HTTPS/localhost)下生效，若不支持则回退使用execCommand方式
  * @param {string} text
- * @param {AsyncCallback} options 可选参数：成功回调、失败回调、容器元素
+ * @param {CopyTextOptions} options 可选参数：成功回调successCallback、失败回调failCallback、容器元素container
+ *                      （默认document.body, 当不支持clipboard时必须传复制按钮元素，包裹模拟选择操作的临时元素，
+ *                        解决脱离文档流的元素无法复制的问题，如Modal内复制操作)
  */
 function copyText(text, options) {
     const { successCallback = void 0, failCallback = void 0 } = isNullOrUnDef(options) ? {} : options;