@uniweb/runtime 0.22.0 → 0.23.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,28 +912,12 @@ 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 });
         const whole = typeof request.whole === "boolean" ? request.whole : void 0;
@@ -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();
@@ -1140,12 +1115,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 +1150,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,21 +1166,32 @@ 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" } = {}) {