@uniweb/runtime 0.26.6 → 0.27.0

package/dist/ssr.js

@@ -3,17 +3,14 @@ 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 { isDynamicRoute, routePatternToRegex, findPageForRoute, routeBinding, parentRouteOf } from "@uniweb/core/route-match";
-import { findPageForRoute as findPageForRoute2 } from "@uniweb/core/route-match";
+import { isDynamicRoute, routePatternToRegex } from "@uniweb/core/route-match";
+import { findPageForRoute } 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 DataStore, { deriveCacheKey as deriveCacheKey$1 } from "@uniweb/core/datastore";
-import { pageRouteQuery, siteReaches, fetchEntries, resolveFetchConfigs, currentFor, othersView, routeSelection } from "@uniweb/core/fetch-config";
-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 { resolveFetchConfigs } from "@uniweb/core/fetch-config";
 import { resolveRecordsService } from "@uniweb/core/records-service";
 function guaranteeItemStructure(item) {
   return {
@@ -319,7 +316,12 @@ function hydrateDataStore(website, fetchedData) {
   if (!website?.dataStore || !fetchedData?.length) return;
   for (const entry of fetchedData) {
     if (entry.outcome && entry.outcome !== "fetched") continue;
-    website.dataStore.set(deriveCacheKey(entry.config), entry.meta ? { data: entry.data, meta: entry.meta } : { data: entry.data });
+    const value = entry.meta ? { data: entry.data, meta: entry.meta } : { data: entry.data };
+    if (typeof website.fetcher?.hydrate === "function") {
+      website.fetcher.hydrate(entry.config, value, { website });
+    } else {
+      website.dataStore.set(deriveCacheKey(entry.config), value);
+    }
   }
 }
 function ensureThemeCss(uniweb, foundation) {
@@ -1157,7 +1159,7 @@ function blocksOf(page) {
   for (const area of Object.values(page.getLayoutAreas?.() ?? {})) walk(area);
   return out;
 }
-async function loadPageData({ website, route, fetch: fetch2, dev = false, locale = null, prerender = "always" }) {
+async function loadPageData({ website, route, fetch: fetch2, dev = false, locale = null, prerender = "always", cache = null }) {
   if (prerender !== "author" && prerender !== "always") {
     throw new Error(`loadPageData: prerender must be 'author' or 'always', got ${JSON.stringify(prerender)}`);
   }
@@ -1174,7 +1176,7 @@ async function loadPageData({ website, route, fetch: fetch2, dev = false, locale
     throw new Error("loadPageData: `route` must be a route or a Page from this Website — page data is not enough to say what its render reads.");
   }
   const dispatcher = website.dispatcherFor({
-    dataStore: new DataStore(),
+    dataStore: cache ?? new DataStore(),
     defaultFetcher: createDefaultFetcher({ basePath: website.config?.base || "", dev, fetch: fetch2 })
   });
   const entries = /* @__PURE__ */ new Map();
@@ -1204,108 +1206,6 @@ async function loadPageData({ website, route, fetch: fetch2, dev = false, locale
   ]);
   return [...entries.values()];
 }
-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 [];
-  const pages = content?.pages || [];
-  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,
-    queries: content?.config?.queries ?? null,
-    services: content?.config?.services ?? null,
-    variables: binding?.variables ?? null
-  };
-  const siteFetch = content?.config?.fetch ?? 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 routeSource = chosen?.nested ? chosen.config : 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) => {
-    const resolved = sources.flatMap((source) => fetchEntries(source).map((entry) => resolveFetchConfigs([entry], options).get(entry.as)));
-    for (const cfg of resolved.filter(Boolean)) {
-      const current = currentFor(cfg, chosen);
-      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);
-      }
-      if (!cfg.ask) put(routeSelection(cfg));
-    }
-  };
-  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) 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", locale = null } = {}) {
-  if (prerender !== "author" && prerender !== "always") {
-    throw new Error(`executeFetchConfigs: prerender must be 'author' or 'always', got ${JSON.stringify(prerender)}`);
-  }
-  const fetcher = createDefaultFetcher({
-    basePath: content?.config?.base || "",
-    dev,
-    fetch: fetch2
-  });
-  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 };
-    }
-    const result = await fetcher.resolve(config, ctx);
-    if (result?.error) return { config, outcome: "failed", data: null, error: result.error };
-    return { config, outcome: "fetched", data: result?.data ?? null, ...result?.meta ? { meta: result.meta } : {} };
-  }));
-}
-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, locale });
-}
 function createPageRenderer({ website, shell }) {
   if (!website) throw new Error("createPageRenderer: `website` is required");
   if (typeof shell !== "string") throw new Error("createPageRenderer: `shell` must be an HTML string");
@@ -1379,8 +1279,7 @@ export {
   collectSiteRecords,
   createPageRenderer,
   escapeHtml,
-  executeFetchConfigs,
-  findPageForRoute2 as findPageForRoute,
+  findPageForRoute,
   generate404Html,
   getComponentDefaults,
   getComponentMeta,
@@ -1393,7 +1292,6 @@ export {
   loadPageData,
   prefetchAndHydrate,
   prefetchIcons,
-  prefetchPageData,
   prepareProps,
   renderAppearanceBootScript,
   renderBackground,
@@ -1402,7 +1300,6 @@ export {
   renderLayout,
   renderPage,
   resolvePage,
-  resolvePageFetchConfigs,
   sliceContentForLocale
 };
 //# sourceMappingURL=ssr.js.map