@zenuml/core 4.8.0 → 4.9.0

package/dist/cli/zenuml.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env bun
 import antlr4 from 'antlr4';
 import { marked } from 'marked';
+import colorString from 'color-string';
 import { readFileSync, statSync, mkdirSync, writeFileSync, watch } from 'node:fs';
 import { resolve, join, dirname, basename, extname } from 'node:path';
 
@@ -1606,7 +1607,7 @@ class sequenceParserListener extends antlr4.tree.ParseTreeListener {
 
 // Generated from java-escape by ANTLR 4.11.1
 // jshint ignore: start
-const serializedATN = [4,1,81,658,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,
+const serializedATN = [4,1,81,659,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,
 4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,2,10,7,10,2,11,7,11,2,12,7,12,
 2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,7,17,2,18,7,18,2,19,7,19,2,
 20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,2,24,7,24,2,25,7,25,2,26,7,26,2,27,
@@ -1655,17 +1656,17 @@ const serializedATN = [4,1,81,658,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,
 1,55,1,55,1,55,1,55,1,55,1,55,1,55,1,55,1,55,1,55,1,55,1,55,1,55,1,55,1,
 55,1,55,1,55,1,55,5,55,621,8,55,10,55,12,55,624,9,55,1,56,1,56,1,56,1,56,
 1,56,1,56,1,56,1,56,3,56,634,8,56,1,57,1,57,3,57,638,8,57,1,57,3,57,641,
-8,57,1,58,1,58,1,58,1,58,3,58,647,8,58,1,59,1,59,1,59,1,59,1,60,4,60,654,
-8,60,11,60,12,60,655,1,60,0,1,110,61,0,2,4,6,8,10,12,14,16,18,20,22,24,26,
-28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,
-76,78,80,82,84,86,88,90,92,94,96,98,100,102,104,106,108,110,112,114,116,
-118,120,0,13,2,0,8,8,20,20,2,0,9,9,19,19,2,0,62,62,67,69,2,0,11,11,24,24,
-2,0,62,62,67,67,1,0,25,27,1,0,23,24,1,0,19,22,1,0,17,18,1,0,63,64,1,0,37,
-38,1,0,68,69,2,0,62,62,66,67,741,0,141,1,0,0,0,2,143,1,0,0,0,4,164,1,0,0,
-0,6,166,1,0,0,0,8,191,1,0,0,0,10,193,1,0,0,0,12,216,1,0,0,0,14,231,1,0,0,
-0,16,236,1,0,0,0,18,238,1,0,0,0,20,240,1,0,0,0,22,242,1,0,0,0,24,249,1,0,
-0,0,26,252,1,0,0,0,28,272,1,0,0,0,30,286,1,0,0,0,32,288,1,0,0,0,34,290,1,
-0,0,0,36,308,1,0,0,0,38,316,1,0,0,0,40,324,1,0,0,0,42,332,1,0,0,0,44,345,
+8,57,1,58,1,58,1,58,1,58,1,58,3,58,648,8,58,1,59,1,59,1,59,1,59,1,60,4,60,
+655,8,60,11,60,12,60,656,1,60,0,1,110,61,0,2,4,6,8,10,12,14,16,18,20,22,
+24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,
+72,74,76,78,80,82,84,86,88,90,92,94,96,98,100,102,104,106,108,110,112,114,
+116,118,120,0,13,2,0,8,8,20,20,2,0,9,9,19,19,2,0,62,62,67,69,2,0,11,11,24,
+24,2,0,62,62,67,67,1,0,25,27,1,0,23,24,1,0,19,22,1,0,17,18,1,0,63,64,1,0,
+37,38,1,0,68,69,2,0,62,64,66,67,743,0,141,1,0,0,0,2,143,1,0,0,0,4,164,1,
+0,0,0,6,166,1,0,0,0,8,191,1,0,0,0,10,193,1,0,0,0,12,216,1,0,0,0,14,231,1,
+0,0,0,16,236,1,0,0,0,18,238,1,0,0,0,20,240,1,0,0,0,22,242,1,0,0,0,24,249,
+1,0,0,0,26,252,1,0,0,0,28,272,1,0,0,0,30,286,1,0,0,0,32,288,1,0,0,0,34,290,
+1,0,0,0,36,308,1,0,0,0,38,316,1,0,0,0,40,324,1,0,0,0,42,332,1,0,0,0,44,345,
 1,0,0,0,46,347,1,0,0,0,48,352,1,0,0,0,50,387,1,0,0,0,52,389,1,0,0,0,54,407,
 1,0,0,0,56,412,1,0,0,0,58,417,1,0,0,0,60,426,1,0,0,0,62,431,1,0,0,0,64,435,
 1,0,0,0,66,439,1,0,0,0,68,446,1,0,0,0,70,466,1,0,0,0,72,468,1,0,0,0,74,470,
@@ -1673,7 +1674,7 @@ const serializedATN = [4,1,81,658,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,
 1,0,0,0,86,509,1,0,0,0,88,514,1,0,0,0,90,517,1,0,0,0,92,527,1,0,0,0,94,530,
 1,0,0,0,96,536,1,0,0,0,98,539,1,0,0,0,100,549,1,0,0,0,102,554,1,0,0,0,104,
 560,1,0,0,0,106,564,1,0,0,0,108,570,1,0,0,0,110,597,1,0,0,0,112,633,1,0,
-0,0,114,635,1,0,0,0,116,646,1,0,0,0,118,648,1,0,0,0,120,653,1,0,0,0,122,
+0,0,114,635,1,0,0,0,116,647,1,0,0,0,118,649,1,0,0,0,120,654,1,0,0,0,122,
 124,3,2,1,0,123,122,1,0,0,0,123,124,1,0,0,0,124,125,1,0,0,0,125,142,5,0,
 0,1,126,128,3,2,1,0,127,126,1,0,0,0,127,128,1,0,0,0,128,129,1,0,0,0,129,
 130,3,4,2,0,130,131,5,0,0,1,131,142,1,0,0,0,132,134,3,2,1,0,133,132,1,0,
@@ -1823,17 +1824,18 @@ const serializedATN = [4,1,81,658,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,
 0,633,627,1,0,0,0,633,628,1,0,0,0,633,629,1,0,0,0,633,630,1,0,0,0,633,631,
 1,0,0,0,633,632,1,0,0,0,634,113,1,0,0,0,635,637,5,33,0,0,636,638,3,116,58,
 0,637,636,1,0,0,0,637,638,1,0,0,0,638,640,1,0,0,0,639,641,5,34,0,0,640,639,
-1,0,0,0,640,641,1,0,0,0,641,115,1,0,0,0,642,647,3,112,56,0,643,647,3,110,
-55,0,644,647,3,118,59,0,645,647,3,120,60,0,646,642,1,0,0,0,646,643,1,0,0,
-0,646,644,1,0,0,0,646,645,1,0,0,0,647,117,1,0,0,0,648,649,7,4,0,0,649,650,
-5,55,0,0,650,651,7,4,0,0,651,119,1,0,0,0,652,654,7,12,0,0,653,652,1,0,0,
-0,654,655,1,0,0,0,655,653,1,0,0,0,655,656,1,0,0,0,656,121,1,0,0,0,103,123,
-127,133,136,141,145,148,152,154,158,160,164,168,174,178,180,185,188,191,
-196,199,202,206,209,212,216,225,229,231,236,249,254,258,261,266,270,272,
-279,284,286,303,308,312,316,320,324,328,332,337,340,345,350,359,364,369,
-372,378,381,384,387,392,397,400,404,407,412,422,426,431,437,441,446,454,
-459,464,466,480,486,489,498,502,507,512,521,525,532,543,547,552,558,562,
-566,572,575,586,597,620,622,633,637,640,646,655];
+1,0,0,0,640,641,1,0,0,0,641,115,1,0,0,0,642,648,3,112,56,0,643,648,3,110,
+55,0,644,648,3,118,59,0,645,648,3,120,60,0,646,648,3,24,12,0,647,642,1,0,
+0,0,647,643,1,0,0,0,647,644,1,0,0,0,647,645,1,0,0,0,647,646,1,0,0,0,648,
+117,1,0,0,0,649,650,7,4,0,0,650,651,5,55,0,0,651,652,7,4,0,0,652,119,1,0,
+0,0,653,655,7,12,0,0,654,653,1,0,0,0,655,656,1,0,0,0,656,654,1,0,0,0,656,
+657,1,0,0,0,657,121,1,0,0,0,103,123,127,133,136,141,145,148,152,154,158,
+160,164,168,174,178,180,185,188,191,196,199,202,206,209,212,216,225,229,
+231,236,249,254,258,261,266,270,272,279,284,286,303,308,312,316,320,324,
+328,332,337,340,345,350,359,364,369,372,378,381,384,387,392,397,400,404,
+407,412,422,426,431,437,441,446,454,459,464,466,480,486,489,498,502,507,
+512,521,525,532,543,547,552,558,562,566,572,575,586,597,620,622,633,637,
+640,647,656];
 
 
 const atn = new antlr4.atn.ATNDeserializer().deserialize(serializedATN);
@@ -4837,7 +4839,7 @@ class sequenceParser extends antlr4.Parser {
 	    let localctx = new ConditionContext(this, this._ctx, this.state);
 	    this.enterRule(localctx, 116, sequenceParser.RULE_condition);
 	    try {
-	        this.state = 646;
+	        this.state = 647;
 	        this._errHandler.sync(this);
 	        var la_ = this._interp.adaptivePredict(this._input,101,this._ctx);
 	        switch(la_) {
@@ -4865,6 +4867,12 @@ class sequenceParser extends antlr4.Parser {
 	            this.textExpr();
 	            break;
 
+	        case 5:
+	            this.enterOuterAlt(localctx, 5);
+	            this.state = 646;
+	            this.emoji();
+	            break;
+
 	        }
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
@@ -4888,7 +4896,7 @@ class sequenceParser extends antlr4.Parser {
 	    var _la = 0; // Token type
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 648;
+	        this.state = 649;
 	        _la = this._input.LA(1);
 	        if(!(_la===62 || _la===67)) {
 	        this._errHandler.recoverInline(this);
@@ -4897,9 +4905,9 @@ class sequenceParser extends antlr4.Parser {
 	        	this._errHandler.reportMatch(this);
 	            this.consume();
 	        }
-	        this.state = 649;
-	        this.match(sequenceParser.IN);
 	        this.state = 650;
+	        this.match(sequenceParser.IN);
+	        this.state = 651;
 	        _la = this._input.LA(1);
 	        if(!(_la===62 || _la===67)) {
 	        this._errHandler.recoverInline(this);
@@ -4930,15 +4938,15 @@ class sequenceParser extends antlr4.Parser {
 	    var _la = 0; // Token type
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 653; 
+	        this.state = 654; 
 	        this._errHandler.sync(this);
 	        var _alt = 1;
 	        do {
 	        	switch (_alt) {
 	        	case 1:
-	        		this.state = 652;
+	        		this.state = 653;
 	        		_la = this._input.LA(1);
-	        		if(!(((((_la - 62)) & ~0x1f) == 0 && ((1 << (_la - 62)) & 49) !== 0))) {
+	        		if(!(((((_la - 62)) & ~0x1f) == 0 && ((1 << (_la - 62)) & 55) !== 0))) {
 	        		this._errHandler.recoverInline(this);
 	        		}
 	        		else {
@@ -4949,7 +4957,7 @@ class sequenceParser extends antlr4.Parser {
 	        	default:
 	        		throw new antlr4.error.NoViableAltException(this);
 	        	}
-	        	this.state = 655; 
+	        	this.state = 656; 
 	        	this._errHandler.sync(this);
 	        	_alt = this._interp.adaptivePredict(this._input,102, this._ctx);
 	        } while ( _alt!=2 && _alt!=antlr4.atn.ATN.INVALID_ALT_NUMBER );
@@ -8555,6 +8563,10 @@ class ConditionContext extends antlr4.ParserRuleContext {
 	    return this.getTypedRuleContext(TextExprContext,0);
 	};
 
+	emoji() {
+	    return this.getTypedRuleContext(EmojiContext,0);
+	};
+
 	enterRule(listener) {
 	    if(listener instanceof sequenceParserListener ) {
 	        listener.enterCondition(this);
@@ -8681,6 +8693,30 @@ class TextExprContext extends antlr4.ParserRuleContext {
 	};
 
 
+	INT = function(i) {
+		if(i===undefined) {
+			i = null;
+		}
+	    if(i===null) {
+	        return this.getTokens(sequenceParser.INT);
+	    } else {
+	        return this.getToken(sequenceParser.INT, i);
+	    }
+	};
+
+
+	FLOAT = function(i) {
+		if(i===undefined) {
+			i = null;
+		}
+	    if(i===null) {
+	        return this.getTokens(sequenceParser.FLOAT);
+	    } else {
+	        return this.getToken(sequenceParser.FLOAT, i);
+	    }
+	};
+
+
 	enterRule(listener) {
 	    if(listener instanceof sequenceParserListener ) {
 	        listener.enterTextExpr(this);
@@ -12667,7 +12703,7 @@ const coreIcons = {
   sagemaker: () => import('./assets/Arch_Amazon-SageMaker_16-DrLi5pZN.mjs')
 };
 const loadCloudIcon = async (key) => {
-  const { cloudIcons } = await import('./assets/CloudIcons-qEDx5IlS.mjs');
+  const { cloudIcons } = await import('./assets/CloudIcons-De45wK6e.mjs');
   return cloudIcons[key] ?? null;
 };
 const loadIcon = async (iconKey) => {
@@ -12757,6 +12793,15 @@ function styleToAttr(style) {
   return Object.entries(style).map(([k, v]) => `${esc(k)}: ${esc(v)}`).join("; ");
 }
 
+function brightnessIgnoreAlpha(color) {
+  const c = colorString.get.rgb(color) || [0, 0, 0];
+  const [r, g, b] = c;
+  return (r * 299 + g * 587 + b * 114) / 1e3;
+}
+function participantTextColor(color) {
+  return brightnessIgnoreAlpha(color) > 128 ? "#000" : "#fff";
+}
+
 const STROKE_WIDTH$1 = 1;
 const HALF_STROKE$1 = STROKE_WIDTH$1 / 2;
 const ICON_SIZE = 24;
@@ -12767,7 +12812,6 @@ const LABEL_HORIZONTAL_PADDING = 16;
 const STEREOTYPE_VERTICAL_OFFSET = 8;
 const STEREOTYPE_FONT_SIZE = 14;
 const BOUNDARY_ICON_VERTICAL_TWEAK = 2.75;
-const PARTICIPANT_TEXT_FILL = "#222";
 function renderParticipant(p) {
   if (p.isStarter) return renderStarterParticipant(p);
   const rx = 4 - HALF_STROKE$1;
@@ -12802,7 +12846,7 @@ function renderParticipant(p) {
     const [, , vbW, vbH] = (icon.viewBox || "0 0 24 24").split(" ").map(Number);
     const scale = ICON_SIZE / Math.max(vbW, vbH);
     const iconAttrs = icon.attributes ? ` ${icon.attributes}` : "";
-    iconSvg = `<g class="participant-icon" transform="translate(${iconX}, ${iconY}) scale(${scale})"${iconAttrs}>
+    iconSvg = `<g class="participant-icon" transform="translate(${iconX}, ${iconY}) scale(${scale})"${p.color ? ` style="color:${participantTextColor(normalizeHexColor(p.color))};"` : ""}${iconAttrs}>
     ${icon.content}
   </g>`;
   } else if (p.emoji) {
@@ -12868,12 +12912,9 @@ function colorAttrs(color) {
   const hex = normalizeHexColor(color);
   return {
     fillStyle: ` style="fill:${hex};"`,
-    textStyle: participantTextStyle()
+    textStyle: ` style="fill:${participantTextColor(hex)};"`
   };
 }
-function participantTextStyle() {
-  return ` style="fill:${PARTICIPANT_TEXT_FILL};"`;
-}
 
 function renderLifeline(l) {
   const x = l.x + 0.5;
@@ -13510,7 +13551,6 @@ function buildThemeStyles(p) {
   .participant-label { font-family: ${p.fontFamily}; font-size: 14px; fill: ${p.participantText}; }
   .stereotype-label { fill: ${p.participantText}; }
   .participant-icon { color: ${p.participantText}; }
-  .participant-icon [fill="currentColor"]:not([stroke]) { stroke: ${p.participantBorder}; stroke-width: 1; }
   .lifeline { stroke: ${p.lifeline}; stroke-width: 1; }
   .message-line { stroke: ${p.messageArrow}; stroke-width: 1; shape-rendering: crispEdges; }
   .message-label { font-family: ${p.fontFamily}; font-size: 15px; fill: ${p.messageText}; }
@@ -13547,13 +13587,71 @@ function buildThemeStyles(p) {
 `;
 }
 
+const PALETTE_CSS_VARS = {
+  canvasBg: "--color-bg-canvas",
+  frameBg: "--color-bg-frame",
+  frameBorder: "--color-border-frame",
+  titleText: "--color-text-title",
+  participantBg: "--color-bg-participant",
+  participantBorder: "--color-border-participant",
+  participantText: "--color-text-participant",
+  messageArrow: "--color-message-arrow",
+  messageText: "--color-text-message",
+  lifeline: "--color-border-base",
+  occurrenceBg: "--color-bg-occurrence",
+  occurrenceBorder: "--color-border-occurrence",
+  fragmentBorder: "--color-border-fragment",
+  fragmentHeaderBg: "--color-bg-fragment-header",
+  fragmentHeaderText: "--color-text-fragment-header",
+  fragmentText: "--color-text-fragment",
+  fragmentSeparator: "--color-border-fragment-separator",
+  guardOpacity: "--opacity-guard",
+  guardText: "--color-text-guard",
+  commentText: "--color-text-comment",
+  commentOpacity: "--opacity-comment",
+  groupOutline: "--color-border-group",
+  dividerLine: "--color-border-divider",
+  dividerBg: "--color-bg-divider",
+  dividerText: "--color-text-divider",
+  numberText: "--color-text-number",
+  fragmentNumberText: "--color-text-fragment-number",
+  numberBg: "--color-bg-number"
+};
+function safeSvgPalette(palette) {
+  if (!palette) return void 0;
+  const safe = {};
+  for (const [key, value] of Object.entries(palette)) {
+    if (!(key in PALETTE_CSS_VARS) || typeof value !== "string") continue;
+    if (key === "guardOpacity" || key === "commentOpacity") {
+      const opacity = Number(value);
+      if (Number.isFinite(opacity) && opacity >= 0 && opacity <= 1)
+        safe[key] = value;
+    } else if (/^[a-zA-Z0-9#(),.%/+\-\s]+$/.test(value) && !/\b(?:url|expression|var)\s*\(/i.test(value)) {
+      safe[key] = value;
+    }
+  }
+  return safe;
+}
+function normaliseBackingColor(color) {
+  const rgb = colorString.get.rgb(color);
+  if (!rgb || rgb[3] !== 1) {
+    throw new TypeError("backingColor must be an opaque CSS colour");
+  }
+  return `rgb(${rgb[0]}, ${rgb[1]}, ${rgb[2]})`;
+}
+
 const FRAME_VIEWPORT_HEADER_ALLOWANCE = 28;
 const FRAME_BORDER_RADIUS = 4;
 function renderToSvg(code, options) {
+  const safeOptions = options ? { ...options, palette: safeSvgPalette(options.palette) } : void 0;
+  const surface = {
+    backgroundColor: safeOptions?.palette?.canvasBg ?? "transparent"
+  };
   const rootContext = RootContext(code);
   if (!rootContext) {
     return {
       svg: "<svg></svg>",
+      surface,
       innerSvg: "",
       width: 0,
       height: 0,
@@ -13574,9 +13672,12 @@ function renderToSvg(code, options) {
     measureText: WidthProviderOnCanvas,
     enableNumbering: options?.enableNumbering
   });
-  return { ...composeSvg(geometry, options), geometry };
+  return { ...composeSvg(geometry, safeOptions), geometry };
 }
 function composeSvg(g, options) {
+  const surface = {
+    backgroundColor: options?.palette?.canvasBg ?? "transparent"
+  };
   const padding = 10;
   const headerH = FRAME_VIEWPORT_HEADER_ALLOWANCE;
   let contentLeftMargin = 1 + padding + g.frameBorderLeft;
@@ -13661,7 +13762,7 @@ function composeSvg(g, options) {
   const titleSvg = g.title ? `<text x="5" y="${headerLineDrawY / 2}" dominant-baseline="central" class="frame-title">${esc(g.title)}</text>` : "";
   const viewBox = `0 0 ${viewWidth} ${viewHeight}`;
   const defs = `<defs>
-  <style>${buildThemeStyles(resolvePalette(options?.theme))}</style>
+  <style>${buildThemeStyles(resolveSvgPalette(options))}</style>
 </defs>`;
   const frame = `${frameSvg}
 ${headerLineSvg}
@@ -13669,13 +13770,35 @@ ${titleSvg}`;
   const content = `<g transform="translate(${contentLeftMargin}, ${headerLineY})">
 ${parts.join("\n")}
 </g>`;
+  const backing = options?.backingColor !== void 0 ? `<rect class="export-backing" x="0" y="0" width="${viewWidth}" height="${viewHeight}" style="fill: ${normaliseBackingColor(options.backingColor)} !important"/>` : "";
+  const background = surface.backgroundColor !== "transparent" ? `<rect class="canvas-background" x="0" y="0" width="${viewWidth}" height="${viewHeight}" fill="${surface.backgroundColor}"/>` : "";
   const innerSvg = `${defs}
+${backing}
+${background}
 ${frame}
 ${content}`;
   const svg = `<svg xmlns="http://www.w3.org/2000/svg" width="${viewWidth}" height="${viewHeight}" viewBox="${viewBox}">
 ${innerSvg}
 </svg>`;
-  return { svg, innerSvg, width: viewWidth, height: viewHeight, viewBox };
+  return {
+    svg,
+    innerSvg,
+    width: viewWidth,
+    height: viewHeight,
+    viewBox,
+    surface
+  };
+}
+function resolveSvgPalette(options) {
+  const theme = resolvePalette(options?.theme);
+  const palette = options?.palette;
+  if (!palette) return theme;
+  return {
+    ...theme,
+    ...palette,
+    ...palette.fragmentHeaderBg ? { fragmentHeaderOpacity: "1" } : {},
+    ...palette.numberBg ? { numberBgOpacity: "1" } : {}
+  };
 }
 
 function readVersion() {