@unicom-cloud/utils 0.1.13 → 0.1.15

package/content-disposition/index.js

@@ -1,56 +1,59 @@
-function m(t) {
-  if (!t) return null;
+import "../is/index.js";
+import m from "lodash/isString";
+function p(t) {
+  if (!(m(t) && t.trim())) return null;
   const e = {
     type: "",
-    parameters: {}
-  }, o = t.match(/^([^;]+)/);
-  o && (e.type = o[1].trim());
-  const s = t.matchAll(
-    /;\s*([^=]+)=(?:"([^"]*)"|([^;]*))/g
-  );
-  for (const r of s) {
-    const n = r[1].trim().toLowerCase(), i = r[2] || r[3];
-    if (n.endsWith("*")) {
-      const a = p(i);
-      e.parameters[n] = a;
-      const c = n.slice(0, -1);
-      e.parameters[c] || (e.parameters[c] = a);
-    } else e.parameters[n] || (e.parameters[n] = i);
+    parameters: /* @__PURE__ */ Object.create(null)
+    // 避免原型污染
+  }, a = t.match(/^\s*([^;\s]+)\s*/);
+  m(a?.[1]) && (e.type = a[1].toLowerCase());
+  const s = /;\s*([^=\s]+)\s*=\s*(?:"([^"]*)"|([^;\s]*))/g;
+  let o;
+  for (; (o = s.exec(t)) !== null; ) {
+    const r = o[1].trim().toLowerCase(), n = o[2] || o[3] || "";
+    if (r.endsWith("*"))
+      try {
+        const c = f(n), i = r.slice(0, -1);
+        e.parameters[i] || (e.parameters[i] = c), e.parameters[r] = c;
+      } catch (c) {
+        console.debug(`RFC5987解码失败: ${n}`, c), e.parameters[r] = n;
+      }
+    else !e.parameters[r] && !e.parameters[`${r}*`] && (e.parameters[r] = n);
   }
   return e;
 }
-function p(t) {
-  const e = t.match(/^([^']*)'[^']*'(.*)$/);
+function f(t) {
+  const e = t.match(/^([^']*)'([^']*)'(.*)$/);
   if (!e) return t;
-  const [o, s, r] = e;
+  const [a, s, o, r] = e;
   try {
-    const n = r.replace(
-      /%([0-9A-Fa-f]{2})/g,
-      (i, a) => String.fromCharCode(parseInt(a, 16))
+    const n = decodeURIComponent(
+      r.replace(/%(?![0-9A-Fa-f]{2})/g, "%25")
     );
-    return s && s.toLowerCase() !== "utf-8", n;
+    return s && !/^utf-?8$/i.test(s) && console.warn(`非UTF-8编码暂未转换: ${s}`), n;
   } catch (n) {
-    return console.warn("Failed to decode RFC 5987 value:", t, n), t;
+    return console.warn(`RFC5987解码失败: ${t}`, n), t;
   }
 }
-function f(t) {
+function l(t) {
   let e = t?.["content-disposition"];
   if (e)
-    return m(e);
+    return p(e);
 }
 function d(t) {
-  const e = f(t);
+  const e = l(t);
   if (e)
     return e.parameters;
 }
-function l(t) {
+function C(t) {
   const e = d(t);
   if (e)
     return e["filename*"] || e.filename;
 }
 export {
-  m as default,
-  f as getContentDispositionFromHeader,
-  l as getContentDispositionParametersFilenameFromHeader,
+  p as default,
+  l as getContentDispositionFromHeader,
+  C as getContentDispositionParametersFilenameFromHeader,
   d as getContentDispositionParametersFromHeader
 };

package/contentDisposition.js

@@ -1,7 +1,9 @@
-import { default as o, getContentDispositionFromHeader as r, getContentDispositionParametersFilenameFromHeader as i, getContentDispositionParametersFromHeader as n } from "./content-disposition/index.js";
+import "./is/index.js";
+import "lodash/isString";
+import { default as i, getContentDispositionFromHeader as n, getContentDispositionParametersFilenameFromHeader as a, getContentDispositionParametersFromHeader as m } from "./content-disposition/index.js";
 export {
-  o as default,
-  r as getContentDispositionFromHeader,
-  i as getContentDispositionParametersFilenameFromHeader,
-  n as getContentDispositionParametersFromHeader
+  i as default,
+  n as getContentDispositionFromHeader,
+  a as getContentDispositionParametersFilenameFromHeader,
+  m as getContentDispositionParametersFromHeader
 };

package/file/saveAs.js

@@ -1,34 +1,33 @@
 import { fileToURL as r } from "./fileToURL.js";
-function o(n) {
+function o(t) {
   return new XMLHttpRequest();
 }
-function s(n, t) {
+function s(t, n) {
   const e = o();
-  e.open("GET", n), e.responseType = "blob", e.onload = () => {
-    c(e.response, t);
+  e.open("GET", t), e.responseType = "blob", e.onload = () => {
+    c(e.response, n);
   }, e.onerror = () => {
     console.error("无法下载文件");
   }, e.send();
 }
-function a(n) {
-  const t = o();
-  t.open("HEAD", n, !1);
+function a(t) {
+  const n = o();
+  n.open("HEAD", t, !1);
   try {
-    t.send();
+    n.send();
   } catch (e) {
     console.error(e);
   }
-  return t.status >= 200 && t.status <= 299;
+  return n.status >= 200 && n.status <= 299;
 }
-async function i(n, t) {
+async function c(t, n) {
   const e = document.createElementNS("http://www.w3.org/1999/xhtml", "a");
-  e.rel = "noopener", typeof n == "string" && (e.href = n, e.origin === location.origin || (a(n) ? s(n, t) : e.target = "_blank")), n instanceof Blob && (e.href = await r(n)), n instanceof File && (t ||= n.name), t ||= "download", e.download = t, setTimeout(() => {
+  e.rel = "noopener", typeof t == "string" && (e.href = t, e.origin === location.origin || (a(t) ? s(t, n) : e.target = "_blank")), t instanceof File ? (e.href = await r(t), n ||= t.name) : t instanceof Blob && (e.href = URL.createObjectURL(t), setTimeout(() => {
+    URL.revokeObjectURL(e.href);
+  }, 4e4)), n ||= "download", e.download = n, setTimeout(() => {
     e.dispatchEvent(new MouseEvent("click"));
   }, 0);
 }
-function c(n, t) {
-  i(n, t);
-}
 export {
   c as default,
   c as saveAs

package/mock/MockWebSocket.js

@@ -19,7 +19,7 @@ class l extends EventTarget {
           this.dispatchEvent(t), this.onopen?.(t), clearTimeout(this.#i);
         },
         this.#t?.openTimeout ?? Math.random() * 27
-      ), this.#a = setInterval(
+      ), this.#a = window.setInterval(
         () => {
           this.readyState === n.OPEN && this.#e.length && (this.send(this.#h), this.#s++);
         },
@@ -44,7 +44,7 @@ class l extends EventTarget {
         let t = new CloseEvent("close");
         this.dispatchEvent(t), this.onclose?.(t);
       }
-      clearTimeout(this.#i), clearInterval(this.#a), this.#s = 0, this.#e = [];
+      clearTimeout(this.#i), window.clearInterval(this.#a), this.#s = 0, this.#e = [];
     } else
       this.#o?.close?.(e, s);
   }

package/package.json

@@ -1 +1 @@
-{"name":"@unicom-cloud/utils","version":"0.1.13","dependencies":{},"peerDependencies":{"lodash":"^4.17.21"},"main":"./index.js","type":"module","types":"types/index.d.ts","publishConfig":{"registry":"https://registry.npmjs.org/","access":"public"}}
+{"name":"@unicom-cloud/utils","version":"0.1.15","dependencies":{},"peerDependencies":{"lodash":"^4.17.21"},"main":"./index.js","type":"module","types":"types/index.d.ts","publishConfig":{"registry":"https://registry.npmjs.org/","access":"public"}}

package/snapdom/src/api/snapdom.js

@@ -1,108 +1,113 @@
 import { captureDOM as v } from "../core/capture.js";
 import { extendIconFonts as j } from "../modules/iconFonts.js";
-import { isSafari as R } from "../utils/helpers.js";
-async function x(a, { dpr: t = 1, scale: o = 1 }) {
-  const e = new Image();
-  return e.src = a, await e.decode(), R ? (e.width = e.width * o, e.height = e.height * o) : (e.width = e.width / o, e.height = e.height / o), e;
+import { isSafari as x } from "../utils/helpers.js";
+async function R(e, { scale: t = 1 } = {}) {
+  const n = new Image();
+  return n.src = e, await n.decode(), t !== 1 && (n.style.width = `${n.naturalWidth * t}px`, n.style.height = `${n.naturalHeight * t}px`), n;
 }
-async function l(a, { dpr: t = 1, scale: o = 1 } = {}) {
-  const e = new Image();
-  e.src = a, await e.decode();
-  const n = document.createElement("canvas"), c = e.width * o, g = e.height * o;
-  n.width = Math.ceil(c * t), n.height = Math.ceil(g * t);
-  const s = n.getContext("2d");
-  return s.scale(t, t), s.drawImage(e, 0, 0, c, g), n.style.width = `${c}px`, n.style.height = `${g}px`, n;
+async function h(e, { dpr: t = 1, scale: n = 1 } = {}) {
+  const c = new Image();
+  c.src = e, c.crossOrigin = "anonymous", c.loading = "eager", c.decoding = "sync";
+  const o = x();
+  let a = !1;
+  if (o && (document.body.appendChild(c), a = !0), await c.decode(), o && await new Promise((w) => setTimeout(w, 100)), c.width === 0 || c.height === 0)
+    throw a && c.remove(), new Error("Image failed to load or has no dimensions");
+  const s = c.naturalWidth * n, r = c.naturalHeight * n, g = document.createElement("canvas");
+  g.width = Math.ceil(s * t), g.height = Math.ceil(r * t), g.style.width = `${s}px`, g.style.height = `${r}px`;
+  const d = g.getContext("2d");
+  return d.scale(t, t), d.drawImage(c, 0, 0, s, r), a && c.remove(), g;
 }
-async function f(a, { type: t = "svg", scale: o = 1, backgroundColor: e = "#fff", quality: n } = {}) {
-  const c = {
+async function y(e, { type: t = "svg", scale: n = 1, backgroundColor: c = "#fff", quality: o } = {}) {
+  const a = {
     jpg: "image/jpeg",
     jpeg: "image/jpeg",
     png: "image/png",
     webp: "image/webp"
   }[t] || "image/png";
   if (t === "svg") {
-    const s = decodeURIComponent(a.split(",")[1]);
-    return new Blob([s], { type: "image/svg+xml" });
+    const r = decodeURIComponent(e.split(",")[1]);
+    return new Blob([r], { type: "image/svg+xml" });
   }
-  const g = await m(
-    a,
-    { dpr: 1, scale: o },
-    e
+  const s = await u(
+    e,
+    { dpr: 1, scale: n },
+    c
   );
-  return new Promise((s) => {
-    g.toBlob((r) => s(r), `${c}`, n);
+  return new Promise((r) => {
+    s.toBlob((g) => r(g), `${a}`, o);
   });
 }
-async function m(a, { dpr: t = 1, scale: o = 1 }, e) {
-  const n = await l(a, { dpr: t, scale: o });
-  if (!e) return n;
-  const c = document.createElement("canvas");
-  c.width = n.width, c.height = n.height;
-  const g = c.getContext("2d");
-  return g.fillStyle = e, g.fillRect(0, 0, c.width, c.height), g.drawImage(n, 0, 0), c;
+async function u(e, { dpr: t = 1, scale: n = 1 }, c) {
+  const o = await h(e, { dpr: t, scale: n });
+  if (!c) return o;
+  const a = document.createElement("canvas");
+  a.width = o.width, a.height = o.height;
+  const s = a.getContext("2d");
+  return s.fillStyle = c, s.fillRect(0, 0, a.width, a.height), s.drawImage(o, 0, 0), a;
 }
-async function u(a, { dpr: t = 1, scale: o = 1, backgroundColor: e, quality: n }, c = "png") {
-  const g = ["jpg", "jpeg", "webp"].includes(c) ? "#fff" : void 0, r = await m(a, { dpr: t, scale: o }, e ?? g), w = new Image();
-  return w.src = r.toDataURL(`image/${c}`, n), await w.decode(), w.style.width = `${r.width / t}px`, w.style.height = `${r.height / t}px`, w;
+async function m(e, { dpr: t = 1, scale: n = 1, backgroundColor: c, quality: o }, a = "png") {
+  const s = ["jpg", "jpeg", "webp"].includes(a) ? "#fff" : void 0, g = await u(e, { dpr: t, scale: n }, c ?? s), d = new Image();
+  return d.src = g.toDataURL(`image/${a}`, o), await d.decode(), d.style.width = `${g.width / t}px`, d.style.height = `${g.height / t}px`, d;
 }
-async function B(a, {
+async function B(e, {
   dpr: t = 1,
-  scale: o = 1,
-  backgroundColor: e = "#fff",
-  format: n = "png",
-  filename: c = "capture"
+  scale: n = 1,
+  backgroundColor: c,
+  format: o = "png",
+  filename: a = "snapDOM"
 } = {}) {
-  if (n === "svg") {
-    const y = await f(a), h = URL.createObjectURL(y), p = document.createElement("a");
-    p.href = h, p.download = `${c}.svg`, p.click(), URL.revokeObjectURL(h);
+  if (o === "svg") {
+    const b = await y(e), f = URL.createObjectURL(b), l = document.createElement("a");
+    l.href = f, l.download = `${a}.svg`, l.click(), URL.revokeObjectURL(f);
     return;
   }
-  const g = ["jpg", "jpeg", "webp"].includes(n) ? "#fff" : void 0, r = await m(a, { dpr: t, scale: o }, e ?? g), w = {
+  const s = ["jpg", "jpeg", "webp"].includes(o) ? "#fff" : void 0, g = await u(e, { dpr: t, scale: n }, c ?? s), d = {
     jpg: "image/jpeg",
     jpeg: "image/jpeg",
     png: "image/png",
     webp: "image/webp"
-  }[n] || "image/png", b = r.toDataURL(w), d = document.createElement("a");
-  d.href = b, d.download = `${c}.${n}`, d.click();
+  }[o] || "image/png", w = g.toDataURL(d), p = document.createElement("a");
+  p.href = w, p.download = `${a}.${o}`, p.click();
 }
-async function i(a, t = {}) {
-  if (t = { scale: 1, ...t }, !a) throw new Error("Element cannot be null or undefined");
-  return t.iconFonts && j(t.iconFonts), await i.capture(a, t);
+async function i(e, t = {}) {
+  if (t = { scale: 1, ...t }, !e) throw new Error("Element cannot be null or undefined");
+  return t.iconFonts && j(t.iconFonts), await i.capture(e, t);
 }
-i.capture = async (a, t = {}) => {
-  const o = await v(a, t), e = window.devicePixelRatio || 1, n = t.scale || 1;
+i.capture = async (e, t = {}) => {
+  const n = await v(e, t), c = t.dpr ?? (window.devicePixelRatio || 1), o = t.scale || 1;
   return {
-    url: o,
+    url: n,
     options: t,
-    toRaw: () => o,
-    toImg: () => x(o, { dpr: e, scale: n }),
-    toCanvas: () => l(o, { dpr: e, scale: n }),
-    toBlob: (c) => f(o, { scale: n, ...c }),
-    toPng: (c) => u(o, { dpr: e, scale: n, ...c }, "png"),
-    toJpg: (c) => u(o, { dpr: e, scale: n, ...c }, "jpeg"),
-    toWebp: (c) => u(o, { dpr: e, scale: n, ...c }, "webp"),
+    toRaw: () => n,
+    toImg: (a = {}) => R(n, { scale: o, ...a }),
+    toCanvas: (a = {}) => h(n, { dpr: c, scale: o, ...a }),
+    toBlob: (a = {}) => y(n, { scale: o, ...a }),
+    toPng: (a = {}) => m(n, { dpr: c, scale: o, ...a }, "png"),
+    toJpg: (a = {}) => m(n, { dpr: c, scale: o, ...a }, "jpeg"),
+    toWebp: (a = {}) => m(n, { dpr: c, scale: o, ...a }, "webp"),
     download: ({
-      format: c = "png",
-      filename: g = "capture",
-      backgroundColor: s
-    } = {}) => B(o, { dpr: e, scale: n, backgroundColor: s, format: c, filename: g })
+      format: a = "png",
+      filename: s = "snapDOM",
+      backgroundColor: r,
+      ...g
+    } = {}) => B(n, { dpr: c, scale: o, format: a, filename: s, backgroundColor: r, ...g })
   };
 };
-i.toRaw = async (a, t) => (await i.capture(a, t)).toRaw();
-i.toImg = async (a, t) => (await i.capture(a, t)).toImg();
-i.toCanvas = async (a, t) => (await i.capture(a, t)).toCanvas();
-i.toBlob = async (a, t) => (await i.capture(a, t)).toBlob(t);
-i.toPng = async (a, t) => (await i.capture(a, t)).toPng(t);
-i.toJpg = async (a, t) => (await i.capture(a, t)).toJpg(t);
-i.toWebp = async (a, t) => (await i.capture(a, t)).toWebp(t);
-i.download = async (a, t = {}) => {
+i.toRaw = async (e, t) => (await i.capture(e, t)).toRaw();
+i.toImg = async (e, t) => (await i.capture(e, t)).toImg();
+i.toCanvas = async (e, t) => (await i.capture(e, t)).toCanvas();
+i.toBlob = async (e, t) => (await i.capture(e, t)).toBlob(t);
+i.toPng = async (e, t) => (await i.capture(e, t)).toPng(t);
+i.toJpg = async (e, t) => (await i.capture(e, t)).toJpg(t);
+i.toWebp = async (e, t) => (await i.capture(e, t)).toWebp(t);
+i.download = async (e, t = {}) => {
   const {
-    format: o = "png",
-    filename: e = "capture",
-    backgroundColor: n,
-    ...c
+    format: n = "png",
+    filename: c = "capture",
+    backgroundColor: o,
+    ...a
   } = t;
-  return await (await i.capture(a, c)).download({ format: o, filename: e, backgroundColor: n });
+  return await (await i.capture(e, a)).download({ format: n, filename: c, backgroundColor: o });
 };
 export {
   i as snapdom

package/snapdom/src/core/capture.js

@@ -3,83 +3,83 @@ import { inlineBackgroundImages as H } from "../modules/background.js";
 import { embedCustomFonts as I } from "../modules/fonts.js";
 import { inlineImages as M } from "../modules/images.js";
 import { collectUsedTagNames as A, generateDedupedBaseCSS as O } from "../utils/cssTools.js";
-import { idle as l, isSafari as R } from "../utils/helpers.js";
-import { prepareClone as U } from "./prepare.js";
-async function Q(c, t = {}) {
-  if (!c) throw new Error("Element cannot be null or undefined");
+import { idle as c } from "../utils/helpers.js";
+import { prepareClone as R } from "./prepare.js";
+async function J(l, t = {}) {
+  if (!l) throw new Error("Element cannot be null or undefined");
   h.reset();
   const {
-    compress: b = !0,
-    embedFonts: y = !1,
+    compress: u = !0,
+    embedFonts: b = !1,
     fast: n = !0,
-    scale: f = 1,
-    useProxy: j = ""
+    scale: S = 1,
+    useProxy: U = ""
   } = t;
-  let s, p, v = "", m = "", x, C;
-  if ({ clone: s, classCSS: p } = await U(
-    c,
+  let a, y, p = "", m = "", v, x;
+  if ({ clone: a, classCSS: y } = await R(
+    l,
+    u,
     b,
-    y,
     t
-  ), await new Promise((i) => {
-    l(
+  ), await new Promise((s) => {
+    c(
       async () => {
-        await M(s, t), i();
+        await M(a, t), s();
       },
       { fast: n }
     );
-  }), await new Promise((i) => {
-    l(
+  }), await new Promise((s) => {
+    c(
       async () => {
-        await H(c, s, t), i();
+        await H(l, a, t), s();
       },
       { fast: n }
     );
-  }), y && await new Promise((i) => {
-    l(
+  }), b && await new Promise((s) => {
+    c(
       async () => {
-        v = await I(), i();
+        p = await I(), s();
       },
       { fast: n }
     );
-  }), b) {
-    const i = A(s).sort(), a = i.join(",");
-    h.baseStyle.has(a) ? m = h.baseStyle.get(a) : await new Promise((e) => {
-      l(
+  }), u) {
+    const s = A(a).sort(), i = s.join(",");
+    h.baseStyle.has(i) ? m = h.baseStyle.get(i) : await new Promise((e) => {
+      c(
         () => {
-          m = O(i), h.baseStyle.set(a, m), e();
+          m = O(s), h.baseStyle.set(i, m), e();
         },
         { fast: n }
       );
     });
   }
-  await new Promise((i) => {
-    l(
+  await new Promise((s) => {
+    c(
       () => {
-        const a = c.getBoundingClientRect();
-        let e = a.width, r = a.height;
-        const d = Number.isFinite(t.width), u = Number.isFinite(t.height), S = typeof f == "number" && f !== 1;
-        if (!S) {
-          const g = a.width / a.height;
-          d && u ? (e = t.width, r = t.height) : d ? (e = t.width, r = e / g) : u && (r = t.height, e = r * g);
+        const i = l.getBoundingClientRect();
+        let e = i.width, r = i.height;
+        const d = Number.isFinite(t.width), f = Number.isFinite(t.height), C = typeof S == "number" && S !== 1;
+        if (!C) {
+          const g = i.width / i.height;
+          d && f ? (e = t.width, r = t.height) : d ? (e = t.width, r = e / g) : f && (r = t.height, e = r * g);
+        }
+        if (e = Math.ceil(e), r = Math.ceil(r), a.setAttribute("xmlns", "http://www.w3.org/1999/xhtml"), a.style.transformOrigin = "top left", !C && (d || f)) {
+          const g = i.width, T = i.height, B = e / g, E = r / T, N = a.style.transform || "", z = `scale(${B}, ${E})`;
+          a.style.transform = `${z} ${N}`.trim();
         }
-        if (e = Math.ceil(e), r = Math.ceil(r), s.setAttribute("xmlns", "http://www.w3.org/1999/xhtml"), s.style.transformOrigin = "top left", !S && (d || u)) {
-          const g = a.width, T = a.height, B = e / g, E = r / T, N = s.style.transform || "", z = `scale(${B}, ${E})`;
-          s.style.transform = `${z} ${N}`.trim();
-        } else S && R() && (s.style.scale = `${f}`);
         const $ = "http://www.w3.org/2000/svg", o = document.createElementNS($, "foreignObject");
         o.setAttribute("width", "100%"), o.setAttribute("height", "100%");
         const F = document.createElement("style");
-        F.textContent = m + v + "svg{overflow:visible;}" + p, o.appendChild(F), o.appendChild(s);
+        F.textContent = m + p + "svg{overflow:visible;}" + y, o.appendChild(F), o.appendChild(a);
         const P = new XMLSerializer().serializeToString(o);
-        C = `<svg xmlns="${$}" width="${e}" height="${r}" viewBox="0 0 ${e} ${r}">` + P + "</svg>", x = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(C)}`, i();
+        x = `<svg xmlns="${$}" width="${e}" height="${r}" viewBox="0 0 ${e} ${r}">` + P + "</svg>", v = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(x)}`, s();
       },
       { fast: n }
     );
   });
   const w = document.getElementById("snapdom-sandbox");
-  return w && w.style.position === "absolute" && w.remove(), x;
+  return w && w.style.position === "absolute" && w.remove(), v;
 }
 export {
-  Q as captureDOM
+  J as captureDOM
 };

package/snapdom/src/core/clone.js

@@ -54,9 +54,7 @@ function u(e, n, a = {}, o) {
     const t = e.getBoundingClientRect();
     return c.style.width = `${t.width}px`, c.style.height = `${t.height}px`, c;
   }
-  if (e instanceof HTMLInputElement)
-    return c.value = e.value, c.setAttribute("value", e.value), e.checked !== void 0 && (c.checked = e.checked, e.checked && c.setAttribute("checked", ""), e.indeterminate && (c.indeterminate = e.indeterminate)), c;
-  if (e instanceof HTMLSelectElement && (d = e.value), f(e, c, n), e.shadowRoot)
+  if (e instanceof HTMLInputElement && (c.value = e.value, c.setAttribute("value", e.value), e.checked !== void 0 && (c.checked = e.checked, e.checked && c.setAttribute("checked", ""), e.indeterminate && (c.indeterminate = e.indeterminate))), e instanceof HTMLSelectElement && (d = e.value), f(e, c, n), e.shadowRoot)
     if (Array.from(e.shadowRoot.querySelectorAll("slot")).length > 0) {
       for (const i of e.shadowRoot.childNodes)
         if (i.nodeType === Node.ELEMENT_NODE && i.tagName === "STYLE") {

package/snapdom/src/modules/background.js

@@ -1,7 +1,7 @@
 import { cache as c } from "../core/cache.js";
-import { getStyle as y, splitBackgroundImage as h, inlineSingleBackgroundEntry as b } from "../utils/helpers.js";
-async function w(u, d, k = {}) {
-  const t = [[u, d]], p = [
+import { getStyle as f, splitBackgroundImage as h, inlineSingleBackgroundEntry as y } from "../utils/helpers.js";
+async function S(d, u, b = {}) {
+  const n = [[d, u]], p = [
     "background-image",
     "mask",
     "mask-image",
@@ -9,26 +9,32 @@ async function w(u, d, k = {}) {
     "mask-source",
     "mask-box-image-source",
     "mask-border-source",
-    "-webkit-mask-box-image-source"
+    "-webkit-mask-box-image-source",
+    "border-image",
+    "border-image-source",
+    "border-image-slice",
+    "border-image-width",
+    "border-image-outset",
+    "border-image-repeat"
   ];
-  for (; t.length; ) {
-    const [o, s] = t.shift(), a = c.preStyle.get(o) || y(o);
-    c.preStyle.has(o) || c.preStyle.set(o, a);
+  for (; n.length; ) {
+    const [r, i] = n.shift(), s = c.preStyle.get(r) || f(r);
+    c.preStyle.has(r) || c.preStyle.set(r, s);
     for (const e of p) {
-      const i = a.getPropertyValue(e);
-      if (!i || i === "none") continue;
-      const f = h(i), g = await Promise.all(
-        f.map((r) => b(r, k))
+      const a = s.getPropertyValue(e);
+      if (!a || a === "none") continue;
+      const k = h(a), g = await Promise.all(
+        k.map((o) => y(o, b))
       );
-      g.some((r) => r && r !== "none" && !/^url\(undefined/.test(r)) && s.style.setProperty(e, g.join(", "));
+      g.some((o) => o && o !== "none" && !/^url\(undefined/.test(o)) && i.style.setProperty(e, g.join(", "));
     }
-    const n = a.getPropertyValue("background-color");
-    n && n !== "transparent" && n !== "rgba(0, 0, 0, 0)" && (s.style.backgroundColor = n);
-    const l = Array.from(o.children), m = Array.from(s.children);
+    const t = s.getPropertyValue("background-color");
+    t && t !== "transparent" && t !== "rgba(0, 0, 0, 0)" && (i.style.backgroundColor = t);
+    const l = Array.from(r.children), m = Array.from(i.children);
     for (let e = 0; e < Math.min(l.length, m.length); e++)
-      t.push([l[e], m[e]]);
+      n.push([l[e], m[e]]);
   }
 }
 export {
-  w as inlineBackgroundImages
+  S as inlineBackgroundImages
 };

package/snapdom/src/modules/fonts.js

@@ -1,28 +1,28 @@
 import { cache as o } from "../core/cache.js";
 import { isIconFont as y } from "./iconFonts.js";
 import { extractURL as L } from "../utils/helpers.js";
-async function E(u, i, a, p = 32, m = "#000") {
+async function E(m, i, a, p = 32, u = "#000") {
   i = i.replace(/^['"]+|['"]+$/g, "");
   const t = window.devicePixelRatio || 1, s = document.createElement("canvas").getContext("2d");
   s.font = a ? `${a} ${p}px "${i}"` : `${p}px "${i}"`;
-  const c = s.measureText(u), l = c.actualBoundingBoxAscent || p * 0.8, f = c.actualBoundingBoxDescent || p * 0.2, d = l + f, w = c.width, e = document.createElement("canvas");
+  const c = s.measureText(m), l = c.actualBoundingBoxAscent || p * 0.8, f = c.actualBoundingBoxDescent || p * 0.2, d = l + f, w = c.width, e = document.createElement("canvas");
   e.width = Math.ceil(w * t), e.height = Math.ceil(d * t);
   const h = e.getContext("2d");
-  return h.scale(t, t), h.font = s.font, h.textAlign = "left", h.textBaseline = "alphabetic", h.fillStyle = m, h.fillText(u, 0, l), e.toDataURL();
+  return h.scale(t, t), h.font = s.font, h.textAlign = "left", h.textBaseline = "alphabetic", h.fillStyle = u, h.fillText(m, 0, l), e.toDataURL();
 }
-function $(u) {
-  return Array.from(document.styleSheets).some((i) => i.href === u);
+function $(m) {
+  return Array.from(document.styleSheets).some((i) => i.href === m);
 }
-function P(u) {
+function P(m) {
   return new Promise((i) => {
-    if ($(u)) return i(null);
+    if ($(m)) return i(null);
     const a = document.createElement("link");
-    a.rel = "stylesheet", a.href = u, a.setAttribute("data-snapdom", "injected-import"), a.onload = () => i(a), a.onerror = () => i(null), document.head.appendChild(a);
+    a.rel = "stylesheet", a.href = m, a.setAttribute("data-snapdom", "injected-import"), a.onload = () => i(a), a.onerror = () => i(null), document.head.appendChild(a);
   });
 }
-async function T({ preCached: u = !1 } = {}) {
+async function T({ preCached: m = !1 } = {}) {
   if (o.resource.has("fonts-embed-css")) {
-    if (u) {
+    if (m) {
       const t = document.createElement("style");
       t.setAttribute("data-snapdom", "embedFonts"), t.textContent = o.resource.get("fonts-embed-css"), document.head.appendChild(t);
     }
@@ -40,7 +40,7 @@ async function T({ preCached: u = !1 } = {}) {
   const p = Array.from(
     document.querySelectorAll('link[rel="stylesheet"]')
   ).filter((t) => t.href);
-  let m = "";
+  let u = "";
   for (const t of p)
     try {
       const s = await (await fetch(t.href)).text();
@@ -71,7 +71,7 @@ async function T({ preCached: u = !1 } = {}) {
       let f = s;
       for (const d of l)
         d && (f = f.replace(d.original, d.inlined));
-      m += f + `
+      u += f + `
 `;
     } catch {
       console.warn("[snapdom] Failed to fetch CSS:", t.href);
@@ -83,9 +83,9 @@ async function T({ preCached: u = !1 } = {}) {
           if (n.type === CSSRule.FONT_FACE_RULE) {
             const s = n.style.getPropertyValue("src"), c = n.style.getPropertyValue("font-family");
             if (!s || y(c)) continue;
-            const l = /url\((["']?)([^"')]+)\1\)/g, f = /local\((["']?)[^)]+?\1\)/g, d = l.test(s), w = f.test(s);
+            const l = /url\((["']?)([^"')]+)\1\)/g, f = /local\((["']?)[^)]+?\1\)/g, d = !!s.match(l), w = !!s.match(f);
             if (!d && w) {
-              m += `@font-face{font-family:${c};src:${s};font-style:${n.style.getPropertyValue("font-style") || "normal"};font-weight:${n.style.getPropertyValue("font-weight") || "normal"};}`;
+              u += `@font-face{font-family:${c};src:${s};font-style:${n.style.getPropertyValue("font-style") || "normal"};font-weight:${n.style.getPropertyValue("font-weight") || "normal"};}`;
               continue;
             }
             let e = s;
@@ -114,7 +114,7 @@ async function T({ preCached: u = !1 } = {}) {
                   }
               }
             }
-            m += `@font-face{font-family:${c};src:${e};font-style:${n.style.getPropertyValue("font-style") || "normal"};font-weight:${n.style.getPropertyValue("font-weight") || "normal"};}`;
+            u += `@font-face{font-family:${c};src:${e};font-style:${n.style.getPropertyValue("font-style") || "normal"};font-weight:${n.style.getPropertyValue("font-weight") || "normal"};}`;
           }
       }
     } catch (n) {
@@ -142,13 +142,13 @@ async function T({ preCached: u = !1 } = {}) {
             continue;
           }
       }
-      m += `@font-face{font-family:'${t.family}';src:url(${n});font-style:${t.style || "normal"};font-weight:${t.weight || "normal"};}`;
+      u += `@font-face{font-family:'${t.family}';src:url(${n});font-style:${t.style || "normal"};font-weight:${t.weight || "normal"};}`;
     }
-  if (m && (o.resource.set("fonts-embed-css", m), u)) {
+  if (u && (o.resource.set("fonts-embed-css", u), m)) {
     const t = document.createElement("style");
-    t.setAttribute("data-snapdom", "embedFonts"), t.textContent = m, document.head.appendChild(t);
+    t.setAttribute("data-snapdom", "embedFonts"), t.textContent = u, document.head.appendChild(t);
   }
-  return m;
+  return u;
 }
 export {
   T as embedCustomFonts,

package/snapdom/src/modules/pseudo.js

@@ -1,94 +1,86 @@
-import { cache as I } from "../core/cache.js";
-import { iconToImage as T } from "./fonts.js";
-import { isIconFont as $ } from "./iconFonts.js";
-import { getStyleKey as N } from "../utils/cssTools.js";
-import { getStyle as z, snapshotComputedStyle as V, parseContent as U, extractURL as W, fetchImage as j, safeEncodeURI as A, splitBackgroundImage as D, inlineSingleBackgroundEntry as L } from "../utils/helpers.js";
-async function R(c, r, h, F = !1, S) {
-  if (!(c instanceof Element) || !(r instanceof Element)) return;
+import { cache as M } from "../core/cache.js";
+import { iconToImage as v } from "./fonts.js";
+import { isIconFont as G } from "./iconFonts.js";
+import { getStyleKey as $ } from "../utils/cssTools.js";
+import { getStyle as H, snapshotComputedStyle as z, parseContent as J, extractURL as Q, fetchImage as Y, safeEncodeURI as Z, splitBackgroundImage as tt, inlineSingleBackgroundEntry as nt } from "../utils/helpers.js";
+async function et(a, s, m, R = !1, b) {
+  if (!(a instanceof Element) || !(s instanceof Element)) return;
   for (const n of ["::before", "::after", "::first-letter"])
     try {
-      const t = z(c, n);
-      if (!t || typeof t[Symbol.iterator] != "function") continue;
+      const t = H(a, n);
+      if (!t || typeof t[Symbol.iterator] != "function" || t.content === "none" && t.backgroundImage === "none" && t.backgroundColor === "transparent" && (t.borderStyle === "none" || parseFloat(t.borderWidth) === 0) && (!t.transform || t.transform === "none") && t.display === "inline") continue;
       if (n === "::first-letter") {
-        const l = getComputedStyle(c);
-        if (!(t.color !== l.color || t.fontSize !== l.fontSize || t.fontWeight !== l.fontWeight)) continue;
-        const d = Array.from(r.childNodes).find(
-          (e) => e.nodeType === Node.TEXT_NODE && e.textContent && e.textContent.trim().length > 0
+        const e = getComputedStyle(a);
+        if (!(t.color !== e.color || t.fontSize !== e.fontSize || t.fontWeight !== e.fontWeight)) continue;
+        const c = Array.from(s.childNodes).find(
+          (T) => T.nodeType === Node.TEXT_NODE && T.textContent?.trim().length > 0
         );
-        if (!d) continue;
-        const g = d.textContent, f = g.match(/^([^\p{L}\p{N}\s]*[\p{L}\p{N}](?:['’])?)/u)?.[0], x = g.slice(f?.length || 0);
-        if (!f || /[\uD800-\uDFFF]/.test(f)) continue;
-        const a = document.createElement("span");
-        a.textContent = f, a.dataset.snapdomPseudo = "::first-letter";
-        const s = V(t), B = N(s, "span", h);
-        I.preStyleMap.set(a, B);
-        const E = document.createTextNode(x);
-        r.replaceChild(E, d), r.insertBefore(a, E);
+        if (!c) continue;
+        const W = c.textContent, d = W.match(/^([^\p{L}\p{N}\s]*[\p{L}\p{N}](?:['’])?)/u)?.[0], X = W.slice(d?.length || 0);
+        if (!d || /[\uD800-\uDFFF]/.test(d)) continue;
+        const f = document.createElement("span");
+        f.textContent = d, f.dataset.snapdomPseudo = "::first-letter";
+        const _ = z(t), q = $(_, "span", m);
+        M.preStyleMap.set(f, q);
+        const P = document.createTextNode(X);
+        s.replaceChild(P, c), s.insertBefore(f, P);
         continue;
       }
-      const u = t.getPropertyValue("content"), y = t.getPropertyValue("background-image"), p = t.getPropertyValue("background-color"), M = u !== "none", C = y && y !== "none", b = p && p !== "transparent" && p !== "rgba(0, 0, 0, 0)";
-      if (M || C || b) {
-        const l = t.getPropertyValue("font-family"), m = parseInt(t.getPropertyValue("font-size")) || 32, d = parseInt(t.getPropertyValue("font-weight")) || !1, g = t.getPropertyValue("color") || "#000", o = document.createElement("span");
-        o.dataset.snapdomPseudo = n;
-        const f = V(t), x = N(f, "span", h);
-        I.preStyleMap.set(o, x);
-        const a = $(l);
-        let s;
-        if (/counter\s*\(|counters\s*\(/.test(u) ? s = "- " : s = U(u), a && s.length === 1) {
-          const e = document.createElement("img");
-          e.src = await T(
-            s,
-            l,
-            d,
-            m,
-            g
-          ), e.style = `width:${m}px;height:auto;object-fit:contain;`, o.appendChild(e);
-        } else if (s.startsWith("url(")) {
-          const e = W(s);
-          if (e && e.trim() !== "")
-            try {
-              const i = document.createElement("img"), P = await j(
-                A(e, { useProxy: S })
-              );
-              i.src = P, i.style = `width:${m}px;height:auto;object-fit:contain;`, o.appendChild(i);
-            } catch (i) {
-              console.error(
-                `[snapdom] Error in pseudo ${n} for`,
-                c,
-                i
-              );
-            }
-        } else !a && s && s !== "none" && (o.textContent = s);
-        if (C)
+      const h = t.content, i = /counter\s*\(|counters\s*\(/.test(h) ? "- " : J(h), p = t.backgroundImage, l = t.backgroundColor, S = t.fontFamily, g = parseInt(t.fontSize) || 32, U = parseInt(t.fontWeight) || !1, j = t.color || "#000", A = t.display, D = parseFloat(t.width), L = parseFloat(t.height), x = t.borderStyle, V = parseFloat(t.borderWidth), F = t.transform, w = G(S), k = h !== "none" && i !== "", u = p && p !== "none", y = l && l !== "transparent" && l !== "rgba(0, 0, 0, 0)", B = A !== "inline" && (D > 0 || L > 0), I = x && x !== "none" && V > 0, N = F && F !== "none";
+      if (!(k || u || y || B || I || N)) continue;
+      const o = document.createElement("span");
+      o.dataset.snapdomPseudo = n;
+      const K = z(t), O = $(K, "span", m);
+      if (M.preStyleMap.set(o, O), w && i.length === 1) {
+        const e = document.createElement("img");
+        e.src = await v(
+          i,
+          S,
+          U,
+          g,
+          j
+        ), e.style = `width:${g}px;height:auto;object-fit:contain;`, o.appendChild(e);
+      } else if (i.startsWith("url(")) {
+        const e = Q(i);
+        if (e?.trim())
           try {
-            const e = D(y), i = await Promise.all(
-              e.map((P) => L(P))
-            );
-            o.style.backgroundImage = i.join(", ");
-          } catch (e) {
-            console.warn(
-              `[snapdom] Failed to inline background-image for ${n}`,
-              e
+            const r = document.createElement("img"), c = await Y(
+              Z(e, { useProxy: b })
             );
+            r.src = c, r.style = `width:${g}px;height:auto;object-fit:contain;`, o.appendChild(r);
+          } catch (r) {
+            console.error(`[snapdom] Error in pseudo ${n} for`, a, r);
           }
-        if (b && (o.style.backgroundColor = p), !(o.childNodes.length > 0 || o.textContent && o.textContent.trim() !== "" || C || b)) continue;
-        n === "::before" ? r.insertBefore(o, r.firstChild) : r.appendChild(o);
-      }
+      } else !w && k && (o.textContent = i);
+      if (u)
+        try {
+          const e = tt(p), r = await Promise.all(
+            e.map(nt)
+          );
+          o.style.backgroundImage = r.join(", ");
+        } catch (e) {
+          console.warn(
+            `[snapdom] Failed to inline background-image for ${n}`,
+            e
+          );
+        }
+      if (y && (o.style.backgroundColor = l), !(o.childNodes.length > 0 || o.textContent?.trim() !== "" || u || y || B || I || N)) continue;
+      n === "::before" ? s.insertBefore(o, s.firstChild) : s.appendChild(o);
     } catch (t) {
-      console.warn(`[snapdom] Failed to capture ${n} for`, c, t);
+      console.warn(`[snapdom] Failed to capture ${n} for`, a, t);
     }
-  const w = Array.from(c.children), k = Array.from(r.children).filter(
+  const C = Array.from(a.children), E = Array.from(s.children).filter(
     (n) => !n.dataset.snapdomPseudo
   );
-  for (let n = 0; n < Math.min(w.length, k.length); n++)
-    await R(
-      w[n],
-      k[n],
-      h,
-      F,
-      S
+  for (let n = 0; n < Math.min(C.length, E.length); n++)
+    await et(
+      C[n],
+      E[n],
+      m,
+      R,
+      b
     );
 }
 export {
-  R as inlinePseudoElements
+  et as inlinePseudoElements
 };

package/types/file/saveAs.d.ts

@@ -1,2 +1,2 @@
 export default saveAs;
-export function saveAs(blob: any, name: any): void;
+export function saveAs(blob: any, name: any): Promise<void>;