@uniweb/runtime 1.3.2 → 1.3.3

package/dist/ssr.js

@@ -5,17 +5,18 @@ import { sectionDomId } from "@uniweb/core/section-id";
 import { applyBasePath } from "@uniweb/core/base-path";
 import { isDynamicRoute, routePatternToRegex } from "@uniweb/core/route-match";
 import { findPageForRoute } from "@uniweb/core/route-match";
-import { DEFAULT_ICON_BASE, iconUrl } from "@uniweb/core/icon-corpus";
+import { DEFAULT_ICON_BASE, iconUrl, ICON_FAMILY_MAP } from "@uniweb/core/icon-corpus";
 import { buildTheme, FONT_LINKS_MARKER, buildSectionOverrides } from "@uniweb/theming";
 import "@uniweb/core/services";
 import "@uniweb/core/tracker";
 import { escapeHtml } from "@uniweb/core/page-shell";
 import { escapeHtml as escapeHtml2, foundationCssUrl, pageShell } from "@uniweb/core/page-shell";
+import { jsonForScript } from "@uniweb/core/data-script";
+import { dataScript, jsonForScript as jsonForScript2 } from "@uniweb/core/data-script";
 import DataStore, { deriveCacheKey as deriveCacheKey$1 } from "@uniweb/core/datastore";
 import { RESOLUTION_STATUS, carryQuery, localeOfPath, localeUrl, resolveRoute, routeIndex } from "@uniweb/core/resolve-route";
 import { resolveFetchConfigs } from "@uniweb/core/fetch-config";
 import { resolveRecordsService } from "@uniweb/core/records-service";
-import { dataScript, jsonForScript } from "@uniweb/core/data-script";
 function guaranteeItemStructure(item) {
   return {
     title: item.title || "",
@@ -800,6 +801,11 @@ ${themeData.links}
 ${options.sectionOverrideCSS}
 </style>`;
     result = result.replace("</head>", `${overrideStyle}
+</head>`);
+  }
+  if (options.icons?.size && !result.includes('id="__ICON_CACHE__"')) {
+    const iconScript = `<script id="__ICON_CACHE__" type="application/json">${jsonForScript(Object.fromEntries(options.icons))}<\/script>`;
+    result = result.replace("</head>", () => `  ${iconScript}
 </head>`);
   }
   result = result.replace(
@@ -1191,7 +1197,74 @@ function blocksOf(page) {
   for (const area of Object.values(page.getLayoutAreas?.() ?? {})) walk(area);
   return out;
 }
-async function loadPageData({ website, route, fetch: fetch2, dev = false, locale = null, prerender = "always", cache = null }) {
+const ICON_WAIT_MS = 1e3;
+const MAX_ICON_REQUESTS = 40;
+function parseIconReference(ref) {
+  if (typeof ref !== "string") return null;
+  const colon = ref.indexOf(":");
+  if (colon > 0) return { library: ref.slice(0, colon), name: ref.slice(colon + 1) };
+  const dash = ref.indexOf("-");
+  if (dash < 2 || dash > 3) return null;
+  const library = ref.slice(0, dash);
+  return ICON_FAMILY_MAP[library] ? { library, name: ref.slice(dash + 1) } : null;
+}
+function visit(node, found) {
+  if (!node || typeof node !== "object") return;
+  if (node.type === "image" && node.attrs?.role === "icon") found.push(node.attrs);
+  for (const mark of node.marks || []) {
+    const ref = parseIconReference(mark?.attrs?.icon);
+    if (ref) found.push(ref);
+  }
+  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);
+  const icons = /* @__PURE__ */ new Map();
+  for (const { library, name } of named) {
+    const family = ICON_FAMILY_MAP[String(library).toLowerCase()];
+    if (family && name) icons.set(`${library}:${name}`, { family, name });
+  }
+  return icons;
+}
+async function loadPageIcons({ blocks, 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 {
+    }
+  }));
+  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;
+  if (!cache) return draw();
+  const { get } = cache;
+  cache.get = (key) => {
+    const svg = get.call(cache, key);
+    if (svg) read.set(key, svg);
+    return svg;
+  };
+  try {
+    return draw();
+  } finally {
+    delete cache.get;
+  }
+}
+async function loadPageData({ website, route, fetch: fetch2, dev = false, locale = null, prerender = "always", cache = null, icons = true }) {
   if (prerender !== "author" && prerender !== "always") {
     throw new Error(`loadPageData: prerender must be 'author' or 'always', got ${JSON.stringify(prerender)}`);
   }
@@ -1203,6 +1276,7 @@ async function loadPageData({ website, route, fetch: fetch2, dev = false, locale
     );
   }
   website.makeCurrent();
+  const iconCache = globalThis.uniweb?.iconCache;
   const named = typeof route === "string" ? resolveRequestedPage(website, route) : route;
   const resolved = named ?? (typeof route === "string" ? website.getNotFoundPage() : null);
   if (!resolved) return [];
@@ -1241,11 +1315,13 @@ async function loadPageData({ website, route, fetch: fetch2, dev = false, locale
     }
   };
   const store = website.entityStore;
+  const blocks = blocksOf(page);
   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 }),
-    ...blocksOf(page).map((block) => store.fetch(block, getComponentMeta(block.type), { dispatcher: recording }))
+    ...blocks.map((block) => store.fetch(block, getComponentMeta(block.type), { dispatcher: recording })),
+    icons && iconCache && loadPageIcons({ blocks, website, fetch: fetch2, cache: iconCache })
   ]);
   return [...entries.values()];
 }
@@ -1268,16 +1344,18 @@ function createPageRenderer({ website, shell }) {
     const missing = !named || page?.notFound === true;
     restoreStartPage(website);
     if (typeof target === "string") website.setActivePage(target);
+    const icons = /* @__PURE__ */ new Map();
     let result;
     try {
-      result = renderPage(page, website);
+      result = whileReadingIcons(globalThis.uniweb, icons, () => renderPage(page, website));
     } catch (err) {
       return { outcome: missing ? "notFound" : "failed", html: null, page, error: classifyRenderError(err) };
     }
     if (result.error) return { outcome: missing ? "notFound" : "failed", html: null, page, error: result.error };
     const html = injectPageContent(shell, result.renderedContent, page, {
       ...inject,
-      sectionOverrideCSS: result.sectionOverrideCSS
+      sectionOverrideCSS: result.sectionOverrideCSS,
+      icons
     });
     return { outcome: missing ? "notFound" : "rendered", html, page, error: null };
   }
@@ -1344,7 +1422,7 @@ export {
   initPrerender,
   initPrerenderForLocale,
   injectPageContent,
-  jsonForScript,
+  jsonForScript2 as jsonForScript,
   loadPageData,
   localeOfPath,
   localeUrl,