@uniweb/runtime 1.2.1 → 1.2.3

package/dist/ssr.js

@@ -697,10 +697,12 @@ async function prefetchIcons(siteContent, uniweb, onProgress = () => {
       const url = iconUrl(family, name, cdnBase);
       const response = await fetch(url);
       if (!response.ok) throw new Error(`HTTP ${response.status}`);
-      const svg = await response.text();
-      uniweb.iconCache.set(`${family}:${name}`, svg);
+      return [`${family}:${name}`, await response.text()];
     })
   );
+  for (const result of results) {
+    if (result.status === "fulfilled") uniweb.iconCache.set(...result.value);
+  }
   const succeeded = results.filter((r) => r.status === "fulfilled").length;
   const failedRefs = icons.filter((_, i) => results[i].status === "rejected");
   if (failedRefs.length > 0) {
@@ -1188,6 +1190,7 @@ async function loadPageData({ website, route, fetch: fetch2, dev = false, locale
       `loadPageData: this Website renders ${JSON.stringify(active)} and the caller asked for ${JSON.stringify(locale)}. A Website is locale-sliced — build one per locale (\`initPrerenderForLocale\`) rather than asking this step for another language.`
     );
   }
+  website.makeCurrent();
   const resolved = typeof route === "string" ? resolvePage(website, route) : route;
   if (!resolved) return [];
   const page = typeof resolved.getRenderableSelf === "function" ? resolved.getRenderableSelf() : resolved;
@@ -1203,15 +1206,19 @@ async function loadPageData({ website, route, fetch: fetch2, dev = false, locale
     const key = deriveCacheKey$1(request);
     if (!entries.has(key)) entries.set(key, entry);
   };
+  const answered = new DataStore();
   const recording = {
     peek: (request, ctx) => dispatcher.peek(request, ctx),
-    peekRecord: (id) => dispatcher.peekRecord(id),
+    peekRecord: (id) => answered.getRecord(id),
     dispatch: async (request, ctx) => {
       if (prerender === "author" && request?.prerender === false) {
         record(request, { config: request, outcome: "skipped", data: null });
         return { data: null };
       }
       const result = await dispatcher.dispatch(request, ctx);
+      if (!result?.error && result?.data != null) {
+        answered.set(deriveCacheKey$1(request), result.meta ? { data: result.data, meta: result.meta } : { data: result.data });
+      }
       record(request, result?.error ? { config: request, outcome: "failed", data: null, error: result.error } : { config: request, outcome: "fetched", data: result?.data ?? null, ...result?.meta ? { meta: result.meta } : {} });
       return result;
     }
@@ -1228,7 +1235,15 @@ async function loadPageData({ website, route, fetch: fetch2, dev = false, locale
 function createPageRenderer({ website, shell }) {
   if (!website) throw new Error("createPageRenderer: `website` is required");
   if (typeof shell !== "string") throw new Error("createPageRenderer: `shell` must be an HTML string");
-  function render(target, { inject = {} } = {}) {
+  function render(target, { inject = {}, fetchedData } = {}) {
+    if (fetchedData !== void 0 && !Array.isArray(fetchedData)) {
+      throw new Error("createPageRenderer: `fetchedData` must be the array of entries the page carries");
+    }
+    website.makeCurrent();
+    if (fetchedData !== void 0) {
+      website.forgetData();
+      hydrateDataStore(website, fetchedData);
+    }
     const resolved = typeof target === "string" ? resolvePage(website, target) : target;
     if (!resolved) return { outcome: "notFound", html: null, page: null, error: null };
     const page = typeof resolved.getRenderableSelf === "function" ? resolved.getRenderableSelf() : resolved;