yumiamd 0.1.33 → 0.1.35

package/dist/bin.js

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

package/dist/{chunk-IY7SXY6N.js → chunk-FUQWTKHG.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 },
@@ -1814,10 +1814,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 +1827,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 +1888,10 @@ 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 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) {
@@ -1974,14 +1974,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 +2451,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 +2489,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++;
@@ -2598,6 +2596,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 "";
@@ -12052,7 +12059,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.33";
+var VERSION = "0.1.35";
 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.33";
+declare const VERSION = "0.1.35";
 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-IY7SXY6N.js";
+} from "./chunk-FUQWTKHG.js";
 export {
   DEFAULT_VIEWPORT,
   DefaultLayoutEngine,

package/package.json

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