@uniweb/runtime 0.19.4 → 0.20.0

package/dist/ssr.js

@@ -1,14 +1,14 @@
-import { isRichSchema, deriveCacheKey, resolveDefaultLocale, hasDarkScheme, createUniweb, substitutePlaceholders, resolveServiceUrl, matchWhere, sortRecords, sortToWire } from "@uniweb/core";
+import { isRichSchema, deriveCacheKey, resolveDefaultLocale, hasDarkScheme, createUniweb, substitutePlaceholders, resolveServiceUrl, applyScope, matchWhere, sortRecords, sortToWire } from "@uniweb/core";
 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 { routePatternToRegex, isDynamicRoute, decodeRouteValue, routeBinding, parentRouteOf } from "@uniweb/core/route-match";
 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 { resolveFetchConfigs } from "@uniweb/core/fetch-config";
+import { routeQuery, sectionFetches, resolveFetchConfigs } 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";
@@ -861,14 +861,22 @@ function createDefaultFetcher({ basePath = "", dev = false, fetch: fetchImpl = n
       queue.push({ request, ctx, resolve });
     });
   };
+  const reads = /* @__PURE__ */ new Map();
+  const readOnce = (target, init) => {
+    const key = `${init.method} ${target} ${init.body ?? ""}`;
+    let pending = reads.get(key);
+    if (!pending) {
+      pending = readResponse(doFetch, target, init).finally(() => reads.delete(key));
+      reads.set(key, pending);
+    }
+    return pending;
+  };
   return {
     /**
-     * The cache identity is the request's ADDRESS — or, when asked of the
-     * records service, the QUESTION (`deriveCacheKey` hashes every operator of an address-less
-     * request). Operators evaluated here run over a shared cached value and
-     * must NOT split the cache: two pages declaring different `where:` clauses
-     * against the same path share one entry — the file is fetched once and
-     * each page filters its own copy.
+     * The cache identity is the request's ADDRESS and the view it takes of it —
+     * or, when asked of the records service, the QUESTION (`deriveCacheKey`).
+     * Two pages declaring different `where:` clauses against one path are two
+     * entries, each cut from a read of the file (`readOnce`, above).
      */
     cacheKey(request) {
       return deriveCacheKey(request);
@@ -890,7 +898,7 @@ function createDefaultFetcher({ basePath = "", dev = false, fetch: fetchImpl = n
       } else {
         return { data: [], error: "No path, url or ask specified" };
       }
-      const init = { signal: ctx.signal, method };
+      const init = { method };
       if (method === "POST") {
         const dc = request.dynamicContext;
         const body = rawBody !== void 0 && rawBody !== null && dc && dc.paramName ? substitutePlaceholders(rawBody, { [dc.paramName]: dc.paramValue }, { encode: false }) : rawBody;
@@ -900,21 +908,18 @@ function createDefaultFetcher({ basePath = "", dev = false, fetch: fetchImpl = n
         }
       }
       try {
-        const response = await doFetch(target, init);
+        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) {
-            try {
-              const text = await response.text();
-              const body = safeParseJSON(text);
-              if (body !== void 0) {
-                const candidate = getNestedValue(body, envelope.error);
-                if (typeof candidate === "string" && candidate.length) {
-                  extracted = candidate;
-                }
+          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;
               }
-            } catch {
             }
           }
           return {
@@ -922,18 +927,7 @@ function createDefaultFetcher({ basePath = "", dev = false, fetch: fetchImpl = n
             error: extracted ?? `HTTP ${response.status}: ${response.statusText}`
           };
         }
-        const contentType = response.headers.get("content-type") || "";
-        let data;
-        if (contentType.includes("application/json")) {
-          data = await response.json();
-        } else {
-          const text = await response.text();
-          try {
-            data = JSON.parse(text);
-          } catch {
-            data = text;
-          }
-        }
+        let data = response.body;
         const isDetailRequest = !!request.dynamicContext;
         const effectiveTransform = transform || (isDetailRequest ? envelope.item : envelope.list);
         if (effectiveTransform && data !== null && data !== void 0) {
@@ -953,15 +947,11 @@ function createDefaultFetcher({ basePath = "", dev = false, fetch: fetchImpl = n
 }
 function toQuestion(request) {
   const q = { schema: request.schema };
-  let where = request.where && typeof request.where === "object" ? request.where : null;
-  let scope = typeof request.scope === "string" && request.scope ? request.scope : null;
-  if (where && !scope && where.path && typeof where.path === "object" && typeof where.path.under === "string" && where.path.under) {
-    const { path, ...rest } = where;
-    scope = path.under;
-    where = Object.keys(rest).length ? rest : null;
-  }
+  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 (request.match && typeof request.match === "object") q.match = request.match;
   const sort = sortToWire(request.sort);
   if (sort) q.sort = sort;
   if (typeof request.limit === "number" && request.limit > 0) q.limit = request.limit;
@@ -1086,6 +1076,25 @@ async function flushAsked(url, queue, doFetch) {
     return flushAsked(url, [next], doFetch);
   }));
 }
+async function readResponse(doFetch, target, init) {
+  const response = await doFetch(target, init);
+  if (!response.ok) {
+    let text2 = null;
+    try {
+      text2 = await response.text();
+    } catch {
+    }
+    return { ok: false, status: response.status, statusText: response.statusText, text: text2 };
+  }
+  const contentType = response.headers.get("content-type") || "";
+  if (contentType.includes("application/json")) return { ok: true, body: await response.json() };
+  const text = await response.text();
+  try {
+    return { ok: true, body: JSON.parse(text) };
+  } catch {
+    return { ok: true, body: text };
+  }
+}
 function withMeta(fields) {
   const out = {};
   for (const [k, v] of Object.entries(fields)) if (v !== void 0) out[k] = v;
@@ -1094,6 +1103,7 @@ function withMeta(fields) {
 function applyOperators(data, request, { dev = false } = {}) {
   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 (typeof request.limit === "number" && request.limit > 0) result = result.slice(0, request.limit);
@@ -1135,7 +1145,7 @@ function findPageForRoute(content, route) {
   const exact = pages.find((p) => p.route === route);
   if (exact) return { page: exact, params: {} };
   for (const page of pages) {
-    if (!page.isDynamic || !page.route) continue;
+    if (!page.route || !isDynamicRoute(page.route)) continue;
     const compiled = routePatternToRegex(page.route);
     const m = compiled?.regex ? compiled.regex.exec(route) : null;
     if (m) {
@@ -1149,22 +1159,17 @@ function findPageForRoute(content, route) {
   }
   return { page: null, params: {} };
 }
-function routeBinding(page, params) {
-  const { catchAll } = routePatternToRegex(page.route);
-  if (catchAll && params[catchAll] !== void 0) {
-    const parts = splitPathCapture(params[catchAll]);
-    const paramName2 = page.paramName || "slug";
-    return { paramName: paramName2, paramValue: parts.slug, variables: { ...params, ...parts } };
-  }
-  const paramName = page.paramName || Object.keys(params)[0];
-  return { paramName, paramValue: params[paramName], variables: { ...params } };
+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 resolvePageFetchConfigs(content, route, { locale = null } = {}) {
   const { page, params } = findPageForRoute(content, route);
   if (!page) return [];
   const pages = content?.pages || [];
-  const parent = page.parent ? pages.find((p) => p.route === page.parent) : null;
-  const binding = page.isDynamic && Object.keys(params).length ? routeBinding(page, params) : null;
+  const parent = parentPageOf(page, pages);
+  const binding = isDynamicRoute(page.route) && Object.keys(params).length ? routeBinding(page.route, params, page.paramName ?? null) : null;
   const options = {
     locale,
     defaultLocale: resolveDefaultLocale$1(content?.config) ?? null,
@@ -1172,29 +1177,30 @@ function resolvePageFetchConfigs(content, route, { locale = null } = {}) {
     services: content?.config?.services ?? 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 out = /* @__PURE__ */ new Map();
+  const put = (cfg) => {
+    const key = deriveCacheKey$1(cfg);
+    if (!out.has(key)) out.set(key, cfg);
+  };
   const add = (sources) => {
     for (const cfg of resolveFetchConfigs(sources, options).values()) {
-      const key = deriveCacheKey$1(cfg);
-      if (!out.has(key)) out.set(key, cfg);
+      put(cfg);
+      if (routeKey && cfg.as === routeKey && cfg.detail && binding.paramValue !== void 0) {
+        const detailCfg = buildDetailConfig(cfg, { paramName: binding.paramName, paramValue: String(binding.paramValue) });
+        if (detailCfg) put(detailCfg);
+      }
     }
   };
-  add([page.fetch ?? null, parent?.fetch ?? null, content?.config?.fetch ?? null]);
+  add([page.fetch ?? null, parent?.fetch ?? null, siteFetch]);
   const walk = (sections) => {
     for (const s of sections || []) {
-      if (s?.fetch && !isRefinement(s.fetch)) add([s.fetch, page.fetch ?? null, parent?.fetch ?? null, content?.config?.fetch ?? null]);
+      if (s?.fetch && !isRefinement(s.fetch)) add([s.fetch, page.fetch ?? null, parent?.fetch ?? null, siteFetch]);
       if (s?.subsections) walk(s.subsections);
     }
   };
   walk(page.sections);
-  if (binding && binding.paramValue !== void 0 && page.parentSchema) {
-    const listCfg = [...out.values()].find((cfg) => cfg.as === page.parentSchema && cfg.detail);
-    const detailCfg = listCfg ? buildDetailConfig(listCfg, { paramName: binding.paramName, paramValue: String(binding.paramValue) }) : null;
-    if (detailCfg) {
-      const key = deriveCacheKey$1(detailCfg);
-      if (!out.has(key)) out.set(key, detailCfg);
-    }
-  }
   return [...out.values()];
 }
 async function executeFetchConfigs(configs, { content, fetch: fetch2 = null, dev = false, prerender = "always" } = {}) {