@uniweb/runtime 0.17.0 → 0.17.2

package/dist/ssr.js

@@ -2,6 +2,7 @@ import { isRichSchema, deriveCacheKey, resolveDefaultLocale, hasDarkScheme, crea
 import React from "react";
 import { renderToString } from "react-dom/server";
 import { sectionDomId } from "@uniweb/core/section-id";
+import { applyBasePath } from "@uniweb/core/base-path";
 import { routePatternToRegex, decodeRouteValue, splitPathCapture } from "@uniweb/core/route-match";
 import { DEFAULT_ICON_BASE, iconUrl } from "@uniweb/core/icon-corpus";
 import { buildTheme, FONT_LINKS_MARKER, buildSectionOverrides } from "@uniweb/theming";
@@ -249,6 +250,23 @@ function getComponentMeta(componentName) {
 function getComponentDefaults(componentName) {
   return globalThis.uniweb?.getComponentDefaults?.(componentName) || {};
 }
+function siteUrl(url) {
+  return applyBasePath(url, globalThis.uniweb?.activeWebsite?.basePath || "");
+}
+function withOpacity(color, opacity) {
+  if (typeof color !== "string" || !color) return color;
+  if (color.startsWith("#")) {
+    const r = parseInt(color.slice(1, 3), 16);
+    const g = parseInt(color.slice(3, 5), 16);
+    const b = parseInt(color.slice(5, 7), 16);
+    return `rgba(${r}, ${g}, ${b}, ${opacity})`;
+  }
+  if (color.startsWith("rgb")) {
+    const match = color.match(/rgba?\((\d+),\s*(\d+),\s*(\d+)/);
+    if (match) return `rgba(${match[1]}, ${match[2]}, ${match[3]}, ${opacity})`;
+  }
+  return color;
+}
 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>`;
@@ -395,28 +413,6 @@ function getWrapperProps(block) {
   }
   return { id: sectionDomId(block), style, className, background };
 }
-function withOpacity(color, opacity) {
-  if (color.startsWith("#")) {
-    const r = parseInt(color.slice(1, 3), 16);
-    const g = parseInt(color.slice(3, 5), 16);
-    const b = parseInt(color.slice(5, 7), 16);
-    return `rgba(${r}, ${g}, ${b}, ${opacity})`;
-  }
-  if (color.startsWith("rgb")) {
-    const match = color.match(/rgba?\((\d+),\s*(\d+),\s*(\d+)/);
-    if (match) {
-      return `rgba(${match[1]}, ${match[2]}, ${match[3]}, ${opacity})`;
-    }
-  }
-  return color;
-}
-function resolveUrl(url) {
-  if (!url || !url.startsWith("/")) return url;
-  const basePath = globalThis.uniweb?.activeWebsite?.basePath || "";
-  if (!basePath) return url;
-  if (url.startsWith(basePath + "/") || url === basePath) return url;
-  return basePath + url;
-}
 function renderBackground(background) {
   if (!background?.mode) return null;
   const containerStyle = {
@@ -473,7 +469,7 @@ function renderBackground(background) {
         style: {
           position: "absolute",
           inset: "0",
-          backgroundImage: `url(${resolveUrl(img.src)})`,
+          backgroundImage: `url(${siteUrl(img.src)})`,
           backgroundPosition: img.position || "center",
           backgroundSize: img.size || "cover",
           backgroundRepeat: "no-repeat"
@@ -983,7 +979,7 @@ function renameOperators(where) {
   }
   return out;
 }
-const MAX_PAGES = 50;
+const DEFAULT_MAX_PAGES = 20;
 async function flushAsked(url, queue, doFetch) {
   const pending = /* @__PURE__ */ new Map();
   const body = {};
@@ -1016,7 +1012,10 @@ async function flushAsked(url, queue, doFetch) {
     parsed = await response.json();
   } catch (error) {
     const message = error?.name === "AbortError" ? "aborted" : error?.message || String(error);
-    for (const entry of queue) entry.resolve({ data: null, error: message });
+    for (const entry of queue) {
+      const held = Array.isArray(entry.collected) && entry.collected.length ? entry.collected : null;
+      entry.resolve(held ? { data: held, error: message, meta: withMeta({ partial: true, pages: entry.page }) } : { data: null, error: message });
+    }
     return;
   }
   const data = parsed && typeof parsed.data === "object" && parsed.data ? parsed.data : {};
@@ -1026,10 +1025,11 @@ async function flushAsked(url, queue, doFetch) {
   const limits = parsed && typeof parsed.limits === "object" && parsed.limits ? parsed.limits : {};
   queue.forEach((entry, i) => {
     const key = keys[i];
+    const held = Array.isArray(entry.collected) && entry.collected.length ? entry.collected : null;
     if (key in errors) {
       const e = errors[key];
       const detail = typeof e === "string" ? e : e?.detail || e?.message || JSON.stringify(e);
-      const out = { data: null, error: detail };
+      const out = held ? { data: held, error: detail, meta: withMeta({ partial: true, pages: entry.page }) } : { data: null, error: detail };
       if (e && typeof e === "object" && typeof e.code === "string") out.code = e.code;
       entry.resolve(out);
       return;
@@ -1045,21 +1045,32 @@ async function flushAsked(url, queue, doFetch) {
     if (cursor && entry.request.exhaustive && Array.isArray(rows)) {
       const acc = entry.collected ? entry.collected.concat(rows) : rows.slice();
       const page = (entry.page || 1) + 1;
-      if (page <= MAX_PAGES) {
+      const cap = typeof entry.request.maxPages === "number" && entry.request.maxPages > 0 ? entry.request.maxPages : DEFAULT_MAX_PAGES;
+      if (page <= cap) {
         pending.set(entry, { cursor, collected: acc, page, depth, bound });
         return;
       }
-      entry.resolve({ data: acc, meta: withMeta({ depth, bound, truncated: true, pages: MAX_PAGES }) });
+      entry.resolve({ data: acc, meta: withMeta({ depth, bound, partial: true, pages: cap }) });
       return;
     }
     const collected = entry.collected ? entry.collected.concat(Array.isArray(rows) ? rows : []) : rows;
     const meta = withMeta({
       depth,
       bound,
-      // ⭐ A cursor IS the truncation signal, and it is the only one for a query
-      // that declared no `limit`: `limits` is reported only when an author's own
-      // limit was clamped (the records contract §5).
-      truncated: cursor ? true : void 0,
+      // ⭐ ONE FLAG, MEANING **NOT THE WHOLE POPULATION** — asked for by name, so
+      // a caller has one boolean to branch on rather than three signals to
+      // combine. It is set in every case that means it:
+      //   · a cursor came back and this caller does not page (a page render);
+      //   · a cursor came back and the caller's `maxPages` stopped the walk;
+      //   · the walk failed or aborted with pages already in hand;
+      //   · the service reported it BOUNDED the answer and offered no cursor.
+      // ⚠️ The last is why `limits` is read at all: a cursor is the signal for a
+      // query that declared no `limit`, and `limits` is the signal for one whose
+      // author limit was clamped (the records contract §5). Neither alone covers
+      // both. ⛔ Named `truncated` when it shipped in 0.17.0 this morning; renamed
+      // the same day, before any consumer adopted it, because "truncated" says
+      // something was cut and this also means "there is more you did not ask for".
+      partial: cursor || bound !== void 0 ? true : void 0,
       pages: entry.page && entry.page > 1 ? entry.page : void 0
     });
     entry.resolve(meta ? { data: collected, meta } : { data: collected });
@@ -1243,7 +1254,7 @@ async function prefetchAndHydrate({ website, content, route, locale = null, fetc
   hydrateDataStore(website, fetched);
   return fetched;
 }
-async function collectSiteRecords(content, { locale, fetch: fetch2, signal, only = null } = {}) {
+async function collectSiteRecords(content, { locale, fetch: fetch2, signal, only = null, depth = "brief", maxPages } = {}) {
   const config = content?.config;
   const services = config?.services ?? null;
   const queries = config?.queries ?? null;
@@ -1261,12 +1272,13 @@ async function collectSiteRecords(content, { locale, fetch: fetch2, signal, only
   const meta = {};
   await Promise.all([...configs].map(async ([name, cfg]) => {
     if (!cfg.ask) return;
-    const result = await fetcher.resolve({ ...cfg, depth: "brief", exhaustive: true }, { signal });
-    if (result?.error) {
-      errors[name] = result.error;
-      return;
-    }
-    records[name] = Array.isArray(result?.data) ? result.data : [];
+    const { limit, ...population } = cfg;
+    const asked = { ...population, depth, exhaustive: true };
+    if (typeof maxPages === "number" && maxPages > 0) asked.maxPages = maxPages;
+    const result = await fetcher.resolve(asked, { signal });
+    if (result?.error) errors[name] = result.error;
+    if (Array.isArray(result?.data)) records[name] = result.data;
+    else if (!result?.error) records[name] = [];
     if (result?.meta) meta[name] = result.meta;
   }));
   return { records, errors: Object.keys(errors).length ? errors : null, meta };