yumiamd 0.1.32 → 0.1.34

package/dist/bin.js

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

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

@@ -1781,14 +1781,14 @@ var NativeYumiaParser = class {
     const baseIndent = tok.indent;
     switch (tok.command) {
       case "hero": {
-        const titleMatch = tok.args.match(/^(?:title=)?["']([^"']+)["']/);
-        const subMatch = tok.args.match(/\bsubtitle=["']([^"']+)["']/);
-        const tagMatch = tok.args.match(/\btagline=["']([^"']+)["']/);
-        const badgeMatch = tok.args.match(/\bbadge=["']([^"']+)["']/);
-        const alignMatch = tok.args.match(/\balign=["']?([^"'\s]+)["']?/);
-        const emphMatch = tok.args.match(/\bemphasis=["']?([^"'\s]+)["']?/);
-        const densMatch = tok.args.match(/\bdensity=["']?([^"'\s]+)["']?/);
-        const title = titleMatch ? titleMatch[1] : this.stripQuotes(tok.args) || "Hero";
+        const titleVal = this.extractAttr(tok.args, "title") ?? this.extractAttr(tok.args);
+        const subVal = this.extractAttr(tok.args, "subtitle");
+        const tagVal = this.extractAttr(tok.args, "tagline");
+        const badgeVal = this.extractAttr(tok.args, "badge");
+        const alignVal = this.extractAttr(tok.args, "align");
+        const emphVal = this.extractAttr(tok.args, "emphasis");
+        const densVal = this.extractAttr(tok.args, "density");
+        const title = (titleVal ?? this.stripQuotes(tok.args)) || "Hero";
         const children = [];
         let nextIdx = idx + 1;
         while (nextIdx < tokens.length && tokens[nextIdx].indent > baseIndent) {
@@ -1800,12 +1800,12 @@ var NativeYumiaParser = class {
             nextIdx++;
           }
         }
-        const heroEl = createHero(title, subMatch ? subMatch[1] : void 0, children.length > 0 ? children : void 0, {
-          tagline: tagMatch ? tagMatch[1] : void 0,
-          badge: badgeMatch ? badgeMatch[1] : void 0,
-          align: alignMatch ? alignMatch[1] : void 0,
-          emphasis: emphMatch ? emphMatch[1] : void 0,
-          density: densMatch ? densMatch[1] : void 0
+        const heroEl = createHero(title, subVal, children.length > 0 ? children : void 0, {
+          tagline: tagVal,
+          badge: badgeVal,
+          align: alignVal,
+          emphasis: emphVal,
+          density: densVal
         });
         heroEl.loc = {
           start: { line: tok.lineNum, column: 1 },
@@ -2598,6 +2598,15 @@ var NativeYumiaParser = class {
       return template;
     }
   }
+  extractAttr(argsStr, key) {
+    if (!argsStr)
+      return void 0;
+    const pattern = key ? new RegExp(`\\b${key}=(?:"([^"]*)"|'([^']*)'|([^\\s"']+))`) : /^(?:"([^"]*)"|'([^']*)')/;
+    const m = argsStr.match(pattern);
+    if (!m)
+      return void 0;
+    return m[1] ?? m[2] ?? m[3];
+  }
   stripQuotes(str) {
     if (!str)
       return "";
@@ -10780,6 +10789,10 @@ var PdfRenderer = class {
       }
       return;
     }
+    if (el.type === "diagram") {
+      this.renderDiagram(doc, el, x, y, w, h, theme);
+      return;
+    }
     this.renderElement(doc, el, x, y, w, theme, presentation);
   }
   paintCardFrame(doc, card, x, y, width, height, theme) {
@@ -11671,7 +11684,7 @@ var PdfRenderer = class {
         return curY;
       }
       case "diagram": {
-        return this.renderDiagram(doc, element, x, y, width, theme);
+        return this.renderDiagram(doc, element, x, y, width, void 0, theme);
       }
       case "sequence": {
         return this.renderSequence(doc, element, x, y, width, theme);
@@ -11683,19 +11696,46 @@ var PdfRenderer = class {
         return y;
     }
   }
-  renderDiagram(doc, diagram, x, y, width, theme) {
+  renderDiagram(doc, diagram, x, y, width, height, theme) {
     const isLR = (diagram.direction || "LR").toUpperCase() === "LR";
     if (diagram.nodes.length === 0)
       return y;
-    const layout = computeDiagramLayout(diagram, width, isLR, {
-      originX: x,
-      originY: y,
-      titleHeight: 24
+    const layout = computeDiagramLayout(diagram, 1e3, isLR, {
+      originX: 0,
+      originY: diagram.title ? 30 : 0,
+      titleHeight: diagram.title ? 30 : 0
     });
-    const { nodeWidth: nodeW, nodeHeight: nodeH, positions } = layout;
+    const { nodeWidth: rawNodeW, nodeHeight: rawNodeH, positions: rawPositions } = layout;
+    let minX = Infinity;
+    let minY = Infinity;
+    let maxX = 0;
+    let maxY = 0;
+    for (const p of Object.values(rawPositions)) {
+      minX = Math.min(minX, p.x);
+      minY = Math.min(minY, p.y);
+      maxX = Math.max(maxX, p.x + rawNodeW);
+      maxY = Math.max(maxY, p.y + rawNodeH);
+    }
+    const contentW = Math.max(1, maxX - minX);
+    const contentH = Math.max(1, maxY - minY);
+    const titleH = diagram.title ? 18 : 0;
     if (diagram.title) {
       doc.font(this.getPdfFont(theme, "bold")).fontSize(14).fillColor(theme.colors.primary).text(this.stripFormatting(diagram.title), x, y, { width, align: "center" });
     }
+    const drawY = y + titleH;
+    const drawH = height !== void 0 ? Math.max(24, height - titleH) : contentH;
+    const scale = Math.min(width / contentW, drawH / contentH, 1);
+    const nodeW = rawNodeW * scale;
+    const nodeH = rawNodeH * scale;
+    const offsetX = x + (width - contentW * scale) / 2;
+    const offsetY = drawY + (drawH - contentH * scale) / 2;
+    const positions = {};
+    for (const [id, p] of Object.entries(rawPositions)) {
+      positions[id] = {
+        x: offsetX + (p.x - minX) * scale,
+        y: offsetY + (p.y - minY) * scale
+      };
+    }
     const arrowColor = theme.colors.accent || theme.colors.primary;
     diagram.edges.forEach((e) => {
       const p1 = positions[e.from];
@@ -11708,7 +11748,7 @@ var PdfRenderer = class {
       const last = pts[pts.length - 1];
       const prev = pts[pts.length - 2];
       doc.save();
-      doc.lineWidth(1.5).strokeColor(arrowColor);
+      doc.lineWidth(Math.max(1, 1.5 * scale)).strokeColor(arrowColor);
       if (e.style === "dashed")
         doc.dash(4, { space: 3 });
       doc.moveTo(pts[0].x, pts[0].y);
@@ -11717,7 +11757,7 @@ var PdfRenderer = class {
       doc.stroke();
       doc.restore();
       const angle = Math.atan2(last.y - prev.y, last.x - prev.x);
-      const headLen = 6;
+      const headLen = Math.max(4, 6 * scale);
       doc.save();
       doc.fillColor(arrowColor);
       doc.moveTo(last.x, last.y).lineTo(last.x - headLen * Math.cos(angle - Math.PI / 6), last.y - headLen * Math.sin(angle - Math.PI / 6)).lineTo(last.x - headLen * Math.cos(angle + Math.PI / 6), last.y - headLen * Math.sin(angle + Math.PI / 6)).fill();
@@ -11727,15 +11767,19 @@ var PdfRenderer = class {
         const midX = mid.x;
         const midY = mid.y;
         const labelText = this.stripFormatting(e.label);
-        const labelW = Math.min(90, Math.max(45, labelText.length * 5.5 + 16));
+        const labelW = Math.min(90 * scale, Math.max(45 * scale, labelText.length * 5.5 * scale + 16));
+        const labelH = Math.max(12, 16 * scale);
         doc.save();
-        doc.roundedRect(midX - labelW / 2, midY - 8, labelW, 16, 4).fill(theme.colors.surface || "#151522");
-        doc.roundedRect(midX - labelW / 2, midY - 8, labelW, 16, 4).lineWidth(0.8).strokeColor(theme.colors.border || "#334155").stroke();
+        doc.roundedRect(midX - labelW / 2, midY - labelH / 2, labelW, labelH, 4).fill(theme.colors.surface || "#151522");
+        doc.roundedRect(midX - labelW / 2, midY - labelH / 2, labelW, labelH, 4).lineWidth(0.8).strokeColor(theme.colors.border || "#334155").stroke();
         doc.restore();
-        doc.font(this.getPdfFont(theme, "bold")).fontSize(7.5).fillColor(theme.colors.muted || "#888888").text(labelText, midX - labelW / 2, midY - 5, { width: labelW, align: "center" });
+        doc.font(this.getPdfFont(theme, "bold")).fontSize(Math.max(6, 7.5 * scale)).fillColor(theme.colors.muted || "#888888").text(labelText, midX - labelW / 2, midY - labelH / 2 + 2, {
+          width: labelW,
+          align: "center"
+        });
       }
     });
-    const maxChars = Math.max(6, Math.floor((nodeW - 10) / 6));
+    const maxChars = Math.max(6, Math.floor((nodeW - 10) / Math.max(4, 6 * scale)));
     diagram.nodes.forEach((n) => {
       const p = positions[n.id];
       if (!p)
@@ -11753,18 +11797,18 @@ var PdfRenderer = class {
       else if (variant === "info")
         nodeColor = theme.colors.info || theme.colors.primary;
       doc.save();
-      doc.roundedRect(p.x, p.y, nodeW, nodeH, 6).fill(theme.colors.surface || "#151522");
-      doc.roundedRect(p.x, p.y, nodeW, nodeH, 6).lineWidth(1.5).strokeColor(nodeColor).stroke();
+      doc.roundedRect(p.x, p.y, nodeW, nodeH, Math.max(3, 6 * scale)).fill(theme.colors.surface || "#151522");
+      doc.roundedRect(p.x, p.y, nodeW, nodeH, Math.max(3, 6 * scale)).lineWidth(Math.max(1, 1.5 * scale)).strokeColor(nodeColor).stroke();
       doc.restore();
       const label = fitDiagramLabel(this.stripFormatting(n.label), maxChars);
-      doc.font(this.getPdfFont(theme, "bold")).fontSize(Math.min(10, Math.max(7.5, nodeH / 4))).fillColor(theme.colors.text).text(label, p.x + 4, p.y + Math.max(4, nodeH / 2 - 6), {
+      doc.font(this.getPdfFont(theme, "bold")).fontSize(Math.min(10, Math.max(6.5, nodeH / 4))).fillColor(theme.colors.text).text(label, p.x + 4, p.y + Math.max(3, nodeH / 2 - 5), {
         width: nodeW - 8,
-        height: nodeH - 8,
+        height: nodeH - 6,
         align: "center",
         ellipsis: true
       });
     });
-    return y + layout.height + 8;
+    return height !== void 0 ? y + height : y + titleH + contentH * scale + 8;
   }
   renderSequence(doc, s, x, y, width, theme) {
     const participants = s.participants || [];
@@ -12017,7 +12061,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.32";
+var VERSION = "0.1.34";
 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.32";
+declare const VERSION = "0.1.34";
 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-Y2OWK5OP.js";
+} from "./chunk-VTY4XT47.js";
 export {
   DEFAULT_VIEWPORT,
   DefaultLayoutEngine,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yumiamd",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "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/layout": "0.1.32",
-    "@yumiamd/ast": "0.1.32",
-    "@yumiamd/renderer-pdf": "0.1.32",
-    "@yumiamd/parser": "0.1.32",
-    "@yumiamd/renderer": "0.1.32",
-    "@yumiamd/theme": "0.1.32",
-    "@yumiamd/renderer-html": "0.1.32",
-    "@yumiamd/renderer-pptx": "0.1.32",
-    "@yumiamd/core": "0.1.32"
+    "@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"
   },
   "keywords": [
     "yumia",