@unicom-cloud/utils 0.1.30 → 0.1.32

package/snapdom/src/modules/fonts.js

@@ -1,8 +1,8 @@
-/* 2025-11-19 09:08:12 */
-import { cache as g } from "../core/cache.js";
-import { isIconFont as x } from "./iconFonts.js";
+/* 2025-11-27 12:11:03 */
+import { cache as w } from "../core/cache.js";
+import { isIconFont as k } from "./iconFonts.js";
 import { extractURL as X } from "../utils/helpers.js";
-import { snapFetch as A } from "./snapFetch.js";
+import { snapFetch as U } from "./snapFetch.js";
 async function lt(o, e, r, a = 32, n = "#000") {
   e = e.replace(/^['"]+|['"]+$/g, "");
   const c = window.devicePixelRatio || 1;
@@ -47,31 +47,31 @@ function T(o) {
   }
   return "";
 }
-function N(o) {
+function I(o) {
   const e = String(o ?? "400").trim().toLowerCase();
   if (e === "normal") return 400;
   if (e === "bold") return 700;
   const r = parseInt(e, 10);
   return Number.isFinite(r) ? Math.min(900, Math.max(100, r)) : 400;
 }
-function W(o) {
+function N(o) {
   const e = String(o ?? "normal").trim().toLowerCase();
   return e.startsWith("italic") ? "italic" : e.startsWith("oblique") ? "oblique" : "normal";
 }
-function Y(o) {
+function K(o) {
   const e = String(o ?? "100%").match(/(\d+(?:\.\d+)?)\s*%/);
   return e ? Math.max(50, Math.min(200, parseFloat(e[1]))) : 100;
 }
-function J(o) {
+function Y(o) {
   const e = String(o || "400").trim(), r = e.match(/^(\d{2,3})\s+(\d{2,3})$/);
   if (r) {
-    const n = N(r[1]), c = N(r[2]);
+    const n = I(r[1]), c = I(r[2]);
     return { min: Math.min(n, c), max: Math.max(n, c) };
   }
-  const a = N(e);
+  const a = I(e);
   return { min: a, max: a };
 }
-function K(o) {
+function J(o) {
   const e = String(o || "normal").trim().toLowerCase();
   return e === "italic" ? { kind: "italic" } : e.startsWith("oblique") ? { kind: "oblique" } : { kind: "normal" };
 }
@@ -129,7 +129,7 @@ function q(o, e) {
     return `url("${t}")`;
   });
 }
-const v = /@import\s+(?:url\(\s*(['"]?)([^)"']+)\1\s*\)|(['"])([^"']+)\3)([^;]*);/g, I = 4;
+const v = /@import\s+(?:url\(\s*(['"]?)([^)"']+)\1\s*\)|(['"])([^"']+)\3)([^;]*);/g, W = 4;
 async function et(o, e, r) {
   if (!o) return o;
   const a = /* @__PURE__ */ new Set();
@@ -141,22 +141,22 @@ async function et(o, e, r) {
     }
   }
   async function c(f, s, u = 0) {
-    if (u > I)
+    if (u > W)
       return console.warn(
-        `[snapDOM] @import depth exceeded (${I}) at ${s}`
+        `[snapDOM] @import depth exceeded (${W}) at ${s}`
       ), f;
     let m = "", d = 0, p;
     for (; p = v.exec(f); ) {
       m += f.slice(d, p.index), d = v.lastIndex;
-      const L = (p[2] || p[4] || "").trim(), C = n(L, s);
-      if (a.has(C)) {
-        console.warn(`[snapDOM] Skipping circular @import: ${C}`);
+      const b = (p[2] || p[4] || "").trim(), R = n(b, s);
+      if (a.has(R)) {
+        console.warn(`[snapDOM] Skipping circular @import: ${R}`);
         continue;
       }
-      a.add(C);
+      a.add(R);
       let i = "";
       try {
-        const l = await A(C, {
+        const l = await U(R, {
           as: "text",
           useProxy: r,
           silent: !0
@@ -164,8 +164,8 @@ async function et(o, e, r) {
         l.ok && typeof l.data == "string" && (i = l.data);
       } catch {
       }
-      i ? (i = q(i, C), i = await c(i, C, u + 1), m += `
-/* inlined: ${C} */
+      i ? (i = q(i, R), i = await c(i, R, u + 1), m += `
+/* inlined: ${R} */
 ${i}
 `) : m += p[0];
     }
@@ -229,17 +229,17 @@ async function z(o, e, r = "") {
         t = new URL(t, e || location.href).href;
       } catch {
       }
-    if (!x(t)) {
-      if (g.resource?.has(t)) {
-        g.font?.add(t), a = a.replace(n[0], `url(${g.resource.get(t)})`);
+    if (!k(t)) {
+      if (w.resource?.has(t)) {
+        w.font?.add(t), a = a.replace(n[0], `url(${w.resource.get(t)})`);
         continue;
       }
-      if (!g.font?.has(t))
+      if (!w.font?.has(t))
         try {
-          const f = await A(t, { as: "dataURL", useProxy: r, silent: !0 });
+          const f = await U(t, { as: "dataURL", useProxy: r, silent: !0 });
           if (f.ok && typeof f.data == "string") {
             const s = f.data;
-            g.resource?.set(t, s), g.font?.add(t), a = a.replace(n[0], `url(${s})`);
+            w.resource?.set(t, s), w.font?.add(t), a = a.replace(n[0], `url(${s})`);
           }
         } catch {
           console.warn("[snapDOM] Failed to fetch font resource:", t);
@@ -280,13 +280,13 @@ function rt(o) {
   if (!o) return o;
   const e = /@font-face[^{}]*\{[^}]*\}/gi, r = /* @__PURE__ */ new Set(), a = [];
   for (const c of o.match(e) || []) {
-    const t = c.match(/font-family:\s*([^;]+);/i)?.[1] || "", f = T(t), s = (c.match(/font-weight:\s*([^;]+);/i)?.[1] || "400").trim(), u = (c.match(/font-style:\s*([^;]+);/i)?.[1] || "normal").trim(), m = (c.match(/font-stretch:\s*([^;]+);/i)?.[1] || "100%").trim(), d = (c.match(/unicode-range:\s*([^;]+);/i)?.[1] || "").trim(), p = (c.match(/src\s*:\s*([^;}]+)[;}]/i)?.[1] || "").trim(), L = P(p, location.href), C = L.length ? L.map((l) => String(l).toLowerCase()).sort().join("|") : p.toLowerCase(), i = [
+    const t = c.match(/font-family:\s*([^;]+);/i)?.[1] || "", f = T(t), s = (c.match(/font-weight:\s*([^;]+);/i)?.[1] || "400").trim(), u = (c.match(/font-style:\s*([^;]+);/i)?.[1] || "normal").trim(), m = (c.match(/font-stretch:\s*([^;]+);/i)?.[1] || "100%").trim(), d = (c.match(/unicode-range:\s*([^;]+);/i)?.[1] || "").trim(), p = (c.match(/src\s*:\s*([^;}]+)[;}]/i)?.[1] || "").trim(), b = P(p, location.href), R = b.length ? b.map((l) => String(l).toLowerCase()).sort().join("|") : p.toLowerCase(), i = [
       String(f || "").toLowerCase(),
       s,
       u,
       m,
       d.toLowerCase(),
-      C
+      R
     ].join("|");
     r.has(i) || (r.add(i), a.push(c));
   }
@@ -321,9 +321,9 @@ async function H(o, e, r, a) {
   for (const t of n) {
     if (t.type === CSSRule.IMPORT_RULE && t.styleSheet) {
       const f = t.href ? c(t.href, e) : e;
-      if (a.depth >= I) {
+      if (a.depth >= W) {
         console.warn(
-          `[snapDOM] CSSOM import depth exceeded (${I}) at ${f}`
+          `[snapDOM] CSSOM import depth exceeded (${W}) at ${f}`
         );
         continue;
       }
@@ -343,23 +343,23 @@ async function H(o, e, r, a) {
     }
     if (t.type === CSSRule.FONT_FACE_RULE) {
       const f = (t.style.getPropertyValue("font-family") || "").trim(), s = T(f);
-      if (!s || x(s)) continue;
-      const u = (t.style.getPropertyValue("font-weight") || "400").trim(), m = (t.style.getPropertyValue("font-style") || "normal").trim(), d = (t.style.getPropertyValue("font-stretch") || "100%").trim(), p = (t.style.getPropertyValue("src") || "").trim(), L = (t.style.getPropertyValue("unicode-range") || "").trim();
+      if (!s || k(s)) continue;
+      const u = (t.style.getPropertyValue("font-weight") || "400").trim(), m = (t.style.getPropertyValue("font-style") || "normal").trim(), d = (t.style.getPropertyValue("font-stretch") || "100%").trim(), p = (t.style.getPropertyValue("src") || "").trim(), b = (t.style.getPropertyValue("unicode-range") || "").trim();
       if (!a.faceMatchesRequired(s, m, u, d))
         continue;
-      const C = B(L);
-      if (!V(a.usedCodepoints, C)) continue;
+      const R = B(b);
+      if (!V(a.usedCodepoints, R)) continue;
       const i = {
         family: s,
         weightSpec: u,
         styleSpec: m,
         stretchSpec: d,
-        unicodeRange: L,
+        unicodeRange: b,
         srcRaw: p,
         srcUrls: P(p, e || location.href),
         href: e || location.href
       };
-      if (a.simpleExcluder && a.simpleExcluder(i, C)) continue;
+      if (a.simpleExcluder && a.simpleExcluder(i, R)) continue;
       if (/url\(/i.test(p)) {
         const l = await z(
           p,
@@ -367,11 +367,11 @@ async function H(o, e, r, a) {
           a.useProxy
         );
         await r(
-          `@font-face{font-family:${s};src:${l};font-style:${m};font-weight:${u};font-stretch:${d};${L ? `unicode-range:${L};` : ""}}`
+          `@font-face{font-family:${s};src:${l};font-style:${m};font-weight:${u};font-stretch:${d};${b ? `unicode-range:${b};` : ""}}`
         );
       } else
         await r(
-          `@font-face{font-family:${s};src:${p};font-style:${m};font-weight:${u};font-stretch:${d};${L ? `unicode-range:${L};` : ""}}`
+          `@font-face{font-family:${s};src:${p};font-style:${m};font-weight:${u};font-stretch:${d};${b ? `unicode-range:${b};` : ""}}`
         );
     }
   }
@@ -386,42 +386,48 @@ async function ut({
   o instanceof Set || (o = /* @__PURE__ */ new Set()), e instanceof Set || (e = /* @__PURE__ */ new Set());
   const c = /* @__PURE__ */ new Map();
   for (const i of o) {
-    const [l, h, w, S] = String(i).split("__");
+    const [l, h, S, g] = String(i).split("__");
     if (!l) continue;
     const y = c.get(l) || [];
-    y.push({ w: parseInt(h, 10), s: w, st: parseInt(S, 10) }), c.set(l, y);
+    y.push({ w: parseInt(h, 10), s: S, st: parseInt(g, 10) }), c.set(l, y);
   }
-  function t(i, l, h, w) {
+  function t(i, l, h, S) {
     if (!c.has(i)) return !1;
-    const S = c.get(i), y = J(h), R = K(l), b = Q(w), F = y.min !== y.max, M = y.min, E = ($) => R.kind === "normal" && $ === "normal" || R.kind !== "normal" && ($ === "italic" || $ === "oblique");
-    let k = !1;
-    for (const $ of S) {
-      const _ = F ? $.w >= y.min && $.w <= y.max : $.w === M, O = E(W($.s)), U = $.st >= b.min && $.st <= b.max;
-      if (_ && O && U) {
-        k = !0;
+    const g = c.get(i), y = Y(h), C = J(l), L = Q(S), M = y.min !== y.max, F = y.min, A = ($) => C.kind === "normal" && $ === "normal" || C.kind !== "normal" && ($ === "italic" || $ === "oblique");
+    let O = !1;
+    for (const $ of g) {
+      const x = M ? $.w >= y.min && $.w <= y.max : $.w === F, _ = A(N($.s)), E = $.st >= L.min && $.st <= L.max;
+      if (x && _ && E) {
+        O = !0;
         break;
       }
     }
-    if (k) return !0;
-    if (!F)
-      for (const $ of S) {
-        const _ = E(W($.s)), O = $.st >= b.min && $.st <= b.max;
-        if (Math.abs(M - $.w) <= 300 && _ && O) return !0;
+    if (O) return !0;
+    if (!M)
+      for (const $ of g) {
+        const x = A(N($.s)), _ = $.st >= L.min && $.st <= L.max;
+        if (Math.abs(F - $.w) <= 300 && x && _) return !0;
+      }
+    if (!M && C.kind === "normal" && g.some((x) => N(x.s) !== "normal"))
+      for (const x of g) {
+        const _ = Math.abs(F - x.w) <= 300, E = x.st >= L.min && x.st <= L.max;
+        if (_ && E)
+          return !0;
       }
     return !1;
   }
   const f = D(r), s = st(o, r, a, n);
-  if (g.resource?.has(s))
-    return g.resource.get(s);
+  if (w.resource?.has(s))
+    return w.resource.get(s);
   const u = tt(o), m = [], d = v;
   for (const i of document.querySelectorAll("style")) {
     const l = i.textContent || "";
     for (const h of l.matchAll(d)) {
-      const w = (h[2] || h[4] || "").trim();
-      if (!w || x(w)) continue;
+      const S = (h[2] || h[4] || "").trim();
+      if (!S || k(S)) continue;
       !!document.querySelector(
-        `link[rel="stylesheet"][href="${w}"]`
-      ) || m.push(w);
+        `link[rel="stylesheet"][href="${S}"]`
+      ) || m.push(S);
     }
   }
   m.length && await Promise.all(
@@ -435,12 +441,12 @@ async function ut({
     )
   );
   let p = "";
-  const L = Array.from(
+  const b = Array.from(
     document.querySelectorAll('link[rel="stylesheet"]')
   ).filter((i) => !!i.href);
-  for (const i of L)
+  for (const i of b)
     try {
-      if (x(i.href)) continue;
+      if (k(i.href)) continue;
       let l = "", h = !1;
       try {
         h = new URL(i.href, location.href).origin === location.origin;
@@ -449,47 +455,47 @@ async function ut({
       if (!h && !Z(i.href, u))
         continue;
       if (h) {
-        const S = Array.from(document.styleSheets).find(
+        const g = Array.from(document.styleSheets).find(
           (y) => y.href === i.href
         );
-        if (S)
+        if (g)
           try {
-            const y = S.cssRules || [];
-            l = Array.from(y).map((R) => R.cssText).join("");
+            const y = g.cssRules || [];
+            l = Array.from(y).map((C) => C.cssText).join("");
           } catch {
           }
       }
-      if (!l && (l = (await A(i.href, { as: "text", useProxy: n })).data, x(i.href)))
+      if (!l && (l = (await U(i.href, { as: "text", useProxy: n })).data, k(i.href)))
         continue;
       l = await et(l, i.href, n);
-      let w = "";
-      for (const S of l.match(nt) || []) {
-        const y = (S.match(/font-family:\s*([^;]+);/i)?.[1] || "").trim(), R = T(y);
-        if (!R || x(R)) continue;
-        const b = (S.match(/font-weight:\s*([^;]+);/i)?.[1] || "400").trim(), F = (S.match(/font-style:\s*([^;]+);/i)?.[1] || "normal").trim(), M = (S.match(/font-stretch:\s*([^;]+);/i)?.[1] || "100%").trim(), E = (S.match(/unicode-range:\s*([^;]+);/i)?.[1] || "").trim(), k = (S.match(/src\s*:\s*([^;}]+)[;}]/i)?.[1] || "").trim(), $ = P(k, i.href);
-        if (!t(R, F, b, M))
+      let S = "";
+      for (const g of l.match(nt) || []) {
+        const y = (g.match(/font-family:\s*([^;]+);/i)?.[1] || "").trim(), C = T(y);
+        if (!C || k(C)) continue;
+        const L = (g.match(/font-weight:\s*([^;]+);/i)?.[1] || "400").trim(), M = (g.match(/font-style:\s*([^;]+);/i)?.[1] || "normal").trim(), F = (g.match(/font-stretch:\s*([^;]+);/i)?.[1] || "100%").trim(), A = (g.match(/unicode-range:\s*([^;]+);/i)?.[1] || "").trim(), O = (g.match(/src\s*:\s*([^;}]+)[;}]/i)?.[1] || "").trim(), $ = P(O, i.href);
+        if (!t(C, M, L, F))
           continue;
-        const _ = B(E);
-        if (!V(e, _)) continue;
-        const O = {
-          family: R,
-          weightSpec: b,
-          styleSpec: F,
-          stretchSpec: M,
-          unicodeRange: E,
-          srcRaw: k,
+        const x = B(A);
+        if (!V(e, x)) continue;
+        const _ = {
+          family: C,
+          weightSpec: L,
+          styleSpec: M,
+          stretchSpec: F,
+          unicodeRange: A,
+          srcRaw: O,
           srcUrls: $,
           href: i.href
         };
-        if (r && f(O, _)) continue;
-        const U = /url\(/i.test(k) ? await z(S, i.href, n) : S;
-        w += U;
+        if (r && f(_, x)) continue;
+        const E = /url\(/i.test(O) ? await z(g, i.href, n) : g;
+        S += E;
       }
-      w.trim() && (p += w);
+      S.trim() && (p += S);
     } catch {
       console.warn("[snapDOM] Failed to process stylesheet:", i.href);
     }
-  const C = {
+  const R = {
     requiredIndex: c,
     usedCodepoints: e,
     faceMatchesRequired: t,
@@ -499,16 +505,16 @@ async function ut({
     depth: 0
   };
   for (const i of document.styleSheets)
-    if (!(i.href && L.some((l) => l.href === i.href)))
+    if (!(i.href && b.some((l) => l.href === i.href)))
       try {
         const l = i.href || location.href;
-        l && C.visitedSheets.add(l), await H(
+        l && R.visitedSheets.add(l), await H(
           i,
           l,
           async (h) => {
             p += h;
           },
-          C
+          R
         );
       } catch {
       }
@@ -516,23 +522,23 @@ async function ut({
     for (const i of document.fonts || []) {
       if (!i || !i.family || i.status !== "loaded" || !i._snapdomSrc) continue;
       const l = String(i.family).replace(/^['"]+|['"]+$/g, "");
-      if (x(l) || !c.has(l) || r?.families && r.families.some(
-        (w) => String(w).toLowerCase() === l.toLowerCase()
+      if (k(l) || !c.has(l) || r?.families && r.families.some(
+        (S) => String(S).toLowerCase() === l.toLowerCase()
       ))
         continue;
       let h = i._snapdomSrc;
       if (!String(h).startsWith("data:")) {
-        if (g.resource?.has(i._snapdomSrc))
-          h = g.resource.get(i._snapdomSrc), g.font?.add(i._snapdomSrc);
-        else if (!g.font?.has(i._snapdomSrc))
+        if (w.resource?.has(i._snapdomSrc))
+          h = w.resource.get(i._snapdomSrc), w.font?.add(i._snapdomSrc);
+        else if (!w.font?.has(i._snapdomSrc))
           try {
-            const w = await A(i._snapdomSrc, {
+            const S = await U(i._snapdomSrc, {
               as: "dataURL",
               useProxy: n,
               silent: !0
             });
-            if (w.ok && typeof w.data == "string")
-              h = w.data, g.resource?.set(i._snapdomSrc, h), g.font?.add(i._snapdomSrc);
+            if (S.ok && typeof S.data == "string")
+              h = S.data, w.resource?.set(i._snapdomSrc, h), w.font?.add(i._snapdomSrc);
             else
               continue;
           } catch {
@@ -550,24 +556,24 @@ async function ut({
   for (const i of a) {
     if (!i || typeof i != "object") continue;
     const l = String(i.family || "").replace(/^['"]+|['"]+$/g, "");
-    if (!l || x(l) || !c.has(l) || r?.families && r.families.some(
-      (b) => String(b).toLowerCase() === l.toLowerCase()
+    if (!l || k(l) || !c.has(l) || r?.families && r.families.some(
+      (L) => String(L).toLowerCase() === l.toLowerCase()
     ))
       continue;
-    const h = i.weight != null ? String(i.weight) : "normal", w = i.style != null ? String(i.style) : "normal", S = i.stretchPct != null ? `${i.stretchPct}%` : "100%", y = String(i.src || "");
-    let R = y;
-    if (!R.startsWith("data:")) {
-      if (g.resource?.has(y))
-        R = g.resource.get(y), g.font?.add(y);
-      else if (!g.font?.has(y))
+    const h = i.weight != null ? String(i.weight) : "normal", S = i.style != null ? String(i.style) : "normal", g = i.stretchPct != null ? `${i.stretchPct}%` : "100%", y = String(i.src || "");
+    let C = y;
+    if (!C.startsWith("data:")) {
+      if (w.resource?.has(y))
+        C = w.resource.get(y), w.font?.add(y);
+      else if (!w.font?.has(y))
         try {
-          const b = await A(y, {
+          const L = await U(y, {
             as: "dataURL",
             useProxy: n,
             silent: !0
           });
-          if (b.ok && typeof b.data == "string")
-            R = b.data, g.resource?.set(y, R), g.font?.add(y);
+          if (L.ok && typeof L.data == "string")
+            C = L.data, w.resource?.set(y, C), w.font?.add(y);
           else
             continue;
         } catch {
@@ -575,9 +581,9 @@ async function ut({
           continue;
         }
     }
-    p += `@font-face{font-family:'${l}';src:url(${R});font-style:${w};font-weight:${h};font-stretch:${S};}`;
+    p += `@font-face{font-family:'${l}';src:url(${C});font-style:${S};font-weight:${h};font-stretch:${g};}`;
   }
-  return p && (p = rt(p), g.resource?.set(s, p)), p;
+  return p && (p = rt(p), w.resource?.set(s, p)), p;
 }
 function mt(o) {
   const e = /* @__PURE__ */ new Set();
@@ -585,7 +591,7 @@ function mt(o) {
   const r = document.createTreeWalker(o, NodeFilter.SHOW_ELEMENT, null), a = (t) => {
     const f = T(t.fontFamily);
     if (!f) return;
-    const s = (u, m, d) => `${f}__${N(u)}__${W(m)}__${Y(d)}`;
+    const s = (u, m, d) => `${f}__${I(u)}__${N(m)}__${K(d)}`;
     e.add(s(t.fontWeight, t.fontStyle, t.fontStretch));
   };
   a(getComputedStyle(o));