mnfst-render 0.1.3 → 0.1.5

package/manifest.render.mjs

@@ -464,6 +464,39 @@ function buildCanonicalAndHreflang(pathSeg, locales, defaultLocale, base) {
   return out;
 }
 
+/** Same alternate URLs as buildCanonicalAndHreflang; used for sitemap xhtml:link entries. */
+function getAlternateLinksForPath(pathSeg, locales, defaultLocale, base) {
+  const baseClean = base.replace(/\/$/, '');
+  const defaultLoc = defaultLocale || locales[0];
+  if (!locales || locales.length <= 1) return [];
+  const currentLocale = locales.find((l) => pathSeg === l || pathSeg.startsWith(l + '/')) || defaultLoc;
+  const logicalRoute =
+    currentLocale === defaultLoc
+      ? pathSeg === defaultLoc
+        ? ''
+        : pathSeg.startsWith(defaultLoc + '/')
+          ? pathSeg.slice(defaultLoc.length + 1)
+          : pathSeg
+      : pathSeg === currentLocale
+        ? ''
+        : pathSeg.slice(currentLocale.length + 1);
+  const entries = [];
+  locales.forEach((loc) => {
+    const seg = loc === defaultLoc ? logicalRoute : (logicalRoute ? `${loc}/${logicalRoute}` : loc);
+    const href = baseClean + (seg ? `/${seg}` : '');
+    const hreflang = loc === defaultLoc ? 'x-default' : loc;
+    entries.push({ hreflang, href });
+  });
+  return entries;
+}
+
+function escapeXmlText(s) {
+  return String(s)
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;');
+}
+
 function buildOgLocale(pathSeg, locales, defaultLocale) {
   if (locales.length <= 1) return '';
   const defaultLoc = defaultLocale || locales[0];
@@ -530,7 +563,22 @@ function setNestedKey(obj, path, value) {
   let cur = obj;
   for (let i = 0; i < parts.length - 1; i++) {
     const p = parts[i];
-    if (!(p in cur) || typeof cur[p] !== 'object') cur[p] = {};
+    const next = parts[i + 1];
+    const nextIsIndex = /^\d+$/.test(next);
+    if (!(p in cur) || typeof cur[p] !== 'object') {
+      cur[p] = nextIsIndex ? [] : {};
+    } else if (nextIsIndex && !Array.isArray(cur[p]) && cur[p] && typeof cur[p] === 'object') {
+      const existing = cur[p];
+      const keys = Object.keys(existing);
+      const numericOnly = keys.every((k) => /^\d+$/.test(k));
+      if (numericOnly) {
+        const arr = [];
+        keys.forEach((k) => {
+          arr[parseInt(k, 10)] = existing[k];
+        });
+        cur[p] = arr;
+      }
+    }
     cur = cur[p];
   }
   cur[parts[parts.length - 1]] = value;
@@ -568,9 +616,11 @@ function resolveHeadXBindings(html, xData) {
 
 // --- SEO: robots.txt and sitemap.xml (written to output, use liveUrl for crawlers) ---
 
-function writeSeoFiles(outputDir, pathList, liveUrl) {
+function writeSeoFiles(outputDir, pathList, liveUrl, locales, defaultLocale) {
   const base = liveUrl.replace(/\/$/, '');
   const today = new Date().toISOString().slice(0, 10);
+  const localeList = Array.isArray(locales) ? locales : [];
+  const multiLocale = localeList.length > 1;
 
   writeFileSync(
     join(outputDir, 'robots.txt'),
@@ -582,22 +632,32 @@ Sitemap: ${base}/sitemap.xml
     'utf8'
   );
 
+  const urlsetNs = multiLocale
+    ? '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">'
+    : '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">';
+
   const urlEntries = pathList.map((pathSeg) => {
     const path = pathSeg === '' ? '' : '/' + pathSeg.replace(/\/$/, '');
     const loc = path ? `${base}${path}` : base + '/';
-    const escaped = loc.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&apos;');
-    return `    <url>
-        <loc>${escaped}</loc>
-        <lastmod>${today}</lastmod>
+    const escapedLoc = escapeXmlText(loc);
+    let body = `        <loc>${escapedLoc}</loc>`;
+    if (multiLocale) {
+      for (const { hreflang, href } of getAlternateLinksForPath(pathSeg, localeList, defaultLocale, liveUrl)) {
+        body += `\n        <xhtml:link rel="alternate" hreflang="${escapeXmlText(hreflang)}" href="${escapeXmlText(href)}" />`;
+      }
+    }
+    body += `\n        <lastmod>${today}</lastmod>
         <changefreq>monthly</changefreq>
-        <priority>${path === '' ? '1.0' : '0.8'}</priority>
+        <priority>${path === '' ? '1.0' : '0.8'}</priority>`;
+    return `    <url>
+${body}
     </url>`;
   });
 
   writeFileSync(
     join(outputDir, 'sitemap.xml'),
     `<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+${urlsetNs}
 ${urlEntries.join('\n')}
 </urlset>
 `,
@@ -953,6 +1013,20 @@ async function runPrerender(config) {
       await page.evaluate(() => {
         const loopVarRegex = /^\s*(?:\(\s*([A-Za-z_$][\w$]*)(?:\s*,\s*([A-Za-z_$][\w$]*))?\s*\)|([A-Za-z_$][\w$]*))\s+in\s+/;
         const bindingAttrRegex = /^(?:x-bind:|:|x-text|x-html|x-show|x-if|x-model|x-effect|x-on:|@)/;
+        const hasVar = (expr, varName) => varName && new RegExp(`\\b${varName}\\b`).test(expr || '');
+        const elementReferencesLoopScope = (el, itemVar, indexVar) => {
+          if (!el) return false;
+          const nodes = [el, ...Array.from(el.querySelectorAll('*'))];
+          for (const node of nodes) {
+            const attrs = node.attributes ? Array.from(node.attributes) : [];
+            for (const attr of attrs) {
+              if (!bindingAttrRegex.test(attr.name)) continue;
+              const expr = attr.value || '';
+              if (hasVar(expr, itemVar) || hasVar(expr, indexVar)) return true;
+            }
+          }
+          return false;
+        };
 
         document.querySelectorAll('template[x-for]').forEach((tpl) => {
           const xFor = (tpl.getAttribute('x-for') || '').trim();
@@ -970,19 +1044,7 @@ async function runPrerender(config) {
             const sameTag = next.tagName === tag;
             if (!sameTag) break;
 
-            let referencesLoopScope = false;
-            const attrNodes = next.attributes ? Array.from(next.attributes) : [];
-            for (const attr of attrNodes) {
-              if (!bindingAttrRegex.test(attr.name)) continue;
-              const expr = attr.value || '';
-              if (
-                (itemVar && new RegExp(`\\b${itemVar}\\b`).test(expr)) ||
-                (indexVar && new RegExp(`\\b${indexVar}\\b`).test(expr))
-              ) {
-                referencesLoopScope = true;
-                break;
-              }
-            }
+            const referencesLoopScope = elementReferencesLoopScope(next, itemVar, indexVar);
 
             const toRemove = next;
             next = next.nextElementSibling;
@@ -1061,7 +1123,13 @@ async function runPrerender(config) {
     await browser.close();
   }
 
-  writeSeoFiles(config.output, pathList.filter((p) => p !== NOT_FOUND_PATH), config.liveUrl);
+  writeSeoFiles(
+    config.output,
+    pathList.filter((p) => p !== NOT_FOUND_PATH),
+    config.liveUrl,
+    locales,
+    defaultLocale
+  );
 
   if (config.redirects.length > 0) {
     const lines = config.redirects.map((r) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnfst-render",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Render Manifest sites to static HTML for SEO",
   "type": "module",
   "bin": {