sculp-js 1.7.2 → 1.8.1

package/README.md

@@ -7,7 +7,7 @@
 
 # sculp-js
 
-[API文档](https://chandq.github.io/sculp-js/)
+[API Doc](https://chandq.github.io/sculp-js/)
 
 > TS + Rollup, native implementation, without relying on any third-party libraries, outputs products of three module modes: ESM, CJS, and UMD. sculp-js only used to Web environment, @sculp/core can be used to Web、Node.js、Mini Program.
 
@@ -29,13 +29,14 @@
   - isNumber
   - isUndefined
   - isNull
-  - isNullOrUnDef
+  - isNullish
   - isPrimitive
   - isFunction
   - isObject
   - isArray
   - typeIs
   - isJsonString
+  - isEmpty
 
 - encode/decode
 
@@ -60,11 +61,12 @@
 
   - isPlainObject
   - objectHas
-  - objectAssign 合并
+  - objectAssign
   - objectEach
   - objectEachAsync
   - objectGet
   - cloneDeep
+  - isEqual
 
 - Number
 

package/lib/cjs/array.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.2
+ * sculp-js v1.8.1
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -26,7 +26,7 @@ function arrayEach(array, iterator, reverse = false) {
         }
     }
     else {
-        for (let idx = 0; idx < array.length; idx++) {
+        for (let idx = 0, len = array.length; idx < len; idx++) {
             const val = array[idx];
             const re = iterator(val, idx, array);
             if (re === false)
@@ -51,7 +51,7 @@ async function arrayEachAsync(array, iterator, reverse = false) {
         }
     }
     else {
-        for (let idx = 0; idx < array.length; idx++) {
+        for (let idx = 0, len = array.length; idx < len; idx++) {
             const val = array[idx];
             if ((await iterator(val, idx)) === false)
                 break;
@@ -88,7 +88,9 @@ function arrayRemove(array, expect) {
         if (_expect(val, idx))
             indexes.push(idx);
     });
-    indexes.forEach((val, idx) => array.splice(val - idx, 1));
+    arrayEach(indexes, (val, idx) => {
+        array.splice(val - idx, 1);
+    });
     return array;
 }
 

package/lib/cjs/async.js

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

package/lib/cjs/base64.js

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

package/lib/cjs/clipboard.js

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

package/lib/cjs/cookie.js

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

package/lib/cjs/date.js

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

package/lib/cjs/dom.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.2
+ * sculp-js v1.8.1
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -118,31 +118,6 @@ function smoothScroll(options) {
         render();
     });
 }
-const domReadyCallbacks = [];
-const eventType = 'DOMContentLoaded';
-const listener = () => {
-    domReadyCallbacks.forEach(callback => callback());
-    domReadyCallbacks.length = 0;
-    document.removeEventListener(eventType, listener);
-};
-document.addEventListener(eventType, listener);
-let readied = false;
-function isDomReady() {
-    if (readied)
-        return true;
-    readied = ['complete', 'loaded', 'interactive'].indexOf(document.readyState) !== -1;
-    return readied;
-}
-function onDomReady(callback) {
-    // document readied
-    if (isDomReady()) {
-        setTimeout(callback, 0);
-    }
-    // listen document to ready
-    else {
-        domReadyCallbacks.push(callback);
-    }
-}
 /**
  * 获取元素样式属性的计算值
  * @param {HTMLElement} el
@@ -190,8 +165,6 @@ exports.getComputedCssVal = getComputedCssVal;
 exports.getStrWidthPx = getStrWidthPx;
 exports.getStyle = getStyle;
 exports.hasClass = hasClass;
-exports.isDomReady = isDomReady;
-exports.onDomReady = onDomReady;
 exports.removeClass = removeClass;
 exports.setStyle = setStyle;
 exports.smoothScroll = smoothScroll;

package/lib/cjs/download.js

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

package/lib/cjs/easing.js

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

package/lib/cjs/file.js

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

package/lib/cjs/func.js

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

package/lib/cjs/index.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.2
+ * sculp-js v1.8.1
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -55,8 +55,6 @@ exports.getComputedCssVal = dom.getComputedCssVal;
 exports.getStrWidthPx = dom.getStrWidthPx;
 exports.getStyle = dom.getStyle;
 exports.hasClass = dom.hasClass;
-exports.isDomReady = dom.isDomReady;
-exports.onDomReady = dom.onDomReady;
 exports.removeClass = dom.removeClass;
 exports.setStyle = dom.setStyle;
 exports.smoothScroll = dom.smoothScroll;
@@ -66,6 +64,7 @@ exports.downloadData = download.downloadData;
 exports.downloadHref = download.downloadHref;
 exports.downloadURL = download.downloadURL;
 exports.cloneDeep = object.cloneDeep;
+exports.isEqual = object.isEqual;
 exports.isPlainObject = object.isPlainObject;
 exports.objectAssign = object.objectAssign;
 exports.objectEach = object.objectEach;
@@ -102,6 +101,7 @@ exports.isJsonString = type.isJsonString;
 exports.isNaN = type.isNaN;
 exports.isNull = type.isNull;
 exports.isNullOrUnDef = type.isNullOrUnDef;
+exports.isNullish = type.isNullOrUnDef;
 exports.isNumber = type.isNumber;
 exports.isObject = type.isObject;
 exports.isPrimitive = type.isPrimitive;
@@ -138,7 +138,6 @@ exports.UNIQUE_NUMBER_SAFE_LENGTH = unique.UNIQUE_NUMBER_SAFE_LENGTH;
 exports.uniqueNumber = unique.uniqueNumber;
 exports.uniqueString = unique.uniqueString;
 exports.tooltipEvent = tooltip.tooltipEvent;
-exports.buildTree = tree.buildTree;
 exports.flatTree = tree.flatTree;
 exports.forEachDeep = tree.forEachDeep;
 exports.formatTree = tree.formatTree;

package/lib/cjs/math.js

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

package/lib/cjs/number.js

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

package/lib/cjs/object.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.2
+ * sculp-js v1.8.1
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -143,7 +143,7 @@ const merge = (map, source, target) => {
  */
 function objectAssign(source, ...targets) {
     const map = new Map();
-    for (let i = 0; i < targets.length; i++) {
+    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
@@ -168,6 +168,13 @@ function objectFill(source, target, fillable) {
     });
     return source;
 }
+/**
+ * 获取对象指定层级下的属性值（现在可用ES6+的可选链?.来替代）
+ * @param {AnyObject} obj
+ * @param {string} path
+ * @param {boolean} strict
+ * @returns
+ */
 function objectGet(obj, path, strict = false) {
     path = path.replace(/\[(\w+)\]/g, '.$1');
     path = path.replace(/^\./, '');
@@ -261,10 +268,10 @@ function cloneDeep(source, map = new WeakMap()) {
     }
     // 处理数组 (包含稀疏数组)
     if (Array.isArray(source)) {
-        const copy = Array.from({ length: source.length });
+        const copy = new Array(source.length);
         map.set(source, copy);
         // 克隆所有有效索引
-        for (let i = 0; i < source.length; i++) {
+        for (let i = 0, len = source.length; i < len; i++) {
             if (i in source) {
                 // 保留空位
                 copy[i] = cloneDeep(source[i], map);
@@ -303,8 +310,130 @@ function cloneDeep(source, map = new WeakMap()) {
     }
     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 (type.isObject(a) && type.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.cloneDeep = cloneDeep;
+exports.isEqual = isEqual;
 exports.isPlainObject = isPlainObject;
 exports.objectAssign = objectAssign;
 exports.objectEach = objectEach;

package/lib/cjs/path.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.2
+ * sculp-js v1.8.1
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -12,7 +12,7 @@
  * @returns {string}
  */
 const pathNormalize = (path) => {
-    const slicees = path
+    const slices = path
         .replace(/\\/g, '/')
         .replace(/\/{2,}/g, '/')
         .replace(/\.{3,}/g, '..')
@@ -37,7 +37,7 @@ const pathNormalize = (path) => {
             points.pop();
         }
     };
-    slicees.forEach(slice => {
+    slices.forEach(slice => {
         const isCurrent = isCurrentSlice(slice);
         const isParent = isParentSlice(slice);
         // 未进入实际路径

package/lib/cjs/qs.js

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

package/lib/cjs/random.js

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

package/lib/cjs/string.js

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

package/lib/cjs/tooltip.js

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

package/lib/cjs/tree.js

@@ -1,11 +1,12 @@
 /*!
- * sculp-js v1.7.2
+ * sculp-js v1.8.1
  * (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');
 
@@ -48,7 +49,7 @@ function forEachDeep(tree, iterator, children = 'children', isReverse = false) {
             }
         }
         else {
-            for (let i = 0; i < arr.length; i++) {
+            for (let i = 0, len = arr.length; i < len; i++) {
                 if (isBreak) {
                     break;
                 }
@@ -174,92 +175,7 @@ function searchTreeById(tree, nodeId, config) {
     return getIds(toFlatArray(tree));
 }
 /**
- * 使用迭代函数转换数组
- * @param {T} array
- * @param {Function} callback 迭代函数
- * @returns {Array}
- */
-function flatMap(array, callback) {
-    const result = [];
-    array.forEach((value, index) => {
-        result.push(...callback(value, index, array));
-    });
-    return result;
-}
-/**
- * 根据 idProp 与 parentIdProp 从对象数组中构建对应的树
- * 当 A[parentIdProp] === B[idProp] 时，对象A会被移动到对象B的children。
- * 当一个对象的 parentIdProp 不与其他对象的 idProp 字段相等时，该对象被作为树的顶层节点
- * @param {string} idProp 元素ID
- * @param {string} parentIdProp 父元素ID
- * @param {object[]} items 一维数组
- * @returns {WithChildren<T>[]} 树
- * @example
- * const array = [
- *   { id: 'node-1', parent: 'root' },
- *   { id: 'node-2', parent: 'root' },
- *   { id: 'node-3', parent: 'node-2' },
- *   { id: 'node-4', parent: 'node-2' },
- *   { id: 'node-5', parent: 'node-4' },
- * ]
- * const tree = buildTree('id', 'parent', array)
- * expect(tree).toEqual([
- *   { id: 'node-1', parent: 'root' },
- *   {
- *     id: 'node-2',
- *     parent: 'root',
- *     children: [
- *       { id: 'node-3', parent: 'node-2' },
- *       {
- *         id: 'node-4',
- *         parent: 'node-2',
- *         children: [{ id: 'node-5', parent: 'node-4' }],
- *       },
- *     ],
- *   },
- * ])
- */
-function buildTree(idProp, parentIdProp, items) {
-    const wrapperMap = new Map();
-    const ensure = (id) => {
-        if (wrapperMap.has(id)) {
-            return wrapperMap.get(id);
-        }
-        //@ts-ignore
-        const wrapper = { id, parent: null, item: null, children: [] };
-        wrapperMap.set(id, wrapper);
-        return wrapper;
-    };
-    for (const item of items) {
-        const parentWrapper = ensure(item[parentIdProp]);
-        const itemWrapper = ensure(item[idProp]);
-        //@ts-ignore
-        itemWrapper.parent = parentWrapper;
-        //@ts-ignore
-        parentWrapper.children.push(itemWrapper);
-        //@ts-ignore
-        itemWrapper.item = item;
-    }
-    const topLevelWrappers = flatMap(Array.from(wrapperMap.values()).filter(wrapper => wrapper.parent === null), wrapper => wrapper.children);
-    return unwrapRecursively(topLevelWrappers);
-    function unwrapRecursively(wrapperArray) {
-        const result = [];
-        for (const wrapper of wrapperArray) {
-            if (wrapper.children.length === 0) {
-                result.push(wrapper.item);
-            }
-            else {
-                result.push({
-                    ...wrapper.item,
-                    children: unwrapRecursively(wrapper.children)
-                });
-            }
-        }
-        return result;
-    }
-}
-/**
- * 扁平化数组转换成树(效率高于buildTree)
+ * 扁平化数组转换成树
  * @param {any[]} list
  * @param {IFieldOptions} options
  * @returns {any[]}
@@ -268,10 +184,10 @@ function formatTree(list, options = defaultFieldOptions) {
     const { keyField, childField, pidField } = options;
     const treeArr = [];
     const sourceMap = {};
-    list.forEach(item => {
+    array.arrayEach(list, item => {
         sourceMap[item[keyField]] = item;
     });
-    list.forEach(item => {
+    array.arrayEach(list, item => {
         const parent = sourceMap[item[pidField]];
         if (parent) {
             (parent[childField] || (parent[childField] = [])).push(item);
@@ -290,7 +206,8 @@ function formatTree(list, options = defaultFieldOptions) {
  */
 function flatTree(treeList, options = defaultFieldOptions) {
     const { childField, keyField, pidField } = options;
-    return treeList.reduce((res, node) => {
+    let res = [];
+    array.arrayEach(treeList, node => {
         const item = {
             ...node,
             [childField]: [] // 清空子级
@@ -304,8 +221,8 @@ function flatTree(treeList, options = defaultFieldOptions) {
             }));
             res = res.concat(flatTree(children, options));
         }
-        return res;
-    }, []);
+    });
+    return res;
 }
 /**
  * 模糊搜索函数，返回包含搜索字符的节点及其祖先节点, 适用于树型组件的字符过滤功能
@@ -327,7 +244,7 @@ function fuzzySearchTree(nodes, filterCondition, options = defaultSearchTreeOpti
         return nodes;
     }
     const result = [];
-    for (const node of nodes) {
+    array.arrayEach(nodes, node => {
         // 递归检查子节点是否匹配
         const matchedChildren = node[options.childField] && node[options.childField].length > 0
             ? fuzzySearchTree(node[options.childField] || [], filterCondition, options)
@@ -367,11 +284,10 @@ function fuzzySearchTree(nodes, filterCondition, options = defaultSearchTreeOpti
                 });
             }
         }
-    }
+    });
     return result;
 }
 
-exports.buildTree = buildTree;
 exports.flatTree = flatTree;
 exports.forEachDeep = forEachDeep;
 exports.formatTree = formatTree;

package/lib/cjs/type.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.2
+ * sculp-js v1.8.1
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -34,11 +34,17 @@ function arrayLike(any) {
     return objectHas(any, 'length');
 }
 /**
- * 判断任意值的数据类型
+ * 判断任意值的数据类型，检查非对象时不如typeof、instanceof的性能高
+ *
+ * 当检查类对象时是不可靠的，对象可以通过定义 Symbol.toStringTag 属性来更改检查结果
+ *
+ * 详见：https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Global_Objects/Object/toString
  * @param {unknown} any
- * @returns {string}
+ * @returns
  */
-const typeIs = (any) => Object.prototype.toString.call(any).slice(8, -1);
+function typeIs(any) {
+    return Object.prototype.toString.call(any).slice(8, -1);
+}
 // 基本数据类型判断
 const isString = (any) => typeof any === 'string';
 const isBoolean = (any) => typeof any === 'boolean';
@@ -131,6 +137,7 @@ exports.isJsonString = isJsonString;
 exports.isNaN = isNaN;
 exports.isNull = isNull;
 exports.isNullOrUnDef = isNullOrUnDef;
+exports.isNullish = isNullOrUnDef;
 exports.isNumber = isNumber;
 exports.isObject = isObject;
 exports.isPrimitive = isPrimitive;