@uniweb/runtime 0.17.1 → 0.18.0

package/dist/ssr.js

@@ -940,8 +940,8 @@ function createDefaultFetcher({ basePath = "", dev = false, fetch: fetchImpl = n
           data = getNestedValue(data, effectiveTransform);
         }
         data = applyOperators(data, request, { dev });
-        const depth = request.depth === "brief" || request.depth === "full" ? request.depth : void 0;
-        return depth ? { data: data ?? [], meta: { depth } } : { data: data ?? [] };
+        const whole = typeof request.whole === "boolean" ? request.whole : void 0;
+        return whole === void 0 ? { data: data ?? [] } : { data: data ?? [], meta: { whole } };
       } catch (error) {
         if (error?.name === "AbortError") {
           return { data: [], error: "aborted" };
@@ -965,7 +965,7 @@ function toQuestion(request) {
   const sort = sortToWire(request.sort);
   if (sort) q.sort = sort;
   if (typeof request.limit === "number" && request.limit > 0) q.limit = request.limit;
-  if (request.depth === "brief" || request.depth === "full") q.depth = request.depth;
+  if (request.whole === true) q.whole = true;
   if (typeof request.cursor === "string" && request.cursor) q.cursor = request.cursor;
   return q;
 }
@@ -979,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 = {};
@@ -1012,20 +1012,24 @@ 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 : {};
   const errors = parsed && typeof parsed.errors === "object" && parsed.errors ? parsed.errors : {};
-  const depths = parsed && typeof parsed.depths === "object" && parsed.depths ? parsed.depths : {};
+  const wholes = parsed && typeof parsed.whole === "object" && parsed.whole ? parsed.whole : {};
   const cursors = parsed && typeof parsed.cursors === "object" && parsed.cursors ? parsed.cursors : {};
   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;
@@ -1034,28 +1038,39 @@ async function flushAsked(url, queue, doFetch) {
       entry.resolve({ data: null, error: `the records service answered without the key "${key}"` });
       return;
     }
-    const depth = depths[key] === "brief" || depths[key] === "full" ? depths[key] : entry.request.depth === "brief" || entry.request.depth === "full" ? entry.request.depth : void 0;
+    const whole = typeof wholes[key] === "boolean" ? wholes[key] : typeof entry.request.whole === "boolean" ? entry.request.whole : void 0;
     const cursor = typeof cursors[key] === "string" && cursors[key] ? cursors[key] : null;
     const bound = typeof limits[key] === "number" ? limits[key] : void 0;
     const rows = Array.isArray(data[key]) ? data[key] : data[key];
     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) {
-        pending.set(entry, { cursor, collected: acc, page, depth, bound });
+      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, whole, bound });
         return;
       }
-      entry.resolve({ data: acc, meta: withMeta({ depth, bound, truncated: true, pages: MAX_PAGES }) });
+      entry.resolve({ data: acc, meta: withMeta({ whole, bound, partial: true, pages: cap }) });
       return;
     }
     const collected = entry.collected ? entry.collected.concat(Array.isArray(rows) ? rows : []) : rows;
     const meta = withMeta({
-      depth,
+      whole,
       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 });
@@ -1239,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, whole = false, maxPages } = {}) {
   const config = content?.config;
   const services = config?.services ?? null;
   const queries = config?.queries ?? null;
@@ -1257,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, whole, 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 };