@uniweb/runtime 1.4.3 → 1.4.4

package/dist/ssr.js

@@ -1220,6 +1220,12 @@ function parseIconReference(ref) {
   const library = ref.slice(0, dash);
   return ICON_FAMILY_MAP[library] ? { library, name: ref.slice(dash + 1) } : null;
 }
+const ICON_NAME = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+function iconValue(value) {
+  if (value.length > 64) return null;
+  const ref = parseIconReference(value);
+  return ref && ICON_FAMILY_MAP[ref.library.toLowerCase()] && ICON_NAME.test(ref.name) ? ref : null;
+}
 function visit(node, found) {
   if (!node || typeof node !== "object") return;
   if (node.type === "image" && node.attrs?.role === "icon") found.push(node.attrs);
@@ -1229,9 +1235,18 @@ function visit(node, found) {
   }
   if (Array.isArray(node.content)) for (const child of node.content) visit(child, found);
 }
-function pageIcons(blocks) {
-  const named = [];
-  for (const block of blocks) visit(block.rawContent?.doc ?? block.rawContent, named);
+function visitValue(value, found, seen = /* @__PURE__ */ new WeakSet()) {
+  if (typeof value === "string") {
+    const ref = iconValue(value);
+    if (ref) found.push(ref);
+    return;
+  }
+  if (!value || typeof value !== "object" || seen.has(value)) return;
+  seen.add(value);
+  if (value.type === "image" && value.attrs?.role === "icon") found.push(value.attrs);
+  for (const child of Array.isArray(value) ? value : Object.values(value)) visitValue(child, found, seen);
+}
+function addressed(named) {
   const icons = /* @__PURE__ */ new Map();
   for (const { library, name } of named) {
     const family = ICON_FAMILY_MAP[String(library).toLowerCase()];
@@ -1239,27 +1254,51 @@ function pageIcons(blocks) {
   }
   return icons;
 }
-async function loadPageIcons({ blocks, website, fetch: fetch2, cache }) {
+function pageIcons(blocks) {
+  const named = [];
+  for (const block of blocks) visit(block.rawContent?.doc ?? block.rawContent, named);
+  for (const block of blocks) {
+    visitValue(block.properties, named);
+    visitValue(getComponentMeta(block.type)?.defaults, named);
+    visitValue(block.heldData, named);
+  }
+  return addressed(named);
+}
+function dataIcons(values) {
+  const named = [];
+  visitValue(values, named);
+  return addressed(named);
+}
+function iconRequests({ website, fetch: fetch2, cache }) {
   const config = website.config?.icons;
-  if (config?.cdn === false) return;
   const base = config?.base || DEFAULT_ICON_BASE;
-  const wanted = [...pageIcons(blocks)].filter(([key]) => !cache.has(key)).slice(0, MAX_ICON_REQUESTS);
-  if (wanted.length === 0) return;
-  const all = Promise.all(wanted.map(async ([key, { family, name }]) => {
-    try {
-      const response = await fetch2(iconUrl(family, name, base), { method: "GET" });
-      if (!response.ok) return;
-      const svg = await response.text();
-      if (/<svg[\s>]/i.test(svg)) cache.set(key, svg);
-    } catch {
+  const asked = /* @__PURE__ */ new Set();
+  return async function ask(icons) {
+    if (config?.cdn === false) return;
+    const wanted = [];
+    for (const [key, address] of icons) {
+      if (asked.size === MAX_ICON_REQUESTS) break;
+      if (cache.has(key) || asked.has(key)) continue;
+      asked.add(key);
+      wanted.push([key, address]);
     }
-  }));
-  let timer;
-  const waited = new Promise((resolve) => {
-    timer = setTimeout(resolve, ICON_WAIT_MS);
-  });
-  await Promise.race([all, waited]);
-  clearTimeout(timer);
+    if (wanted.length === 0) return;
+    const all = Promise.all(wanted.map(async ([key, { family, name }]) => {
+      try {
+        const response = await fetch2(iconUrl(family, name, base), { method: "GET" });
+        if (!response.ok) return;
+        const svg = await response.text();
+        if (/<svg[\s>]/i.test(svg)) cache.set(key, svg);
+      } catch {
+      }
+    }));
+    let timer;
+    const waited = new Promise((resolve) => {
+      timer = setTimeout(resolve, ICON_WAIT_MS);
+    });
+    await Promise.race([all, waited]);
+    clearTimeout(timer);
+  };
 }
 function whileReadingIcons(uniweb, read, draw) {
   const cache = uniweb?.iconCache;
@@ -1328,13 +1367,15 @@ async function loadPageData({ website, route, fetch: fetch2, dev = false, locale
   };
   const store = website.entityStore;
   const blocks = blocksOf(page);
+  const askIcons = icons && iconCache ? iconRequests({ website, fetch: fetch2, cache: iconCache }) : null;
   await Promise.all([
     // The page's own record: asked whether or not a section declares the route key, because the
     // page names itself from it and a URL naming no record is a 404.
     store.fetchPageRecord(page, { dispatcher: recording }),
     ...blocks.map((block) => store.fetch(block, getComponentMeta(block.type), { dispatcher: recording })),
-    icons && iconCache && loadPageIcons({ blocks, website, fetch: fetch2, cache: iconCache })
+    askIcons?.(pageIcons(blocks))
   ]);
+  if (askIcons) await askIcons(dataIcons([...entries.values()].map((entry) => entry.data)));
   return [...entries.values()];
 }
 function createPageRenderer({ website, shell }) {