@uniweb/runtime 0.14.1 → 0.14.2

package/dist/ssr.js

@@ -1,8 +1,15 @@
-import { isRichSchema, deriveCacheKey as deriveCacheKey$1, resolveDefaultLocale as resolveDefaultLocale$1, hasDarkScheme, createUniweb, resolveRequestStyle, resolveServiceUrl, substitutePlaceholders as substitutePlaceholders$1, matchWhere } from "@uniweb/core";
+import { isRichSchema, deriveCacheKey, resolveDefaultLocale, hasDarkScheme, createUniweb, resolveRequestStyle, resolveServiceUrl, substitutePlaceholders, matchWhere } from "@uniweb/core";
 import React from "react";
 import { renderToString } from "react-dom/server";
 import { sectionDomId } from "@uniweb/core/section-id";
+import { routePatternToRegex } 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 { deriveCacheKey as deriveCacheKey$1 } from "@uniweb/core/datastore";
+import { resolveDefaultLocale as resolveDefaultLocale$1 } from "@uniweb/core/locale-config";
 function guaranteeItemStructure(item) {
   return {
     title: item.title || "",
@@ -240,27 +247,6 @@ function getComponentMeta(componentName) {
 function getComponentDefaults(componentName) {
   return globalThis.uniweb?.getComponentDefaults?.(componentName) || {};
 }
-const PARAM_NAME = "[A-Za-z0-9_-]+";
-const REGEX_SPECIALS = /[.*+?^${}()|[\]\\]/g;
-function normalizeRoute(route) {
-  if (typeof route !== "string" || route === "") return "/";
-  return route === "/" ? "/" : route.replace(/\/+$/, "") || "/";
-}
-function routePatternToRegex(pattern) {
-  const paramNames = [];
-  const source = normalizeRoute(pattern).replace(REGEX_SPECIALS, "\\$&").replace(new RegExp(`:(${PARAM_NAME})`, "g"), (_, name) => {
-    paramNames.push(name);
-    return "([^/]+)";
-  });
-  return { regex: new RegExp(`^${source}$`), paramNames };
-}
-const DEFAULT_ICON_BASE = "https://uniweb.github.io/icons";
-function iconPath(family, name) {
-  return `${family}/${family}-${name}.svg`;
-}
-function iconUrl(family, name, base = DEFAULT_ICON_BASE) {
-  return `${String(base).replace(/\/+$/, "")}/${iconPath(family, name)}`;
-}
 function default404Html(basePath = "") {
   const homeHref = basePath ? `${basePath}/` : "/";
   return `<div class="page-not-found" style="min-height:80vh;display:flex;flex-direction:column;align-items:center;justify-content:center;padding:2rem;text-align:center"><h1 style="font-size:3rem;font-weight:bold;color:#1f2937;margin-bottom:1rem">404</h1><p style="color:#64748b;margin-bottom:2rem">Page not found</p><a href="${homeHref}" style="color:#3b82f6;text-decoration:underline">Go to homepage</a></div>`;
@@ -282,7 +268,7 @@ function wireFoundationCapabilities(uniweb, foundation) {
   }
 }
 function sliceContentForLocale(content, locale) {
-  const defaultLang = resolveDefaultLocale$1(content?.config);
+  const defaultLang = resolveDefaultLocale(content?.config);
   const locData = content?.locales?.[locale];
   if (!locale || locale === defaultLang || !locData) return content;
   return {
@@ -299,7 +285,7 @@ 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$1(entry.config), { data: entry.data });
+    website.dataStore.set(deriveCacheKey(entry.config), { data: entry.data });
   }
 }
 function ensureThemeCss(uniweb, foundation) {
@@ -628,7 +614,7 @@ function renderLayout(page, website) {
 function initPrerenderForLocale(content, foundation, locale, extensionsOrOptions, maybeOptions) {
   const localeContent = sliceContentForLocale(content, locale);
   const uniweb = initPrerender(localeContent, foundation, extensionsOrOptions, maybeOptions);
-  const defaultLang = resolveDefaultLocale$1(content?.config);
+  const defaultLang = resolveDefaultLocale(content?.config);
   if (locale && locale !== defaultLang && uniweb.activeWebsite?.setActiveLocale) {
     uniweb.activeWebsite.setActiveLocale(locale);
   }
@@ -852,169 +838,6 @@ function generate404Html({ baseHtml, website, siteContent }) {
   }
   return { html, hasNotFoundPage: !!notFoundPage };
 }
-const DATA_DIR = "data";
-const DATA_URL_PREFIX = `/${DATA_DIR}/`;
-function queryDataUrl(name) {
-  return `${DATA_URL_PREFIX}${name}.json`;
-}
-function recordDataUrl(query, slug) {
-  return `${DATA_URL_PREFIX}${query}/${slug}.json`;
-}
-function isDataUrl(path) {
-  return typeof path === "string" && path.startsWith(DATA_URL_PREFIX);
-}
-const PLACEHOLDER_RE = /\{([A-Za-z_][A-Za-z0-9_]*)\}/g;
-function substitutePlaceholders(value, context, options = {}) {
-  const { encode = true } = options;
-  if (typeof value === "string") {
-    return value.replace(PLACEHOLDER_RE, (literal, key) => {
-      if (!(key in (context || {}))) return literal;
-      const raw = context[key];
-      if (raw === void 0 || raw === null) return literal;
-      return encode ? encodeURIComponent(String(raw)) : String(raw);
-    });
-  }
-  if (Array.isArray(value)) {
-    return value.map((item) => substitutePlaceholders(item, context, options));
-  }
-  if (value && typeof value === "object") {
-    const result = {};
-    for (const key of Object.keys(value)) {
-      result[key] = substitutePlaceholders(value[key], context, options);
-    }
-    return result;
-  }
-  return value;
-}
-const PATH_SLOT = "{path}";
-const PARAM_SLOT = "{param}";
-const warnedPatterns = /* @__PURE__ */ new Set();
-function warnOnce(key, message) {
-  if (warnedPatterns.has(key)) return;
-  warnedPatterns.add(key);
-  console.warn(`[query-address] ${message}`);
-}
-function readPattern(lane, key) {
-  if (!lane || typeof lane !== "object" || Array.isArray(lane)) return null;
-  const pattern = lane[key];
-  return typeof pattern === "string" && pattern.length > 0 ? pattern : null;
-}
-function resolveQueryAddress(query, lane) {
-  if (typeof query !== "string" || query.length === 0) return null;
-  const pattern = readPattern(lane, "list");
-  if (!pattern) return null;
-  if (!pattern.includes(PATH_SLOT)) {
-    warnOnce(
-      `list:${pattern}`,
-      `config.records.list carries no ${PATH_SLOT} placeholder, so every query would resolve to the same address. Ignoring it and reading the compiled file instead.`
-    );
-    return null;
-  }
-  return substitutePlaceholders(pattern, { path: query });
-}
-function resolveRecordAddressPattern(query, lane) {
-  if (typeof query !== "string" || query.length === 0) return null;
-  const pattern = readPattern(lane, "record");
-  if (!pattern) return null;
-  if (!pattern.includes(PARAM_SLOT)) {
-    warnOnce(
-      `record:${pattern}`,
-      `config.records.record carries no ${PARAM_SLOT} placeholder, so every record would resolve to the same address. Ignoring it and reading the per-record file instead.`
-    );
-    return null;
-  }
-  return substitutePlaceholders(pattern, { path: query });
-}
-function localizeConfig(cfg, locale, defaultLocale) {
-  if (!cfg.path) return cfg;
-  if (!locale || locale === defaultLocale) return cfg;
-  if (!isDataUrl(cfg.path)) return cfg;
-  return { ...cfg, path: `/${locale}${cfg.path}` };
-}
-function applyDeferredDetail(cfg, queries, records) {
-  if (cfg.detail !== void 0) return cfg;
-  if (cfg.endpoint) {
-    const recordPattern = resolveRecordAddressPattern(cfg.query, records);
-    if (recordPattern) return { ...cfg, detail: recordPattern };
-  }
-  const queryName = cfg.query || bindingKey(cfg);
-  if (!queryName || !queries) return cfg;
-  const collConfig = queries[queryName];
-  if (!collConfig || typeof collConfig !== "object") return cfg;
-  const deferred = Array.isArray(collConfig.deferred) ? collConfig.deferred : null;
-  if (!deferred || deferred.length === 0) return cfg;
-  const pattern = typeof collConfig.detailUrl === "string" ? collConfig.detailUrl : recordDataUrl(queryName, "{slug}");
-  return { ...cfg, detail: pattern };
-}
-function resolveQuerySource(cfg, records) {
-  if (typeof cfg.query !== "string" || cfg.query.length === 0) return cfg;
-  const endpoint = resolveQueryAddress(cfg.query, records);
-  if (endpoint) {
-    const { path, url, ...rest } = cfg;
-    return { ...rest, endpoint };
-  }
-  return { ...cfg, path: queryDataUrl(cfg.query) };
-}
-function bindingKey(cfg) {
-  return cfg?.as;
-}
-function resolveFetchConfigs(sources, options = {}) {
-  const {
-    schemas = [],
-    locale = null,
-    defaultLocale = null,
-    queries = null,
-    records = null
-  } = options;
-  const configs = /* @__PURE__ */ new Map();
-  const collectAll = schemas.length === 0;
-  for (const source of sources) {
-    if (!source) continue;
-    const configList = Array.isArray(source) ? source : [source];
-    for (const cfg of configList) {
-      const key = bindingKey(cfg);
-      if (!key) continue;
-      if (configs.has(key)) continue;
-      if (!collectAll && !schemas.includes(key)) continue;
-      const sourced = resolveQuerySource(cfg, records);
-      const localized = localizeConfig(sourced, locale, defaultLocale);
-      configs.set(key, applyDeferredDetail(localized, queries, records));
-    }
-  }
-  return configs;
-}
-function deriveCacheKey(request) {
-  const { path, url, endpoint, transform } = request || {};
-  const as = request?.as;
-  const method = request?.method && request.method.toUpperCase() !== "GET" ? request.method.toUpperCase() : void 0;
-  const body = method === "POST" ? request?.body : void 0;
-  return JSON.stringify({ path, url, endpoint, as, transform, method, body });
-}
-function codeOf(entry) {
-  if (typeof entry === "string" && entry.trim() && entry.trim() !== "*") return entry.trim();
-  if (entry && typeof entry === "object" && typeof entry.code === "string" && entry.code.trim()) {
-    return entry.code.trim();
-  }
-  return null;
-}
-function normalizeLanguageList(value) {
-  if (!Array.isArray(value)) return [];
-  const seen = /* @__PURE__ */ new Set();
-  const codes = [];
-  for (const entry of value) {
-    const code = codeOf(entry);
-    if (!code || seen.has(code)) continue;
-    seen.add(code);
-    codes.push(code);
-  }
-  return codes;
-}
-function resolveDefaultLocale(config = {}) {
-  if (typeof config?.defaultLanguage === "string" && config.defaultLanguage.trim()) {
-    return config.defaultLanguage.trim();
-  }
-  return normalizeLanguageList(config?.languages)[0] || "en";
-}
 const KNOWN_OPERATORS = /* @__PURE__ */ new Set(["where", "limit", "sort"]);
 function createDefaultFetcher({ basePath = "", config = {}, dev = false, records = null, fetch: fetchImpl = null } = {}) {
   const doFetch = (input, init) => (fetchImpl || globalThis.fetch)(input, init);
@@ -1044,7 +867,7 @@ function createDefaultFetcher({ basePath = "", config = {}, dev = false, records
      * the predicate travels in the request.
      */
     cacheKey(request) {
-      const base = deriveCacheKey$1(request);
+      const base = deriveCacheKey(request);
       const projected = {};
       for (const op of supports) {
         if (!style.canPush.has(op)) continue;
@@ -1095,7 +918,7 @@ function createDefaultFetcher({ basePath = "", config = {}, dev = false, records
       }
       if (method === "POST") {
         const dc = request.dynamicContext;
-        const resolvedBody = rawBody !== void 0 && rawBody !== null && dc && dc.paramName ? substitutePlaceholders$1(rawBody, { [dc.paramName]: dc.paramValue }, { encode: false }) : rawBody;
+        const resolvedBody = rawBody !== void 0 && rawBody !== null && dc && dc.paramName ? substitutePlaceholders(rawBody, { [dc.paramName]: dc.paramValue }, { encode: false }) : rawBody;
         const finalBody = composePostBody(resolvedBody, encoded.bodyMerge);
         if (finalBody !== null) {
           if (!hasHeader(headers, "Content-Type")) {
@@ -1293,14 +1116,14 @@ function resolvePageFetchConfigs(content, route, { locale = null } = {}) {
   const parent = page.parent ? pages.find((p) => p.route === page.parent) : null;
   const options = {
     locale,
-    defaultLocale: resolveDefaultLocale(content?.config) ?? null,
+    defaultLocale: resolveDefaultLocale$1(content?.config) ?? null,
     queries: content?.config?.queries ?? null,
     records: content?.config?.records ?? null
   };
   const out = /* @__PURE__ */ new Map();
   const add = (sources) => {
     for (const cfg of resolveFetchConfigs(sources, options).values()) {
-      const key = deriveCacheKey(cfg);
+      const key = deriveCacheKey$1(cfg);
       if (!out.has(key)) out.set(key, cfg);
     }
   };
@@ -1343,10 +1166,45 @@ async function prefetchPageData({ content, route, locale = null, fetch: fetch2 =
   const configs = resolvePageFetchConfigs(content, route, { locale });
   return executeFetchConfigs(configs, { content, fetch: fetch2, dev, prerender });
 }
+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");
+  function render(target, { inject = {} } = {}) {
+    const page = typeof target === "string" ? resolvePage(website, target) : target;
+    if (!page) return { outcome: "notFound", html: null, page: null, error: null };
+    let result;
+    try {
+      result = renderPage(page, website);
+    } catch (err) {
+      return { outcome: "failed", html: null, page, error: classifyRenderError(err) };
+    }
+    if (result.error) return { outcome: "failed", html: null, page, error: result.error };
+    const html = injectPageContent(shell, result.renderedContent, page, {
+      ...inject,
+      sectionOverrideCSS: result.sectionOverrideCSS
+    });
+    return { outcome: "rendered", html, page, error: null };
+  }
+  return { website, render };
+}
+async function prefetchAndHydrate({ website, content, route, locale = null, fetch: fetch2 = null, dev = false, prerender = "always" }) {
+  if (!website?.dataStore) {
+    throw new Error("prefetchAndHydrate: `website` must be an initialized Website with a dataStore");
+  }
+  if (typeof fetch2 !== "function") {
+    throw new Error(
+      "prefetchAndHydrate: `fetch` must be a function. A transport does not survive a JSON-serialized isolate boundary — pass it as an RPC method argument. To use the ambient fetch deliberately, pass `fetch: globalThis.fetch`."
+    );
+  }
+  const fetched = await prefetchPageData({ content, route, locale, fetch: fetch2, dev, prerender });
+  hydrateDataStore(website, fetched);
+  return fetched;
+}
 export {
   applyDefaults,
   applySchemas,
   classifyRenderError,
+  createPageRenderer,
   escapeHtml,
   executeFetchConfigs,
   findPageForRoute,
@@ -1359,6 +1217,7 @@ export {
   initPrerender,
   initPrerenderForLocale,
   injectPageContent,
+  prefetchAndHydrate,
   prefetchIcons,
   prefetchPageData,
   prepareProps,