mnfst-render 0.4.6 → 0.4.8

package/manifest.render.mjs

@@ -1144,6 +1144,9 @@ function loadAllLocaleContentData(manifest, rootDir, locales) {
         target[key] = (target[key] && typeof target[key] === 'object') ? target[key] : {};
         deepMerge(target[key], source[key]);
       } else {
+        // Don't overwrite an existing nested object with a primitive — that creates
+        // type asymmetry across locales and causes '[object Object]' in substitution pairs
+        if (target[key] && typeof target[key] === 'object') continue;
         target[key] = source[key];
       }
     }
@@ -1152,12 +1155,25 @@ function loadAllLocaleContentData(manifest, rootDir, locales) {
   const result = new Map();
   for (const locale of locales) result.set(locale, {});
 
+  // Read just the header row of a CSV to check which locale columns it contains.
+  function csvLocaleColumns(csvPath) {
+    if (!existsSync(csvPath)) return new Set();
+    try {
+      const firstLine = readFileSync(csvPath, 'utf8').split(/\r?\n/)[0] || '';
+      return new Set(splitCsvLine(firstLine).slice(1)); // skip key column
+    } catch { return new Set(); }
+  }
+
   for (const [, value] of Object.entries(data)) {
     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);
+        const cols = csvLocaleColumns(csvPath);
         for (const locale of locales) {
+          // Only include locales the CSV actually declares; falling back to the English
+          // column for a missing locale silently poisons substitution pairs with English values.
+          if (!cols.has(locale)) continue;
           deepMerge(result.get(locale), parseCsvToKeyValue(csvPath, locale));
         }
       }
@@ -1168,7 +1184,9 @@ function loadAllLocaleContentData(manifest, rootDir, locales) {
         for (const ref of refs) {
           if (typeof ref !== 'string' || !ref.endsWith('.csv')) continue;
           const csvPath = join(rootDir, ref.startsWith('/') ? ref.slice(1) : ref);
+          const cols = csvLocaleColumns(csvPath);
           for (const locale of locales) {
+            if (!cols.has(locale)) continue;
             deepMerge(result.get(locale), parseCsvToKeyValue(csvPath, locale));
           }
         }
@@ -1215,6 +1233,8 @@ function buildSubstitutionPairs(defaultLocaleData, targetLocaleData) {
         // Recurse into nested objects (produced by setNestedKey for dotted CSV keys)
         collectPairs(defaultVal, targetVal && typeof targetVal === 'object' ? targetVal : {});
       } else {
+        // Skip if target is a non-primitive — String(obj) === '[object Object]' is never useful
+        if (targetVal !== null && typeof targetVal === 'object') continue;
         const from = String(defaultVal ?? '').trim();
         const to = String(targetVal ?? '').trim();
         if (!from || from === to) continue;
@@ -2179,10 +2199,20 @@ async function runPrerender(config) {
             ) {
               try {
                 const A = window.Alpine;
-                if (A && typeof A.$data === 'function') {
-                  const scope = A.$data(n);
-                  if (scope && Object.prototype.hasOwnProperty.call(scope, itemVar)) {
-                    const raw = scope[itemVar];
+                if (A) {
+                  // Alpine.evaluate(el, expr) evaluates in the full scope chain including
+                  // x-for loop variables, unlike Alpine.$data() which only sees x-data attrs.
+                  let raw = undefined;
+                  if (typeof A.evaluate === 'function') {
+                    raw = A.evaluate(n, itemVar);
+                  } else if (typeof A.$data === 'function') {
+                    // Fallback: $data only sees x-data scopes, not x-for vars
+                    const scope = A.$data(n);
+                    if (scope && Object.prototype.hasOwnProperty.call(scope, itemVar)) {
+                      raw = scope[itemVar];
+                    }
+                  }
+                  if (raw !== undefined && raw !== null) {
                     // Serialize only own-enumerable properties to avoid circular refs / proxies
                     const snapshot = JSON.parse(JSON.stringify(raw));
                     n.setAttribute('x-data', JSON.stringify({ [itemVar]: snapshot }));

package/package.json

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