domma-cms 1.6.32 → 1.6.33

package/server/services/markdown.js

@@ -18,6 +18,7 @@ import {buildMenuNav} from './menuRender.js';
 import {checkVisibility} from '../middleware/auth.js';
 import {getRoleHierarchy, getRoleLevel} from './roles.js';
 import {buildTextStyle} from '../../public/js/text-style.mjs';
+import {buildScribeStyle} from '../../public/js/scribe-style.mjs';
 import {CHARACTERS, resolveCharacterSize} from '../../public/js/celebrations/character-catalog.mjs';
 import {publicButtonSettings} from '../../public/js/form-submit.mjs';
 
@@ -1680,7 +1681,7 @@ export function parseShortcodeAttrs(attrStr) {
  */
 let scrubCallId = 0;
 
-export function scrubCodeRegions(markdown) {
+export function scrubCodeRegions(markdown, preserveIndented = false) {
   const callId = ++scrubCallId;
   const store = [];
   const placeholder = (s) => {
@@ -1694,7 +1695,10 @@ export function scrubCodeRegions(markdown) {
   // Collection bodies may already be HTML: inline examples remain literal too.
   scrubbed = scrubbed.replace(/<code\b[^>]*>[\s\S]*?<\/code>/gi, placeholder);
   // Fenced code blocks (``` or ~~~, with optional language tag)
-    scrubbed = scrubbed.replace(/^(`{3,}|~{3,})[^\n]*\n[\s\S]*?\n\1[ \t]*$/gm, placeholder);
+    scrubbed = preserveIndented
+        ? scrubbed.replace(/^ {0,3}(`{3,}|~{3,})[^\n]*\n[\s\S]*?(?:\n {0,3}\1[ \t]*$|(?![\s\S]))/gm, placeholder)
+        : scrubbed.replace(/^(`{3,}|~{3,})[^\n]*\n[\s\S]*?\n\1[ \t]*$/gm, placeholder);
+    if (preserveIndented) scrubbed = scrubbed.replace(/^(?: {4}|\t)[^\r\n]*/gm, placeholder);
   // Inline code spans (single or multiple backticks, non-greedy)
   scrubbed = scrubbed.replace(/`+[^`\n]+`+/g, placeholder);
 
@@ -1847,12 +1851,14 @@ function processEffectsBlocks(markdown) {
             if (typeof attrs[key] === 'string') attrs[key] = attrs[key].replace(/&(amp|quot|apos|lt|gt);/g, (_, name) => entities[name]);
         }
         const dataAttrs = Object.entries(attrs).map(([k, v]) => ` data-fx-${k}="${escapeAttr(v)}"`).join('');
+        const scribeStyle = buildScribeStyle(attrs);
+        const styleAttrs = scribeStyle ? ` style="${escapeAttr(scribeStyle)}"` : '';
         const hasActions = /\[\s*(render|wait|undo|redraw)\b/i.test(body);
         if (!hasActions) {
             // 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(processInlineShortcodes(restore(body.trim())))));
-            return `<div class="dm-fx-scribe"${dataAttrs}>${innerHtml}</div>\n`;
+            return `<div class="dm-fx-scribe"${dataAttrs}${styleAttrs}>${innerHtml}</div>\n`;
         }
         const actions = [];
         const actionRe = /\[render([^\]]*)\]([\s\S]*?)\[\/render\]|\[wait\]([\s\S]*?)\[\/wait\]|\[undo([^\]]*?)\/\]|\[redraw([^\]]*)\]([\s\S]*?)\[\/redraw\]/gi;
@@ -1881,7 +1887,7 @@ function processEffectsBlocks(markdown) {
             }
         }
         if (!actions.length) return '';
-        return `<span class="dm-fx-scribe"${dataAttrs} data-fx-actions="${escapeAttr(JSON.stringify(actions))}"></span>\n`;
+        return `<span class="dm-fx-scribe"${dataAttrs}${styleAttrs} data-fx-actions="${escapeAttr(JSON.stringify(actions))}"></span>\n`;
     });
 
     for (const name of ['reveal', 'breathe', 'pulse', 'shake', 'scramble', 'ripple', 'twinkle']) {
@@ -4541,7 +4547,13 @@ export async function parseMarkdown(raw, opts = {}) {
   //   → listgroup → spacer → center → icon → demo → embed → form → hero → table
   //   → badge → text → button → link → cta → grid → card (+ box) → banner → slideover
   //   → marked → sanitize → afterParse
-  const preprocessed = applyTransforms('markdown:beforeParse', content);
+  // Comments must be removed before shortcodes are expanded. Protect code
+  // examples first; four-space-indented lines remain Markdown code too.
+  const comments = scrubCodeRegions(content, true);
+  const uncommented = comments.restore(comments.scrubbed
+      .replace(/<!--[\s\S]*?(?:-->|$)/g, '')
+      .replace(/^[ ]{0,3}\/\/[^\r\n]*/gm, ''));
+  const preprocessed = applyTransforms('markdown:beforeParse', uncommented);
   const {output: withComponents, used: usedComponents} = collectAndRewriteComponents(preprocessed);
   const tagSet = new Set();
   const flags = {perViewer: false};

package/server/services/versions.js

@@ -7,6 +7,16 @@ import fs from 'fs/promises';
 import path from 'path';
 import {config} from '../config.js';
 import {hooks} from './hooks.js';
+import {getUserById} from './users.js';
+
+/** Auth tokens carry name/email, rather than the old username field. */
+export async function versionAuthor(user = {}) {
+    const record = user.id ? await getUserById(user.id) : null;
+    for (const value of [record?.name, user.name, user.username, record?.email, user.email, user.id]) {
+        if (typeof value === 'string' && value.trim()) return value.trim();
+    }
+    return 'Unknown user';
+}
 
 const VERSIONS_DIR = path.join(config.content.contentDir, 'versions');
 const PAGES_DIR = path.join(config.content.contentDir, 'pages');

package/server/templates/page.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{{seoTitle}}</title>
     <meta name="description" content="{{seoDescription}}">
-    <link rel="icon" href="/favicon.svg" type="image/svg+xml">
+    <link rel="icon" href="/favicon.ico">
     {{seoTags}}
 
     <!-- Set on preview renders (editor preview, draft preview, share link).
@@ -173,7 +173,7 @@
     </script>
 
     <!-- Site initialisation -->
-    <script src="/public/js/site.js?v=20261012-banner-dismiss" type="module"></script>
+    <script src="/public/js/site.js?v=20261012-timeline-icons" type="module"></script>
     <script src="/public/js/collection-context.js?v=20261010-utf8-payloads" type="module"></script>
     {{ctxMenusModule}}
 
@@ -191,7 +191,7 @@
     <script src="/public/js/forms.js?v=20261009-form-classes" type="module"></script>
 
     <!-- Core effects runtime -->
-    <script src="/public/js/effects.js?v=20261011-scribe-controls"></script>
+    <script src="/public/js/effects.js?v=20261012-scribe-typography"></script>
 
     <!-- Plugin body-end injection -->
     {{bodyEndInject}}