@wzh-/ai-chat-example 1.0.13 → 1.0.15

package/dist/js/blockDiagram-VD42YOAC.js

@@ -1,27 +1,27 @@
 import "./marked.esm.js";
-import "./isArrayLikeObject.js";
-import "./_baseUniq.js";
+import "./reduce.js";
+import "./_baseFor.js";
 import "./isEmpty.js";
-import { E as basis_default, a as decodeEntities, g as utils_default, l as getStylesFromArray } from "./chunk-S3R3BYOJ.js";
-import { t as clone_default } from "./clone.js";
-import { t as Graph } from "./graphlib.js";
 import { g as log, h as __name, p as select_default } from "./src.js";
 import { E as getUrl, I as sanitizeText, a as clear, b as getConfig2, c as configureSvgSize, et as rgba_default, h as evaluate, s as common_default, y as getConfig } from "./chunk-ABZYJK2D.js";
 import { t as channel_default } from "./channel.js";
 import "./path.js";
 import "./math.js";
 import "./array.js";
+import { U as basis_default, a as decodeEntities, g as utils_default, l as getStylesFromArray } from "./chunk-S3R3BYOJ.js";
 import { t as line_default } from "./line.js";
 import "./dist.js";
 import { a as replaceIconSubstring, n as createText } from "./chunk-JA3XYJ7Z.js";
 import { t as getIconStyles } from "./chunk-FMBD7UC4.js";
 import { t as getLineFunctionsWithOffset } from "./chunk-HN2XXSSU.js";
 import { t as getSubGraphTitleMargins } from "./chunk-CVBHYZKI.js";
+import { t as Graph } from "./graphlib.js";
+import { t as clone_default } from "./clone.js";
 var parser = (function() {
 	var e = /* @__PURE__ */ __name(function(e, S, C, w) {
 		for (C ||= {}, w = e.length; w--; C[e[w]] = S);
 		return C;
-	}, "o"), S = [1, 15], C = [1, 7], w = [1, 13], T = [1, 14], E = [1, 19], D = [1, 16], k = [1, 17], A = [1, 18], j = [8, 30], M = [
+	}, "o"), C = [1, 15], w = [1, 7], T = [1, 13], E = [1, 14], D = [1, 19], O = [1, 16], k = [1, 17], A = [1, 18], j = [8, 30], M = [
 		8,
 		10,
 		21,
@@ -370,21 +370,21 @@ var parser = (function() {
 			},
 			{ 1: [3] },
 			{
-				10: S,
+				10: C,
 				11: 3,
 				13: 4,
 				19: 5,
 				20: 6,
-				21: C,
+				21: w,
 				22: 8,
 				23: 9,
 				24: 10,
 				25: 11,
 				26: 12,
-				28: w,
-				29: T,
-				31: E,
-				39: D,
+				28: T,
+				29: E,
+				31: D,
+				39: O,
 				43: k,
 				46: A
 			},
@@ -399,12 +399,12 @@ var parser = (function() {
 				25: 11,
 				26: 12,
 				11: 21,
-				10: S,
-				21: C,
-				28: w,
-				29: T,
-				31: E,
-				39: D,
+				10: C,
+				21: w,
+				28: T,
+				29: E,
+				31: D,
+				39: O,
 				43: k,
 				46: A
 			}),
@@ -424,24 +424,24 @@ var parser = (function() {
 			{
 				19: 26,
 				26: 12,
-				31: E
+				31: D
 			},
 			{
-				10: S,
+				10: C,
 				11: 27,
 				13: 4,
 				19: 5,
 				20: 6,
-				21: C,
+				21: w,
 				22: 8,
 				23: 9,
 				24: 10,
 				25: 11,
 				26: 12,
-				28: w,
-				29: T,
-				31: E,
-				39: D,
+				28: T,
+				29: E,
+				31: D,
+				39: O,
 				43: k,
 				46: A
 			},
@@ -460,13 +460,13 @@ var parser = (function() {
 			e(j, [2, 13]),
 			{
 				26: 35,
-				31: E
+				31: D
 			},
 			{ 31: [2, 14] },
 			{ 17: [1, 36] },
 			e(F, [2, 24]),
 			{
-				10: S,
+				10: C,
 				11: 37,
 				13: 4,
 				14: 22,
@@ -474,16 +474,16 @@ var parser = (function() {
 				16: P,
 				19: 5,
 				20: 6,
-				21: C,
+				21: w,
 				22: 8,
 				23: 9,
 				24: 10,
 				25: 11,
 				26: 12,
-				28: w,
-				29: T,
-				31: E,
-				39: D,
+				28: T,
+				29: E,
+				31: D,
+				39: O,
 				43: k,
 				46: A
 			},
@@ -535,26 +535,26 @@ var parser = (function() {
 			}
 		}, "parseError"),
 		parse: /* @__PURE__ */ __name(function(e) {
-			var S = this, C = [0], w = [], T = [null], E = [], D = this.table, k = "", A = 0, j = 0, M = 0, N = 2, P = 1, F = E.slice.call(arguments, 1), I = Object.create(this.lexer), L = { yy: {} };
+			var C = this, w = [0], T = [], E = [null], D = [], O = this.table, k = "", A = 0, j = 0, M = 0, N = 2, P = 1, F = D.slice.call(arguments, 1), I = Object.create(this.lexer), L = { yy: {} };
 			for (var R in this.yy) Object.prototype.hasOwnProperty.call(this.yy, R) && (L.yy[R] = this.yy[R]);
 			I.setInput(e, L.yy), L.yy.lexer = I, L.yy.parser = this, I.yylloc === void 0 && (I.yylloc = {});
 			var z = I.yylloc;
-			E.push(z);
+			D.push(z);
 			var B = I.options && I.options.ranges;
 			typeof L.yy.parseError == "function" ? this.parseError = L.yy.parseError : this.parseError = Object.getPrototypeOf(this).parseError;
 			function V(e) {
-				C.length -= 2 * e, T.length -= e, E.length -= e;
+				w.length -= 2 * e, E.length -= e, D.length -= e;
 			}
 			__name(V, "popStack");
 			function H() {
-				var e = w.pop() || I.lex() || P;
-				return typeof e != "number" && (e instanceof Array && (w = e, e = w.pop()), e = S.symbols_[e] || e), e;
+				var e = T.pop() || I.lex() || P;
+				return typeof e != "number" && (e instanceof Array && (T = e, e = T.pop()), e = C.symbols_[e] || e), e;
 			}
 			__name(H, "lex");
 			for (var U, W, G, K, q, J = {}, Y, X, Z, Q;;) {
-				if (G = C[C.length - 1], this.defaultActions[G] ? K = this.defaultActions[G] : (U ??= H(), K = D[G] && D[G][U]), K === void 0 || !K.length || !K[0]) {
+				if (G = w[w.length - 1], this.defaultActions[G] ? K = this.defaultActions[G] : (U ??= H(), K = O[G] && O[G][U]), K === void 0 || !K.length || !K[0]) {
 					var $ = "";
-					for (Y in Q = [], D[G]) this.terminals_[Y] && Y > N && Q.push("'" + this.terminals_[Y] + "'");
+					for (Y in Q = [], O[G]) this.terminals_[Y] && Y > N && Q.push("'" + this.terminals_[Y] + "'");
 					$ = I.showPosition ? "Parse error on line " + (A + 1) + ":\n" + I.showPosition() + "\nExpecting " + Q.join(", ") + ", got '" + (this.terminals_[U] || U) + "'" : "Parse error on line " + (A + 1) + ": Unexpected " + (U == P ? "end of input" : "'" + (this.terminals_[U] || U) + "'"), this.parseError($, {
 						text: I.match,
 						token: this.terminals_[U] || U,
@@ -566,24 +566,24 @@ var parser = (function() {
 				if (K[0] instanceof Array && K.length > 1) throw Error("Parse Error: multiple actions possible at state: " + G + ", token: " + U);
 				switch (K[0]) {
 					case 1:
-						C.push(U), T.push(I.yytext), E.push(I.yylloc), C.push(K[1]), U = null, W ? (U = W, W = null) : (j = I.yyleng, k = I.yytext, A = I.yylineno, z = I.yylloc, M > 0 && M--);
+						w.push(U), E.push(I.yytext), D.push(I.yylloc), w.push(K[1]), U = null, W ? (U = W, W = null) : (j = I.yyleng, k = I.yytext, A = I.yylineno, z = I.yylloc, M > 0 && M--);
 						break;
 					case 2:
-						if (X = this.productions_[K[1]][1], J.$ = T[T.length - X], J._$ = {
-							first_line: E[E.length - (X || 1)].first_line,
-							last_line: E[E.length - 1].last_line,
-							first_column: E[E.length - (X || 1)].first_column,
-							last_column: E[E.length - 1].last_column
-						}, B && (J._$.range = [E[E.length - (X || 1)].range[0], E[E.length - 1].range[1]]), q = this.performAction.apply(J, [
+						if (X = this.productions_[K[1]][1], J.$ = E[E.length - X], J._$ = {
+							first_line: D[D.length - (X || 1)].first_line,
+							last_line: D[D.length - 1].last_line,
+							first_column: D[D.length - (X || 1)].first_column,
+							last_column: D[D.length - 1].last_column
+						}, B && (J._$.range = [D[D.length - (X || 1)].range[0], D[D.length - 1].range[1]]), q = this.performAction.apply(J, [
 							k,
 							j,
 							A,
 							L.yy,
 							K[1],
-							T,
-							E
+							E,
+							D
 						].concat(F)), q !== void 0) return q;
-						X && (C = C.slice(0, -1 * X * 2), T = T.slice(0, -1 * X), E = E.slice(0, -1 * X)), C.push(this.productions_[K[1]][0]), T.push(J.$), E.push(J._$), Z = D[C[C.length - 2]][C[C.length - 1]], C.push(Z);
+						X && (w = w.slice(0, -1 * X * 2), E = E.slice(0, -1 * X), D = D.slice(0, -1 * X)), w.push(this.productions_[K[1]][0]), E.push(J.$), D.push(J._$), Z = O[w[w.length - 2]][w[w.length - 1]], w.push(Z);
 						break;
 					case 3: return !0;
 				}
@@ -1182,38 +1182,38 @@ var block_default = parser, blockDatabase = /* @__PURE__ */ new Map(), edgeList
 		}
 		C.classes ||= [], C.classes.push(S);
 	});
-}, "setCssClass"), populateBlockDatabase = /* @__PURE__ */ __name((e, S) => {
-	let C = e.flat(), w = [], E = C.find((e) => e?.type === "column-setting")?.columns ?? -1;
-	for (let e of C) {
-		if (typeof E == "number" && E > 0 && e.type !== "column-setting" && typeof e.widthInColumns == "number" && e.widthInColumns > E && log.warn(`Block ${e.id} width ${e.widthInColumns} exceeds configured column width ${E}`), e.label &&= sanitizeText2(e.label), e.type === "classDef") {
-			addStyleClass(e.id, e.css);
+}, "setCssClass"), populateBlockDatabase = /* @__PURE__ */ __name((S, C) => {
+	let w = S.flat(), T = [], E = w.find((e) => e?.type === "column-setting")?.columns ?? -1;
+	for (let S of w) {
+		if (typeof E == "number" && E > 0 && S.type !== "column-setting" && typeof S.widthInColumns == "number" && S.widthInColumns > E && log.warn(`Block ${S.id} width ${S.widthInColumns} exceeds configured column width ${E}`), S.label &&= sanitizeText2(S.label), S.type === "classDef") {
+			addStyleClass(S.id, S.css);
 			continue;
 		}
-		if (e.type === "applyClass") {
-			setCssClass(e.id, e?.styleClass ?? "");
+		if (S.type === "applyClass") {
+			setCssClass(S.id, S?.styleClass ?? "");
 			continue;
 		}
-		if (e.type === "applyStyles") {
-			e?.stylesStr && addStyle2Node(e.id, e?.stylesStr);
+		if (S.type === "applyStyles") {
+			S?.stylesStr && addStyle2Node(S.id, S?.stylesStr);
 			continue;
 		}
-		if (e.type === "column-setting") S.columns = e.columns ?? -1;
-		else if (e.type === "edge") {
-			let S = (edgeCount.get(e.id) ?? 0) + 1;
-			edgeCount.set(e.id, S), e.id = S + "-" + e.id, edgeList.push(e);
+		if (S.type === "column-setting") C.columns = S.columns ?? -1;
+		else if (S.type === "edge") {
+			let e = (edgeCount.get(S.id) ?? 0) + 1;
+			edgeCount.set(S.id, e), S.id = e + "-" + S.id, edgeList.push(S);
 		} else {
-			e.label || (e.type === "composite" ? e.label = "" : e.label = e.id);
-			let S = blockDatabase.get(e.id);
-			if (S === void 0 ? blockDatabase.set(e.id, e) : (e.type !== "na" && (S.type = e.type), e.label !== e.id && (S.label = e.label)), e.children && populateBlockDatabase(e.children, e), e.type === "space") {
-				let S = e.width ?? 1;
-				for (let C = 0; C < S; C++) {
-					let S = clone_default(e);
-					S.id = S.id + "-" + C, blockDatabase.set(S.id, S), w.push(S);
+			S.label || (S.type === "composite" ? S.label = "" : S.label = S.id);
+			let e = blockDatabase.get(S.id);
+			if (e === void 0 ? blockDatabase.set(S.id, S) : (S.type !== "na" && (e.type = S.type), S.label !== S.id && (e.label = S.label)), S.children && populateBlockDatabase(S.children, S), S.type === "space") {
+				let e = S.width ?? 1;
+				for (let C = 0; C < e; C++) {
+					let e = clone_default(S);
+					e.id = e.id + "-" + C, blockDatabase.set(e.id, e), T.push(e);
 				}
-			} else S === void 0 && w.push(e);
+			} else e === void 0 && T.push(S);
 		}
 	}
-	S.children = w;
+	C.children = T;
 }, "populateBlockDatabase"), blocks = [], rootBlock = {
 	id: "root",
 	type: "composite",
@@ -1227,8 +1227,8 @@ var block_default = parser, blockDatabase = /* @__PURE__ */ new Map(), edgeList
 		columns: -1
 	}, blockDatabase = /* @__PURE__ */ new Map([["root", rootBlock]]), blocks = [], classes = /* @__PURE__ */ new Map(), edgeList = [], edgeCount = /* @__PURE__ */ new Map();
 }, "clear");
-function typeStr2Type(e) {
-	switch (log.debug("typeStr2Type", e), e) {
+function typeStr2Type(S) {
+	switch (log.debug("typeStr2Type", S), S) {
 		case "[]": return "square";
 		case "()": return log.debug("we have a round"), "round";
 		case "(())": return "circle";
@@ -1248,8 +1248,8 @@ function typeStr2Type(e) {
 	}
 }
 __name(typeStr2Type, "typeStr2Type");
-function edgeTypeStr2Type(e) {
-	switch (log.debug("typeStr2Type", e), e) {
+function edgeTypeStr2Type(S) {
+	switch (log.debug("typeStr2Type", S), S) {
 		case "==": return "thick";
 		default: return "normal";
 	}
@@ -1410,8 +1410,8 @@ var cnt = 0, blockDB_default = {
 		markers[S](e, C, w);
 	});
 }, "insertMarkers"), markers = {
-	extension: /* @__PURE__ */ __name((e, S, C) => {
-		log.trace("Making markers for ", C), e.append("defs").append("marker").attr("id", C + "_" + S + "-extensionStart").attr("class", "marker extension " + S).attr("refX", 18).attr("refY", 7).attr("markerWidth", 190).attr("markerHeight", 240).attr("orient", "auto").append("path").attr("d", "M 1,7 L18,13 V 1 Z"), e.append("defs").append("marker").attr("id", C + "_" + S + "-extensionEnd").attr("class", "marker extension " + S).attr("refX", 1).attr("refY", 7).attr("markerWidth", 20).attr("markerHeight", 28).attr("orient", "auto").append("path").attr("d", "M 1,1 V 13 L18,7 Z");
+	extension: /* @__PURE__ */ __name((S, C, w) => {
+		log.trace("Making markers for ", w), S.append("defs").append("marker").attr("id", w + "_" + C + "-extensionStart").attr("class", "marker extension " + C).attr("refX", 18).attr("refY", 7).attr("markerWidth", 190).attr("markerHeight", 240).attr("orient", "auto").append("path").attr("d", "M 1,7 L18,13 V 1 Z"), S.append("defs").append("marker").attr("id", w + "_" + C + "-extensionEnd").attr("class", "marker extension " + C).attr("refX", 1).attr("refY", 7).attr("markerWidth", 20).attr("markerHeight", 28).attr("orient", "auto").append("path").attr("d", "M 1,1 V 13 L18,7 Z");
 	}, "extension"),
 	composition: /* @__PURE__ */ __name((e, S, C) => {
 		e.append("defs").append("marker").attr("id", C + "_" + S + "-compositionStart").attr("class", "marker composition " + S).attr("refX", 18).attr("refY", 7).attr("markerWidth", 190).attr("markerHeight", 240).attr("orient", "auto").append("path").attr("d", "M 18,7 L9,13 L1,7 L9,1 Z"), e.append("defs").append("marker").attr("id", C + "_" + S + "-compositionEnd").attr("class", "marker composition " + S).attr("refX", 1).attr("refY", 7).attr("markerWidth", 20).attr("markerHeight", 28).attr("orient", "auto").append("path").attr("d", "M 18,7 L9,13 L1,7 L9,1 Z");
@@ -1453,89 +1453,89 @@ function calculateBlockPosition(e, S) {
 	};
 }
 __name(calculateBlockPosition, "calculateBlockPosition");
-var getMaxChildSize = /* @__PURE__ */ __name((e) => {
-	let S = 0, C = 0;
-	for (let w of e.children) {
-		let { width: T, height: E, x: O, y: k } = w.size ?? {
+var getMaxChildSize = /* @__PURE__ */ __name((S) => {
+	let C = 0, w = 0;
+	for (let T of S.children) {
+		let { width: E, height: D, x: O, y: k } = T.size ?? {
 			width: 0,
 			height: 0,
 			x: 0,
 			y: 0
 		};
-		log.debug("getMaxChildSize abc95 child:", w.id, "width:", T, "height:", E, "x:", O, "y:", k, w.type), w.type !== "space" && (T > S && (S = T / (e.widthInColumns ?? 1)), E > C && (C = E));
+		log.debug("getMaxChildSize abc95 child:", T.id, "width:", E, "height:", D, "x:", O, "y:", k, T.type), T.type !== "space" && (E > C && (C = E / (S.widthInColumns ?? 1)), D > w && (w = D));
 	}
 	return {
-		width: S,
-		height: C
+		width: C,
+		height: w
 	};
 }, "getMaxChildSize");
-function setBlockSizes(e, S, C = 0, w = 0) {
-	log.debug("setBlockSizes abc95 (start)", e.id, e?.size?.x, "block width =", e?.size, "siblingWidth", C), e?.size?.width || (e.size = {
-		width: C,
-		height: w,
+function setBlockSizes(S, C, w = 0, T = 0) {
+	log.debug("setBlockSizes abc95 (start)", S.id, S?.size?.x, "block width =", S?.size, "siblingWidth", w), S?.size?.width || (S.size = {
+		width: w,
+		height: T,
 		x: 0,
 		y: 0
 	});
-	let T = 0, E = 0;
-	if (e.children?.length > 0) {
-		for (let C of e.children) setBlockSizes(C, S);
-		let O = getMaxChildSize(e);
-		T = O.width, E = O.height, log.debug("setBlockSizes abc95 maxWidth of", e.id, ":s children is ", T, E);
-		for (let S of e.children) S.size && (log.debug(`abc95 Setting size of children of ${e.id} id=${S.id} ${T} ${E} ${JSON.stringify(S.size)}`), S.size.width = T * (S.widthInColumns ?? 1) + padding * ((S.widthInColumns ?? 1) - 1), S.size.height = E, S.size.x = 0, S.size.y = 0, log.debug(`abc95 updating size of ${e.id} children child:${S.id} maxWidth:${T} maxHeight:${E}`));
-		for (let C of e.children) setBlockSizes(C, S, T, E);
-		let k = e.columns ?? -1, A = 0;
-		for (let S of e.children) A += S.widthInColumns ?? 1;
-		let j = e.children.length;
+	let E = 0, D = 0;
+	if (S.children?.length > 0) {
+		for (let e of S.children) setBlockSizes(e, C);
+		let O = getMaxChildSize(S);
+		E = O.width, D = O.height, log.debug("setBlockSizes abc95 maxWidth of", S.id, ":s children is ", E, D);
+		for (let C of S.children) C.size && (log.debug(`abc95 Setting size of children of ${S.id} id=${C.id} ${E} ${D} ${JSON.stringify(C.size)}`), C.size.width = E * (C.widthInColumns ?? 1) + padding * ((C.widthInColumns ?? 1) - 1), C.size.height = D, C.size.x = 0, C.size.y = 0, log.debug(`abc95 updating size of ${S.id} children child:${C.id} maxWidth:${E} maxHeight:${D}`));
+		for (let e of S.children) setBlockSizes(e, C, E, D);
+		let k = S.columns ?? -1, A = 0;
+		for (let e of S.children) A += e.widthInColumns ?? 1;
+		let j = S.children.length;
 		k > 0 && k < A && (j = k);
-		let M = Math.ceil(A / j), N = j * (T + padding) + padding, P = M * (E + padding) + padding;
-		if (N < C) {
-			log.debug(`Detected to small sibling: abc95 ${e.id} siblingWidth ${C} siblingHeight ${w} width ${N}`), N = C, P = w;
-			let S = (C - j * padding - padding) / j, O = (w - M * padding - padding) / M;
-			log.debug("Size indata abc88", e.id, "childWidth", S, "maxWidth", T), log.debug("Size indata abc88", e.id, "childHeight", O, "maxHeight", E), log.debug("Size indata abc88 xSize", j, "padding", padding);
-			for (let C of e.children) C.size && (C.size.width = S, C.size.height = O, C.size.x = 0, C.size.y = 0);
+		let M = Math.ceil(A / j), N = j * (E + padding) + padding, P = M * (D + padding) + padding;
+		if (N < w) {
+			log.debug(`Detected to small sibling: abc95 ${S.id} siblingWidth ${w} siblingHeight ${T} width ${N}`), N = w, P = T;
+			let C = (w - j * padding - padding) / j, O = (T - M * padding - padding) / M;
+			log.debug("Size indata abc88", S.id, "childWidth", C, "maxWidth", E), log.debug("Size indata abc88", S.id, "childHeight", O, "maxHeight", D), log.debug("Size indata abc88 xSize", j, "padding", padding);
+			for (let e of S.children) e.size && (e.size.width = C, e.size.height = O, e.size.x = 0, e.size.y = 0);
 		}
-		if (log.debug(`abc95 (finale calc) ${e.id} xSize ${j} ySize ${M} columns ${k}${e.children.length} width=${Math.max(N, e.size?.width || 0)}`), N < (e?.size?.width || 0)) {
-			N = e?.size?.width || 0;
-			let S = k > 0 ? Math.min(e.children.length, k) : e.children.length;
-			if (S > 0) {
-				let C = (N - S * padding - padding) / S;
-				log.debug("abc95 (growing to fit) width", e.id, N, e.size?.width, C);
-				for (let S of e.children) S.size && (S.size.width = C);
+		if (log.debug(`abc95 (finale calc) ${S.id} xSize ${j} ySize ${M} columns ${k}${S.children.length} width=${Math.max(N, S.size?.width || 0)}`), N < (S?.size?.width || 0)) {
+			N = S?.size?.width || 0;
+			let C = k > 0 ? Math.min(S.children.length, k) : S.children.length;
+			if (C > 0) {
+				let w = (N - C * padding - padding) / C;
+				log.debug("abc95 (growing to fit) width", S.id, N, S.size?.width, w);
+				for (let e of S.children) e.size && (e.size.width = w);
 			}
 		}
-		e.size = {
+		S.size = {
 			width: N,
 			height: P,
 			x: 0,
 			y: 0
 		};
 	}
-	log.debug("setBlockSizes abc94 (done)", e.id, e?.size?.x, e?.size?.width, e?.size?.y, e?.size?.height);
+	log.debug("setBlockSizes abc94 (done)", S.id, S?.size?.x, S?.size?.width, S?.size?.y, S?.size?.height);
 }
 __name(setBlockSizes, "setBlockSizes");
-function layoutBlocks(e, S) {
-	log.debug(`abc85 layout blocks (=>layoutBlocks) ${e.id} x: ${e?.size?.x} y: ${e?.size?.y} width: ${e?.size?.width}`);
-	let C = e.columns ?? -1;
-	if (log.debug("layoutBlocks columns abc95", e.id, "=>", C, e), e.children && e.children.length > 0) {
-		let w = e?.children[0]?.size?.width ?? 0, T = e.children.length * w + (e.children.length - 1) * padding;
-		log.debug("widthOfChildren 88", T, "posX");
-		let E = 0;
-		log.debug("abc91 block?.size?.x", e.id, e?.size?.x);
-		let O = e?.size?.x ? e?.size?.x + (-e?.size?.width / 2 || 0) : -padding, k = 0;
-		for (let w of e.children) {
-			let T = e;
-			if (!w.size) continue;
-			let { width: A, height: j } = w.size, { px: M, py: N } = calculateBlockPosition(C, E);
-			if (N != k && (k = N, O = e?.size?.x ? e?.size?.x + (-e?.size?.width / 2 || 0) : -padding, log.debug("New row in layout for block", e.id, " and child ", w.id, k)), log.debug(`abc89 layout blocks (child) id: ${w.id} Pos: ${E} (px, py) ${M},${N} (${T?.size?.x},${T?.size?.y}) parent: ${T.id} width: ${A}${padding}`), T.size) {
-				let e = A / 2;
-				w.size.x = O + padding + e, log.debug(`abc91 layout blocks (calc) px, pyid:${w.id} startingPos=X${O} new startingPosX${w.size.x} ${e} padding=${padding} width=${A} halfWidth=${e} => x:${w.size.x} y:${w.size.y} ${w.widthInColumns} (width * (child?.w || 1)) / 2 ${A * (w?.widthInColumns ?? 1) / 2}`), O = w.size.x + e, w.size.y = T.size.y - T.size.height / 2 + N * (j + padding) + j / 2 + padding, log.debug(`abc88 layout blocks (calc) px, pyid:${w.id}startingPosX${O}${padding}${e}=>x:${w.size.x}y:${w.size.y}${w.widthInColumns}(width * (child?.w || 1)) / 2${A * (w?.widthInColumns ?? 1) / 2}`);
+function layoutBlocks(S, C) {
+	log.debug(`abc85 layout blocks (=>layoutBlocks) ${S.id} x: ${S?.size?.x} y: ${S?.size?.y} width: ${S?.size?.width}`);
+	let w = S.columns ?? -1;
+	if (log.debug("layoutBlocks columns abc95", S.id, "=>", w, S), S.children && S.children.length > 0) {
+		let T = S?.children[0]?.size?.width ?? 0, E = S.children.length * T + (S.children.length - 1) * padding;
+		log.debug("widthOfChildren 88", E, "posX");
+		let D = 0;
+		log.debug("abc91 block?.size?.x", S.id, S?.size?.x);
+		let O = S?.size?.x ? S?.size?.x + (-S?.size?.width / 2 || 0) : -padding, k = 0;
+		for (let T of S.children) {
+			let E = S;
+			if (!T.size) continue;
+			let { width: A, height: j } = T.size, { px: M, py: N } = calculateBlockPosition(w, D);
+			if (N != k && (k = N, O = S?.size?.x ? S?.size?.x + (-S?.size?.width / 2 || 0) : -padding, log.debug("New row in layout for block", S.id, " and child ", T.id, k)), log.debug(`abc89 layout blocks (child) id: ${T.id} Pos: ${D} (px, py) ${M},${N} (${E?.size?.x},${E?.size?.y}) parent: ${E.id} width: ${A}${padding}`), E.size) {
+				let S = A / 2;
+				T.size.x = O + padding + S, log.debug(`abc91 layout blocks (calc) px, pyid:${T.id} startingPos=X${O} new startingPosX${T.size.x} ${S} padding=${padding} width=${A} halfWidth=${S} => x:${T.size.x} y:${T.size.y} ${T.widthInColumns} (width * (child?.w || 1)) / 2 ${A * (T?.widthInColumns ?? 1) / 2}`), O = T.size.x + S, T.size.y = E.size.y - E.size.height / 2 + N * (j + padding) + j / 2 + padding, log.debug(`abc88 layout blocks (calc) px, pyid:${T.id}startingPosX${O}${padding}${S}=>x:${T.size.x}y:${T.size.y}${T.widthInColumns}(width * (child?.w || 1)) / 2${A * (T?.widthInColumns ?? 1) / 2}`);
 			}
-			w.children && layoutBlocks(w, S);
-			let P = w?.widthInColumns ?? 1;
-			C > 0 && (P = Math.min(P, C - E % C)), E += P, log.debug("abc88 columnsPos", w, E);
+			T.children && layoutBlocks(T, C);
+			let P = T?.widthInColumns ?? 1;
+			w > 0 && (P = Math.min(P, w - D % w)), D += P, log.debug("abc88 columnsPos", T, D);
 		}
 	}
-	log.debug(`layout blocks (<==layoutBlocks) ${e.id} x: ${e?.size?.x} y: ${e?.size?.y} width: ${e?.size?.width}`);
+	log.debug(`layout blocks (<==layoutBlocks) ${S.id} x: ${S?.size?.x} y: ${S?.size?.y} width: ${S?.size?.width}`);
 }
 __name(layoutBlocks, "layoutBlocks");
 function findBounds(e, { minX: S, minY: C, maxX: w, maxY: T } = {
@@ -1562,15 +1562,15 @@ function findBounds(e, { minX: S, minY: C, maxX: w, maxY: T } = {
 	};
 }
 __name(findBounds, "findBounds");
-function layout(e) {
-	let S = e.getBlock("root");
-	if (!S) return;
-	setBlockSizes(S, e, 0, 0), layoutBlocks(S, e), log.debug("getBlocks", JSON.stringify(S, null, 2));
-	let { minX: C, minY: w, maxX: T, maxY: E } = findBounds(S), O = E - w;
+function layout(S) {
+	let C = S.getBlock("root");
+	if (!C) return;
+	setBlockSizes(C, S, 0, 0), layoutBlocks(C, S), log.debug("getBlocks", JSON.stringify(C, null, 2));
+	let { minX: w, minY: T, maxX: E, maxY: D } = findBounds(C), O = D - T;
 	return {
-		x: C,
-		y: w,
-		width: T - C,
+		x: w,
+		y: T,
+		width: E - w,
 		height: O
 	};
 }
@@ -1580,12 +1580,12 @@ function applyStyle(e, S) {
 }
 __name(applyStyle, "applyStyle");
 function addHtmlLabel(e, S) {
-	let C = select_default(document.createElementNS("http://www.w3.org/2000/svg", "foreignObject")), w = C.append("xhtml:div"), T = e.label, E = e.isNode ? "nodeLabel" : "edgeLabel", D = w.append("span");
-	return D.html(sanitizeText(T, S)), applyStyle(D, e.labelStyle), D.attr("class", E), applyStyle(w, e.labelStyle), w.style("display", "inline-block"), w.style("white-space", "nowrap"), w.attr("xmlns", "http://www.w3.org/1999/xhtml"), C.node();
+	let w = select_default(document.createElementNS("http://www.w3.org/2000/svg", "foreignObject")), E = w.append("xhtml:div"), D = e.label, O = e.isNode ? "nodeLabel" : "edgeLabel", k = E.append("span");
+	return k.html(sanitizeText(D, S)), applyStyle(k, e.labelStyle), k.attr("class", O), applyStyle(E, e.labelStyle), E.style("display", "inline-block"), E.style("white-space", "nowrap"), E.attr("xmlns", "http://www.w3.org/1999/xhtml"), w.node();
 }
 __name(addHtmlLabel, "addHtmlLabel");
-var createLabel_default = /* @__PURE__ */ __name(async (e, C, w, T) => {
-	let E = e || "";
+var createLabel_default = /* @__PURE__ */ __name(async (S, C, w, T) => {
+	let E = S || "";
 	typeof E == "object" && (E = E[0]);
 	let O = getConfig2();
 	if (evaluate(O.flowchart.htmlLabels)) return E = E.replace(/\\n|\n/g, "<br />"), log.debug("vertexText" + E), addHtmlLabel({
@@ -1616,176 +1616,176 @@ var createLabel_default = /* @__PURE__ */ __name(async (e, C, w, T) => {
 	composition: "composition",
 	dependency: "dependency",
 	lollipop: "lollipop"
-}, addEdgeMarker = /* @__PURE__ */ __name((e, S, C, w, T, E) => {
-	let O = arrowTypesMap[C];
+}, addEdgeMarker = /* @__PURE__ */ __name((S, C, w, T, E, D) => {
+	let O = arrowTypesMap[w];
 	if (!O) {
-		log.warn(`Unknown arrow type: ${C}`);
+		log.warn(`Unknown arrow type: ${w}`);
 		return;
 	}
-	let k = S === "start" ? "Start" : "End";
-	e.attr(`marker-${S}`, `url(${w}#${T}_${E}-${O}${k})`);
+	let k = C === "start" ? "Start" : "End";
+	S.attr(`marker-${C}`, `url(${T}#${E}_${D}-${O}${k})`);
 }, "addEdgeMarker"), edgeLabels = {}, terminalLabels = {}, insertEdgeLabel = /* @__PURE__ */ __name(async (e, S) => {
-	let C = getConfig2(), w = evaluate(C.flowchart.htmlLabels), T = S.labelType === "markdown" ? createText(e, S.label, {
+	let w = getConfig2(), T = evaluate(w.flowchart.htmlLabels), E = S.labelType === "markdown" ? createText(e, S.label, {
 		style: S.labelStyle,
-		useHtmlLabels: w,
+		useHtmlLabels: T,
 		addSvgBackground: !0
-	}, C) : await createLabel_default(S.label, S.labelStyle), E = e.insert("g").attr("class", "edgeLabel"), D = E.insert("g").attr("class", "label");
-	D.node().appendChild(T);
-	let O = T.getBBox();
-	if (w) {
-		let e = T.children[0], S = select_default(T);
-		O = e.getBoundingClientRect(), S.attr("width", O.width), S.attr("height", O.height);
+	}, w) : await createLabel_default(S.label, S.labelStyle), O = e.insert("g").attr("class", "edgeLabel"), k = O.insert("g").attr("class", "label");
+	k.node().appendChild(E);
+	let j = E.getBBox();
+	if (T) {
+		let e = E.children[0], S = select_default(E);
+		j = e.getBoundingClientRect(), S.attr("width", j.width), S.attr("height", j.height);
 	}
-	D.attr("transform", "translate(" + -O.width / 2 + ", " + -O.height / 2 + ")"), edgeLabels[S.id] = E, S.width = O.width, S.height = O.height;
-	let A;
+	k.attr("transform", "translate(" + -j.width / 2 + ", " + -j.height / 2 + ")"), edgeLabels[S.id] = O, S.width = j.width, S.height = j.height;
+	let M;
 	if (S.startLabelLeft) {
 		let C = await createLabel_default(S.startLabelLeft, S.labelStyle), w = e.insert("g").attr("class", "edgeTerminals"), T = w.insert("g").attr("class", "inner");
-		A = T.node().appendChild(C);
+		M = T.node().appendChild(C);
 		let E = C.getBBox();
-		T.attr("transform", "translate(" + -E.width / 2 + ", " + -E.height / 2 + ")"), terminalLabels[S.id] || (terminalLabels[S.id] = {}), terminalLabels[S.id].startLeft = w, setTerminalWidth(A, S.startLabelLeft);
+		T.attr("transform", "translate(" + -E.width / 2 + ", " + -E.height / 2 + ")"), terminalLabels[S.id] || (terminalLabels[S.id] = {}), terminalLabels[S.id].startLeft = w, setTerminalWidth(M, S.startLabelLeft);
 	}
 	if (S.startLabelRight) {
 		let C = await createLabel_default(S.startLabelRight, S.labelStyle), w = e.insert("g").attr("class", "edgeTerminals"), T = w.insert("g").attr("class", "inner");
-		A = w.node().appendChild(C), T.node().appendChild(C);
+		M = w.node().appendChild(C), T.node().appendChild(C);
 		let E = C.getBBox();
-		T.attr("transform", "translate(" + -E.width / 2 + ", " + -E.height / 2 + ")"), terminalLabels[S.id] || (terminalLabels[S.id] = {}), terminalLabels[S.id].startRight = w, setTerminalWidth(A, S.startLabelRight);
+		T.attr("transform", "translate(" + -E.width / 2 + ", " + -E.height / 2 + ")"), terminalLabels[S.id] || (terminalLabels[S.id] = {}), terminalLabels[S.id].startRight = w, setTerminalWidth(M, S.startLabelRight);
 	}
 	if (S.endLabelLeft) {
 		let C = await createLabel_default(S.endLabelLeft, S.labelStyle), w = e.insert("g").attr("class", "edgeTerminals"), T = w.insert("g").attr("class", "inner");
-		A = T.node().appendChild(C);
+		M = T.node().appendChild(C);
 		let E = C.getBBox();
-		T.attr("transform", "translate(" + -E.width / 2 + ", " + -E.height / 2 + ")"), w.node().appendChild(C), terminalLabels[S.id] || (terminalLabels[S.id] = {}), terminalLabels[S.id].endLeft = w, setTerminalWidth(A, S.endLabelLeft);
+		T.attr("transform", "translate(" + -E.width / 2 + ", " + -E.height / 2 + ")"), w.node().appendChild(C), terminalLabels[S.id] || (terminalLabels[S.id] = {}), terminalLabels[S.id].endLeft = w, setTerminalWidth(M, S.endLabelLeft);
 	}
 	if (S.endLabelRight) {
 		let C = await createLabel_default(S.endLabelRight, S.labelStyle), w = e.insert("g").attr("class", "edgeTerminals"), T = w.insert("g").attr("class", "inner");
-		A = T.node().appendChild(C);
+		M = T.node().appendChild(C);
 		let E = C.getBBox();
-		T.attr("transform", "translate(" + -E.width / 2 + ", " + -E.height / 2 + ")"), w.node().appendChild(C), terminalLabels[S.id] || (terminalLabels[S.id] = {}), terminalLabels[S.id].endRight = w, setTerminalWidth(A, S.endLabelRight);
+		T.attr("transform", "translate(" + -E.width / 2 + ", " + -E.height / 2 + ")"), w.node().appendChild(C), terminalLabels[S.id] || (terminalLabels[S.id] = {}), terminalLabels[S.id].endRight = w, setTerminalWidth(M, S.endLabelRight);
 	}
-	return T;
+	return E;
 }, "insertEdgeLabel");
 function setTerminalWidth(e, S) {
 	getConfig2().flowchart.htmlLabels && e && (e.style.width = S.length * 9 + "px", e.style.height = "12px");
 }
 __name(setTerminalWidth, "setTerminalWidth");
-var positionEdgeLabel = /* @__PURE__ */ __name((e, S) => {
-	log.debug("Moving label abc88 ", e.id, e.label, edgeLabels[e.id], S);
-	let w = S.updatedPath ? S.updatedPath : S.originalPath, { subGraphTitleTotalMargin: T } = getSubGraphTitleMargins(getConfig2());
-	if (e.label) {
-		let E = edgeLabels[e.id], O = e.x, k = e.y;
+var positionEdgeLabel = /* @__PURE__ */ __name((S, C) => {
+	log.debug("Moving label abc88 ", S.id, S.label, edgeLabels[S.id], C);
+	let w = C.updatedPath ? C.updatedPath : C.originalPath, { subGraphTitleTotalMargin: T } = getSubGraphTitleMargins(getConfig2());
+	if (S.label) {
+		let E = edgeLabels[S.id], D = S.x, O = S.y;
 		if (w) {
 			let T = utils_default.calcLabelPosition(w);
-			log.debug("Moving label " + e.label + " from (", O, ",", k, ") to (", T.x, ",", T.y, ") abc88"), S.updatedPath && (O = T.x, k = T.y);
+			log.debug("Moving label " + S.label + " from (", D, ",", O, ") to (", T.x, ",", T.y, ") abc88"), C.updatedPath && (D = T.x, O = T.y);
 		}
-		E.attr("transform", `translate(${O}, ${k + T / 2})`);
+		E.attr("transform", `translate(${D}, ${O + T / 2})`);
 	}
-	if (e.startLabelLeft) {
-		let S = terminalLabels[e.id].startLeft, T = e.x, E = e.y;
+	if (S.startLabelLeft) {
+		let e = terminalLabels[S.id].startLeft, C = S.x, T = S.y;
 		if (w) {
-			let S = utils_default.calcTerminalLabelPosition(e.arrowTypeStart ? 10 : 0, "start_left", w);
-			T = S.x, E = S.y;
+			let e = utils_default.calcTerminalLabelPosition(S.arrowTypeStart ? 10 : 0, "start_left", w);
+			C = e.x, T = e.y;
 		}
-		S.attr("transform", `translate(${T}, ${E})`);
+		e.attr("transform", `translate(${C}, ${T})`);
 	}
-	if (e.startLabelRight) {
-		let S = terminalLabels[e.id].startRight, T = e.x, E = e.y;
+	if (S.startLabelRight) {
+		let e = terminalLabels[S.id].startRight, C = S.x, T = S.y;
 		if (w) {
-			let S = utils_default.calcTerminalLabelPosition(e.arrowTypeStart ? 10 : 0, "start_right", w);
-			T = S.x, E = S.y;
+			let e = utils_default.calcTerminalLabelPosition(S.arrowTypeStart ? 10 : 0, "start_right", w);
+			C = e.x, T = e.y;
 		}
-		S.attr("transform", `translate(${T}, ${E})`);
+		e.attr("transform", `translate(${C}, ${T})`);
 	}
-	if (e.endLabelLeft) {
-		let S = terminalLabels[e.id].endLeft, T = e.x, E = e.y;
+	if (S.endLabelLeft) {
+		let e = terminalLabels[S.id].endLeft, C = S.x, T = S.y;
 		if (w) {
-			let S = utils_default.calcTerminalLabelPosition(e.arrowTypeEnd ? 10 : 0, "end_left", w);
-			T = S.x, E = S.y;
+			let e = utils_default.calcTerminalLabelPosition(S.arrowTypeEnd ? 10 : 0, "end_left", w);
+			C = e.x, T = e.y;
 		}
-		S.attr("transform", `translate(${T}, ${E})`);
+		e.attr("transform", `translate(${C}, ${T})`);
 	}
-	if (e.endLabelRight) {
-		let S = terminalLabels[e.id].endRight, T = e.x, E = e.y;
+	if (S.endLabelRight) {
+		let e = terminalLabels[S.id].endRight, C = S.x, T = S.y;
 		if (w) {
-			let S = utils_default.calcTerminalLabelPosition(e.arrowTypeEnd ? 10 : 0, "end_right", w);
-			T = S.x, E = S.y;
+			let e = utils_default.calcTerminalLabelPosition(S.arrowTypeEnd ? 10 : 0, "end_right", w);
+			C = e.x, T = e.y;
 		}
-		S.attr("transform", `translate(${T}, ${E})`);
+		e.attr("transform", `translate(${C}, ${T})`);
 	}
 }, "positionEdgeLabel"), outsideNode = /* @__PURE__ */ __name((e, S) => {
 	let C = e.x, w = e.y, T = Math.abs(S.x - C), E = Math.abs(S.y - w), D = e.width / 2, O = e.height / 2;
 	return T >= D || E >= O;
-}, "outsideNode"), intersection = /* @__PURE__ */ __name((e, S, C) => {
+}, "outsideNode"), intersection = /* @__PURE__ */ __name((S, C, w) => {
 	log.debug(`intersection calc abc89:
-  outsidePoint: ${JSON.stringify(S)}
-  insidePoint : ${JSON.stringify(C)}
-  node        : x:${e.x} y:${e.y} w:${e.width} h:${e.height}`);
-	let w = e.x, T = e.y, E = Math.abs(w - C.x), O = e.width / 2, k = C.x < S.x ? O - E : O + E, A = e.height / 2, j = Math.abs(S.y - C.y), M = Math.abs(S.x - C.x);
-	if (Math.abs(T - S.y) * O > Math.abs(w - S.x) * A) {
-		let e = C.y < S.y ? S.y - A - T : T - A - S.y;
-		k = M * e / j;
-		let w = {
-			x: C.x < S.x ? C.x + k : C.x - M + k,
-			y: C.y < S.y ? C.y + j - e : C.y - j + e
+  outsidePoint: ${JSON.stringify(C)}
+  insidePoint : ${JSON.stringify(w)}
+  node        : x:${S.x} y:${S.y} w:${S.width} h:${S.height}`);
+	let T = S.x, E = S.y, D = Math.abs(T - w.x), O = S.width / 2, k = w.x < C.x ? O - D : O + D, A = S.height / 2, j = Math.abs(C.y - w.y), M = Math.abs(C.x - w.x);
+	if (Math.abs(E - C.y) * O > Math.abs(T - C.x) * A) {
+		let S = w.y < C.y ? C.y - A - E : E - A - C.y;
+		k = M * S / j;
+		let T = {
+			x: w.x < C.x ? w.x + k : w.x - M + k,
+			y: w.y < C.y ? w.y + j - S : w.y - j + S
 		};
-		return k === 0 && (w.x = S.x, w.y = S.y), M === 0 && (w.x = S.x), j === 0 && (w.y = S.y), log.debug(`abc89 topp/bott calc, Q ${j}, q ${e}, R ${M}, r ${k}`, w), w;
+		return k === 0 && (T.x = C.x, T.y = C.y), M === 0 && (T.x = C.x), j === 0 && (T.y = C.y), log.debug(`abc89 topp/bott calc, Q ${j}, q ${S}, R ${M}, r ${k}`, T), T;
 	} else {
-		k = C.x < S.x ? S.x - O - w : w - O - S.x;
-		let e = j * k / M, T = C.x < S.x ? C.x + M - k : C.x - M + k, E = C.y < S.y ? C.y + e : C.y - e;
-		return log.debug(`sides calc abc89, Q ${j}, q ${e}, R ${M}, r ${k}`, {
-			_x: T,
-			_y: E
-		}), k === 0 && (T = S.x, E = S.y), M === 0 && (T = S.x), j === 0 && (E = S.y), {
-			x: T,
-			y: E
+		k = w.x < C.x ? C.x - O - T : T - O - C.x;
+		let S = j * k / M, E = w.x < C.x ? w.x + M - k : w.x - M + k, D = w.y < C.y ? w.y + S : w.y - S;
+		return log.debug(`sides calc abc89, Q ${j}, q ${S}, R ${M}, r ${k}`, {
+			_x: E,
+			_y: D
+		}), k === 0 && (E = C.x, D = C.y), M === 0 && (E = C.x), j === 0 && (D = C.y), {
+			x: E,
+			y: D
 		};
 	}
-}, "intersection"), cutPathAtIntersect = /* @__PURE__ */ __name((e, S) => {
-	log.debug("abc88 cutPathAtIntersect", e, S);
-	let C = [], w = e[0], T = !1;
-	return e.forEach((e) => {
-		if (!outsideNode(S, e) && !T) {
-			let E = intersection(S, w, e), D = !1;
-			C.forEach((e) => {
-				D ||= e.x === E.x && e.y === E.y;
-			}), C.some((e) => e.x === E.x && e.y === E.y) || C.push(E), T = !0;
-		} else w = e, T || C.push(e);
-	}), C;
-}, "cutPathAtIntersect"), insertEdge = /* @__PURE__ */ __name(function(S, C, w, T, E, O, k) {
-	let j = w.points;
-	log.debug("abc88 InsertEdge: edge=", w, "e=", C);
-	let M = !1, P = O.node(C.v);
-	var F = O.node(C.w);
-	F?.intersect && P?.intersect && (j = j.slice(1, w.points.length - 1), j.unshift(P.intersect(j[0])), j.push(F.intersect(j[j.length - 1]))), w.toCluster && (log.debug("to cluster abc88", T[w.toCluster]), j = cutPathAtIntersect(w.points, T[w.toCluster].node), M = !0), w.fromCluster && (log.debug("from cluster abc88", T[w.fromCluster]), j = cutPathAtIntersect(j.reverse(), T[w.fromCluster].node).reverse(), M = !0);
+}, "intersection"), cutPathAtIntersect = /* @__PURE__ */ __name((S, C) => {
+	log.debug("abc88 cutPathAtIntersect", S, C);
+	let w = [], T = S[0], E = !1;
+	return S.forEach((e) => {
+		if (!outsideNode(C, e) && !E) {
+			let S = intersection(C, T, e), D = !1;
+			w.forEach((e) => {
+				D ||= e.x === S.x && e.y === S.y;
+			}), w.some((e) => e.x === S.x && e.y === S.y) || w.push(S), E = !0;
+		} else T = e, E || w.push(e);
+	}), w;
+}, "cutPathAtIntersect"), insertEdge = /* @__PURE__ */ __name(function(S, C, T, E, O, k, A) {
+	let j = T.points;
+	log.debug("abc88 InsertEdge: edge=", T, "e=", C);
+	let M = !1, N = k.node(C.v);
+	var F = k.node(C.w);
+	F?.intersect && N?.intersect && (j = j.slice(1, T.points.length - 1), j.unshift(N.intersect(j[0])), j.push(F.intersect(j[j.length - 1]))), T.toCluster && (log.debug("to cluster abc88", E[T.toCluster]), j = cutPathAtIntersect(T.points, E[T.toCluster].node), M = !0), T.fromCluster && (log.debug("from cluster abc88", E[T.fromCluster]), j = cutPathAtIntersect(j.reverse(), E[T.fromCluster].node).reverse(), M = !0);
 	let I = j.filter((e) => !Number.isNaN(e.y)), L = basis_default;
-	w.curve && (E === "graph" || E === "flowchart") && (L = w.curve);
-	let { x: R, y: z } = getLineFunctionsWithOffset(w), V = line_default().x(R).y(z).curve(L), H;
-	switch (w.thickness) {
+	T.curve && (O === "graph" || O === "flowchart") && (L = T.curve);
+	let { x: z, y: B } = getLineFunctionsWithOffset(T), V = line_default().x(z).y(B).curve(L), U;
+	switch (T.thickness) {
 		case "normal":
-			H = "edge-thickness-normal";
+			U = "edge-thickness-normal";
 			break;
 		case "thick":
-			H = "edge-thickness-thick";
+			U = "edge-thickness-thick";
 			break;
 		case "invisible":
-			H = "edge-thickness-thick";
+			U = "edge-thickness-thick";
 			break;
-		default: H = "";
+		default: U = "";
 	}
-	switch (w.pattern) {
+	switch (T.pattern) {
 		case "solid":
-			H += " edge-pattern-solid";
+			U += " edge-pattern-solid";
 			break;
 		case "dotted":
-			H += " edge-pattern-dotted";
+			U += " edge-pattern-dotted";
 			break;
 		case "dashed":
-			H += " edge-pattern-dashed";
+			U += " edge-pattern-dashed";
 			break;
 	}
-	let U = S.append("path").attr("d", V(I)).attr("id", w.id).attr("class", " " + H + (w.classes ? " " + w.classes : "")).attr("style", w.style), G = "";
-	(getConfig2().flowchart.arrowMarkerAbsolute || getConfig2().state.arrowMarkerAbsolute) && (G = getUrl(!0)), addEdgeMarkers(U, w, G, k, E);
+	let W = S.append("path").attr("d", V(I)).attr("id", T.id).attr("class", " " + U + (T.classes ? " " + T.classes : "")).attr("style", T.style), G = "";
+	(getConfig2().flowchart.arrowMarkerAbsolute || getConfig2().state.arrowMarkerAbsolute) && (G = getUrl(!0)), addEdgeMarkers(W, T, G, A, O);
 	let K = {};
-	return M && (K.updatedPath = j), K.originalPath = w.points, K;
+	return M && (K.updatedPath = j), K.originalPath = T.points, K;
 }, "insertEdge"), expandAndDeduplicateDirections = /* @__PURE__ */ __name((e) => {
 	let S = /* @__PURE__ */ new Set();
 	for (let C of e) switch (C) {
@@ -2273,41 +2273,41 @@ var intersect_default = {
 			y: w + A
 		};
 	}, "intersectRect")
-}, labelHelper = /* @__PURE__ */ __name(async (e, C, w, T) => {
-	let E = getConfig2(), D, A = C.useHtmlLabels || evaluate(E.flowchart.htmlLabels);
-	D = w || "node default";
-	let M = e.insert("g").attr("class", D).attr("id", C.domId || C.id), P = M.insert("g").attr("class", "label").attr("style", C.labelStyle), F;
-	F = C.labelText === void 0 ? "" : typeof C.labelText == "string" ? C.labelText : C.labelText[0];
+}, labelHelper = /* @__PURE__ */ __name(async (e, w, E, O) => {
+	let k = getConfig2(), j, M = w.useHtmlLabels || evaluate(k.flowchart.htmlLabels);
+	j = E || "node default";
+	let N = e.insert("g").attr("class", j).attr("id", w.domId || w.id), P = N.insert("g").attr("class", "label").attr("style", w.labelStyle), I;
+	I = w.labelText === void 0 ? "" : typeof w.labelText == "string" ? w.labelText : w.labelText[0];
 	let L = P.node(), R;
-	R = C.labelType === "markdown" ? createText(P, sanitizeText(decodeEntities(F), E), {
-		useHtmlLabels: A,
-		width: C.width || E.flowchart.wrappingWidth,
+	R = w.labelType === "markdown" ? createText(P, sanitizeText(decodeEntities(I), k), {
+		useHtmlLabels: M,
+		width: w.width || k.flowchart.wrappingWidth,
 		classes: "markdown-node-label"
-	}, E) : L.appendChild(await createLabel_default(sanitizeText(decodeEntities(F), E), C.labelStyle, !1, T));
-	let z = R.getBBox(), B = C.padding / 2;
-	if (evaluate(E.flowchart.htmlLabels)) {
-		let e = R.children[0], S = select_default(R), C = e.getElementsByTagName("img");
-		if (C) {
-			let e = F.replace(/<img[^>]*>/g, "").trim() === "";
-			await Promise.all([...C].map((S) => new Promise((C) => {
-				function w() {
-					if (S.style.display = "flex", S.style.flexDirection = "column", e) {
-						let e = E.fontSize ? E.fontSize : window.getComputedStyle(document.body).fontSize, C = parseInt(e, 10) * 5 + "px";
-						S.style.minWidth = C, S.style.maxWidth = C;
-					} else S.style.width = "100%";
-					C(S);
+	}, k) : L.appendChild(await createLabel_default(sanitizeText(decodeEntities(I), k), w.labelStyle, !1, O));
+	let z = R.getBBox(), V = w.padding / 2;
+	if (evaluate(k.flowchart.htmlLabels)) {
+		let e = R.children[0], w = select_default(R), T = e.getElementsByTagName("img");
+		if (T) {
+			let e = I.replace(/<img[^>]*>/g, "").trim() === "";
+			await Promise.all([...T].map((C) => new Promise((w) => {
+				function T() {
+					if (C.style.display = "flex", C.style.flexDirection = "column", e) {
+						let e = k.fontSize ? k.fontSize : window.getComputedStyle(document.body).fontSize, S = parseInt(e, 10) * 5 + "px";
+						C.style.minWidth = S, C.style.maxWidth = S;
+					} else C.style.width = "100%";
+					w(C);
 				}
-				__name(w, "setupImage"), setTimeout(() => {
-					S.complete && w();
-				}), S.addEventListener("error", w), S.addEventListener("load", w);
+				__name(T, "setupImage"), setTimeout(() => {
+					C.complete && T();
+				}), C.addEventListener("error", T), C.addEventListener("load", T);
 			})));
 		}
-		z = e.getBoundingClientRect(), S.attr("width", z.width), S.attr("height", z.height);
+		z = e.getBoundingClientRect(), w.attr("width", z.width), w.attr("height", z.height);
 	}
-	return A ? P.attr("transform", "translate(" + -z.width / 2 + ", " + -z.height / 2 + ")") : P.attr("transform", "translate(0, " + -z.height / 2 + ")"), C.centerLabel && P.attr("transform", "translate(" + -z.width / 2 + ", " + -z.height / 2 + ")"), P.insert("rect", ":first-child"), {
-		shapeSvg: M,
+	return M ? P.attr("transform", "translate(" + -z.width / 2 + ", " + -z.height / 2 + ")") : P.attr("transform", "translate(0, " + -z.height / 2 + ")"), w.centerLabel && P.attr("transform", "translate(" + -z.width / 2 + ", " + -z.height / 2 + ")"), P.insert("rect", ":first-child"), {
+		shapeSvg: N,
 		bbox: z,
-		halfPadding: B,
+		halfPadding: V,
 		label: P
 	};
 }, "labelHelper"), updateNodeBounds = /* @__PURE__ */ __name((e, S) => {
@@ -2320,38 +2320,38 @@ function insertPolygonShape(e, S, C, w) {
 	}).join(" ")).attr("class", "label-container").attr("transform", "translate(" + -S / 2 + "," + C / 2 + ")");
 }
 __name(insertPolygonShape, "insertPolygonShape");
-var note_default = /* @__PURE__ */ __name(async (e, S) => {
-	S.useHtmlLabels || getConfig2().flowchart.htmlLabels || (S.centerLabel = !0);
-	let { shapeSvg: C, bbox: w, halfPadding: T } = await labelHelper(e, S, "node " + S.classes, !0);
-	log.info("Classes = ", S.classes);
-	let E = C.insert("rect", ":first-child");
-	return E.attr("rx", S.rx).attr("ry", S.ry).attr("x", -w.width / 2 - T).attr("y", -w.height / 2 - T).attr("width", w.width + S.padding).attr("height", w.height + S.padding), updateNodeBounds(S, E), S.intersect = function(e) {
-		return intersect_default.rect(S, e);
-	}, C;
-}, "note"), formatClass = /* @__PURE__ */ __name((e) => e ? " " + e : "", "formatClass"), getClassesFromNode = /* @__PURE__ */ __name((e, S) => `${S || "node default"}${formatClass(e.classes)} ${formatClass(e.class)}`, "getClassesFromNode"), question = /* @__PURE__ */ __name(async (e, S) => {
-	let { shapeSvg: C, bbox: w } = await labelHelper(e, S, getClassesFromNode(S, void 0), !0), T = w.width + S.padding + (w.height + S.padding), E = [
+var note_default = /* @__PURE__ */ __name(async (S, C) => {
+	C.useHtmlLabels || getConfig2().flowchart.htmlLabels || (C.centerLabel = !0);
+	let { shapeSvg: w, bbox: T, halfPadding: E } = await labelHelper(S, C, "node " + C.classes, !0);
+	log.info("Classes = ", C.classes);
+	let O = w.insert("rect", ":first-child");
+	return O.attr("rx", C.rx).attr("ry", C.ry).attr("x", -T.width / 2 - E).attr("y", -T.height / 2 - E).attr("width", T.width + C.padding).attr("height", T.height + C.padding), updateNodeBounds(C, O), C.intersect = function(e) {
+		return intersect_default.rect(C, e);
+	}, w;
+}, "note"), formatClass = /* @__PURE__ */ __name((e) => e ? " " + e : "", "formatClass"), getClassesFromNode = /* @__PURE__ */ __name((e, S) => `${S || "node default"}${formatClass(e.classes)} ${formatClass(e.class)}`, "getClassesFromNode"), question = /* @__PURE__ */ __name(async (S, C) => {
+	let { shapeSvg: w, bbox: T } = await labelHelper(S, C, getClassesFromNode(C, void 0), !0), E = T.width + C.padding + (T.height + C.padding), D = [
 		{
-			x: T / 2,
+			x: E / 2,
 			y: 0
 		},
 		{
-			x: T,
-			y: -T / 2
+			x: E,
+			y: -E / 2
 		},
 		{
-			x: T / 2,
-			y: -T
+			x: E / 2,
+			y: -E
 		},
 		{
 			x: 0,
-			y: -T / 2
+			y: -E / 2
 		}
 	];
 	log.info("Question main (Circle)");
-	let O = insertPolygonShape(C, T, T, E);
-	return O.attr("style", S.style), updateNodeBounds(S, O), S.intersect = function(e) {
-		return log.warn("Intersect called"), intersect_default.polygon(S, E, e);
-	}, C;
+	let O = insertPolygonShape(w, E, E, D);
+	return O.attr("style", C.style), updateNodeBounds(C, O), C.intersect = function(S) {
+		return log.warn("Intersect called"), intersect_default.polygon(C, D, S);
+	}, w;
 }, "question"), choice = /* @__PURE__ */ __name((e, S) => {
 	let C = e.insert("g").attr("class", "node default").attr("id", S.domId || S.id);
 	return C.insert("polygon", ":first-child").attr("points", [
@@ -2561,89 +2561,89 @@ var note_default = /* @__PURE__ */ __name(async (e, S) => {
 		}
 		return C;
 	}, C;
-}, "cylinder"), rect = /* @__PURE__ */ __name(async (e, S) => {
-	let { shapeSvg: C, bbox: w, halfPadding: T } = await labelHelper(e, S, "node " + S.classes + " " + S.class, !0), E = C.insert("rect", ":first-child"), O = S.positioned ? S.width : w.width + S.padding, k = S.positioned ? S.height : w.height + S.padding, A = S.positioned ? -O / 2 : -w.width / 2 - T, j = S.positioned ? -k / 2 : -w.height / 2 - T;
-	if (E.attr("class", "basic label-container").attr("style", S.style).attr("rx", S.rx).attr("ry", S.ry).attr("x", A).attr("y", j).attr("width", O).attr("height", k), S.props) {
-		let e = new Set(Object.keys(S.props));
-		S.props.borders && (applyNodePropertyBorders(E, S.props.borders, O, k), e.delete("borders")), e.forEach((e) => {
-			log.warn(`Unknown node property ${e}`);
+}, "cylinder"), rect = /* @__PURE__ */ __name(async (S, C) => {
+	let { shapeSvg: w, bbox: T, halfPadding: E } = await labelHelper(S, C, "node " + C.classes + " " + C.class, !0), D = w.insert("rect", ":first-child"), O = C.positioned ? C.width : T.width + C.padding, k = C.positioned ? C.height : T.height + C.padding, A = C.positioned ? -O / 2 : -T.width / 2 - E, j = C.positioned ? -k / 2 : -T.height / 2 - E;
+	if (D.attr("class", "basic label-container").attr("style", C.style).attr("rx", C.rx).attr("ry", C.ry).attr("x", A).attr("y", j).attr("width", O).attr("height", k), C.props) {
+		let S = new Set(Object.keys(C.props));
+		C.props.borders && (applyNodePropertyBorders(D, C.props.borders, O, k), S.delete("borders")), S.forEach((S) => {
+			log.warn(`Unknown node property ${S}`);
 		});
 	}
-	return updateNodeBounds(S, E), S.intersect = function(e) {
-		return intersect_default.rect(S, e);
-	}, C;
-}, "rect"), composite = /* @__PURE__ */ __name(async (e, S) => {
-	let { shapeSvg: C, bbox: w, halfPadding: T } = await labelHelper(e, S, "node " + S.classes, !0), E = C.insert("rect", ":first-child"), O = S.positioned ? S.width : w.width + S.padding, k = S.positioned ? S.height : w.height + S.padding, A = S.positioned ? -O / 2 : -w.width / 2 - T, j = S.positioned ? -k / 2 : -w.height / 2 - T;
-	if (E.attr("class", "basic cluster composite label-container").attr("style", S.style).attr("rx", S.rx).attr("ry", S.ry).attr("x", A).attr("y", j).attr("width", O).attr("height", k), S.props) {
-		let e = new Set(Object.keys(S.props));
-		S.props.borders && (applyNodePropertyBorders(E, S.props.borders, O, k), e.delete("borders")), e.forEach((e) => {
-			log.warn(`Unknown node property ${e}`);
+	return updateNodeBounds(C, D), C.intersect = function(e) {
+		return intersect_default.rect(C, e);
+	}, w;
+}, "rect"), composite = /* @__PURE__ */ __name(async (S, C) => {
+	let { shapeSvg: w, bbox: T, halfPadding: E } = await labelHelper(S, C, "node " + C.classes, !0), D = w.insert("rect", ":first-child"), O = C.positioned ? C.width : T.width + C.padding, k = C.positioned ? C.height : T.height + C.padding, A = C.positioned ? -O / 2 : -T.width / 2 - E, j = C.positioned ? -k / 2 : -T.height / 2 - E;
+	if (D.attr("class", "basic cluster composite label-container").attr("style", C.style).attr("rx", C.rx).attr("ry", C.ry).attr("x", A).attr("y", j).attr("width", O).attr("height", k), C.props) {
+		let S = new Set(Object.keys(C.props));
+		C.props.borders && (applyNodePropertyBorders(D, C.props.borders, O, k), S.delete("borders")), S.forEach((S) => {
+			log.warn(`Unknown node property ${S}`);
 		});
 	}
-	return updateNodeBounds(S, E), S.intersect = function(e) {
-		return intersect_default.rect(S, e);
-	}, C;
-}, "composite"), labelRect = /* @__PURE__ */ __name(async (e, S) => {
-	let { shapeSvg: C } = await labelHelper(e, S, "label", !0);
-	log.trace("Classes = ", S.class);
-	let w = C.insert("rect", ":first-child");
-	if (w.attr("width", 0).attr("height", 0), C.attr("class", "label edgeLabel"), S.props) {
-		let e = new Set(Object.keys(S.props));
-		S.props.borders && (applyNodePropertyBorders(w, S.props.borders, 0, 0), e.delete("borders")), e.forEach((e) => {
-			log.warn(`Unknown node property ${e}`);
+	return updateNodeBounds(C, D), C.intersect = function(e) {
+		return intersect_default.rect(C, e);
+	}, w;
+}, "composite"), labelRect = /* @__PURE__ */ __name(async (S, C) => {
+	let { shapeSvg: w } = await labelHelper(S, C, "label", !0);
+	log.trace("Classes = ", C.class);
+	let T = w.insert("rect", ":first-child");
+	if (T.attr("width", 0).attr("height", 0), w.attr("class", "label edgeLabel"), C.props) {
+		let S = new Set(Object.keys(C.props));
+		C.props.borders && (applyNodePropertyBorders(T, C.props.borders, 0, 0), S.delete("borders")), S.forEach((S) => {
+			log.warn(`Unknown node property ${S}`);
 		});
 	}
-	return updateNodeBounds(S, w), S.intersect = function(e) {
-		return intersect_default.rect(S, e);
-	}, C;
+	return updateNodeBounds(C, T), C.intersect = function(e) {
+		return intersect_default.rect(C, e);
+	}, w;
 }, "labelRect");
-function applyNodePropertyBorders(e, S, C, w) {
-	let T = [], E = /* @__PURE__ */ __name((e) => {
-		T.push(e, 0);
+function applyNodePropertyBorders(C, w, T, E) {
+	let D = [], O = /* @__PURE__ */ __name((e) => {
+		D.push(e, 0);
 	}, "addBorder"), k = /* @__PURE__ */ __name((e) => {
-		T.push(0, e);
+		D.push(0, e);
 	}, "skipBorder");
-	S.includes("t") ? (log.debug("add top border"), E(C)) : k(C), S.includes("r") ? (log.debug("add right border"), E(w)) : k(w), S.includes("b") ? (log.debug("add bottom border"), E(C)) : k(C), S.includes("l") ? (log.debug("add left border"), E(w)) : k(w), e.attr("stroke-dasharray", T.join(" "));
+	w.includes("t") ? (log.debug("add top border"), O(T)) : k(T), w.includes("r") ? (log.debug("add right border"), O(E)) : k(E), w.includes("b") ? (log.debug("add bottom border"), O(T)) : k(T), w.includes("l") ? (log.debug("add left border"), O(E)) : k(E), C.attr("stroke-dasharray", D.join(" "));
 }
 __name(applyNodePropertyBorders, "applyNodePropertyBorders");
-var rectWithTitle = /* @__PURE__ */ __name(async (e, S) => {
-	let C;
-	C = S.classes ? "node " + S.classes : "node default";
-	let w = e.insert("g").attr("class", C).attr("id", S.domId || S.id), T = w.insert("rect", ":first-child"), E = w.insert("line"), O = w.insert("g").attr("class", "label"), A = S.labelText.flat ? S.labelText.flat() : S.labelText, j = "";
-	j = typeof A == "object" ? A[0] : A, log.info("Label text abc79", j, A, typeof A == "object");
-	let M = O.node().appendChild(await createLabel_default(j, S.labelStyle, !0, !0)), P = {
+var rectWithTitle = /* @__PURE__ */ __name(async (S, w) => {
+	let T;
+	T = w.classes ? "node " + w.classes : "node default";
+	let E = S.insert("g").attr("class", T).attr("id", w.domId || w.id), O = E.insert("rect", ":first-child"), k = E.insert("line"), j = E.insert("g").attr("class", "label"), M = w.labelText.flat ? w.labelText.flat() : w.labelText, N = "";
+	N = typeof M == "object" ? M[0] : M, log.info("Label text abc79", N, M, typeof M == "object");
+	let P = j.node().appendChild(await createLabel_default(N, w.labelStyle, !0, !0)), F = {
 		width: 0,
 		height: 0
 	};
 	if (evaluate(getConfig2().flowchart.htmlLabels)) {
-		let e = M.children[0], S = select_default(M);
-		P = e.getBoundingClientRect(), S.attr("width", P.width), S.attr("height", P.height);
+		let e = P.children[0], S = select_default(P);
+		F = e.getBoundingClientRect(), S.attr("width", F.width), S.attr("height", F.height);
 	}
-	log.info("Text 2", A);
-	let F = A.slice(1, A.length), L = M.getBBox(), R = O.node().appendChild(await createLabel_default(F.join ? F.join("<br/>") : F, S.labelStyle, !0, !0));
+	log.info("Text 2", M);
+	let I = M.slice(1, M.length), L = P.getBBox(), R = j.node().appendChild(await createLabel_default(I.join ? I.join("<br/>") : I, w.labelStyle, !0, !0));
 	if (evaluate(getConfig2().flowchart.htmlLabels)) {
 		let e = R.children[0], S = select_default(R);
-		P = e.getBoundingClientRect(), S.attr("width", P.width), S.attr("height", P.height);
+		F = e.getBoundingClientRect(), S.attr("width", F.width), S.attr("height", F.height);
 	}
-	let z = S.padding / 2;
-	return select_default(R).attr("transform", "translate( " + (P.width > L.width ? 0 : (L.width - P.width) / 2) + ", " + (L.height + z + 5) + ")"), select_default(M).attr("transform", "translate( " + (P.width < L.width ? 0 : -(L.width - P.width) / 2) + ", 0)"), P = O.node().getBBox(), O.attr("transform", "translate(" + -P.width / 2 + ", " + (-P.height / 2 - z + 3) + ")"), T.attr("class", "outer title-state").attr("x", -P.width / 2 - z).attr("y", -P.height / 2 - z).attr("width", P.width + S.padding).attr("height", P.height + S.padding), E.attr("class", "divider").attr("x1", -P.width / 2 - z).attr("x2", P.width / 2 + z).attr("y1", -P.height / 2 - z + L.height + z).attr("y2", -P.height / 2 - z + L.height + z), updateNodeBounds(S, T), S.intersect = function(e) {
-		return intersect_default.rect(S, e);
-	}, w;
+	let z = w.padding / 2;
+	return select_default(R).attr("transform", "translate( " + (F.width > L.width ? 0 : (L.width - F.width) / 2) + ", " + (L.height + z + 5) + ")"), select_default(P).attr("transform", "translate( " + (F.width < L.width ? 0 : -(L.width - F.width) / 2) + ", 0)"), F = j.node().getBBox(), j.attr("transform", "translate(" + -F.width / 2 + ", " + (-F.height / 2 - z + 3) + ")"), O.attr("class", "outer title-state").attr("x", -F.width / 2 - z).attr("y", -F.height / 2 - z).attr("width", F.width + w.padding).attr("height", F.height + w.padding), k.attr("class", "divider").attr("x1", -F.width / 2 - z).attr("x2", F.width / 2 + z).attr("y1", -F.height / 2 - z + L.height + z).attr("y2", -F.height / 2 - z + L.height + z), updateNodeBounds(w, O), w.intersect = function(e) {
+		return intersect_default.rect(w, e);
+	}, E;
 }, "rectWithTitle"), stadium = /* @__PURE__ */ __name(async (e, S) => {
 	let { shapeSvg: C, bbox: w } = await labelHelper(e, S, getClassesFromNode(S, void 0), !0), T = w.height + S.padding, E = w.width + T / 4 + S.padding;
 	return updateNodeBounds(S, C.insert("rect", ":first-child").attr("style", S.style).attr("rx", T / 2).attr("ry", T / 2).attr("x", -E / 2).attr("y", -T / 2).attr("width", E).attr("height", T)), S.intersect = function(e) {
 		return intersect_default.rect(S, e);
 	}, C;
-}, "stadium"), circle2 = /* @__PURE__ */ __name(async (e, S) => {
-	let { shapeSvg: C, bbox: w, halfPadding: T } = await labelHelper(e, S, getClassesFromNode(S, void 0), !0), E = C.insert("circle", ":first-child");
-	return E.attr("style", S.style).attr("rx", S.rx).attr("ry", S.ry).attr("r", w.width / 2 + T).attr("width", w.width + S.padding).attr("height", w.height + S.padding), log.info("Circle main"), updateNodeBounds(S, E), S.intersect = function(e) {
-		return log.info("Circle intersect", S, w.width / 2 + T, e), intersect_default.circle(S, w.width / 2 + T, e);
-	}, C;
-}, "circle"), doublecircle = /* @__PURE__ */ __name(async (e, S) => {
-	let { shapeSvg: C, bbox: w, halfPadding: T } = await labelHelper(e, S, getClassesFromNode(S, void 0), !0), E = C.insert("g", ":first-child"), O = E.insert("circle"), k = E.insert("circle");
-	return E.attr("class", S.class), O.attr("style", S.style).attr("rx", S.rx).attr("ry", S.ry).attr("r", w.width / 2 + T + 5).attr("width", w.width + S.padding + 10).attr("height", w.height + S.padding + 10), k.attr("style", S.style).attr("rx", S.rx).attr("ry", S.ry).attr("r", w.width / 2 + T).attr("width", w.width + S.padding).attr("height", w.height + S.padding), log.info("DoubleCircle main"), updateNodeBounds(S, O), S.intersect = function(e) {
-		return log.info("DoubleCircle intersect", S, w.width / 2 + T + 5, e), intersect_default.circle(S, w.width / 2 + T + 5, e);
-	}, C;
+}, "stadium"), circle2 = /* @__PURE__ */ __name(async (S, C) => {
+	let { shapeSvg: w, bbox: T, halfPadding: E } = await labelHelper(S, C, getClassesFromNode(C, void 0), !0), D = w.insert("circle", ":first-child");
+	return D.attr("style", C.style).attr("rx", C.rx).attr("ry", C.ry).attr("r", T.width / 2 + E).attr("width", T.width + C.padding).attr("height", T.height + C.padding), log.info("Circle main"), updateNodeBounds(C, D), C.intersect = function(S) {
+		return log.info("Circle intersect", C, T.width / 2 + E, S), intersect_default.circle(C, T.width / 2 + E, S);
+	}, w;
+}, "circle"), doublecircle = /* @__PURE__ */ __name(async (S, C) => {
+	let { shapeSvg: w, bbox: T, halfPadding: E } = await labelHelper(S, C, getClassesFromNode(C, void 0), !0), D = w.insert("g", ":first-child"), O = D.insert("circle"), k = D.insert("circle");
+	return D.attr("class", C.class), O.attr("style", C.style).attr("rx", C.rx).attr("ry", C.ry).attr("r", T.width / 2 + E + 5).attr("width", T.width + C.padding + 10).attr("height", T.height + C.padding + 10), k.attr("style", C.style).attr("rx", C.rx).attr("ry", C.ry).attr("r", T.width / 2 + E).attr("width", T.width + C.padding).attr("height", T.height + C.padding), log.info("DoubleCircle main"), updateNodeBounds(C, O), C.intersect = function(S) {
+		return log.info("DoubleCircle intersect", C, T.width / 2 + E + 5, S), intersect_default.circle(C, T.width / 2 + E + 5, S);
+	}, w;
 }, "doublecircle"), subroutine = /* @__PURE__ */ __name(async (e, S) => {
 	let { shapeSvg: C, bbox: w } = await labelHelper(e, S, getClassesFromNode(S, void 0), !0), T = w.width + S.padding, E = w.height + S.padding, D = [
 		{
@@ -2732,61 +2732,61 @@ var rectWithTitle = /* @__PURE__ */ __name(async (e, S) => {
 	fork: forkJoin,
 	join: forkJoin,
 	class_box: /* @__PURE__ */ __name(async (e, S) => {
-		let C = S.padding / 2, w;
-		w = S.classes ? "node " + S.classes : "node default";
-		let T = e.insert("g").attr("class", w).attr("id", S.domId || S.id), E = T.insert("rect", ":first-child"), D = T.insert("line"), O = T.insert("line"), A = 0, j = 4, M = T.insert("g").attr("class", "label"), P = 0, F = S.classData.annotations?.[0], L = S.classData.annotations[0] ? "«" + S.classData.annotations[0] + "»" : "", R = M.node().appendChild(await createLabel_default(L, S.labelStyle, !0, !0)), z = R.getBBox();
+		let w = S.padding / 2, T;
+		T = S.classes ? "node " + S.classes : "node default";
+		let E = e.insert("g").attr("class", T).attr("id", S.domId || S.id), O = E.insert("rect", ":first-child"), k = E.insert("line"), j = E.insert("line"), M = 0, N = 4, P = E.insert("g").attr("class", "label"), F = 0, I = S.classData.annotations?.[0], L = S.classData.annotations[0] ? "«" + S.classData.annotations[0] + "»" : "", R = P.node().appendChild(await createLabel_default(L, S.labelStyle, !0, !0)), z = R.getBBox();
 		if (evaluate(getConfig2().flowchart.htmlLabels)) {
 			let e = R.children[0], S = select_default(R);
 			z = e.getBoundingClientRect(), S.attr("width", z.width), S.attr("height", z.height);
 		}
-		S.classData.annotations[0] && (j += z.height + 4, A += z.width);
+		S.classData.annotations[0] && (N += z.height + 4, M += z.width);
 		let B = S.classData.label;
 		S.classData.type !== void 0 && S.classData.type !== "" && (getConfig2().flowchart.htmlLabels ? B += "&lt;" + S.classData.type + "&gt;" : B += "<" + S.classData.type + ">");
-		let V = M.node().appendChild(await createLabel_default(B, S.labelStyle, !0, !0));
+		let V = P.node().appendChild(await createLabel_default(B, S.labelStyle, !0, !0));
 		select_default(V).attr("class", "classTitle");
 		let H = V.getBBox();
 		if (evaluate(getConfig2().flowchart.htmlLabels)) {
 			let e = V.children[0], S = select_default(V);
 			H = e.getBoundingClientRect(), S.attr("width", H.width), S.attr("height", H.height);
 		}
-		j += H.height + 4, H.width > A && (A = H.width);
+		N += H.height + 4, H.width > M && (M = H.width);
 		let U = [];
 		S.classData.members.forEach(async (e) => {
-			let C = e.getDisplayDetails(), w = C.displayText;
-			getConfig2().flowchart.htmlLabels && (w = w.replace(/</g, "&lt;").replace(/>/g, "&gt;"));
-			let T = M.node().appendChild(await createLabel_default(w, C.cssStyle ? C.cssStyle : S.labelStyle, !0, !0)), E = T.getBBox();
+			let w = e.getDisplayDetails(), T = w.displayText;
+			getConfig2().flowchart.htmlLabels && (T = T.replace(/</g, "&lt;").replace(/>/g, "&gt;"));
+			let E = P.node().appendChild(await createLabel_default(T, w.cssStyle ? w.cssStyle : S.labelStyle, !0, !0)), O = E.getBBox();
 			if (evaluate(getConfig2().flowchart.htmlLabels)) {
-				let e = T.children[0], S = select_default(T);
-				E = e.getBoundingClientRect(), S.attr("width", E.width), S.attr("height", E.height);
+				let e = E.children[0], S = select_default(E);
+				O = e.getBoundingClientRect(), S.attr("width", O.width), S.attr("height", O.height);
 			}
-			E.width > A && (A = E.width), j += E.height + 4, U.push(T);
-		}), j += 8;
+			O.width > M && (M = O.width), N += O.height + 4, U.push(E);
+		}), N += 8;
 		let W = [];
 		if (S.classData.methods.forEach(async (e) => {
-			let C = e.getDisplayDetails(), w = C.displayText;
-			getConfig2().flowchart.htmlLabels && (w = w.replace(/</g, "&lt;").replace(/>/g, "&gt;"));
-			let T = M.node().appendChild(await createLabel_default(w, C.cssStyle ? C.cssStyle : S.labelStyle, !0, !0)), E = T.getBBox();
+			let w = e.getDisplayDetails(), T = w.displayText;
+			getConfig2().flowchart.htmlLabels && (T = T.replace(/</g, "&lt;").replace(/>/g, "&gt;"));
+			let E = P.node().appendChild(await createLabel_default(T, w.cssStyle ? w.cssStyle : S.labelStyle, !0, !0)), O = E.getBBox();
 			if (evaluate(getConfig2().flowchart.htmlLabels)) {
-				let e = T.children[0], S = select_default(T);
-				E = e.getBoundingClientRect(), S.attr("width", E.width), S.attr("height", E.height);
+				let e = E.children[0], S = select_default(E);
+				O = e.getBoundingClientRect(), S.attr("width", O.width), S.attr("height", O.height);
 			}
-			E.width > A && (A = E.width), j += E.height + 4, W.push(T);
-		}), j += 8, F) {
-			let e = (A - z.width) / 2;
-			select_default(R).attr("transform", "translate( " + (-1 * A / 2 + e) + ", " + -1 * j / 2 + ")"), P = z.height + 4;
+			O.width > M && (M = O.width), N += O.height + 4, W.push(E);
+		}), N += 8, I) {
+			let e = (M - z.width) / 2;
+			select_default(R).attr("transform", "translate( " + (-1 * M / 2 + e) + ", " + -1 * N / 2 + ")"), F = z.height + 4;
 		}
-		let G = (A - H.width) / 2;
-		return select_default(V).attr("transform", "translate( " + (-1 * A / 2 + G) + ", " + (-1 * j / 2 + P) + ")"), P += H.height + 4, D.attr("class", "divider").attr("x1", -A / 2 - C).attr("x2", A / 2 + C).attr("y1", -j / 2 - C + 8 + P).attr("y2", -j / 2 - C + 8 + P), P += 8, U.forEach((e) => {
-			select_default(e).attr("transform", "translate( " + -A / 2 + ", " + (-1 * j / 2 + P + 8 / 2) + ")");
+		let G = (M - H.width) / 2;
+		return select_default(V).attr("transform", "translate( " + (-1 * M / 2 + G) + ", " + (-1 * N / 2 + F) + ")"), F += H.height + 4, k.attr("class", "divider").attr("x1", -M / 2 - w).attr("x2", M / 2 + w).attr("y1", -N / 2 - w + 8 + F).attr("y2", -N / 2 - w + 8 + F), F += 8, U.forEach((e) => {
+			select_default(e).attr("transform", "translate( " + -M / 2 + ", " + (-1 * N / 2 + F + 8 / 2) + ")");
 			let S = e?.getBBox();
-			P += (S?.height ?? 0) + 4;
-		}), P += 8, O.attr("class", "divider").attr("x1", -A / 2 - C).attr("x2", A / 2 + C).attr("y1", -j / 2 - C + 8 + P).attr("y2", -j / 2 - C + 8 + P), P += 8, W.forEach((e) => {
-			select_default(e).attr("transform", "translate( " + -A / 2 + ", " + (-1 * j / 2 + P) + ")");
+			F += (S?.height ?? 0) + 4;
+		}), F += 8, j.attr("class", "divider").attr("x1", -M / 2 - w).attr("x2", M / 2 + w).attr("y1", -N / 2 - w + 8 + F).attr("y2", -N / 2 - w + 8 + F), F += 8, W.forEach((e) => {
+			select_default(e).attr("transform", "translate( " + -M / 2 + ", " + (-1 * N / 2 + F) + ")");
 			let S = e?.getBBox();
-			P += (S?.height ?? 0) + 4;
-		}), E.attr("style", S.style).attr("class", "outer title-state").attr("x", -A / 2 - C).attr("y", -(j / 2) - C).attr("width", A + S.padding).attr("height", j + S.padding), updateNodeBounds(S, E), S.intersect = function(e) {
+			F += (S?.height ?? 0) + 4;
+		}), O.attr("style", S.style).attr("class", "outer title-state").attr("x", -M / 2 - w).attr("y", -(N / 2) - w).attr("width", M + S.padding).attr("height", N + S.padding), updateNodeBounds(S, O), S.intersect = function(e) {
 			return intersect_default.rect(S, e);
-		}, T;
+		}, E;
 	}, "class_box")
 }, nodeElems = {}, insertNode = /* @__PURE__ */ __name(async (e, S, C) => {
 	let w, T;
@@ -2795,100 +2795,100 @@ var rectWithTitle = /* @__PURE__ */ __name(async (e, S) => {
 		getConfig2().securityLevel === "sandbox" ? E = "_top" : S.linkTarget && (E = S.linkTarget || "_blank"), w = e.insert("svg:a").attr("xlink:href", S.link).attr("target", E), T = await shapes[S.shape](w, S, C);
 	} else T = await shapes[S.shape](e, S, C), w = T;
 	return S.tooltip && T.attr("title", S.tooltip), S.class && T.attr("class", "node default " + S.class), nodeElems[S.id] = w, S.haveCallback && nodeElems[S.id].attr("class", nodeElems[S.id].attr("class") + " clickable"), w;
-}, "insertNode"), positionNode = /* @__PURE__ */ __name((e) => {
-	let S = nodeElems[e.id];
-	log.trace("Transforming node", e.diff, e, "translate(" + (e.x - e.width / 2 - 5) + ", " + e.width / 2 + ")");
-	let C = e.diff || 0;
-	return e.clusterNode ? S.attr("transform", "translate(" + (e.x + C - e.width / 2) + ", " + (e.y - e.height / 2 - 8) + ")") : S.attr("transform", "translate(" + e.x + ", " + e.y + ")"), C;
+}, "insertNode"), positionNode = /* @__PURE__ */ __name((S) => {
+	let C = nodeElems[S.id];
+	log.trace("Transforming node", S.diff, S, "translate(" + (S.x - S.width / 2 - 5) + ", " + S.width / 2 + ")");
+	let w = S.diff || 0;
+	return S.clusterNode ? C.attr("transform", "translate(" + (S.x + w - S.width / 2) + ", " + (S.y - S.height / 2 - 8) + ")") : C.attr("transform", "translate(" + S.x + ", " + S.y + ")"), w;
 }, "positionNode");
 function getNodeFromBlock(e, S, C = !1) {
-	let T = e, E = "default";
-	(T?.classes?.length || 0) > 0 && (E = (T?.classes ?? []).join(" ")), E += " flowchart-label";
-	let D = 0, O = "", k;
-	switch (T.type) {
+	let w = e, T = "default";
+	(w?.classes?.length || 0) > 0 && (T = (w?.classes ?? []).join(" ")), T += " flowchart-label";
+	let E = 0, D = "", O;
+	switch (w.type) {
 		case "round":
-			D = 5, O = "rect";
+			E = 5, D = "rect";
 			break;
 		case "composite":
-			D = 0, O = "composite", k = 0;
+			E = 0, D = "composite", O = 0;
 			break;
 		case "square":
-			O = "rect";
+			D = "rect";
 			break;
 		case "diamond":
-			O = "question";
+			D = "question";
 			break;
 		case "hexagon":
-			O = "hexagon";
+			D = "hexagon";
 			break;
 		case "block_arrow":
-			O = "block_arrow";
+			D = "block_arrow";
 			break;
 		case "odd":
-			O = "rect_left_inv_arrow";
+			D = "rect_left_inv_arrow";
 			break;
 		case "lean_right":
-			O = "lean_right";
+			D = "lean_right";
 			break;
 		case "lean_left":
-			O = "lean_left";
+			D = "lean_left";
 			break;
 		case "trapezoid":
-			O = "trapezoid";
+			D = "trapezoid";
 			break;
 		case "inv_trapezoid":
-			O = "inv_trapezoid";
+			D = "inv_trapezoid";
 			break;
 		case "rect_left_inv_arrow":
-			O = "rect_left_inv_arrow";
+			D = "rect_left_inv_arrow";
 			break;
 		case "circle":
-			O = "circle";
+			D = "circle";
 			break;
 		case "ellipse":
-			O = "ellipse";
+			D = "ellipse";
 			break;
 		case "stadium":
-			O = "stadium";
+			D = "stadium";
 			break;
 		case "subroutine":
-			O = "subroutine";
+			D = "subroutine";
 			break;
 		case "cylinder":
-			O = "cylinder";
+			D = "cylinder";
 			break;
 		case "group":
-			O = "rect";
+			D = "rect";
 			break;
 		case "doublecircle":
-			O = "doublecircle";
+			D = "doublecircle";
 			break;
-		default: O = "rect";
+		default: D = "rect";
 	}
-	let A = getStylesFromArray(T?.styles ?? []), j = T.label, M = T.size ?? {
+	let k = getStylesFromArray(w?.styles ?? []), A = w.label, j = w.size ?? {
 		width: 0,
 		height: 0,
 		x: 0,
 		y: 0
 	};
 	return {
-		labelStyle: A.labelStyle,
-		shape: O,
-		labelText: j,
-		rx: D,
-		ry: D,
-		class: E,
-		style: A.style,
-		id: T.id,
-		directions: T.directions,
-		width: M.width,
-		height: M.height,
-		x: M.x,
-		y: M.y,
+		labelStyle: k.labelStyle,
+		shape: D,
+		labelText: A,
+		rx: E,
+		ry: E,
+		class: T,
+		style: k.style,
+		id: w.id,
+		directions: w.directions,
+		width: j.width,
+		height: j.height,
+		x: j.x,
+		y: j.y,
 		positioned: C,
 		intersect: void 0,
-		type: T.type,
-		padding: k ?? getConfig()?.block?.padding ?? 0
+		type: w.type,
+		padding: O ?? getConfig()?.block?.padding ?? 0
 	};
 }
 __name(getNodeFromBlock, "getNodeFromBlock");
@@ -2923,26 +2923,26 @@ async function insertBlocks(e, S, C) {
 }
 __name(insertBlocks, "insertBlocks");
 async function insertEdges(e, S, C, w, T) {
-	let D = new Graph({
+	let E = new Graph({
 		multigraph: !0,
 		compound: !0
 	});
-	D.setGraph({
+	E.setGraph({
 		rankdir: "TB",
 		nodesep: 10,
 		ranksep: 10,
 		marginx: 8,
 		marginy: 8
 	});
-	for (let e of C) e.size && D.setNode(e.id, {
+	for (let e of C) e.size && E.setNode(e.id, {
 		width: e.size.width,
 		height: e.size.height,
 		intersect: e.intersect
 	});
 	for (let C of S) if (C.start && C.end) {
-		let S = w.getBlock(C.start), E = w.getBlock(C.end);
-		if (S?.size && E?.size) {
-			let w = S.size, O = E.size, k = [
+		let S = w.getBlock(C.start), D = w.getBlock(C.end);
+		if (S?.size && D?.size) {
+			let w = S.size, O = D.size, k = [
 				{
 					x: w.x,
 					y: w.y
@@ -2966,7 +2966,7 @@ async function insertEdges(e, S, C, w, T) {
 				arrowTypeStart: C.arrowTypeStart,
 				points: k,
 				classes: "edge-thickness-normal edge-pattern-solid flowchart-link LS-a1 LE-b1"
-			}, void 0, "block", D, T), C.label && (await insertEdgeLabel(e, {
+			}, void 0, "block", E, T), C.label && (await insertEdgeLabel(e, {
 				...C,
 				label: C.label,
 				labelStyle: "stroke: #333; stroke-width: 1.5px;fill:none;",
@@ -2987,21 +2987,21 @@ var diagram = {
 	parser: block_default,
 	db: blockDB_default,
 	renderer: {
-		draw: /* @__PURE__ */ __name(async function(e, S, C, w) {
-			let { securityLevel: T, block: E } = getConfig(), O = w.db, A;
-			T === "sandbox" && (A = select_default("#i" + S));
-			let j = select_default(T === "sandbox" ? A.nodes()[0].contentDocument.body : "body"), M = T === "sandbox" ? j.select(`[id="${S}"]`) : select_default(`[id="${S}"]`);
-			markers_default(M, [
+		draw: /* @__PURE__ */ __name(async function(S, w, T, E) {
+			let { securityLevel: D, block: k } = getConfig(), A = E.db, j;
+			D === "sandbox" && (j = select_default("#i" + w));
+			let N = select_default(D === "sandbox" ? j.nodes()[0].contentDocument.body : "body"), P = D === "sandbox" ? N.select(`[id="${w}"]`) : select_default(`[id="${w}"]`);
+			markers_default(P, [
 				"point",
 				"circle",
 				"cross"
-			], w.type, S);
-			let N = O.getBlocks(), F = O.getBlocksFlat(), I = O.getEdges(), L = M.insert("g").attr("class", "block");
-			await calculateBlockSizes(L, N, O);
-			let z = layout(O);
-			if (await insertBlocks(L, N, O), await insertEdges(L, I, F, O, S), z) {
-				let e = z, S = Math.max(1, Math.round(.125 * (e.width / e.height))), C = e.height + S + 10, w = e.width + 10, { useMaxWidth: T } = E;
-				configureSvgSize(M, C, w, !!T), log.debug("Here Bounds", z, e), M.attr("viewBox", `${e.x - 5} ${e.y - 5} ${e.width + 10} ${e.height + 10}`);
+			], E.type, w);
+			let F = A.getBlocks(), I = A.getBlocksFlat(), L = A.getEdges(), R = P.insert("g").attr("class", "block");
+			await calculateBlockSizes(R, F, A);
+			let z = layout(A);
+			if (await insertBlocks(R, F, A), await insertEdges(R, L, I, A, w), z) {
+				let S = z, C = Math.max(1, Math.round(.125 * (S.width / S.height))), w = S.height + C + 10, T = S.width + 10, { useMaxWidth: E } = k;
+				configureSvgSize(P, w, T, !!E), log.debug("Here Bounds", z, S), P.attr("viewBox", `${S.x - 5} ${S.y - 5} ${S.width + 10} ${S.height + 10}`);
 			}
 		}, "draw"),
 		getClasses: /* @__PURE__ */ __name(function(e, S) {