@uniweb/runtime 1.5.4 → 1.5.6

package/dist/ssr.js

@@ -15,6 +15,8 @@ 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 { declaredKeys } from "@uniweb/core/data-keys";
+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) {
@@ -99,7 +101,16 @@ function applyDefaults(params, defaults) {
   };
 }
 function assembleData(block, meta, entityData) {
-  const declared = block.website?.declaredKeys ? block.website.declaredKeys(meta) : [];
+  const declared = declaredOf(block, meta);
+  const data = collectDeclared(block, declared, entityData);
+  warnUndeclaredBlocks(block, Object.keys(block.heldData || {}).filter((key) => !Object.hasOwn(data, key)));
+  block.parsedContent.data = data;
+  return declared;
+}
+function declaredOf(block, meta) {
+  return block.website?.declaredKeys ? block.website.declaredKeys(meta) : [];
+}
+function collectDeclared(block, declared, entityData) {
   const held = block.heldData || {};
   const data = {};
   for (const [key] of declared) {
@@ -107,19 +118,25 @@ function assembleData(block, meta, entityData) {
     else if (entityData && entityData[key] !== void 0) data[key] = entityData[key];
     else data[key] = null;
   }
-  warnUndeclaredBlocks(block, Object.keys(held).filter((key) => !Object.hasOwn(data, key)));
-  block.parsedContent.data = data;
-  return declared;
+  return data;
+}
+function receivedData(block, meta, entityData = null) {
+  const declared = declaredOf(block, meta);
+  const probe = { parsedContent: { data: collectDeclared(block, declared, entityData) }, fetch: block.fetch, website: block.website };
+  block.website?.entityStore?.linkOwnRecords?.(probe);
+  return { declared, data: oneRecordEach(probe.parsedContent.data, declared) };
 }
 function holdOneRecord(block, declared) {
-  const data = block.parsedContent.data;
+  block.parsedContent.data = oneRecordEach(block.parsedContent.data, declared);
+}
+function oneRecordEach(data, declared) {
   let out = null;
   for (const [key, , , single] of declared) {
     if (single !== true || !Array.isArray(data?.[key])) continue;
     out = out || { ...data };
     out[key] = data[key][0] ?? null;
   }
-  if (out) block.parsedContent.data = out;
+  return out || data;
 }
 const warnedBlocks = /* @__PURE__ */ new Set();
 function warnUndeclaredBlocks(block, leftOut) {
@@ -1260,14 +1277,14 @@ function iconValue(value) {
   const ref = parseIconReference(value);
   return ref && ICON_FAMILY_MAP[ref.library.toLowerCase()] && ICON_NAME.test(ref.name) ? ref : null;
 }
-function visit(node, found) {
+function visit$1(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);
+  if (Array.isArray(node.content)) for (const child of node.content) visit$1(child, found);
 }
 function visitValue(value, found, seen = /* @__PURE__ */ new WeakSet()) {
   if (typeof value === "string") {
@@ -1290,7 +1307,7 @@ function addressed(named) {
 }
 function pageIcons(blocks) {
   const named = [];
-  for (const block of blocks) visit(block.rawContent?.doc ?? block.rawContent, named);
+  for (const block of blocks) visit$1(block.rawContent?.doc ?? block.rawContent, named);
   for (const block of blocks) {
     visitValue(block.properties, named);
     visitValue(getComponentMeta(block.type)?.defaults, named);
@@ -1412,10 +1429,93 @@ async function loadPageData({ website, route, fetch: fetch2, dev = false, locale
   if (askIcons) await askIcons(dataIcons([...entries.values()].map((entry) => entry.data)));
   return [...entries.values()];
 }
+function sectionRecords(page) {
+  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, sections, shown) {
+  if (!block) return;
+  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, shown) {
+  if (!globalThis.uniweb?.getComponent?.(block.type)) return null;
+  const meta = getComponentMeta(block.type);
+  const own = declaredKeys(meta?.data);
+  if (own.length === 0) return null;
+  const resolved = block.website?.entityStore?.resolve(block, meta);
+  const { data } = receivedData(block, meta, resolved?.status === "ready" ? resolved.data : null);
+  const held = block.heldData || {};
+  let fills = null;
+  let route = null;
+  let tagged = null;
+  const out = {};
+  for (const [key] of own) {
+    const value = data[key];
+    if (value === void 0 || value === null) continue;
+    let name;
+    if (held[key] !== void 0) {
+      tagged ??= taggedKeys(block);
+      if (tagged.has(key)) continue;
+      name = key;
+    } else {
+      if (!fills) {
+        route = blockRouteQuery(block);
+        fills = blockFillsOf(block, meta, route);
+      }
+      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;
+    if (Object.hasOwn(out, name) && !sameValue(out[name], value)) continue;
+    out[name] = value;
+  }
+  return Object.keys(out).length ? out : null;
+}
+function taggedKeys(block) {
+  const parsed = typeof block.parseContent === "function" && block.rawContent ? block.parseContent(block.rawContent) : null;
+  return new Set(Object.keys(parsed?.data || {}));
+}
+function sameValue(a, b) {
+  if (a === b) return true;
+  try {
+    return JSON.stringify(a) === JSON.stringify(b);
+  } catch {
+    return false;
+  }
+}
 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 = {}, fetchedData } = {}) {
+  function render(target, { inject = {}, fetchedData, sectionData = false } = {}) {
     if (fetchedData !== void 0 && !Array.isArray(fetchedData)) {
       throw new Error("createPageRenderer: `fetchedData` must be the array of entries the page carries");
     }
@@ -1442,7 +1542,13 @@ function createPageRenderer({ website, shell }) {
       sectionOverrideCSS: result.sectionOverrideCSS,
       icons
     });
-    return { outcome: missing ? "notFound" : "rendered", html, page, error: null };
+    const rendered = { outcome: missing ? "notFound" : "rendered", html, page, error: null };
+    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) };
 }