domma-cms 0.25.1 → 0.25.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "0.25.1",
+  "version": "0.25.2",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",
@@ -23,7 +23,8 @@
     "scripts/",
     "docs/",
     "CHANGELOG.md",
-    "CLAUDE.md"
+    "CLAUDE.md",
+    "FEATURES.md"
   ],
   "scripts": {
     "test": "node --test --test-concurrency=1 'tests/**/*.test.js'",

package/server/services/markdown.js

@@ -1177,12 +1177,26 @@ export function parseShortcodeAttrs(attrStr) {
  * @param {string} markdown
  * @returns {{ scrubbed: string, restore: (s: string) => string }}
  */
+/**
+ * Monotonic id namespacing each scrubCodeRegions call. Scrub/restore pairs
+ * NEST: a shortcode handler may run nested processors (processCardBlocks,
+ * processGridBlocks, …) on an already-scrubbed body, and each of those scrubs
+ * again. Without a per-call id, the inner restore's regex also matched the
+ * OUTER call's placeholders and looked them up in the wrong store —
+ * `store[idx]` → undefined, which surfaced as literal "undefined" strings
+ * wherever inline code appeared inside [reveal]/effects bodies. With the id,
+ * each restore only touches its own placeholders and the outer restore picks
+ * up the rest on the way out.
+ */
+let scrubCallId = 0;
+
 export function scrubCodeRegions(markdown) {
+  const callId = ++scrubCallId;
   const store = [];
   const placeholder = (s) => {
     const idx = store.length;
     store.push(s);
-    return `\x02SC${idx}\x03`;
+    return `\x02SC${callId}:${idx}\x03`;
   };
 
     // HTML <pre><code>...</code></pre> blocks (rendered by earlier marked.parse calls inside accordion/carousel etc.)
@@ -1192,7 +1206,7 @@ export function scrubCodeRegions(markdown) {
   // Inline code spans (single or multiple backticks, non-greedy)
   scrubbed = scrubbed.replace(/`+[^`\n]+`+/g, placeholder);
 
-  const restore = (s) => s.replace(/\x02SC(\d+)\x03/g, (_, i) => store[parseInt(i, 10)]);
+  const restore = (s) => s.replace(new RegExp(`\\x02SC${callId}:(\\d+)\\x03`, 'g'), (_, i) => store[parseInt(i, 10)]);
   return {scrubbed, restore};
 }
 
@@ -1306,7 +1320,9 @@ function processEffectsBlocks(markdown) {
         if (attrs.continuous === 'true') classes.push('firework-continuous');
         if (attrs.hover === 'true') classes.push('firework-on-hover');
         if (body === null) return `<div class="${classes.join(' ')}"></div>`;
-        const innerHtml = marked.parse(processCardBlocks(processGridBlocks(body.trim())));
+        // Restore code placeholders before the nested parse (tabs-handler
+        // pattern) so code spans/fences render as <code>, not raw backticks.
+        const innerHtml = marked.parse(processCardBlocks(processGridBlocks(restore(body.trim()))));
         return `<div class="${classes.join(' ')}">${innerHtml}</div>\n`;
     });
 
@@ -1321,7 +1337,9 @@ function processEffectsBlocks(markdown) {
         const dataAttrs = Object.entries(attrs).map(([k, v]) => ` data-fx-${k}="${escapeAttr(v)}"`).join('');
         const hasActions = /\[\s*(render|wait|undo|redraw)\b/.test(body);
         if (!hasActions) {
-            const innerHtml = marked.parse(processCardBlocks(processGridBlocks(body.trim())));
+            // Restore code placeholders before the nested parse (tabs-handler
+        // pattern) so code spans/fences render as <code>, not raw backticks.
+        const innerHtml = marked.parse(processCardBlocks(processGridBlocks(restore(body.trim()))));
             return `<div class="dm-fx-scribe"${dataAttrs}>${innerHtml}</div>\n`;
         }
         const actions = [];
@@ -1358,7 +1376,9 @@ function processEffectsBlocks(markdown) {
             if (body === null) return '';
             const attrs = parseShortcodeAttrs(attrStr);
             const dataAttrs = Object.entries(attrs).map(([k, v]) => ` data-fx-${k}="${v}"`).join('');
-            const innerHtml = marked.parse(processCardBlocks(processGridBlocks(body.trim())));
+            // Restore code placeholders before the nested parse (tabs-handler
+        // pattern) so code spans/fences render as <code>, not raw backticks.
+        const innerHtml = marked.parse(processCardBlocks(processGridBlocks(restore(body.trim()))));
             return `<div class="dm-fx-${name}"${dataAttrs}>${innerHtml}</div>\n`;
         });
     }
@@ -1373,7 +1393,9 @@ function processEffectsBlocks(markdown) {
         if (body === null) {
             return `<div class="dm-fx-ticker-tape" data-fx-mode="page"${dataAttrs}></div>`;
         }
-        const innerHtml = marked.parse(processCardBlocks(processGridBlocks(body.trim())));
+        // Restore code placeholders before the nested parse (tabs-handler
+        // pattern) so code spans/fences render as <code>, not raw backticks.
+        const innerHtml = marked.parse(processCardBlocks(processGridBlocks(restore(body.trim()))));
         return `<div class="dm-fx-ticker-tape" data-fx-mode="container"${dataAttrs}>${innerHtml}</div>\n`;
     });
 
@@ -1385,7 +1407,7 @@ function processEffectsBlocks(markdown) {
         if (attrs.duration) classes.push(`animate-duration-${attrs.duration}`);
         if (attrs.delay) classes.push(`animate-delay-${attrs.delay}`);
         if (attrs.repeat) classes.push(`animate-${attrs.repeat}`);
-        return `<div class="${classes.join(' ')}">${marked.parse(processCardBlocks(processGridBlocks(body.trim())))}</div>\n`;
+        return `<div class="${classes.join(' ')}">${marked.parse(processCardBlocks(processGridBlocks(restore(body.trim()))))}</div>\n`;
     });
 
     apply('ambient', (attrStr, body) => {
@@ -1395,7 +1417,7 @@ function processEffectsBlocks(markdown) {
         if (attrs.type) classes.push(`bg-ambient-${attrs.type}`);
         if (attrs.speed) classes.push(`bg-ambient-${attrs.speed}`);
         if (attrs.intensity) classes.push(`bg-ambient-${attrs.intensity}`);
-        return `<div class="${classes.join(' ')}">${marked.parse(processCardBlocks(processGridBlocks(body.trim())))}</div>\n`;
+        return `<div class="${classes.join(' ')}">${marked.parse(processCardBlocks(processGridBlocks(restore(body.trim()))))}</div>\n`;
     });
 
     return restore(result);