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

package/dist/{chunk-WL4C6EOR-BV-op7zg.js → chunk-727SXJPM-kowsFLrz.js}

@@ -1,28 +1,28 @@
-import { t as e } from "./purify.es-Dsqc2y0I.js";
-import { w as t } from "./src-D1EMXotX.js";
-import { h as n, s as r } from "./chunk-GEFDOKGD-DGJJEGSm.js";
-import { n as i, r as a } from "./src-BhNgmpel.js";
-import { B as o, C as s, L as c, V as l, W as u, _ as d, a as f, b as p, j as m, s as h, v as g } from "./chunk-7R4GIKGN-DJmroLCH.js";
-import { t as _ } from "./chunk-FMBD7UC4-1IxrpdPX.js";
-import { t as v } from "./chunk-JSJVCQXG-Do17yYig.js";
-import { t as y } from "./chunk-55IACEB6-DZ-UBhHX.js";
-import { t as b } from "./chunk-KX2RTZJC-d9jFqUAY.js";
-import { r as x, t as S } from "./chunk-GLR3WWYH-BDwmgwCA.js";
-//#region node_modules/mermaid/dist/chunks/mermaid.core/chunk-WL4C6EOR.mjs
+import { w as e } from "./src-CWnvxuyh.js";
+import { t } from "./purify.es-Dsqc2y0I.js";
+import { n, r } from "./src-DngnQkx_.js";
+import { H as i, K as a, M as o, U as s, a as c, s as l, v as u, w as d, x as f, y as p, z as m } from "./chunk-CSCIHK7Q-DyRIc27i.js";
+import { c as h, g } from "./chunk-5ZQYHXKU-CjOcwRY6.js";
+import { t as _ } from "./chunk-FMBD7UC4-IdpWVRCU.js";
+import { t as v } from "./chunk-ND2GUHAM-Boh7GenS.js";
+import { t as y } from "./chunk-55IACEB6-CuKbiO89.js";
+import { t as b } from "./chunk-2J33WTMH-BKsVIUnb.js";
+import { r as x, t as S } from "./chunk-LZXEDZCA-BO_GpQSR.js";
+//#region node_modules/mermaid/dist/chunks/mermaid.core/chunk-727SXJPM.mjs
 var C = (function() {
-	var e = /* @__PURE__ */ i(function(e, t, n, r) {
+	var e = /* @__PURE__ */ n(function(e, t, n, r) {
 		for (n ||= {}, r = e.length; r--; n[e[r]] = t);
 		return n;
-	}, "o"), t = [1, 18], n = [1, 19], r = [1, 20], a = [1, 41], o = [1, 42], s = [1, 26], c = [1, 24], l = [1, 25], u = [1, 32], d = [1, 33], f = [1, 34], p = [1, 45], m = [1, 35], h = [1, 36], g = [1, 37], _ = [1, 38], v = [1, 27], y = [1, 28], b = [1, 29], x = [1, 30], S = [1, 31], C = [1, 44], w = [1, 46], T = [1, 43], E = [1, 47], D = [1, 9], O = [
+	}, "o"), t = [1, 18], r = [1, 19], i = [1, 20], a = [1, 41], o = [1, 26], s = [1, 42], c = [1, 24], l = [1, 25], u = [1, 32], d = [1, 33], f = [1, 34], p = [1, 45], m = [1, 35], h = [1, 36], g = [1, 37], _ = [1, 38], v = [1, 27], y = [1, 28], b = [1, 29], x = [1, 30], S = [1, 31], C = [1, 44], w = [1, 46], T = [1, 43], E = [1, 47], D = [1, 9], O = [
 		1,
 		8,
 		9
-	], k = [1, 58], A = [1, 59], j = [1, 60], M = [1, 61], N = [1, 62], ee = [1, 63], P = [1, 64], F = [
+	], k = [1, 58], A = [1, 59], j = [1, 60], M = [1, 61], N = [1, 62], P = [1, 63], ee = [1, 64], F = [
 		1,
 		8,
 		9,
 		41
-	], te = [1, 76], I = [
+	], te = [1, 77], I = [
 		1,
 		8,
 		9,
@@ -32,6 +32,7 @@ var C = (function() {
 		39,
 		41,
 		44,
+		46,
 		68,
 		69,
 		70,
@@ -53,7 +54,8 @@ var C = (function() {
 		39,
 		41,
 		44,
-		50,
+		46,
+		47,
 		60,
 		68,
 		69,
@@ -96,9 +98,9 @@ var C = (function() {
 		100,
 		102,
 		103
-	], B = [1, 101], V = [1, 118], H = [1, 114], U = [1, 110], W = [1, 116], G = [1, 111], K = [1, 112], q = [1, 113], J = [1, 115], Y = [1, 117], re = [
+	], B = [1, 103], V = [1, 121], H = [1, 117], U = [1, 113], W = [1, 119], G = [1, 114], K = [1, 115], q = [1, 116], J = [1, 118], Y = [1, 120], re = [
 		22,
-		48,
+		50,
 		60,
 		61,
 		82,
@@ -107,19 +109,20 @@ var C = (function() {
 		88,
 		89,
 		90
-	], X = [
+	], ie = [1, 128], X = [12, 39], ae = [
 		1,
 		8,
 		9,
 		39,
 		41,
-		44
+		44,
+		46
 	], Z = [
 		1,
 		8,
 		9,
 		22
-	], ie = [1, 147], ae = [
+	], oe = [1, 153], se = [
 		1,
 		8,
 		9,
@@ -129,7 +132,7 @@ var C = (function() {
 		8,
 		9,
 		22,
-		48,
+		50,
 		60,
 		61,
 		82,
@@ -138,8 +141,8 @@ var C = (function() {
 		88,
 		89,
 		90
-	], oe = {
-		trace: /* @__PURE__ */ i(function() {}, "trace"),
+	], ce = {
+		trace: /* @__PURE__ */ n(function() {}, "trace"),
 		yy: {},
 		symbols_: {
 			error: 2,
@@ -186,11 +189,11 @@ var C = (function() {
 			classIdentifier: 43,
 			STYLE_SEPARATOR: 44,
 			members: 45,
-			CLASS: 46,
-			emptyBody: 47,
-			SPACE: 48,
-			ANNOTATION_START: 49,
-			ANNOTATION_END: 50,
+			ANNOTATION_START: 46,
+			ANNOTATION_END: 47,
+			CLASS: 48,
+			emptyBody: 49,
+			SPACE: 50,
 			MEMBER: 51,
 			SEPARATOR: 52,
 			relation: 53,
@@ -267,10 +270,10 @@ var C = (function() {
 			41: "STRUCT_STOP",
 			42: "NAMESPACE",
 			44: "STYLE_SEPARATOR",
-			46: "CLASS",
-			48: "SPACE",
-			49: "ANNOTATION_START",
-			50: "ANNOTATION_END",
+			46: "ANNOTATION_START",
+			47: "ANNOTATION_END",
+			48: "CLASS",
+			50: "SPACE",
 			51: "MEMBER",
 			52: "SEPARATOR",
 			54: "NOTE_FOR",
@@ -352,6 +355,10 @@ var C = (function() {
 			[23, 4],
 			[23, 5],
 			[38, 2],
+			[38, 3],
+			[40, 1],
+			[40, 2],
+			[40, 3],
 			[40, 1],
 			[40, 2],
 			[40, 3],
@@ -363,11 +370,14 @@ var C = (function() {
 			[24, 4],
 			[24, 3],
 			[24, 6],
+			[24, 4],
+			[24, 7],
+			[24, 6],
 			[43, 2],
 			[43, 3],
-			[47, 0],
-			[47, 2],
-			[47, 2],
+			[49, 0],
+			[49, 2],
+			[49, 2],
 			[26, 4],
 			[45, 1],
 			[45, 2],
@@ -448,7 +458,7 @@ var C = (function() {
 			[17, 1],
 			[55, 1]
 		],
-		performAction: /* @__PURE__ */ i(function(e, t, n, r, i, a, o) {
+		performAction: /* @__PURE__ */ n(function(e, t, n, r, i, a, o) {
 			var s = a.length - 1;
 			switch (i) {
 				case 8:
@@ -486,64 +496,83 @@ var C = (function() {
 					this.$ = a[s].trim(), r.setAccDescription(this.$);
 					break;
 				case 34:
-					r.addClassesToNamespace(a[s - 3], a[s - 1][0], a[s - 1][1]);
+					r.addClassesToNamespace(a[s - 3], a[s - 1][0], a[s - 1][1]), r.popNamespace();
 					break;
 				case 35:
-					r.addClassesToNamespace(a[s - 4], a[s - 1][0], a[s - 1][1]);
+					r.addClassesToNamespace(a[s - 4], a[s - 1][0], a[s - 1][1]), r.popNamespace();
 					break;
 				case 36:
-					this.$ = a[s], r.addNamespace(a[s]);
+					this.$ = r.addNamespace(a[s]);
 					break;
 				case 37:
-					this.$ = [[a[s]], []];
+					this.$ = r.addNamespace(a[s - 1], a[s]);
 					break;
 				case 38:
-					this.$ = [[a[s - 1]], []];
+					this.$ = [[a[s]], []];
 					break;
 				case 39:
-					a[s][0].unshift(a[s - 2]), this.$ = a[s];
+					this.$ = [[a[s - 1]], []];
 					break;
 				case 40:
-					this.$ = [[], [a[s]]];
+					a[s][0].unshift(a[s - 2]), this.$ = a[s];
 					break;
 				case 41:
-					this.$ = [[], [a[s - 1]]];
+					this.$ = [[], [a[s]]];
 					break;
 				case 42:
+					this.$ = [[], [a[s - 1]]];
+					break;
+				case 43:
 					a[s][1].unshift(a[s - 2]), this.$ = a[s];
 					break;
 				case 44:
+				case 45:
+					this.$ = [[], []];
+					break;
+				case 46:
+					this.$ = a[s];
+					break;
+				case 48:
 					r.setCssClass(a[s - 2], a[s]);
 					break;
-				case 45:
+				case 49:
 					r.addMembers(a[s - 3], a[s - 1]);
 					break;
-				case 47:
+				case 51:
 					r.setCssClass(a[s - 5], a[s - 3]), r.addMembers(a[s - 5], a[s - 1]);
 					break;
-				case 48:
+				case 52:
+					r.addAnnotation(a[s - 3], a[s - 1]);
+					break;
+				case 53:
+					r.addAnnotation(a[s - 6], a[s - 4]), r.addMembers(a[s - 6], a[s - 1]);
+					break;
+				case 54:
+					r.addAnnotation(a[s - 5], a[s - 3]);
+					break;
+				case 55:
 					this.$ = a[s], r.addClass(a[s]);
 					break;
-				case 49:
+				case 56:
 					this.$ = a[s - 1], r.addClass(a[s - 1]), r.setClassLabel(a[s - 1], a[s]);
 					break;
-				case 53:
+				case 60:
 					r.addAnnotation(a[s], a[s - 2]);
 					break;
-				case 54:
-				case 67:
+				case 61:
+				case 74:
 					this.$ = [a[s]];
 					break;
-				case 55:
+				case 62:
 					a[s].push(a[s - 1]), this.$ = a[s];
 					break;
-				case 56: break;
-				case 57:
+				case 63: break;
+				case 64:
 					r.addMember(a[s - 1], r.cleanupLabel(a[s]));
 					break;
-				case 58: break;
-				case 59: break;
-				case 60:
+				case 65: break;
+				case 66: break;
+				case 67:
 					this.$ = {
 						id1: a[s - 2],
 						id2: a[s],
@@ -552,7 +581,7 @@ var C = (function() {
 						relationTitle2: "none"
 					};
 					break;
-				case 61:
+				case 68:
 					this.$ = {
 						id1: a[s - 3],
 						id2: a[s],
@@ -561,7 +590,7 @@ var C = (function() {
 						relationTitle2: "none"
 					};
 					break;
-				case 62:
+				case 69:
 					this.$ = {
 						id1: a[s - 3],
 						id2: a[s],
@@ -570,7 +599,7 @@ var C = (function() {
 						relationTitle2: a[s - 1]
 					};
 					break;
-				case 63:
+				case 70:
 					this.$ = {
 						id1: a[s - 4],
 						id2: a[s],
@@ -579,130 +608,130 @@ var C = (function() {
 						relationTitle2: a[s - 1]
 					};
 					break;
-				case 64:
+				case 71:
 					this.$ = r.addNote(a[s], a[s - 1]);
 					break;
-				case 65:
+				case 72:
 					this.$ = r.addNote(a[s]);
 					break;
-				case 66:
+				case 73:
 					this.$ = a[s - 2], r.defineClass(a[s - 1], a[s]);
 					break;
-				case 68:
+				case 75:
 					this.$ = a[s - 2].concat([a[s]]);
 					break;
-				case 69:
+				case 76:
 					r.setDirection("TB");
 					break;
-				case 70:
+				case 77:
 					r.setDirection("BT");
 					break;
-				case 71:
+				case 78:
 					r.setDirection("RL");
 					break;
-				case 72:
+				case 79:
 					r.setDirection("LR");
 					break;
-				case 73:
+				case 80:
 					this.$ = {
 						type1: a[s - 2],
 						type2: a[s],
 						lineType: a[s - 1]
 					};
 					break;
-				case 74:
+				case 81:
 					this.$ = {
 						type1: "none",
 						type2: a[s],
 						lineType: a[s - 1]
 					};
 					break;
-				case 75:
+				case 82:
 					this.$ = {
 						type1: a[s - 1],
 						type2: "none",
 						lineType: a[s]
 					};
 					break;
-				case 76:
+				case 83:
 					this.$ = {
 						type1: "none",
 						type2: "none",
 						lineType: a[s]
 					};
 					break;
-				case 77:
+				case 84:
 					this.$ = r.relationType.AGGREGATION;
 					break;
-				case 78:
+				case 85:
 					this.$ = r.relationType.EXTENSION;
 					break;
-				case 79:
+				case 86:
 					this.$ = r.relationType.COMPOSITION;
 					break;
-				case 80:
+				case 87:
 					this.$ = r.relationType.DEPENDENCY;
 					break;
-				case 81:
+				case 88:
 					this.$ = r.relationType.LOLLIPOP;
 					break;
-				case 82:
+				case 89:
 					this.$ = r.lineType.LINE;
 					break;
-				case 83:
+				case 90:
 					this.$ = r.lineType.DOTTED_LINE;
 					break;
-				case 84:
-				case 90:
+				case 91:
+				case 97:
 					this.$ = a[s - 2], r.setClickEvent(a[s - 1], a[s]);
 					break;
-				case 85:
-				case 91:
+				case 92:
+				case 98:
 					this.$ = a[s - 3], r.setClickEvent(a[s - 2], a[s - 1]), r.setTooltip(a[s - 2], a[s]);
 					break;
-				case 86:
+				case 93:
 					this.$ = a[s - 2], r.setLink(a[s - 1], a[s]);
 					break;
-				case 87:
+				case 94:
 					this.$ = a[s - 3], r.setLink(a[s - 2], a[s - 1], a[s]);
 					break;
-				case 88:
+				case 95:
 					this.$ = a[s - 3], r.setLink(a[s - 2], a[s - 1]), r.setTooltip(a[s - 2], a[s]);
 					break;
-				case 89:
+				case 96:
 					this.$ = a[s - 4], r.setLink(a[s - 3], a[s - 2], a[s]), r.setTooltip(a[s - 3], a[s - 1]);
 					break;
-				case 92:
+				case 99:
 					this.$ = a[s - 3], r.setClickEvent(a[s - 2], a[s - 1], a[s]);
 					break;
-				case 93:
+				case 100:
 					this.$ = a[s - 4], r.setClickEvent(a[s - 3], a[s - 2], a[s - 1]), r.setTooltip(a[s - 3], a[s]);
 					break;
-				case 94:
+				case 101:
 					this.$ = a[s - 3], r.setLink(a[s - 2], a[s]);
 					break;
-				case 95:
+				case 102:
 					this.$ = a[s - 4], r.setLink(a[s - 3], a[s - 1], a[s]);
 					break;
-				case 96:
+				case 103:
 					this.$ = a[s - 4], r.setLink(a[s - 3], a[s - 1]), r.setTooltip(a[s - 3], a[s]);
 					break;
-				case 97:
+				case 104:
 					this.$ = a[s - 5], r.setLink(a[s - 4], a[s - 2], a[s]), r.setTooltip(a[s - 4], a[s - 1]);
 					break;
-				case 98:
+				case 105:
 					this.$ = a[s - 2], r.setCssStyle(a[s - 1], a[s]);
 					break;
-				case 99:
+				case 106:
 					r.setCssClass(a[s - 1], a[s]);
 					break;
-				case 100:
+				case 107:
 					this.$ = [a[s]];
 					break;
-				case 101:
+				case 108:
 					a[s - 2].push(a[s]), this.$ = a[s - 2];
 					break;
-				case 103:
+				case 110:
 					this.$ = a[s - 1] + a[s];
 					break;
 			}
@@ -730,13 +759,13 @@ var C = (function() {
 				31: 16,
 				32: 17,
 				33: t,
-				35: n,
-				37: r,
+				35: r,
+				37: i,
 				38: 22,
 				42: a,
 				43: 23,
 				46: o,
-				49: s,
+				48: s,
 				51: c,
 				52: l,
 				54: u,
@@ -777,7 +806,7 @@ var C = (function() {
 			{ 34: [1, 51] },
 			{ 36: [1, 52] },
 			e(O, [2, 33]),
-			e(O, [2, 56], {
+			e(O, [2, 63], {
 				53: 53,
 				66: 56,
 				67: 57,
@@ -788,18 +817,19 @@ var C = (function() {
 				70: j,
 				71: M,
 				72: N,
-				73: ee,
-				74: P
+				73: P,
+				74: ee
 			}),
 			{ 39: [1, 65] },
-			e(F, [2, 43], {
+			e(F, [2, 47], {
 				39: [1, 67],
-				44: [1, 66]
+				44: [1, 66],
+				46: [1, 68]
 			}),
-			e(O, [2, 58]),
-			e(O, [2, 59]),
+			e(O, [2, 65]),
+			e(O, [2, 66]),
 			{
-				16: 68,
+				16: 69,
 				60: p,
 				86: C,
 				100: w,
@@ -808,7 +838,7 @@ var C = (function() {
 			{
 				16: 39,
 				17: 40,
-				19: 69,
+				19: 70,
 				60: p,
 				86: C,
 				100: w,
@@ -818,7 +848,7 @@ var C = (function() {
 			{
 				16: 39,
 				17: 40,
-				19: 70,
+				19: 71,
 				60: p,
 				86: C,
 				100: w,
@@ -828,19 +858,19 @@ var C = (function() {
 			{
 				16: 39,
 				17: 40,
-				19: 71,
+				19: 72,
 				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
 			},
-			{ 60: [1, 72] },
-			{ 13: [1, 73] },
+			{ 60: [1, 73] },
+			{ 13: [1, 74] },
 			{
 				16: 39,
 				17: 40,
-				19: 74,
+				19: 75,
 				60: p,
 				86: C,
 				100: w,
@@ -849,33 +879,33 @@ var C = (function() {
 			},
 			{
 				13: te,
-				55: 75
+				55: 76
 			},
 			{
-				58: 77,
-				60: [1, 78]
+				58: 78,
+				60: [1, 79]
 			},
-			e(O, [2, 69]),
-			e(O, [2, 70]),
-			e(O, [2, 71]),
-			e(O, [2, 72]),
+			e(O, [2, 76]),
+			e(O, [2, 77]),
+			e(O, [2, 78]),
+			e(O, [2, 79]),
 			e(I, [2, 13], {
 				16: 39,
 				17: 40,
-				19: 80,
-				18: [1, 79],
-				20: [1, 81],
+				19: 81,
+				18: [1, 80],
+				20: [1, 82],
 				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
 			}),
-			e(I, [2, 15], { 20: [1, 82] }),
+			e(I, [2, 15], { 20: [1, 83] }),
 			{
-				15: 83,
-				16: 84,
-				17: 85,
+				15: 84,
+				16: 85,
+				17: 86,
 				60: p,
 				86: C,
 				100: w,
@@ -885,17 +915,17 @@ var C = (function() {
 			{
 				16: 39,
 				17: 40,
-				19: 86,
+				19: 87,
 				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
 			},
-			e(L, [2, 126]),
-			e(L, [2, 127]),
-			e(L, [2, 128]),
-			e(L, [2, 129]),
+			e(L, [2, 133]),
+			e(L, [2, 134]),
+			e(L, [2, 135]),
+			e(L, [2, 136]),
 			e([
 				1,
 				8,
@@ -907,6 +937,7 @@ var C = (function() {
 				39,
 				41,
 				44,
+				46,
 				68,
 				69,
 				70,
@@ -916,7 +947,7 @@ var C = (function() {
 				74,
 				79,
 				81
-			], [2, 130]),
+			], [2, 137]),
 			e(D, [2, 6], {
 				10: 5,
 				21: 7,
@@ -935,13 +966,13 @@ var C = (function() {
 				43: 23,
 				16: 39,
 				17: 40,
-				5: 87,
+				5: 88,
 				33: t,
-				35: n,
-				37: r,
+				35: r,
+				37: i,
 				42: a,
 				46: o,
-				49: s,
+				48: s,
 				51: c,
 				52: l,
 				54: u,
@@ -963,7 +994,7 @@ var C = (function() {
 				103: E
 			}),
 			{
-				5: 88,
+				5: 89,
 				10: 5,
 				16: 39,
 				17: 40,
@@ -980,13 +1011,13 @@ var C = (function() {
 				31: 16,
 				32: 17,
 				33: t,
-				35: n,
-				37: r,
+				35: r,
+				37: i,
 				38: 22,
 				42: a,
 				43: 23,
 				46: o,
-				49: s,
+				48: s,
 				51: c,
 				52: l,
 				54: u,
@@ -1011,10 +1042,10 @@ var C = (function() {
 			e(O, [2, 31]),
 			e(O, [2, 32]),
 			{
-				13: [1, 90],
+				13: [1, 91],
 				16: 39,
 				17: 40,
-				19: 89,
+				19: 90,
 				60: p,
 				86: C,
 				100: w,
@@ -1022,7 +1053,7 @@ var C = (function() {
 				103: E
 			},
 			{
-				53: 91,
+				53: 92,
 				66: 56,
 				67: 57,
 				68: k,
@@ -1030,100 +1061,110 @@ var C = (function() {
 				70: j,
 				71: M,
 				72: N,
-				73: ee,
-				74: P
+				73: P,
+				74: ee
 			},
-			e(O, [2, 57]),
+			e(O, [2, 64]),
 			{
-				67: 92,
-				73: ee,
-				74: P
+				67: 93,
+				73: P,
+				74: ee
 			},
-			e(R, [2, 76], {
-				66: 93,
+			e(R, [2, 83], {
+				66: 94,
 				68: k,
 				69: A,
 				70: j,
 				71: M,
 				72: N
 			}),
-			e(z, [2, 77]),
-			e(z, [2, 78]),
-			e(z, [2, 79]),
-			e(z, [2, 80]),
-			e(z, [2, 81]),
-			e(ne, [2, 82]),
-			e(ne, [2, 83]),
+			e(z, [2, 84]),
+			e(z, [2, 85]),
+			e(z, [2, 86]),
+			e(z, [2, 87]),
+			e(z, [2, 88]),
+			e(ne, [2, 89]),
+			e(ne, [2, 90]),
 			{
-				8: [1, 95],
-				24: 96,
-				30: 97,
-				40: 94,
+				8: [1, 96],
+				23: 99,
+				24: 97,
+				30: 98,
+				38: 22,
+				40: 95,
+				42: a,
 				43: 23,
-				46: o,
+				48: s,
 				54: u,
 				56: d
 			},
 			{
-				16: 98,
+				16: 100,
 				60: p,
 				86: C,
 				100: w,
 				102: T
 			},
 			{
-				41: [1, 100],
-				45: 99,
+				41: [1, 102],
+				45: 101,
 				51: B
 			},
-			{ 50: [1, 102] },
-			{ 13: [1, 103] },
-			{ 13: [1, 104] },
 			{
-				79: [1, 105],
-				81: [1, 106]
+				16: 104,
+				60: p,
+				86: C,
+				100: w,
+				102: T
+			},
+			{ 47: [1, 105] },
+			{ 13: [1, 106] },
+			{ 13: [1, 107] },
+			{
+				79: [1, 108],
+				81: [1, 109]
 			},
 			{
 				22: V,
-				48: H,
-				59: 107,
+				50: H,
+				59: 110,
 				60: U,
 				82: W,
-				84: 108,
-				85: 109,
+				84: 111,
+				85: 112,
 				86: G,
 				87: K,
 				88: q,
 				89: J,
 				90: Y
 			},
-			{ 60: [1, 119] },
+			{ 60: [1, 122] },
 			{
 				13: te,
-				55: 120
+				55: 123
 			},
-			e(F, [2, 65]),
-			e(F, [2, 131]),
+			e(F, [2, 72]),
+			e(F, [2, 138]),
 			{
 				22: V,
-				48: H,
-				59: 121,
+				50: H,
+				59: 124,
 				60: U,
-				61: [1, 122],
+				61: [1, 125],
 				82: W,
-				84: 108,
-				85: 109,
+				84: 111,
+				85: 112,
 				86: G,
 				87: K,
 				88: q,
 				89: J,
 				90: Y
 			},
-			e(re, [2, 67]),
+			e(re, [2, 74]),
 			{
 				16: 39,
 				17: 40,
-				19: 123,
+				19: 126,
 				60: p,
 				86: C,
 				100: w,
@@ -1133,31 +1174,34 @@ var C = (function() {
 			e(I, [2, 16]),
 			e(I, [2, 17]),
 			e(I, [2, 18]),
-			{ 39: [2, 36] },
 			{
-				15: 125,
-				16: 84,
-				17: 85,
-				18: [1, 124],
-				39: [2, 9],
+				11: 127,
+				12: ie,
+				39: [2, 36]
+			},
+			e(X, [2, 9], {
+				16: 85,
+				17: 86,
+				15: 130,
+				18: [1, 129],
 				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
-			},
-			{ 39: [2, 10] },
-			e(X, [2, 48], {
-				11: 126,
-				12: [1, 127]
+			}),
+			e(X, [2, 10]),
+			e(ae, [2, 55], {
+				11: 131,
+				12: ie
 			}),
 			e(D, [2, 7]),
-			{ 9: [1, 128] },
-			e(Z, [2, 60]),
+			{ 9: [1, 132] },
+			e(Z, [2, 67]),
 			{
 				16: 39,
 				17: 40,
-				19: 129,
+				19: 133,
 				60: p,
 				86: C,
 				100: w,
@@ -1165,76 +1209,84 @@ var C = (function() {
 				103: E
 			},
 			{
-				13: [1, 131],
+				13: [1, 135],
 				16: 39,
 				17: 40,
-				19: 130,
+				19: 134,
 				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
 			},
-			e(R, [2, 75], {
-				66: 132,
+			e(R, [2, 82], {
+				66: 136,
 				68: k,
 				69: A,
 				70: j,
 				71: M,
 				72: N
 			}),
-			e(R, [2, 74]),
-			{ 41: [1, 133] },
+			e(R, [2, 81]),
+			{ 41: [1, 137] },
 			{
-				24: 96,
-				30: 97,
-				40: 134,
+				23: 99,
+				24: 97,
+				30: 98,
+				38: 22,
+				40: 138,
+				42: a,
 				43: 23,
-				46: o,
+				48: s,
 				54: u,
 				56: d
 			},
 			{
-				8: [1, 135],
-				41: [2, 37]
+				8: [1, 139],
+				41: [2, 38]
 			},
 			{
-				8: [1, 136],
-				41: [2, 40]
+				8: [1, 140],
+				41: [2, 41]
 			},
-			e(F, [2, 44], { 39: [1, 137] }),
-			{ 41: [1, 138] },
-			e(F, [2, 46]),
 			{
-				41: [2, 54],
-				45: 139,
+				8: [1, 141],
+				41: [2, 44]
+			},
+			e(F, [2, 48], { 39: [1, 142] }),
+			{ 41: [1, 143] },
+			e(F, [2, 50]),
+			{
+				41: [2, 61],
+				45: 144,
 				51: B
 			},
+			{ 47: [1, 145] },
 			{
 				16: 39,
 				17: 40,
-				19: 140,
+				19: 146,
 				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
 			},
-			e(O, [2, 84], { 13: [1, 141] }),
-			e(O, [2, 86], {
-				13: [1, 143],
-				77: [1, 142]
+			e(O, [2, 91], { 13: [1, 147] }),
+			e(O, [2, 93], {
+				13: [1, 149],
+				77: [1, 148]
 			}),
-			e(O, [2, 90], {
-				13: [1, 144],
-				80: [1, 145]
+			e(O, [2, 97], {
+				13: [1, 150],
+				80: [1, 151]
 			}),
-			{ 13: [1, 146] },
-			e(O, [2, 98], { 61: ie }),
-			e(ae, [2, 100], {
-				85: 148,
+			{ 13: [1, 152] },
+			e(O, [2, 105], { 61: oe }),
+			e(se, [2, 107], {
+				85: 154,
 				22: V,
-				48: H,
+				50: H,
 				60: U,
 				82: W,
 				86: G,
@@ -1243,116 +1295,143 @@ var C = (function() {
 				89: J,
 				90: Y
 			}),
-			e(Q, [2, 102]),
-			e(Q, [2, 104]),
-			e(Q, [2, 105]),
-			e(Q, [2, 106]),
-			e(Q, [2, 107]),
-			e(Q, [2, 108]),
 			e(Q, [2, 109]),
-			e(Q, [2, 110]),
 			e(Q, [2, 111]),
 			e(Q, [2, 112]),
-			e(O, [2, 99]),
-			e(F, [2, 64]),
-			e(O, [2, 66], { 61: ie }),
-			{ 60: [1, 149] },
+			e(Q, [2, 113]),
+			e(Q, [2, 114]),
+			e(Q, [2, 115]),
+			e(Q, [2, 116]),
+			e(Q, [2, 117]),
+			e(Q, [2, 118]),
+			e(Q, [2, 119]),
+			e(O, [2, 106]),
+			e(F, [2, 71]),
+			e(O, [2, 73], { 61: oe }),
+			{ 60: [1, 155] },
 			e(I, [2, 14]),
+			{ 39: [2, 37] },
+			{ 13: [1, 156] },
 			{
-				15: 150,
-				16: 84,
-				17: 85,
+				15: 157,
+				16: 85,
+				17: 86,
 				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
 			},
-			{ 39: [2, 12] },
-			e(X, [2, 49]),
-			{ 13: [1, 151] },
+			e(X, [2, 12]),
+			e(ae, [2, 56]),
 			{ 1: [2, 4] },
-			e(Z, [2, 62]),
-			e(Z, [2, 61]),
+			e(Z, [2, 69]),
+			e(Z, [2, 68]),
 			{
 				16: 39,
 				17: 40,
-				19: 152,
+				19: 158,
 				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
 			},
-			e(R, [2, 73]),
-			e(O, [2, 34]),
-			{ 41: [1, 153] },
+			e(R, [2, 80]),
+			e(F, [2, 34]),
+			{ 41: [1, 159] },
 			{
-				24: 96,
-				30: 97,
-				40: 154,
-				41: [2, 38],
+				23: 99,
+				24: 97,
+				30: 98,
+				38: 22,
+				40: 160,
+				41: [2, 39],
+				42: a,
 				43: 23,
-				46: o,
+				48: s,
 				54: u,
 				56: d
 			},
 			{
-				24: 96,
-				30: 97,
-				40: 155,
-				41: [2, 41],
+				23: 99,
+				24: 97,
+				30: 98,
+				38: 22,
+				40: 161,
+				41: [2, 42],
+				42: a,
 				43: 23,
-				46: o,
+				48: s,
 				54: u,
 				56: d
 			},
 			{
-				45: 156,
+				23: 99,
+				24: 97,
+				30: 98,
+				38: 22,
+				40: 162,
+				41: [2, 45],
+				42: a,
+				43: 23,
+				48: s,
+				54: u,
+				56: d
+			},
+			{
+				45: 163,
 				51: B
 			},
-			e(F, [2, 45]),
-			{ 41: [2, 55] },
-			e(O, [2, 53]),
-			e(O, [2, 85]),
-			e(O, [2, 87]),
-			e(O, [2, 88], { 77: [1, 157] }),
-			e(O, [2, 91]),
-			e(O, [2, 92], { 13: [1, 158] }),
-			e(O, [2, 94], {
-				13: [1, 160],
-				77: [1, 159]
+			e(F, [2, 49]),
+			{ 41: [2, 62] },
+			e(F, [2, 52], { 39: [1, 164] }),
+			e(O, [2, 60]),
+			e(O, [2, 92]),
+			e(O, [2, 94]),
+			e(O, [2, 95], { 77: [1, 165] }),
+			e(O, [2, 98]),
+			e(O, [2, 99], { 13: [1, 166] }),
+			e(O, [2, 101], {
+				13: [1, 168],
+				77: [1, 167]
 			}),
 			{
 				22: V,
-				48: H,
+				50: H,
 				60: U,
 				82: W,
-				84: 161,
-				85: 109,
+				84: 169,
+				85: 112,
 				86: G,
 				87: K,
 				88: q,
 				89: J,
 				90: Y
 			},
-			e(Q, [2, 103]),
-			e(re, [2, 68]),
-			{ 39: [2, 11] },
-			{ 14: [1, 162] },
-			e(Z, [2, 63]),
-			e(O, [2, 35]),
-			{ 41: [2, 39] },
-			{ 41: [2, 42] },
-			{ 41: [1, 163] },
-			e(O, [2, 89]),
-			e(O, [2, 93]),
-			e(O, [2, 95]),
-			e(O, [2, 96], { 77: [1, 164] }),
-			e(ae, [2, 101], {
-				85: 148,
+			e(Q, [2, 110]),
+			e(re, [2, 75]),
+			{ 14: [1, 170] },
+			e(X, [2, 11]),
+			e(Z, [2, 70]),
+			e(F, [2, 35]),
+			{ 41: [2, 40] },
+			{ 41: [2, 43] },
+			{ 41: [2, 46] },
+			{ 41: [1, 171] },
+			{
+				41: [1, 173],
+				45: 172,
+				51: B
+			},
+			e(O, [2, 96]),
+			e(O, [2, 100]),
+			e(O, [2, 102]),
+			e(O, [2, 103], { 77: [1, 174] }),
+			e(se, [2, 108], {
+				85: 154,
 				22: V,
-				48: H,
+				50: H,
 				60: U,
 				82: W,
 				86: G,
@@ -1361,32 +1440,33 @@ var C = (function() {
 				89: J,
 				90: Y
 			}),
-			e(X, [2, 8]),
-			e(F, [2, 47]),
-			e(O, [2, 97])
+			e(ae, [2, 8]),
+			e(F, [2, 51]),
+			{ 41: [1, 175] },
+			e(F, [2, 54]),
+			e(O, [2, 104]),
+			e(F, [2, 53])
 		],
 		defaultActions: {
 			2: [2, 1],
 			3: [2, 2],
 			4: [2, 3],
-			83: [2, 36],
-			85: [2, 10],
-			125: [2, 12],
-			128: [2, 4],
-			139: [2, 55],
-			150: [2, 11],
-			154: [2, 39],
-			155: [2, 42]
+			127: [2, 37],
+			132: [2, 4],
+			144: [2, 62],
+			160: [2, 40],
+			161: [2, 43],
+			162: [2, 46]
 		},
-		parseError: /* @__PURE__ */ i(function(e, t) {
+		parseError: /* @__PURE__ */ n(function(e, t) {
 			if (t.recoverable) this.trace(e);
 			else {
 				var n = Error(e);
 				throw n.hash = t, n;
 			}
 		}, "parseError"),
-		parse: /* @__PURE__ */ i(function(e) {
-			var t = this, n = [0], r = [], a = [null], o = [], s = this.table, c = "", l = 0, u = 0, d = 0, f = 2, p = 1, m = o.slice.call(arguments, 1), h = Object.create(this.lexer), g = { yy: {} };
+		parse: /* @__PURE__ */ n(function(e) {
+			var t = this, r = [0], i = [], a = [null], o = [], s = this.table, c = "", l = 0, u = 0, d = 0, f = 2, p = 1, m = o.slice.call(arguments, 1), h = Object.create(this.lexer), g = { yy: {} };
 			for (var _ in this.yy) Object.prototype.hasOwnProperty.call(this.yy, _) && (g.yy[_] = this.yy[_]);
 			h.setInput(e, g.yy), g.yy.lexer = h, g.yy.parser = this, h.yylloc === void 0 && (h.yylloc = {});
 			var v = h.yylloc;
@@ -1394,16 +1474,16 @@ var C = (function() {
 			var y = h.options && h.options.ranges;
 			typeof g.yy.parseError == "function" ? this.parseError = g.yy.parseError : this.parseError = Object.getPrototypeOf(this).parseError;
 			function b(e) {
-				n.length -= 2 * e, a.length -= e, o.length -= e;
+				r.length -= 2 * e, a.length -= e, o.length -= e;
 			}
-			i(b, "popStack");
+			n(b, "popStack");
 			function x() {
-				var e = r.pop() || h.lex() || p;
-				return typeof e != "number" && (e instanceof Array && (r = e, e = r.pop()), e = t.symbols_[e] || e), e;
+				var e = i.pop() || h.lex() || p;
+				return typeof e != "number" && (e instanceof Array && (i = e, e = i.pop()), e = t.symbols_[e] || e), e;
 			}
-			i(x, "lex");
+			n(x, "lex");
 			for (var S, C, w, T, E, D = {}, O, k, A, j;;) {
-				if (w = n[n.length - 1], this.defaultActions[w] ? T = this.defaultActions[w] : (S ??= x(), T = s[w] && s[w][S]), T === void 0 || !T.length || !T[0]) {
+				if (w = r[r.length - 1], this.defaultActions[w] ? T = this.defaultActions[w] : (S ??= x(), T = s[w] && s[w][S]), T === void 0 || !T.length || !T[0]) {
 					var M = "";
 					for (O in j = [], s[w]) this.terminals_[O] && O > f && j.push("'" + this.terminals_[O] + "'");
 					M = h.showPosition ? "Parse error on line " + (l + 1) + ":\n" + h.showPosition() + "\nExpecting " + j.join(", ") + ", got '" + (this.terminals_[S] || S) + "'" : "Parse error on line " + (l + 1) + ": Unexpected " + (S == p ? "end of input" : "'" + (this.terminals_[S] || S) + "'"), this.parseError(M, {
@@ -1417,7 +1497,7 @@ var C = (function() {
 				if (T[0] instanceof Array && T.length > 1) throw Error("Parse Error: multiple actions possible at state: " + w + ", token: " + S);
 				switch (T[0]) {
 					case 1:
-						n.push(S), a.push(h.yytext), o.push(h.yylloc), n.push(T[1]), S = null, C ? (S = C, C = null) : (u = h.yyleng, c = h.yytext, l = h.yylineno, v = h.yylloc, d > 0 && d--);
+						r.push(S), a.push(h.yytext), o.push(h.yylloc), r.push(T[1]), S = null, C ? (S = C, C = null) : (u = h.yyleng, c = h.yytext, l = h.yylineno, v = h.yylloc, d > 0 && d--);
 						break;
 					case 2:
 						if (k = this.productions_[T[1]][1], D.$ = a[a.length - k], D._$ = {
@@ -1434,7 +1514,7 @@ var C = (function() {
 							a,
 							o
 						].concat(m)), E !== void 0) return E;
-						k && (n = n.slice(0, -1 * k * 2), a = a.slice(0, -1 * k), o = o.slice(0, -1 * k)), n.push(this.productions_[T[1]][0]), a.push(D.$), o.push(D._$), A = s[n[n.length - 2]][n[n.length - 1]], n.push(A);
+						k && (r = r.slice(0, -1 * k * 2), a = a.slice(0, -1 * k), o = o.slice(0, -1 * k)), r.push(this.productions_[T[1]][0]), a.push(D.$), o.push(D._$), A = s[r[r.length - 2]][r[r.length - 1]], r.push(A);
 						break;
 					case 3: return !0;
 				}
@@ -1442,14 +1522,14 @@ var C = (function() {
 			return !0;
 		}, "parse")
 	};
-	oe.lexer = /* @__PURE__ */ (function() {
+	ce.lexer = /* @__PURE__ */ (function() {
 		return {
 			EOF: 1,
-			parseError: /* @__PURE__ */ i(function(e, t) {
+			parseError: /* @__PURE__ */ n(function(e, t) {
 				if (this.yy.parser) this.yy.parser.parseError(e, t);
 				else throw Error(e);
 			}, "parseError"),
-			setInput: /* @__PURE__ */ i(function(e, t) {
+			setInput: /* @__PURE__ */ n(function(e, t) {
 				return this.yy = t || this.yy || {}, this._input = e, this._more = this._backtrack = this.done = !1, this.yylineno = this.yyleng = 0, this.yytext = this.matched = this.match = "", this.conditionStack = ["INITIAL"], this.yylloc = {
 					first_line: 1,
 					first_column: 0,
@@ -1457,11 +1537,11 @@ var C = (function() {
 					last_column: 0
 				}, this.options.ranges && (this.yylloc.range = [0, 0]), this.offset = 0, this;
 			}, "setInput"),
-			input: /* @__PURE__ */ i(function() {
+			input: /* @__PURE__ */ n(function() {
 				var e = this._input[0];
 				return this.yytext += e, this.yyleng++, this.offset++, this.match += e, this.matched += e, e.match(/(?:\r\n?|\n).*/g) ? (this.yylineno++, this.yylloc.last_line++) : this.yylloc.last_column++, this.options.ranges && this.yylloc.range[1]++, this._input = this._input.slice(1), e;
 			}, "input"),
-			unput: /* @__PURE__ */ i(function(e) {
+			unput: /* @__PURE__ */ n(function(e) {
 				var t = e.length, n = e.split(/(?:\r\n?|\n)/g);
 				this._input = e + this._input, this.yytext = this.yytext.substr(0, this.yytext.length - t), this.offset -= t;
 				var r = this.match.split(/(?:\r\n?|\n)/g);
@@ -1474,10 +1554,10 @@ var C = (function() {
 					last_column: n ? (n.length === r.length ? this.yylloc.first_column : 0) + r[r.length - n.length].length - n[0].length : this.yylloc.first_column - t
 				}, this.options.ranges && (this.yylloc.range = [i[0], i[0] + this.yyleng - t]), this.yyleng = this.yytext.length, this;
 			}, "unput"),
-			more: /* @__PURE__ */ i(function() {
+			more: /* @__PURE__ */ n(function() {
 				return this._more = !0, this;
 			}, "more"),
-			reject: /* @__PURE__ */ i(function() {
+			reject: /* @__PURE__ */ n(function() {
 				if (this.options.backtrack_lexer) this._backtrack = !0;
 				else return this.parseError("Lexical error on line " + (this.yylineno + 1) + ". You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true).\n" + this.showPosition(), {
 					text: "",
@@ -1486,22 +1566,22 @@ var C = (function() {
 				});
 				return this;
 			}, "reject"),
-			less: /* @__PURE__ */ i(function(e) {
+			less: /* @__PURE__ */ n(function(e) {
 				this.unput(this.match.slice(e));
 			}, "less"),
-			pastInput: /* @__PURE__ */ i(function() {
+			pastInput: /* @__PURE__ */ n(function() {
 				var e = this.matched.substr(0, this.matched.length - this.match.length);
 				return (e.length > 20 ? "..." : "") + e.substr(-20).replace(/\n/g, "");
 			}, "pastInput"),
-			upcomingInput: /* @__PURE__ */ i(function() {
+			upcomingInput: /* @__PURE__ */ n(function() {
 				var e = this.match;
 				return e.length < 20 && (e += this._input.substr(0, 20 - e.length)), (e.substr(0, 20) + (e.length > 20 ? "..." : "")).replace(/\n/g, "");
 			}, "upcomingInput"),
-			showPosition: /* @__PURE__ */ i(function() {
+			showPosition: /* @__PURE__ */ n(function() {
 				var e = this.pastInput(), t = Array(e.length + 1).join("-");
 				return e + this.upcomingInput() + "\n" + t + "^";
 			}, "showPosition"),
-			test_match: /* @__PURE__ */ i(function(e, t) {
+			test_match: /* @__PURE__ */ n(function(e, t) {
 				var n, r, i;
 				if (this.options.backtrack_lexer && (i = {
 					yylineno: this.yylineno,
@@ -1534,7 +1614,7 @@ var C = (function() {
 				}
 				return !1;
 			}, "test_match"),
-			next: /* @__PURE__ */ i(function() {
+			next: /* @__PURE__ */ n(function() {
 				if (this.done) return this.EOF;
 				this._input || (this.done = !0);
 				var e, t, n, r;
@@ -1554,29 +1634,29 @@ var C = (function() {
 					line: this.yylineno
 				});
 			}, "next"),
-			lex: /* @__PURE__ */ i(function() {
+			lex: /* @__PURE__ */ n(function() {
 				return this.next() || this.lex();
 			}, "lex"),
-			begin: /* @__PURE__ */ i(function(e) {
+			begin: /* @__PURE__ */ n(function(e) {
 				this.conditionStack.push(e);
 			}, "begin"),
-			popState: /* @__PURE__ */ i(function() {
+			popState: /* @__PURE__ */ n(function() {
 				return this.conditionStack.length - 1 > 0 ? this.conditionStack.pop() : this.conditionStack[0];
 			}, "popState"),
-			_currentRules: /* @__PURE__ */ i(function() {
+			_currentRules: /* @__PURE__ */ n(function() {
 				return this.conditionStack.length && this.conditionStack[this.conditionStack.length - 1] ? this.conditions[this.conditionStack[this.conditionStack.length - 1]].rules : this.conditions.INITIAL.rules;
 			}, "_currentRules"),
-			topState: /* @__PURE__ */ i(function(e) {
+			topState: /* @__PURE__ */ n(function(e) {
 				return e = this.conditionStack.length - 1 - Math.abs(e || 0), e >= 0 ? this.conditionStack[e] : "INITIAL";
 			}, "topState"),
-			pushState: /* @__PURE__ */ i(function(e) {
+			pushState: /* @__PURE__ */ n(function(e) {
 				this.begin(e);
 			}, "pushState"),
-			stateStackSize: /* @__PURE__ */ i(function() {
+			stateStackSize: /* @__PURE__ */ n(function() {
 				return this.conditionStack.length;
 			}, "stateStackSize"),
 			options: {},
-			performAction: /* @__PURE__ */ i(function(e, t, n, r) {
+			performAction: /* @__PURE__ */ n(function(e, t, n, r) {
 				switch (n) {
 					case 0: return 62;
 					case 1: return 63;
@@ -1627,79 +1707,82 @@ var C = (function() {
 					case 30: return this.popState(), 8;
 					case 31: break;
 					case 32: return this.begin("namespace-body"), 39;
-					case 33: return this.popState(), 41;
-					case 34: return "EOF_IN_STRUCT";
-					case 35: return 8;
-					case 36: break;
-					case 37: return "EDGE_STATE";
-					case 38: return this.begin("class"), 46;
-					case 39: return this.popState(), 8;
-					case 40: break;
-					case 41: return this.popState(), this.popState(), 41;
-					case 42: return this.begin("class-body"), 39;
-					case 43: return this.popState(), 41;
-					case 44: return "EOF_IN_STRUCT";
-					case 45: return "EDGE_STATE";
-					case 46: return "OPEN_IN_STRUCT";
-					case 47: break;
-					case 48: return "MEMBER";
-					case 49: return 83;
-					case 50: return 75;
-					case 51: return 76;
-					case 52: return 78;
-					case 53: return 54;
-					case 54: return 56;
-					case 55: return 49;
-					case 56: return 50;
-					case 57: return 81;
-					case 58:
+					case 33:
+						this.popState(), this.less(0);
+						break;
+					case 34: return this.popState(), 41;
+					case 35: return "EOF_IN_STRUCT";
+					case 36: return 8;
+					case 37: break;
+					case 38: return "EDGE_STATE";
+					case 39: return this.begin("class"), 48;
+					case 40: return this.popState(), 8;
+					case 41: break;
+					case 42: return this.popState(), this.popState(), 41;
+					case 43: return this.begin("class-body"), 39;
+					case 44: return this.popState(), 41;
+					case 45: return "EOF_IN_STRUCT";
+					case 46: return "EDGE_STATE";
+					case 47: return "OPEN_IN_STRUCT";
+					case 48: break;
+					case 49: return "MEMBER";
+					case 50: return 83;
+					case 51: return 75;
+					case 52: return 76;
+					case 53: return 78;
+					case 54: return 54;
+					case 55: return 56;
+					case 56: return 46;
+					case 57: return 47;
+					case 58: return 81;
+					case 59:
 						this.popState();
 						break;
-					case 59: return "GENERICTYPE";
-					case 60:
+					case 60: return "GENERICTYPE";
+					case 61:
 						this.begin("generic");
 						break;
-					case 61:
+					case 62:
 						this.popState();
 						break;
-					case 62: return "BQUOTE_STR";
-					case 63:
+					case 63: return "BQUOTE_STR";
+					case 64:
 						this.begin("bqstring");
 						break;
-					case 64: return 77;
 					case 65: return 77;
 					case 66: return 77;
 					case 67: return 77;
-					case 68: return 69;
+					case 68: return 77;
 					case 69: return 69;
-					case 70: return 71;
+					case 70: return 69;
 					case 71: return 71;
-					case 72: return 70;
-					case 73: return 68;
-					case 74: return 72;
-					case 75: return 73;
-					case 76: return 74;
-					case 77: return 22;
-					case 78: return 44;
-					case 79: return 100;
-					case 80: return 18;
-					case 81: return "PLUS";
-					case 82: return 87;
-					case 83: return 61;
-					case 84: return 89;
+					case 72: return 71;
+					case 73: return 70;
+					case 74: return 68;
+					case 75: return 72;
+					case 76: return 73;
+					case 77: return 74;
+					case 78: return 22;
+					case 79: return 44;
+					case 80: return 100;
+					case 81: return 18;
+					case 82: return "PLUS";
+					case 83: return 87;
+					case 84: return 61;
 					case 85: return 89;
-					case 86: return 90;
-					case 87: return "EQUALS";
+					case 86: return 89;
+					case 87: return 90;
 					case 88: return "EQUALS";
-					case 89: return 60;
-					case 90: return 12;
-					case 91: return 14;
-					case 92: return "PUNCTUATION";
-					case 93: return 86;
-					case 94: return 102;
-					case 95: return 48;
-					case 96: return 48;
-					case 97: return 9;
+					case 89: return "EQUALS";
+					case 90: return 60;
+					case 91: return 12;
+					case 92: return 14;
+					case 93: return "PUNCTUATION";
+					case 94: return 86;
+					case 95: return 102;
+					case 96: return 50;
+					case 97: return 50;
+					case 98: return 9;
 				}
 			}, "anonymous"),
 			rules: [
@@ -1737,6 +1820,7 @@ var C = (function() {
 				/^(?:\s+)/,
 				/^(?:[{])/,
 				/^(?:[}])/,
+				/^(?:[}])/,
 				/^(?:$)/,
 				/^(?:\s*(\r?\n)+)/,
 				/^(?:\s+)/,
@@ -1806,13 +1890,13 @@ var C = (function() {
 				"namespace-body": {
 					rules: [
 						26,
-						33,
+						29,
 						34,
 						35,
 						36,
 						37,
 						38,
-						49,
+						39,
 						50,
 						51,
 						52,
@@ -1821,8 +1905,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -1841,7 +1925,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -1851,7 +1935,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -1862,7 +1947,7 @@ var C = (function() {
 						30,
 						31,
 						32,
-						49,
+						33,
 						50,
 						51,
 						52,
@@ -1871,8 +1956,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -1891,7 +1976,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -1901,14 +1986,14 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
 				"class-body": {
 					rules: [
 						26,
-						43,
 						44,
 						45,
 						46,
@@ -1923,8 +2008,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -1943,7 +2028,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -1953,18 +2038,18 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
 				class: {
 					rules: [
 						26,
-						39,
 						40,
 						41,
 						42,
-						49,
+						43,
 						50,
 						51,
 						52,
@@ -1973,8 +2058,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -1993,7 +2078,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2003,7 +2088,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2012,7 +2098,6 @@ var C = (function() {
 						11,
 						12,
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2021,8 +2106,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2041,7 +2126,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2051,7 +2136,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2059,7 +2145,6 @@ var C = (function() {
 					rules: [
 						9,
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2068,8 +2153,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2088,7 +2173,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2098,7 +2183,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2106,7 +2192,6 @@ var C = (function() {
 					rules: [
 						7,
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2115,8 +2200,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2135,7 +2220,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2145,7 +2230,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2154,7 +2240,6 @@ var C = (function() {
 						22,
 						23,
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2163,8 +2248,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2183,7 +2268,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2193,7 +2278,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2203,7 +2289,6 @@ var C = (function() {
 						20,
 						21,
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2212,8 +2297,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2232,7 +2317,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2242,14 +2327,14 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
 				href: {
 					rules: [
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2258,8 +2343,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2278,7 +2363,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2288,14 +2373,14 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
 				struct: {
 					rules: [
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2304,8 +2389,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2324,7 +2409,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2334,14 +2419,14 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
 				generic: {
 					rules: [
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2353,7 +2438,7 @@ var C = (function() {
 						58,
 						59,
 						60,
-						63,
+						61,
 						64,
 						65,
 						66,
@@ -2372,7 +2457,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2382,14 +2467,14 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
 				bqstring: {
 					rules: [
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2398,7 +2483,7 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
+						58,
 						61,
 						62,
 						63,
@@ -2420,7 +2505,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2430,7 +2515,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2439,7 +2525,6 @@ var C = (function() {
 						24,
 						25,
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2448,8 +2533,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2468,7 +2553,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2478,7 +2563,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2503,8 +2589,7 @@ var C = (function() {
 						27,
 						28,
 						29,
-						38,
-						49,
+						39,
 						50,
 						51,
 						52,
@@ -2513,8 +2598,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2548,7 +2633,8 @@ var C = (function() {
 						94,
 						95,
 						96,
-						97
+						97,
+						98
 					],
 					inclusive: !0
 				}
@@ -2558,7 +2644,7 @@ var C = (function() {
 	function $() {
 		this.yy = {};
 	}
-	return i($, "Parser"), $.prototype = oe, oe.Parser = $, new $();
+	return n($, "Parser"), $.prototype = ce, ce.Parser = $, new $();
 })();
 C.parser = C;
 var w = C, T = [
@@ -2569,16 +2655,16 @@ var w = C, T = [
 	""
 ], E = class {
 	static {
-		i(this, "ClassMember");
+		n(this, "ClassMember");
 	}
 	constructor(e, t) {
 		this.memberType = t, this.visibility = "", this.classifier = "", this.text = "";
-		let n = c(e, p());
+		let n = m(e, f());
 		this.parseMember(n);
 	}
 	getDisplayDetails() {
-		let e = this.visibility + m(this.id);
-		this.memberType === "method" && (e += `(${m(this.parameters.trim())})`, this.returnType && (e += " : " + m(this.returnType))), e = e.trim();
+		let e = this.visibility + o(this.id);
+		this.memberType === "method" && (e += `(${o(this.parameters.trim())})`, this.returnType && (e += " : " + o(this.returnType))), e = e.trim();
 		let t = this.parseClassifier();
 		return {
 			displayText: e,
@@ -2600,7 +2686,7 @@ var w = C, T = [
 			let n = e.length, r = e.substring(0, 1), i = e.substring(n - 1);
 			T.includes(r) && (this.visibility = r), /[$*]/.exec(i) && (t = i), this.id = e.substring(this.visibility === "" ? 0 : 1, t === "" ? n : n - 1);
 		}
-		this.classifier = t, this.id = this.id.startsWith(" ") ? " " + this.id.trim() : this.id.trim(), this.text = `${this.visibility ? "\\" + this.visibility : ""}${m(this.id)}${this.memberType === "method" ? `(${m(this.parameters)})${this.returnType ? " : " + m(this.returnType) : ""}` : ""}`.replaceAll("<", "&lt;").replaceAll(">", "&gt;"), this.text.startsWith("\\&lt;") && (this.text = this.text.replace("\\&lt;", "~"));
+		this.classifier = t, this.id = this.id.startsWith(" ") ? " " + this.id.trim() : this.id.trim(), this.text = `${this.visibility ? "\\" + this.visibility : ""}${o(this.id)}${this.memberType === "method" ? `(${o(this.parameters)})${this.returnType ? " : " + o(this.returnType) : ""}` : ""}`.replaceAll("<", "&lt;").replaceAll(">", "&gt;"), this.text.startsWith("\\&lt;") && (this.text = this.text.replace("\\&lt;", "~"));
 	}
 	parseClassifier() {
 		switch (this.classifier) {
@@ -2609,9 +2695,9 @@ var w = C, T = [
 			default: return "";
 		}
 	}
-}, D = "classId-", O = 0, k = /* @__PURE__ */ i((e) => h.sanitizeText(e, p()), "sanitizeText"), A = class {
+}, D = "classId-", O = 0, k = /* @__PURE__ */ n((e) => l.sanitizeText(e, f()), "sanitizeText"), A = class o {
 	constructor() {
-		this.relations = [], this.classes = /* @__PURE__ */ new Map(), this.styleClasses = /* @__PURE__ */ new Map(), this.notes = /* @__PURE__ */ new Map(), this.interfaces = [], this.namespaces = /* @__PURE__ */ new Map(), this.namespaceCounter = 0, this.functions = [], this.lineType = {
+		this.relations = [], this.classes = /* @__PURE__ */ new Map(), this.styleClasses = /* @__PURE__ */ new Map(), this.notes = /* @__PURE__ */ new Map(), this.interfaces = [], this.namespaces = /* @__PURE__ */ new Map(), this.namespaceCounter = 0, this.namespaceStack = [], this.diagramId = "", this.functions = [], this.lineType = {
 			LINE: 0,
 			DOTTED_LINE: 1
 		}, this.relationType = {
@@ -2620,25 +2706,25 @@ var w = C, T = [
 			COMPOSITION: 2,
 			DEPENDENCY: 3,
 			LOLLIPOP: 4
-		}, this.setupToolTips = /* @__PURE__ */ i((n) => {
+		}, this.setupToolTips = /* @__PURE__ */ n((n) => {
 			let r = v();
-			t(n).select("svg").selectAll("g").filter(function() {
-				return t(this).attr("title") !== null;
+			e(n).select("svg").selectAll("g").filter(function() {
+				return e(this).attr("title") !== null;
 			}).on("mouseover", (n) => {
-				let i = t(n.currentTarget), a = i.attr("title");
+				let i = e(n.currentTarget), a = i.attr("title");
 				if (!a) return;
 				let o = n.currentTarget.getBoundingClientRect();
-				r.transition().duration(200).style("opacity", ".9"), r.html(e.sanitize(a)).style("left", `${window.scrollX + o.left + o.width / 2}px`).style("top", `${window.scrollY + o.bottom + 4}px`), i.classed("hover", !0);
-			}).on("mouseout", (e) => {
-				r.transition().duration(500).style("opacity", 0), t(e.currentTarget).classed("hover", !1);
+				r.transition().duration(200).style("opacity", ".9"), r.html(t.sanitize(a)).style("left", `${window.scrollX + o.left + o.width / 2}px`).style("top", `${window.scrollY + o.bottom + 4}px`), i.classed("hover", !0);
+			}).on("mouseout", (t) => {
+				r.transition().duration(500).style("opacity", 0), e(t.currentTarget).classed("hover", !1);
 			});
-		}, "setupToolTips"), this.direction = "TB", this.setAccTitle = l, this.getAccTitle = g, this.setAccDescription = o, this.getAccDescription = d, this.setDiagramTitle = u, this.getDiagramTitle = s, this.getConfig = /* @__PURE__ */ i(() => p().class, "getConfig"), this.functions.push(this.setupToolTips.bind(this)), this.clear(), this.addRelation = this.addRelation.bind(this), this.addClassesToNamespace = this.addClassesToNamespace.bind(this), this.addNamespace = this.addNamespace.bind(this), this.setCssClass = this.setCssClass.bind(this), this.addMembers = this.addMembers.bind(this), this.addClass = this.addClass.bind(this), this.setClassLabel = this.setClassLabel.bind(this), this.addAnnotation = this.addAnnotation.bind(this), this.addMember = this.addMember.bind(this), this.cleanupLabel = this.cleanupLabel.bind(this), this.addNote = this.addNote.bind(this), this.defineClass = this.defineClass.bind(this), this.setDirection = this.setDirection.bind(this), this.setLink = this.setLink.bind(this), this.bindFunctions = this.bindFunctions.bind(this), this.clear = this.clear.bind(this), this.setTooltip = this.setTooltip.bind(this), this.setClickEvent = this.setClickEvent.bind(this), this.setCssStyle = this.setCssStyle.bind(this);
+		}, "setupToolTips"), this.direction = "TB", this.setAccTitle = s, this.getAccTitle = p, this.setAccDescription = i, this.getAccDescription = u, this.setDiagramTitle = a, this.getDiagramTitle = d, this.getConfig = /* @__PURE__ */ n(() => f().class, "getConfig"), this.functions.push(this.setupToolTips.bind(this)), this.clear(), this.addRelation = this.addRelation.bind(this), this.addClassesToNamespace = this.addClassesToNamespace.bind(this), this.addNamespace = this.addNamespace.bind(this), this.popNamespace = this.popNamespace.bind(this), this.setCssClass = this.setCssClass.bind(this), this.addMembers = this.addMembers.bind(this), this.addClass = this.addClass.bind(this), this.setClassLabel = this.setClassLabel.bind(this), this.addAnnotation = this.addAnnotation.bind(this), this.addMember = this.addMember.bind(this), this.cleanupLabel = this.cleanupLabel.bind(this), this.addNote = this.addNote.bind(this), this.defineClass = this.defineClass.bind(this), this.setDirection = this.setDirection.bind(this), this.setLink = this.setLink.bind(this), this.bindFunctions = this.bindFunctions.bind(this), this.clear = this.clear.bind(this), this.setTooltip = this.setTooltip.bind(this), this.setClickEvent = this.setClickEvent.bind(this), this.setCssStyle = this.setCssStyle.bind(this);
 	}
 	static {
-		i(this, "ClassDB");
+		n(this, "ClassDB");
 	}
 	splitClassNameAndType(e) {
-		let t = h.sanitizeText(e, p()), n = "", r = t;
+		let t = l.sanitizeText(e, f()), n = "", r = t;
 		if (t.indexOf("~") > 0) {
 			let e = t.split("~");
 			r = k(e[0]), n = k(e[1]);
@@ -2649,15 +2735,15 @@ var w = C, T = [
 		};
 	}
 	setClassLabel(e, t) {
-		let n = h.sanitizeText(e, p());
+		let n = l.sanitizeText(e, f());
 		t &&= k(t);
 		let { className: r } = this.splitClassNameAndType(n);
 		this.classes.get(r).label = t, this.classes.get(r).text = `${t}${this.classes.get(r).type ? `<${this.classes.get(r).type}>` : ""}`;
 	}
 	addClass(e) {
-		let t = h.sanitizeText(e, p()), { className: n, type: r } = this.splitClassNameAndType(t);
+		let t = l.sanitizeText(e, f()), { className: n, type: r } = this.splitClassNameAndType(t);
 		if (this.classes.has(n)) return;
-		let i = h.sanitizeText(n, p());
+		let i = l.sanitizeText(n, f());
 		this.classes.set(i, {
 			id: i,
 			type: r,
@@ -2680,13 +2766,19 @@ var w = C, T = [
 		};
 		this.interfaces.push(n);
 	}
+	setDiagramId(e) {
+		this.diagramId = e;
+	}
 	lookUpDomId(e) {
-		let t = h.sanitizeText(e, p());
-		if (this.classes.has(t)) return this.classes.get(t).domId;
+		let t = l.sanitizeText(e, f());
+		if (this.classes.has(t)) {
+			let e = this.classes.get(t).domId;
+			return this.diagramId ? `${this.diagramId}-${e}` : e;
+		}
 		throw Error("Class not found: " + t);
 	}
 	clear() {
-		this.relations = [], this.classes = /* @__PURE__ */ new Map(), this.notes = /* @__PURE__ */ new Map(), this.interfaces = [], this.functions = [], this.functions.push(this.setupToolTips.bind(this)), this.namespaces = /* @__PURE__ */ new Map(), this.namespaceCounter = 0, this.direction = "TB", f();
+		this.relations = [], this.classes = /* @__PURE__ */ new Map(), this.notes = /* @__PURE__ */ new Map(), this.interfaces = [], this.functions = [], this.functions.push(this.setupToolTips.bind(this)), this.namespaces = /* @__PURE__ */ new Map(), this.namespaceCounter = 0, this.namespaceStack = [], this.diagramId = "", this.direction = "TB", c();
 	}
 	getClass(e) {
 		return this.classes.get(e);
@@ -2705,7 +2797,7 @@ var w = C, T = [
 		return this.notes;
 	}
 	addRelation(e) {
-		a.debug("Adding relation: " + JSON.stringify(e));
+		r.debug("Adding relation: " + JSON.stringify(e));
 		let t = [
 			this.relationType.LOLLIPOP,
 			this.relationType.AGGREGATION,
@@ -2713,7 +2805,7 @@ var w = C, T = [
 			this.relationType.DEPENDENCY,
 			this.relationType.EXTENSION
 		];
-		e.relation.type1 === this.relationType.LOLLIPOP && !t.includes(e.relation.type2) ? (this.addClass(e.id2), this.addInterface(e.id1, e.id2), e.id1 = `interface${this.interfaces.length - 1}`) : e.relation.type2 === this.relationType.LOLLIPOP && !t.includes(e.relation.type1) ? (this.addClass(e.id1), this.addInterface(e.id2, e.id1), e.id2 = `interface${this.interfaces.length - 1}`) : (this.addClass(e.id1), this.addClass(e.id2)), e.id1 = this.splitClassNameAndType(e.id1).className, e.id2 = this.splitClassNameAndType(e.id2).className, e.relationTitle1 = h.sanitizeText(e.relationTitle1.trim(), p()), e.relationTitle2 = h.sanitizeText(e.relationTitle2.trim(), p()), this.relations.push(e);
+		e.relation.type1 === this.relationType.LOLLIPOP && !t.includes(e.relation.type2) ? (this.addClass(e.id2), this.addInterface(e.id1, e.id2), e.id1 = `interface${this.interfaces.length - 1}`) : e.relation.type2 === this.relationType.LOLLIPOP && !t.includes(e.relation.type1) ? (this.addClass(e.id1), this.addInterface(e.id2, e.id1), e.id2 = `interface${this.interfaces.length - 1}`) : (this.addClass(e.id1), this.addClass(e.id2)), e.id1 = this.splitClassNameAndType(e.id1).className, e.id2 = this.splitClassNameAndType(e.id2).className, e.relationTitle1 = l.sanitizeText(e.relationTitle1.trim(), f()), e.relationTitle2 = l.sanitizeText(e.relationTitle2.trim(), f()), this.relations.push(e);
 	}
 	addAnnotation(e, t) {
 		let n = this.splitClassNameAndType(e).className;
@@ -2776,13 +2868,13 @@ var w = C, T = [
 	getTooltip(e, t) {
 		return t && this.namespaces.has(t) ? this.namespaces.get(t).classes.get(e).tooltip : this.classes.get(e).tooltip;
 	}
-	setLink(e, t, r) {
-		let i = p();
+	setLink(e, t, n) {
+		let r = f();
 		e.split(",").forEach((e) => {
-			let a = e;
-			/\d/.exec(e[0]) && (a = D + a);
-			let o = this.classes.get(a);
-			o && (o.link = n.formatUrl(t, i), i.securityLevel === "sandbox" ? o.linkTarget = "_top" : typeof r == "string" ? o.linkTarget = k(r) : o.linkTarget = "_blank");
+			let i = e;
+			/\d/.exec(e[0]) && (i = D + i);
+			let a = this.classes.get(i);
+			a && (a.link = g.formatUrl(t, r), r.securityLevel === "sandbox" ? a.linkTarget = "_top" : typeof n == "string" ? a.linkTarget = k(n) : a.linkTarget = "_blank");
 		}), this.setCssClass(e, "clickable");
 	}
 	setClickEvent(e, t, n) {
@@ -2790,23 +2882,23 @@ var w = C, T = [
 			this.setClickFunc(e, t, n), this.classes.get(e).haveCallback = !0;
 		}), this.setCssClass(e, "clickable");
 	}
-	setClickFunc(e, t, r) {
-		let i = h.sanitizeText(e, p());
-		if (p().securityLevel !== "loose" || t === void 0) return;
-		let a = i;
-		if (this.classes.has(a)) {
-			let e = this.lookUpDomId(a), i = [];
-			if (typeof r == "string") {
-				i = r.split(/,(?=(?:(?:[^"]*"){2})*[^"]*$)/);
-				for (let e = 0; e < i.length; e++) {
-					let t = i[e].trim();
-					t.startsWith("\"") && t.endsWith("\"") && (t = t.substr(1, t.length - 2)), i[e] = t;
+	setClickFunc(e, t, n) {
+		let r = l.sanitizeText(e, f());
+		if (f().securityLevel !== "loose" || t === void 0) return;
+		let i = r;
+		if (this.classes.has(i)) {
+			let e = [];
+			if (typeof n == "string") {
+				e = n.split(/,(?=(?:(?:[^"]*"){2})*[^"]*$)/);
+				for (let t = 0; t < e.length; t++) {
+					let n = e[t].trim();
+					n.startsWith("\"") && n.endsWith("\"") && (n = n.substr(1, n.length - 2)), e[t] = n;
 				}
 			}
-			i.length === 0 && i.push(e), this.functions.push(() => {
-				let r = document.querySelector(`[id="${e}"]`);
+			e.length === 0 && e.push(i), this.functions.push(() => {
+				let n = this.lookUpDomId(i), r = document.querySelector(`[id="${n}"]`);
 				r !== null && r.addEventListener("click", () => {
-					n.runFunc(t, ...i);
+					g.runFunc(t, ...e);
 				}, !1);
 			});
 		}
@@ -2825,14 +2917,47 @@ var w = C, T = [
 	setDirection(e) {
 		this.direction = e;
 	}
-	addNamespace(e) {
-		this.namespaces.has(e) || (this.namespaces.set(e, {
+	static resolveQualifiedId(e, t) {
+		let n = t.at(-1);
+		return n ? `${n}.${e}` : e;
+	}
+	static getAncestorIds(e) {
+		let t = e.split("."), n = Array(t.length);
+		n[0] = t[0];
+		for (let e = 1; e < t.length; e++) n[e] = `${n[e - 1]}.${t[e]}`;
+		return n;
+	}
+	createNamespaceNode(e, t, n, r = !1) {
+		return {
 			id: e,
+			label: t,
 			classes: /* @__PURE__ */ new Map(),
 			notes: /* @__PURE__ */ new Map(),
 			children: /* @__PURE__ */ new Map(),
-			domId: D + e + "-" + this.namespaceCounter
-		}), this.namespaceCounter++);
+			domId: D + e + "-" + this.namespaceCounter++,
+			parent: n,
+			explicit: r
+		};
+	}
+	linkParentChild(e, t) {
+		let n = this.namespaces.get(e), r = this.namespaces.get(t);
+		!n || !r || (n.children.has(t) || n.children.set(t, r), r.parent ??= e);
+	}
+	addNamespace(e, t) {
+		let n = o.resolveQualifiedId(e, this.namespaceStack);
+		if (this.namespaceStack.push(n), this.namespaces.has(n)) {
+			let e = this.namespaces.get(n);
+			return e.explicit = !0, t && (e.label = t), n;
+		}
+		let r = n.split("."), i = o.getAncestorIds(n);
+		for (let e = 0; e < i.length; e++) {
+			let n = i[e], a = e > 0 ? i[e - 1] : void 0, o = e === i.length - 1, s = o && t ? t : r[e];
+			this.namespaces.has(n) ? o && (this.namespaces.get(n).explicit = !0) : this.namespaces.set(n, this.createNamespaceNode(n, s, a, o)), a && this.linkParentChild(a, n);
+		}
+		return n;
+	}
+	popNamespace() {
+		this.namespaceStack.pop();
 	}
 	getNamespace(e) {
 		return this.namespaces.get(e);
@@ -2878,34 +3003,45 @@ var w = C, T = [
 		}
 		return t;
 	}
+	resolveExplicitAncestor(e) {
+		let t = e;
+		for (; t;) {
+			let e = this.namespaces.get(t);
+			if (!e) return;
+			if (e.explicit) return t;
+			t = e.parent;
+		}
+	}
 	getData() {
-		let e = [], t = [], n = p();
+		let e = [], t = [], n = f(), r = n.class?.hierarchicalNamespaces ?? !0;
 		for (let t of this.namespaces.values()) {
-			let r = {
+			if (!r && !t.explicit) continue;
+			let i = {
 				id: t.id,
-				label: t.id,
+				label: r ? t.label : t.id,
 				isGroup: !0,
 				padding: n.class.padding ?? 16,
 				shape: "rect",
 				cssStyles: [],
-				look: n.look
+				look: n.look,
+				parentId: r ? t.parent : void 0
 			};
-			e.push(r);
+			e.push(i);
 		}
 		for (let t of this.classes.values()) {
-			let r = {
+			let i = r ? t.parent : this.resolveExplicitAncestor(t.parent), a = {
 				...t,
 				type: void 0,
 				isGroup: !1,
-				parentId: t.parent,
+				parentId: i,
 				look: n.look
 			};
-			e.push(r);
+			e.push(a);
 		}
-		for (let r of this.notes.values()) {
-			let i = {
-				id: r.id,
-				label: r.text,
+		for (let i of this.notes.values()) {
+			let a = r ? i.parent : this.resolveExplicitAncestor(i.parent), o = {
+				id: i.id,
+				label: i.text,
 				isGroup: !1,
 				shape: "note",
 				padding: n.class.padding ?? 6,
@@ -2916,16 +3052,16 @@ var w = C, T = [
 					`stroke: ${n.themeVariables.noteBorderColor}`
 				],
 				look: n.look,
-				parentId: r.parent,
+				parentId: a,
 				labelType: "markdown"
 			};
-			e.push(i);
-			let a = this.classes.get(r.class)?.id;
-			if (a) {
+			e.push(o);
+			let s = this.classes.get(i.class)?.id;
+			if (s) {
 				let e = {
-					id: `edgeNote${r.index}`,
-					start: r.id,
-					end: a,
+					id: `edgeNote${i.index}`,
+					start: i.id,
+					end: s,
 					type: "normal",
 					thickness: "normal",
 					classes: "relation",
@@ -2954,8 +3090,8 @@ var w = C, T = [
 		let i = 0;
 		for (let e of this.relations) {
 			i++;
-			let a = {
-				id: r(e.id1, e.id2, {
+			let r = {
+				id: h(e.id1, e.id2, {
 					prefix: "id",
 					counter: i
 				}),
@@ -2977,7 +3113,7 @@ var w = C, T = [
 				look: n.look,
 				labelType: "markdown"
 			};
-			t.push(a);
+			t.push(r);
 		}
 		return {
 			nodes: e,
@@ -2987,7 +3123,7 @@ var w = C, T = [
 			direction: this.getDirection()
 		};
 	}
-}, j = /* @__PURE__ */ i((e) => `g.classGroup text {
+}, j = /* @__PURE__ */ n((e) => `g.classGroup text {
   fill: ${e.nodeBorder || e.classText};
   stroke: none;
   font-family: ${e.fontFamily};
@@ -3026,6 +3162,10 @@ var w = C, T = [
 .nodeLabel, .edgeLabel {
   color: ${e.classText};
 }
+
+.noteLabel .nodeLabel, .noteLabel .edgeLabel {
+  color: ${e.noteTextColor};
+}
 .edgeLabel .label rect {
   fill: ${e.mainBkg};
 }
@@ -3050,7 +3190,7 @@ var w = C, T = [
   .node path {
     fill: ${e.mainBkg};
     stroke: ${e.nodeBorder};
-    stroke-width: 1px;
+    stroke-width: ${e.strokeWidth};
   }
 
 
@@ -3087,7 +3227,7 @@ g.classGroup line {
 
 .relation {
   stroke: ${e.lineColor};
-  stroke-width: 1;
+  stroke-width: ${e.strokeWidth};
   fill: none;
 }
 
@@ -3099,61 +3239,61 @@ g.classGroup line {
   stroke-dasharray: 1 2;
 }
 
-#compositionStart, .composition {
+[id$="-compositionStart"], .composition {
   fill: ${e.lineColor} !important;
   stroke: ${e.lineColor} !important;
   stroke-width: 1;
 }
 
-#compositionEnd, .composition {
+[id$="-compositionEnd"], .composition {
   fill: ${e.lineColor} !important;
   stroke: ${e.lineColor} !important;
   stroke-width: 1;
 }
 
-#dependencyStart, .dependency {
+[id$="-dependencyStart"], .dependency {
   fill: ${e.lineColor} !important;
   stroke: ${e.lineColor} !important;
   stroke-width: 1;
 }
 
-#dependencyStart, .dependency {
+[id$="-dependencyEnd"], .dependency {
   fill: ${e.lineColor} !important;
   stroke: ${e.lineColor} !important;
   stroke-width: 1;
 }
 
-#extensionStart, .extension {
+[id$="-extensionStart"], .extension {
   fill: transparent !important;
   stroke: ${e.lineColor} !important;
   stroke-width: 1;
 }
 
-#extensionEnd, .extension {
+[id$="-extensionEnd"], .extension {
   fill: transparent !important;
   stroke: ${e.lineColor} !important;
   stroke-width: 1;
 }
 
-#aggregationStart, .aggregation {
+[id$="-aggregationStart"], .aggregation {
   fill: transparent !important;
   stroke: ${e.lineColor} !important;
   stroke-width: 1;
 }
 
-#aggregationEnd, .aggregation {
+[id$="-aggregationEnd"], .aggregation {
   fill: transparent !important;
   stroke: ${e.lineColor} !important;
   stroke-width: 1;
 }
 
-#lollipopStart, .lollipop {
+[id$="-lollipopStart"], .lollipop {
   fill: ${e.mainBkg} !important;
   stroke: ${e.lineColor} !important;
   stroke-width: 1;
 }
 
-#lollipopEnd, .lollipop {
+[id$="-lollipopEnd"], .lollipop {
   fill: ${e.mainBkg} !important;
   stroke: ${e.lineColor} !important;
   stroke-width: 1;
@@ -3169,23 +3309,38 @@ g.classGroup line {
   font-size: 18px;
   fill: ${e.textColor};
 }
+
+.edgeLabel[data-look="neo"] {
+  background-color: ${e.edgeLabelBackground};
+  p {
+    background-color: ${e.edgeLabelBackground};
+  }
+  rect {
+    opacity: 0.5;
+    background-color: ${e.edgeLabelBackground};
+    fill: ${e.edgeLabelBackground};
+  }
+  text-align: center;
+}
   ${_()}
 `, "getStyles"), M = {
-	getClasses: /* @__PURE__ */ i(function(e, t) {
+	getClasses: /* @__PURE__ */ n(function(e, t) {
 		return t.db.getClasses();
 	}, "getClasses"),
-	draw: /* @__PURE__ */ i(async function(e, t, r, i) {
-		a.info("REF0:"), a.info("Drawing class diagram (v3)", t);
-		let { securityLevel: o, state: s, layout: c } = p(), l = i.db.getData(), u = y(t, o);
-		l.type = i.type, l.layoutAlgorithm = S(c), l.nodeSpacing = s?.nodeSpacing || 50, l.rankSpacing = s?.rankSpacing || 50, l.markers = [
+	draw: /* @__PURE__ */ n(async function(e, t, n, i) {
+		r.info("REF0:"), r.info("Drawing class diagram (v3)", t);
+		let { securityLevel: a, state: o, layout: s } = f();
+		i.db.setDiagramId(t);
+		let c = i.db.getData(), l = y(t, a);
+		c.type = i.type, c.layoutAlgorithm = S(s), c.nodeSpacing = o?.nodeSpacing || 50, c.rankSpacing = o?.rankSpacing || 50, c.markers = [
 			"aggregation",
 			"extension",
 			"composition",
 			"dependency",
 			"lollipop"
-		], l.diagramId = t, await x(l, u), n.insertTitle(u, "classDiagramTitleText", s?.titleTopMargin ?? 25, i.db.getDiagramTitle()), b(u, 8, "classDiagram", s?.useMaxWidth ?? !0);
+		], c.diagramId = t, await x(c, l), g.insertTitle(l, "classDiagramTitleText", o?.titleTopMargin ?? 25, i.db.getDiagramTitle()), b(l, 8, "classDiagram", o?.useMaxWidth ?? !0);
 	}, "draw"),
-	getDir: /* @__PURE__ */ i((e, t = "TB") => {
+	getDir: /* @__PURE__ */ n((e, t = "TB") => {
 		if (!e.doc) return t;
 		let n = t;
 		for (let t of e.doc) t.stmt === "dir" && (n = t.value);
@@ -3195,4 +3350,4 @@ g.classGroup line {
 //#endregion
 export { j as i, w as n, M as r, A as t };
 
-//# sourceMappingURL=chunk-WL4C6EOR-BV-op7zg.js.map
+//# sourceMappingURL=chunk-727SXJPM-kowsFLrz.js.map