@uniweb/runtime 0.24.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 || {};
@@ -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();
@@ -1034,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
     };
@@ -1072,13 +1102,10 @@ function sortLocale(request, ctx) {
   return typeof active === "string" && active ? active : null;
 }
 function applyOperators(data, request, { dev = false, locale = null } = {}) {
-  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, locale);
-  if (typeof request.limit === "number" && request.limit > 0) result = result.slice(0, request.limit);
-  return result;
+  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, locale) {
@@ -1152,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) => {
@@ -1160,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;
@@ -1174,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;
@@ -1265,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;