@uniweb/runtime 1.5.5 → 1.5.7

package/dist/ssr.js

@@ -16,7 +16,7 @@ import { dataScript, jsonForScript as jsonForScript2 } from "@uniweb/core/data-s
 import DataStore, { deriveCacheKey as deriveCacheKey$1 } from "@uniweb/core/datastore";
 import { RESOLUTION_STATUS, carryQuery, localeOfPath, localeUrl, resolveRoute, routeIndex } from "@uniweb/core/resolve-route";
 import { declaredKeys } from "@uniweb/core/data-keys";
-import { blockRouteQuery, blockFillsOf, fillIsPageRecord } from "@uniweb/core/page-data";
+import { heldPageRecord, blockRouteQuery, blockFillsOf, fillIsPageRecord } from "@uniweb/core/page-data";
 import { resolveFetchConfigs } from "@uniweb/core/fetch-config";
 import { resolveRecordsService } from "@uniweb/core/records-service";
 function guaranteeItemStructure(item) {
@@ -1427,21 +1427,40 @@ async function loadPageData({ website, route, fetch: fetch2, dev = false, locale
     askIcons?.(pageIcons(blocks))
   ]);
   if (askIcons) await askIcons(dataIcons([...entries.values()].map((entry) => entry.data)));
-  return [...entries.values()];
+  return [...entries].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([, entry]) => entry);
 }
 function sectionRecords(page) {
-  const out = [];
-  for (const block of page?.getBodyBlocks?.() ?? []) visit(block, sectionDomId(block), out);
-  return out;
+  const sections = [];
+  const shown = [];
+  for (const block of page?.getBodyBlocks?.() ?? []) visit(block, sectionDomId(block), sections, shown);
+  return { sections, record: pageRecordOf(page, shown) };
 }
-function visit(block, id, out) {
+function visit(block, id, sections, shown) {
   if (!block) return;
-  const data = recordsOf(block);
-  if (data) out.push({ id, data });
-  for (const inset of block.insets || []) visit(inset, id, out);
-  for (const child of block.childBlocks || []) visit(child, sectionDomId(child), out);
+  const data = recordsOf(block, shown);
+  if (data) sections.push({ id, data });
+  for (const inset of block.insets || []) visit(inset, id, sections, shown);
+  for (const child of block.childBlocks || []) visit(child, sectionDomId(child), sections, shown);
+}
+function pageRecordOf(page, shown) {
+  if (!page?.dynamicContext) return void 0;
+  const one = (value) => Array.isArray(value) ? value[0] ?? null : value;
+  const whole = shown.find((s) => s.whole && one(s.value));
+  if (whole) return one(whole.value);
+  const website = page.website;
+  const fetcher = website?.fetcher;
+  const own = heldPageRecord(page, {
+    website,
+    peek: (request) => fetcher?.peek?.(request, { website, page, block: null }),
+    peekRecord: (id2) => fetcher?.peekRecord?.(id2)
+  });
+  const seen = shown.map((s) => one(s.value)).find(Boolean) ?? null;
+  const id = (own ?? seen)?.$uuid;
+  const held = typeof id === "string" && id ? fetcher?.peekRecord?.(id) : null;
+  if (held?.whole === true && held.record) return held.record;
+  return seen ?? own;
 }
-function recordsOf(block) {
+function recordsOf(block, shown) {
   if (!globalThis.uniweb?.getComponent?.(block.type)) return null;
   const meta = getComponentMeta(block.type);
   const own = declaredKeys(meta?.data);
@@ -1466,8 +1485,13 @@ function recordsOf(block) {
         route = blockRouteQuery(block);
         fills = blockFillsOf(block, meta, route);
       }
-      const cfg = fills.get(key)?.cfg;
-      if (!cfg?.as || fillIsPageRecord(block, cfg, route)) continue;
+      const fill = fills.get(key);
+      const cfg = fill?.cfg;
+      if (!cfg?.as) continue;
+      if (fillIsPageRecord(block, cfg, route)) {
+        shown.push({ value, whole: fill.whole === true });
+        continue;
+      }
       name = cfg.as;
     }
     if (Object.hasOwn(out, name) && !sameValue(out[name], value)) name = key;
@@ -1519,7 +1543,11 @@ function createPageRenderer({ website, shell }) {
       icons
     });
     const rendered = { outcome: missing ? "notFound" : "rendered", html, page, error: null };
-    if (sectionData) rendered.sections = sectionRecords(page);
+    if (sectionData) {
+      const shown = sectionRecords(page);
+      rendered.sections = shown.sections;
+      if (shown.record !== void 0) rendered.record = shown.record;
+    }
     return rendered;
   }
   return { website, render, failingSection: (page, message) => failingSectionOf(page, message) };