@uniweb/runtime 0.23.0 → 0.25.0

package/dist/ssr.js

@@ -1,4 +1,4 @@
-import { isRichSchema, deriveCacheKey, resolveDefaultLocale, hasDarkScheme, createUniweb, substitutePlaceholders, resolveServiceUrl, applyScope, matchWhere, sortRecords, sortToWire } from "@uniweb/core";
+import { isRichSchema, deriveCacheKey, resolveDefaultLocale, hasDarkScheme, createUniweb, substitutePlaceholders, resolveServiceUrl, evaluateQuery, sortRecords, sortToWire } from "@uniweb/core";
 import React from "react";
 import { renderToString } from "react-dom/server";
 import { sectionDomId } from "@uniweb/core/section-id";
@@ -9,7 +9,7 @@ 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 { pageRouteQuery, siteReaches, resolveFetchConfigs, currentOf, othersView, routeSelection } from "@uniweb/core/fetch-config";
+import { pageRouteQuery, siteReaches, fetchEntries, resolveFetchConfigs, currentFor, 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";
@@ -171,19 +171,30 @@ function applyDefaults(params, defaults) {
     ...params || {}
   };
 }
-function mergeEntityData(block, entityData) {
-  if (!entityData) return;
-  const current = block.parsedContent.data || {};
-  let changed = false;
-  const merged = { ...current };
-  for (const key of Object.keys(entityData)) {
-    if (merged[key] === void 0) {
-      merged[key] = entityData[key];
-      changed = true;
-    }
-  }
-  if (changed) {
-    block.parsedContent.data = merged;
+function assembleData(block, meta, entityData) {
+  const declared = block.website?.declaredKeys ? block.website.declaredKeys(meta) : [];
+  const held = block.heldData || {};
+  const data = {};
+  for (const [key] of declared) {
+    if (held[key] !== void 0) data[key] = held[key];
+    else if (entityData && entityData[key] !== void 0) data[key] = entityData[key];
+    else data[key] = null;
+  }
+  warnUndeclaredBlocks(block, declared);
+  block.parsedContent.data = data;
+}
+const warnedBlocks = /* @__PURE__ */ new Set();
+function warnUndeclaredBlocks(block, declared) {
+  if (!block.website?.entityStore?.dev) return;
+  const keys = new Set(declared.map(([key]) => key));
+  for (const item of block.parsedContent?.sequence || []) {
+    if (item?.type !== "dataBlock" || typeof item.tag !== "string" || keys.has(item.tag)) continue;
+    const memo = `${block.type}::${item.tag}`;
+    if (warnedBlocks.has(memo)) continue;
+    warnedBlocks.add(memo);
+    console.warn(
+      `[uniweb] ${block.type}: the \`${item.tag}\` data block is not in content.data — ${block.type} does not declare \`${item.tag}\` in its meta.js \`data:\`. It stays in content.sequence.`
+    );
   }
 }
 function runDataHandler(block) {
@@ -227,7 +238,8 @@ function runPropsHandler(content, params, block) {
   return null;
 }
 function prepareProps(block, meta, entityData = null) {
-  mergeEntityData(block, entityData);
+  assembleData(block, meta, entityData);
+  block.website?.entityStore?.linkOwnRecords?.(block);
   runDataHandler(block);
   runContentHandler(block);
   const defaults = meta?.defaults || {};
@@ -919,7 +931,7 @@ function createDefaultFetcher({ basePath = "", dev = false, fetch: fetchImpl = n
         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) {
@@ -937,14 +949,32 @@ function toQuestion(request) {
   const scope = typeof request.scope === "string" && request.scope ? request.scope : null;
   if (scope) q.scope = scope;
   if (where) q.where = where;
-  if (request.match && typeof request.match === "object") q.match = request.match;
-  const sort = sortToWire(request.sort);
+  const sort = wireSort(request.sort);
   if (sort) q.sort = sort;
   if (typeof request.limit === "number" && request.limit > 0) q.limit = request.limit;
   if (request.whole === true) q.whole = true;
-  if (typeof request.cursor === "string" && request.cursor) q.cursor = request.cursor;
+  const narrow = toNarrow(request.narrow);
+  if (narrow) q.narrow = narrow;
   return q;
 }
+function toNarrow(narrow) {
+  if (!narrow || typeof narrow !== "object") return null;
+  const n = {};
+  if (narrow.where && typeof narrow.where === "object") n.where = narrow.where;
+  if (narrow.match && typeof narrow.match === "object") n.match = narrow.match;
+  const sort = wireSort(narrow.sort);
+  if (sort) n.sort = sort;
+  if (typeof narrow.cursor === "string" && narrow.cursor) n.cursor = narrow.cursor;
+  if (typeof narrow.limit === "number" && narrow.limit > 0) n.limit = narrow.limit;
+  return Object.keys(n).length > 0 ? n : null;
+}
+function wireSort(sort) {
+  try {
+    return sortToWire(sort);
+  } catch {
+    return typeof sort === "string" && sort.trim() ? sort : null;
+  }
+}
 const DEFAULT_MAX_PAGES = 20;
 async function flushAsked(url, queue, doFetch) {
   const pending = /* @__PURE__ */ new Map();
@@ -985,58 +1015,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 });
@@ -1045,7 +1064,7 @@ async function flushAsked(url, queue, doFetch) {
   await Promise.all([...pending].map(([entry, state]) => {
     const next = {
       ...entry,
-      request: { ...entry.request, cursor: state.cursor },
+      request: { ...entry.request, narrow: { ...entry.request.narrow || {}, cursor: state.cursor } },
       collected: state.collected,
       page: state.page
     };
@@ -1076,19 +1095,22 @@ 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 } = {}) {
-  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);
-  return result;
+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 } = {}) {
+  return evaluateQuery(data, request, {
+    locale,
+    sort: (items, sortExpr, options) => applySort(items, sortExpr, dev, options.locale)
+  });
 }
 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);
@@ -1157,7 +1179,6 @@ function resolvePageFetchConfigs(content, route, { locale = 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) => {
@@ -1165,8 +1186,9 @@ function resolvePageFetchConfigs(content, route, { locale = null } = {}) {
     if (!out.has(key)) out.set(key, cfg);
   };
   const add = (sources) => {
-    for (const cfg of resolveFetchConfigs(sources, options).values()) {
-      const current = routeKey && cfg.as === routeKey ? currentOf(cfg) : null;
+    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;
@@ -1179,7 +1201,7 @@ function resolvePageFetchConfigs(content, route, { locale = null } = {}) {
         const detailCfg = buildDetailConfig(cfg, { paramName: binding.paramName, paramValue: String(binding.paramValue) });
         if (detailCfg) put(detailCfg);
       }
-      put(cfg.ask ? cfg : routeSelection(cfg));
+      if (!cfg.ask) put(routeSelection(cfg));
     }
   };
   const siteForPage = siteReaches(parent) ? siteFetch : null;
@@ -1194,7 +1216,7 @@ function resolvePageFetchConfigs(content, route, { locale = null } = {}) {
   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)}`);
   }
@@ -1203,7 +1225,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 };
@@ -1215,7 +1237,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");
@@ -1270,8 +1292,7 @@ async function collectSiteRecords(content, { locale, fetch: fetch2, signal, only
   const meta = {};
   await Promise.all([...configs].map(async ([name, cfg]) => {
     if (!cfg.ask) return;
-    const { limit, ...population } = cfg;
-    const asked = { ...population, whole, exhaustive: true };
+    const asked = { ...cfg, whole, exhaustive: true };
     if (typeof maxPages === "number" && maxPages > 0) asked.maxPages = maxPages;
     const result = await fetcher.resolve(asked, { signal });
     if (result?.error) errors[name] = result.error;