mnfst-render 0.4.2 → 0.4.4

package/manifest.render.mjs

@@ -238,6 +238,11 @@ function resolveConfig() {
     localeSubstitutionExclude: Array.isArray(pre.localeSubstitutionExclude)
       ? pre.localeSubstitutionExclude.map(String)
       : [],
+    /** Explicit locale-neutral paths to render in addition to those discovered automatically.
+     *  Each entry is expanded to all locale variants (e.g. "legal/privacy" → "cs/legal/privacy", ...) */
+    paths: Array.isArray(pre.paths)
+      ? pre.paths.map((p) => String(p).replace(/^\/+|\/+$/g, '')).filter(Boolean)
+      : [],
     dryRun: !!cli.dryRun,
     debugPrerender: !!(cli.debugPrerender ?? pre.debugPrerender),
     pipelineTimeout: Math.max(3000, Number(pre.pipelineTimeout) || 25000),
@@ -956,6 +961,7 @@ function markPrerenderedManifestComponents(html) {
   return html.replace(/<(x-[a-z][\w-]*)([^>]*)>/gi, (full, tag, attrs) => {
     const a = attrs || '';
     if (/\bdata-pre-rendered\s*=/i.test(a) || /\bdata-processed\s*=/i.test(a)) return full;
+    if (/\bdata-prerender-hydrate\b/i.test(a)) return full; // Inside data-hydrate island — skip
     const spacer = /\S/.test(a) ? ' ' : '';
     return `<${tag}${a}${spacer}data-pre-rendered="1">`;
   });
@@ -1126,32 +1132,71 @@ function loadAllLocaleContentData(manifest, rootDir, locales) {
   const data = manifest?.data;
   if (!data || typeof data !== 'object') return new Map();
 
-  const csvFiles = [];
-  const seen = new Set();
-  const addCsv = (ref) => {
-    if (typeof ref !== 'string' || !ref.endsWith('.csv')) return;
-    const p = join(rootDir, ref.startsWith('/') ? ref.slice(1) : ref);
-    if (!seen.has(p)) { seen.add(p); csvFiles.push(p); }
-  };
+  // Lazy-load js-yaml for parsing per-locale YAML files
+  let jsYaml = null;
+  try { jsYaml = require('js-yaml'); } catch { /* yaml not available; YAML locale files will be skipped */ }
+
+  // Deep-merge source into target (for combining multiple data sources per locale)
+  function deepMerge(target, source) {
+    if (!source || typeof source !== 'object' || Array.isArray(source)) return;
+    for (const key of Object.keys(source)) {
+      if (source[key] && typeof source[key] === 'object' && !Array.isArray(source[key])) {
+        target[key] = (target[key] && typeof target[key] === 'object') ? target[key] : {};
+        deepMerge(target[key], source[key]);
+      } else {
+        target[key] = source[key];
+      }
+    }
+  }
+
+  const result = new Map();
+  for (const locale of locales) result.set(locale, {});
 
   for (const [, value] of Object.entries(data)) {
-    if (typeof value === 'string') { addCsv(value); continue; }
-    if (value && typeof value === 'object' && !Array.isArray(value)) {
+    if (typeof value === 'string') {
+      // Single CSV with locale columns (all locales in one file)
+      if (value.endsWith('.csv')) {
+        const csvPath = join(rootDir, value.startsWith('/') ? value.slice(1) : value);
+        for (const locale of locales) {
+          deepMerge(result.get(locale), parseCsvToKeyValue(csvPath, locale));
+        }
+      }
+    } else if (value && typeof value === 'object' && !Array.isArray(value)) {
       if (value.locales) {
+        // { locales: "/path/to/multi-locale.csv" } format
         const refs = Array.isArray(value.locales) ? value.locales : [value.locales];
-        refs.forEach(addCsv);
+        for (const ref of refs) {
+          if (typeof ref !== 'string' || !ref.endsWith('.csv')) continue;
+          const csvPath = join(rootDir, ref.startsWith('/') ? ref.slice(1) : ref);
+          for (const locale of locales) {
+            deepMerge(result.get(locale), parseCsvToKeyValue(csvPath, locale));
+          }
+        }
+      } else {
+        // Per-locale files: { "en": "/data/content.en.yaml", "fr": "/data/content.fr.yaml", ... }
+        for (const [localeKey, filePath] of Object.entries(value)) {
+          if (!locales.includes(localeKey) || typeof filePath !== 'string') continue;
+          const fullPath = join(rootDir, filePath.startsWith('/') ? filePath.slice(1) : filePath);
+          if (!existsSync(fullPath)) continue;
+          let localeData = null;
+          try {
+            const raw = readFileSync(fullPath, 'utf8');
+            if ((filePath.endsWith('.yaml') || filePath.endsWith('.yml')) && jsYaml) {
+              localeData = jsYaml.load(raw);
+            } else if (filePath.endsWith('.json')) {
+              localeData = JSON.parse(raw);
+            } else if (filePath.endsWith('.csv')) {
+              localeData = parseCsvToKeyValue(fullPath, localeKey);
+            }
+          } catch { /* ignore parse errors for individual locale files */ }
+          if (localeData && typeof localeData === 'object') {
+            deepMerge(result.get(localeKey), localeData);
+          }
+        }
       }
     }
   }
 
-  const result = new Map();
-  for (const locale of locales) {
-    const merged = {};
-    for (const csvPath of csvFiles) {
-      Object.assign(merged, parseCsvToKeyValue(csvPath, locale));
-    }
-    result.set(locale, merged);
-  }
   return result;
 }
 
@@ -1161,14 +1206,24 @@ function loadAllLocaleContentData(manifest, rootDir, locales) {
  */
 function buildSubstitutionPairs(defaultLocaleData, targetLocaleData) {
   const pairs = [];
-  for (const [key, rawDefault] of Object.entries(defaultLocaleData)) {
-    const rawTarget = targetLocaleData[key];
-    if (rawTarget == null || rawDefault == null) continue;
-    const from = String(rawDefault).trim();
-    const to = String(rawTarget).trim();
-    if (!from || from === to) continue;
-    pairs.push([from, to]);
+  function collectPairs(defaultObj, targetObj) {
+    if (!defaultObj || !targetObj) return;
+    for (const key of Object.keys(defaultObj)) {
+      const defaultVal = defaultObj[key];
+      const targetVal = targetObj[key];
+      if (defaultVal && typeof defaultVal === 'object') {
+        // Recurse into nested objects (produced by setNestedKey for dotted CSV keys)
+        collectPairs(defaultVal, targetVal && typeof targetVal === 'object' ? targetVal : {});
+      } else {
+        const from = String(defaultVal ?? '').trim();
+        const to = String(targetVal ?? '').trim();
+        if (!from || from === to) continue;
+        pairs.push([from, to]);
+      }
+    }
   }
+  collectPairs(defaultLocaleData, targetLocaleData);
+  // Sort longest-first so more specific strings are replaced before shorter substrings
   pairs.sort((a, b) => b[0].length - a[0].length);
   return pairs;
 }
@@ -1266,6 +1321,9 @@ function generateLocaleVariantHtml({
   html = stripRedundantImgSrcBindings(html);
   html = stripEmptyInlineMaskStyles(html);
   html = stripResolvedXIconDirectives(html);
+  // markPrerenderedManifestComponents must run BEFORE stripPrerenderHydrateMarkers so it can
+  // detect data-prerender-hydrate markers and skip components inside hydrate islands.
+  html = markPrerenderedManifestComponents(html);
   html = stripPrerenderHydrateMarkers(html);
 
   const fileSegments = pathToFileSegments(pathSeg ? '/' + pathSeg : '/');
@@ -1290,7 +1348,6 @@ function generateLocaleVariantHtml({
     '</head>',
     `${canonicalHreflang}${injectOgLocale ? ogLocale : ''}${routeMeta}${baseMeta}<meta name="manifest:prerendered" content="1">\n<meta name="manifest:router-base-depth" content="${routeDepth}">\n</head>`
   );
-  html = markPrerenderedManifestComponents(html);
 
   return { html, utilityBlocks: pageUtilityBlocks };
 }
@@ -1586,6 +1643,14 @@ async function runPrerender(config) {
 
   const defaultLocale = locales[0] ?? null;
   const routeSegments = discoverRoutes(manifest, config.root);
+  // Merge any explicitly configured paths (manifest.prerender.paths) into the discovered segments.
+  // These are treated as locale-neutral and get full locale-expansion like all other discovered paths.
+  if (config.paths && config.paths.length > 0) {
+    const segSet = new Set(routeSegments);
+    for (const p of config.paths) {
+      if (!segSet.has(p)) { routeSegments.push(p); segSet.add(p); }
+    }
+  }
   const localeSet = new Set(locales.map((l) => String(l).toLowerCase()));
   const localeNeutralSegments = routeSegments.filter((seg) => {
     if (!seg) return true;
@@ -2099,6 +2164,8 @@ async function runPrerender(config) {
         const stripLoopBindings = (el, itemVar, indexVar) => {
           const nodes = [el, ...Array.from(el.querySelectorAll('*'))];
           for (const node of nodes) {
+            // Skip elements inside data-hydrate islands — their bindings must remain live
+            if (node.hasAttribute('data-prerender-hydrate') || node.closest('[data-prerender-hydrate]')) continue;
             const attrs = node.attributes ? Array.from(node.attributes) : [];
             for (const attr of attrs) {
               if (!bindingAttrRegex.test(attr.name)) continue;
@@ -2295,6 +2362,9 @@ async function runPrerender(config) {
       html = stripRedundantImgSrcBindings(html);
       html = stripEmptyInlineMaskStyles(html);
       html = stripResolvedXIconDirectives(html);
+      // markPrerenderedManifestComponents must run BEFORE stripPrerenderHydrateMarkers so it can
+      // detect data-prerender-hydrate markers and skip components inside hydrate islands.
+      html = markPrerenderedManifestComponents(html);
       html = stripPrerenderHydrateMarkers(html);
       html = rewriteHtmlAssetPaths(html, fileSegments.length);
       const liveBase = config.liveUrl.replace(/\/$/, '');
@@ -2314,7 +2384,6 @@ async function runPrerender(config) {
         '</head>',
         `${canonicalHreflang}${injectOgLocale ? ogLocale : ''}${routeMeta}${baseMeta}${prerenderedMeta}<meta name="manifest:router-base-depth" content="${routeDepth}">\n</head>`
       );
-      html = markPrerenderedManifestComponents(html);
       mkdirSync(outDir, { recursive: true });
       writeFileSync(outFile, html, 'utf8');
       pushDebug({

package/package.json

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