@countermeasure-platform/web-components 1.2.1-dev.6.1 → 1.2.2-dev.7.1

package/dist/{architectureDiagram-2XIMDMQ5-D5q0ma9h.js → architectureDiagram-3BPJPVTR-cYFnhp15.js}

@@ -1,15 +1,14 @@
-import { s as e, t } from "./chunk-NBPlniwU.js";
-import { w as n } from "./src-D1EMXotX.js";
-import { r, s as i } from "./chunk-GEFDOKGD-DGJJEGSm.js";
-import { n as a, r as o } from "./src-BhNgmpel.js";
-import { B as s, C as c, K as l, L as u, V as d, W as f, _ as p, a as m, b as h, d as g, v as _, y as v } from "./chunk-7R4GIKGN-DJmroLCH.js";
-import { t as y } from "./chunk-HHEYEP7N-DJ1b-gA8.js";
-import { a as b, i as x, n as S, r as C } from "./chunk-PU5JKC2W-DNpn_Yik.js";
-import { t as w } from "./chunk-4BX2VUAB-BS9gpN-y.js";
-import { t as T } from "./mermaid-parser.core-Dz5qv4CI.js";
-import { t as E } from "./cytoscape.esm-2vKMh7AJ.js";
+import { E as e, O as t, w as n } from "./src-CWnvxuyh.js";
+import { n as r, r as i } from "./src-DngnQkx_.js";
+import { H as a, J as o, K as s, U as c, a as l, b as u, f as d, v as f, w as p, x as m, y as h, z as g } from "./chunk-CSCIHK7Q-DyRIc27i.js";
+import { c as _, i as v } from "./chunk-5ZQYHXKU-CjOcwRY6.js";
+import { t as y } from "./chunk-WU5MYG2G-mzocEmS2.js";
+import { a as b, i as x, n as S, r as C } from "./chunk-O5CBEL6O-DThtyjPO.js";
+import { t as w } from "./chunk-4BX2VUAB-BeLKo9Pn.js";
+import { t as T } from "./mermaid-parser.core-B_q76LYz.js";
+import { t as E } from "./cytoscape.esm-C85eXBIz.js";
 //#region node_modules/cytoscape-fcose/node_modules/layout-base/layout-base.js
-var D = /* @__PURE__ */ t(((e, t) => {
+var D = /* @__PURE__ */ e(((e, t) => {
 	(function(n, r) {
 		typeof e == "object" && typeof t == "object" ? t.exports = r() : typeof define == "function" && define.amd ? define([], r) : typeof e == "object" ? e.layoutBase = r() : n.layoutBase = r();
 	})(e, function() {
@@ -1640,7 +1639,7 @@ var D = /* @__PURE__ */ t(((e, t) => {
 			})
 		]);
 	});
-})), O = /* @__PURE__ */ t(((e, t) => {
+})), O = /* @__PURE__ */ e(((e, t) => {
 	(function(n, r) {
 		typeof e == "object" && typeof t == "object" ? t.exports = r(D()) : typeof define == "function" && define.amd ? define(["layout-base"], r) : typeof e == "object" ? e.coseBase = r(D()) : n.coseBase = r(n.layoutBase);
 	})(e, function(e) {
@@ -2775,7 +2774,7 @@ var D = /* @__PURE__ */ t(((e, t) => {
 			return r(45);
 		})();
 	});
-})), k = /* @__PURE__ */ e((/* @__PURE__ */ t(((e, t) => {
+})), k = /* @__PURE__ */ t((/* @__PURE__ */ e(((e, t) => {
 	(function(n, r) {
 		typeof e == "object" && typeof t == "object" ? t.exports = r(O()) : typeof define == "function" && define.amd ? define(["cose-base"], r) : typeof e == "object" ? e.cytoscapeFcose = r(O()) : n.cytoscapeFcose = r(n.coseBase);
 	})(e, function(e) {
@@ -3380,57 +3379,63 @@ var D = /* @__PURE__ */ t(((e, t) => {
 	T: "top",
 	B: "bottom"
 }, j = {
-	L: /* @__PURE__ */ a((e) => `${e},${e / 2} 0,${e} 0,0`, "L"),
-	R: /* @__PURE__ */ a((e) => `0,${e / 2} ${e},0 ${e},${e}`, "R"),
-	T: /* @__PURE__ */ a((e) => `0,0 ${e},0 ${e / 2},${e}`, "T"),
-	B: /* @__PURE__ */ a((e) => `${e / 2},0 ${e},${e} 0,${e}`, "B")
+	L: /* @__PURE__ */ r((e) => `${e},${e / 2} 0,${e} 0,0`, "L"),
+	R: /* @__PURE__ */ r((e) => `0,${e / 2} ${e},0 ${e},${e}`, "R"),
+	T: /* @__PURE__ */ r((e) => `0,0 ${e},0 ${e / 2},${e}`, "T"),
+	B: /* @__PURE__ */ r((e) => `${e / 2},0 ${e},${e} 0,${e}`, "B")
 }, M = {
-	L: /* @__PURE__ */ a((e, t) => e - t + 2, "L"),
-	R: /* @__PURE__ */ a((e, t) => e - 2, "R"),
-	T: /* @__PURE__ */ a((e, t) => e - t + 2, "T"),
-	B: /* @__PURE__ */ a((e, t) => e - 2, "B")
-}, N = /* @__PURE__ */ a(function(e) {
+	L: /* @__PURE__ */ r((e, t) => e - t + 2, "L"),
+	R: /* @__PURE__ */ r((e, t) => e - 2, "R"),
+	T: /* @__PURE__ */ r((e, t) => e - t + 2, "T"),
+	B: /* @__PURE__ */ r((e, t) => e - 2, "B")
+}, N = /* @__PURE__ */ r(function(e) {
 	return F(e) ? e === "L" ? "R" : "L" : e === "T" ? "B" : "T";
-}, "getOppositeArchitectureDirection"), P = /* @__PURE__ */ a(function(e) {
+}, "getOppositeArchitectureDirection"), P = /* @__PURE__ */ r(function(e) {
 	let t = e;
 	return t === "L" || t === "R" || t === "T" || t === "B";
-}, "isArchitectureDirection"), F = /* @__PURE__ */ a(function(e) {
+}, "isArchitectureDirection"), F = /* @__PURE__ */ r(function(e) {
 	let t = e;
 	return t === "L" || t === "R";
-}, "isArchitectureDirectionX"), I = /* @__PURE__ */ a(function(e) {
+}, "isArchitectureDirectionX"), I = /* @__PURE__ */ r(function(e) {
 	let t = e;
 	return t === "T" || t === "B";
-}, "isArchitectureDirectionY"), L = /* @__PURE__ */ a(function(e, t) {
+}, "isArchitectureDirectionY"), L = /* @__PURE__ */ r(function(e, t) {
 	let n = F(e) && I(t), r = I(e) && F(t);
 	return n || r;
-}, "isArchitectureDirectionXY"), R = /* @__PURE__ */ a(function(e) {
+}, "isArchitectureDirectionXY"), R = /* @__PURE__ */ r(function(e) {
 	let t = e[0], n = e[1], r = F(t) && I(n), i = I(t) && F(n);
 	return r || i;
-}, "isArchitecturePairXY"), z = /* @__PURE__ */ a(function(e) {
+}, "isArchitecturePairXY"), z = /* @__PURE__ */ r(function(e) {
 	return e !== "LL" && e !== "RR" && e !== "TT" && e !== "BB";
-}, "isValidArchitectureDirectionPair"), B = /* @__PURE__ */ a(function(e, t) {
+}, "isValidArchitectureDirectionPair"), B = /* @__PURE__ */ r(function(e, t) {
 	let n = `${e}${t}`;
 	return z(n) ? n : void 0;
-}, "getArchitectureDirectionPair"), V = /* @__PURE__ */ a(function([e, t], n) {
+}, "getArchitectureDirectionPair"), V = /* @__PURE__ */ r(function([e, t], n) {
 	let r = n[0], i = n[1];
 	return F(r) ? I(i) ? [e + (r === "L" ? -1 : 1), t + (i === "T" ? 1 : -1)] : [e + (r === "L" ? -1 : 1), t] : F(i) ? [e + (i === "L" ? 1 : -1), t + (r === "T" ? 1 : -1)] : [e, t + (r === "T" ? 1 : -1)];
-}, "shiftPositionByArchitectureDirectionPair"), ee = /* @__PURE__ */ a(function(e) {
+}, "shiftPositionByArchitectureDirectionPair"), ee = /* @__PURE__ */ r(function(e) {
 	return e === "LT" || e === "TL" ? [1, 1] : e === "BL" || e === "LB" ? [1, -1] : e === "BR" || e === "RB" ? [-1, -1] : [-1, 1];
-}, "getArchitectureDirectionXYFactors"), te = /* @__PURE__ */ a(function(e, t) {
+}, "getArchitectureDirectionXYFactors"), te = /* @__PURE__ */ r(function(e, t) {
 	return L(e, t) ? "bend" : F(e) ? "horizontal" : "vertical";
-}, "getArchitectureDirectionAlignment"), H = /* @__PURE__ */ a(function(e) {
+}, "getArchitectureDirectionAlignment"), H = /* @__PURE__ */ r(function(e) {
 	return e.type === "service";
-}, "isArchitectureService"), ne = /* @__PURE__ */ a(function(e) {
+}, "isArchitectureService"), ne = /* @__PURE__ */ r(function(e) {
 	return e.type === "junction";
-}, "isArchitectureJunction"), re = /* @__PURE__ */ a((e) => e.data(), "edgeData"), U = /* @__PURE__ */ a((e) => e.data(), "nodeData"), W = g.architecture, G = class {
+}, "isArchitectureJunction"), re = /* @__PURE__ */ r((e) => e.data(), "edgeData"), U = /* @__PURE__ */ r((e) => e.data(), "nodeData"), W = d.architecture, G = class {
 	constructor() {
-		this.nodes = {}, this.groups = {}, this.edges = [], this.registeredIds = {}, this.elements = {}, this.setAccTitle = d, this.getAccTitle = _, this.setDiagramTitle = f, this.getDiagramTitle = c, this.getAccDescription = p, this.setAccDescription = s, this.clear();
+		this.nodes = {}, this.groups = {}, this.edges = [], this.registeredIds = {}, this.elements = {}, this.diagramId = "", this.setAccTitle = c, this.getAccTitle = h, this.setDiagramTitle = s, this.getDiagramTitle = p, this.getAccDescription = f, this.setAccDescription = a, this.clear();
 	}
 	static {
-		a(this, "ArchitectureDB");
+		r(this, "ArchitectureDB");
+	}
+	setDiagramId(e) {
+		this.diagramId = e;
+	}
+	getDiagramId() {
+		return this.diagramId;
 	}
 	clear() {
-		this.nodes = {}, this.groups = {}, this.edges = [], this.registeredIds = {}, this.dataStructures = void 0, this.elements = {}, m();
+		this.nodes = {}, this.groups = {}, this.edges = [], this.registeredIds = {}, this.dataStructures = void 0, this.elements = {}, this.diagramId = "", l();
 	}
 	addService({ id: e, icon: t, in: n, title: r, iconText: i }) {
 		if (this.registeredIds[e] !== void 0) throw Error(`The service id [${e}] is already in use by another ${this.registeredIds[e]}`);
@@ -3532,24 +3537,24 @@ var D = /* @__PURE__ */ t(((e, t) => {
 					e && (t[e] = r.lhsId);
 				}
 				return t;
-			}, {}), t), {}), n = Object.keys(t)[0], r = { [n]: 1 }, i = Object.keys(t).reduce((e, t) => t === n ? e : {
+			}, {}), t), {}), n = Object.keys(t)[0], i = { [n]: 1 }, a = Object.keys(t).reduce((e, t) => t === n ? e : {
 				...e,
 				[t]: 1
-			}, {}), o = /* @__PURE__ */ a((e) => {
-				let n = { [e]: [0, 0] }, a = [e];
-				for (; a.length > 0;) {
-					let e = a.shift();
+			}, {}), o = /* @__PURE__ */ r((e) => {
+				let n = { [e]: [0, 0] }, r = [e];
+				for (; r.length > 0;) {
+					let e = r.shift();
 					if (e) {
-						r[e] = 1, delete i[e];
+						i[e] = 1, delete a[e];
 						let o = t[e], [s, c] = n[e];
 						Object.entries(o).forEach(([e, t]) => {
-							r[t] || (n[t] = V([s, c], e), a.push(t));
+							i[t] || (n[t] = V([s, c], e), r.push(t));
 						});
 					}
 				}
 				return n;
 			}, "BFS"), s = [o(n)];
-			for (; Object.keys(i).length > 0;) s.push(o(Object.keys(i)[0]));
+			for (; Object.keys(a).length > 0;) s.push(o(Object.keys(a)[0]));
 			this.dataStructures = {
 				adjList: t,
 				spatialMaps: s,
@@ -3565,15 +3570,15 @@ var D = /* @__PURE__ */ t(((e, t) => {
 		return this.elements[e];
 	}
 	getConfig() {
-		return r({
+		return v({
 			...W,
-			...v().architecture
+			...u().architecture
 		});
 	}
 	getConfigField(e) {
 		return this.getConfig()[e];
 	}
-}, ie = /* @__PURE__ */ a((e, t) => {
+}, ie = /* @__PURE__ */ r((e, t) => {
 	w(e, t), e.groups.map((e) => t.addGroup(e)), e.services.map((e) => t.addService({
 		...e,
 		type: "service"
@@ -3583,14 +3588,14 @@ var D = /* @__PURE__ */ t(((e, t) => {
 	})), e.edges.map((e) => t.addEdge(e));
 }, "populateDb"), K = {
 	parser: { yy: void 0 },
-	parse: /* @__PURE__ */ a(async (e) => {
+	parse: /* @__PURE__ */ r(async (e) => {
 		let t = await T("architecture", e);
-		o.debug(t);
+		i.debug(t);
 		let n = K.parser?.yy;
 		if (!(n instanceof G)) throw Error("parser.parser?.yy was not a ArchitectureDB. This is due to a bug within Mermaid, please report this issue at https://github.com/mermaid-js/mermaid/issues.");
 		ie(t, n);
 	}, "parse")
-}, q = /* @__PURE__ */ a((e) => `
+}, q = /* @__PURE__ */ r((e) => `
   .edge {
     stroke-width: ${e.archEdgeWidth};
     stroke: ${e.archEdgeColor};
@@ -3621,7 +3626,7 @@ var D = /* @__PURE__ */ t(((e, t) => {
     display: -webkit-box;
     -webkit-box-orient: vertical;
   }
-`, "getStyles"), J = /* @__PURE__ */ a((e) => `<g><rect width="80" height="80" style="fill: #087ebf; stroke-width: 0px;"/>${e}</g>`, "wrapIcon"), Y = {
+`, "getStyles"), J = /* @__PURE__ */ r((e) => `<g><rect width="80" height="80" style="fill: #087ebf; stroke-width: 0px;"/>${e}</g>`, "wrapIcon"), Y = {
 	prefix: "mermaid-architecture",
 	height: 80,
 	width: 80,
@@ -3634,30 +3639,30 @@ var D = /* @__PURE__ */ t(((e, t) => {
 		unknown: b,
 		blank: { body: J("") }
 	}
-}, ae = /* @__PURE__ */ a(async function(e, t, n) {
-	let r = n.getConfigField("padding"), a = n.getConfigField("iconSize"), o = a / 2, s = a / 6, c = s / 2;
+}, ae = /* @__PURE__ */ r(async function(e, t, n, r) {
+	let i = n.getConfigField("padding"), a = n.getConfigField("iconSize"), o = a / 2, s = a / 6, c = s / 2;
 	await Promise.all(t.edges().map(async (t) => {
-		let { source: a, sourceDir: l, sourceArrow: u, sourceGroup: d, target: f, targetDir: p, targetArrow: m, targetGroup: g, label: _ } = re(t), { x: v, y } = t[0].sourceEndpoint(), { x: b, y: x } = t[0].midpoint(), { x: C, y: w } = t[0].targetEndpoint(), T = r + 4;
-		if (d && (F(l) ? v += l === "L" ? -T : T : y += l === "T" ? -T : T + 18), g && (F(p) ? C += p === "L" ? -T : T : w += p === "T" ? -T : T + 18), !d && n.getNode(a)?.type === "junction" && (F(l) ? v += l === "L" ? o : -o : y += l === "T" ? o : -o), !g && n.getNode(f)?.type === "junction" && (F(p) ? C += p === "L" ? o : -o : w += p === "T" ? o : -o), t[0]._private.rscratch) {
+		let { source: a, sourceDir: l, sourceArrow: u, sourceGroup: d, target: f, targetDir: p, targetArrow: h, targetGroup: g, label: v } = re(t), { x: y, y: b } = t[0].sourceEndpoint(), { x, y: C } = t[0].midpoint(), { x: w, y: T } = t[0].targetEndpoint(), E = i + 4;
+		if (d && (F(l) ? y += l === "L" ? -E : E : b += l === "T" ? -E : E + 18), g && (F(p) ? w += p === "L" ? -E : E : T += p === "T" ? -E : E + 18), !d && n.getNode(a)?.type === "junction" && (F(l) ? y += l === "L" ? o : -o : b += l === "T" ? o : -o), !g && n.getNode(f)?.type === "junction" && (F(p) ? w += p === "L" ? o : -o : T += p === "T" ? o : -o), t[0]._private.rscratch) {
 			let t = e.insert("g");
-			if (t.insert("path").attr("d", `M ${v},${y} L ${b},${x} L${C},${w} `).attr("class", "edge").attr("id", i(a, f, { prefix: "L" })), u) {
-				let e = F(l) ? M[l](v, s) : v - c, n = I(l) ? M[l](y, s) : y - c;
+			if (t.insert("path").attr("d", `M ${y},${b} L ${x},${C} L${w},${T} `).attr("class", "edge").attr("id", `${r}-${_(a, f, { prefix: "L" })}`), u) {
+				let e = F(l) ? M[l](y, s) : y - c, n = I(l) ? M[l](b, s) : b - c;
 				t.insert("polygon").attr("points", j[l](s)).attr("transform", `translate(${e},${n})`).attr("class", "arrow");
 			}
-			if (m) {
-				let e = F(p) ? M[p](C, s) : C - c, n = I(p) ? M[p](w, s) : w - c;
+			if (h) {
+				let e = F(p) ? M[p](w, s) : w - c, n = I(p) ? M[p](T, s) : T - c;
 				t.insert("polygon").attr("points", j[p](s)).attr("transform", `translate(${e},${n})`).attr("class", "arrow");
 			}
-			if (_) {
+			if (v) {
 				let e = L(l, p) ? "XY" : F(l) ? "X" : "Y", n = 0;
-				n = e === "X" ? Math.abs(v - C) : e === "Y" ? Math.abs(y - w) / 1.5 : Math.abs(v - C) / 2;
+				n = e === "X" ? Math.abs(y - w) : e === "Y" ? Math.abs(b - T) / 1.5 : Math.abs(y - w) / 2;
 				let r = t.append("g");
-				if (await S(r, _, {
+				if (await S(r, v, {
 					useHtmlLabels: !1,
 					width: n,
 					classes: "architecture-service-label"
-				}, h()), r.attr("dy", "1em").attr("alignment-baseline", "middle").attr("dominant-baseline", "middle").attr("text-anchor", "middle"), e === "X") r.attr("transform", "translate(" + b + ", " + x + ")");
-				else if (e === "Y") r.attr("transform", "translate(" + b + ", " + x + ") rotate(-90)");
+				}, m()), r.attr("dy", "1em").attr("alignment-baseline", "middle").attr("dominant-baseline", "middle").attr("text-anchor", "middle"), e === "X") r.attr("transform", "translate(" + x + ", " + C + ")");
+				else if (e === "Y") r.attr("transform", "translate(" + x + ", " + C + ") rotate(-90)");
 				else if (e === "XY") {
 					let e = B(l, p);
 					if (e && R(e)) {
@@ -3665,7 +3670,7 @@ var D = /* @__PURE__ */ t(((e, t) => {
 						r.attr("dominant-baseline", "auto").attr("transform", `rotate(${-1 * n * i * 45})`);
 						let a = r.node().getBoundingClientRect();
 						r.attr("transform", `
-                translate(${b}, ${x - t.height / 2})
+                translate(${x}, ${C - t.height / 2})
                 translate(${n * a.width / 2}, ${i * a.height / 2})
                 rotate(${-1 * n * i * 45}, 0, ${t.height / 2})
               `);
@@ -3674,71 +3679,71 @@ var D = /* @__PURE__ */ t(((e, t) => {
 			}
 		}
 	}));
-}, "drawEdges"), X = /* @__PURE__ */ a(async function(e, t, n) {
-	let r = n.getConfigField("padding") * .75, i = n.getConfigField("fontSize"), a = n.getConfigField("iconSize") / 2;
+}, "drawEdges"), X = /* @__PURE__ */ r(async function(e, t, n, r) {
+	let i = n.getConfigField("padding") * .75, a = n.getConfigField("fontSize"), o = n.getConfigField("iconSize") / 2;
 	await Promise.all(t.nodes().map(async (t) => {
-		let o = U(t);
-		if (o.type === "group") {
-			let { h: s, w: c, x1: l, y1: u } = t.boundingBox(), d = e.append("rect");
-			d.attr("id", `group-${o.id}`).attr("x", l + a).attr("y", u + a).attr("width", c).attr("height", s).attr("class", "node-bkg");
-			let f = e.append("g"), p = l, m = u;
-			if (o.icon) {
-				let e = f.append("g");
-				e.html(`<g>${await C(o.icon, {
-					height: r,
-					width: r,
+		let s = U(t);
+		if (s.type === "group") {
+			let { h: c, w: l, x1: u, y1: d } = t.boundingBox(), f = e.append("rect");
+			f.attr("id", `${r}-group-${s.id}`).attr("x", u + o).attr("y", d + o).attr("width", l).attr("height", c).attr("class", "node-bkg");
+			let p = e.append("g"), h = u, g = d;
+			if (s.icon) {
+				let e = p.append("g");
+				e.html(`<g>${await C(s.icon, {
+					height: i,
+					width: i,
 					fallbackPrefix: Y.prefix
-				})}</g>`), e.attr("transform", "translate(" + (p + a + 1) + ", " + (m + a + 1) + ")"), p += r, m += i / 2 - 1 - 2;
+				})}</g>`), e.attr("transform", "translate(" + (h + o + 1) + ", " + (g + o + 1) + ")"), h += i, g += a / 2 - 1 - 2;
 			}
-			if (o.label) {
-				let e = f.append("g");
-				await S(e, o.label, {
+			if (s.label) {
+				let e = p.append("g");
+				await S(e, s.label, {
 					useHtmlLabels: !1,
-					width: c,
+					width: l,
 					classes: "architecture-service-label"
-				}, h()), e.attr("dy", "1em").attr("alignment-baseline", "middle").attr("dominant-baseline", "start").attr("text-anchor", "start"), e.attr("transform", "translate(" + (p + a + 4) + ", " + (m + a + 2) + ")");
+				}, m()), e.attr("dy", "1em").attr("alignment-baseline", "middle").attr("dominant-baseline", "start").attr("text-anchor", "start"), e.attr("transform", "translate(" + (h + o + 4) + ", " + (g + o + 2) + ")");
 			}
-			n.setElementForId(o.id, d);
+			n.setElementForId(s.id, f);
 		}
 	}));
-}, "drawGroups"), oe = /* @__PURE__ */ a(async function(e, t, n) {
-	let r = h();
-	for (let i of n) {
-		let n = t.append("g"), a = e.getConfigField("iconSize");
-		if (i.title) {
+}, "drawGroups"), oe = /* @__PURE__ */ r(async function(e, t, n, r) {
+	let i = m();
+	for (let a of n) {
+		let n = t.append("g"), o = e.getConfigField("iconSize");
+		if (a.title) {
 			let e = n.append("g");
-			await S(e, i.title, {
+			await S(e, a.title, {
 				useHtmlLabels: !1,
-				width: a * 1.5,
+				width: o * 1.5,
 				classes: "architecture-service-label"
-			}, r), e.attr("dy", "1em").attr("alignment-baseline", "middle").attr("dominant-baseline", "middle").attr("text-anchor", "middle"), e.attr("transform", "translate(" + a / 2 + ", " + a + ")");
+			}, i), e.attr("dy", "1em").attr("alignment-baseline", "middle").attr("dominant-baseline", "middle").attr("text-anchor", "middle"), e.attr("transform", "translate(" + o / 2 + ", " + o + ")");
 		}
-		let o = n.append("g");
-		if (i.icon) o.html(`<g>${await C(i.icon, {
-			height: a,
-			width: a,
+		let s = n.append("g");
+		if (a.icon) s.html(`<g>${await C(a.icon, {
+			height: o,
+			width: o,
 			fallbackPrefix: Y.prefix
 		})}</g>`);
-		else if (i.iconText) {
-			o.html(`<g>${await C("blank", {
-				height: a,
-				width: a,
+		else if (a.iconText) {
+			s.html(`<g>${await C("blank", {
+				height: o,
+				width: o,
 				fallbackPrefix: Y.prefix
 			})}</g>`);
-			let e = o.append("g").append("foreignObject").attr("width", a).attr("height", a).append("div").attr("class", "node-icon-text").attr("style", `height: ${a}px;`).append("div").html(u(i.iconText, r)), t = parseInt(window.getComputedStyle(e.node(), null).getPropertyValue("font-size").replace(/\D/g, "")) ?? 16;
-			e.attr("style", `-webkit-line-clamp: ${Math.floor((a - 2) / t)};`);
-		} else o.append("path").attr("class", "node-bkg").attr("id", "node-" + i.id).attr("d", `M0,${a} V5 Q0,0 5,0 H${a - 5} Q${a},0 ${a},5 V${a} Z`);
-		n.attr("id", `service-${i.id}`).attr("class", "architecture-service");
-		let { width: s, height: c } = n.node().getBBox();
-		i.width = s, i.height = c, e.setElementForId(i.id, n);
+			let e = s.append("g").append("foreignObject").attr("width", o).attr("height", o).append("div").attr("class", "node-icon-text").attr("style", `height: ${o}px;`).append("div").html(g(a.iconText, i)), t = parseInt(window.getComputedStyle(e.node(), null).getPropertyValue("font-size").replace(/\D/g, "")) ?? 16;
+			e.attr("style", `-webkit-line-clamp: ${Math.floor((o - 2) / t)};`);
+		} else s.append("path").attr("class", "node-bkg").attr("id", `${r}-node-${a.id}`).attr("d", `M0,${o} V5 Q0,0 5,0 H${o - 5} Q${o},0 ${o},5 V${o} Z`);
+		n.attr("id", `${r}-service-${a.id}`).attr("class", "architecture-service");
+		let { width: c, height: l } = n.node().getBBox();
+		a.width = c, a.height = l, e.setElementForId(a.id, n);
 	}
 	return 0;
-}, "drawServices"), Z = /* @__PURE__ */ a(function(e, t, n) {
+}, "drawServices"), Z = /* @__PURE__ */ r(function(e, t, n, r) {
 	n.forEach((n) => {
-		let r = t.append("g"), i = e.getConfigField("iconSize");
-		r.append("g").append("rect").attr("id", "node-" + n.id).attr("fill-opacity", "0").attr("width", i).attr("height", i), r.attr("class", "architecture-junction");
-		let { width: a, height: o } = r._groups[0][0].getBBox();
-		r.width = a, r.height = o, e.setElementForId(n.id, r);
+		let i = t.append("g"), a = e.getConfigField("iconSize");
+		i.append("g").append("rect").attr("id", `${r}-node-${n.id}`).attr("fill-opacity", "0").attr("width", a).attr("height", a), i.attr("class", "architecture-junction");
+		let { width: o, height: s } = i._groups[0][0].getBBox();
+		i.width = o, i.height = s, e.setElementForId(n.id, i);
 	});
 }, "drawJunctions");
 x([{
@@ -3762,7 +3767,7 @@ function se(e, t, n) {
 		});
 	});
 }
-a(se, "addServices");
+r(se, "addServices");
 function ce(e, t, n) {
 	e.forEach((e) => {
 		t.add({
@@ -3778,14 +3783,14 @@ function ce(e, t, n) {
 		});
 	});
 }
-a(ce, "addJunctions");
+r(ce, "addJunctions");
 function le(e, t) {
 	t.nodes().map((t) => {
 		let n = U(t);
 		n.type !== "group" && (n.x = t.position().x, n.y = t.position().y, e.getElementById(n.id).attr("transform", "translate(" + (n.x || 0) + "," + (n.y || 0) + ")"));
 	});
 }
-a(le, "positionNodes");
+r(le, "positionNodes");
 function ue(e, t) {
 	e.forEach((e) => {
 		t.add({
@@ -3801,7 +3806,7 @@ function ue(e, t) {
 		});
 	});
 }
-a(ue, "addGroups");
+r(ue, "addGroups");
 function de(e, t) {
 	e.forEach((e) => {
 		let { lhsId: n, rhsId: r, lhsInto: i, lhsGroup: a, rhsInto: o, lhsDir: s, rhsDir: c, rhsGroup: l, title: u } = e, d = L(e.lhsDir, e.rhsDir) ? "segments" : "straight", f = {
@@ -3825,9 +3830,9 @@ function de(e, t) {
 		});
 	});
 }
-a(de, "addEdges");
+r(de, "addEdges");
 function fe(e, t, n) {
-	let r = /* @__PURE__ */ a((e, t) => Object.entries(e).reduce((e, [r, i]) => {
+	let i = /* @__PURE__ */ r((e, t) => Object.entries(e).reduce((e, [r, i]) => {
 		let a = 0, o = Object.entries(i);
 		if (o.length === 1) return e[r] = o[0][1], e;
 		for (let i = 0; i < o.length - 1; i++) for (let s = i + 1; s < o.length; s++) {
@@ -3850,26 +3855,26 @@ function fe(e, t, n) {
 			}
 		}
 		return e;
-	}, {}), "flattenAlignments"), [i, o] = t.map((t) => {
-		let n = {}, i = {};
-		return Object.entries(t).forEach(([t, [r, a]]) => {
+	}, {}), "flattenAlignments"), [a, o] = t.map((t) => {
+		let n = {}, r = {};
+		return Object.entries(t).forEach(([t, [i, a]]) => {
 			let o = e.getNode(t)?.in ?? "default";
-			n[a] ??= {}, n[a][o] ??= [], n[a][o].push(t), i[r] ??= {}, i[r][o] ??= [], i[r][o].push(t);
+			n[a] ??= {}, n[a][o] ??= [], n[a][o].push(t), r[i] ??= {}, r[i][o] ??= [], r[i][o].push(t);
 		}), {
-			horiz: Object.values(r(n, "horizontal")).filter((e) => e.length > 1),
-			vert: Object.values(r(i, "vertical")).filter((e) => e.length > 1)
+			horiz: Object.values(i(n, "horizontal")).filter((e) => e.length > 1),
+			vert: Object.values(i(r, "vertical")).filter((e) => e.length > 1)
 		};
 	}).reduce(([e, t], { horiz: n, vert: r }) => [[...e, ...n], [...t, ...r]], [[], []]);
 	return {
-		horizontal: i,
+		horizontal: a,
 		vertical: o
 	};
 }
-a(fe, "getAlignments");
+r(fe, "getAlignments");
 function pe(e, t) {
-	let n = [], r = /* @__PURE__ */ a((e) => `${e[0]},${e[1]}`, "posToStr"), i = /* @__PURE__ */ a((e) => e.split(",").map((e) => parseInt(e)), "strToPos");
+	let n = [], i = /* @__PURE__ */ r((e) => `${e[0]},${e[1]}`, "posToStr"), a = /* @__PURE__ */ r((e) => e.split(",").map((e) => parseInt(e)), "strToPos");
 	return e.forEach((e) => {
-		let a = Object.fromEntries(Object.entries(e).map(([e, t]) => [r(t), e])), o = [r([0, 0])], s = {}, c = {
+		let r = Object.fromEntries(Object.entries(e).map(([e, t]) => [i(t), e])), o = [i([0, 0])], s = {}, c = {
 			L: [-1, 0],
 			R: [1, 0],
 			T: [0, 1],
@@ -3879,11 +3884,11 @@ function pe(e, t) {
 			let e = o.shift();
 			if (e) {
 				s[e] = 1;
-				let l = a[e];
+				let l = r[e];
 				if (l) {
-					let u = i(e);
-					Object.entries(c).forEach(([e, i]) => {
-						let c = r([u[0] + i[0], u[1] + i[1]]), d = a[c];
+					let u = a(e);
+					Object.entries(c).forEach(([e, a]) => {
+						let c = i([u[0] + a[0], u[1] + a[1]]), d = r[c];
 						d && !s[c] && (o.push(c), n.push({
 							[A[e]]: d,
 							[A[N(e)]]: l,
@@ -3895,8 +3900,8 @@ function pe(e, t) {
 		}
 	}), n;
 }
-a(pe, "getRelativeConstraints");
-function me(e, t, r, i, s, { spatialMaps: c, groupAlignments: l }) {
+r(pe, "getRelativeConstraints");
+function me(e, t, a, o, s, { spatialMaps: c, groupAlignments: l }) {
 	return new Promise((u) => {
 		let d = n("body").append("div").attr("id", "cy").attr("style", "display:none"), f = E({
 			container: document.getElementById("cy"),
@@ -3905,11 +3910,14 @@ function me(e, t, r, i, s, { spatialMaps: c, groupAlignments: l }) {
 					selector: "edge",
 					style: {
 						"curve-style": "straight",
-						label: "data(label)",
 						"source-endpoint": "data(sourceEndpoint)",
 						"target-endpoint": "data(targetEndpoint)"
 					}
 				},
+				{
+					selector: "edge[label]",
+					style: { label: "data(label)" }
+				},
 				{
 					selector: "edge.segments",
 					style: {
@@ -3963,25 +3971,28 @@ function me(e, t, r, i, s, { spatialMaps: c, groupAlignments: l }) {
 				}
 			}
 		});
-		d.remove(), ue(r, f), se(e, f, s), ce(t, f, s), de(i, f);
-		let p = fe(s, c, l), m = pe(c, s), h = f.layout({
+		d.remove(), ue(a, f), se(e, f, s), ce(t, f, s), de(o, f);
+		let p = fe(s, c, l), m = pe(c, s), h = s.getConfigField("iconSize"), g = s.getConfigField("idealEdgeLengthMultiplier") * h, _ = .5 * h, v = s.getConfigField("edgeElasticity"), y = f.layout({
 			name: "fcose",
 			quality: "proof",
+			randomize: s.getConfigField("randomize"),
+			nodeSeparation: s.getConfigField("nodeSeparation"),
+			numIter: s.getConfigField("numIter"),
 			styleEnabled: !1,
 			animate: !1,
 			nodeDimensionsIncludeLabels: !1,
 			idealEdgeLength(e) {
 				let [t, n] = e.connectedNodes(), { parent: r } = U(t), { parent: i } = U(n);
-				return r === i ? 1.5 * s.getConfigField("iconSize") : .5 * s.getConfigField("iconSize");
+				return r === i ? g : _;
 			},
 			edgeElasticity(e) {
 				let [t, n] = e.connectedNodes(), { parent: r } = U(t), { parent: i } = U(n);
-				return r === i ? .45 : .001;
+				return r === i ? v : .001;
 			},
 			alignmentConstraint: p,
 			relativePlacementConstraint: m
 		});
-		h.one("layoutstop", () => {
+		y.one("layoutstop", () => {
 			function e(e, t, n, r) {
 				let i, a, { x: o, y: s } = e, { x: c, y: l } = t;
 				a = (r - s + (o - n) * (s - l) / (o - c)) / Math.sqrt(1 + ((s - l) / (o - c)) ** 2), i = Math.sqrt((r - s) ** 2 + (n - o) ** 2 - a ** 2);
@@ -4010,7 +4021,7 @@ function me(e, t, r, i, s, { spatialMaps: c, groupAlignments: l }) {
 					weights: i
 				};
 			}
-			a(e, "getSegmentWeights"), f.startBatch();
+			r(e, "getSegmentWeights"), f.startBatch();
 			for (let t of Object.values(f.edges())) if (t.data?.()) {
 				let { x: n, y: r } = t.source().position(), { x: i, y: a } = t.target().position();
 				if (n !== i && r !== a) {
@@ -4018,31 +4029,33 @@ function me(e, t, r, i, s, { spatialMaps: c, groupAlignments: l }) {
 					t.style("segment-distances", c), t.style("segment-weights", s);
 				}
 			}
-			f.endBatch(), h.run();
-		}), h.run(), f.ready((e) => {
-			o.info("Ready", e), u(f);
+			f.endBatch(), y.run();
+		}), y.run(), f.ready((e) => {
+			i.info("Ready", e), u(f);
 		});
 	});
 }
-a(me, "layoutArchitecture");
+r(me, "layoutArchitecture");
 var he = {
 	parser: K,
 	get db() {
 		return new G();
 	},
-	renderer: { draw: /* @__PURE__ */ a(async (e, t, n, r) => {
-		let i = r.db, a = i.getServices(), o = i.getJunctions(), s = i.getGroups(), c = i.getEdges(), u = i.getDataStructures(), d = y(t), f = d.append("g");
+	renderer: { draw: /* @__PURE__ */ r(async (e, t, n, r) => {
+		let i = r.db;
+		i.setDiagramId(t);
+		let a = i.getServices(), s = i.getJunctions(), c = i.getGroups(), l = i.getEdges(), u = i.getDataStructures(), d = y(t), f = d.append("g");
 		f.attr("class", "architecture-edges");
 		let p = d.append("g");
 		p.attr("class", "architecture-services");
 		let m = d.append("g");
-		m.attr("class", "architecture-groups"), await oe(i, p, a), Z(i, p, o);
-		let h = await me(a, o, s, c, i, u);
-		await ae(f, h, i), await X(m, h, i), le(i, h), l(void 0, d, i.getConfigField("padding"), i.getConfigField("useMaxWidth"));
+		m.attr("class", "architecture-groups"), await oe(i, p, a, t), Z(i, p, s, t);
+		let h = await me(a, s, c, l, i, u);
+		await ae(f, h, i, t), await X(m, h, i, t), le(i, h), o(void 0, d, i.getConfigField("padding"), i.getConfigField("useMaxWidth"));
 	}, "draw") },
 	styles: q
 };
 //#endregion
 export { he as diagram };
 
-//# sourceMappingURL=architectureDiagram-2XIMDMQ5-D5q0ma9h.js.map
+//# sourceMappingURL=architectureDiagram-3BPJPVTR-cYFnhp15.js.map