sculp-js 1.8.2 → 1.8.4

package/lib/umd/index.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.1
+ * sculp-js v1.8.4
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -72,7 +72,6 @@
     function arrayInsertBefore(array, start, to) {
         if (start === to || start + 1 === to)
             return;
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const [source] = array.splice(start, 1);
         const insertIndex = to < start ? to : to - 1;
         array.splice(insertIndex, 0, source);
@@ -92,7 +91,7 @@
             if (_expect(val, idx))
                 indexes.push(idx);
         });
-        arrayEach(indexes, (val, idx) => {
+        indexes.forEach((val, idx) => {
             array.splice(val - idx, 1);
         });
         return array;
@@ -294,7 +293,6 @@
         for (const key in obj) {
             if (!objectHas(obj, key))
                 continue;
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             obj2[key] = iterator(obj[key], key);
         }
         return obj2;
@@ -309,7 +307,6 @@
         const obj2 = {};
         objectEach(obj, (v, k) => {
             if (keys.includes(k)) {
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
                 obj2[k] = v;
             }
@@ -326,7 +323,6 @@
         const obj2 = {};
         objectEach(obj, (v, k) => {
             if (!keys.includes(k)) {
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
                 obj2[k] = v;
             }
@@ -379,7 +375,6 @@
         const map = new Map();
         for (let i = 0, len = targets.length; i < len; i++) {
             const target = targets[i];
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             source = merge(map, source, target);
         }
@@ -437,234 +432,6 @@
             v: tempObj ? tempObj[keyArr[i]] : undefined
         };
     }
-    /**
-     * 深拷贝堪称完全体 即：任何类型的数据都会被深拷贝
-     *
-     * 包含对null、原始值、对象循环引用的处理
-     *
-     * 对Map、Set、ArrayBuffer、Date、RegExp、Array、Object及原型链属性方法执行深拷贝
-     * @param {T} source
-     * @param {WeakMap} map
-     * @returns {T}
-     */
-    function cloneDeep(source, map = new WeakMap()) {
-        // 处理原始类型和 null/undefined
-        if (source === null || typeof source !== 'object') {
-            return source;
-        }
-        // 处理循环引用
-        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 = new Array(source.length);
-            map.set(source, copy);
-            // 克隆所有有效索引
-            for (let i = 0, len = source.length; i < len; 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 copy;
-    }
-    /**
-     * 比较两值是否相等，适用所有数据类型
-     * @param {Comparable} a
-     * @param {Comparable} b
-     * @returns {boolean}
-     */
-    function isEqual(a, b) {
-        return deepEqual(a, b);
-    }
-    function deepEqual(a, b, compared = new WeakMap()) {
-        // 相同值快速返回
-        if (Object.is(a, b))
-            return true;
-        // 类型不同直接返回false
-        const typeA = Object.prototype.toString.call(a);
-        const typeB = Object.prototype.toString.call(b);
-        if (typeA !== typeB)
-            return false;
-        // 只缓存对象类型
-        if (isObject(a) && isObject(b)) {
-            if (compared.has(a))
-                return compared.get(a) === b;
-            compared.set(a, b);
-            compared.set(b, a);
-        }
-        // 处理特殊对象类型
-        switch (typeA) {
-            case '[object Date]':
-                return a.getTime() === b.getTime();
-            case '[object RegExp]':
-                return a.toString() === b.toString();
-            case '[object Map]':
-                return compareMap(a, b, compared);
-            case '[object Set]':
-                return compareSet(a, b, compared);
-            case '[object ArrayBuffer]':
-                return compareArrayBuffer(a, b);
-            case '[object DataView]':
-                return compareDataView(a, b, compared);
-            case '[object Int8Array]':
-            case '[object Uint8Array]':
-            case '[object Uint8ClampedArray]':
-            case '[object Int16Array]':
-            case '[object Uint16Array]':
-            case '[object Int32Array]':
-            case '[object Uint32Array]':
-            case '[object Float32Array]':
-            case '[object Float64Array]':
-                return compareTypedArray(a, b, compared);
-            case '[object Object]':
-                return compareObjects(a, b, compared);
-            case '[object Array]':
-                return compareArrays(a, b, compared);
-        }
-        return false;
-    }
-    // 辅助比较函数
-    function compareMap(a, b, compared) {
-        if (a.size !== b.size)
-            return false;
-        for (const [key, value] of a) {
-            if (!b.has(key) || !deepEqual(value, b.get(key), compared))
-                return false;
-        }
-        return true;
-    }
-    function compareSet(a, b, compared) {
-        if (a.size !== b.size)
-            return false;
-        for (const value of a) {
-            let found = false;
-            for (const bValue of b) {
-                if (deepEqual(value, bValue, compared)) {
-                    found = true;
-                    break;
-                }
-            }
-            if (!found)
-                return false;
-        }
-        return true;
-    }
-    function compareArrayBuffer(a, b) {
-        if (a.byteLength !== b.byteLength)
-            return false;
-        return new DataView(a).getInt32(0) === new DataView(b).getInt32(0);
-    }
-    function compareDataView(a, b, compared) {
-        return a.byteLength === b.byteLength && deepEqual(new Uint8Array(a.buffer), new Uint8Array(b.buffer), compared);
-    }
-    function compareTypedArray(a, b, compared) {
-        return a.byteLength === b.byteLength && deepEqual(Array.from(a), Array.from(b), compared);
-    }
-    function compareObjects(a, b, compared) {
-        const keysA = Reflect.ownKeys(a);
-        const keysB = Reflect.ownKeys(b);
-        if (keysA.length !== keysB.length)
-            return false;
-        for (const key of keysA) {
-            if (!keysB.includes(key))
-                return false;
-            if (!deepEqual(a[key], b[key], compared))
-                return false;
-        }
-        // 原型链比较
-        return Object.getPrototypeOf(a) === Object.getPrototypeOf(b);
-    }
-    function compareArrays(a, b, compared) {
-        // 增加有效索引检查
-        const keysA = Object.keys(a).map(Number);
-        const keysB = Object.keys(b).map(Number);
-        if (keysA.length !== keysB.length)
-            return false;
-        // 递归比较每个元素
-        for (let i = 0, len = a.length; i < len; i++) {
-            if (!deepEqual(a[i], b[i], compared))
-                return false;
-        }
-        // 比较数组对象的其他属性
-        return compareObjects(a, b, compared);
-    }
 
     /**
      * 将字符串转换为驼峰格式
@@ -1455,17 +1222,41 @@
     }
     /**
      * 根据URL下载文件（解决跨域a.download不生效问题)
+     *
+     * 可定制下载成功的状态码status(浏览器原生状态码)
+     *
+     * 支持下载操作成功、失败后的回调
      * @param {string} url
      * @param {string} filename
-     * @param {Function} callback
+     * @param {CrossOriginDownloadParams} options
      */
-    function crossOriginDownload(url, filename, callback) {
+    function crossOriginDownload(url, filename, options) {
+        const { successCode = 200, successCallback, failCallback } = isNullOrUnDef(options) ? { successCode: 200, successCallback: void 0, failCallback: void 0 } : options;
         const xhr = new XMLHttpRequest();
         xhr.open('GET', url, true);
         xhr.responseType = 'blob';
         xhr.onload = function () {
-            if (xhr.status === 200)
-                downloadBlob(xhr.response, filename, callback);
+            if (xhr.status === successCode)
+                downloadBlob(xhr.response, filename, successCallback);
+            else if (isFunction(failCallback)) {
+                const status = xhr.status;
+                const responseType = xhr.getResponseHeader('Content-Type');
+                if (isString(responseType) && responseType.includes('application/json')) {
+                    const reader = new FileReader();
+                    reader.onload = () => {
+                        failCallback({ status, response: reader.result });
+                    };
+                    reader.readAsText(xhr.response);
+                }
+                else {
+                    failCallback(xhr);
+                }
+            }
+        };
+        xhr.onerror = e => {
+            if (isFunction(failCallback)) {
+                failCallback({ status: 0, code: 'ERROR_CONNECTION_REFUSED' });
+            }
         };
         xhr.send();
     }
@@ -1958,13 +1749,10 @@
         let called = false;
         let result;
         return function (...args) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             if (called)
                 return result;
             called = true;
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             result = func.call(this, ...args);
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return result;
         };
     };
@@ -1974,24 +1762,12 @@
      * @param val
      */
     function setGlobal(key, val) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         if (typeof globalThis !== 'undefined')
             globalThis[key] = val;
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         else if (typeof window !== 'undefined')
             window[key] = val;
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         else if (typeof global !== 'undefined')
             global[key] = val;
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         else if (typeof self !== 'undefined')
             self[key] = val;
         else
@@ -2003,24 +1779,12 @@
      * @param val
      */
     function getGlobal(key) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         if (typeof globalThis !== 'undefined')
             return globalThis[key];
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         else if (typeof window !== 'undefined')
             return window[key];
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         else if (typeof global !== 'undefined')
             return global[key];
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         else if (typeof self !== 'undefined')
             return self[key];
     }
@@ -2889,7 +2653,8 @@
      * default match symbol {} same as /{\s*([^{}\s]*)\s*}/g
      */
     function parseVarFromString(str, leftMatchSymbol = '{', rightMatchSymbol = '}') {
-        return Array.from(str.matchAll(parseVariableRegExp(leftMatchSymbol, rightMatchSymbol))).map(el => el?.[1]);
+        // @ts-ignore
+        return Array.from(str.matchAll(parseVariableRegExp(leftMatchSymbol, rightMatchSymbol))).map(el => isNullOrUnDef(el) ? void 0 : el[1]);
     }
     /**
      * 替换字符串中的插值变量
@@ -2951,6 +2716,236 @@
         }
     }
 
+    /**
+     * 深拷贝堪称完全体 即：任何类型的数据都会被深拷贝
+     *
+     * 包含对null、原始值、对象循环引用的处理
+     *
+     * 对Map、Set、ArrayBuffer、Date、RegExp、Array、Object及原型链属性方法执行深拷贝
+     * @param {T} source
+     * @param {WeakMap} map
+     * @returns {T}
+     */
+    function cloneDeep(source, map = new WeakMap()) {
+        // 处理原始类型和 null/undefined
+        if (source === null || typeof source !== 'object') {
+            return source;
+        }
+        // 处理循环引用
+        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 = new Array(source.length);
+            map.set(source, copy);
+            // 克隆所有有效索引
+            for (let i = 0, len = source.length; i < len; 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 copy;
+    }
+
+    /**
+     * 比较两值是否相等，适用所有数据类型
+     * @param {Comparable} a
+     * @param {Comparable} b
+     * @returns {boolean}
+     */
+    function isEqual(a, b) {
+        return deepEqual(a, b);
+    }
+    function deepEqual(a, b, compared = new WeakMap()) {
+        // 相同值快速返回
+        if (Object.is(a, b))
+            return true;
+        // 类型不同直接返回false
+        const typeA = Object.prototype.toString.call(a);
+        const typeB = Object.prototype.toString.call(b);
+        if (typeA !== typeB)
+            return false;
+        // 只缓存对象类型
+        if (isObject(a) && isObject(b)) {
+            if (compared.has(a))
+                return compared.get(a) === b;
+            compared.set(a, b);
+            compared.set(b, a);
+        }
+        // 处理特殊对象类型
+        switch (typeA) {
+            case '[object Date]':
+                return a.getTime() === b.getTime();
+            case '[object RegExp]':
+                return a.toString() === b.toString();
+            case '[object Map]':
+                return compareMap(a, b, compared);
+            case '[object Set]':
+                return compareSet(a, b, compared);
+            case '[object ArrayBuffer]':
+                return compareArrayBuffer(a, b);
+            case '[object DataView]':
+                return compareDataView(a, b, compared);
+            case '[object Int8Array]':
+            case '[object Uint8Array]':
+            case '[object Uint8ClampedArray]':
+            case '[object Int16Array]':
+            case '[object Uint16Array]':
+            case '[object Int32Array]':
+            case '[object Uint32Array]':
+            case '[object Float32Array]':
+            case '[object Float64Array]':
+                return compareTypedArray(a, b, compared);
+            case '[object Object]':
+                return compareObjects(a, b, compared);
+            case '[object Array]':
+                return compareArrays(a, b, compared);
+        }
+        return false;
+    }
+    // 辅助比较函数
+    function compareMap(a, b, compared) {
+        if (a.size !== b.size)
+            return false;
+        for (const [key, value] of a) {
+            if (!b.has(key) || !deepEqual(value, b.get(key), compared))
+                return false;
+        }
+        return true;
+    }
+    function compareSet(a, b, compared) {
+        if (a.size !== b.size)
+            return false;
+        for (const value of a) {
+            let found = false;
+            for (const bValue of b) {
+                if (deepEqual(value, bValue, compared)) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found)
+                return false;
+        }
+        return true;
+    }
+    function compareArrayBuffer(a, b) {
+        if (a.byteLength !== b.byteLength)
+            return false;
+        return new DataView(a).getInt32(0) === new DataView(b).getInt32(0);
+    }
+    function compareDataView(a, b, compared) {
+        return a.byteLength === b.byteLength && deepEqual(new Uint8Array(a.buffer), new Uint8Array(b.buffer), compared);
+    }
+    function compareTypedArray(a, b, compared) {
+        return a.byteLength === b.byteLength && deepEqual(Array.from(a), Array.from(b), compared);
+    }
+    function compareObjects(a, b, compared) {
+        const keysA = Reflect.ownKeys(a);
+        const keysB = Reflect.ownKeys(b);
+        if (keysA.length !== keysB.length)
+            return false;
+        for (const key of keysA) {
+            if (!keysB.includes(key))
+                return false;
+            if (!deepEqual(a[key], b[key], compared))
+                return false;
+        }
+        // 原型链比较
+        return Object.getPrototypeOf(a) === Object.getPrototypeOf(b);
+    }
+    function compareArrays(a, b, compared) {
+        // 增加有效索引检查
+        const keysA = Object.keys(a).map(Number);
+        const keysB = Object.keys(b).map(Number);
+        if (keysA.length !== keysB.length)
+            return false;
+        // 递归比较每个元素
+        for (let i = 0, len = a.length; i < len; i++) {
+            if (!deepEqual(a[i], b[i], compared))
+                return false;
+        }
+        // 比较数组对象的其他属性
+        return compareObjects(a, b, compared);
+    }
+
     exports.EMAIL_REGEX = EMAIL_REGEX;
     exports.HEX_POOL = HEX_POOL;
     exports.HTTP_URL_REGEX = HTTP_URL_REGEX;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sculp-js",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "packageManager": "npm@8.19.2",
   "description": "js utils library, includes function library、class library",
   "scripts": {