domma-cms 0.46.4 → 0.47.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "0.46.4",
+  "version": "0.47.0",
   "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",

package/public/js/text-style.mjs

@@ -0,0 +1 @@
+export const SIZE_MAP={xs:".75rem",sm:".875rem",base:"1rem",lg:"1.125rem",xl:"1.25rem","2xl":"1.5rem","3xl":"1.875rem","4xl":"2.25rem"},WEIGHT_MAP={thin:"100",light:"300",normal:"400",medium:"500",semibold:"600",bold:"700",extrabold:"800",black:"900"},SPACING_MAP={tight:"-0.05em",normal:"0em",wide:"0.05em",wider:"0.1em"},COLOUR_TOKENS={primary:"var(--dm-color-primary)",secondary:"var(--dm-color-secondary)",muted:"var(--dm-text-muted)",danger:"var(--dm-color-danger)",success:"var(--dm-color-success)",warning:"var(--dm-color-warning)",info:"var(--dm-color-info)"},FONT_MAP={Georgia:"Georgia,serif",Arial:"Arial,sans-serif",Verdana:"Verdana,sans-serif","Courier New":"'Courier New',monospace","Times New Roman":"'Times New Roman',serif","Trebuchet MS":"'Trebuchet MS',sans-serif"},TRANSFORM_MAP={upper:"uppercase",lower:"lowercase",capitalize:"capitalize",none:"none"},DECORATION_MAP={underline:"underline","line-through":"line-through",none:"none"};function l(e){return e!=null&&e!==!1&&e!=="false"&&e!=="0"}function i(e){return String(e).replace(/["<>]/g,"").trim()}export function buildTextStyle(e={}){const o=[];if(e.size&&o.push(`font-size:${SIZE_MAP[e.size]||i(e.size)}`),e["point-size"]){const r=parseFloat(e["point-size"]);!isNaN(r)&&r>0&&o.push(`font-size:${r}pt`)}l(e.bold)?o.push("font-weight:700"):e.weight&&WEIGHT_MAP[e.weight]&&o.push(`font-weight:${WEIGHT_MAP[e.weight]}`),l(e.italic)&&o.push("font-style:italic");const n=e.colour||e.color;return n&&o.push(`color:${COLOUR_TOKENS[n]||i(n)}`),e.font&&FONT_MAP[e.font]&&o.push(`font-family:${FONT_MAP[e.font]}`),e.transform&&TRANSFORM_MAP[e.transform]&&o.push(`text-transform:${TRANSFORM_MAP[e.transform]}`),e.decoration&&DECORATION_MAP[e.decoration]&&o.push(`text-decoration:${DECORATION_MAP[e.decoration]}`),e.spacing&&o.push(`letter-spacing:${SPACING_MAP[e.spacing]||i(e.spacing)}`),e.align&&(o.push("display:block"),o.push(`text-align:${i(e.align)}`)),e.style&&o.push(i(e.style).replace(/;+$/,"")),o.join(";")}

package/server/services/markdown.js

@@ -15,6 +15,7 @@ import {getMenu, resolveLocation, resolveMenuDecorations} from './menus.js';
 import {buildMenuNav} from './menuRender.js';
 import {checkVisibility} from '../middleware/auth.js';
 import {getRoleHierarchy} from './roles.js';
+import {buildTextStyle} from '../../public/js/text-style.mjs';
 
 const __dirname_md = path.dirname(fileURLToPath(import.meta.url));
 const BLOCKS_DIR = path.resolve(__dirname_md, '../../content/blocks');
@@ -3014,94 +3015,12 @@ function processBadgeBlocks(markdown) {
 function processTextBlocks(markdown) {
     const {scrubbed, restore} = scrubCodeRegions(markdown);
 
-    const SIZE_MAP = {
-        xs: '.75rem', sm: '.875rem', base: '1rem', lg: '1.125rem',
-        xl: '1.25rem', '2xl': '1.5rem', '3xl': '1.875rem', '4xl': '2.25rem',
-    };
-    const WEIGHT_MAP = {
-        thin: '100', light: '300', normal: '400', medium: '500',
-        semibold: '600', bold: '700', extrabold: '800', black: '900',
-    };
-    const SPACING_MAP = {
-        tight: '-0.05em', normal: '0em', wide: '0.05em', wider: '0.1em',
-    };
-    const COLOR_TOKENS = {
-        primary: 'var(--dm-color-primary)', secondary: 'var(--dm-color-secondary)',
-        muted: 'var(--dm-text-muted)', danger: 'var(--dm-color-danger)',
-        success: 'var(--dm-color-success)', warning: 'var(--dm-color-warning)',
-        info: 'var(--dm-color-info)',
-    };
-    const FONT_MAP = {
-        'Georgia': 'Georgia,serif',
-        'Arial': 'Arial,sans-serif',
-        'Verdana': 'Verdana,sans-serif',
-        'Courier New': "'Courier New',monospace",
-        'Times New Roman': "'Times New Roman',serif",
-        'Trebuchet MS': "'Trebuchet MS',sans-serif",
-    };
-    const TRANSFORM_MAP = {
-        upper: 'uppercase', lower: 'lowercase', capitalize: 'capitalize', none: 'none',
-    };
-    const DECORATION_MAP = {
-        underline: 'underline', 'line-through': 'line-through', none: 'none',
-    };
-
     function buildText(attrStr, inner) {
         const attrs = parseShortcodeAttrs(attrStr || '');
-        const styles = [];
-
-        if (attrs.size) {
-            styles.push(`font-size:${SIZE_MAP[attrs.size] || attrs.size}`);
-        }
-
-        if (attrs['point-size']) {
-            const pt = parseFloat(attrs['point-size']);
-            if (!isNaN(pt) && pt > 0) styles.push(`font-size:${pt}pt`);
-        }
-
-        // bold flag takes precedence over weight attr
-        const isBold = /\bbold\b/i.test(attrStr);
-        if (isBold) {
-            styles.push('font-weight:700');
-        } else if (attrs.weight && WEIGHT_MAP[attrs.weight]) {
-            styles.push(`font-weight:${WEIGHT_MAP[attrs.weight]}`);
-        }
-
-        if (/\bitalic\b/i.test(attrStr)) {
-            styles.push('font-style:italic');
-        }
-
-        const colourVal = attrs.colour || attrs.color;
-        if (colourVal) {
-            styles.push(`color:${COLOR_TOKENS[colourVal] || colourVal}`);
-        }
-
-        if (attrs.font && FONT_MAP[attrs.font]) {
-            styles.push(`font-family:${FONT_MAP[attrs.font]}`);
-        }
-
-        if (attrs.transform && TRANSFORM_MAP[attrs.transform]) {
-            styles.push(`text-transform:${TRANSFORM_MAP[attrs.transform]}`);
-        }
-
-        if (attrs.decoration && DECORATION_MAP[attrs.decoration]) {
-            styles.push(`text-decoration:${DECORATION_MAP[attrs.decoration]}`);
-        }
-
-        if (attrs.spacing) {
-            styles.push(`letter-spacing:${SPACING_MAP[attrs.spacing] || attrs.spacing}`);
-        }
-
-        if (attrs.align) {
-            styles.push('display:block');
-            styles.push(`text-align:${escapeAttr(attrs.align)}`);
-        }
-
-        if (attrs.style) {
-            styles.push(attrs.style.trim().replace(/;+$/, ''));
-        }
-
-        const styleAttr = styles.length ? ` style="${styles.join(';')}"` : '';
+        // The attribute → CSS mapping is shared with the admin editor's live
+        // preview (public/js/text-style.mjs), so the two cannot disagree.
+        const style = buildTextStyle(attrs);
+        const styleAttr = style ? ` style="${style}"` : '';
         const classAttr = attrs.class ? ` class="${escapeAttr(attrs.class)}"` : '';
         const idAttr = attrs.id ? ` id="${escapeAttr(attrs.id)}"` : '';