sculp-js 1.13.3-beta.0 → 1.13.6

package/dist/cjs/watermark.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.13.3-beta.0
+ * sculp-js v1.13.6
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -20,74 +20,85 @@ var type = require('./type.js');
  * @example genCanvasWM({ content: 'QQMusicFE' })
  */
 function genCanvasWM(content = '请勿外传', canvasWM) {
-    const { rootContainer = document.body, width = '300px', height = '150px', textAlign = 'center', textBaseline = 'middle', font = '20px PingFangSC-Medium,PingFang SC', 
+  const {
+    rootContainer = document.body,
+    width = '300px',
+    height = '150px',
+    textAlign = 'center',
+    textBaseline = 'middle',
+    font = '20px PingFangSC-Medium,PingFang SC',
     // fontWeight = 500,
-    fillStyle = 'rgba(189, 177, 167, .3)', rotate = -20, zIndex = 2147483647, watermarkId = '__wm' } = type.isNullOrUnDef(canvasWM) ? {} : canvasWM;
-    const container = type.isString(rootContainer) ? document.querySelector(rootContainer) : rootContainer;
-    if (!container) {
-        throw new Error(`${rootContainer} is not valid Html Element or element selector`);
-    }
-    const canvas = document.createElement('canvas');
-    canvas.setAttribute('width', width);
-    canvas.setAttribute('height', height);
-    const ctx = canvas.getContext('2d');
-    ctx.textAlign = textAlign;
-    ctx.textBaseline = textBaseline;
-    ctx.font = font;
-    // ctx!.fontWeight = fontWeight;
-    ctx.fillStyle = fillStyle;
-    ctx.rotate((Math.PI / 180) * rotate);
-    ctx.fillText(content, parseFloat(width) / 4, parseFloat(height) / 2);
-    const base64Url = canvas.toDataURL();
-    const __wm = document.querySelector(`#${watermarkId}`);
-    const watermarkDiv = __wm || document.createElement('div');
-    const styleStr = `opacity: 1 !important; display: block !important; visibility: visible !important;         position:absolute;          left:0; top:0;         width:100%;          height:100%;          z-index:${zIndex};          pointer-events:none;          background-repeat:repeat;          background-image:url('${base64Url}')`;
-    watermarkDiv.setAttribute('style', styleStr);
-    watermarkDiv.setAttribute('id', watermarkId);
-    watermarkDiv.classList.add('nav-height');
-    if (!__wm) {
-        container.style.position = 'relative';
-        container.appendChild(watermarkDiv);
-    }
-    const getMutableStyle = (ele) => {
-        const computedStyle = getComputedStyle(ele);
-        return {
-            opacity: computedStyle.getPropertyValue('opacity'),
-            zIndex: computedStyle.getPropertyValue('z-index'),
-            display: computedStyle.getPropertyValue('display'),
-            visibility: computedStyle.getPropertyValue('visibility')
-        };
+    fillStyle = 'rgba(189, 177, 167, .3)',
+    rotate = -20,
+    zIndex = 2147483647,
+    watermarkId = '__wm'
+  } = type.isNullOrUnDef(canvasWM) ? {} : canvasWM;
+  const container = type.isString(rootContainer) ? document.querySelector(rootContainer) : rootContainer;
+  if (!container) {
+    throw new Error(`${rootContainer} is not valid Html Element or element selector`);
+  }
+  const canvas = document.createElement('canvas');
+  canvas.setAttribute('width', width);
+  canvas.setAttribute('height', height);
+  const ctx = canvas.getContext('2d');
+  ctx.textAlign = textAlign;
+  ctx.textBaseline = textBaseline;
+  ctx.font = font;
+  // ctx!.fontWeight = fontWeight;
+  ctx.fillStyle = fillStyle;
+  ctx.rotate((Math.PI / 180) * rotate);
+  ctx.fillText(content, parseFloat(width) / 4, parseFloat(height) / 2);
+  const base64Url = canvas.toDataURL();
+  const __wm = document.querySelector(`#${watermarkId}`);
+  const watermarkDiv = __wm || document.createElement('div');
+  const styleStr = `opacity: 1 !important; display: block !important; visibility: visible !important;         position:absolute;          left:0; top:0;         width:100%;          height:100%;          z-index:${zIndex};          pointer-events:none;          background-repeat:repeat;          background-image:url('${base64Url}')`;
+  watermarkDiv.setAttribute('style', styleStr);
+  watermarkDiv.setAttribute('id', watermarkId);
+  watermarkDiv.classList.add('nav-height');
+  if (!__wm) {
+    container.style.position = 'relative';
+    container.appendChild(watermarkDiv);
+  }
+  const getMutableStyle = ele => {
+    const computedStyle = getComputedStyle(ele);
+    return {
+      opacity: computedStyle.getPropertyValue('opacity'),
+      zIndex: computedStyle.getPropertyValue('z-index'),
+      display: computedStyle.getPropertyValue('display'),
+      visibility: computedStyle.getPropertyValue('visibility')
     };
-    //@ts-ignore
-    const MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
-    if (MutationObserver) {
-        let mo = new MutationObserver(function () {
-            let __wm = document.querySelector(`#${watermarkId}`); // 只在__wm元素变动才重新调用 __canvasWM
-            if (!__wm) {
-                // 避免一直触发
-                // console.log('regenerate watermark by delete::')
-                mo.disconnect();
-                mo = null;
-                genCanvasWM(content, canvasWM);
-            }
-            else {
-                const { opacity, zIndex, display, visibility } = getMutableStyle(__wm);
-                if ((__wm && __wm.getAttribute('style') !== styleStr) ||
-                    !__wm ||
-                    !(opacity === '1' && zIndex === '2147483647' && display === 'block' && visibility === 'visible')) {
-                    // 避免一直触发
-                    // console.log('regenerate watermark by inline style changed ::')
-                    mo.disconnect();
-                    mo = null;
-                    container.removeChild(__wm);
-                    // @ts-ignore
-                    __wm = null;
-                    genCanvasWM(content, canvasWM);
-                }
-            }
-        });
-        mo.observe(container, { attributes: true, subtree: true, childList: true });
-    }
+  };
+  //@ts-ignore
+  const MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
+  if (MutationObserver) {
+    let mo = new MutationObserver(function () {
+      let __wm = document.querySelector(`#${watermarkId}`); // 只在__wm元素变动才重新调用 __canvasWM
+      if (!__wm) {
+        // 避免一直触发
+        // console.log('regenerate watermark by delete::')
+        mo.disconnect();
+        mo = null;
+        genCanvasWM(content, canvasWM);
+      } else {
+        const { opacity, zIndex, display, visibility } = getMutableStyle(__wm);
+        if (
+          (__wm && __wm.getAttribute('style') !== styleStr) ||
+          !__wm ||
+          !(opacity === '1' && zIndex === '2147483647' && display === 'block' && visibility === 'visible')
+        ) {
+          // 避免一直触发
+          // console.log('regenerate watermark by inline style changed ::')
+          mo.disconnect();
+          mo = null;
+          container.removeChild(__wm);
+          // @ts-ignore
+          __wm = null;
+          genCanvasWM(content, canvasWM);
+        }
+      }
+    });
+    mo.observe(container, { attributes: true, subtree: true, childList: true });
+  }
 }
 
 exports.genCanvasWM = genCanvasWM;

package/dist/esm/array.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.13.3-beta.0
+ * sculp-js v1.13.6
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -13,26 +13,21 @@
  * @returns {*}
  */
 function arrayEach(array, iterator, reverse = false) {
-    if (reverse) {
-        for (let idx = array.length - 1; idx >= 0; idx--) {
-            const re = iterator(array[idx], idx, array);
-            if (re === false)
-                break;
-            else if (re === true)
-                continue;
-        }
+  if (reverse) {
+    for (let idx = array.length - 1; idx >= 0; idx--) {
+      const re = iterator(array[idx], idx, array);
+      if (re === false) break;
+      else if (re === true) continue;
     }
-    else {
-        for (let idx = 0, len = array.length; idx < len; idx++) {
-            const re = iterator(array[idx], idx, array);
-            if (re === false)
-                break;
-            else if (re === true)
-                continue;
-        }
+  } else {
+    for (let idx = 0, len = array.length; idx < len; idx++) {
+      const re = iterator(array[idx], idx, array);
+      if (re === false) break;
+      else if (re === true) continue;
     }
-    // @ts-ignore
-    array = null;
+  }
+  // @ts-ignore
+  array = null;
 }
 /**
  * 异步遍历数组，返回 false 中断遍历
@@ -58,18 +53,15 @@ function arrayEach(array, iterator, reverse = false) {
  * }
  */
 async function arrayEachAsync(array, iterator, reverse = false) {
-    if (reverse) {
-        for (let idx = array.length - 1; idx >= 0; idx--) {
-            if ((await iterator(array[idx], idx)) === false)
-                break;
-        }
+  if (reverse) {
+    for (let idx = array.length - 1; idx >= 0; idx--) {
+      if ((await iterator(array[idx], idx)) === false) break;
     }
-    else {
-        for (let idx = 0, len = array.length; idx < len; idx++) {
-            if ((await iterator(array[idx], idx)) === false)
-                break;
-        }
+  } else {
+    for (let idx = 0, len = array.length; idx < len; idx++) {
+      if ((await iterator(array[idx], idx)) === false) break;
     }
+  }
 }
 /**
  * 插入到目标位置之前
@@ -79,11 +71,10 @@ async function arrayEachAsync(array, iterator, reverse = false) {
  * @returns {*}
  */
 function arrayInsertBefore(array, start, to) {
-    if (start === to || start + 1 === to)
-        return;
-    const [source] = array.splice(start, 1);
-    const insertIndex = to < start ? to : to - 1;
-    array.splice(insertIndex, 0, source);
+  if (start === to || start + 1 === to) return;
+  const [source] = array.splice(start, 1);
+  const insertIndex = to < start ? to : to - 1;
+  array.splice(insertIndex, 0, source);
 }
 /**
  * 数组删除指定项目
@@ -92,18 +83,17 @@ function arrayInsertBefore(array, start, to) {
  * @returns {V[]}
  */
 function arrayRemove(array, expect) {
-    const indexes = [];
-    // 这里重命名一下：是为了杜绝 jest 里的 expect 与之产生检查错误
-    // eslint 的 jest 语法检查是遇到 expect 函数就以为是单元测试
-    const _expect = expect;
-    arrayEach(array, (val, idx) => {
-        if (_expect(val, idx))
-            indexes.push(idx);
-    });
-    indexes.forEach((val, idx) => {
-        array.splice(val - idx, 1);
-    });
-    return array;
+  const indexes = [];
+  // 这里重命名一下：是为了杜绝 jest 里的 expect 与之产生检查错误
+  // eslint 的 jest 语法检查是遇到 expect 函数就以为是单元测试
+  const _expect = expect;
+  arrayEach(array, (val, idx) => {
+    if (_expect(val, idx)) indexes.push(idx);
+  });
+  indexes.forEach((val, idx) => {
+    array.splice(val - idx, 1);
+  });
+  return array;
 }
 
 export { arrayEach, arrayEachAsync, arrayInsertBefore, arrayRemove };

package/dist/esm/async.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.13.3-beta.0
+ * sculp-js v1.13.6
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -10,7 +10,7 @@
  * @returns {Promise<void>}
  */
 function wait(timeout = 1) {
-    return new Promise(resolve => setTimeout(resolve, timeout));
+  return new Promise(resolve => setTimeout(resolve, timeout));
 }
 /**
  * 异步遍历
@@ -22,39 +22,37 @@ function wait(timeout = 1) {
  * @returns {Promise<R[]>}
  */
 function asyncMap(list, mapper, concurrency = Infinity) {
-    return new Promise((resolve, reject) => {
-        const iterator = list[Symbol.iterator]();
-        const limit = Math.min(list.length, concurrency);
-        const resolves = [];
-        let resolvedLength = 0;
-        let rejected;
-        let index = 0;
-        const next = () => {
-            if (rejected)
-                return reject(rejected);
-            const it = iterator.next();
-            if (it.done) {
-                if (resolvedLength === list.length)
-                    resolve(resolves);
-                return;
-            }
-            const current = index++;
-            mapper(it.value, current, list)
-                .then(value => {
-                resolvedLength++;
-                resolves[current] = value;
-                next();
-            })
-                .catch(err => {
-                rejected = err;
-                next();
-            });
-        };
-        // 开始
-        for (let i = 0; i < limit; i++) {
-            next();
-        }
-    });
+  return new Promise((resolve, reject) => {
+    const iterator = list[Symbol.iterator]();
+    const limit = Math.min(list.length, concurrency);
+    const resolves = [];
+    let resolvedLength = 0;
+    let rejected;
+    let index = 0;
+    const next = () => {
+      if (rejected) return reject(rejected);
+      const it = iterator.next();
+      if (it.done) {
+        if (resolvedLength === list.length) resolve(resolves);
+        return;
+      }
+      const current = index++;
+      mapper(it.value, current, list)
+        .then(value => {
+          resolvedLength++;
+          resolves[current] = value;
+          next();
+        })
+        .catch(err => {
+          rejected = err;
+          next();
+        });
+    };
+    // 开始
+    for (let i = 0; i < limit; i++) {
+      next();
+    }
+  });
 }
 /**
  * Execute a promise safely
@@ -76,14 +74,14 @@ function asyncMap(list, mapper, concurrency = Infinity) {
 }
  */
 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];
+  return promise
+    .then(data => [null, data])
+    .catch(err => {
+      if (errorExt) {
+        const parsedError = Object.assign({}, err, errorExt);
+        return [parsedError, undefined];
+      }
+      return [err, undefined];
     });
 }
 

package/dist/esm/base64.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.13.3-beta.0
+ * sculp-js v1.13.6
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -16,22 +16,29 @@ const b64re = /^(?:[A-Za-z\d+\/]{4})*?(?:[A-Za-z\d+\/]{2}(?:==)?|[A-Za-z\d+\/]{3
  * @returns {string}
  */
 function weBtoa(string) {
-    // 同window.btoa: 字符串编码成Base64
-    string = String(string);
-    let bitmap, a, b, c, result = '', i = 0;
-    const strLen = string.length;
-    const rest = strLen % 3;
-    for (; i < strLen;) {
-        if ((a = string.charCodeAt(i++)) > 255 || (b = string.charCodeAt(i++)) > 255 || (c = string.charCodeAt(i++)) > 255)
-            throw new TypeError("Failed to execute 'btoa' on 'Window': The string to be encoded contains characters outside of the Latin1 range.");
-        bitmap = (a << 16) | (b << 8) | c;
-        result +=
-            b64.charAt((bitmap >> 18) & 63) +
-                b64.charAt((bitmap >> 12) & 63) +
-                b64.charAt((bitmap >> 6) & 63) +
-                b64.charAt(bitmap & 63);
-    }
-    return rest ? result.slice(0, rest - 3) + '==='.substring(rest) : result;
+  // 同window.btoa: 字符串编码成Base64
+  string = String(string);
+  let bitmap,
+    a,
+    b,
+    c,
+    result = '',
+    i = 0;
+  const strLen = string.length;
+  const rest = strLen % 3;
+  for (; i < strLen; ) {
+    if ((a = string.charCodeAt(i++)) > 255 || (b = string.charCodeAt(i++)) > 255 || (c = string.charCodeAt(i++)) > 255)
+      throw new TypeError(
+        "Failed to execute 'btoa' on 'Window': The string to be encoded contains characters outside of the Latin1 range."
+      );
+    bitmap = (a << 16) | (b << 8) | c;
+    result +=
+      b64.charAt((bitmap >> 18) & 63) +
+      b64.charAt((bitmap >> 12) & 63) +
+      b64.charAt((bitmap >> 6) & 63) +
+      b64.charAt(bitmap & 63);
+  }
+  return rest ? result.slice(0, rest - 3) + '==='.substring(rest) : result;
 }
 /**
  * Base64解码为原始字符串，平替浏览器的atob, 不包含中文的处理（适用于任何环境，包括小程序）
@@ -39,38 +46,42 @@ function weBtoa(string) {
  * @returns {string}
  */
 function weAtob(string) {
-    // 同window.atob: Base64解码为原始字符串
-    string = String(string).replace(/[\t\n\f\r ]+/g, '');
-    if (!b64re.test(string))
-        throw new TypeError("Failed to execute 'atob' on 'Window': The string to be decoded is not correctly encoded.");
-    string += '=='.slice(2 - (string.length & 3));
-    let bitmap, result = '', r1, r2, i = 0;
-    for (const strLen = string.length; i < strLen;) {
-        bitmap =
-            (b64.indexOf(string.charAt(i++)) << 18) |
-                (b64.indexOf(string.charAt(i++)) << 12) |
-                ((r1 = b64.indexOf(string.charAt(i++))) << 6) |
-                (r2 = b64.indexOf(string.charAt(i++)));
-        result +=
-            r1 === 64
-                ? String.fromCharCode((bitmap >> 16) & 255)
-                : r2 === 64
-                    ? String.fromCharCode((bitmap >> 16) & 255, (bitmap >> 8) & 255)
-                    : String.fromCharCode((bitmap >> 16) & 255, (bitmap >> 8) & 255, bitmap & 255);
-    }
-    return result;
+  // 同window.atob: Base64解码为原始字符串
+  string = String(string).replace(/[\t\n\f\r ]+/g, '');
+  if (!b64re.test(string))
+    throw new TypeError("Failed to execute 'atob' on 'Window': The string to be decoded is not correctly encoded.");
+  string += '=='.slice(2 - (string.length & 3));
+  let bitmap,
+    result = '',
+    r1,
+    r2,
+    i = 0;
+  for (const strLen = string.length; i < strLen; ) {
+    bitmap =
+      (b64.indexOf(string.charAt(i++)) << 18) |
+      (b64.indexOf(string.charAt(i++)) << 12) |
+      ((r1 = b64.indexOf(string.charAt(i++))) << 6) |
+      (r2 = b64.indexOf(string.charAt(i++)));
+    result +=
+      r1 === 64
+        ? String.fromCharCode((bitmap >> 16) & 255)
+        : r2 === 64
+        ? String.fromCharCode((bitmap >> 16) & 255, (bitmap >> 8) & 255)
+        : String.fromCharCode((bitmap >> 16) & 255, (bitmap >> 8) & 255, bitmap & 255);
+  }
+  return result;
 }
 function stringToUint8Array(str) {
-    const utf8 = encodeURIComponent(str); // 将字符串转换为 UTF-8 编码
-    const uint8Array = new Uint8Array(utf8.length); // 创建 Uint8Array
-    for (let i = 0; i < utf8.length; i++) {
-        uint8Array[i] = utf8.charCodeAt(i); // 填充 Uint8Array
-    }
-    return uint8Array;
+  const utf8 = encodeURIComponent(str); // 将字符串转换为 UTF-8 编码
+  const uint8Array = new Uint8Array(utf8.length); // 创建 Uint8Array
+  for (let i = 0; i < utf8.length; i++) {
+    uint8Array[i] = utf8.charCodeAt(i); // 填充 Uint8Array
+  }
+  return uint8Array;
 }
 function uint8ArrayToString(uint8Array) {
-    const utf8 = String.fromCharCode.apply(null, uint8Array); // 将 Uint8Array 转为字符串
-    return decodeURIComponent(utf8); // 将 UTF-8 字符串解码回正常字符串
+  const utf8 = String.fromCharCode.apply(null, uint8Array); // 将 Uint8Array 转为字符串
+  return decodeURIComponent(utf8); // 将 UTF-8 字符串解码回正常字符串
 }
 /**
  * 将base64编码的字符串转换为原始字符串，包括对中文内容的处理(高性能，且支持Web、Node、小程序等任意平台)
@@ -78,16 +89,16 @@ function uint8ArrayToString(uint8Array) {
  * @returns 原始字符串，包括中文内容
  */
 function b64decode(base64) {
-    const binaryString = !isNullOrUnDef(getGlobal('atob')) ? getGlobal('atob')(base64) : weAtob(base64);
-    const len = binaryString.length;
-    const bytes = new Uint8Array(len);
-    for (let i = 0; i < len; i++) {
-        bytes[i] = binaryString.charCodeAt(i);
-    }
-    // 使用TextDecoder将Uint8Array转换为原始字符串，包括中文内容
-    return !isNullOrUnDef(getGlobal('TextDecoder'))
-        ? new (getGlobal('TextDecoder'))('utf-8').decode(bytes)
-        : uint8ArrayToString(bytes);
+  const binaryString = !isNullOrUnDef(getGlobal('atob')) ? getGlobal('atob')(base64) : weAtob(base64);
+  const len = binaryString.length;
+  const bytes = new Uint8Array(len);
+  for (let i = 0; i < len; i++) {
+    bytes[i] = binaryString.charCodeAt(i);
+  }
+  // 使用TextDecoder将Uint8Array转换为原始字符串，包括中文内容
+  return !isNullOrUnDef(getGlobal('TextDecoder'))
+    ? new (getGlobal('TextDecoder'))('utf-8').decode(bytes)
+    : uint8ArrayToString(bytes);
 }
 /**
  * 将原始字符串，包括中文内容，转换为base64编码的字符串(高性能，且支持Web、Node、小程序等任意平台)
@@ -95,17 +106,17 @@ function b64decode(base64) {
  * @returns base64编码的字符串
  */
 function b64encode(rawStr) {
-    const utf8Array = !isNullOrUnDef(getGlobal('TextEncoder'))
-        ? new (getGlobal('TextEncoder'))().encode(rawStr)
-        : stringToUint8Array(rawStr);
-    // 将 Uint8Array 转换为二进制字符串
-    let binaryString = '';
-    const len = utf8Array.length;
-    for (let i = 0; i < len; i++) {
-        binaryString += String.fromCharCode(utf8Array[i]);
-    }
-    // 将二进制字符串转换为base64编码的字符串
-    return !isNullOrUnDef(getGlobal('btoa')) ? getGlobal('btoa')(binaryString) : weBtoa(binaryString);
+  const utf8Array = !isNullOrUnDef(getGlobal('TextEncoder'))
+    ? new (getGlobal('TextEncoder'))().encode(rawStr)
+    : stringToUint8Array(rawStr);
+  // 将 Uint8Array 转换为二进制字符串
+  let binaryString = '';
+  const len = utf8Array.length;
+  for (let i = 0; i < len; i++) {
+    binaryString += String.fromCharCode(utf8Array[i]);
+  }
+  // 将二进制字符串转换为base64编码的字符串
+  return !isNullOrUnDef(getGlobal('btoa')) ? getGlobal('btoa')(binaryString) : weBtoa(binaryString);
 }
 
 export { b64decode, b64encode, weAtob, weBtoa };