mnfst-render 0.1.4 → 0.1.6

package/manifest.render.mjs

@@ -144,16 +144,37 @@ function extractXRouteConditions(html) {
   return conditions;
 }
 
+function normalizeRouteCondition(cond) {
+  const raw = String(cond || '').trim();
+  if (!raw) return { kind: 'all', path: '' };
+  if (raw.startsWith('!')) {
+    const omitted = raw.slice(1).trim();
+    if (!omitted || omitted === '*') return { kind: 'not-found', path: '' }; // !*
+    return { kind: 'omit', path: omitted };
+  }
+  if (raw === '*') return { kind: 'all', path: '' };
+  const withoutExact = raw.startsWith('=') ? raw.slice(1) : raw;
+  const trimmed = withoutExact.replace(/^\/+|\/+$/g, '');
+  if (!trimmed) return { kind: 'root', path: '' };
+  if (trimmed.endsWith('/*')) {
+    const base = trimmed.slice(0, -2).replace(/^\/+|\/+$/g, '');
+    return base ? { kind: 'wildcard-prefix', path: base } : { kind: 'all', path: '' };
+  }
+  if (trimmed.includes('*')) return { kind: 'unsupported-pattern', path: trimmed };
+  return { kind: 'path', path: trimmed };
+}
+
 function conditionsToPaths(conditions) {
   const paths = new Set();
   paths.add('/');
   for (const c of conditions) {
-    if (c === '/' || c === '') continue;
-    if (c.startsWith('/')) {
-      paths.add(c === '/' ? '/' : c.replace(/^\//, '').replace(/\/$/, '') || '/');
-    } else {
-      paths.add('/' + c.replace(/\/$/, ''));
-    }
+    const parsed = normalizeRouteCondition(c);
+    // Discovery rules aligned with router docs:
+    // - "*" and omitted routes do not define concrete paths.
+    // - "!*" is handled separately via explicit NOT_FOUND path.
+    // - "about/*" does not include "/about" by itself; concrete children come from data paths.
+    if (parsed.kind === 'path') paths.add('/' + parsed.path);
+    else if (parsed.kind === 'root') paths.add('/');
   }
   return paths;
 }
@@ -177,6 +198,13 @@ function parseYamlPaths(filePath) {
       const segment = pathMatch[1].trim();
       paths.push(`${currentGroup}/${segment}`);
     }
+    const genericPathMatch = line.match(/^\s*(?:-\s*)?(?:path|slug):\s*["']?([^"'\n#]+)["']?/);
+    if (genericPathMatch) {
+      const v = genericPathMatch[1].trim().replace(/^\/+|\/+$/g, '');
+      if (v && !v.includes('*') && !/\.[a-z0-9]+$/i.test(v)) {
+        paths.push(v);
+      }
+    }
   }
   return paths;
 }
@@ -309,10 +337,8 @@ function discoverRoutes(manifest, rootDir) {
     const compPath = join(rootDir, rel);
     if (existsSync(compPath)) {
       const html = readFileSync(compPath, 'utf8');
-      extractXRouteConditions(html).forEach((c) => {
-        if (c.startsWith('/')) pathSet.add(c === '/' ? '/' : c.replace(/^\//, '').replace(/\/$/, '') || '/');
-        else if (c) pathSet.add('/' + c);
-      });
+      const conditions = extractXRouteConditions(html);
+      conditionsToPaths(conditions).forEach((p) => pathSet.add(p));
     }
   }
 
@@ -329,6 +355,29 @@ function pathToFileSegments(pathname) {
   return normalized ? normalized.split('/') : [];
 }
 
+function validatePrerenderedOutput(outputDir, pathList) {
+  const invalidPathTokens = pathList.filter((p) => /(^|\/)[*=]/.test(p) || p.includes('/*') || p.includes('*'));
+  if (invalidPathTokens.length > 0) {
+    throw new Error(`prerender validation failed: invalid discovered route token(s): ${invalidPathTokens.join(', ')}`);
+  }
+
+  const badFolders = [];
+  function walk(dir, rel = '') {
+    const entries = readdirSync(dir, { withFileTypes: true });
+    for (const ent of entries) {
+      if (!ent.isDirectory()) continue;
+      const seg = ent.name;
+      const nextRel = rel ? `${rel}/${seg}` : seg;
+      if (seg.includes('*') || seg.startsWith('=')) badFolders.push(nextRel);
+      walk(join(dir, seg), nextRel);
+    }
+  }
+  if (existsSync(outputDir)) walk(outputDir, '');
+  if (badFolders.length > 0) {
+    throw new Error(`prerender validation failed: invalid output folder(s): ${badFolders.join(', ')}`);
+  }
+}
+
 // --- Strip dev-only injected content (e.g. browser-sync) so dist works under any server -
 
 function stripDevOnlyContent(html) {
@@ -464,6 +513,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 +612,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 +665,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 +681,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>
 `,
@@ -930,7 +1039,11 @@ async function runPrerender(config) {
             xFor.includes('$url') || xFor.includes('$auth') ||
             /\bin\s+(filtered\w*|results|searchResults)\b/.test(xFor);
           const forceCollapse = explicit || inferred;
-          if (!forceCollapse) return; // keep prerendered list for SEO
+          if (!forceCollapse) {
+            tpl.removeAttribute('data-prerender-collapsed');
+            return; // keep prerendered list for SEO
+          }
+          tpl.setAttribute('data-prerender-collapsed', '1');
           const first = tpl.content?.firstElementChild;
           if (!first) return;
           const tag = first.tagName;
@@ -968,7 +1081,9 @@ async function runPrerender(config) {
           return false;
         };
 
-        document.querySelectorAll('template[x-for]').forEach((tpl) => {
+        // Only clean up templates we intentionally collapsed above.
+        // Running this on all x-for templates can remove valid prerendered list items.
+        document.querySelectorAll('template[x-for][data-prerender-collapsed="1"]').forEach((tpl) => {
           const xFor = (tpl.getAttribute('x-for') || '').trim();
           const m = xFor.match(loopVarRegex);
           const itemVar = m ? (m[1] || m[3] || '') : '';
@@ -1063,7 +1178,14 @@ 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
+  );
+  validatePrerenderedOutput(config.output, pathList.filter((p) => p !== NOT_FOUND_PATH));
 
   if (config.redirects.length > 0) {
     const lines = config.redirects.map((r) => {

package/package.json

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