@unicom-cloud/utils 0.1.14 → 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.14","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,112 +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 B(a, { dpr: t = 1, scale: o = 1 }) {
-  const e = new Image();
-  return e.src = a, await e.decode(), 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 f(a, { dpr: t = 1, scale: o = 1 } = {}) {
-  const e = new Image();
-  e.src = a, e.crossOrigin = "anonymous", e.loading = "eager", e.decoding = "sync";
-  const c = R();
-  let n = !1;
-  if (c && (document.body.appendChild(e), n = !0), await e.decode(), c && await new Promise((w) => setTimeout(w, 100)), e.width === 0 || e.height === 0)
-    throw n && e.remove(), new Error("Image failed to load or has no dimensions");
-  const s = e.width * o, r = e.height * o, g = document.createElement("canvas");
+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(e, 0, 0, s, r), n && e.remove(), g;
+  return d.scale(t, t), d.drawImage(c, 0, 0, s, r), a && c.remove(), g;
 }
-async function b(a, { type: t = "svg", scale: o = 1, backgroundColor: e = "#fff", quality: c } = {}) {
-  const n = {
+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 r = decodeURIComponent(a.split(",")[1]);
+    const r = decodeURIComponent(e.split(",")[1]);
     return new Blob([r], { type: "image/svg+xml" });
   }
   const s = await u(
-    a,
-    { dpr: 1, scale: o },
-    e
+    e,
+    { dpr: 1, scale: n },
+    c
   );
   return new Promise((r) => {
-    s.toBlob((g) => r(g), `${n}`, c);
+    s.toBlob((g) => r(g), `${a}`, o);
   });
 }
-async function u(a, { dpr: t = 1, scale: o = 1 }, e) {
-  const c = await f(a, { dpr: t, scale: o });
-  if (!e) return c;
-  const n = document.createElement("canvas");
-  n.width = c.width, n.height = c.height;
-  const s = n.getContext("2d");
-  return s.fillStyle = e, s.fillRect(0, 0, n.width, n.height), s.drawImage(c, 0, 0), n;
+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 l(a, { dpr: t = 1, scale: o = 1, backgroundColor: e, quality: c }, n = "png") {
-  const s = ["jpg", "jpeg", "webp"].includes(n) ? "#fff" : void 0, g = await u(a, { dpr: t, scale: o }, e ?? s), d = new Image();
-  return d.src = g.toDataURL(`image/${n}`, c), await d.decode(), d.style.width = `${g.width / t}px`, d.style.height = `${g.height / t}px`, d;
+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 x(a, {
+async function B(e, {
   dpr: t = 1,
-  scale: o = 1,
-  backgroundColor: e,
-  format: c = "png",
-  filename: n = "snapDOM"
+  scale: n = 1,
+  backgroundColor: c,
+  format: o = "png",
+  filename: a = "snapDOM"
 } = {}) {
-  if (c === "svg") {
-    const y = await b(a), h = URL.createObjectURL(y), m = document.createElement("a");
-    m.href = h, m.download = `${n}.svg`, m.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 s = ["jpg", "jpeg", "webp"].includes(c) ? "#fff" : void 0, g = await u(a, { dpr: t, scale: o }, e ?? s), d = {
+  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"
-  }[c] || "image/png", w = g.toDataURL(d), p = document.createElement("a");
-  p.href = w, p.download = `${n}.${c}`, p.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, c = 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: () => B(o, { dpr: e, scale: c }),
-    toCanvas: () => f(o, { dpr: e, scale: c }),
-    toBlob: (n) => b(o, { scale: c, ...n }),
-    toPng: (n) => l(o, { dpr: e, scale: c, ...n }, "png"),
-    toJpg: (n) => l(o, { dpr: e, scale: c, ...n }, "jpeg"),
-    toWebp: (n) => l(o, { dpr: e, scale: c, ...n }, "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: n = "png",
-      filename: s = "capture",
-      backgroundColor: r
-    } = {}) => x(o, { dpr: e, scale: c, backgroundColor: r, format: n, filename: s })
+      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: c,
-    ...n
+    format: n = "png",
+    filename: c = "capture",
+    backgroundColor: o,
+    ...a
   } = t;
-  return await (await i.capture(a, n)).download({ format: o, filename: e, backgroundColor: c });
+  return await (await i.capture(e, a)).download({ format: n, filename: c, backgroundColor: o });
 };
 export {
   i as snapdom

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/pseudo.js

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

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>;