yumiamd 0.1.34 → 0.1.36

package/dist/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runCli
-} from "./chunk-VTY4XT47.js";
+} from "./chunk-EZEUXKPI.js";
 
 // src/bin.ts
 var result = await runCli(process.argv);

package/dist/{chunk-VTY4XT47.js → chunk-EZEUXKPI.js}

@@ -40,12 +40,13 @@ function createImage(src, alt, caption, options) {
     ...options || {}
   };
 }
-function createCard(elements, title, variant) {
+function createCard(elements, title, variant, icon) {
   return {
     type: "card",
     elements,
     ...title ? { title } : {},
-    ...variant ? { variant } : {}
+    ...variant ? { variant } : {},
+    ...icon ? { icon } : {}
   };
 }
 function createMetric(value, label, variant, description, unit, change) {
@@ -1814,10 +1815,10 @@ var NativeYumiaParser = class {
         return { element: heroEl, nextIdx };
       }
       case "callout": {
-        const titleMatch = tok.args.match(/title=["']([^"']+)["']/);
-        const sevMatch = tok.args.match(/\b(?:severity|variant)=["']?([^"'\s]+)["']?/);
-        const iconMatch = tok.args.match(/\bicon=["']?([^"'\s]+)["']?/);
-        let text = this.stripQuotes(tok.args.replace(/title=["'][^"']+["']/, "").replace(/(?:severity|variant|icon)=["']?[^"'\s]+["']?/g, ""));
+        const titleVal = this.extractAttr(tok.args, "title");
+        const sevVal = this.extractAttr(tok.args, "severity") ?? this.extractAttr(tok.args, "variant");
+        const iconVal = this.extractAttr(tok.args, "icon");
+        let text = this.stripQuotes(tok.args.replace(/\btitle=(?:"[^"]*"|'[^']*'|\S+)/g, "").replace(/\b(?:severity|variant|icon)=(?:"[^"]*"|'[^']*'|\S+)/g, ""));
         let nextIdx = idx + 1;
         if (!text) {
           const cLines = [];
@@ -1827,7 +1828,7 @@ var NativeYumiaParser = class {
           }
           text = cLines.join(" ");
         }
-        const calloutEl = createCallout(text || "Note", sevMatch ? sevMatch[1] : "info", titleMatch ? titleMatch[1] : void 0, iconMatch ? iconMatch[1] : void 0);
+        const calloutEl = createCallout(text || "Note", sevVal ? sevVal : "info", titleVal, iconVal);
         calloutEl.loc = {
           start: { line: tok.lineNum, column: 1 },
           end: { line: tok.lineNum, column: tok.text.length }
@@ -1888,10 +1889,11 @@ var NativeYumiaParser = class {
         };
       }
       case "card": {
-        const titleMatch = tok.args.match(/title=["']([^"']+)["']/);
-        const variantMatch = tok.args.match(/variant=["']?([^"'\s]+)["']?/);
-        const title = titleMatch ? titleMatch[1] : this.stripQuotes(tok.args) || void 0;
-        const variant = variantMatch ? variantMatch[1] : "default";
+        const titleVal = this.extractAttr(tok.args, "title");
+        const variantVal = this.extractAttr(tok.args, "variant");
+        const iconVal = this.extractAttr(tok.args, "icon");
+        const title = titleVal ?? (this.stripQuotes(tok.args) || void 0);
+        const variant = variantVal ? variantVal : "default";
         const children = [];
         let nextIdx = idx + 1;
         while (nextIdx < tokens.length && tokens[nextIdx].indent > baseIndent) {
@@ -1903,7 +1905,7 @@ var NativeYumiaParser = class {
             nextIdx++;
           }
         }
-        return { element: createCard(children, title, variant), nextIdx };
+        return { element: createCard(children, title, variant, iconVal), nextIdx };
       }
       case "column": {
         const children = [];
@@ -1974,14 +1976,14 @@ var NativeYumiaParser = class {
         };
       }
       case "metric": {
-        const valMatch = tok.args.match(/^(?:value=)?["']([^"']+)["']/);
-        const labelMatch = tok.args.match(/\blabel=["']([^"']+)["']/);
-        const diffMatch = tok.args.match(/\bdiff=["']([^"']+)["']/);
-        const variantMatch = tok.args.match(/\bvariant=["']?([^"'\s]+)["']?/);
-        const value = valMatch ? valMatch[1] : "0";
-        const label = labelMatch ? labelMatch[1] : "Metric";
+        const valVal = this.extractAttr(tok.args, "value") ?? this.extractAttr(tok.args);
+        const labelVal = this.extractAttr(tok.args, "label");
+        const diffVal = this.extractAttr(tok.args, "diff") ?? this.extractAttr(tok.args, "change");
+        const variantVal = this.extractAttr(tok.args, "variant");
+        const value = valVal || "0";
+        const label = labelVal || "Metric";
         return {
-          element: createMetric(value, label, variantMatch ? variantMatch[1] : "primary", void 0, void 0, diffMatch ? diffMatch[1] : void 0),
+          element: createMetric(value, label, variantVal || "primary", void 0, void 0, diffVal),
           nextIdx: idx + 1
         };
       }
@@ -2451,10 +2453,8 @@ var NativeYumiaParser = class {
         return { element: classEl, nextIdx };
       }
       case "compare": {
-        const leftTitleMatch = tok.args.match(/\bleft(?:Title)?=["']([^"']+)["']/);
-        const rightTitleMatch = tok.args.match(/\bright(?:Title)?=["']([^"']+)["']/);
-        const leftTitle = leftTitleMatch ? leftTitleMatch[1] : void 0;
-        const rightTitle = rightTitleMatch ? rightTitleMatch[1] : void 0;
+        const leftTitle = this.extractAttr(tok.args, "left") ?? this.extractAttr(tok.args, "leftTitle");
+        const rightTitle = this.extractAttr(tok.args, "right") ?? this.extractAttr(tok.args, "rightTitle");
         const leftEls = [];
         const rightEls = [];
         let currentSide = "left";
@@ -2491,13 +2491,13 @@ var NativeYumiaParser = class {
         while (nextIdx < tokens.length && tokens[nextIdx].indent > baseIndent) {
           const sub = tokens[nextIdx];
           if (sub.command === "item") {
-            const dateMatch = sub.args.match(/date=["']([^"']+)["']/);
-            const titleMatch = sub.args.match(/title=["']([^"']+)["']/);
-            const descMatch = sub.args.match(/desc(?:ription)?=["']([^"']+)["']/);
+            const dateVal = this.extractAttr(sub.args, "date");
+            const titleVal = this.extractAttr(sub.args, "title");
+            const descVal = this.extractAttr(sub.args, "desc") ?? this.extractAttr(sub.args, "description");
             items.push({
-              date: dateMatch ? dateMatch[1] : "2026",
-              title: titleMatch ? titleMatch[1] : "Milestone",
-              description: descMatch ? descMatch[1] : void 0
+              date: dateVal || "2026",
+              title: titleVal || "Milestone",
+              description: descVal
             });
           }
           nextIdx++;
@@ -6513,11 +6513,26 @@ var PptxRenderer = class {
       fill: { color: borderColor },
       rectRadius: 0.03
     });
+    let titleOffset = 0.25;
+    if (card.icon) {
+      try {
+        const raster = rasterizeIcon(card.icon, 32, "#" + titleColor);
+        pptxSlide.addImage({
+          data: `image/png;base64,${raster.png.toString("base64")}`,
+          x: rect.x + 0.22,
+          y: rect.y + 0.14,
+          w: 0.24,
+          h: 0.24
+        });
+        titleOffset = 0.52;
+      } catch {
+      }
+    }
     if (card.title) {
       pptxSlide.addText(card.title, {
-        x: rect.x + 0.25,
+        x: rect.x + titleOffset,
         y: rect.y + 0.12,
-        w: rect.w - 0.5,
+        w: rect.w - titleOffset - 0.25,
         h: 0.3,
         fontSize: themeSizeToPptxPoints(theme.typography.sizes?.h4, 22),
         bold: true,
@@ -6714,12 +6729,27 @@ var PptxRenderer = class {
       line: { color: sevColor, width: 2 },
       rectRadius: 0.08
     });
+    let titleOffset = 0.2;
+    if (callout.icon) {
+      try {
+        const raster = rasterizeIcon(callout.icon, 32, "#" + sevColor);
+        pptxSlide.addImage({
+          data: `image/png;base64,${raster.png.toString("base64")}`,
+          x: rect.x + 0.2,
+          y: rect.y + 0.16,
+          w: 0.22,
+          h: 0.22
+        });
+        titleOffset = 0.48;
+      } catch {
+      }
+    }
     const titleH = callout.title ? 0.38 : 0;
     if (callout.title) {
       pptxSlide.addText(callout.title, {
-        x: rect.x + 0.2,
+        x: rect.x + titleOffset,
         y: rect.y + 0.16,
-        w: rect.w - 0.4,
+        w: rect.w - titleOffset - 0.2,
         h: 0.3,
         fontSize: 13,
         bold: true,
@@ -9687,7 +9717,9 @@ var HtmlRenderer = class {
         const c = element;
         const sev = c.severity || "info";
         const colorVar = sev === "warning" ? "var(--yumia-warning)" : sev === "danger" ? "var(--yumia-danger)" : sev === "success" ? "var(--yumia-success)" : "var(--yumia-info)";
-        const titleHtml = c.title ? `<div style="font-weight:700; font-size:1.05rem; color:${colorVar}; margin-bottom:4px;">${this.formatInline(c.title)}</div>` : "";
+        const iconSvg = c.icon ? defaultIconResolver.toSvg(c.icon, 20, colorVar, "yumia-callout-icon") : "";
+        const iconSpan = iconSvg ? `<span style="display:inline-flex; align-items:center; margin-right:8px; vertical-align:middle;">${iconSvg}</span>` : "";
+        const titleHtml = c.title ? `<div style="font-weight:700; font-size:1.05rem; color:${colorVar}; margin-bottom:4px; display:flex; align-items:center;">${iconSpan}${this.formatInline(c.title)}</div>` : iconSpan ? `<div style="margin-bottom:4px;">${iconSpan}</div>` : "";
         return `
         <div class="yumia-callout" data-severity="${sev}" data-yumia-role="callout" style="background:var(--yumia-surface); border-left:4px solid ${colorVar}; border-radius:var(--yumia-radius-card); padding:1rem 1.4rem; margin:0.8rem 0; width:100%; display:flex; flex-direction:column; gap:6px; box-sizing:border-box;">
           ${titleHtml}
@@ -9862,7 +9894,9 @@ var HtmlRenderer = class {
       case "card": {
         const card = element;
         const variant = card.variant || "default";
-        const titleHtml = card.title ? `<div class="yumia-card-title">${this.escapeHtml(card.title)}</div>` : "";
+        const iconSvg = card.icon ? defaultIconResolver.toSvg(card.icon, 20, "currentColor", "yumia-card-icon") : "";
+        const iconHtml = iconSvg ? `<span class="yumia-card-icon" style="display:inline-flex; align-items:center; vertical-align:middle;">${iconSvg}</span>` : "";
+        const titleHtml = card.title ? `<div class="yumia-card-title" style="display:flex; align-items:center; gap:8px;">${iconHtml}<span>${this.escapeHtml(card.title)}</span></div>` : iconHtml ? `<div class="yumia-card-title">${iconHtml}</div>` : "";
         const innerHtml = card.elements ? card.elements.map((child) => this.renderElement(child, theme)).join("\n") : "";
         return `
         <div class="yumia-card" data-variant="${variant}">
@@ -10932,9 +10966,20 @@ var PdfRenderer = class {
         doc.roundedRect(x, y, width, totalH, 6).fill(theme.colors.surface || "#151522");
         doc.rect(x, y, 4, totalH).fill(sevColor);
         let curY = y + 8;
+        let titleOffset = 16;
+        if (c.icon) {
+          try {
+            const raster = rasterizeIcon(c.icon, 18, sevColor);
+            doc.image(raster.png, x + 16, curY - 1, { width: 16, height: 16 });
+            titleOffset = 38;
+          } catch {
+          }
+        }
         if (c.title) {
           doc.font(this.getPdfFont(theme, "bold")).fontSize(12).fillColor(sevColor);
-          doc.text(this.stripFormatting(c.title), x + 16, curY, { width: width - 26 });
+          doc.text(this.stripFormatting(c.title), x + titleOffset, curY, {
+            width: width - titleOffset - 10
+          });
           curY += 18;
         }
         doc.font(this.getPdfFont(theme, "regular")).fontSize(12).fillColor(theme.colors.text);
@@ -11114,11 +11159,22 @@ var PdfRenderer = class {
         doc.roundedRect(x, y, width, totalCardHeight, 8).lineWidth(1.5).strokeColor(variantColor).stroke();
         doc.restore();
         let renderTop = y + cardPad;
+        let titleOffset = cardPad;
+        if (card.icon) {
+          try {
+            const raster = rasterizeIcon(card.icon, 20, variantColor);
+            doc.image(raster.png, x + cardPad, renderTop - 1, { width: 16, height: 16 });
+            titleOffset = cardPad + 22;
+          } catch {
+          }
+        }
         if (card.title) {
-          doc.font(this.getPdfFont(theme, "bold")).fontSize(15).fillColor(variantColor).text(this.stripFormatting(card.title), x + cardPad, renderTop, {
-            width: width - cardPad * 2
+          doc.font(this.getPdfFont(theme, "bold")).fontSize(15).fillColor(variantColor).text(this.stripFormatting(card.title), x + titleOffset, renderTop, {
+            width: width - cardPad - titleOffset
           });
-          renderTop += doc.heightOfString(this.stripFormatting(card.title), { width: width - cardPad * 2 }) + 8;
+          renderTop += doc.heightOfString(this.stripFormatting(card.title), {
+            width: width - cardPad - titleOffset
+          }) + 8;
         }
         if (card.elements) {
           for (const child of card.elements) {
@@ -12061,7 +12117,7 @@ function startDevServer(filePath, options = {}) {
 // src/cli.ts
 import { mkdirSync, readFileSync as readFileSync3, watch as fsWatch, writeFileSync } from "fs";
 import { basename, dirname, extname, join, resolve as resolve3 } from "path";
-var VERSION = "0.1.34";
+var VERSION = "0.1.36";
 function printHelp() {
   return `
 YumiaMD \u2014 Markdown-based presentation compiler (v${VERSION})

package/dist/index.d.ts

@@ -9,7 +9,7 @@ export * from '@yumiamd/renderer-pptx';
 export * from '@yumiamd/renderer-html';
 export * from '@yumiamd/renderer-pdf';
 
-declare const VERSION = "0.1.34";
+declare const VERSION = "0.1.36";
 declare function printHelp(): string;
 declare function runCli(argv: string[]): Promise<{
     exitCode: number;

package/dist/index.js

@@ -92,7 +92,7 @@ import {
   themeSizeToPptxPoints,
   tokyoNightTheme,
   validate
-} from "./chunk-VTY4XT47.js";
+} from "./chunk-EZEUXKPI.js";
 export {
   DEFAULT_VIEWPORT,
   DefaultLayoutEngine,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yumiamd",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "Command line interface and compiler for YumiaMD presentations",
   "type": "module",
   "main": "./dist/index.js",
@@ -22,15 +22,15 @@
   },
   "devDependencies": {
     "tsup": "^8.5.1",
-    "@yumiamd/ast": "0.1.34",
-    "@yumiamd/parser": "0.1.34",
-    "@yumiamd/layout": "0.1.34",
-    "@yumiamd/core": "0.1.34",
-    "@yumiamd/renderer-pdf": "0.1.34",
-    "@yumiamd/renderer": "0.1.34",
-    "@yumiamd/renderer-pptx": "0.1.34",
-    "@yumiamd/renderer-html": "0.1.34",
-    "@yumiamd/theme": "0.1.34"
+    "@yumiamd/ast": "0.1.36",
+    "@yumiamd/layout": "0.1.36",
+    "@yumiamd/renderer-pdf": "0.1.36",
+    "@yumiamd/core": "0.1.36",
+    "@yumiamd/renderer": "0.1.36",
+    "@yumiamd/parser": "0.1.36",
+    "@yumiamd/renderer-pptx": "0.1.36",
+    "@yumiamd/renderer-html": "0.1.36",
+    "@yumiamd/theme": "0.1.36"
   },
   "keywords": [
     "yumia",