@uniweb/runtime 0.9.4 → 0.9.6

package/dist/worker-runtime.js

@@ -16362,6 +16362,8 @@ var __P2 = __toESM(require_jsx_runtime(), 1);
 var src_exports = {};
 __export(src_exports, {
   Block: () => Block,
+  DATA_DIR: () => DATA_DIR,
+  DATA_URL_PREFIX: () => DATA_URL_PREFIX,
   DataStore: () => DataStore,
   EntityStore: () => EntityStore,
   FetcherDispatcher: () => FetcherDispatcher,
@@ -16370,16 +16372,21 @@ __export(src_exports, {
   Theme: () => Theme,
   Uniweb: () => Uniweb,
   Website: () => Website,
+  collectionDataUrl: () => collectionDataUrl,
+  collectionNameFromUrl: () => collectionNameFromUrl,
   createUniweb: () => createUniweb,
   deriveCacheKey: () => deriveCacheKey,
   evaluateWhere: () => evaluate,
   getUniweb: () => getUniweb,
   hasDarkScheme: () => hasDarkScheme,
+  isDataUrl: () => isDataUrl,
   isRichSchema: () => isRichSchema,
   isWildcardLanguages: () => isWildcardLanguages,
   listRequestStyleNames: () => listStyleNames,
   matchWhere: () => match,
   normalizeLanguageList: () => normalizeLanguageList,
+  normalizeSchema: () => normalizeSchema,
+  recordDataUrl: () => recordDataUrl,
   resolveDefaultLocale: () => resolveDefaultLocale,
   resolvePublishableLocales: () => resolvePublishableLocales,
   resolveRequestStyle: () => resolveStyle,
@@ -22732,6 +22739,13 @@ function createSequenceElement(node, options = {}) {
         children: processSequence({ content })
       };
     }
+    case "concept_block": {
+      return {
+        type: "concept_block",
+        tag: attrs?.tag,
+        children: processSequence({ content }, options)
+      };
+    }
     case "dataBlock":
       return {
         type: "dataBlock",
@@ -22773,6 +22787,12 @@ function createSequenceElement(node, options = {}) {
         attrs: parseImgBlock(attrs)
       };
     case "image":
+      if (attrs?.role === "video") {
+        return {
+          type: "video",
+          attrs: parseMarkdownVideo(attrs)
+        };
+      }
       return {
         type: "image",
         attrs: parseImgBlock(attrs || {})
@@ -22798,10 +22818,32 @@ function createSequenceElement(node, options = {}) {
         attrs
       };
     }
+    case "table": {
+      const rows = (content || []).filter((row) => row.type === "tableRow").map((row) => ({
+        cells: (row.content || []).filter((cell) => cell.type === "tableCell").map((cell) => ({
+          children: processSequence({ content: cell.content }, options),
+          header: cell.attrs?.header === true,
+          align: cell.attrs?.align || null,
+          colspan: cell.attrs?.colspan || 1,
+          rowspan: cell.attrs?.rowspan || 1
+        }))
+      }));
+      return { type: "table", rows, attrs };
+    }
+    // `divider` is what content-reader emits; `horizontalRule` and
+    // `DividerBlock` are the editor's spellings. All three are one element.
+    //
+    // The reader's own name was NOT listed here until 2026-07-30 — markdown
+    // dividers reached consumers only by falling through `default:`, which
+    // happens to produce `{ type: 'divider', content: '' }` and happens to
+    // match what everything downstream keys on. It worked by coincidence,
+    // and the coincidence would have broken the moment `default:` changed.
+    case "divider":
     case "DividerBlock":
     case "horizontalRule":
       return {
-        type: "divider"
+        type: "divider",
+        attrs
       };
     // Custom TipTap elements
     case "card-group":
@@ -22814,6 +22856,11 @@ function createSequenceElement(node, options = {}) {
         type: "document-group",
         documents: node.content?.filter((c) => c.type === "document").map((doc) => parseDocumentBlock(doc.attrs)) || []
       };
+    // The editor renamed this node to `StructuredContent` (2026-07-31,
+    // editor-internal). Both are accepted: the new name is what the editor
+    // emits now, and the old one still arrives from documents authored
+    // before the rename, which the framework never rewrites.
+    case "StructuredContent":
     case "FormBlock":
       let formData = attrs?.data;
       if (typeof formData === "string") {
@@ -22983,6 +23030,12 @@ function processInlineElements(content) {
         type: "icon",
         attrs: parseUniwebIcon(item.attrs)
       });
+    } else if (item.type === "image" || item.type === "ImageBlock") {
+      const isVideo = item.attrs?.role === "video";
+      items.push({
+        type: isVideo ? "video" : "image",
+        attrs: isVideo ? parseMarkdownVideo(item.attrs) : parseImgBlock(item.attrs || {})
+      });
     } else if (item.type === "math-inline" || item.type === "math_inline") {
       items.push(item);
     } else if (item.type === "inset_placeholder") {
@@ -23057,10 +23110,10 @@ function parseDocumentBlock(itemAttrs) {
   return ele;
 }
 function parseUniwebIcon(itemAttrs) {
-  const { svg, url, size, color, preserveColors, href, target, library, name } = itemAttrs || {};
+  const { svg, url, src, size, color, preserveColors, href, target, library, name } = itemAttrs || {};
   const icon = {};
   if (svg) icon.svg = svg;
-  if (url) icon.url = url;
+  if (url || src) icon.url = url || src;
   if (size) icon.size = size;
   if (color) icon.color = color;
   if (preserveColors) icon.preserveColors = preserveColors;
@@ -23078,8 +23131,11 @@ function parseUniwebIcon(itemAttrs) {
   return icon;
 }
 function parseIconBlock(itemAttrs) {
-  let { svg } = itemAttrs;
-  return svg;
+  const { svg, theme } = itemAttrs || {};
+  const icon = {};
+  if (svg) icon.svg = svg;
+  if (theme) icon.theme = theme;
+  return icon;
 }
 function parseImgBlock(itemAttrs) {
   let {
@@ -23096,9 +23152,30 @@ function parseImgBlock(itemAttrs) {
     theme,
     role,
     credit = "",
-    id
+    id,
     // {#fig-id} cross-reference label — preserved so Press
     // adapters can emit \label{id} (LaTeX) / <id> (Typst).
+    // ── Markdown-authored attributes ────────────────────────────────
+    // This function was written for the EDITOR's `ImageBlock` node and
+    // later reused for the markdown `image` node (see `case "image"`), so
+    // its vocabulary is the editor's: contentType, direction, filter,
+    // theme, credit. Everything markdown declares and the editor does not
+    // was therefore tokenized, declared, and then dropped one layer before
+    // delivery — the published "Image Attributes" table
+    // (docs/reference/content-structure.md) reached no component, and
+    // neither did the `role=pdf` set added 2026-07-29 for the editor's
+    // `document` fold-in. Carried 2026-07-30.
+    width,
+    height,
+    loading,
+    fit,
+    position,
+    preview,
+    // role=pdf — the preview image
+    author,
+    // role=pdf — resource metadata, rendered beside the preview
+    description
+    // role=pdf — describes the RESOURCE, not the image (≠ alt)
   } = itemAttrs;
   let { contentType, viewType, contentId, identifier } = imgInfo || {};
   const sizes = {
@@ -23123,14 +23200,64 @@ function parseImgBlock(itemAttrs) {
     direction,
     filter,
     imgPos: direction === "left" || direction === "right" ? direction : "",
+    // NOTE: `size` here is the direction-derived LAYOUT size
+    // (basic/lg/full), not the author's `{size=…}` — that attribute is
+    // icon-only and is read by parseUniwebIcon. Do not wire `{size=…}`
+    // through here; the two meanings collide on one key.
     size: sizes[direction] || "basic",
     href,
     target,
     theme,
     role,
     credit,
-    id: id || void 0
+    id: id || void 0,
+    // Omitted when absent, so an existing consumer sees no new empty keys.
+    ...width !== void 0 && width !== null && { width },
+    ...height !== void 0 && height !== null && { height },
+    ...loading && { loading },
+    ...fit && { fit },
+    ...position && { position },
+    ...preview && { preview },
+    ...author && { author },
+    ...description && { description }
+  };
+}
+function parseMarkdownVideo(itemAttrs) {
+  const {
+    src,
+    url,
+    info,
+    poster,
+    alt = "",
+    caption = "",
+    autoplay,
+    muted,
+    loop,
+    controls,
+    href = "",
+    target = "",
+    role,
+    id
+    // {#fig-id} cross-reference label, same as parseImgBlock
+  } = itemAttrs || {};
+  const video = {
+    // `identifier` (a CDN-resolvable asset id) wins when present, matching
+    // parseImgBlock — an editor-deployed asset with a stale src must not
+    // shadow the CDN copy.
+    src: makeAssetUrl({ src: url || src, ...info }),
+    alt,
+    caption: stripTags(caption),
+    role,
+    href,
+    target
   };
+  if (poster) video.poster = poster;
+  if (autoplay !== void 0) video.autoplay = autoplay;
+  if (muted !== void 0) video.muted = muted;
+  if (loop !== void 0) video.loop = loop;
+  if (controls !== void 0) video.controls = controls;
+  if (id) video.id = id;
+  return video;
 }
 function parseVideoBlock(itemAttrs) {
   let {
@@ -23295,6 +23422,7 @@ function flattenGroup(group) {
     headings: group.body.headings || []
   };
   if (group.body.math && group.body.math.length) flat.math = group.body.math;
+  if (group.body.tables && group.body.tables.length) flat.tables = group.body.tables;
   return flat;
 }
 function processGroups(sequence, options = {}) {
@@ -23317,11 +23445,11 @@ function processGroups(sequence, options = {}) {
       items: []
     };
   }
-  const groups = splitBySlices(sequence);
+  const groups = splitBySlices(sequence, options);
   const processedGroups = groups.map((group) => processGroupContent(group));
   let mainGroup = null;
   let itemGroups = [];
-  const shouldBeMain = identifyMainContent(processedGroups);
+  const shouldBeMain = options.alwaysItems ? false : identifyMainContent(processedGroups);
   if (shouldBeMain) {
     mainGroup = processedGroups[0];
     itemGroups = processedGroups.slice(1);
@@ -23349,7 +23477,7 @@ function processGroups(sequence, options = {}) {
     items: flatItems
   };
 }
-function splitBySlices(sequence) {
+function splitBySlices(sequence, options = {}) {
   const groups = [];
   let currentGroup = [];
   for (let i = 0; i < sequence.length; i++) {
@@ -23367,7 +23495,7 @@ function splitBySlices(sequence) {
         groups.push(currentGroup);
         currentGroup = [];
       }
-      const headingBlock = readHeadingGroup(sequence, i);
+      const headingBlock = readHeadingGroup(sequence, i, options);
       currentGroup.push(...headingBlock);
       i += headingBlock.length - 1;
     } else {
@@ -23385,7 +23513,7 @@ function isPreTitle(sequence, i) {
 function isBannerImage(sequence, i) {
   return i === 0 && i + 1 < sequence.length && sequence[i].type === "image" && (sequence[i].role === "banner" || sequence[i + 1].type === "heading");
 }
-function readHeadingGroup(sequence, startIdx) {
+function readHeadingGroup(sequence, startIdx, options = {}) {
   const elements = [sequence[startIdx]];
   let hasGoneDeeper = false;
   for (let i = startIdx + 1; i < sequence.length; i++) {
@@ -23403,7 +23531,7 @@ function readHeadingGroup(sequence, startIdx) {
       elements.push(element);
       continue;
     }
-    if (element.level === previousElement.level && !hasGoneDeeper) {
+    if (element.level === previousElement.level && !hasGoneDeeper && !options.alwaysItems) {
       elements.push(element);
       continue;
     }
@@ -23522,6 +23650,14 @@ function processGroupContent(elements) {
           const quoteContent = processGroupContent(element.children);
           body.quotes.push(quoteContent.body);
           break;
+        case "concept_block": {
+          const children = element.children || [];
+          body.data[element.tag] = {
+            items: processGroups(children, { alwaysItems: true }).items,
+            sequence: children
+          };
+          break;
+        }
         case "dataBlock":
           body.data[element.tag] = element.data;
           break;
@@ -23538,6 +23674,12 @@ function processGroupContent(elements) {
             mathml: element.mathml || ""
           });
           break;
+        case "table":
+          (body.tables ||= []).push({
+            rows: element.rows || [],
+            attrs: element.attrs || {}
+          });
+          break;
         case "inset":
           body.insets.push({ refId: element.refId });
           break;
@@ -23596,6 +23738,8 @@ function processInlineElements2(children, body) {
       } else {
         body.images.push(item.attrs);
       }
+    } else if (item.type === "video") {
+      body.videos.push(item.attrs);
     } else if (item.type === "link") {
       body.links.push(item.attrs);
     }
@@ -24228,6 +24372,7 @@ function isGoogleFontsUrl(url) {
     return false;
   }
 }
+var FONT_LINKS_MARKER = "<!--uniweb-fonts-->";
 function generateFontCSS(fontRoles = {}, fonts = {}, base = "/") {
   const cssLines = [];
   const linkTags = [];
@@ -26324,6 +26469,23 @@ function substitutePlaceholders(value, context, options = {}) {
   return value;
 }
 
+// ../core/src/data-paths.js
+var DATA_DIR = "data";
+var DATA_URL_PREFIX = `/${DATA_DIR}/`;
+function collectionDataUrl(name) {
+  return `${DATA_URL_PREFIX}${name}.json`;
+}
+function recordDataUrl(collection, slug) {
+  return `${DATA_URL_PREFIX}${collection}/${slug}.json`;
+}
+function collectionNameFromUrl(path) {
+  if (typeof path !== "string") return "";
+  return path.replace(new RegExp(`^/?${DATA_DIR}/`), "").replace(/\.json$/i, "");
+}
+function isDataUrl(path) {
+  return typeof path === "string" && path.startsWith(DATA_URL_PREFIX);
+}
+
 // ../core/src/fetch-config.js
 function isFetchRefinement(cfg) {
   return cfg?.refine === true || cfg?.inherit === true;
@@ -26331,7 +26493,7 @@ function isFetchRefinement(cfg) {
 function localizeConfig(cfg, locale, defaultLocale) {
   if (!cfg.path) return cfg;
   if (!locale || locale === defaultLocale) return cfg;
-  if (!cfg.path.startsWith("/data/")) return cfg;
+  if (!isDataUrl(cfg.path)) return cfg;
   return { ...cfg, path: `/${locale}${cfg.path}` };
 }
 function applyDeferredDetail(cfg, collections) {
@@ -26342,7 +26504,7 @@ function applyDeferredDetail(cfg, collections) {
   if (!collConfig || typeof collConfig !== "object") return cfg;
   const deferred = Array.isArray(collConfig.deferred) ? collConfig.deferred : null;
   if (!deferred || deferred.length === 0) return cfg;
-  const pattern = typeof collConfig.detailUrl === "string" ? collConfig.detailUrl : `/data/${schema4}/{slug}.json`;
+  const pattern = typeof collConfig.detailUrl === "string" ? collConfig.detailUrl : recordDataUrl(schema4, "{slug}");
   return { ...cfg, detail: pattern };
 }
 function resolveFetchConfigs(sources, options = {}) {
@@ -27097,6 +27259,32 @@ function validateLanguageConfig(config = {}) {
   return { errors, warnings };
 }
 
+// ../core/src/route-match.js
+var PARAM_NAME = "[A-Za-z0-9_-]+";
+var REGEX_SPECIALS = /[.*+?^${}()|[\]\\]/g;
+function normalizeRoute(route) {
+  if (typeof route !== "string" || route === "") return "/";
+  return route === "/" ? "/" : route.replace(/\/+$/, "") || "/";
+}
+function routePatternToRegex(pattern) {
+  const paramNames = [];
+  const source = normalizeRoute(pattern).replace(REGEX_SPECIALS, "\\$&").replace(new RegExp(`:(${PARAM_NAME})`, "g"), (_, name) => {
+    paramNames.push(name);
+    return "([^/]+)";
+  });
+  return { regex: new RegExp(`^${source}$`), paramNames };
+}
+function matchDynamicRoute(pattern, path) {
+  const { regex, paramNames } = routePatternToRegex(pattern);
+  const match2 = normalizeRoute(path).match(regex);
+  if (!match2) return null;
+  const params = {};
+  paramNames.forEach((name, i) => {
+    params[name] = decodeURIComponent(match2[i + 1]);
+  });
+  return { params };
+}
+
 // ../core/src/website.js
 var Website = class {
   constructor({
@@ -27457,19 +27645,7 @@ var Website = class {
    * @returns {Object|null} Match result with params, or null if no match
    */
   _matchDynamicRoute(pattern, path) {
-    const paramNames = [];
-    const regexStr = pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/:(\w+)/g, (_, paramName) => {
-      paramNames.push(paramName);
-      return "([^/]+)";
-    });
-    const regex = new RegExp(`^${regexStr}$`);
-    const match2 = path.match(regex);
-    if (!match2) return null;
-    const params = {};
-    paramNames.forEach((name, i) => {
-      params[name] = decodeURIComponent(match2[i + 1]);
-    });
-    return { params };
+    return matchDynamicRoute(pattern, path);
   }
   /**
    * Create a dynamic page instance with concrete route and params
@@ -28598,26 +28774,6 @@ var Uniweb = class {
 // ../core/src/theme.js
 var SHADE_LEVELS4 = [50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 950];
 var VALID_CONTEXTS = ["light", "medium", "dark"];
-var DEFAULT_CONTEXT_TOKENS2 = {
-  light: {
-    bg: "var(--neutral-50)",
-    text: "var(--neutral-950)",
-    heading: "var(--neutral-900)",
-    link: "var(--primary-600)"
-  },
-  medium: {
-    bg: "var(--neutral-100)",
-    text: "var(--neutral-950)",
-    heading: "var(--neutral-900)",
-    link: "var(--primary-600)"
-  },
-  dark: {
-    bg: "var(--neutral-900)",
-    text: "var(--neutral-50)",
-    heading: "white",
-    link: "var(--primary-400)"
-  }
-};
 var Theme = class {
   /**
    * Create a Theme instance
@@ -28721,36 +28877,42 @@ var Theme = class {
   // ============================================================
   // Context Access
   // ============================================================
-  /**
-   * Get a semantic token value for a context
+  /*
+   * REMOVED 2026-07-28: getContextToken(context, token) and
+   * getContextTokens(context), plus the DEFAULT_CONTEXT_TOKENS table backing
+   * them. Read this before reintroducing either.
    *
-   * @param {string} context - Context name ('light', 'medium', 'dark')
-   * @param {string} token - Token name (e.g., 'bg', 'text', 'link')
-   * @returns {string|null} Token value or null
+   * They were unreachable-by-design rather than merely stale. A lookup keyed on
+   * (context, token) answers "what does the .context-<name> class set by
+   * default?", but the question callers ask is "what colour is --heading HERE",
+   * and those diverge for two reasons no such lookup can see:
    *
-   * @example
-   * theme.getContextToken('light', 'bg') // → "var(--neutral-50)"
-   * theme.getContextToken('dark', 'text') // → "var(--neutral-50)"
-   */
-  getContextToken(context, token) {
-    const customContext = this._contexts[context];
-    if (customContext && customContext[token]) {
-      return customContext[token];
-    }
-    const defaults = DEFAULT_CONTEXT_TOKENS2[context];
-    return defaults?.[token] || null;
-  }
-  /**
-   * Get all tokens for a context
+   *   - a section's own `theme:` overrides, emitted as `#section-{id} { … }` by
+   *     @uniweb/theming's buildSectionOverrides;
+   *   - the active site scheme, where `.scheme-dark` redefines the root tokens.
    *
-   * @param {string} context - Context name
-   * @returns {Object} Token name → value mapping
+   * So a correct-looking answer would still be wrong whenever a section
+   * overrides tokens or the visitor is in dark mode — the failure being a
+   * confident wrong value, not an error. (The table had also drifted: it held
+   * `bg`/`text`, retired in favour of `section`/`body`, and four tokens where
+   * the live set is ~25. Repopulating it would have made a misleading API look
+   * trustworthy, which is worse than leaving it visibly incomplete.)
+   *
+   * What to use instead:
+   *   - an actually-resolved value (canvas, SVG, a chart matching the theme):
+   *     getComputedStyle(el).getPropertyValue('--heading') — this accounts for
+   *     both section overrides and the active scheme, which no static table can;
+   *   - the defaults table itself (tooling, a theme editor):
+   *     getDefaultContextTokens() from @uniweb/theming, which owns it;
+   *   - ordinary component styling: the CSS variables directly. Reading tokens
+   *     into JS to branch on them is the `isDark ? … : …` pattern semantic
+   *     tokens exist to remove.
+   *
+   * SHADE_LEVELS below is duplicated from @uniweb/theming too, and was left
+   * deliberately: both copies are identical and the 11-step scale is fixed by
+   * the design, so there is no drift to prevent — noted so the next reader
+   * knows it was considered rather than missed.
    */
-  getContextTokens(context) {
-    const defaults = DEFAULT_CONTEXT_TOKENS2[context] || {};
-    const custom = this._contexts[context] || {};
-    return { ...defaults, ...custom };
-  }
   /**
    * Get the CSS class name for a context
    *
@@ -29075,6 +29237,25 @@ function isRichSchema(schema4) {
   if (schema4.childSchema && typeof schema4.childSchema === "object") return true;
   return false;
 }
+function normalizeSchema(schema4) {
+  if (!schema4 || typeof schema4 !== "object" || Array.isArray(schema4))
+    return null;
+  if (Array.isArray(schema4.fields)) return schema4;
+  if (schema4.isComposite === true || schema4.childSchema) return schema4;
+  if (schema4.sections !== void 0) return null;
+  const mapToFields = (map2) => Object.entries(map2).map(
+    ([id, spec]) => typeof spec === "string" ? { id, type: spec } : { id, ...spec }
+  );
+  if (schema4.fields && typeof schema4.fields === "object") {
+    const { fields, ...rest } = schema4;
+    return { ...rest, fields: mapToFields(fields) };
+  }
+  const entries = Object.entries(schema4);
+  if (!entries.length) return null;
+  const isFieldSpec = ([, v]) => v && typeof v === "object" && !Array.isArray(v) && v.type !== void 0;
+  if (!entries.every(isFieldSpec)) return null;
+  return { fields: mapToFields(schema4) };
+}
 
 // ../core/src/request-styles/json-body.js
 var jsonBody = {
@@ -29417,7 +29598,14 @@ function getUniweb() {
   return globalThis.uniweb;
 }
 function createUniweb(content, foundation = null, extensions = [], { defaultFetcher = null, transport = null, dev = false } = {}) {
-  const instance = new Uniweb({ content, foundation, extensions, defaultFetcher, transport, dev });
+  const instance = new Uniweb({
+    content,
+    foundation,
+    extensions,
+    defaultFetcher,
+    transport,
+    dev
+  });
   globalThis.uniweb = instance;
   return instance;
 }
@@ -29672,6 +29860,20 @@ function getComponentMeta(componentName) {
 function getComponentDefaults(componentName) {
   return globalThis.uniweb?.getComponentDefaults?.(componentName) || {};
 }
+var PARAM_NAME2 = "[A-Za-z0-9_-]+";
+var REGEX_SPECIALS2 = /[.*+?^${}()|[\]\\]/g;
+function normalizeRoute2(route) {
+  if (typeof route !== "string" || route === "") return "/";
+  return route === "/" ? "/" : route.replace(/\/+$/, "") || "/";
+}
+function routePatternToRegex2(pattern) {
+  const paramNames = [];
+  const source = normalizeRoute2(pattern).replace(REGEX_SPECIALS2, "\\$&").replace(new RegExp(`:(${PARAM_NAME2})`, "g"), (_, name) => {
+    paramNames.push(name);
+    return "([^/]+)";
+  });
+  return { regex: new RegExp(`^${source}$`), paramNames };
+}
 function default404Html(basePath = "") {
   const homeHref = basePath ? `${basePath}/` : "/";
   return `<div class="page-not-found" style="min-height:80vh;display:flex;flex-direction:column;align-items:center;justify-content:center;padding:2rem;text-align:center"><h1 style="font-size:3rem;font-weight:bold;color:#1f2937;margin-bottom:1rem">404</h1><p style="color:#64748b;margin-bottom:2rem">Page not found</p><a href="${homeHref}" style="color:#3b82f6;text-decoration:underline">Go to homepage</a></div>`;
@@ -29735,6 +29937,23 @@ function resolveLayoutTransitions(areaNames, explicit) {
   for (const name of areaNames) transitions[name] = toIdent(name);
   return explicit ? { ...transitions, ...explicit } : transitions;
 }
+function resolveLayoutLayers(areaNames, explicit) {
+  if (explicit === false) return {};
+  const defaults = {};
+  for (const name of areaNames) defaults[name] = 1;
+  return explicit ? { ...defaults, ...explicit } : defaults;
+}
+function areaWrapperStyle(region, transitions, layers) {
+  const style = {};
+  const name = transitions?.[region];
+  if (name) style.viewTransitionName = name;
+  const layer = layers?.[region];
+  if (layer != null) {
+    style.position = "relative";
+    style.zIndex = layer;
+  }
+  return Object.keys(style).length > 0 ? style : null;
+}
 function applyBootScheme(respectSystem, fallback) {
   var stored = null;
   try {
@@ -29988,15 +30207,17 @@ function renderLayout(page, website) {
   const layoutMeta = website.getLayoutMeta(layoutName);
   const bodyBlocks = page.getBodyBlocks();
   const areas = page.getLayoutAreas();
-  const transitions = website.viewTransitions ? resolveLayoutTransitions(Object.keys(areas), layoutMeta?.transitions) : null;
-  const wrapTransition = (name, element) => {
-    const vtName = transitions?.[name];
-    return vtName ? import_react.default.createElement("div", { style: { viewTransitionName: vtName } }, element) : element;
+  const areaNames = Object.keys(areas);
+  const transitions = website.viewTransitions ? resolveLayoutTransitions(areaNames, layoutMeta?.transitions) : null;
+  const layers = resolveLayoutLayers(areaNames, layoutMeta?.layers);
+  const wrapArea = (name, element) => {
+    const style = areaWrapperStyle(name, transitions, layers);
+    return style ? import_react.default.createElement("div", { style }, element) : element;
   };
-  const bodyElement = bodyBlocks ? wrapTransition("body", renderBlocks(bodyBlocks)) : null;
+  const bodyElement = bodyBlocks ? wrapArea("body", renderBlocks(bodyBlocks)) : null;
   const areaElements = {};
   for (const [name, blocks] of Object.entries(areas)) {
-    areaElements[name] = wrapTransition(name, renderBlocks(blocks));
+    areaElements[name] = wrapArea(name, renderBlocks(blocks));
   }
   if (RemoteLayout) {
     const params = { ...layoutMeta?.defaults || {}, ...page.getLayoutParams() || {} };
@@ -30011,9 +30232,9 @@ function renderLayout(page, website) {
   return import_react.default.createElement(
     import_react.default.Fragment,
     null,
-    areaElements.header && import_react.default.createElement("header", { style: { position: "relative", zIndex: 40 } }, areaElements.header),
+    areaElements.header && import_react.default.createElement("header", null, areaElements.header),
     bodyElement && import_react.default.createElement("main", null, bodyElement),
-    areaElements.footer && import_react.default.createElement("footer", { style: { position: "relative", zIndex: 30 } }, areaElements.footer)
+    areaElements.footer && import_react.default.createElement("footer", null, areaElements.footer)
   );
 }
 function initPrerenderForLocale(content, foundation, locale, extensionsOrOptions, maybeOptions) {
@@ -30092,6 +30313,9 @@ async function prefetchIcons(siteContent, uniweb, onProgress = () => {
     siteContent._iconCache = Object.fromEntries(uniweb.iconCache);
   }
 }
+function resolvePage(website, route) {
+  return website.getPage(route);
+}
 function classifyRenderError(err) {
   const msg = err.message || "";
   if (msg.includes("Invalid hook call") || msg.includes("useState") || msg.includes("useEffect")) {
@@ -30113,6 +30337,14 @@ function classifyRenderError(err) {
 }
 function renderPage(page, website) {
   website.setActivePage(page.route);
+  if (page.hasContent?.() && page.getBodyBlocks().length === 0) {
+    return {
+      error: {
+        type: "content-not-loaded",
+        message: `page "${page.route}" declares content but has no loaded sections \u2014 its sections are not in the payload and this renderer does not fetch them`
+      }
+    };
+  }
   const element = renderLayout(page, website);
   let renderedContent;
   try {
@@ -30137,13 +30369,22 @@ function injectPageContent(html, renderedContent, page, options = {}) {
 </head>`);
     }
   }
-  const themeCss = page?.website?.themeData?.css;
+  const themeData = page?.website?.themeData;
+  const themeCss = themeData?.css;
   if (themeCss && !result.includes('id="uniweb-theme"')) {
     result = result.replace(
       "</head>",
       `  <style id="uniweb-theme">
 ${themeCss}
     </style>
+</head>`
+    );
+  }
+  if (themeData?.links && !result.includes(FONT_LINKS_MARKER)) {
+    result = result.replace(
+      "</head>",
+      `  ${FONT_LINKS_MARKER}
+${themeData.links}
 </head>`
     );
   }
@@ -30198,10 +30439,7 @@ ${options.sectionOverrideCSS}
 }
 function generate404Html({ baseHtml, website, siteContent }) {
   const dynamicTemplates = siteContent.pages?.filter((p) => p.isDynamic) || [];
-  const routePatterns = dynamicTemplates.map((p) => {
-    const escaped = p.route.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/:[^/]+/g, "[^\\/]+");
-    return `^${escaped}\\/?$`;
-  });
+  const routePatterns = dynamicTemplates.map((p) => routePatternToRegex2(p.route).regex.source);
   let html = baseHtml;
   const notFoundPage = website.getNotFoundPage();
   if (notFoundPage) {
@@ -30220,7 +30458,7 @@ function generate404Html({ baseHtml, website, siteContent }) {
   }
   if (routePatterns.length > 0) {
     const patternList = routePatterns.map((p) => `/${p}/`).join(",");
-    const dynamicScript = `<script>(function(){var p=[${patternList}],r=window.location.pathname;if(p.some(function(x){return x.test(r)})){var el=document.getElementById('root');if(el)el.innerHTML='';}})()<\/script>`;
+    const dynamicScript = `<script>(function(){var p=[${patternList}],r=window.location.pathname.replace(/\\/+$/,'')||'/';if(p.some(function(x){return x.test(r)})){var el=document.getElementById('root');if(el)el.innerHTML='';}})()<\/script>`;
     html = html.replace("</body>", `${dynamicScript}
 </body>`);
   }
@@ -30254,6 +30492,7 @@ export {
   renderBlocks,
   renderLayout,
   renderPage,
+  resolvePage,
   sliceContentForLocale
 };
 /*! Bundled license information: