mnfst-render 0.1.5 → 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) {
@@ -990,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;
@@ -1028,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] || '') : '';
@@ -1130,6 +1185,7 @@ async function runPrerender(config) {
     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.5",
+  "version": "0.1.6",
   "description": "Render Manifest sites to static HTML for SEO",
   "type": "module",
   "bin": {