@sme.up/ketchup2 2.1.0 → 2.3.0

package/dist/{chunk-4TB4RGXK-CKyHmNcP.js → chunk-727SXJPM-Dof0vDVV.js}

@@ -1,21 +1,21 @@
-import { B as e, C as t, L as n, V as r, W as i, _ as a, a as o, b as s, it as c, j as l, s as u, v as d } from "./chunk-ICPOFSXX-Sn6LWD0k.js";
-import { g as f, h as p, p as m } from "./src-BQiFKP24.js";
-import { h, s as g } from "./chunk-5PVQY5BW-C5U7sJAA.js";
-import { r as _, t as v } from "./chunk-336JU56O-xKPgkG3O.js";
-import { t as y } from "./chunk-FMBD7UC4-RRSc9jqt.js";
-import { t as b } from "./chunk-YZCP3GAM-9K9WNdyN.js";
-import { t as x } from "./chunk-55IACEB6-Bu3k0Yz5.js";
-import { t as S } from "./chunk-EDXVE4YY-Bzf4FU3i.js";
-//#region node_modules/mermaid/dist/chunks/mermaid.core/chunk-4TB4RGXK.mjs
+import { g as e, h as t, p as n } from "./src-v9RrE_4h.js";
+import { H as r, K as i, M as a, U as o, a as s, ot as c, s as l, v as u, w as d, x as f, y as p, z as m } from "./chunk-CSCIHK7Q-9WKhcDqw.js";
+import { c as h, g } from "./chunk-5ZQYHXKU-C4uam08j.js";
+import { r as _, t as v } from "./chunk-LZXEDZCA-KzBFuWPU.js";
+import { t as y } from "./chunk-FMBD7UC4-BbggSGOg.js";
+import { t as b } from "./chunk-ND2GUHAM-CHTke4K8.js";
+import { t as x } from "./chunk-55IACEB6-b_Ivgrk-.js";
+import { t as S } from "./chunk-2J33WTMH-EmvF7iYC.js";
+//#region node_modules/mermaid/dist/chunks/mermaid.core/chunk-727SXJPM.mjs
 var C = (function() {
-	var e = /* @__PURE__ */ p(function(e, t, n, r) {
+	var e = /* @__PURE__ */ t(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], i = [1, 41], a = [1, 26], o = [1, 42], s = [1, 24], c = [1, 25], l = [1, 32], u = [1, 33], d = [1, 34], f = [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"), n = [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,
@@ -96,7 +96,7 @@ var C = (function() {
 		100,
 		102,
 		103
-	], B = [1, 102], V = [1, 120], H = [1, 116], U = [1, 112], W = [1, 118], G = [1, 113], K = [1, 114], q = [1, 115], J = [1, 117], Y = [1, 119], 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,
 		50,
 		60,
@@ -107,7 +107,7 @@ var C = (function() {
 		88,
 		89,
 		90
-	], X = [
+	], ie = [1, 128], X = [12, 39], ae = [
 		1,
 		8,
 		9,
@@ -120,7 +120,7 @@ var C = (function() {
 		8,
 		9,
 		22
-	], ie = [1, 150], ae = [
+	], oe = [1, 153], se = [
 		1,
 		8,
 		9,
@@ -139,8 +139,8 @@ var C = (function() {
 		88,
 		89,
 		90
-	], oe = {
-		trace: /* @__PURE__ */ p(function() {}, "trace"),
+	], ce = {
+		trace: /* @__PURE__ */ t(function() {}, "trace"),
 		yy: {},
 		symbols_: {
 			error: 2,
@@ -353,6 +353,10 @@ var C = (function() {
 			[23, 4],
 			[23, 5],
 			[38, 2],
+			[38, 3],
+			[40, 1],
+			[40, 2],
+			[40, 3],
 			[40, 1],
 			[40, 2],
 			[40, 3],
@@ -452,7 +456,7 @@ var C = (function() {
 			[17, 1],
 			[55, 1]
 		],
-		performAction: /* @__PURE__ */ p(function(e, t, n, r, i, a, o) {
+		performAction: /* @__PURE__ */ t(function(e, t, n, r, i, a, o) {
 			var s = a.length - 1;
 			switch (i) {
 				case 8:
@@ -490,73 +494,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 49:
+				case 53:
 					r.addAnnotation(a[s - 6], a[s - 4]), r.addMembers(a[s - 6], a[s - 1]);
 					break;
-				case 50:
+				case 54:
 					r.addAnnotation(a[s - 5], a[s - 3]);
 					break;
-				case 51:
+				case 55:
 					this.$ = a[s], r.addClass(a[s]);
 					break;
-				case 52:
+				case 56:
 					this.$ = a[s - 1], r.addClass(a[s - 1]), r.setClassLabel(a[s - 1], a[s]);
 					break;
-				case 56:
+				case 60:
 					r.addAnnotation(a[s], a[s - 2]);
 					break;
-				case 57:
-				case 70:
+				case 61:
+				case 74:
 					this.$ = [a[s]];
 					break;
-				case 58:
+				case 62:
 					a[s].push(a[s - 1]), this.$ = a[s];
 					break;
-				case 59: break;
-				case 60:
+				case 63: break;
+				case 64:
 					r.addMember(a[s - 1], r.cleanupLabel(a[s]));
 					break;
-				case 61: break;
-				case 62: break;
-				case 63:
+				case 65: break;
+				case 66: break;
+				case 67:
 					this.$ = {
 						id1: a[s - 2],
 						id2: a[s],
@@ -565,7 +579,7 @@ var C = (function() {
 						relationTitle2: "none"
 					};
 					break;
-				case 64:
+				case 68:
 					this.$ = {
 						id1: a[s - 3],
 						id2: a[s],
@@ -574,7 +588,7 @@ var C = (function() {
 						relationTitle2: "none"
 					};
 					break;
-				case 65:
+				case 69:
 					this.$ = {
 						id1: a[s - 3],
 						id2: a[s],
@@ -583,7 +597,7 @@ var C = (function() {
 						relationTitle2: a[s - 1]
 					};
 					break;
-				case 66:
+				case 70:
 					this.$ = {
 						id1: a[s - 4],
 						id2: a[s],
@@ -592,130 +606,130 @@ var C = (function() {
 						relationTitle2: a[s - 1]
 					};
 					break;
-				case 67:
+				case 71:
 					this.$ = r.addNote(a[s], a[s - 1]);
 					break;
-				case 68:
+				case 72:
 					this.$ = r.addNote(a[s]);
 					break;
-				case 69:
+				case 73:
 					this.$ = a[s - 2], r.defineClass(a[s - 1], a[s]);
 					break;
-				case 71:
+				case 75:
 					this.$ = a[s - 2].concat([a[s]]);
 					break;
-				case 72:
+				case 76:
 					r.setDirection("TB");
 					break;
-				case 73:
+				case 77:
 					r.setDirection("BT");
 					break;
-				case 74:
+				case 78:
 					r.setDirection("RL");
 					break;
-				case 75:
+				case 79:
 					r.setDirection("LR");
 					break;
-				case 76:
+				case 80:
 					this.$ = {
 						type1: a[s - 2],
 						type2: a[s],
 						lineType: a[s - 1]
 					};
 					break;
-				case 77:
+				case 81:
 					this.$ = {
 						type1: "none",
 						type2: a[s],
 						lineType: a[s - 1]
 					};
 					break;
-				case 78:
+				case 82:
 					this.$ = {
 						type1: a[s - 1],
 						type2: "none",
 						lineType: a[s]
 					};
 					break;
-				case 79:
+				case 83:
 					this.$ = {
 						type1: "none",
 						type2: "none",
 						lineType: a[s]
 					};
 					break;
-				case 80:
+				case 84:
 					this.$ = r.relationType.AGGREGATION;
 					break;
-				case 81:
+				case 85:
 					this.$ = r.relationType.EXTENSION;
 					break;
-				case 82:
+				case 86:
 					this.$ = r.relationType.COMPOSITION;
 					break;
-				case 83:
+				case 87:
 					this.$ = r.relationType.DEPENDENCY;
 					break;
-				case 84:
+				case 88:
 					this.$ = r.relationType.LOLLIPOP;
 					break;
-				case 85:
+				case 89:
 					this.$ = r.lineType.LINE;
 					break;
-				case 86:
+				case 90:
 					this.$ = r.lineType.DOTTED_LINE;
 					break;
-				case 87:
-				case 93:
+				case 91:
+				case 97:
 					this.$ = a[s - 2], r.setClickEvent(a[s - 1], a[s]);
 					break;
-				case 88:
-				case 94:
+				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 89:
+				case 93:
 					this.$ = a[s - 2], r.setLink(a[s - 1], a[s]);
 					break;
-				case 90:
+				case 94:
 					this.$ = a[s - 3], r.setLink(a[s - 2], a[s - 1], a[s]);
 					break;
-				case 91:
+				case 95:
 					this.$ = a[s - 3], r.setLink(a[s - 2], a[s - 1]), r.setTooltip(a[s - 2], a[s]);
 					break;
-				case 92:
+				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 95:
+				case 99:
 					this.$ = a[s - 3], r.setClickEvent(a[s - 2], a[s - 1], a[s]);
 					break;
-				case 96:
+				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 97:
+				case 101:
 					this.$ = a[s - 3], r.setLink(a[s - 2], a[s]);
 					break;
-				case 98:
+				case 102:
 					this.$ = a[s - 4], r.setLink(a[s - 3], a[s - 1], a[s]);
 					break;
-				case 99:
+				case 103:
 					this.$ = a[s - 4], r.setLink(a[s - 3], a[s - 1]), r.setTooltip(a[s - 3], a[s]);
 					break;
-				case 100:
+				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 101:
+				case 105:
 					this.$ = a[s - 2], r.setCssStyle(a[s - 1], a[s]);
 					break;
-				case 102:
+				case 106:
 					r.setCssClass(a[s - 1], a[s]);
 					break;
-				case 103:
+				case 107:
 					this.$ = [a[s]];
 					break;
-				case 104:
+				case 108:
 					a[s - 2].push(a[s]), this.$ = a[s - 2];
 					break;
-				case 106:
+				case 110:
 					this.$ = a[s - 1] + a[s];
 					break;
 			}
@@ -742,20 +756,20 @@ var C = (function() {
 				30: 15,
 				31: 16,
 				32: 17,
-				33: t,
-				35: n,
-				37: r,
+				33: n,
+				35: r,
+				37: i,
 				38: 22,
-				42: i,
+				42: a,
 				43: 23,
-				46: a,
-				48: o,
-				51: s,
-				52: c,
-				54: l,
-				56: u,
-				57: d,
-				60: f,
+				46: o,
+				48: s,
+				51: c,
+				52: l,
+				54: u,
+				56: d,
+				57: f,
+				60: p,
 				62: m,
 				63: h,
 				64: g,
@@ -790,7 +804,7 @@ var C = (function() {
 			{ 34: [1, 51] },
 			{ 36: [1, 52] },
 			e(O, [2, 33]),
-			e(O, [2, 59], {
+			e(O, [2, 63], {
 				53: 53,
 				66: 56,
 				67: 57,
@@ -801,20 +815,20 @@ 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],
 				46: [1, 68]
 			}),
-			e(O, [2, 61]),
-			e(O, [2, 62]),
+			e(O, [2, 65]),
+			e(O, [2, 66]),
 			{
 				16: 69,
-				60: f,
+				60: p,
 				86: C,
 				100: w,
 				102: T
@@ -823,7 +837,7 @@ var C = (function() {
 				16: 39,
 				17: 40,
 				19: 70,
-				60: f,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
@@ -833,7 +847,7 @@ var C = (function() {
 				16: 39,
 				17: 40,
 				19: 71,
-				60: f,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
@@ -843,7 +857,7 @@ var C = (function() {
 				16: 39,
 				17: 40,
 				19: 72,
-				60: f,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
@@ -855,7 +869,7 @@ var C = (function() {
 				16: 39,
 				17: 40,
 				19: 75,
-				60: f,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
@@ -869,17 +883,17 @@ var C = (function() {
 				58: 78,
 				60: [1, 79]
 			},
-			e(O, [2, 72]),
-			e(O, [2, 73]),
-			e(O, [2, 74]),
-			e(O, [2, 75]),
+			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: 81,
 				18: [1, 80],
 				20: [1, 82],
-				60: f,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
@@ -890,7 +904,7 @@ var C = (function() {
 				15: 84,
 				16: 85,
 				17: 86,
-				60: f,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
@@ -900,16 +914,16 @@ var C = (function() {
 				16: 39,
 				17: 40,
 				19: 87,
-				60: f,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
 			},
-			e(L, [2, 129]),
-			e(L, [2, 130]),
-			e(L, [2, 131]),
-			e(L, [2, 132]),
+			e(L, [2, 133]),
+			e(L, [2, 134]),
+			e(L, [2, 135]),
+			e(L, [2, 136]),
 			e([
 				1,
 				8,
@@ -931,7 +945,7 @@ var C = (function() {
 				74,
 				79,
 				81
-			], [2, 133]),
+			], [2, 137]),
 			e(D, [2, 6], {
 				10: 5,
 				21: 7,
@@ -951,18 +965,18 @@ var C = (function() {
 				16: 39,
 				17: 40,
 				5: 88,
-				33: t,
-				35: n,
-				37: r,
-				42: i,
-				46: a,
-				48: o,
-				51: s,
-				52: c,
-				54: l,
-				56: u,
-				57: d,
-				60: f,
+				33: n,
+				35: r,
+				37: i,
+				42: a,
+				46: o,
+				48: s,
+				51: c,
+				52: l,
+				54: u,
+				56: d,
+				57: f,
+				60: p,
 				62: m,
 				63: h,
 				64: g,
@@ -994,20 +1008,20 @@ var C = (function() {
 				30: 15,
 				31: 16,
 				32: 17,
-				33: t,
-				35: n,
-				37: r,
+				33: n,
+				35: r,
+				37: i,
 				38: 22,
-				42: i,
+				42: a,
 				43: 23,
-				46: a,
-				48: o,
-				51: s,
-				52: c,
-				54: l,
-				56: u,
-				57: d,
-				60: f,
+				46: o,
+				48: s,
+				51: c,
+				52: l,
+				54: u,
+				56: d,
+				57: f,
+				60: p,
 				62: m,
 				63: h,
 				64: g,
@@ -1030,7 +1044,7 @@ var C = (function() {
 				16: 39,
 				17: 40,
 				19: 90,
-				60: f,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
@@ -1045,16 +1059,16 @@ var C = (function() {
 				70: j,
 				71: M,
 				72: N,
-				73: ee,
-				74: P
+				73: P,
+				74: ee
 			},
-			e(O, [2, 60]),
+			e(O, [2, 64]),
 			{
 				67: 93,
-				73: ee,
-				74: P
+				73: P,
+				74: ee
 			},
-			e(R, [2, 79], {
+			e(R, [2, 83], {
 				66: 94,
 				68: k,
 				69: A,
@@ -1062,91 +1076,94 @@ var C = (function() {
 				71: M,
 				72: N
 			}),
-			e(z, [2, 80]),
-			e(z, [2, 81]),
-			e(z, [2, 82]),
-			e(z, [2, 83]),
 			e(z, [2, 84]),
-			e(ne, [2, 85]),
-			e(ne, [2, 86]),
+			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, 96],
+				23: 99,
 				24: 97,
 				30: 98,
+				38: 22,
 				40: 95,
+				42: a,
 				43: 23,
-				48: o,
-				54: l,
-				56: u
+				48: s,
+				54: u,
+				56: d
 			},
 			{
-				16: 99,
-				60: f,
+				16: 100,
+				60: p,
 				86: C,
 				100: w,
 				102: T
 			},
 			{
-				41: [1, 101],
-				45: 100,
+				41: [1, 102],
+				45: 101,
 				51: B
 			},
 			{
-				16: 103,
-				60: f,
+				16: 104,
+				60: p,
 				86: C,
 				100: w,
 				102: T
 			},
-			{ 47: [1, 104] },
-			{ 13: [1, 105] },
+			{ 47: [1, 105] },
 			{ 13: [1, 106] },
+			{ 13: [1, 107] },
 			{
-				79: [1, 107],
-				81: [1, 108]
+				79: [1, 108],
+				81: [1, 109]
 			},
 			{
 				22: V,
 				50: H,
-				59: 109,
+				59: 110,
 				60: U,
 				82: W,
-				84: 110,
-				85: 111,
+				84: 111,
+				85: 112,
 				86: G,
 				87: K,
 				88: q,
 				89: J,
 				90: Y
 			},
-			{ 60: [1, 121] },
+			{ 60: [1, 122] },
 			{
 				13: te,
-				55: 122
+				55: 123
 			},
-			e(F, [2, 68]),
-			e(F, [2, 134]),
+			e(F, [2, 72]),
+			e(F, [2, 138]),
 			{
 				22: V,
 				50: H,
-				59: 123,
+				59: 124,
 				60: U,
-				61: [1, 124],
+				61: [1, 125],
 				82: W,
-				84: 110,
-				85: 111,
+				84: 111,
+				85: 112,
 				86: G,
 				87: K,
 				88: q,
 				89: J,
 				90: Y
 			},
-			e(re, [2, 70]),
+			e(re, [2, 74]),
 			{
 				16: 39,
 				17: 40,
-				19: 125,
-				60: f,
+				19: 126,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
@@ -1155,107 +1172,117 @@ var C = (function() {
 			e(I, [2, 16]),
 			e(I, [2, 17]),
 			e(I, [2, 18]),
-			{ 39: [2, 36] },
 			{
-				15: 127,
+				11: 127,
+				12: ie,
+				39: [2, 36]
+			},
+			e(X, [2, 9], {
 				16: 85,
 				17: 86,
-				18: [1, 126],
-				39: [2, 9],
-				60: f,
+				15: 130,
+				18: [1, 129],
+				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
-			},
-			{ 39: [2, 10] },
-			e(X, [2, 51], {
-				11: 128,
-				12: [1, 129]
+			}),
+			e(X, [2, 10]),
+			e(ae, [2, 55], {
+				11: 131,
+				12: ie
 			}),
 			e(D, [2, 7]),
-			{ 9: [1, 130] },
-			e(Z, [2, 63]),
+			{ 9: [1, 132] },
+			e(Z, [2, 67]),
 			{
 				16: 39,
 				17: 40,
-				19: 131,
-				60: f,
+				19: 133,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
 			},
 			{
-				13: [1, 133],
+				13: [1, 135],
 				16: 39,
 				17: 40,
-				19: 132,
-				60: f,
+				19: 134,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
 			},
-			e(R, [2, 78], {
-				66: 134,
+			e(R, [2, 82], {
+				66: 136,
 				68: k,
 				69: A,
 				70: j,
 				71: M,
 				72: N
 			}),
-			e(R, [2, 77]),
-			{ 41: [1, 135] },
+			e(R, [2, 81]),
+			{ 41: [1, 137] },
 			{
+				23: 99,
 				24: 97,
 				30: 98,
-				40: 136,
+				38: 22,
+				40: 138,
+				42: a,
 				43: 23,
-				48: o,
-				54: l,
-				56: u
+				48: s,
+				54: u,
+				56: d
 			},
 			{
-				8: [1, 137],
-				41: [2, 37]
+				8: [1, 139],
+				41: [2, 38]
 			},
 			{
-				8: [1, 138],
-				41: [2, 40]
+				8: [1, 140],
+				41: [2, 41]
 			},
-			e(F, [2, 44], { 39: [1, 139] }),
-			{ 41: [1, 140] },
-			e(F, [2, 46]),
 			{
-				41: [2, 57],
-				45: 141,
+				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, 142] },
+			{ 47: [1, 145] },
 			{
 				16: 39,
 				17: 40,
-				19: 143,
-				60: f,
+				19: 146,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
 			},
-			e(O, [2, 87], { 13: [1, 144] }),
-			e(O, [2, 89], {
-				13: [1, 146],
-				77: [1, 145]
-			}),
+			e(O, [2, 91], { 13: [1, 147] }),
 			e(O, [2, 93], {
-				13: [1, 147],
-				80: [1, 148]
+				13: [1, 149],
+				77: [1, 148]
 			}),
-			{ 13: [1, 149] },
-			e(O, [2, 101], { 61: ie }),
-			e(ae, [2, 103], {
-				85: 151,
+			e(O, [2, 97], {
+				13: [1, 150],
+				80: [1, 151]
+			}),
+			{ 13: [1, 152] },
+			e(O, [2, 105], { 61: oe }),
+			e(se, [2, 107], {
+				85: 154,
 				22: V,
 				50: H,
 				60: U,
@@ -1266,120 +1293,141 @@ var C = (function() {
 				89: J,
 				90: Y
 			}),
-			e(Q, [2, 105]),
-			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(Q, [2, 113]),
 			e(Q, [2, 114]),
 			e(Q, [2, 115]),
-			e(O, [2, 102]),
-			e(F, [2, 67]),
-			e(O, [2, 69], { 61: ie }),
-			{ 60: [1, 152] },
+			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: 153,
+				15: 157,
 				16: 85,
 				17: 86,
-				60: f,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
 			},
-			{ 39: [2, 12] },
-			e(X, [2, 52]),
-			{ 13: [1, 154] },
+			e(X, [2, 12]),
+			e(ae, [2, 56]),
 			{ 1: [2, 4] },
-			e(Z, [2, 65]),
-			e(Z, [2, 64]),
+			e(Z, [2, 69]),
+			e(Z, [2, 68]),
 			{
 				16: 39,
 				17: 40,
-				19: 155,
-				60: f,
+				19: 158,
+				60: p,
 				86: C,
 				100: w,
 				102: T,
 				103: E
 			},
-			e(R, [2, 76]),
-			e(O, [2, 34]),
-			{ 41: [1, 156] },
+			e(R, [2, 80]),
+			e(F, [2, 34]),
+			{ 41: [1, 159] },
 			{
+				23: 99,
 				24: 97,
 				30: 98,
-				40: 157,
-				41: [2, 38],
+				38: 22,
+				40: 160,
+				41: [2, 39],
+				42: a,
 				43: 23,
-				48: o,
-				54: l,
-				56: u
+				48: s,
+				54: u,
+				56: d
 			},
 			{
+				23: 99,
 				24: 97,
 				30: 98,
-				40: 158,
-				41: [2, 41],
+				38: 22,
+				40: 161,
+				41: [2, 42],
+				42: a,
 				43: 23,
-				48: o,
-				54: l,
-				56: u
+				48: s,
+				54: u,
+				56: d
 			},
 			{
-				45: 159,
+				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, 58] },
-			e(F, [2, 48], { 39: [1, 160] }),
-			e(O, [2, 56]),
-			e(O, [2, 88]),
-			e(O, [2, 90]),
-			e(O, [2, 91], { 77: [1, 161] }),
+			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], { 13: [1, 162] }),
-			e(O, [2, 97], {
-				13: [1, 164],
-				77: [1, 163]
+			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,
 				50: H,
 				60: U,
 				82: W,
-				84: 165,
-				85: 111,
+				84: 169,
+				85: 112,
 				86: G,
 				87: K,
 				88: q,
 				89: J,
 				90: Y
 			},
-			e(Q, [2, 106]),
-			e(re, [2, 71]),
-			{ 39: [2, 11] },
-			{ 14: [1, 166] },
-			e(Z, [2, 66]),
-			e(O, [2, 35]),
-			{ 41: [2, 39] },
-			{ 41: [2, 42] },
-			{ 41: [1, 167] },
+			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, 169],
-				45: 168,
+				41: [1, 173],
+				45: 172,
 				51: B
 			},
-			e(O, [2, 92]),
 			e(O, [2, 96]),
-			e(O, [2, 98]),
-			e(O, [2, 99], { 77: [1, 170] }),
-			e(ae, [2, 104], {
-				85: 151,
+			e(O, [2, 100]),
+			e(O, [2, 102]),
+			e(O, [2, 103], { 77: [1, 174] }),
+			e(se, [2, 108], {
+				85: 154,
 				22: V,
 				50: H,
 				60: U,
@@ -1390,55 +1438,53 @@ var C = (function() {
 				89: J,
 				90: Y
 			}),
-			e(X, [2, 8]),
-			e(F, [2, 47]),
-			{ 41: [1, 171] },
-			e(F, [2, 50]),
-			e(O, [2, 100]),
-			e(F, [2, 49])
+			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],
-			84: [2, 36],
-			86: [2, 10],
-			127: [2, 12],
-			130: [2, 4],
-			141: [2, 58],
-			153: [2, 11],
-			157: [2, 39],
-			158: [2, 42]
+			127: [2, 37],
+			132: [2, 4],
+			144: [2, 62],
+			160: [2, 40],
+			161: [2, 43],
+			162: [2, 46]
 		},
-		parseError: /* @__PURE__ */ p(function(e, t) {
+		parseError: /* @__PURE__ */ t(function(e, t) {
 			if (t.recoverable) this.trace(e);
 			else {
 				var n = Error(e);
 				throw n.hash = t, n;
 			}
 		}, "parseError"),
-		parse: /* @__PURE__ */ p(function(e) {
-			var t = this, n = [0], r = [], i = [null], a = [], o = this.table, s = "", c = 0, l = 0, u = 0, d = 2, f = 1, m = a.slice.call(arguments, 1), h = Object.create(this.lexer), g = { yy: {} };
+		parse: /* @__PURE__ */ t(function(e) {
+			var n = 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;
-			a.push(v);
+			o.push(v);
 			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, i.length -= e, a.length -= e;
+				r.length -= 2 * e, a.length -= e, o.length -= e;
 			}
-			p(b, "popStack");
+			t(b, "popStack");
 			function x() {
-				var e = r.pop() || h.lex() || f;
-				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 = n.symbols_[e] || e), e;
 			}
-			p(x, "lex");
+			t(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 = o[w] && o[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 = [], o[w]) this.terminals_[O] && O > d && j.push("'" + this.terminals_[O] + "'");
-					M = h.showPosition ? "Parse error on line " + (c + 1) + ":\n" + h.showPosition() + "\nExpecting " + j.join(", ") + ", got '" + (this.terminals_[S] || S) + "'" : "Parse error on line " + (c + 1) + ": Unexpected " + (S == f ? "end of input" : "'" + (this.terminals_[S] || S) + "'"), this.parseError(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, {
 						text: h.match,
 						token: this.terminals_[S] || S,
 						line: h.yylineno,
@@ -1449,24 +1495,24 @@ 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), i.push(h.yytext), a.push(h.yylloc), n.push(T[1]), S = null, C ? (S = C, C = null) : (l = h.yyleng, s = h.yytext, c = h.yylineno, v = h.yylloc, u > 0 && u--);
+						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.$ = i[i.length - k], D._$ = {
-							first_line: a[a.length - (k || 1)].first_line,
-							last_line: a[a.length - 1].last_line,
-							first_column: a[a.length - (k || 1)].first_column,
-							last_column: a[a.length - 1].last_column
-						}, y && (D._$.range = [a[a.length - (k || 1)].range[0], a[a.length - 1].range[1]]), E = this.performAction.apply(D, [
-							s,
-							l,
+						if (k = this.productions_[T[1]][1], D.$ = a[a.length - k], D._$ = {
+							first_line: o[o.length - (k || 1)].first_line,
+							last_line: o[o.length - 1].last_line,
+							first_column: o[o.length - (k || 1)].first_column,
+							last_column: o[o.length - 1].last_column
+						}, y && (D._$.range = [o[o.length - (k || 1)].range[0], o[o.length - 1].range[1]]), E = this.performAction.apply(D, [
 							c,
+							u,
+							l,
 							g.yy,
 							T[1],
-							i,
-							a
+							a,
+							o
 						].concat(m)), E !== void 0) return E;
-						k && (n = n.slice(0, -1 * k * 2), i = i.slice(0, -1 * k), a = a.slice(0, -1 * k)), n.push(this.productions_[T[1]][0]), i.push(D.$), a.push(D._$), A = o[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;
 				}
@@ -1474,14 +1520,14 @@ var C = (function() {
 			return !0;
 		}, "parse")
 	};
-	oe.lexer = /* @__PURE__ */ (function() {
+	ce.lexer = /* @__PURE__ */ (function() {
 		return {
 			EOF: 1,
-			parseError: /* @__PURE__ */ p(function(e, t) {
+			parseError: /* @__PURE__ */ t(function(e, t) {
 				if (this.yy.parser) this.yy.parser.parseError(e, t);
 				else throw Error(e);
 			}, "parseError"),
-			setInput: /* @__PURE__ */ p(function(e, t) {
+			setInput: /* @__PURE__ */ t(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,
@@ -1489,11 +1535,11 @@ var C = (function() {
 					last_column: 0
 				}, this.options.ranges && (this.yylloc.range = [0, 0]), this.offset = 0, this;
 			}, "setInput"),
-			input: /* @__PURE__ */ p(function() {
+			input: /* @__PURE__ */ t(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__ */ p(function(e) {
+			unput: /* @__PURE__ */ t(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);
@@ -1506,10 +1552,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__ */ p(function() {
+			more: /* @__PURE__ */ t(function() {
 				return this._more = !0, this;
 			}, "more"),
-			reject: /* @__PURE__ */ p(function() {
+			reject: /* @__PURE__ */ t(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: "",
@@ -1518,22 +1564,22 @@ var C = (function() {
 				});
 				return this;
 			}, "reject"),
-			less: /* @__PURE__ */ p(function(e) {
+			less: /* @__PURE__ */ t(function(e) {
 				this.unput(this.match.slice(e));
 			}, "less"),
-			pastInput: /* @__PURE__ */ p(function() {
+			pastInput: /* @__PURE__ */ t(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__ */ p(function() {
+			upcomingInput: /* @__PURE__ */ t(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__ */ p(function() {
+			showPosition: /* @__PURE__ */ t(function() {
 				var e = this.pastInput(), t = Array(e.length + 1).join("-");
 				return e + this.upcomingInput() + "\n" + t + "^";
 			}, "showPosition"),
-			test_match: /* @__PURE__ */ p(function(e, t) {
+			test_match: /* @__PURE__ */ t(function(e, t) {
 				var n, r, i;
 				if (this.options.backtrack_lexer && (i = {
 					yylineno: this.yylineno,
@@ -1566,7 +1612,7 @@ var C = (function() {
 				}
 				return !1;
 			}, "test_match"),
-			next: /* @__PURE__ */ p(function() {
+			next: /* @__PURE__ */ t(function() {
 				if (this.done) return this.EOF;
 				this._input || (this.done = !0);
 				var e, t, n, r;
@@ -1586,29 +1632,29 @@ var C = (function() {
 					line: this.yylineno
 				});
 			}, "next"),
-			lex: /* @__PURE__ */ p(function() {
+			lex: /* @__PURE__ */ t(function() {
 				return this.next() || this.lex();
 			}, "lex"),
-			begin: /* @__PURE__ */ p(function(e) {
+			begin: /* @__PURE__ */ t(function(e) {
 				this.conditionStack.push(e);
 			}, "begin"),
-			popState: /* @__PURE__ */ p(function() {
+			popState: /* @__PURE__ */ t(function() {
 				return this.conditionStack.length - 1 > 0 ? this.conditionStack.pop() : this.conditionStack[0];
 			}, "popState"),
-			_currentRules: /* @__PURE__ */ p(function() {
+			_currentRules: /* @__PURE__ */ t(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__ */ p(function(e) {
+			topState: /* @__PURE__ */ t(function(e) {
 				return e = this.conditionStack.length - 1 - Math.abs(e || 0), e >= 0 ? this.conditionStack[e] : "INITIAL";
 			}, "topState"),
-			pushState: /* @__PURE__ */ p(function(e) {
+			pushState: /* @__PURE__ */ t(function(e) {
 				this.begin(e);
 			}, "pushState"),
-			stateStackSize: /* @__PURE__ */ p(function() {
+			stateStackSize: /* @__PURE__ */ t(function() {
 				return this.conditionStack.length;
 			}, "stateStackSize"),
 			options: {},
-			performAction: /* @__PURE__ */ p(function(e, t, n, r) {
+			performAction: /* @__PURE__ */ t(function(e, t, n, r) {
 				switch (n) {
 					case 0: return 62;
 					case 1: return 63;
@@ -1659,79 +1705,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"), 48;
-					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 46;
-					case 56: return 47;
-					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 50;
+					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 9;
+					case 97: return 50;
+					case 98: return 9;
 				}
 			}, "anonymous"),
 			rules: [
@@ -1769,6 +1818,7 @@ var C = (function() {
 				/^(?:\s+)/,
 				/^(?:[{])/,
 				/^(?:[}])/,
+				/^(?:[}])/,
 				/^(?:$)/,
 				/^(?:\s*(\r?\n)+)/,
 				/^(?:\s+)/,
@@ -1838,13 +1888,13 @@ var C = (function() {
 				"namespace-body": {
 					rules: [
 						26,
-						33,
+						29,
 						34,
 						35,
 						36,
 						37,
 						38,
-						49,
+						39,
 						50,
 						51,
 						52,
@@ -1853,8 +1903,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -1873,7 +1923,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -1883,7 +1933,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -1894,7 +1945,7 @@ var C = (function() {
 						30,
 						31,
 						32,
-						49,
+						33,
 						50,
 						51,
 						52,
@@ -1903,8 +1954,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -1923,7 +1974,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -1933,14 +1984,14 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
 				"class-body": {
 					rules: [
 						26,
-						43,
 						44,
 						45,
 						46,
@@ -1955,8 +2006,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -1975,7 +2026,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -1985,18 +2036,18 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
 				class: {
 					rules: [
 						26,
-						39,
 						40,
 						41,
 						42,
-						49,
+						43,
 						50,
 						51,
 						52,
@@ -2005,8 +2056,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2025,7 +2076,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2035,7 +2086,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2044,7 +2096,6 @@ var C = (function() {
 						11,
 						12,
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2053,8 +2104,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2073,7 +2124,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2083,7 +2134,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2091,7 +2143,6 @@ var C = (function() {
 					rules: [
 						9,
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2100,8 +2151,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2120,7 +2171,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2130,7 +2181,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2138,7 +2190,6 @@ var C = (function() {
 					rules: [
 						7,
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2147,8 +2198,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2167,7 +2218,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2177,7 +2228,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2186,7 +2238,6 @@ var C = (function() {
 						22,
 						23,
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2195,8 +2246,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2215,7 +2266,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2225,7 +2276,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2235,7 +2287,6 @@ var C = (function() {
 						20,
 						21,
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2244,8 +2295,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2264,7 +2315,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2274,14 +2325,14 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
 				href: {
 					rules: [
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2290,8 +2341,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2310,7 +2361,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2320,14 +2371,14 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
 				struct: {
 					rules: [
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2336,8 +2387,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2356,7 +2407,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2366,14 +2417,14 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
 				generic: {
 					rules: [
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2385,7 +2436,7 @@ var C = (function() {
 						58,
 						59,
 						60,
-						63,
+						61,
 						64,
 						65,
 						66,
@@ -2404,7 +2455,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2414,14 +2465,14 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
 				bqstring: {
 					rules: [
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2430,7 +2481,7 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
+						58,
 						61,
 						62,
 						63,
@@ -2452,7 +2503,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2462,7 +2513,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2471,7 +2523,6 @@ var C = (function() {
 						24,
 						25,
 						26,
-						49,
 						50,
 						51,
 						52,
@@ -2480,8 +2531,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2500,7 +2551,7 @@ var C = (function() {
 						79,
 						80,
 						81,
-						86,
+						82,
 						87,
 						88,
 						89,
@@ -2510,7 +2561,8 @@ var C = (function() {
 						93,
 						94,
 						95,
-						97
+						96,
+						98
 					],
 					inclusive: !1
 				},
@@ -2535,8 +2587,7 @@ var C = (function() {
 						27,
 						28,
 						29,
-						38,
-						49,
+						39,
 						50,
 						51,
 						52,
@@ -2545,8 +2596,8 @@ var C = (function() {
 						55,
 						56,
 						57,
-						60,
-						63,
+						58,
+						61,
 						64,
 						65,
 						66,
@@ -2580,7 +2631,8 @@ var C = (function() {
 						94,
 						95,
 						96,
-						97
+						97,
+						98
 					],
 					inclusive: !0
 				}
@@ -2590,7 +2642,7 @@ var C = (function() {
 	function $() {
 		this.yy = {};
 	}
-	return p($, "Parser"), $.prototype = oe, oe.Parser = $, new $();
+	return t($, "Parser"), $.prototype = ce, ce.Parser = $, new $();
 })();
 C.parser = C;
 var w = C, T = [
@@ -2601,16 +2653,16 @@ var w = C, T = [
 	""
 ], E = class {
 	static {
-		p(this, "ClassMember");
+		t(this, "ClassMember");
 	}
 	constructor(e, t) {
 		this.memberType = t, this.visibility = "", this.classifier = "", this.text = "";
-		let r = n(e, s());
-		this.parseMember(r);
+		let n = m(e, f());
+		this.parseMember(n);
 	}
 	getDisplayDetails() {
-		let e = this.visibility + l(this.id);
-		this.memberType === "method" && (e += `(${l(this.parameters.trim())})`, this.returnType && (e += " : " + l(this.returnType))), e = e.trim();
+		let e = this.visibility + a(this.id);
+		this.memberType === "method" && (e += `(${a(this.parameters.trim())})`, this.returnType && (e += " : " + a(this.returnType))), e = e.trim();
 		let t = this.parseClassifier();
 		return {
 			displayText: e,
@@ -2632,7 +2684,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 : ""}${l(this.id)}${this.memberType === "method" ? `(${l(this.parameters)})${this.returnType ? " : " + l(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 : ""}${a(this.id)}${this.memberType === "method" ? `(${a(this.parameters)})${this.returnType ? " : " + a(this.returnType) : ""}` : ""}`.replaceAll("<", "&lt;").replaceAll(">", "&gt;"), this.text.startsWith("\\&lt;") && (this.text = this.text.replace("\\&lt;", "~"));
 	}
 	parseClassifier() {
 		switch (this.classifier) {
@@ -2641,9 +2693,9 @@ var w = C, T = [
 			default: return "";
 		}
 	}
-}, D = "classId-", O = 0, k = /* @__PURE__ */ p((e) => u.sanitizeText(e, s()), "sanitizeText"), A = class {
+}, D = "classId-", O = 0, k = /* @__PURE__ */ t((e) => l.sanitizeText(e, f()), "sanitizeText"), A = class a {
 	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.diagramId = "", 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 = {
@@ -2652,25 +2704,25 @@ var w = C, T = [
 			COMPOSITION: 2,
 			DEPENDENCY: 3,
 			LOLLIPOP: 4
-		}, this.setupToolTips = /* @__PURE__ */ p((e) => {
+		}, this.setupToolTips = /* @__PURE__ */ t((e) => {
 			let t = b();
-			m(e).select("svg").selectAll("g").filter(function() {
-				return m(this).attr("title") !== null;
+			n(e).select("svg").selectAll("g").filter(function() {
+				return n(this).attr("title") !== null;
 			}).on("mouseover", (e) => {
-				let n = m(e.currentTarget), r = n.attr("title");
-				if (!r) return;
-				let i = e.currentTarget.getBoundingClientRect();
-				t.transition().duration(200).style("opacity", ".9"), t.html(c.sanitize(r)).style("left", `${window.scrollX + i.left + i.width / 2}px`).style("top", `${window.scrollY + i.bottom + 4}px`), n.classed("hover", !0);
+				let r = n(e.currentTarget), i = r.attr("title");
+				if (!i) return;
+				let a = e.currentTarget.getBoundingClientRect();
+				t.transition().duration(200).style("opacity", ".9"), t.html(c.sanitize(i)).style("left", `${window.scrollX + a.left + a.width / 2}px`).style("top", `${window.scrollY + a.bottom + 4}px`), r.classed("hover", !0);
 			}).on("mouseout", (e) => {
-				t.transition().duration(500).style("opacity", 0), m(e.currentTarget).classed("hover", !1);
+				t.transition().duration(500).style("opacity", 0), n(e.currentTarget).classed("hover", !1);
 			});
-		}, "setupToolTips"), this.direction = "TB", this.setAccTitle = r, this.getAccTitle = d, this.setAccDescription = e, this.getAccDescription = a, this.setDiagramTitle = i, this.getDiagramTitle = t, this.getConfig = /* @__PURE__ */ p(() => s().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 = o, this.getAccTitle = p, this.setAccDescription = r, this.getAccDescription = u, this.setDiagramTitle = i, this.getDiagramTitle = d, this.getConfig = /* @__PURE__ */ t(() => 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 {
-		p(this, "ClassDB");
+		t(this, "ClassDB");
 	}
 	splitClassNameAndType(e) {
-		let t = u.sanitizeText(e, s()), 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]);
@@ -2681,15 +2733,15 @@ var w = C, T = [
 		};
 	}
 	setClassLabel(e, t) {
-		let n = u.sanitizeText(e, s());
+		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 = u.sanitizeText(e, s()), { 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 = u.sanitizeText(n, s());
+		let i = l.sanitizeText(n, f());
 		this.classes.set(i, {
 			id: i,
 			type: r,
@@ -2716,7 +2768,7 @@ var w = C, T = [
 		this.diagramId = e;
 	}
 	lookUpDomId(e) {
-		let t = u.sanitizeText(e, s());
+		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;
@@ -2724,7 +2776,7 @@ var w = C, T = [
 		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.diagramId = "", this.direction = "TB", o();
+		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", s();
 	}
 	getClass(e) {
 		return this.classes.get(e);
@@ -2742,16 +2794,16 @@ var w = C, T = [
 	getNotes() {
 		return this.notes;
 	}
-	addRelation(e) {
-		f.debug("Adding relation: " + JSON.stringify(e));
-		let t = [
+	addRelation(t) {
+		e.debug("Adding relation: " + JSON.stringify(t));
+		let n = [
 			this.relationType.LOLLIPOP,
 			this.relationType.AGGREGATION,
 			this.relationType.COMPOSITION,
 			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 = u.sanitizeText(e.relationTitle1.trim(), s()), e.relationTitle2 = u.sanitizeText(e.relationTitle2.trim(), s()), this.relations.push(e);
+		t.relation.type1 === this.relationType.LOLLIPOP && !n.includes(t.relation.type2) ? (this.addClass(t.id2), this.addInterface(t.id1, t.id2), t.id1 = `interface${this.interfaces.length - 1}`) : t.relation.type2 === this.relationType.LOLLIPOP && !n.includes(t.relation.type1) ? (this.addClass(t.id1), this.addInterface(t.id2, t.id1), t.id2 = `interface${this.interfaces.length - 1}`) : (this.addClass(t.id1), this.addClass(t.id2)), t.id1 = this.splitClassNameAndType(t.id1).className, t.id2 = this.splitClassNameAndType(t.id2).className, t.relationTitle1 = l.sanitizeText(t.relationTitle1.trim(), f()), t.relationTitle2 = l.sanitizeText(t.relationTitle2.trim(), f()), this.relations.push(t);
 	}
 	addAnnotation(e, t) {
 		let n = this.splitClassNameAndType(e).className;
@@ -2815,12 +2867,12 @@ var w = C, T = [
 		return t && this.namespaces.has(t) ? this.namespaces.get(t).classes.get(e).tooltip : this.classes.get(e).tooltip;
 	}
 	setLink(e, t, n) {
-		let r = s();
+		let r = f();
 		e.split(",").forEach((e) => {
 			let i = e;
 			/\d/.exec(e[0]) && (i = D + i);
 			let a = this.classes.get(i);
-			a && (a.link = h.formatUrl(t, r), r.securityLevel === "sandbox" ? a.linkTarget = "_top" : typeof n == "string" ? a.linkTarget = k(n) : a.linkTarget = "_blank");
+			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) {
@@ -2829,8 +2881,8 @@ var w = C, T = [
 		}), this.setCssClass(e, "clickable");
 	}
 	setClickFunc(e, t, n) {
-		let r = u.sanitizeText(e, s());
-		if (s().securityLevel !== "loose" || t === void 0) return;
+		let r = l.sanitizeText(e, f());
+		if (f().securityLevel !== "loose" || t === void 0) return;
 		let i = r;
 		if (this.classes.has(i)) {
 			let e = [];
@@ -2844,7 +2896,7 @@ var w = C, T = [
 			e.length === 0 && e.push(i), this.functions.push(() => {
 				let n = this.lookUpDomId(i), r = document.querySelector(`[id="${n}"]`);
 				r !== null && r.addEventListener("click", () => {
-					h.runFunc(t, ...e);
+					g.runFunc(t, ...e);
 				}, !1);
 			});
 		}
@@ -2863,14 +2915,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 = a.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 = a.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);
@@ -2916,34 +3001,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 = s();
+		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,
@@ -2954,16 +3050,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",
@@ -2989,13 +3085,13 @@ var w = C, T = [
 			};
 			e.push(r);
 		}
-		let r = 0;
+		let i = 0;
 		for (let e of this.relations) {
-			r++;
-			let i = {
-				id: g(e.id1, e.id2, {
+			i++;
+			let r = {
+				id: h(e.id1, e.id2, {
 					prefix: "id",
-					counter: r
+					counter: i
 				}),
 				start: e.id1,
 				end: e.id2,
@@ -3015,7 +3111,7 @@ var w = C, T = [
 				look: n.look,
 				labelType: "markdown"
 			};
-			t.push(i);
+			t.push(r);
 		}
 		return {
 			nodes: e,
@@ -3025,7 +3121,7 @@ var w = C, T = [
 			direction: this.getDirection()
 		};
 	}
-}, j = /* @__PURE__ */ p((e) => `g.classGroup text {
+}, j = /* @__PURE__ */ t((e) => `g.classGroup text {
   fill: ${e.nodeBorder || e.classText};
   stroke: none;
   font-family: ${e.fontFamily};
@@ -3226,23 +3322,23 @@ g.classGroup line {
 }
   ${y()}
 `, "getStyles"), M = {
-	getClasses: /* @__PURE__ */ p(function(e, t) {
+	getClasses: /* @__PURE__ */ t(function(e, t) {
 		return t.db.getClasses();
 	}, "getClasses"),
-	draw: /* @__PURE__ */ p(async function(e, t, n, r) {
-		f.info("REF0:"), f.info("Drawing class diagram (v3)", t);
-		let { securityLevel: i, state: a, layout: o } = s();
-		r.db.setDiagramId(t);
-		let c = r.db.getData(), l = x(t, i);
-		c.type = r.type, c.layoutAlgorithm = v(o), c.nodeSpacing = a?.nodeSpacing || 50, c.rankSpacing = a?.rankSpacing || 50, c.markers = [
+	draw: /* @__PURE__ */ t(async function(t, n, r, i) {
+		e.info("REF0:"), e.info("Drawing class diagram (v3)", n);
+		let { securityLevel: a, state: o, layout: s } = f();
+		i.db.setDiagramId(n);
+		let c = i.db.getData(), l = x(n, a);
+		c.type = i.type, c.layoutAlgorithm = v(s), c.nodeSpacing = o?.nodeSpacing || 50, c.rankSpacing = o?.rankSpacing || 50, c.markers = [
 			"aggregation",
 			"extension",
 			"composition",
 			"dependency",
 			"lollipop"
-		], c.diagramId = t, await _(c, l), h.insertTitle(l, "classDiagramTitleText", a?.titleTopMargin ?? 25, r.db.getDiagramTitle()), S(l, 8, "classDiagram", a?.useMaxWidth ?? !0);
+		], c.diagramId = n, await _(c, l), g.insertTitle(l, "classDiagramTitleText", o?.titleTopMargin ?? 25, i.db.getDiagramTitle()), S(l, 8, "classDiagram", o?.useMaxWidth ?? !0);
 	}, "draw"),
-	getDir: /* @__PURE__ */ p((e, t = "TB") => {
+	getDir: /* @__PURE__ */ t((e, t = "TB") => {
 		if (!e.doc) return t;
 		let n = t;
 		for (let t of e.doc) t.stmt === "dir" && (n = t.value);