@uniweb/runtime 0.22.0 → 0.24.0

package/dist/ssr.js

@@ -9,10 +9,11 @@ import { DEFAULT_ICON_BASE, iconUrl } from "@uniweb/core/icon-corpus";
 import { buildTheme, FONT_LINKS_MARKER, buildSectionOverrides } from "@uniweb/theming";
 import "@uniweb/core/services";
 import "@uniweb/core/tracker";
-import { routeQuery, sectionFetches, resolveFetchConfigs } from "@uniweb/core/fetch-config";
+import { pageRouteQuery, siteReaches, resolveFetchConfigs, currentOf, othersView, routeSelection } from "@uniweb/core/fetch-config";
 import { deriveCacheKey as deriveCacheKey$1 } from "@uniweb/core/datastore";
 import { buildDetailConfig } from "@uniweb/core/detail-url";
 import { resolveDefaultLocale as resolveDefaultLocale$1 } from "@uniweb/core/locale-config";
+import { findLayoutEntry } from "@uniweb/core/layout-name";
 import { resolveRecordsService } from "@uniweb/core/records-service";
 function guaranteeItemStructure(item) {
   return {
@@ -911,30 +912,14 @@ function createDefaultFetcher({ basePath = "", dev = false, fetch: fetchImpl = n
       try {
         const response = await readOnce(target, init);
         if (ctx.signal?.aborted) return { data: [], error: "aborted" };
-        const envelope = request.envelope && typeof request.envelope === "object" ? request.envelope : {};
         if (!response.ok) {
-          let extracted;
-          if (envelope.error && typeof response.text === "string") {
-            const body = safeParseJSON(response.text);
-            if (body !== void 0) {
-              const candidate = getNestedValue(body, envelope.error);
-              if (typeof candidate === "string" && candidate.length) {
-                extracted = candidate;
-              }
-            }
-          }
-          return {
-            data: [],
-            error: extracted ?? `HTTP ${response.status}: ${response.statusText}`
-          };
+          return { data: [], error: `HTTP ${response.status}: ${response.statusText}` };
         }
         let data = response.body;
-        const isDetailRequest = !!request.dynamicContext;
-        const effectiveTransform = transform || (isDetailRequest ? envelope.item : envelope.list);
-        if (effectiveTransform && data !== null && data !== void 0) {
-          data = getNestedValue(data, effectiveTransform);
+        if (transform && data !== null && data !== void 0) {
+          data = getNestedValue(data, transform);
         }
-        data = applyOperators(data, request, { dev });
+        data = applyOperators(data, request, { dev, locale: sortLocale(request, ctx) });
         const whole = typeof request.whole === "boolean" ? request.whole : void 0;
         return whole === void 0 ? { data: data ?? [] } : { data: data ?? [], meta: { whole } };
       } catch (error) {
@@ -951,7 +936,7 @@ function toQuestion(request) {
   const where = request.where && typeof request.where === "object" ? request.where : null;
   const scope = typeof request.scope === "string" && request.scope ? request.scope : null;
   if (scope) q.scope = scope;
-  if (where) q.where = renameOperators(where);
+  if (where) q.where = where;
   if (request.match && typeof request.match === "object") q.match = request.match;
   const sort = sortToWire(request.sort);
   if (sort) q.sort = sort;
@@ -960,16 +945,6 @@ function toQuestion(request) {
   if (typeof request.cursor === "string" && request.cursor) q.cursor = request.cursor;
   return q;
 }
-const OPERATOR_ALIAS = { nin: "not_in" };
-function renameOperators(where) {
-  if (Array.isArray(where)) return where.map(renameOperators);
-  if (!where || typeof where !== "object") return where;
-  const out = {};
-  for (const [key, value] of Object.entries(where)) {
-    out[OPERATOR_ALIAS[key] ?? key] = value && typeof value === "object" ? renameOperators(value) : value;
-  }
-  return out;
-}
 const DEFAULT_MAX_PAGES = 20;
 async function flushAsked(url, queue, doFetch) {
   const pending = /* @__PURE__ */ new Map();
@@ -1010,58 +985,47 @@ async function flushAsked(url, queue, doFetch) {
     return;
   }
   const data = parsed && typeof parsed.data === "object" && parsed.data ? parsed.data : {};
-  const errors = parsed && typeof parsed.errors === "object" && parsed.errors ? parsed.errors : {};
   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 : {};
+  const degraded = parsed && typeof parsed.partial === "object" && parsed.partial ? parsed.partial : {};
   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 = 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;
-    }
     if (!(key in data)) {
-      entry.resolve({ data: null, error: `the records service answered without the key "${key}"` });
+      const error = `the records service answered without the key "${key}"`;
+      entry.resolve(held ? { data: held, error, meta: withMeta({ partial: true, pages: entry.page }) } : { data: null, error });
       return;
     }
     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;
       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 });
+        pending.set(entry, { cursor, collected: acc, page, whole });
         return;
       }
-      entry.resolve({ data: acc, meta: withMeta({ whole, bound, partial: true, pages: cap }) });
+      entry.resolve({ data: acc, meta: withMeta({ whole, partial: true, pages: cap }) });
       return;
     }
     const collected = entry.collected ? entry.collected.concat(Array.isArray(rows) ? rows : []) : rows;
     const meta = withMeta({
       whole,
-      bound,
       // ⭐ 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
+      // a caller has one boolean to branch on rather than several 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,
+      //   · a source of the key did not answer (`partial[key]`), and `unavailable`
+      //     carries the service's own account of which one.
+      // ⛔ Named `truncated` when it shipped in 0.17.0; 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 || key in degraded ? true : void 0,
+      unavailable: key in degraded ? degraded[key] : void 0,
       pages: entry.page && entry.page > 1 ? entry.page : void 0
     });
     entry.resolve(meta ? { data: collected, meta } : { data: collected });
@@ -1101,19 +1065,25 @@ function withMeta(fields) {
   for (const [k, v] of Object.entries(fields)) if (v !== void 0) out[k] = v;
   return Object.keys(out).length ? out : void 0;
 }
-function applyOperators(data, request, { dev = false } = {}) {
+function sortLocale(request, ctx) {
+  if (typeof request?.locale === "string" && request.locale) return request.locale;
+  if (typeof ctx?.locale === "string" && ctx.locale) return ctx.locale;
+  const active = ctx?.website?.getActiveLocale?.();
+  return typeof active === "string" && active ? active : null;
+}
+function applyOperators(data, request, { dev = false, locale = null } = {}) {
   if (!Array.isArray(data)) return data;
   let result = data;
   if (typeof request.scope === "string" && request.scope) result = applyScope(result, request.scope);
   if (request.where) result = matchWhere(request.where, result);
-  if (request.sort) result = applySort(result, request.sort, dev);
+  if (request.sort) result = applySort(result, request.sort, dev, locale);
   if (typeof request.limit === "number" && request.limit > 0) result = result.slice(0, request.limit);
   return result;
 }
 const warnedBadSorts = /* @__PURE__ */ new Set();
-function applySort(items, sortExpr, dev) {
+function applySort(items, sortExpr, dev, locale) {
   try {
-    return sortRecords(items, sortExpr);
+    return sortRecords(items, sortExpr, { locale });
   } catch (err) {
     if (dev) throw err;
     const key = String(sortExpr);
@@ -1140,12 +1110,27 @@ function safeParseJSON(text) {
     return void 0;
   }
 }
-const isRefinement = (f) => f && typeof f === "object" && f.refine === true;
 function parentPageOf(page, pages) {
   const byRoute = new Map(pages.filter((p) => p?.route).map((p) => [p.route, p]));
   const route = parentRouteOf(page.route, { declared: page.parent ?? null, has: (r) => byRoute.has(r) });
   return route ? byRoute.get(route) : null;
 }
+function layoutSectionsFor(content, page) {
+  const sets = content?.layouts && typeof content.layouts === "object" ? content.layouts : {};
+  const name = typeof page?.layout?.name === "string" && page.layout.name ? page.layout.name : null;
+  const named = name ? findLayoutEntry(sets, name) : void 0;
+  const chosen = name ? named ? [named] : [] : Object.values(sets);
+  const out = [];
+  const walk = (sections) => {
+    for (const s of sections || []) {
+      if (!s || typeof s !== "object") continue;
+      out.push(s);
+      walk(s.subsections);
+    }
+  };
+  for (const set of chosen) for (const area of Object.values(set || {})) walk(area?.sections);
+  return out;
+}
 function resolvePageFetchConfigs(content, route, { locale = null } = {}) {
   const { page, params } = findPageForRoute(content, route);
   if (!page) return [];
@@ -1160,7 +1145,15 @@ function resolvePageFetchConfigs(content, route, { locale = null } = {}) {
     variables: binding?.variables ?? null
   };
   const siteFetch = content?.config?.fetch ?? null;
-  const routeKey = binding ? routeQuery({ page: page.fetch, parent: parent?.fetch, site: siteFetch, sections: sectionFetches(page.sections) })?.key ?? null : null;
+  const chosen = binding ? pageRouteQuery(page, {
+    routeOf: (p) => p.route,
+    parentOf: (p) => parentPageOf(p, pages),
+    fetchOf: (p) => p.fetch ?? null,
+    sectionsOf: (p) => p.sections,
+    site: siteFetch
+  }) : null;
+  const routeKey = chosen?.key ?? null;
+  const routeSource = chosen?.nested ? chosen.config : null;
   const out = /* @__PURE__ */ new Map();
   const put = (cfg) => {
     const key = deriveCacheKey$1(cfg);
@@ -1168,24 +1161,35 @@ function resolvePageFetchConfigs(content, route, { locale = null } = {}) {
   };
   const add = (sources) => {
     for (const cfg of resolveFetchConfigs(sources, options).values()) {
-      put(cfg);
-      if (routeKey && cfg.as === routeKey && cfg.detail && binding.paramValue !== void 0) {
+      const current = routeKey && cfg.as === routeKey ? currentOf(cfg) : null;
+      if (current === "exclude") {
+        put(othersView(cfg));
+        continue;
+      }
+      if (current !== "only") {
+        put(cfg);
+        continue;
+      }
+      if (cfg.detail && binding.paramValue !== void 0) {
         const detailCfg = buildDetailConfig(cfg, { paramName: binding.paramName, paramValue: String(binding.paramValue) });
         if (detailCfg) put(detailCfg);
       }
+      put(cfg.ask ? cfg : routeSelection(cfg));
     }
   };
-  add([page.fetch ?? null, parent?.fetch ?? null, siteFetch]);
+  const siteForPage = siteReaches(parent) ? siteFetch : null;
+  add([page.fetch ?? null, parent?.fetch ?? null, routeSource, siteForPage]);
   const walk = (sections) => {
     for (const s of sections || []) {
-      if (s?.fetch && !isRefinement(s.fetch)) add([s.fetch, page.fetch ?? null, parent?.fetch ?? null, siteFetch]);
+      if (s?.fetch) add([s.fetch, page.fetch ?? null, parent?.fetch ?? null, routeSource, siteForPage]);
       if (s?.subsections) walk(s.subsections);
     }
   };
   walk(page.sections);
+  for (const s of layoutSectionsFor(content, page)) add([s.fetch ?? null, siteFetch]);
   return [...out.values()];
 }
-async function executeFetchConfigs(configs, { content, fetch: fetch2 = null, dev = false, prerender = "always" } = {}) {
+async function executeFetchConfigs(configs, { content, fetch: fetch2 = null, dev = false, prerender = "always", locale = null } = {}) {
   if (prerender !== "author" && prerender !== "always") {
     throw new Error(`executeFetchConfigs: prerender must be 'author' or 'always', got ${JSON.stringify(prerender)}`);
   }
@@ -1194,7 +1198,7 @@ async function executeFetchConfigs(configs, { content, fetch: fetch2 = null, dev
     dev,
     fetch: fetch2
   });
-  const ctx = { website: null };
+  const ctx = { website: null, locale: locale ?? content?.config?.activeLocale ?? resolveDefaultLocale$1(content?.config) ?? null };
   return Promise.all((configs || []).filter(Boolean).map(async (config) => {
     if (prerender === "author" && config.prerender === false) {
       return { config, outcome: "skipped", data: null };
@@ -1206,7 +1210,7 @@ async function executeFetchConfigs(configs, { content, fetch: fetch2 = null, dev
 }
 async function prefetchPageData({ content, route, locale = null, fetch: fetch2 = null, dev = false, prerender = "always" }) {
   const configs = resolvePageFetchConfigs(content, route, { locale });
-  return executeFetchConfigs(configs, { content, fetch: fetch2, dev, prerender });
+  return executeFetchConfigs(configs, { content, fetch: fetch2, dev, prerender, locale });
 }
 function createPageRenderer({ website, shell }) {
   if (!website) throw new Error("createPageRenderer: `website` is required");