npm - mnfst-render - Versions diffs - 0.5.16 → 0.5.18 - Mend

mnfst-render 0.5.16 → 0.5.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/manifest.render.mjs +53 -15
package/package.json +1 -1

package/manifest.render.mjs CHANGED Viewed

@@ -363,7 +363,7 @@ function parseYamlPaths(filePath) {
   let currentGroup = '';
   const lines = text.split(/\r?\n/);
   for (const line of lines) {
-    const groupMatch = line.match(/^group:\s*["']?([^"'\n]+)["']?/);
+    const groupMatch = line.match(/^\s*-?\s*group:\s*["']?([^"'\n]+)["']?/);
     if (groupMatch) {
       currentGroup = groupMatch[1].trim().toLowerCase().replace(/\s+/g, '-');
       continue;
@@ -372,12 +372,15 @@ function parseYamlPaths(filePath) {
     if (pathMatch && currentGroup) {
       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);
+    } else {
+      // No group context — fall back to a bare path/slug.  Used by data files
+      // whose entries are flat (e.g. articles list with `path:` per item).
+      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);
+        }
       }
     }
   }
@@ -1474,6 +1477,26 @@ function loadContentForPrerender(manifest, rootDir, locale) {
     content = parseCsvToKeyValue(join(rootDir, data.slice(1)), loc);
   } else if (data && typeof data === 'object' && data.locales && typeof data.locales === 'string') {
     content = parseCsvToKeyValue(join(rootDir, data.locales.slice(1)), loc);
+  } else if (data && typeof data === 'object' && !Array.isArray(data)) {
+    // Per-locale files: { "en": "/data/content.en.yaml", "fr": "/data/content.fr.yaml", ... }
+    const filePath = data[loc] || data[Object.keys(data)[0]];
+    if (typeof filePath === 'string') {
+      const fullPath = join(rootDir, filePath.startsWith('/') ? filePath.slice(1) : filePath);
+      if (existsSync(fullPath)) {
+        try {
+          const raw = readFileSync(fullPath, 'utf8');
+          if (filePath.endsWith('.yaml') || filePath.endsWith('.yml')) {
+            let jsYaml = null;
+            try { jsYaml = require('js-yaml'); } catch { /* skip */ }
+            if (jsYaml) content = jsYaml.load(raw) || {};
+          } else if (filePath.endsWith('.json')) {
+            content = JSON.parse(raw);
+          } else if (filePath.endsWith('.csv')) {
+            content = parseCsvToKeyValue(fullPath, loc);
+          }
+        } catch { /* ignore parse errors */ }
+      }
+    }
   }
   if (manifest.description !== undefined && content.description === undefined) {
     content.description = manifest.description;
@@ -1546,15 +1569,27 @@ function resolveHeadXBindings(html, xData) {
     .replace(/>/g, '&gt;')
     .replace(/"/g, '&quot;');
   return html.replace(/<head>([\s\S]*?)<\/head>/i, (_, headContent) => {
-    let out = headContent.replace(
-      /(\s)(?::|x-bind:)(\w+)=["'](\$x\.[^"']+)["']/g,
-      (_, space, attr, expr) => {
+    // Process each tag in <head> that has a :attr or x-bind:attr binding
+    const out = headContent.replace(/<[^>]+>/g, (tag) => {
+      // Find all :attr="$x...." or x-bind:attr="$x...." bindings in this tag
+      const bindingRe = /\s(?::|x-bind:)(\w+)=["'](\$x\.[^"']+)["']/g;
+      let m;
+      let newTag = tag;
+      while ((m = bindingRe.exec(tag)) !== null) {
+        const attr = m[1];
+        const expr = m[2];
         const path = expr.replace(/^\$x\./, '').trim();
         const value = getXPath(xData, path);
-        if (value === undefined) return _;
-        return `${space}${attr}="${esc(value)}"`;
+        if (value === undefined) continue;
+        // Remove the binding
+        newTag = newTag.replace(m[0], '');
+        // Remove existing static fallback for this attr
+        newTag = newTag.replace(new RegExp(`\\s${attr}=["'][^"']*["']`), '');
+        // Insert the resolved attr before the closing >
+        newTag = newTag.replace(/>$/, ` ${attr}="${esc(value)}">`);
       }
-    );
+      return newTag;
+    });
     return `<head>${out}</head>`;
   });
 }
@@ -1781,8 +1816,11 @@ async function runPrerender(config) {
       paths.add(`${locale}/${seg}`);
     }
   }
-  // Default locale also under its slug (e.g. /en/, /en/page-1) so linking is symmetric; canonical points to root
-  if (defaultLocale) {
+  // Default locale also under its slug (e.g. /en/, /en/page-1) so linking is
+  // symmetric with other locales; canonical points to root.  Skip this when
+  // there's only one locale — the duplicates serve no purpose and bloat the
+  // output (every page would be written twice: at root AND under /en/).
+  if (defaultLocale && locales.length > 1) {
     paths.add(defaultLocale);
     for (const seg of localeNeutralSegments) {
       if (seg !== '') paths.add(`${defaultLocale}/${seg}`);

package/package.json CHANGED Viewed

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