sculp-js 1.7.0 → 1.7.2

package/lib/umd/index.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -309,7 +309,7 @@
         return obj2;
     }
     /**
-     * 对象祛除
+     * 对象去除
      * @param {O} obj
      * @param {K} keys
      * @returns {Pick<O, ArrayElements<K>>}
@@ -424,26 +424,110 @@
     }
     /**
      * 深拷贝堪称完全体 即：任何类型的数据都会被深拷贝
-     * @param {AnyObject | AnyArray} obj
+     *
+     * 包含对null、原始值、对象循环引用的处理
+     *
+     * 对Map、Set、ArrayBuffer、Date、RegExp、Array、Object及原型链属性方法执行深拷贝
+     * @param {T} source
      * @param {WeakMap} map
-     * @returns {AnyObject | AnyArray}
+     * @returns {T}
      */
-    function cloneDeep(obj, map = new WeakMap()) {
-        if (obj instanceof Date)
-            return new Date(obj);
-        if (obj instanceof RegExp)
-            return new RegExp(obj);
-        if (map.has(obj)) {
-            return map.get(obj);
+    function cloneDeep(source, map = new WeakMap()) {
+        // 处理原始类型和 null/undefined
+        if (source === null || typeof source !== 'object') {
+            return source;
         }
-        const allDesc = Object.getOwnPropertyDescriptors(obj);
-        const cloneObj = Object.create(Object.getPrototypeOf(obj), allDesc);
-        map.set(obj, cloneObj);
-        for (const key of Reflect.ownKeys(obj)) {
-            const value = obj[key];
-            cloneObj[key] = value instanceof Object && typeof value !== 'function' ? cloneDeep(value, map) : value;
+        // 处理循环引用
+        if (map.has(source)) {
+            return map.get(source);
+        }
+        // 处理 ArrayBuffer
+        if (source instanceof ArrayBuffer) {
+            const copy = new ArrayBuffer(source.byteLength);
+            new Uint8Array(copy).set(new Uint8Array(source));
+            map.set(source, copy);
+            return copy;
+        }
+        // 处理 DataView 和 TypedArray (Uint8Array 等)
+        if (ArrayBuffer.isView(source)) {
+            const constructor = source.constructor;
+            const bufferCopy = cloneDeep(source.buffer, map);
+            return new constructor(bufferCopy, source.byteOffset, source.length);
+        }
+        // 处理 Date 对象
+        if (source instanceof Date) {
+            const copy = new Date(source.getTime());
+            map.set(source, copy);
+            return copy;
+        }
+        // 处理 RegExp 对象
+        if (source instanceof RegExp) {
+            const copy = new RegExp(source.source, source.flags);
+            copy.lastIndex = source.lastIndex; // 保留匹配状态
+            map.set(source, copy);
+            return copy;
+        }
+        // 处理 Map
+        if (source instanceof Map) {
+            const copy = new Map();
+            map.set(source, copy);
+            source.forEach((value, key) => {
+                copy.set(cloneDeep(key, map), cloneDeep(value, map));
+            });
+            return copy;
+        }
+        // 处理 Set
+        if (source instanceof Set) {
+            const copy = new Set();
+            map.set(source, copy);
+            source.forEach(value => {
+                copy.add(cloneDeep(value, map));
+            });
+            return copy;
+        }
+        // 处理数组 (包含稀疏数组)
+        if (Array.isArray(source)) {
+            const copy = Array.from({ length: source.length });
+            map.set(source, copy);
+            // 克隆所有有效索引
+            for (let i = 0; i < source.length; i++) {
+                if (i in source) {
+                    // 保留空位
+                    copy[i] = cloneDeep(source[i], map);
+                }
+            }
+            // 克隆数组的自定义属性
+            const descriptors = Object.getOwnPropertyDescriptors(source);
+            for (const key of Reflect.ownKeys(descriptors)) {
+                Object.defineProperty(copy, key, {
+                    ...descriptors[key],
+                    value: cloneDeep(descriptors[key].value, map)
+                });
+            }
+            return copy;
+        }
+        // 处理普通对象和类实例
+        const copy = Object.create(Object.getPrototypeOf(source));
+        map.set(source, copy);
+        const descriptors = Object.getOwnPropertyDescriptors(source);
+        for (const key of Reflect.ownKeys(descriptors)) {
+            const descriptor = descriptors[key];
+            if ('value' in descriptor) {
+                // 克隆数据属性
+                descriptor.value = cloneDeep(descriptor.value, map);
+            }
+            else {
+                // 处理访问器属性 (getter/setter)
+                if (descriptor.get) {
+                    descriptor.get = cloneDeep(descriptor.get, map);
+                }
+                if (descriptor.set) {
+                    descriptor.set = cloneDeep(descriptor.set, map);
+                }
+            }
+            Object.defineProperty(copy, key, descriptor);
         }
-        return cloneObj;
+        return copy;
     }
 
     /**
@@ -2132,7 +2216,8 @@
     const defaultSearchTreeOptions = {
         childField: 'children',
         nameField: 'name',
-        ignoreEmptyChild: false
+        removeEmptyChild: false,
+        ignoreCase: true
     };
     /**
      * 深度优先遍历函数(支持continue和break操作), 可用于insert tree item 和 remove tree item
@@ -2189,14 +2274,16 @@
         walk(tree, null);
     }
     /**
-     * 深度优先遍历的Map函数(支持continue和break操作), 可用于insert tree item 和 remove tree item
+     * 创建一个新数组, 深度优先遍历的Map函数(支持continue和break操作), 可用于insert tree item 和 remove tree item
+     *
+     * 可遍历任何带有 length 属性和数字键的类数组对象
      * @param {ArrayLike<V>} tree  树形数据
      * @param {Function} iterator  迭代函数, 返回值为true时continue, 返回值为false时break
      * @param {string} children 定制子元素的key
      * @param {boolean} isReverse  是否反向遍历
      * @returns {any[]} 新的一棵树
      */
-    function forEachMap(tree, iterator, children = 'children', isReverse = false) {
+    function mapDeep(tree, iterator, children = 'children', isReverse = false) {
         let isBreak = false;
         const newTree = [];
         const walk = (arr, parent, newTree, level = 0) => {
@@ -2213,7 +2300,7 @@
                     else if (re === true) {
                         continue;
                     }
-                    newTree.push(re);
+                    newTree.push(objectOmit(re, [children]));
                     // @ts-ignore
                     if (arr[i] && Array.isArray(arr[i][children])) {
                         newTree[newTree.length - 1][children] = [];
@@ -2239,7 +2326,7 @@
                     else if (re === true) {
                         continue;
                     }
-                    newTree.push(re);
+                    newTree.push(objectOmit(re, [children]));
                     // @ts-ignore
                     if (arr[i] && Array.isArray(arr[i][children])) {
                         newTree[newTree.length - 1][children] = [];
@@ -2425,20 +2512,36 @@
     }
     /**
      * 模糊搜索函数，返回包含搜索字符的节点及其祖先节点, 适用于树型组件的字符过滤功能
-     * @param {any[]} nodes
-     * @param {string} query
+     * 以下搜索条件二选一，按先后优先级处理：
+     * 1. 过滤函数filter, 返回true/false
+     * 2. 匹配关键词，支持是否启用忽略大小写来判断
+     *
+     * 有以下特性：
+     * 1. 可配置removeEmptyChild字段，来决定是否移除搜索结果中的空children字段
+     * 2. 若无任何过滤条件或keyword模式匹配且keyword为空串，返回原对象；其他情况返回新数组
+     * @param {V[]} nodes
+     * @param {IFilterCondition} filterCondition
      * @param {ISearchTreeOpts} options
-     * @returns {any[]}
+     * @returns {V[]}
      */
-    function fuzzySearchTree(nodes, query, options = defaultSearchTreeOptions) {
+    function fuzzySearchTree(nodes, filterCondition, options = defaultSearchTreeOptions) {
+        if (!objectHas(filterCondition, 'filter') &&
+            (!objectHas(filterCondition, 'keyword') || isEmpty(filterCondition.keyword))) {
+            return nodes;
+        }
         const result = [];
         for (const node of nodes) {
             // 递归检查子节点是否匹配
             const matchedChildren = node[options.childField] && node[options.childField].length > 0
-                ? fuzzySearchTree(node[options.childField] || [], query, options)
+                ? fuzzySearchTree(node[options.childField] || [], filterCondition, options)
                 : [];
             // 检查当前节点是否匹配或者有匹配的子节点
-            if (node[options.nameField].toLowerCase().includes(query.toLowerCase()) || matchedChildren.length > 0) {
+            if ((objectHas(filterCondition, 'filter')
+                ? filterCondition.filter(node)
+                : !options.ignoreCase
+                    ? node[options.nameField].includes(filterCondition.keyword)
+                    : node[options.nameField].toLowerCase().includes(filterCondition.keyword.toLowerCase())) ||
+                matchedChildren.length > 0) {
                 // 将当前节点加入结果中
                 if (node[options.childField]) {
                     if (matchedChildren.length > 0) {
@@ -2447,7 +2550,7 @@
                             [options.childField]: matchedChildren // 包含匹配的子节点
                         });
                     }
-                    else if (options.ignoreEmptyChild) {
+                    else if (options.removeEmptyChild) {
                         node[options.childField] && delete node[options.childField];
                         result.push({
                             ...node
@@ -2866,7 +2969,6 @@
     exports.executeInScope = executeInScope;
     exports.flatTree = flatTree;
     exports.forEachDeep = forEachDeep;
-    exports.forEachMap = forEachMap;
     exports.formatDate = formatDate;
     exports.formatNumber = formatNumber;
     exports.formatTree = formatTree;
@@ -2908,6 +3010,7 @@
     exports.isUndefined = isUndefined;
     exports.isUrl = isUrl;
     exports.isValidDate = isValidDate;
+    exports.mapDeep = mapDeep;
     exports.multiply = multiply;
     exports.numberAbbr = numberAbbr;
     exports.numberToHex = numberToHex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sculp-js",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "packageManager": "npm@8.19.2",
   "description": "js工具库",
   "scripts": {

package/lib/tsdoc-metadata.json

@@ -1,11 +0,0 @@
-// This file is read by tools that parse documentation comments conforming to the TSDoc standard.
-// It should be published with your NPM package.  It should not be tracked by Git.
-{
-  "tsdocVersion": "0.12",
-  "toolPackages": [
-    {
-      "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.38.3"
-    }
-  ]
-}