@plumile/ui 0.1.116 → 0.1.117

package/lib/esm/node_modules/mermaid/dist/chunks/mermaid.core/{blockDiagram-DXYQGD6D.js → blockDiagram-GPEHLZMM.js}

@@ -1,20 +1,20 @@
 import { __name as e, log as t } from "./chunk-AGHRB4JF.js";
 import n from "../../../../khroma/dist/methods/rgba.js";
 import r from "../../../../khroma/dist/methods/channel.js";
-import { clear as i, common_default as a, configureSvgSize as o, getConfig as s, getConfig2 as c, getEffectiveHtmlLabels as l, getUrl as u, sanitizeText as d } from "./chunk-ICPOFSXX.js";
+import { clear as i, common_default as a, configureSvgSize as o, getConfig as s, getConfig2 as c, getEffectiveHtmlLabels as l, getUrl as u, sanitizeText as d } from "./chunk-CSCIHK7Q.js";
 import f from "../../../../d3-selection/src/select.js";
 import p from "../../../../d3-shape/src/line.js";
 import m from "../../../../d3-shape/src/curve/basis.js";
 import "../../../../d3/src/index.js";
-import { decodeEntities as h, getStylesFromArray as g, utils_default as _ } from "./chunk-5PVQY5BW.js";
-import { createText as v } from "./chunk-U2HBQHQK.js";
-import { getIconStyles as y } from "./chunk-FMBD7UC4.js";
-import { computeLabelTransform as b, getLineFunctionsWithOffset as x } from "./chunk-BSJP7CBP.js";
-import { configureLabelImages as S, getSubGraphTitleMargins as C } from "./chunk-ZZ45TVLE.js";
-import w from "../../../../lodash-es/clone.js";
+import { clone as h } from "../../../../es-toolkit/dist/compat/object/clone.js";
+import { decodeEntities as g, getStylesFromArray as _, utils_default as v } from "./chunk-5ZQYHXKU.js";
+import { createText as y } from "./chunk-O5CBEL6O.js";
+import { getIconStyles as b } from "./chunk-FMBD7UC4.js";
+import { computeLabelTransform as x, getLineFunctionsWithOffset as S } from "./chunk-BSJP7CBP.js";
+import { configureLabelImages as C, getSubGraphTitleMargins as w } from "./chunk-L5ZTLDWV.js";
 import { Graph as T } from "../../../../dagre-d3-es/src/graphlib/graph.js";
 import "../../../../dagre-d3-es/src/graphlib/index.js";
-//#region ../../node_modules/mermaid/dist/chunks/mermaid.core/blockDiagram-DXYQGD6D.mjs
+//#region ../../node_modules/mermaid/dist/chunks/mermaid.core/blockDiagram-GPEHLZMM.mjs
 var E = (function() {
 	var t = /* @__PURE__ */ e(function(e, t, n, r) {
 		for (n ||= {}, r = e.length; r--; n[e[r]] = t);
@@ -242,7 +242,7 @@ var E = (function() {
 					break;
 				case 23:
 					r.getLogger().debug("Rule: (nodeStatement link node) ", a[s - 2], a[s - 1], a[s], " typestr: ", a[s - 1].edgeTypeStr);
-					let i = r.edgeStrToEdgeData(a[s - 1].edgeTypeStr);
+					let i = r.edgeStrToEdgeData(a[s - 1].edgeTypeStr), o = r.edgeStrToEdgeStartData(a[s - 1].edgeTypeStr), c = r.edgeStrToThickness(a[s - 1].edgeTypeStr), l = r.edgeStrToPattern(a[s - 1].edgeTypeStr);
 					this.$ = [
 						{
 							id: a[s - 2].id,
@@ -256,9 +256,11 @@ var E = (function() {
 							end: a[s].id,
 							label: a[s - 1].label,
 							type: "edge",
+							thickness: c,
+							pattern: l,
 							directions: a[s].directions,
 							arrowTypeEnd: i,
-							arrowTypeStart: "arrow_open"
+							arrowTypeStart: o
 						},
 						{
 							id: a[s].id,
@@ -301,9 +303,9 @@ var E = (function() {
 					break;
 				case 28:
 					r.getLogger().debug("Rule: blockStatement : ", a[s - 2], a[s - 1], a[s]);
-					let o = r.generateId();
+					let u = r.generateId();
 					this.$ = {
-						id: o,
+						id: u,
 						type: "composite",
 						label: "",
 						children: a[s - 1]
@@ -941,7 +943,7 @@ var E = (function() {
 				/^(?:\[\\)/,
 				/^(?:\[)/,
 				/^(?:<\[)/,
-				/^(?:[^\(\[\n\-\)\{\}\s\<\>:]+)/,
+				/^(?:[^\(\[\n\-\)\{\}\s\<\>:=]+)/,
 				/^(?:$)/,
 				/^(?:["][`])/,
 				/^(?:["][`])/,
@@ -1152,7 +1154,7 @@ var E = (function() {
 	return e(v, "Parser"), v.prototype = _, _.Parser = v, new v();
 })();
 E.parser = E;
-var D = E, O = /* @__PURE__ */ new Map(), k = [], A = /* @__PURE__ */ new Map(), j = "color", M = "fill", ee = "bgFill", te = ",", ne = c(), N = /* @__PURE__ */ new Map(), re = "", ie = /* @__PURE__ */ e((e) => a.sanitizeText(e, ne), "sanitizeText"), ae = /* @__PURE__ */ e(function(e, t = "") {
+var D = E, O = /* @__PURE__ */ new Map(), k = [], A = /* @__PURE__ */ new Map(), j = "color", M = "fill", ee = "bgFill", te = ",", ne = c(), N = /* @__PURE__ */ new Map(), P = "", re = /* @__PURE__ */ e((e) => a.sanitizeText(e, ne), "sanitizeText"), ie = /* @__PURE__ */ e(function(e, t = "") {
 	let n = N.get(e);
 	n || (n = {
 		id: e,
@@ -1166,10 +1168,10 @@ var D = E, O = /* @__PURE__ */ new Map(), k = [], A = /* @__PURE__ */ new Map(),
 		}
 		n.styles.push(t);
 	});
-}, "addStyleClass"), oe = /* @__PURE__ */ e(function(e, t = "") {
+}, "addStyleClass"), ae = /* @__PURE__ */ e(function(e, t = "") {
 	let n = O.get(e);
 	t != null && (n.styles = t.split(te));
-}, "addStyle2Node"), se = /* @__PURE__ */ e(function(e, t) {
+}, "addStyle2Node"), oe = /* @__PURE__ */ e(function(e, t) {
 	e.split(",").forEach(function(e) {
 		let n = O.get(e);
 		if (n === void 0) {
@@ -1182,19 +1184,19 @@ var D = E, O = /* @__PURE__ */ new Map(), k = [], A = /* @__PURE__ */ new Map(),
 		}
 		n.classes ||= [], n.classes.push(t);
 	});
-}, "setCssClass"), ce = /* @__PURE__ */ e((e, n) => {
+}, "setCssClass"), se = /* @__PURE__ */ e((e, n) => {
 	let r = e.flat(), i = [], a = r.find((e) => e?.type === "column-setting")?.columns ?? -1;
 	for (let e of r) {
-		if (typeof a == "number" && a > 0 && e.type !== "column-setting" && typeof e.widthInColumns == "number" && e.widthInColumns > a && t.warn(`Block ${e.id} width ${e.widthInColumns} exceeds configured column width ${a}`), e.label &&= ie(e.label), e.type === "classDef") {
-			ae(e.id, e.css);
+		if (typeof a == "number" && a > 0 && e.type !== "column-setting" && typeof e.widthInColumns == "number" && e.widthInColumns > a && t.warn(`Block ${e.id} width ${e.widthInColumns} exceeds configured column width ${a}`), e.label &&= re(e.label), e.type === "classDef") {
+			ie(e.id, e.css);
 			continue;
 		}
 		if (e.type === "applyClass") {
-			se(e.id, e?.styleClass ?? "");
+			oe(e.id, e?.styleClass ?? "");
 			continue;
 		}
 		if (e.type === "applyStyles") {
-			e?.stylesStr && oe(e.id, e?.stylesStr);
+			e?.stylesStr && ae(e.id, e?.stylesStr);
 			continue;
 		}
 		if (e.type === "column-setting") n.columns = e.columns ?? -1;
@@ -1204,30 +1206,30 @@ var D = E, O = /* @__PURE__ */ new Map(), k = [], A = /* @__PURE__ */ new Map(),
 		} else {
 			e.label || (e.type === "composite" ? e.label = "" : e.label = e.id);
 			let t = O.get(e.id);
-			if (t === void 0 ? O.set(e.id, e) : (e.type !== "na" && (t.type = e.type), e.label !== e.id && (t.label = e.label)), e.children && ce(e.children, e), e.type === "space") {
+			if (t === void 0 ? O.set(e.id, e) : (e.type !== "na" && (t.type = e.type), e.label !== e.id && (t.label = e.label)), e.children && se(e.children, e), e.type === "space") {
 				let t = e.width ?? 1;
 				for (let n = 0; n < t; n++) {
-					let t = w(e);
+					let t = h(e);
 					t.id = t.id + "-" + n, O.set(t.id, t), i.push(t);
 				}
 			} else t === void 0 && i.push(e);
 		}
 	}
 	n.children = i;
-}, "populateBlockDatabase"), le = [], P = {
+}, "populateBlockDatabase"), F = [], I = {
 	id: "root",
 	type: "composite",
 	children: [],
 	columns: -1
-}, ue = /* @__PURE__ */ e(() => {
-	t.debug("Clear called"), i(), P = {
+}, ce = /* @__PURE__ */ e(() => {
+	t.debug("Clear called"), i(), I = {
 		id: "root",
 		type: "composite",
 		children: [],
 		columns: -1
-	}, O = /* @__PURE__ */ new Map([["root", P]]), le = [], N = /* @__PURE__ */ new Map(), k = [], A = /* @__PURE__ */ new Map(), re = "";
+	}, O = /* @__PURE__ */ new Map([["root", I]]), F = [], N = /* @__PURE__ */ new Map(), k = [], A = /* @__PURE__ */ new Map(), P = "";
 }, "clear");
-function de(e) {
+function le(e) {
 	switch (t.debug("typeStr2Type", e), e) {
 		case "[]": return "square";
 		case "()": return t.debug("we have a round"), "round";
@@ -1247,34 +1249,54 @@ function de(e) {
 		default: return "na";
 	}
 }
-e(de, "typeStr2Type");
-function fe(e) {
+e(le, "typeStr2Type");
+function ue(e) {
 	switch (t.debug("typeStr2Type", e), e) {
 		case "==": return "thick";
 		default: return "normal";
 	}
 }
-e(fe, "edgeTypeStr2Type");
-function pe(e) {
-	switch (e.replace(/^[\s-]+|[\s-]+$/g, "")) {
+e(ue, "edgeTypeStr2Type");
+function de(e) {
+	switch (e.trim().slice(-1)) {
 		case "x": return "arrow_cross";
 		case "o": return "arrow_circle";
 		case ">": return "arrow_point";
 		default: return "";
 	}
 }
-e(pe, "edgeStrToEdgeData");
-var me = 0, he = {
+e(de, "edgeStrToEdgeData");
+function fe(e) {
+	switch (e.trim().charAt(0)) {
+		case "x": return "arrow_cross";
+		case "o": return "arrow_circle";
+		case "<": return "arrow_point";
+		default: return "arrow_open";
+	}
+}
+e(fe, "edgeStrToEdgeStartData");
+function pe(e) {
+	return e.includes("==") ? "thick" : "normal";
+}
+e(pe, "edgeStrToThickness");
+function me(e) {
+	return e.includes(".-") ? "dotted" : "solid";
+}
+e(me, "edgeStrToPattern");
+var he = 0, ge = {
 	getConfig: /* @__PURE__ */ e(() => s().block, "getConfig"),
-	typeStr2Type: de,
-	edgeTypeStr2Type: fe,
-	edgeStrToEdgeData: pe,
+	typeStr2Type: le,
+	edgeTypeStr2Type: ue,
+	edgeStrToEdgeData: de,
+	edgeStrToEdgeStartData: fe,
+	edgeStrToThickness: pe,
+	edgeStrToPattern: me,
 	getLogger: /* @__PURE__ */ e(() => t, "getLogger"),
 	getBlocksFlat: /* @__PURE__ */ e(() => [...O.values()], "getBlocksFlat"),
-	getBlocks: /* @__PURE__ */ e(() => le || [], "getBlocks"),
+	getBlocks: /* @__PURE__ */ e(() => F || [], "getBlocks"),
 	getEdges: /* @__PURE__ */ e(() => k, "getEdges"),
 	setHierarchy: /* @__PURE__ */ e((e) => {
-		P.children = e, ce(e, P), le = P.children;
+		I.children = e, se(e, I), F = I.children;
 	}, "setHierarchy"),
 	getBlock: /* @__PURE__ */ e((e) => O.get(e), "getBlock"),
 	setBlock: /* @__PURE__ */ e((e) => {
@@ -1287,16 +1309,16 @@ var me = 0, he = {
 	getClasses: /* @__PURE__ */ e(function() {
 		return N;
 	}, "getClasses"),
-	clear: ue,
-	generateId: /* @__PURE__ */ e(() => (me++, "id-" + Math.random().toString(36).substr(2, 12) + "-" + me), "generateId"),
+	clear: ce,
+	generateId: /* @__PURE__ */ e(() => (he++, "id-" + Math.random().toString(36).substr(2, 12) + "-" + he), "generateId"),
 	setDiagramId: /* @__PURE__ */ e((e) => {
-		re = e;
+		P = e;
 	}, "setDiagramId"),
-	getDiagramId: /* @__PURE__ */ e(() => re, "getDiagramId")
-}, F = /* @__PURE__ */ e((e, t) => {
+	getDiagramId: /* @__PURE__ */ e(() => P, "getDiagramId")
+}, L = /* @__PURE__ */ e((e, t) => {
 	let i = r;
 	return n(i(e, "r"), i(e, "g"), i(e, "b"), t);
-}, "fade"), ge = /* @__PURE__ */ e((e) => `.label {
+}, "fade"), _e = /* @__PURE__ */ e((e) => `.label {
     font-family: ${e.fontFamily};
     color: ${e.nodeTextColor || e.textColor};
   }
@@ -1381,9 +1403,9 @@ var me = 0, he = {
   }
 
   .node .cluster {
-    // fill: ${F(e.mainBkg, .5)};
-    fill: ${F(e.clusterBkg, .5)};
-    stroke: ${F(e.clusterBorder, .2)};
+    // fill: ${L(e.mainBkg, .5)};
+    fill: ${L(e.clusterBkg, .5)};
+    stroke: ${L(e.clusterBorder, .2)};
     box-shadow: rgba(50, 50, 93, 0.25) 0px 13px 27px -5px, rgba(0, 0, 0, 0.3) 0px 8px 16px -8px;
     stroke-width: 1px;
   }
@@ -1418,12 +1440,12 @@ var me = 0, he = {
     font-size: 18px;
     fill: ${e.textColor};
   }
-  ${y()}
-`, "getStyles"), _e = /* @__PURE__ */ e((e, t, n, r) => {
+  ${b()}
+`, "getStyles"), ve = /* @__PURE__ */ e((e, t, n, r) => {
 	t.forEach((t) => {
-		ve[t](e, n, r);
+		ye[t](e, n, r);
 	});
-}, "insertMarkers"), ve = {
+}, "insertMarkers"), ye = {
 	extension: /* @__PURE__ */ e((e, n, r) => {
 		t.trace("Making markers for ", r), e.append("defs").append("marker").attr("id", r + "_" + n + "-extensionStart").attr("class", "marker extension " + n).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", r + "_" + n + "-extensionEnd").attr("class", "marker extension " + n).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"),
@@ -1451,8 +1473,8 @@ var me = 0, he = {
 	barb: /* @__PURE__ */ e((e, t, n) => {
 		e.append("defs").append("marker").attr("id", n + "_" + t + "-barbEnd").attr("refX", 19).attr("refY", 7).attr("markerWidth", 20).attr("markerHeight", 14).attr("markerUnits", "strokeWidth").attr("orient", "auto").append("path").attr("d", "M 19,7 L9,13 L14,7 L9,1 Z");
 	}, "barb")
-}, ye = _e, I = c()?.block?.padding ?? 8;
-function L(e, t) {
+}, be = ve, R = c()?.block?.padding ?? 8;
+function z(e, t) {
 	if (e === 0 || !Number.isInteger(e)) throw Error("Columns must be an integer !== 0.");
 	if (t < 0 || !Number.isInteger(t)) throw Error("Position must be a non-negative integer." + t);
 	return e < 0 ? {
@@ -1466,8 +1488,8 @@ function L(e, t) {
 		py: Math.floor(t / e)
 	};
 }
-e(L, "calculateBlockPosition");
-var be = /* @__PURE__ */ e((e) => {
+e(z, "calculateBlockPosition");
+var xe = /* @__PURE__ */ e((e) => {
 	let n = 0, r = 0;
 	for (let i of e.children) {
 		let { width: e, height: a, x: o, y: s } = i.size ?? {
@@ -1476,14 +1498,16 @@ var be = /* @__PURE__ */ e((e) => {
 			x: 0,
 			y: 0
 		};
-		t.debug("getMaxChildSize abc95 child:", i.id, "width:", e, "height:", a, "x:", o, "y:", s, i.type), i.type !== "space" && (e > n && (n = e / (i.widthInColumns ?? 1)), a > r && (r = a));
+		if (t.debug("getMaxChildSize abc95 child:", i.id, "width:", e, "height:", a, "x:", o, "y:", s, i.type), i.type === "space") continue;
+		let c = e / (i.widthInColumns ?? 1);
+		c > n && (n = c), a > r && (r = a);
 	}
 	return {
 		width: n,
 		height: r
 	};
 }, "getMaxChildSize");
-function R(e, n, r = 0, i = 0) {
+function B(e, n, r = 0, i = 0) {
 	t.debug("setBlockSizes abc95 (start)", e.id, e?.size?.x, "block width =", e?.size, "siblingWidth", r), e?.size?.width || (e.size = {
 		width: r,
 		height: i,
@@ -1492,27 +1516,27 @@ function R(e, n, r = 0, i = 0) {
 	});
 	let a = 0, o = 0;
 	if (e.children?.length > 0) {
-		for (let t of e.children) R(t, n);
-		let s = be(e);
+		for (let t of e.children) B(t, n);
+		let s = xe(e);
 		a = s.width, o = s.height, t.debug("setBlockSizes abc95 maxWidth of", e.id, ":s children is ", a, o);
-		for (let n of e.children) n.size && (t.debug(`abc95 Setting size of children of ${e.id} id=${n.id} ${a} ${o} ${JSON.stringify(n.size)}`), n.size.width = a * (n.widthInColumns ?? 1) + I * ((n.widthInColumns ?? 1) - 1), n.size.height = o, n.size.x = 0, n.size.y = 0, t.debug(`abc95 updating size of ${e.id} children child:${n.id} maxWidth:${a} maxHeight:${o}`));
-		for (let t of e.children) R(t, n, a, o);
+		for (let n of e.children) n.size && (t.debug(`abc95 Setting size of children of ${e.id} id=${n.id} ${a} ${o} ${JSON.stringify(n.size)}`), n.size.width = a * (n.widthInColumns ?? 1) + R * ((n.widthInColumns ?? 1) - 1), n.size.height = o, n.size.x = 0, n.size.y = 0, t.debug(`abc95 updating size of ${e.id} children child:${n.id} maxWidth:${a} maxHeight:${o}`));
+		for (let t of e.children) B(t, n, a, o);
 		let c = e.columns ?? -1, l = 0;
 		for (let t of e.children) l += t.widthInColumns ?? 1;
 		let u = e.children.length;
 		c > 0 && c < l && (u = c);
-		let d = Math.ceil(l / u), f = u * (a + I) + I, p = d * (o + I) + I;
+		let d = Math.ceil(l / u), f = u * (a + R) + R, p = d * (o + R) + R;
 		if (f < r) {
 			t.debug(`Detected to small sibling: abc95 ${e.id} siblingWidth ${r} siblingHeight ${i} width ${f}`), f = r, p = i;
-			let n = (r - u * I - I) / u, s = (i - d * I - I) / d;
-			t.debug("Size indata abc88", e.id, "childWidth", n, "maxWidth", a), t.debug("Size indata abc88", e.id, "childHeight", s, "maxHeight", o), t.debug("Size indata abc88 xSize", u, "padding", I);
+			let n = (r - u * R - R) / u, s = (i - d * R - R) / d;
+			t.debug("Size indata abc88", e.id, "childWidth", n, "maxWidth", a), t.debug("Size indata abc88", e.id, "childHeight", s, "maxHeight", o), t.debug("Size indata abc88 xSize", u, "padding", R);
 			for (let t of e.children) t.size && (t.size.width = n, t.size.height = s, t.size.x = 0, t.size.y = 0);
 		}
 		if (t.debug(`abc95 (finale calc) ${e.id} xSize ${u} ySize ${d} columns ${c}${e.children.length} width=${Math.max(f, e.size?.width || 0)}`), f < (e?.size?.width || 0)) {
 			f = e?.size?.width || 0;
 			let n = c > 0 ? Math.min(e.children.length, c) : e.children.length;
 			if (n > 0) {
-				let r = (f - n * I - I) / n;
+				let r = (f - n * R - R) / n;
 				t.debug("abc95 (growing to fit) width", e.id, f, e.size?.width, r);
 				for (let t of e.children) t.size && (t.size.width = r);
 			}
@@ -1526,19 +1550,19 @@ function R(e, n, r = 0, i = 0) {
 	}
 	t.debug("setBlockSizes abc94 (done)", e.id, e?.size?.x, e?.size?.width, e?.size?.y, e?.size?.height);
 }
-e(R, "setBlockSizes");
-function z(e, n) {
+e(B, "setBlockSizes");
+function V(e, n) {
 	t.debug(`abc85 layout blocks (=>layoutBlocks) ${e.id} x: ${e?.size?.x} y: ${e?.size?.y} width: ${e?.size?.width}`);
 	let r = e.columns ?? -1;
 	if (t.debug("layoutBlocks columns abc95", e.id, "=>", r, e), e.children && e.children.length > 0) {
-		let i = e?.children[0]?.size?.width ?? 0, a = e.children.length * i + (e.children.length - 1) * I;
+		let i = e?.children[0]?.size?.width ?? 0, a = e.children.length * i + (e.children.length - 1) * R;
 		t.debug("widthOfChildren 88", a, "posX");
 		let o = /* @__PURE__ */ new Map();
 		{
 			let t = 0;
 			for (let n of e.children) {
 				if (!n.size) continue;
-				let { py: e } = L(r, t), i = o.get(e) ?? 0;
+				let { py: e } = z(r, t), i = o.get(e) ?? 0;
 				n.size.height > i && o.set(e, n.size.height);
 				let a = n?.widthInColumns ?? 1;
 				r > 0 && (a = Math.min(a, r - t % r)), t += a;
@@ -1547,30 +1571,30 @@ function z(e, n) {
 		let s = /* @__PURE__ */ new Map();
 		{
 			let e = 0, t = [...o.keys()].sort((e, t) => e - t);
-			for (let n of t) s.set(n, e), e += (o.get(n) ?? 0) + I;
+			for (let n of t) s.set(n, e), e += (o.get(n) ?? 0) + R;
 		}
 		let c = 0;
 		t.debug("abc91 block?.size?.x", e.id, e?.size?.x);
-		let l = e?.size?.x ? e?.size?.x + (-e?.size?.width / 2 || 0) : -I, u = 0;
+		let l = e?.size?.x ? e?.size?.x + (-e?.size?.width / 2 || 0) : -R, u = 0;
 		for (let i of e.children) {
 			let a = e;
 			if (!i.size) continue;
-			let { width: d, height: f } = i.size, { px: p, py: m } = L(r, c);
-			if (m != u && (u = m, l = e?.size?.x ? e?.size?.x + (-e?.size?.width / 2 || 0) : -I, t.debug("New row in layout for block", e.id, " and child ", i.id, u)), t.debug(`abc89 layout blocks (child) id: ${i.id} Pos: ${c} (px, py) ${p},${m} (${a?.size?.x},${a?.size?.y}) parent: ${a.id} width: ${d}${I}`), a.size) {
+			let { width: d, height: f } = i.size, { px: p, py: m } = z(r, c);
+			if (m != u && (u = m, l = e?.size?.x ? e?.size?.x + (-e?.size?.width / 2 || 0) : -R, t.debug("New row in layout for block", e.id, " and child ", i.id, u)), t.debug(`abc89 layout blocks (child) id: ${i.id} Pos: ${c} (px, py) ${p},${m} (${a?.size?.x},${a?.size?.y}) parent: ${a.id} width: ${d}${R}`), a.size) {
 				let e = d / 2;
-				i.size.x = l + I + e, t.debug(`abc91 layout blocks (calc) px, pyid:${i.id} startingPos=X${l} new startingPosX${i.size.x} ${e} padding=${I} width=${d} halfWidth=${e} => x:${i.size.x} y:${i.size.y} ${i.widthInColumns} (width * (child?.w || 1)) / 2 ${d * (i?.widthInColumns ?? 1) / 2}`), l = i.size.x + e;
+				i.size.x = l + R + e, t.debug(`abc91 layout blocks (calc) px, pyid:${i.id} startingPos=X${l} new startingPosX${i.size.x} ${e} padding=${R} width=${d} halfWidth=${e} => x:${i.size.x} y:${i.size.y} ${i.widthInColumns} (width * (child?.w || 1)) / 2 ${d * (i?.widthInColumns ?? 1) / 2}`), l = i.size.x + e;
 				let n = s.get(m) ?? 0, r = o.get(m) ?? f;
-				i.size.y = a.size.y - a.size.height / 2 + n + r / 2 + I, t.debug(`abc88 layout blocks (calc) px, pyid:${i.id}startingPosX${l}${I}${e}=>x:${i.size.x}y:${i.size.y}${i.widthInColumns}(width * (child?.w || 1)) / 2${d * (i?.widthInColumns ?? 1) / 2}`);
+				i.size.y = a.size.y - a.size.height / 2 + n + r / 2 + R, t.debug(`abc88 layout blocks (calc) px, pyid:${i.id}startingPosX${l}${R}${e}=>x:${i.size.x}y:${i.size.y}${i.widthInColumns}(width * (child?.w || 1)) / 2${d * (i?.widthInColumns ?? 1) / 2}`);
 			}
-			i.children && z(i, n);
+			i.children && V(i, n);
 			let h = i?.widthInColumns ?? 1;
 			r > 0 && (h = Math.min(h, r - c % r)), c += h, t.debug("abc88 columnsPos", i, c);
 		}
 	}
 	t.debug(`layout blocks (<==layoutBlocks) ${e.id} x: ${e?.size?.x} y: ${e?.size?.y} width: ${e?.size?.width}`);
 }
-e(z, "layoutBlocks");
-function B(e, { minX: t, minY: n, maxX: r, maxY: i } = {
+e(V, "layoutBlocks");
+function H(e, { minX: t, minY: n, maxX: r, maxY: i } = {
 	minX: 0,
 	minY: 0,
 	maxX: 0,
@@ -1580,7 +1604,7 @@ function B(e, { minX: t, minY: n, maxX: r, maxY: i } = {
 		let { x: a, y: o, width: s, height: c } = e.size;
 		a - s / 2 < t && (t = a - s / 2), o - c / 2 < n && (n = o - c / 2), a + s / 2 > r && (r = a + s / 2), o + c / 2 > i && (i = o + c / 2);
 	}
-	if (e.children) for (let a of e.children) ({minX: t, minY: n, maxX: r, maxY: i} = B(a, {
+	if (e.children) for (let a of e.children) ({minX: t, minY: n, maxX: r, maxY: i} = H(a, {
 		minX: t,
 		minY: n,
 		maxX: r,
@@ -1593,12 +1617,12 @@ function B(e, { minX: t, minY: n, maxX: r, maxY: i } = {
 		maxY: i
 	};
 }
-e(B, "findBounds");
-function xe(e) {
+e(H, "findBounds");
+function Se(e) {
 	let n = e.getBlock("root");
 	if (!n) return;
-	R(n, e, 0, 0), z(n, e), t.debug("getBlocks", JSON.stringify(n, null, 2));
-	let { minX: r, minY: i, maxX: a, maxY: o } = B(n), s = o - i;
+	B(n, e, 0, 0), V(n, e), t.debug("getBlocks", JSON.stringify(n, null, 2));
+	let { minX: r, minY: i, maxX: a, maxY: o } = H(n), s = o - i;
 	return {
 		x: r,
 		y: i,
@@ -1606,12 +1630,12 @@ function xe(e) {
 		height: s
 	};
 }
-e(xe, "layout");
-var V = /* @__PURE__ */ e(async (e, t, n, r = !1, i = !1) => {
+e(Se, "layout");
+var U = /* @__PURE__ */ e(async (e, t, n, r = !1, i = !1) => {
 	let a = t || "";
 	typeof a == "object" && (a = a[0]);
 	let o = c(), s = l(o);
-	return await v(e, a, {
+	return await y(e, a, {
 		style: n,
 		isTitle: r,
 		useHtmlLabels: s,
@@ -1619,9 +1643,9 @@ var V = /* @__PURE__ */ e(async (e, t, n, r = !1, i = !1) => {
 		isNode: i,
 		width: Infinity
 	}, o);
-}, "createLabel"), Se = /* @__PURE__ */ e((e, t, n, r, i) => {
-	t.arrowTypeStart && we(e, "start", t.arrowTypeStart, n, r, i), t.arrowTypeEnd && we(e, "end", t.arrowTypeEnd, n, r, i);
-}, "addEdgeMarkers"), Ce = {
+}, "createLabel"), Ce = /* @__PURE__ */ e((e, t, n, r, i) => {
+	t.arrowTypeStart && Te(e, "start", t.arrowTypeStart, n, r, i), t.arrowTypeEnd && Te(e, "end", t.arrowTypeEnd, n, r, i);
+}, "addEdgeMarkers"), we = {
 	arrow_cross: "cross",
 	arrow_point: "point",
 	arrow_barb: "barb",
@@ -1631,16 +1655,16 @@ var V = /* @__PURE__ */ e(async (e, t, n, r = !1, i = !1) => {
 	composition: "composition",
 	dependency: "dependency",
 	lollipop: "lollipop"
-}, we = /* @__PURE__ */ e((e, n, r, i, a, o) => {
-	let s = Ce[r];
+}, Te = /* @__PURE__ */ e((e, n, r, i, a, o) => {
+	let s = we[r];
 	if (!s) {
 		t.warn(`Unknown arrow type: ${r}`);
 		return;
 	}
 	let c = n === "start" ? "Start" : "End";
 	e.attr(`marker-${n}`, `url(${i}#${a}_${o}-${s}${c})`);
-}, "addEdgeMarker"), H = {}, U = {}, Te = /* @__PURE__ */ e(async (e, t) => {
-	let n = c(), r = l(n), i = e.insert("g").attr("class", "edgeLabel"), a = i.insert("g").attr("class", "label"), o = t.labelType === "markdown", s = await v(e, t.label, {
+}, "addEdgeMarker"), Ee = {}, W = {}, De = /* @__PURE__ */ e(async (e, t) => {
+	let n = c(), r = l(n), i = e.insert("g").attr("class", "edgeLabel"), a = i.insert("g").attr("class", "label"), o = t.labelType === "markdown", s = await y(e, t.label, {
 		style: t.labelStyle,
 		useHtmlLabels: r,
 		addSvgBackground: o,
@@ -1657,101 +1681,101 @@ var V = /* @__PURE__ */ e(async (e, t, n, r = !1, i = !1) => {
 		let e = f(s).select("text").node();
 		e && typeof e.getBBox == "function" && (d = e.getBBox());
 	}
-	a.attr("transform", b(d, r)), H[t.id] = i, t.width = u.width, t.height = u.height;
+	a.attr("transform", x(d, r)), Ee[t.id] = i, t.width = u.width, t.height = u.height;
 	let p;
 	if (t.startLabelLeft) {
-		let n = e.insert("g").attr("class", "edgeTerminals"), i = n.insert("g").attr("class", "inner"), a = await V(i, t.startLabelLeft, t.labelStyle);
+		let n = e.insert("g").attr("class", "edgeTerminals"), i = n.insert("g").attr("class", "inner"), a = await U(i, t.startLabelLeft, t.labelStyle);
 		p = a;
 		let o = a.getBBox();
 		if (r) {
 			let e = a.children[0], t = f(a);
 			o = e.getBoundingClientRect(), t.attr("width", o.width), t.attr("height", o.height);
 		}
-		i.attr("transform", b(o, r)), U[t.id] || (U[t.id] = {}), U[t.id].startLeft = n, W(p, t.startLabelLeft);
+		i.attr("transform", x(o, r)), W[t.id] || (W[t.id] = {}), W[t.id].startLeft = n, G(p, t.startLabelLeft);
 	}
 	if (t.startLabelRight) {
-		let n = e.insert("g").attr("class", "edgeTerminals"), i = n.insert("g").attr("class", "inner"), a = await V(n, t.startLabelRight, t.labelStyle);
-		p = a, i.node().appendChild(a);
+		let n = e.insert("g").attr("class", "edgeTerminals"), i = n.insert("g").attr("class", "inner"), a = await U(i, t.startLabelRight, t.labelStyle);
+		p = a;
 		let o = a.getBBox();
 		if (r) {
 			let e = a.children[0], t = f(a);
 			o = e.getBoundingClientRect(), t.attr("width", o.width), t.attr("height", o.height);
 		}
-		i.attr("transform", b(o, r)), U[t.id] || (U[t.id] = {}), U[t.id].startRight = n, W(p, t.startLabelRight);
+		i.attr("transform", x(o, r)), W[t.id] || (W[t.id] = {}), W[t.id].startRight = n, G(p, t.startLabelRight);
 	}
 	if (t.endLabelLeft) {
-		let n = e.insert("g").attr("class", "edgeTerminals"), i = n.insert("g").attr("class", "inner"), a = await V(i, t.endLabelLeft, t.labelStyle);
+		let n = e.insert("g").attr("class", "edgeTerminals"), i = n.insert("g").attr("class", "inner"), a = await U(n, t.endLabelLeft, t.labelStyle);
 		p = a;
 		let o = a.getBBox();
 		if (r) {
 			let e = a.children[0], t = f(a);
 			o = e.getBoundingClientRect(), t.attr("width", o.width), t.attr("height", o.height);
 		}
-		i.attr("transform", b(o, r)), n.node().appendChild(a), U[t.id] || (U[t.id] = {}), U[t.id].endLeft = n, W(p, t.endLabelLeft);
+		i.attr("transform", x(o, r)), W[t.id] || (W[t.id] = {}), W[t.id].endLeft = n, G(p, t.endLabelLeft);
 	}
 	if (t.endLabelRight) {
-		let n = e.insert("g").attr("class", "edgeTerminals"), i = n.insert("g").attr("class", "inner"), a = await V(i, t.endLabelRight, t.labelStyle);
+		let n = e.insert("g").attr("class", "edgeTerminals"), i = n.insert("g").attr("class", "inner"), a = await U(n, t.endLabelRight, t.labelStyle);
 		p = a;
 		let o = a.getBBox();
 		if (r) {
 			let e = a.children[0], t = f(a);
 			o = e.getBoundingClientRect(), t.attr("width", o.width), t.attr("height", o.height);
 		}
-		i.attr("transform", b(o, r)), n.node().appendChild(a), U[t.id] || (U[t.id] = {}), U[t.id].endRight = n, W(p, t.endLabelRight);
+		i.attr("transform", x(o, r)), W[t.id] || (W[t.id] = {}), W[t.id].endRight = n, G(p, t.endLabelRight);
 	}
 	return s;
 }, "insertEdgeLabel");
-function W(e, t) {
+function G(e, t) {
 	l(c()) && e && (e.style.width = t.length * 9 + "px", e.style.height = "12px");
 }
-e(W, "setTerminalWidth");
-var Ee = /* @__PURE__ */ e((e, n) => {
-	t.debug("Moving label abc88 ", e.id, e.label, H[e.id], n);
-	let r = n.updatedPath ? n.updatedPath : n.originalPath, { subGraphTitleTotalMargin: i } = C(c());
+e(G, "setTerminalWidth");
+var Oe = /* @__PURE__ */ e((e, n) => {
+	t.debug("Moving label abc88 ", e.id, e.label, Ee[e.id], n);
+	let r = n.updatedPath ? n.updatedPath : n.originalPath, { subGraphTitleTotalMargin: i } = w(c());
 	if (e.label) {
-		let a = H[e.id], o = e.x, s = e.y;
+		let a = Ee[e.id], o = e.x, s = e.y;
 		if (r) {
-			let i = _.calcLabelPosition(r);
+			let i = v.calcLabelPosition(r);
 			t.debug("Moving label " + e.label + " from (", o, ",", s, ") to (", i.x, ",", i.y, ") abc88"), n.updatedPath && (o = i.x, s = i.y);
 		}
 		a.attr("transform", `translate(${o}, ${s + i / 2})`);
 	}
 	if (e.startLabelLeft) {
-		let t = U[e.id].startLeft, n = e.x, i = e.y;
+		let t = W[e.id].startLeft, n = e.x, i = e.y;
 		if (r) {
-			let t = _.calcTerminalLabelPosition(e.arrowTypeStart ? 10 : 0, "start_left", r);
+			let t = v.calcTerminalLabelPosition(e.arrowTypeStart ? 10 : 0, "start_left", r);
 			n = t.x, i = t.y;
 		}
 		t.attr("transform", `translate(${n}, ${i})`);
 	}
 	if (e.startLabelRight) {
-		let t = U[e.id].startRight, n = e.x, i = e.y;
+		let t = W[e.id].startRight, n = e.x, i = e.y;
 		if (r) {
-			let t = _.calcTerminalLabelPosition(e.arrowTypeStart ? 10 : 0, "start_right", r);
+			let t = v.calcTerminalLabelPosition(e.arrowTypeStart ? 10 : 0, "start_right", r);
 			n = t.x, i = t.y;
 		}
 		t.attr("transform", `translate(${n}, ${i})`);
 	}
 	if (e.endLabelLeft) {
-		let t = U[e.id].endLeft, n = e.x, i = e.y;
+		let t = W[e.id].endLeft, n = e.x, i = e.y;
 		if (r) {
-			let t = _.calcTerminalLabelPosition(e.arrowTypeEnd ? 10 : 0, "end_left", r);
+			let t = v.calcTerminalLabelPosition(e.arrowTypeEnd ? 10 : 0, "end_left", r);
 			n = t.x, i = t.y;
 		}
 		t.attr("transform", `translate(${n}, ${i})`);
 	}
 	if (e.endLabelRight) {
-		let t = U[e.id].endRight, n = e.x, i = e.y;
+		let t = W[e.id].endRight, n = e.x, i = e.y;
 		if (r) {
-			let t = _.calcTerminalLabelPosition(e.arrowTypeEnd ? 10 : 0, "end_right", r);
+			let t = v.calcTerminalLabelPosition(e.arrowTypeEnd ? 10 : 0, "end_right", r);
 			n = t.x, i = t.y;
 		}
 		t.attr("transform", `translate(${n}, ${i})`);
 	}
-}, "positionEdgeLabel"), De = /* @__PURE__ */ e((e, t) => {
+}, "positionEdgeLabel"), ke = /* @__PURE__ */ e((e, t) => {
 	let n = e.x, r = e.y, i = Math.abs(t.x - n), a = Math.abs(t.y - r), o = e.width / 2, s = e.height / 2;
 	return i >= o || a >= s;
-}, "outsideNode"), Oe = /* @__PURE__ */ e((e, n, r) => {
+}, "outsideNode"), Ae = /* @__PURE__ */ e((e, n, r) => {
 	t.debug(`intersection calc abc89:
   outsidePoint: ${JSON.stringify(n)}
   insidePoint : ${JSON.stringify(r)}
@@ -1776,54 +1800,54 @@ var Ee = /* @__PURE__ */ e((e, n) => {
 			y: o
 		};
 	}
-}, "intersection"), ke = /* @__PURE__ */ e((e, n) => {
+}, "intersection"), je = /* @__PURE__ */ e((e, n) => {
 	t.debug("abc88 cutPathAtIntersect", e, n);
 	let r = [], i = e[0], a = !1;
 	return e.forEach((e) => {
-		if (!De(n, e) && !a) {
-			let t = Oe(n, i, e), o = !1;
+		if (!ke(n, e) && !a) {
+			let t = Ae(n, i, e), o = !1;
 			r.forEach((e) => {
 				o ||= e.x === t.x && e.y === t.y;
 			}), r.some((e) => e.x === t.x && e.y === t.y) || r.push(t), a = !0;
 		} else i = e, a || r.push(e);
 	}), r;
-}, "cutPathAtIntersect"), Ae = /* @__PURE__ */ e(function(e, n, r, i, a, o, s) {
+}, "cutPathAtIntersect"), Me = /* @__PURE__ */ e(function(e, n, r, i, a, o, s) {
 	let l = r.points;
 	t.debug("abc88 InsertEdge: edge=", r, "e=", n);
 	let d = !1, f = o.node(n.v);
 	var h = o.node(n.w);
-	h?.intersect && f?.intersect && (l = l.slice(1, r.points.length - 1), l.unshift(f.intersect(l[0])), l.push(h.intersect(l[l.length - 1]))), r.toCluster && (t.debug("to cluster abc88", i[r.toCluster]), l = ke(r.points, i[r.toCluster].node), d = !0), r.fromCluster && (t.debug("from cluster abc88", i[r.fromCluster]), l = ke(l.reverse(), i[r.fromCluster].node).reverse(), d = !0);
+	h?.intersect && f?.intersect && (l = l.slice(1, r.points.length - 1), l.unshift(f.intersect(l[0])), l.push(h.intersect(l[l.length - 1]))), r.toCluster && (t.debug("to cluster abc88", i[r.toCluster]), l = je(r.points, i[r.toCluster].node), d = !0), r.fromCluster && (t.debug("from cluster abc88", i[r.fromCluster]), l = je(l.reverse(), i[r.fromCluster].node).reverse(), d = !0);
 	let g = l.filter((e) => !Number.isNaN(e.y)), _ = m;
 	r.curve && (a === "graph" || a === "flowchart") && (_ = r.curve);
-	let { x: v, y } = x(r), b = p().x(v).y(y).curve(_), S;
+	let { x: v, y } = S(r), b = p().x(v).y(y).curve(_), x;
 	switch (r.thickness) {
 		case "normal":
-			S = "edge-thickness-normal";
+			x = "edge-thickness-normal";
 			break;
 		case "thick":
-			S = "edge-thickness-thick";
+			x = "edge-thickness-thick";
 			break;
 		case "invisible":
-			S = "edge-thickness-thick";
+			x = "edge-thickness-thick";
 			break;
-		default: S = "";
+		default: x = "";
 	}
 	switch (r.pattern) {
 		case "solid":
-			S += " edge-pattern-solid";
+			x += " edge-pattern-solid";
 			break;
 		case "dotted":
-			S += " edge-pattern-dotted";
+			x += " edge-pattern-dotted";
 			break;
 		case "dashed":
-			S += " edge-pattern-dashed";
+			x += " edge-pattern-dashed";
 			break;
 	}
-	let C = e.append("path").attr("d", b(g)).attr("id", r.id).attr("class", " " + S + (r.classes ? " " + r.classes : "")).attr("style", r.style), w = "";
-	(c().flowchart.arrowMarkerAbsolute || c().state.arrowMarkerAbsolute) && (w = u(!0)), Se(C, r, w, s, a);
+	let C = e.append("path").attr("d", b(g)).attr("id", r.id).attr("class", " " + x + (r.classes ? " " + r.classes : "")).attr("style", r.style), w = "";
+	(c().flowchart.arrowMarkerAbsolute || c().state.arrowMarkerAbsolute) && (w = u(!0)), Ce(C, r, w, s, a);
 	let T = {};
 	return d && (T.updatedPath = l), T.originalPath = r.points, T;
-}, "insertEdge"), je = /* @__PURE__ */ e((e) => {
+}, "insertEdge"), Ne = /* @__PURE__ */ e((e) => {
 	let t = /* @__PURE__ */ new Set();
 	for (let n of e) switch (n) {
 		case "x":
@@ -1837,273 +1861,273 @@ var Ee = /* @__PURE__ */ e((e, n) => {
 			break;
 	}
 	return t;
-}, "expandAndDeduplicateDirections"), Me = /* @__PURE__ */ e((e, t, n) => {
-	let r = je(e), i = t.height + 2 * n.padding, a = i / 2, o = t.width + 2 * a + n.padding, s = n.padding / 2;
-	return r.has("right") && r.has("left") && r.has("up") && r.has("down") ? [
+}, "expandAndDeduplicateDirections"), Pe = /* @__PURE__ */ e((e, t, n, r) => {
+	let i = Ne(e), a = t.height + 2 * n.padding, o = a / 2, s = r ?? t.width + 2 * o + n.padding, c = n.padding / 2;
+	return i.has("right") && i.has("left") && i.has("up") && i.has("down") ? [
 		{
 			x: 0,
 			y: 0
 		},
 		{
-			x: a,
+			x: o,
 			y: 0
 		},
 		{
-			x: o / 2,
-			y: 2 * s
+			x: s / 2,
+			y: 2 * c
 		},
 		{
-			x: o - a,
+			x: s - o,
 			y: 0
 		},
 		{
-			x: o,
+			x: s,
 			y: 0
 		},
 		{
-			x: o,
-			y: -i / 3
+			x: s,
+			y: -a / 3
 		},
 		{
-			x: o + 2 * s,
-			y: -i / 2
+			x: s + 2 * c,
+			y: -a / 2
 		},
 		{
-			x: o,
-			y: -2 * i / 3
+			x: s,
+			y: -2 * a / 3
 		},
 		{
-			x: o,
-			y: -i
+			x: s,
+			y: -a
 		},
 		{
-			x: o - a,
-			y: -i
+			x: s - o,
+			y: -a
 		},
 		{
-			x: o / 2,
-			y: -i - 2 * s
+			x: s / 2,
+			y: -a - 2 * c
 		},
 		{
-			x: a,
-			y: -i
+			x: o,
+			y: -a
 		},
 		{
 			x: 0,
-			y: -i
+			y: -a
 		},
 		{
 			x: 0,
-			y: -2 * i / 3
+			y: -2 * a / 3
 		},
 		{
-			x: -2 * s,
-			y: -i / 2
+			x: -2 * c,
+			y: -a / 2
 		},
 		{
 			x: 0,
-			y: -i / 3
+			y: -a / 3
 		}
-	] : r.has("right") && r.has("left") && r.has("up") ? [
+	] : i.has("right") && i.has("left") && i.has("up") ? [
 		{
-			x: a,
+			x: o,
 			y: 0
 		},
 		{
-			x: o - a,
+			x: s - o,
 			y: 0
 		},
 		{
-			x: o,
-			y: -i / 2
+			x: s,
+			y: -a / 2
 		},
 		{
-			x: o - a,
-			y: -i
+			x: s - o,
+			y: -a
 		},
 		{
-			x: a,
-			y: -i
+			x: o,
+			y: -a
 		},
 		{
 			x: 0,
-			y: -i / 2
+			y: -a / 2
 		}
-	] : r.has("right") && r.has("left") && r.has("down") ? [
+	] : i.has("right") && i.has("left") && i.has("down") ? [
 		{
 			x: 0,
 			y: 0
 		},
 		{
-			x: a,
-			y: -i
+			x: o,
+			y: -a
 		},
 		{
-			x: o - a,
-			y: -i
+			x: s - o,
+			y: -a
 		},
 		{
-			x: o,
+			x: s,
 			y: 0
 		}
-	] : r.has("right") && r.has("up") && r.has("down") ? [
+	] : i.has("right") && i.has("up") && i.has("down") ? [
 		{
 			x: 0,
 			y: 0
 		},
 		{
-			x: o,
-			y: -a
+			x: s,
+			y: -o
 		},
 		{
-			x: o,
-			y: -i + a
+			x: s,
+			y: -a + o
 		},
 		{
 			x: 0,
-			y: -i
+			y: -a
 		}
-	] : r.has("left") && r.has("up") && r.has("down") ? [
+	] : i.has("left") && i.has("up") && i.has("down") ? [
 		{
-			x: o,
+			x: s,
 			y: 0
 		},
 		{
 			x: 0,
-			y: -a
+			y: -o
 		},
 		{
 			x: 0,
-			y: -i + a
+			y: -a + o
 		},
 		{
-			x: o,
-			y: -i
+			x: s,
+			y: -a
 		}
-	] : r.has("right") && r.has("left") ? [
+	] : i.has("right") && i.has("left") ? [
 		{
-			x: a,
+			x: o,
 			y: 0
 		},
 		{
-			x: a,
-			y: -s
+			x: o,
+			y: -c
 		},
 		{
-			x: o - a,
-			y: -s
+			x: s - o,
+			y: -c
 		},
 		{
-			x: o - a,
+			x: s - o,
 			y: 0
 		},
 		{
-			x: o,
-			y: -i / 2
+			x: s,
+			y: -a / 2
 		},
 		{
-			x: o - a,
-			y: -i
+			x: s - o,
+			y: -a
 		},
 		{
-			x: o - a,
-			y: -i + s
+			x: s - o,
+			y: -a + c
 		},
 		{
-			x: a,
-			y: -i + s
+			x: o,
+			y: -a + c
 		},
 		{
-			x: a,
-			y: -i
+			x: o,
+			y: -a
 		},
 		{
 			x: 0,
-			y: -i / 2
+			y: -a / 2
 		}
-	] : r.has("up") && r.has("down") ? [
+	] : i.has("up") && i.has("down") ? [
 		{
-			x: o / 2,
+			x: s / 2,
 			y: 0
 		},
 		{
 			x: 0,
-			y: -s
+			y: -c
 		},
 		{
-			x: a,
-			y: -s
+			x: o,
+			y: -c
 		},
 		{
-			x: a,
-			y: -i + s
+			x: o,
+			y: -a + c
 		},
 		{
 			x: 0,
-			y: -i + s
+			y: -a + c
 		},
 		{
-			x: o / 2,
-			y: -i
+			x: s / 2,
+			y: -a
 		},
 		{
-			x: o,
-			y: -i + s
+			x: s,
+			y: -a + c
 		},
 		{
-			x: o - a,
-			y: -i + s
+			x: s - o,
+			y: -a + c
 		},
 		{
-			x: o - a,
-			y: -s
+			x: s - o,
+			y: -c
 		},
 		{
-			x: o,
-			y: -s
+			x: s,
+			y: -c
 		}
-	] : r.has("right") && r.has("up") ? [
+	] : i.has("right") && i.has("up") ? [
 		{
 			x: 0,
 			y: 0
 		},
 		{
-			x: o,
-			y: -a
+			x: s,
+			y: -o
 		},
 		{
 			x: 0,
-			y: -i
+			y: -a
 		}
-	] : r.has("right") && r.has("down") ? [
+	] : i.has("right") && i.has("down") ? [
 		{
 			x: 0,
 			y: 0
 		},
 		{
-			x: o,
+			x: s,
 			y: 0
 		},
 		{
 			x: 0,
-			y: -i
+			y: -a
 		}
-	] : r.has("left") && r.has("up") ? [
+	] : i.has("left") && i.has("up") ? [
 		{
-			x: o,
+			x: s,
 			y: 0
 		},
 		{
 			x: 0,
-			y: -a
+			y: -o
 		},
 		{
-			x: o,
-			y: -i
+			x: s,
+			y: -a
 		}
-	] : r.has("left") && r.has("down") ? [
+	] : i.has("left") && i.has("down") ? [
 		{
-			x: o,
+			x: s,
 			y: 0
 		},
 		{
@@ -2111,144 +2135,144 @@ var Ee = /* @__PURE__ */ e((e, n) => {
 			y: 0
 		},
 		{
-			x: o,
-			y: -i
+			x: s,
+			y: -a
 		}
-	] : r.has("right") ? [
+	] : i.has("right") ? [
 		{
-			x: a,
-			y: -s
+			x: o,
+			y: -c
 		},
 		{
-			x: a,
-			y: -s
+			x: o,
+			y: -c
 		},
 		{
-			x: o - a,
-			y: -s
+			x: s - o,
+			y: -c
 		},
 		{
-			x: o - a,
+			x: s - o,
 			y: 0
 		},
 		{
-			x: o,
-			y: -i / 2
+			x: s,
+			y: -a / 2
 		},
 		{
-			x: o - a,
-			y: -i
+			x: s - o,
+			y: -a
 		},
 		{
-			x: o - a,
-			y: -i + s
+			x: s - o,
+			y: -a + c
 		},
 		{
-			x: a,
-			y: -i + s
+			x: o,
+			y: -a + c
 		},
 		{
-			x: a,
-			y: -i + s
+			x: o,
+			y: -a + c
 		}
-	] : r.has("left") ? [
+	] : i.has("left") ? [
 		{
-			x: a,
+			x: o,
 			y: 0
 		},
 		{
-			x: a,
-			y: -s
+			x: o,
+			y: -c
 		},
 		{
-			x: o - a,
-			y: -s
+			x: s - o,
+			y: -c
 		},
 		{
-			x: o - a,
-			y: -i + s
+			x: s - o,
+			y: -a + c
 		},
 		{
-			x: a,
-			y: -i + s
+			x: o,
+			y: -a + c
 		},
 		{
-			x: a,
-			y: -i
+			x: o,
+			y: -a
 		},
 		{
 			x: 0,
-			y: -i / 2
+			y: -a / 2
 		}
-	] : r.has("up") ? [
+	] : i.has("up") ? [
 		{
-			x: a,
-			y: -s
+			x: o,
+			y: -c
 		},
 		{
-			x: a,
-			y: -i + s
+			x: o,
+			y: -a + c
 		},
 		{
 			x: 0,
-			y: -i + s
+			y: -a + c
 		},
 		{
-			x: o / 2,
-			y: -i
+			x: s / 2,
+			y: -a
 		},
 		{
-			x: o,
-			y: -i + s
+			x: s,
+			y: -a + c
 		},
 		{
-			x: o - a,
-			y: -i + s
+			x: s - o,
+			y: -a + c
 		},
 		{
-			x: o - a,
-			y: -s
+			x: s - o,
+			y: -c
 		}
-	] : r.has("down") ? [
+	] : i.has("down") ? [
 		{
-			x: o / 2,
+			x: s / 2,
 			y: 0
 		},
 		{
 			x: 0,
-			y: -s
+			y: -c
 		},
 		{
-			x: a,
-			y: -s
+			x: o,
+			y: -c
 		},
 		{
-			x: a,
-			y: -i + s
+			x: o,
+			y: -a + c
 		},
 		{
-			x: o - a,
-			y: -i + s
+			x: s - o,
+			y: -a + c
 		},
 		{
-			x: o - a,
-			y: -s
+			x: s - o,
+			y: -c
 		},
 		{
-			x: o,
-			y: -s
+			x: s,
+			y: -c
 		}
 	] : [{
 		x: 0,
 		y: 0
 	}];
 }, "getArrowPoints");
-function Ne(e, t) {
+function Fe(e, t) {
 	return e.intersect(t);
 }
-e(Ne, "intersectNode");
-var Pe = Ne;
-function Fe(e, t, n, r) {
+e(Fe, "intersectNode");
+var Ie = Fe;
+function Le(e, t, n, r) {
 	var i = e.x, a = e.y, o = i - r.x, s = a - r.y, c = Math.sqrt(t * t * s * s + n * n * o * o), l = Math.abs(t * n * o / c);
 	r.x < i && (l = -l);
 	var u = Math.abs(t * n * s / c);
@@ -2257,33 +2281,33 @@ function Fe(e, t, n, r) {
 		y: a + u
 	};
 }
-e(Fe, "intersectEllipse");
-var Ie = Fe;
-function Le(e, t, n) {
-	return Ie(e, t, t, n);
-}
-e(Le, "intersectCircle");
+e(Le, "intersectEllipse");
 var Re = Le;
-function ze(e, t, n, r) {
+function ze(e, t, n) {
+	return Re(e, t, t, n);
+}
+e(ze, "intersectCircle");
+var Be = ze;
+function Ve(e, t, n, r) {
 	var i = t.y - e.y, a, o = e.x - t.x, s, c = t.x * e.y - e.x * t.y, l, u, d, f = i * n.x + o * n.y + c, p = i * r.x + o * r.y + c, m, h, g, _, v;
-	if (!(f !== 0 && p !== 0 && G(f, p)) && (a = r.y - n.y, s = n.x - r.x, l = r.x * n.y - n.x * r.y, u = a * e.x + s * e.y + l, d = a * t.x + s * t.y + l, !(u !== 0 && d !== 0 && G(u, d)) && (m = i * s - a * o, m !== 0))) return h = Math.abs(m / 2), g = o * l - s * c, _ = g < 0 ? (g - h) / m : (g + h) / m, g = a * c - i * l, v = g < 0 ? (g - h) / m : (g + h) / m, {
+	if (!(f !== 0 && p !== 0 && He(f, p)) && (a = r.y - n.y, s = n.x - r.x, l = r.x * n.y - n.x * r.y, u = a * e.x + s * e.y + l, d = a * t.x + s * t.y + l, !(u !== 0 && d !== 0 && He(u, d)) && (m = i * s - a * o, m !== 0))) return h = Math.abs(m / 2), g = o * l - s * c, _ = g < 0 ? (g - h) / m : (g + h) / m, g = a * c - i * l, v = g < 0 ? (g - h) / m : (g + h) / m, {
 		x: _,
 		y: v
 	};
 }
-e(ze, "intersectLine");
-function G(e, t) {
+e(Ve, "intersectLine");
+function He(e, t) {
 	return e * t > 0;
 }
-e(G, "sameSign");
-var Be = ze, Ve = He;
-function He(e, t, n) {
+e(He, "sameSign");
+var Ue = Ve, We = Ge;
+function Ge(e, t, n) {
 	var r = e.x, i = e.y, a = [], o = Infinity, s = Infinity;
 	typeof t.forEach == "function" ? t.forEach(function(e) {
 		o = Math.min(o, e.x), s = Math.min(s, e.y);
 	}) : (o = Math.min(o, t.x), s = Math.min(s, t.y));
 	for (var c = r - e.width / 2 - o, l = i - e.height / 2 - s, u = 0; u < t.length; u++) {
-		var d = t[u], f = t[u < t.length - 1 ? u + 1 : 0], p = Be(e, n, {
+		var d = t[u], f = t[u < t.length - 1 ? u + 1 : 0], p = Ue(e, n, {
 			x: c + d.x,
 			y: l + d.y
 		}, {
@@ -2297,12 +2321,12 @@ function He(e, t, n) {
 		return a < c ? -1 : a === c ? 0 : 1;
 	}), a[0]) : e;
 }
-e(He, "intersectPolygon");
+e(Ge, "intersectPolygon");
 var K = {
-	node: Pe,
-	circle: Re,
-	ellipse: Ie,
-	polygon: Ve,
+	node: Ie,
+	circle: Be,
+	ellipse: Re,
+	polygon: We,
 	rect: /* @__PURE__ */ e((e, t) => {
 		var n = e.x, r = e.y, i = t.x - n, a = t.y - r, o = e.width / 2, s = e.height / 2, c, l;
 		return Math.abs(a) * o > Math.abs(i) * s ? (a < 0 && (s = -s), c = a === 0 ? 0 : s * i / a, l = s) : (i < 0 && (o = -o), c = o, l = i === 0 ? 0 : o * a / i), {
@@ -2316,19 +2340,19 @@ var K = {
 	let s = e.insert("g").attr("class", a).attr("id", t.domId || t.id), u = s.insert("g").attr("class", "label").attr("style", t.labelStyle), p;
 	p = t.labelText === void 0 ? "" : typeof t.labelText == "string" ? t.labelText : t.labelText[0];
 	let m;
-	m = t.labelType === "markdown" ? v(u, d(h(p), i), {
+	m = t.labelType === "markdown" ? y(u, d(g(p), i), {
 		useHtmlLabels: o,
 		width: t.width || i.flowchart.wrappingWidth,
 		classes: "markdown-node-label"
-	}, i) : await V(u, d(h(p), i), t.labelStyle, !1, r);
-	let g = m.getBBox(), _ = t.padding / 2;
+	}, i) : await U(u, d(g(p), i), t.labelStyle, !1, r);
+	let h = m.getBBox(), _ = t.padding / 2;
 	if (l(i)) {
 		let e = m.children[0], t = f(m);
-		await S(e, p), g = e.getBoundingClientRect(), t.attr("width", g.width), t.attr("height", g.height);
+		await C(e, p), h = e.getBoundingClientRect(), t.attr("width", h.width), t.attr("height", h.height);
 	}
-	return o ? u.attr("transform", "translate(" + -g.width / 2 + ", " + -g.height / 2 + ")") : u.attr("transform", "translate(0, " + -g.height / 2 + ")"), t.centerLabel && u.attr("transform", "translate(" + -g.width / 2 + ", " + -g.height / 2 + ")"), u.insert("rect", ":first-child"), {
+	return o ? u.attr("transform", "translate(" + -h.width / 2 + ", " + -h.height / 2 + ")") : u.attr("transform", "translate(0, " + -h.height / 2 + ")"), t.centerLabel && u.attr("transform", "translate(" + -h.width / 2 + ", " + -h.height / 2 + ")"), u.insert("rect", ":first-child"), {
 		shapeSvg: s,
-		bbox: g,
+		bbox: h,
 		halfPadding: _,
 		label: u
 	};
@@ -2342,7 +2366,7 @@ function Y(e, t, n, r) {
 	}).join(" ")).attr("class", "label-container").attr("transform", "translate(" + -t / 2 + "," + n / 2 + ")");
 }
 e(Y, "insertPolygonShape");
-var Ue = /* @__PURE__ */ e(async (e, n) => {
+var Ke = /* @__PURE__ */ e(async (e, n) => {
 	n.useHtmlLabels || l(c()) || (n.centerLabel = !0);
 	let { shapeSvg: r, bbox: i, halfPadding: a } = await q(e, n, "node " + n.classes, !0);
 	t.info("Classes = ", n.classes);
@@ -2350,7 +2374,7 @@ var Ue = /* @__PURE__ */ e(async (e, n) => {
 	return o.attr("rx", n.rx).attr("ry", n.ry).attr("x", -i.width / 2 - a).attr("y", -i.height / 2 - a).attr("width", i.width + n.padding).attr("height", i.height + n.padding), J(n, o), n.intersect = function(e) {
 		return K.rect(n, e);
 	}, r;
-}, "note"), We = /* @__PURE__ */ e((e) => e ? " " + e : "", "formatClass"), X = /* @__PURE__ */ e((e, t) => `${t || "node default"}${We(e.classes)} ${We(e.class)}`, "getClassesFromNode"), Ge = /* @__PURE__ */ e(async (e, n) => {
+}, "note"), qe = /* @__PURE__ */ e((e) => e ? " " + e : "", "formatClass"), X = /* @__PURE__ */ e((e, t) => `${t || "node default"}${qe(e.classes)} ${qe(e.class)}`, "getClassesFromNode"), Je = /* @__PURE__ */ e(async (e, n) => {
 	let { shapeSvg: r, bbox: i } = await q(e, n, X(n, void 0), !0), a = i.width + n.padding + (i.height + n.padding), o = [
 		{
 			x: a / 2,
@@ -2374,7 +2398,7 @@ var Ue = /* @__PURE__ */ e(async (e, n) => {
 	return s.attr("style", n.style), J(n, s), n.intersect = function(e) {
 		return t.warn("Intersect called"), K.polygon(n, o, e);
 	}, r;
-}, "question"), Ke = /* @__PURE__ */ e((e, t) => {
+}, "question"), Ye = /* @__PURE__ */ e((e, t) => {
 	let n = e.insert("g").attr("class", "node default").attr("id", t.domId || t.id);
 	return n.insert("polygon", ":first-child").attr("points", [
 		{
@@ -2398,8 +2422,8 @@ var Ue = /* @__PURE__ */ e(async (e, n) => {
 	}).join(" ")).attr("class", "state-start").attr("r", 7).attr("width", 28).attr("height", 28), t.width = 28, t.height = 28, t.intersect = function(e) {
 		return K.circle(t, 14, e);
 	}, n;
-}, "choice"), qe = /* @__PURE__ */ e(async (e, t) => {
-	let { shapeSvg: n, bbox: r } = await q(e, t, X(t, void 0), !0), i = r.height + t.padding, a = i / 4, o = r.width + 2 * a + t.padding, s = [
+}, "choice"), Xe = /* @__PURE__ */ e(async (e, t) => {
+	let { shapeSvg: n, bbox: r } = await q(e, t, X(t, void 0), !0), i = t.positioned ? t.height : r.height + t.padding, a = i / 4, o = t.positioned ? t.width : r.width + 2 * a + t.padding, s = [
 		{
 			x: a,
 			y: 0
@@ -2428,12 +2452,12 @@ var Ue = /* @__PURE__ */ e(async (e, n) => {
 	return c.attr("style", t.style), J(t, c), t.intersect = function(e) {
 		return K.polygon(t, s, e);
 	}, n;
-}, "hexagon"), Je = /* @__PURE__ */ e(async (e, t) => {
-	let { shapeSvg: n, bbox: r } = await q(e, t, void 0, !0), i = r.height + 2 * t.padding, a = i / 2, o = r.width + 2 * a + t.padding, s = Me(t.directions, r, t), c = Y(n, o, i, s);
-	return c.attr("style", t.style), J(t, c), t.intersect = function(e) {
-		return K.polygon(t, s, e);
+}, "hexagon"), Ze = /* @__PURE__ */ e(async (e, t) => {
+	let { shapeSvg: n, bbox: r } = await q(e, t, void 0, !0), i = r.height + 2 * t.padding, a = i / 2, o = r.width + 2 * a + t.padding, s = t.positioned && (t.widthInColumns ?? 1) > 1 && t.width > o ? t.width : o, c = Pe(t.directions, r, t, s), l = Y(n, s, i, c);
+	return l.attr("style", t.style), J(t, l), t.intersect = function(e) {
+		return K.polygon(t, c, e);
 	}, n;
-}, "block_arrow"), Ye = /* @__PURE__ */ e(async (e, t) => {
+}, "block_arrow"), Qe = /* @__PURE__ */ e(async (e, t) => {
 	let { shapeSvg: n, bbox: r } = await q(e, t, X(t, void 0), !0), i = r.width + t.padding, a = r.height + t.padding, o = [
 		{
 			x: -a / 2,
@@ -2459,7 +2483,7 @@ var Ue = /* @__PURE__ */ e(async (e, n) => {
 	return Y(n, i, a, o).attr("style", t.style), t.width = i + a, t.height = a, t.intersect = function(e) {
 		return K.polygon(t, o, e);
 	}, n;
-}, "rect_left_inv_arrow"), Xe = /* @__PURE__ */ e(async (e, t) => {
+}, "rect_left_inv_arrow"), $e = /* @__PURE__ */ e(async (e, t) => {
 	let { shapeSvg: n, bbox: r } = await q(e, t, X(t), !0), i = r.width + t.padding, a = r.height + t.padding, o = [
 		{
 			x: -2 * a / 6,
@@ -2481,7 +2505,7 @@ var Ue = /* @__PURE__ */ e(async (e, n) => {
 	return s.attr("style", t.style), J(t, s), t.intersect = function(e) {
 		return K.polygon(t, o, e);
 	}, n;
-}, "lean_right"), Ze = /* @__PURE__ */ e(async (e, t) => {
+}, "lean_right"), et = /* @__PURE__ */ e(async (e, t) => {
 	let { shapeSvg: n, bbox: r } = await q(e, t, X(t, void 0), !0), i = r.width + t.padding, a = r.height + t.padding, o = [
 		{
 			x: 2 * a / 6,
@@ -2503,7 +2527,7 @@ var Ue = /* @__PURE__ */ e(async (e, n) => {
 	return s.attr("style", t.style), J(t, s), t.intersect = function(e) {
 		return K.polygon(t, o, e);
 	}, n;
-}, "lean_left"), Qe = /* @__PURE__ */ e(async (e, t) => {
+}, "lean_left"), tt = /* @__PURE__ */ e(async (e, t) => {
 	let { shapeSvg: n, bbox: r } = await q(e, t, X(t, void 0), !0), i = r.width + t.padding, a = r.height + t.padding, o = [
 		{
 			x: -2 * a / 6,
@@ -2525,7 +2549,7 @@ var Ue = /* @__PURE__ */ e(async (e, n) => {
 	return s.attr("style", t.style), J(t, s), t.intersect = function(e) {
 		return K.polygon(t, o, e);
 	}, n;
-}, "trapezoid"), $e = /* @__PURE__ */ e(async (e, t) => {
+}, "trapezoid"), nt = /* @__PURE__ */ e(async (e, t) => {
 	let { shapeSvg: n, bbox: r } = await q(e, t, X(t, void 0), !0), i = r.width + t.padding, a = r.height + t.padding, o = [
 		{
 			x: a / 6,
@@ -2547,7 +2571,7 @@ var Ue = /* @__PURE__ */ e(async (e, n) => {
 	return s.attr("style", t.style), J(t, s), t.intersect = function(e) {
 		return K.polygon(t, o, e);
 	}, n;
-}, "inv_trapezoid"), et = /* @__PURE__ */ e(async (e, t) => {
+}, "inv_trapezoid"), rt = /* @__PURE__ */ e(async (e, t) => {
 	let { shapeSvg: n, bbox: r } = await q(e, t, X(t, void 0), !0), i = r.width + t.padding, a = r.height + t.padding, o = [
 		{
 			x: 0,
@@ -2573,7 +2597,7 @@ var Ue = /* @__PURE__ */ e(async (e, n) => {
 	return s.attr("style", t.style), J(t, s), t.intersect = function(e) {
 		return K.polygon(t, o, e);
 	}, n;
-}, "rect_right_inv_arrow"), tt = /* @__PURE__ */ e(async (e, t) => {
+}, "rect_right_inv_arrow"), it = /* @__PURE__ */ e(async (e, t) => {
 	let { shapeSvg: n, bbox: r } = await q(e, t, X(t, void 0), !0), i = r.width + t.padding, a = i / 2, o = a / (2.5 + i / 50), s = r.height + o + t.padding, c = "M 0," + o + " a " + a + "," + o + " 0,0,0 " + i + " 0 a " + a + "," + o + " 0,0,0 " + -i + " 0 l 0," + s + " a " + a + "," + o + " 0,0,0 " + i + " 0 l 0," + -s;
 	return J(t, n.attr("label-offset-y", o).insert("path", ":first-child").attr("style", t.style).attr("d", c).attr("transform", "translate(" + -i / 2 + "," + -(s / 2 + o) + ")")), t.intersect = function(e) {
 		let n = K.rect(t, e), r = n.x - t.x;
@@ -2583,7 +2607,7 @@ var Ue = /* @__PURE__ */ e(async (e, n) => {
 		}
 		return n;
 	}, n;
-}, "cylinder"), nt = /* @__PURE__ */ e(async (e, n) => {
+}, "cylinder"), at = /* @__PURE__ */ e(async (e, n) => {
 	let { shapeSvg: r, bbox: i, halfPadding: a } = await q(e, n, "node " + n.classes + " " + n.class, !0), o = r.insert("rect", ":first-child"), s = n.positioned ? n.width : i.width + n.padding, c = n.positioned ? n.height : i.height + n.padding, l = n.positioned ? -s / 2 : -i.width / 2 - a, u = n.positioned ? -c / 2 : -i.height / 2 - a;
 	if (o.attr("class", "basic label-container").attr("style", n.style).attr("rx", n.rx).attr("ry", n.ry).attr("x", l).attr("y", u).attr("width", s).attr("height", c), n.props) {
 		let e = new Set(Object.keys(n.props));
@@ -2594,7 +2618,7 @@ var Ue = /* @__PURE__ */ e(async (e, n) => {
 	return J(n, o), n.intersect = function(e) {
 		return K.rect(n, e);
 	}, r;
-}, "rect"), rt = /* @__PURE__ */ e(async (e, n) => {
+}, "rect"), ot = /* @__PURE__ */ e(async (e, n) => {
 	let { shapeSvg: r, bbox: i, halfPadding: a } = await q(e, n, "node " + n.classes, !0), o = r.insert("rect", ":first-child"), s = n.positioned ? n.width : i.width + n.padding, c = n.positioned ? n.height : i.height + n.padding, l = n.positioned ? -s / 2 : -i.width / 2 - a, u = n.positioned ? -c / 2 : -i.height / 2 - a;
 	if (o.attr("class", "basic cluster composite label-container").attr("style", n.style).attr("rx", n.rx).attr("ry", n.ry).attr("x", l).attr("y", u).attr("width", s).attr("height", c), n.props) {
 		let e = new Set(Object.keys(n.props));
@@ -2605,7 +2629,7 @@ var Ue = /* @__PURE__ */ e(async (e, n) => {
 	return J(n, o), n.intersect = function(e) {
 		return K.rect(n, e);
 	}, r;
-}, "composite"), it = /* @__PURE__ */ e(async (e, n) => {
+}, "composite"), st = /* @__PURE__ */ e(async (e, n) => {
 	let { shapeSvg: r } = await q(e, n, "label", !0);
 	t.trace("Classes = ", n.class);
 	let i = r.insert("rect", ":first-child");
@@ -2628,12 +2652,12 @@ function Z(n, r, i, a) {
 	r.includes("t") ? (t.debug("add top border"), s(i)) : c(i), r.includes("r") ? (t.debug("add right border"), s(a)) : c(a), r.includes("b") ? (t.debug("add bottom border"), s(i)) : c(i), r.includes("l") ? (t.debug("add left border"), s(a)) : c(a), n.attr("stroke-dasharray", o.join(" "));
 }
 e(Z, "applyNodePropertyBorders");
-var at = /* @__PURE__ */ e(async (e, n) => {
+var ct = /* @__PURE__ */ e(async (e, n) => {
 	let r;
 	r = n.classes ? "node " + n.classes : "node default";
 	let i = e.insert("g").attr("class", r).attr("id", n.domId || n.id), a = i.insert("rect", ":first-child"), o = i.insert("line"), s = i.insert("g").attr("class", "label"), u = n.labelText.flat ? n.labelText.flat() : n.labelText, d = "";
 	d = typeof u == "object" ? u[0] : u, t.info("Label text abc79", d, u, typeof u == "object");
-	let p = await V(s, d, n.labelStyle, !0, !0), m = {
+	let p = await U(s, d, n.labelStyle, !0, !0), m = {
 		width: 0,
 		height: 0
 	};
@@ -2642,7 +2666,7 @@ var at = /* @__PURE__ */ e(async (e, n) => {
 		m = e.getBoundingClientRect(), t.attr("width", m.width), t.attr("height", m.height);
 	}
 	t.info("Text 2", u);
-	let h = u.slice(1, u.length), g = p.getBBox(), _ = await V(s, h.join ? h.join("<br/>") : h, n.labelStyle, !0, !0);
+	let h = u.slice(1, u.length), g = p.getBBox(), _ = await U(s, h.join ? h.join("<br/>") : h, n.labelStyle, !0, !0);
 	if (l(c())) {
 		let e = _.children[0], t = f(_);
 		m = e.getBoundingClientRect(), t.attr("width", m.width), t.attr("height", m.height);
@@ -2651,22 +2675,22 @@ var at = /* @__PURE__ */ e(async (e, n) => {
 	return f(_).attr("transform", "translate( " + (m.width > g.width ? 0 : (g.width - m.width) / 2) + ", " + (g.height + v + 5) + ")"), f(p).attr("transform", "translate( " + (m.width < g.width ? 0 : -(g.width - m.width) / 2) + ", 0)"), m = s.node().getBBox(), s.attr("transform", "translate(" + -m.width / 2 + ", " + (-m.height / 2 - v + 3) + ")"), a.attr("class", "outer title-state").attr("x", -m.width / 2 - v).attr("y", -m.height / 2 - v).attr("width", m.width + n.padding).attr("height", m.height + n.padding), o.attr("class", "divider").attr("x1", -m.width / 2 - v).attr("x2", m.width / 2 + v).attr("y1", -m.height / 2 - v + g.height + v).attr("y2", -m.height / 2 - v + g.height + v), J(n, a), n.intersect = function(e) {
 		return K.rect(n, e);
 	}, i;
-}, "rectWithTitle"), ot = /* @__PURE__ */ e(async (e, t) => {
+}, "rectWithTitle"), lt = /* @__PURE__ */ e(async (e, t) => {
 	let { shapeSvg: n, bbox: r } = await q(e, t, X(t, void 0), !0), i = r.height + t.padding, a = r.width + i / 4 + t.padding;
 	return J(t, n.insert("rect", ":first-child").attr("style", t.style).attr("rx", i / 2).attr("ry", i / 2).attr("x", -a / 2).attr("y", -i / 2).attr("width", a).attr("height", i)), t.intersect = function(e) {
 		return K.rect(t, e);
 	}, n;
-}, "stadium"), st = /* @__PURE__ */ e(async (e, n) => {
+}, "stadium"), ut = /* @__PURE__ */ e(async (e, n) => {
 	let { shapeSvg: r, bbox: i, halfPadding: a } = await q(e, n, X(n, void 0), !0), o = r.insert("circle", ":first-child");
 	return o.attr("style", n.style).attr("rx", n.rx).attr("ry", n.ry).attr("r", i.width / 2 + a).attr("width", i.width + n.padding).attr("height", i.height + n.padding), t.info("Circle main"), J(n, o), n.intersect = function(e) {
 		return t.info("Circle intersect", n, i.width / 2 + a, e), K.circle(n, i.width / 2 + a, e);
 	}, r;
-}, "circle"), ct = /* @__PURE__ */ e(async (e, n) => {
+}, "circle"), dt = /* @__PURE__ */ e(async (e, n) => {
 	let { shapeSvg: r, bbox: i, halfPadding: a } = await q(e, n, X(n, void 0), !0), o = r.insert("g", ":first-child"), s = o.insert("circle"), c = o.insert("circle");
 	return o.attr("class", n.class), s.attr("style", n.style).attr("rx", n.rx).attr("ry", n.ry).attr("r", i.width / 2 + a + 5).attr("width", i.width + n.padding + 10).attr("height", i.height + n.padding + 10), c.attr("style", n.style).attr("rx", n.rx).attr("ry", n.ry).attr("r", i.width / 2 + a).attr("width", i.width + n.padding).attr("height", i.height + n.padding), t.info("DoubleCircle main"), J(n, s), n.intersect = function(e) {
 		return t.info("DoubleCircle intersect", n, i.width / 2 + a + 5, e), K.circle(n, i.width / 2 + a + 5, e);
 	}, r;
-}, "doublecircle"), lt = /* @__PURE__ */ e(async (e, t) => {
+}, "doublecircle"), ft = /* @__PURE__ */ e(async (e, t) => {
 	let { shapeSvg: n, bbox: r } = await q(e, t, X(t, void 0), !0), i = r.width + t.padding, a = r.height + t.padding, o = [
 		{
 			x: 0,
@@ -2712,51 +2736,51 @@ var at = /* @__PURE__ */ e(async (e, n) => {
 	return s.attr("style", t.style), J(t, s), t.intersect = function(e) {
 		return K.polygon(t, o, e);
 	}, n;
-}, "subroutine"), ut = /* @__PURE__ */ e((e, t) => {
+}, "subroutine"), pt = /* @__PURE__ */ e((e, t) => {
 	let n = e.insert("g").attr("class", "node default").attr("id", t.domId || t.id), r = n.insert("circle", ":first-child");
 	return r.attr("class", "state-start").attr("r", 7).attr("width", 14).attr("height", 14), J(t, r), t.intersect = function(e) {
 		return K.circle(t, 7, e);
 	}, n;
-}, "start"), dt = /* @__PURE__ */ e((e, t, n) => {
+}, "start"), mt = /* @__PURE__ */ e((e, t, n) => {
 	let r = e.insert("g").attr("class", "node default").attr("id", t.domId || t.id), i = 70, a = 10;
 	return n === "LR" && (i = 10, a = 70), J(t, r.append("rect").attr("x", -1 * i / 2).attr("y", -1 * a / 2).attr("width", i).attr("height", a).attr("class", "fork-join")), t.height += t.padding / 2, t.width += t.padding / 2, t.intersect = function(e) {
 		return K.rect(t, e);
 	}, r;
-}, "forkJoin"), ft = {
-	rhombus: Ge,
-	composite: rt,
-	question: Ge,
-	rect: nt,
-	labelRect: it,
-	rectWithTitle: at,
-	choice: Ke,
-	circle: st,
-	doublecircle: ct,
-	stadium: ot,
-	hexagon: qe,
-	block_arrow: Je,
-	rect_left_inv_arrow: Ye,
-	lean_right: Xe,
-	lean_left: Ze,
-	trapezoid: Qe,
-	inv_trapezoid: $e,
-	rect_right_inv_arrow: et,
-	cylinder: tt,
-	start: ut,
+}, "forkJoin"), ht = {
+	rhombus: Je,
+	composite: ot,
+	question: Je,
+	rect: at,
+	labelRect: st,
+	rectWithTitle: ct,
+	choice: Ye,
+	circle: ut,
+	doublecircle: dt,
+	stadium: lt,
+	hexagon: Xe,
+	block_arrow: Ze,
+	rect_left_inv_arrow: Qe,
+	lean_right: $e,
+	lean_left: et,
+	trapezoid: tt,
+	inv_trapezoid: nt,
+	rect_right_inv_arrow: rt,
+	cylinder: it,
+	start: pt,
 	end: /* @__PURE__ */ e((e, t) => {
 		let n = e.insert("g").attr("class", "node default").attr("id", t.domId || t.id), r = n.insert("circle", ":first-child"), i = n.insert("circle", ":first-child");
 		return i.attr("class", "state-start").attr("r", 7).attr("width", 14).attr("height", 14), r.attr("class", "state-end").attr("r", 5).attr("width", 10).attr("height", 10), J(t, i), t.intersect = function(e) {
 			return K.circle(t, 7, e);
 		}, n;
 	}, "end"),
-	note: Ue,
-	subroutine: lt,
-	fork: dt,
-	join: dt,
+	note: Ke,
+	subroutine: ft,
+	fork: mt,
+	join: mt,
 	class_box: /* @__PURE__ */ e(async (e, t) => {
 		let n = t.padding / 2, r;
 		r = t.classes ? "node " + t.classes : "node default";
-		let i = e.insert("g").attr("class", r).attr("id", t.domId || t.id), a = i.insert("rect", ":first-child"), o = i.insert("line"), s = i.insert("line"), u = 0, d = 4, p = i.insert("g").attr("class", "label"), m = 0, h = t.classData.annotations?.[0], g = await V(p, t.classData.annotations[0] ? "«" + t.classData.annotations[0] + "»" : "", t.labelStyle, !0, !0), _ = g.getBBox();
+		let i = e.insert("g").attr("class", r).attr("id", t.domId || t.id), a = i.insert("rect", ":first-child"), o = i.insert("line"), s = i.insert("line"), u = 0, d = 4, p = i.insert("g").attr("class", "label"), m = 0, h = t.classData.annotations?.[0], g = await U(p, t.classData.annotations[0] ? "«" + t.classData.annotations[0] + "»" : "", t.labelStyle, !0, !0), _ = g.getBBox();
 		if (l(c())) {
 			let e = g.children[0], t = f(g);
 			_ = e.getBoundingClientRect(), t.attr("width", _.width), t.attr("height", _.height);
@@ -2764,7 +2788,7 @@ var at = /* @__PURE__ */ e(async (e, n) => {
 		t.classData.annotations[0] && (d += _.height + 4, u += _.width);
 		let v = t.classData.label;
 		t.classData.type !== void 0 && t.classData.type !== "" && (l(c()) ? v += "&lt;" + t.classData.type + "&gt;" : v += "<" + t.classData.type + ">");
-		let y = await V(p, v, t.labelStyle, !0, !0);
+		let y = await U(p, v, t.labelStyle, !0, !0);
 		f(y).attr("class", "classTitle");
 		let b = y.getBBox();
 		if (l(c())) {
@@ -2776,7 +2800,7 @@ var at = /* @__PURE__ */ e(async (e, n) => {
 		t.classData.members.forEach(async (e) => {
 			let n = e.getDisplayDetails(), r = n.displayText;
 			l(c()) && (r = r.replace(/</g, "&lt;").replace(/>/g, "&gt;"));
-			let i = await V(p, r, n.cssStyle ? n.cssStyle : t.labelStyle, !0, !0), a = i.getBBox();
+			let i = await U(p, r, n.cssStyle ? n.cssStyle : t.labelStyle, !0, !0), a = i.getBBox();
 			if (l(c())) {
 				let e = i.children[0], t = f(i);
 				a = e.getBoundingClientRect(), t.attr("width", a.width), t.attr("height", a.height);
@@ -2787,7 +2811,7 @@ var at = /* @__PURE__ */ e(async (e, n) => {
 		if (t.classData.methods.forEach(async (e) => {
 			let n = e.getDisplayDetails(), r = n.displayText;
 			l(c()) && (r = r.replace(/</g, "&lt;").replace(/>/g, "&gt;"));
-			let i = await V(p, r, n.cssStyle ? n.cssStyle : t.labelStyle, !0, !0), a = i.getBBox();
+			let i = await U(p, r, n.cssStyle ? n.cssStyle : t.labelStyle, !0, !0), a = i.getBBox();
 			if (l(c())) {
 				let e = i.children[0], t = f(i);
 				a = e.getBoundingClientRect(), t.attr("width", a.width), t.attr("height", a.height);
@@ -2810,20 +2834,20 @@ var at = /* @__PURE__ */ e(async (e, n) => {
 			return K.rect(t, e);
 		}, i;
 	}, "class_box")
-}, Q = {}, pt = /* @__PURE__ */ e(async (e, t, n) => {
+}, Q = {}, gt = /* @__PURE__ */ e(async (e, t, n) => {
 	let r, i;
 	if (t.link) {
 		let a;
-		c().securityLevel === "sandbox" ? a = "_top" : t.linkTarget && (a = t.linkTarget || "_blank"), r = e.insert("svg:a").attr("xlink:href", t.link).attr("target", a), i = await ft[t.shape](r, t, n);
-	} else i = await ft[t.shape](e, t, n), r = i;
+		c().securityLevel === "sandbox" ? a = "_top" : t.linkTarget && (a = t.linkTarget || "_blank"), r = e.insert("svg:a").attr("xlink:href", t.link).attr("target", a), i = await ht[t.shape](r, t, n);
+	} else i = await ht[t.shape](e, t, n), r = i;
 	return t.tooltip && i.attr("title", t.tooltip), t.class && i.attr("class", "node default " + t.class), Q[t.id] = r, t.haveCallback && Q[t.id].attr("class", Q[t.id].attr("class") + " clickable"), r;
-}, "insertNode"), mt = /* @__PURE__ */ e((e) => {
+}, "insertNode"), _t = /* @__PURE__ */ e((e) => {
 	let n = Q[e.id];
 	t.trace("Transforming node", e.diff, e, "translate(" + (e.x - e.width / 2 - 5) + ", " + e.width / 2 + ")");
 	let r = e.diff || 0;
 	return e.clusterNode ? n.attr("transform", "translate(" + (e.x + r - e.width / 2) + ", " + (e.y - e.height / 2 - 8) + ")") : n.attr("transform", "translate(" + e.x + ", " + e.y + ")"), r;
 }, "positionNode");
-function ht(e, t, n = !1) {
+function vt(e, t, n = !1) {
 	let r = e, i = "default";
 	(r?.classes?.length || 0) > 0 && (i = (r?.classes ?? []).join(" ")), i += " flowchart-label";
 	let a = 0, o = "", c;
@@ -2887,7 +2911,7 @@ function ht(e, t, n = !1) {
 			break;
 		default: o = "rect";
 	}
-	let l = g(r?.styles ?? []), u = r.label, d = r.size ?? {
+	let l = _(r?.styles ?? []), u = r.label, d = r.size ?? {
 		width: 0,
 		height: 0,
 		x: 0,
@@ -2911,14 +2935,15 @@ function ht(e, t, n = !1) {
 		positioned: n,
 		intersect: void 0,
 		type: r.type,
-		padding: c ?? s()?.block?.padding ?? 0
+		padding: c ?? s()?.block?.padding ?? 0,
+		widthInColumns: r.widthInColumns ?? 1
 	};
 }
-e(ht, "getNodeFromBlock");
-async function gt(e, t, n) {
-	let r = ht(t, n, !1);
+e(vt, "getNodeFromBlock");
+async function yt(e, t, n) {
+	let r = vt(t, n, !1);
 	if (r.type === "group") return;
-	let i = await pt(e, r, { config: s() }), a = i.node().getBBox(), o = n.getBlock(r.id);
+	let i = await gt(e, r, { config: s() }), a = i.node().getBBox(), o = n.getBlock(r.id);
 	o.size = {
 		width: a.width,
 		height: a.height,
@@ -2927,25 +2952,25 @@ async function gt(e, t, n) {
 		node: i
 	}, n.setBlock(o), i.remove();
 }
-e(gt, "calculateBlockSize");
-async function _t(e, t, n) {
-	let r = ht(t, n, !0);
-	n.getBlock(r.id).type !== "space" && (await pt(e, r, { config: s() }), t.intersect = r?.intersect, mt(r));
+e(yt, "calculateBlockSize");
+async function bt(e, t, n) {
+	let r = vt(t, n, !0);
+	n.getBlock(r.id).type !== "space" && (await gt(e, r, { config: s() }), t.intersect = r?.intersect, _t(r));
 }
-e(_t, "insertBlockPositioned");
+e(bt, "insertBlockPositioned");
 async function $(e, t, n, r) {
 	for (let i of t) await r(e, i, n), i.children && await $(e, i.children, n, r);
 }
 e($, "performOperations");
-async function vt(e, t, n) {
-	await $(e, t, n, gt);
+async function xt(e, t, n) {
+	await $(e, t, n, yt);
 }
-e(vt, "calculateBlockSizes");
-async function yt(e, t, n) {
-	await $(e, t, n, _t);
+e(xt, "calculateBlockSizes");
+async function St(e, t, n) {
+	await $(e, t, n, bt);
 }
-e(yt, "insertBlocks");
-async function bt(e, t, n, r, i) {
+e(St, "insertBlocks");
+async function Ct(e, t, n, r, i) {
 	let a = new T({
 		multigraph: !0,
 		compound: !0
@@ -2978,8 +3003,8 @@ async function bt(e, t, n, r, i) {
 					x: s.x,
 					y: s.y
 				}
-			], l = i ? `${i}-${n.id}` : n.id;
-			Ae(e, {
+			], l = i ? `${i}-${n.id}` : n.id, u = `${n.thickness === "thick" ? "edge-thickness-thick" : "edge-thickness-normal"} ${n.pattern === "dotted" ? "edge-pattern-dotted" : "edge-pattern-solid"} flowchart-link LS-a1 LE-b1`;
+			Me(e, {
 				v: n.start,
 				w: n.end,
 				name: l
@@ -2989,16 +3014,16 @@ async function bt(e, t, n, r, i) {
 				arrowTypeEnd: n.arrowTypeEnd,
 				arrowTypeStart: n.arrowTypeStart,
 				points: c,
-				classes: "edge-thickness-normal edge-pattern-solid flowchart-link LS-a1 LE-b1"
-			}, void 0, "block", a, i), n.label && (await Te(e, {
+				classes: u
+			}, void 0, "block", a, i), n.label && (await De(e, {
 				...n,
 				label: n.label,
 				labelStyle: "stroke: #333; stroke-width: 1.5px;fill:none;",
 				arrowTypeEnd: n.arrowTypeEnd,
 				arrowTypeStart: n.arrowTypeStart,
 				points: c,
-				classes: "edge-thickness-normal edge-pattern-solid flowchart-link LS-a1 LE-b1"
-			}), Ee({
+				classes: u
+			}), Oe({
 				...n,
 				x: c[1].x,
 				y: c[1].y
@@ -3006,10 +3031,10 @@ async function bt(e, t, n, r, i) {
 		}
 	}
 }
-e(bt, "insertEdges");
-var xt = {
+e(Ct, "insertEdges");
+var wt = {
 	parser: D,
-	db: he,
+	db: ge,
 	renderer: {
 		draw: /* @__PURE__ */ e(async function(e, n, r, i) {
 			let { securityLevel: a, block: c } = s(), l = i.db;
@@ -3017,15 +3042,15 @@ var xt = {
 			let u;
 			a === "sandbox" && (u = f("#i" + n));
 			let d = f(a === "sandbox" ? u.nodes()[0].contentDocument.body : "body"), p = a === "sandbox" ? d.select(`[id="${n}"]`) : f(`[id="${n}"]`);
-			ye(p, [
+			be(p, [
 				"point",
 				"circle",
 				"cross"
 			], i.type, n);
 			let m = l.getBlocks(), h = l.getBlocksFlat(), g = l.getEdges(), _ = p.insert("g").attr("class", "block");
-			await vt(_, m, l);
-			let v = xe(l);
-			if (await yt(_, m, l), await bt(_, g, h, l, n), v) {
+			await xt(_, m, l);
+			let v = Se(l);
+			if (await St(_, m, l), await Ct(_, g, h, l, n), v) {
 				let e = v, n = Math.max(1, Math.round(.125 * (e.width / e.height))), r = e.height + n + 10, i = e.width + 10, { useMaxWidth: a } = c;
 				o(p, r, i, !!a), t.debug("Here Bounds", v, e), p.attr("viewBox", `${e.x - 5} ${e.y - 5} ${e.width + 10} ${e.height + 10}`);
 			}
@@ -3034,9 +3059,9 @@ var xt = {
 			return t.db.getClasses();
 		}, "getClasses")
 	},
-	styles: ge
+	styles: _e
 };
 //#endregion
-export { xt as diagram };
+export { wt as diagram };
 
-//# sourceMappingURL=blockDiagram-DXYQGD6D.js.map
+//# sourceMappingURL=blockDiagram-GPEHLZMM.js.map