@uniweb/runtime 1.1.19 → 1.2.0

package/dist/ssr.js

@@ -106,7 +106,7 @@ function assembleData(block, meta, entityData) {
     else if (entityData && entityData[key] !== void 0) data[key] = entityData[key];
     else data[key] = null;
   }
-  warnUndeclaredBlocks(block, declared);
+  warnUndeclaredBlocks(block, Object.keys(held).filter((key) => !Object.hasOwn(data, key)));
   block.parsedContent.data = data;
   return declared;
 }
@@ -121,17 +121,18 @@ function holdOneRecord(block, declared) {
   if (out) block.parsedContent.data = out;
 }
 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 || []) {
-    const kind = item?.type === "dataBlock" ? "data block" : item?.type === "concept_block" ? "concept block" : null;
-    if (!kind || typeof item.tag !== "string" || keys.has(item.tag)) continue;
-    const memo = `${block.type}::${item.tag}`;
+function warnUndeclaredBlocks(block, leftOut) {
+  if (!leftOut.length || !block.website?.entityStore?.dev) return;
+  const sequence = block.parsedContent?.sequence || [];
+  for (const tag of leftOut) {
+    const memo = `${block.type}::${tag}`;
     if (warnedBlocks.has(memo)) continue;
+    const element = sequence.find((e) => (e?.type === "dataBlock" || e?.type === "concept_block") && e.tag === tag);
+    if (!element) continue;
     warnedBlocks.add(memo);
+    const kind = element.type === "dataBlock" ? "data block" : "concept block";
     console.warn(
-      `[uniweb] ${block.type}: the \`${item.tag}\` ${kind} is not in content.data — ${block.type} does not declare \`${item.tag}\` in its meta.js \`data:\`. It stays in content.sequence.`
+      `[uniweb] ${block.type}: the \`${tag}\` ${kind} is not in content.data — ${block.type} does not declare \`${tag}\` in its meta.js \`data:\`. It stays in content.sequence.`
     );
   }
 }
@@ -822,37 +823,46 @@ ${options.sectionOverrideCSS}
       `<title>${escapeHtml(title)}</title>`
     );
   }
-  if (page.description) {
-    const metaDesc = `<meta name="description" content="${escapeHtml(page.description)}">`;
-    if (result.includes('<meta name="description"')) {
-      result = result.replace(/<meta name="description"[^>]*>/, metaDesc);
-    } else {
-      result = result.replace("</head>", `${metaDesc}
-</head>`);
-    }
-  }
-  const headMeta = page.getHeadMeta?.();
-  if (headMeta) {
-    const og = headMeta.og || {};
-    const keywords = Array.isArray(headMeta.keywords) ? headMeta.keywords.join(", ") : headMeta.keywords;
-    const tags = [];
-    if (keywords) tags.push(`<meta name="keywords" content="${escapeHtml(keywords)}">`);
-    if (headMeta.robots) tags.push(`<meta name="robots" content="${escapeHtml(headMeta.robots)}">`);
-    if (og.title) tags.push(`<meta property="og:title" content="${escapeHtml(og.title)}">`);
-    if (og.description) tags.push(`<meta property="og:description" content="${escapeHtml(og.description)}">`);
-    if (og.image) tags.push(`<meta property="og:image" content="${escapeHtml(og.image)}">`);
-    if (og.url) tags.push(`<meta property="og:url" content="${escapeHtml(og.url)}">`);
-    tags.push('<meta property="og:type" content="website">');
-    tags.push(`<meta name="twitter:card" content="${og.image ? "summary_large_image" : "summary"}">`);
-    if (og.title) tags.push(`<meta name="twitter:title" content="${escapeHtml(og.title)}">`);
-    if (og.description) tags.push(`<meta name="twitter:description" content="${escapeHtml(og.description)}">`);
-    if (og.image) tags.push(`<meta name="twitter:image" content="${escapeHtml(og.image)}">`);
-    if (headMeta.canonical) tags.push(`<link rel="canonical" href="${escapeHtml(headMeta.canonical)}">`);
-    if (tags.length) result = result.replace("</head>", `${tags.join("\n")}
-</head>`);
-  }
+  result = writeHeadMeta(result, page);
   return result;
 }
+function writeHeadMeta(html, page) {
+  const meta = typeof page?.getHeadMeta === "function" ? page.getHeadMeta() : { description: page?.description || null };
+  const end = html.indexOf("</head>");
+  if (!meta || end === -1) return html;
+  const og = meta.og || {};
+  const keywords = Array.isArray(meta.keywords) ? meta.keywords.join(", ") : meta.keywords;
+  const metaTags = [
+    ["name", "description", meta.description],
+    ["name", "keywords", keywords],
+    ["name", "robots", meta.robots],
+    ["property", "og:type", "website"],
+    ["property", "og:site_name", og.siteName],
+    ["property", "og:title", og.title],
+    ["property", "og:description", og.description],
+    ["property", "og:image", og.image],
+    ["property", "og:url", og.url],
+    ["name", "twitter:card", og.image ? "summary_large_image" : "summary"],
+    ["name", "twitter:site", meta.twitter?.site],
+    ["name", "twitter:title", og.title],
+    ["name", "twitter:description", og.description],
+    ["name", "twitter:image", og.image]
+  ];
+  let head = html.slice(0, end);
+  const written = [];
+  for (const [attr, key, value] of metaTags) {
+    head = head.replace(new RegExp(`<meta\\b[^>]*\\b(?:name|property)=["']${key}["'][^>]*>\\s*`, "gi"), "");
+    if (value) written.push(`<meta ${attr}="${key}" content="${escapeHtml(value)}">`);
+  }
+  head = head.replace(/<link\b[^>]*\brel=["']canonical["'][^>]*>\s*/gi, "");
+  if (meta.canonical) written.push(`<link rel="canonical" href="${escapeHtml(meta.canonical)}">`);
+  head = head.replace(/<link\b[^>]*\bhreflang=["'][^"']*["'][^>]*>\s*/gi, "");
+  for (const { hreflang, url } of meta.alternates || []) {
+    written.push(`<link rel="alternate" hreflang="${escapeHtml(hreflang)}" href="${escapeHtml(url)}">`);
+  }
+  return `${head}${written.join("\n")}
+${html.slice(end)}`;
+}
 function generate404Html({ baseHtml, website, siteContent }) {
   const dynamicTemplates = siteContent.pages?.filter((p) => p.isDynamic || isDynamicRoute(p.route)) || [];
   const routePatterns = dynamicTemplates.map((p) => routePatternToRegex(p.route).regex.source);
@@ -1171,6 +1181,12 @@ function safeParseJSON(text) {
     return void 0;
   }
 }
+function requireTransport(fetch2, entry) {
+  if (typeof fetch2 === "function") return fetch2;
+  throw new Error(
+    `${entry}: \`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\`.`
+  );
+}
 function blocksOf(page) {
   const out = [];
   const walk = (list) => {
@@ -1189,6 +1205,7 @@ async function loadPageData({ website, route, fetch: fetch2, dev = false, locale
   if (prerender !== "author" && prerender !== "always") {
     throw new Error(`loadPageData: prerender must be 'author' or 'always', got ${JSON.stringify(prerender)}`);
   }
+  requireTransport(fetch2, "loadPageData");
   const active = website?.getActiveLocale?.() ?? null;
   if (locale && active && locale !== active) {
     throw new Error(
@@ -1259,16 +1276,13 @@ async function prefetchAndHydrate({ website, content, route, locale = null, fetc
   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`."
-    );
-  }
+  requireTransport(fetch2, "prefetchAndHydrate");
   const fetched = await loadPageData({ website, route, fetch: fetch2, dev, locale, prerender });
   hydrateDataStore(website, fetched);
   return fetched;
 }
 async function collectSiteRecords(content, { locale, fetch: fetch2, signal, only = null, whole = false, maxPages } = {}) {
+  requireTransport(fetch2, "collectSiteRecords");
   const config = content?.config;
   const services = config?.services ?? null;
   const queries = config?.queries ?? null;