@marimo-team/islands 0.23.17-dev54 → 0.23.17-dev56

package/dist/{chunk-B4BG7PRW-C0gy-pwj.js → chunk-GF5L2VYU-esTxzELH.js}

@@ -1,25 +1,28 @@
 var _a, _b;
-import { c as getEdgeId, g as utils_default } from "./chunk-S3R3BYOJ-eotljhmB.js";
-import { i as log, r as __name, t as select_default } from "./src-DV3ha_nA.js";
-import { A as parseGenericTypes, B as setAccTitle, C as getDiagramTitle, I as sanitizeText, U as setDiagramTitle, _ as getAccDescription, a as clear, b as getConfig2, s as common_default, v as getAccTitle, z as setAccDescription } from "./chunk-ABZYJK2D-BK1Rtvs7.js";
-import { r as render, t as getRegisteredLayoutAlgorithm } from "./chunk-N4CR4FBY-B3gMBPd2.js";
-import { t as getIconStyles } from "./chunk-FMBD7UC4-quJmebXa.js";
-import { t as getDiagramElement } from "./chunk-55IACEB6-7h71GwyW.js";
-import { t as setupViewPortForSVG } from "./chunk-QN33PNHL-D3s0CL4V.js";
+import { t as purify } from "./purify.es-DR5PNXwx.js";
+import { _ as utils_default, l as getEdgeId } from "./chunk-NSK5VX7P-BmmoJBbx.js";
+import { n as log, t as select_default } from "./src-BwVZVGyf.js";
+import { n as __name } from "./chunk-Y2CYZVJY-DX3DSigL.js";
+import { H as setAccDescription, K as setDiagramTitle, M as parseGenericTypes, U as setAccTitle, a as clear, s as common_default, v as getAccDescription, w as getDiagramTitle, x as getConfig2, y as getAccTitle, z as sanitizeText } from "./chunk-I66GZJ75-9xAsFrdW.js";
+import { r as render, t as getRegisteredLayoutAlgorithm } from "./chunk-J7OUQ5F2-CbNBTlFM.js";
+import { t as getIconStyles } from "./chunk-5VM5RSS4-ChXEBudA.js";
+import { t as createTooltip } from "./chunk-2GRJ4B5K-DRayWnnu.js";
+import { t as getDiagramElement } from "./chunk-XXDRQBXY-Dzcp3rUR.js";
+import { t as setupViewPortForSVG } from "./chunk-KBJHAD2P-B7m9DztL.js";
 var parser = (function() {
-  var e = /* @__PURE__ */ __name(function(e2, t2, n2, r) {
-    for (n2 || (n2 = {}), r = e2.length; r--; n2[e2[r]] = t2) ;
+  var e = /* @__PURE__ */ __name(function(e2, t2, n2, r2) {
+    for (n2 || (n2 = {}), r2 = e2.length; r2--; n2[e2[r2]] = t2) ;
     return n2;
-  }, "o"), t = [1, 18], n = [1, 19], i = [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], n = [1, 19], r = [1, 20], i = [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], P = [1, 63], F = [1, 64], I = [
+  ], 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
-  ], ee = [1, 76], L = [
+  ], te = [1, 77], I = [
     1,
     8,
     9,
@@ -29,6 +32,7 @@ var parser = (function() {
     39,
     41,
     44,
+    46,
     68,
     69,
     70,
@@ -38,7 +42,7 @@ var parser = (function() {
     74,
     79,
     81
-  ], R = [
+  ], L = [
     1,
     8,
     9,
@@ -50,7 +54,8 @@ var parser = (function() {
     39,
     41,
     44,
-    50,
+    46,
+    47,
     60,
     68,
     69,
@@ -65,14 +70,14 @@ var parser = (function() {
     100,
     102,
     103
-  ], z = [
+  ], R = [
     13,
     60,
     86,
     100,
     102,
     103
-  ], B = [
+  ], z = [
     13,
     60,
     73,
@@ -81,7 +86,7 @@ var parser = (function() {
     100,
     102,
     103
-  ], te = [
+  ], ne = [
     13,
     60,
     68,
@@ -93,9 +98,9 @@ var parser = (function() {
     100,
     102,
     103
-  ], ne = [1, 100], V = [1, 117], H = [1, 113], U = [1, 109], W = [1, 115], G = [1, 110], K = [1, 111], q = [1, 112], J = [1, 114], Y = [1, 116], 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,
@@ -104,19 +109,20 @@ var parser = (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, 145], ae = [
+  ], oe = [1, 153], se = [
     1,
     8,
     9,
@@ -126,7 +132,7 @@ var parser = (function() {
     8,
     9,
     22,
-    48,
+    50,
     60,
     61,
     82,
@@ -135,7 +141,7 @@ var parser = (function() {
     88,
     89,
     90
-  ], oe = {
+  ], ce = {
     trace: /* @__PURE__ */ __name(function() {
     }, "trace"),
     yy: {},
@@ -184,11 +190,11 @@ var parser = (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,
@@ -265,10 +271,10 @@ var parser = (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",
@@ -350,6 +356,13 @@ var parser = (function() {
       [23, 4],
       [23, 5],
       [38, 2],
+      [38, 3],
+      [40, 1],
+      [40, 2],
+      [40, 3],
+      [40, 1],
+      [40, 2],
+      [40, 3],
       [40, 1],
       [40, 2],
       [40, 3],
@@ -358,11 +371,14 @@ var parser = (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],
@@ -443,256 +459,284 @@ var parser = (function() {
       [17, 1],
       [55, 1]
     ],
-    performAction: /* @__PURE__ */ __name(function(e2, t2, n2, r, i2, a2, o2) {
-      var s2 = a2.length - 1;
+    performAction: /* @__PURE__ */ __name(function(e2, t2, n2, r2, i2, a, o2) {
+      var s2 = a.length - 1;
       switch (i2) {
         case 8:
-          this.$ = a2[s2 - 1];
+          this.$ = a[s2 - 1];
           break;
         case 9:
         case 10:
         case 13:
         case 15:
-          this.$ = a2[s2];
+          this.$ = a[s2];
           break;
         case 11:
         case 14:
-          this.$ = a2[s2 - 2] + "." + a2[s2];
+          this.$ = a[s2 - 2] + "." + a[s2];
           break;
         case 12:
         case 16:
-          this.$ = a2[s2 - 1] + a2[s2];
+          this.$ = a[s2 - 1] + a[s2];
           break;
         case 17:
         case 18:
-          this.$ = a2[s2 - 1] + "~" + a2[s2] + "~";
+          this.$ = a[s2 - 1] + "~" + a[s2] + "~";
           break;
         case 19:
-          r.addRelation(a2[s2]);
+          r2.addRelation(a[s2]);
           break;
         case 20:
-          a2[s2 - 1].title = r.cleanupLabel(a2[s2]), r.addRelation(a2[s2 - 1]);
+          a[s2 - 1].title = r2.cleanupLabel(a[s2]), r2.addRelation(a[s2 - 1]);
           break;
         case 31:
-          this.$ = a2[s2].trim(), r.setAccTitle(this.$);
+          this.$ = a[s2].trim(), r2.setAccTitle(this.$);
           break;
         case 32:
         case 33:
-          this.$ = a2[s2].trim(), r.setAccDescription(this.$);
+          this.$ = a[s2].trim(), r2.setAccDescription(this.$);
           break;
         case 34:
-          r.addClassesToNamespace(a2[s2 - 3], a2[s2 - 1]);
+          r2.addClassesToNamespace(a[s2 - 3], a[s2 - 1][0], a[s2 - 1][1]), r2.popNamespace();
           break;
         case 35:
-          r.addClassesToNamespace(a2[s2 - 4], a2[s2 - 1]);
+          r2.addClassesToNamespace(a[s2 - 4], a[s2 - 1][0], a[s2 - 1][1]), r2.popNamespace();
           break;
         case 36:
-          this.$ = a2[s2], r.addNamespace(a2[s2]);
+          this.$ = r2.addNamespace(a[s2]);
           break;
         case 37:
-          this.$ = [a2[s2]];
+          this.$ = r2.addNamespace(a[s2 - 1], a[s2]);
           break;
         case 38:
-          this.$ = [a2[s2 - 1]];
+          this.$ = [[a[s2]], []];
           break;
         case 39:
-          a2[s2].unshift(a2[s2 - 2]), this.$ = a2[s2];
+          this.$ = [[a[s2 - 1]], []];
+          break;
+        case 40:
+          a[s2][0].unshift(a[s2 - 2]), this.$ = a[s2];
           break;
         case 41:
-          r.setCssClass(a2[s2 - 2], a2[s2]);
+          this.$ = [[], [a[s2]]];
           break;
         case 42:
-          r.addMembers(a2[s2 - 3], a2[s2 - 1]);
+          this.$ = [[], [a[s2 - 1]]];
           break;
-        case 44:
-          r.setCssClass(a2[s2 - 5], a2[s2 - 3]), r.addMembers(a2[s2 - 5], a2[s2 - 1]);
+        case 43:
+          a[s2][1].unshift(a[s2 - 2]), this.$ = a[s2];
           break;
+        case 44:
         case 45:
-          this.$ = a2[s2], r.addClass(a2[s2]);
+          this.$ = [[], []];
           break;
         case 46:
-          this.$ = a2[s2 - 1], r.addClass(a2[s2 - 1]), r.setClassLabel(a2[s2 - 1], a2[s2]);
+          this.$ = a[s2];
+          break;
+        case 48:
+          r2.setCssClass(a[s2 - 2], a[s2]);
           break;
-        case 50:
-          r.addAnnotation(a2[s2], a2[s2 - 2]);
+        case 49:
+          r2.addMembers(a[s2 - 3], a[s2 - 1]);
           break;
         case 51:
-        case 64:
-          this.$ = [a2[s2]];
+          r2.setCssClass(a[s2 - 5], a[s2 - 3]), r2.addMembers(a[s2 - 5], a[s2 - 1]);
           break;
         case 52:
-          a2[s2].push(a2[s2 - 1]), this.$ = a2[s2];
+          r2.addAnnotation(a[s2 - 3], a[s2 - 1]);
           break;
         case 53:
+          r2.addAnnotation(a[s2 - 6], a[s2 - 4]), r2.addMembers(a[s2 - 6], a[s2 - 1]);
           break;
         case 54:
-          r.addMember(a2[s2 - 1], r.cleanupLabel(a2[s2]));
+          r2.addAnnotation(a[s2 - 5], a[s2 - 3]);
           break;
         case 55:
+          this.$ = a[s2], r2.addClass(a[s2]);
           break;
         case 56:
-          break;
-        case 57:
-          this.$ = {
-            id1: a2[s2 - 2],
-            id2: a2[s2],
-            relation: a2[s2 - 1],
-            relationTitle1: "none",
-            relationTitle2: "none"
-          };
-          break;
-        case 58:
-          this.$ = {
-            id1: a2[s2 - 3],
-            id2: a2[s2],
-            relation: a2[s2 - 1],
-            relationTitle1: a2[s2 - 2],
-            relationTitle2: "none"
-          };
-          break;
-        case 59:
-          this.$ = {
-            id1: a2[s2 - 3],
-            id2: a2[s2],
-            relation: a2[s2 - 2],
-            relationTitle1: "none",
-            relationTitle2: a2[s2 - 1]
-          };
+          this.$ = a[s2 - 1], r2.addClass(a[s2 - 1]), r2.setClassLabel(a[s2 - 1], a[s2]);
           break;
         case 60:
-          this.$ = {
-            id1: a2[s2 - 4],
-            id2: a2[s2],
-            relation: a2[s2 - 2],
-            relationTitle1: a2[s2 - 3],
-            relationTitle2: a2[s2 - 1]
-          };
+          r2.addAnnotation(a[s2], a[s2 - 2]);
           break;
         case 61:
-          r.addNote(a2[s2], a2[s2 - 1]);
+        case 74:
+          this.$ = [a[s2]];
           break;
         case 62:
-          r.addNote(a2[s2]);
+          a[s2].push(a[s2 - 1]), this.$ = a[s2];
           break;
         case 63:
-          this.$ = a2[s2 - 2], r.defineClass(a2[s2 - 1], a2[s2]);
+          break;
+        case 64:
+          r2.addMember(a[s2 - 1], r2.cleanupLabel(a[s2]));
           break;
         case 65:
-          this.$ = a2[s2 - 2].concat([a2[s2]]);
           break;
         case 66:
-          r.setDirection("TB");
           break;
         case 67:
-          r.setDirection("BT");
+          this.$ = {
+            id1: a[s2 - 2],
+            id2: a[s2],
+            relation: a[s2 - 1],
+            relationTitle1: "none",
+            relationTitle2: "none"
+          };
           break;
         case 68:
-          r.setDirection("RL");
+          this.$ = {
+            id1: a[s2 - 3],
+            id2: a[s2],
+            relation: a[s2 - 1],
+            relationTitle1: a[s2 - 2],
+            relationTitle2: "none"
+          };
           break;
         case 69:
-          r.setDirection("LR");
+          this.$ = {
+            id1: a[s2 - 3],
+            id2: a[s2],
+            relation: a[s2 - 2],
+            relationTitle1: "none",
+            relationTitle2: a[s2 - 1]
+          };
           break;
         case 70:
           this.$ = {
-            type1: a2[s2 - 2],
-            type2: a2[s2],
-            lineType: a2[s2 - 1]
+            id1: a[s2 - 4],
+            id2: a[s2],
+            relation: a[s2 - 2],
+            relationTitle1: a[s2 - 3],
+            relationTitle2: a[s2 - 1]
           };
           break;
         case 71:
-          this.$ = {
-            type1: "none",
-            type2: a2[s2],
-            lineType: a2[s2 - 1]
-          };
+          this.$ = r2.addNote(a[s2], a[s2 - 1]);
           break;
         case 72:
-          this.$ = {
-            type1: a2[s2 - 1],
-            type2: "none",
-            lineType: a2[s2]
-          };
+          this.$ = r2.addNote(a[s2]);
           break;
         case 73:
-          this.$ = {
-            type1: "none",
-            type2: "none",
-            lineType: a2[s2]
-          };
-          break;
-        case 74:
-          this.$ = r.relationType.AGGREGATION;
+          this.$ = a[s2 - 2], r2.defineClass(a[s2 - 1], a[s2]);
           break;
         case 75:
-          this.$ = r.relationType.EXTENSION;
+          this.$ = a[s2 - 2].concat([a[s2]]);
           break;
         case 76:
-          this.$ = r.relationType.COMPOSITION;
+          r2.setDirection("TB");
           break;
         case 77:
-          this.$ = r.relationType.DEPENDENCY;
+          r2.setDirection("BT");
           break;
         case 78:
-          this.$ = r.relationType.LOLLIPOP;
+          r2.setDirection("RL");
           break;
         case 79:
-          this.$ = r.lineType.LINE;
+          r2.setDirection("LR");
           break;
         case 80:
-          this.$ = r.lineType.DOTTED_LINE;
+          this.$ = {
+            type1: a[s2 - 2],
+            type2: a[s2],
+            lineType: a[s2 - 1]
+          };
           break;
         case 81:
-        case 87:
-          this.$ = a2[s2 - 2], r.setClickEvent(a2[s2 - 1], a2[s2]);
+          this.$ = {
+            type1: "none",
+            type2: a[s2],
+            lineType: a[s2 - 1]
+          };
           break;
         case 82:
-        case 88:
-          this.$ = a2[s2 - 3], r.setClickEvent(a2[s2 - 2], a2[s2 - 1]), r.setTooltip(a2[s2 - 2], a2[s2]);
+          this.$ = {
+            type1: a[s2 - 1],
+            type2: "none",
+            lineType: a[s2]
+          };
           break;
         case 83:
-          this.$ = a2[s2 - 2], r.setLink(a2[s2 - 1], a2[s2]);
+          this.$ = {
+            type1: "none",
+            type2: "none",
+            lineType: a[s2]
+          };
           break;
         case 84:
-          this.$ = a2[s2 - 3], r.setLink(a2[s2 - 2], a2[s2 - 1], a2[s2]);
+          this.$ = r2.relationType.AGGREGATION;
           break;
         case 85:
-          this.$ = a2[s2 - 3], r.setLink(a2[s2 - 2], a2[s2 - 1]), r.setTooltip(a2[s2 - 2], a2[s2]);
+          this.$ = r2.relationType.EXTENSION;
           break;
         case 86:
-          this.$ = a2[s2 - 4], r.setLink(a2[s2 - 3], a2[s2 - 2], a2[s2]), r.setTooltip(a2[s2 - 3], a2[s2 - 1]);
+          this.$ = r2.relationType.COMPOSITION;
+          break;
+        case 87:
+          this.$ = r2.relationType.DEPENDENCY;
+          break;
+        case 88:
+          this.$ = r2.relationType.LOLLIPOP;
           break;
         case 89:
-          this.$ = a2[s2 - 3], r.setClickEvent(a2[s2 - 2], a2[s2 - 1], a2[s2]);
+          this.$ = r2.lineType.LINE;
           break;
         case 90:
-          this.$ = a2[s2 - 4], r.setClickEvent(a2[s2 - 3], a2[s2 - 2], a2[s2 - 1]), r.setTooltip(a2[s2 - 3], a2[s2]);
+          this.$ = r2.lineType.DOTTED_LINE;
           break;
         case 91:
-          this.$ = a2[s2 - 3], r.setLink(a2[s2 - 2], a2[s2]);
+        case 97:
+          this.$ = a[s2 - 2], r2.setClickEvent(a[s2 - 1], a[s2]);
           break;
         case 92:
-          this.$ = a2[s2 - 4], r.setLink(a2[s2 - 3], a2[s2 - 1], a2[s2]);
+        case 98:
+          this.$ = a[s2 - 3], r2.setClickEvent(a[s2 - 2], a[s2 - 1]), r2.setTooltip(a[s2 - 2], a[s2]);
           break;
         case 93:
-          this.$ = a2[s2 - 4], r.setLink(a2[s2 - 3], a2[s2 - 1]), r.setTooltip(a2[s2 - 3], a2[s2]);
+          this.$ = a[s2 - 2], r2.setLink(a[s2 - 1], a[s2]);
           break;
         case 94:
-          this.$ = a2[s2 - 5], r.setLink(a2[s2 - 4], a2[s2 - 2], a2[s2]), r.setTooltip(a2[s2 - 4], a2[s2 - 1]);
+          this.$ = a[s2 - 3], r2.setLink(a[s2 - 2], a[s2 - 1], a[s2]);
           break;
         case 95:
-          this.$ = a2[s2 - 2], r.setCssStyle(a2[s2 - 1], a2[s2]);
+          this.$ = a[s2 - 3], r2.setLink(a[s2 - 2], a[s2 - 1]), r2.setTooltip(a[s2 - 2], a[s2]);
           break;
         case 96:
-          r.setCssClass(a2[s2 - 1], a2[s2]);
-          break;
-        case 97:
-          this.$ = [a2[s2]];
+          this.$ = a[s2 - 4], r2.setLink(a[s2 - 3], a[s2 - 2], a[s2]), r2.setTooltip(a[s2 - 3], a[s2 - 1]);
           break;
-        case 98:
-          a2[s2 - 2].push(a2[s2]), this.$ = a2[s2 - 2];
+        case 99:
+          this.$ = a[s2 - 3], r2.setClickEvent(a[s2 - 2], a[s2 - 1], a[s2]);
           break;
         case 100:
-          this.$ = a2[s2 - 1] + a2[s2];
+          this.$ = a[s2 - 4], r2.setClickEvent(a[s2 - 3], a[s2 - 2], a[s2 - 1]), r2.setTooltip(a[s2 - 3], a[s2]);
+          break;
+        case 101:
+          this.$ = a[s2 - 3], r2.setLink(a[s2 - 2], a[s2]);
+          break;
+        case 102:
+          this.$ = a[s2 - 4], r2.setLink(a[s2 - 3], a[s2 - 1], a[s2]);
+          break;
+        case 103:
+          this.$ = a[s2 - 4], r2.setLink(a[s2 - 3], a[s2 - 1]), r2.setTooltip(a[s2 - 3], a[s2]);
+          break;
+        case 104:
+          this.$ = a[s2 - 5], r2.setLink(a[s2 - 4], a[s2 - 2], a[s2]), r2.setTooltip(a[s2 - 4], a[s2 - 1]);
+          break;
+        case 105:
+          this.$ = a[s2 - 2], r2.setCssStyle(a[s2 - 1], a[s2]);
+          break;
+        case 106:
+          r2.setCssClass(a[s2 - 1], a[s2]);
+          break;
+        case 107:
+          this.$ = [a[s2]];
+          break;
+        case 108:
+          a[s2 - 2].push(a[s2]), this.$ = a[s2 - 2];
+          break;
+        case 110:
+          this.$ = a[s2 - 1] + a[s2];
           break;
       }
     }, "anonymous"),
@@ -720,12 +764,12 @@ var parser = (function() {
         32: 17,
         33: t,
         35: n,
-        37: i,
+        37: r,
         38: 22,
-        42: a,
+        42: i,
         43: 23,
         46: o,
-        49: s,
+        48: s,
         51: c,
         52: l,
         54: u,
@@ -766,7 +810,7 @@ var parser = (function() {
       { 34: [1, 51] },
       { 36: [1, 52] },
       e(O, [2, 33]),
-      e(O, [2, 53], {
+      e(O, [2, 63], {
         53: 53,
         66: 56,
         67: 57,
@@ -778,17 +822,18 @@ var parser = (function() {
         71: M,
         72: N,
         73: P,
-        74: F
+        74: ee
       }),
       { 39: [1, 65] },
-      e(I, [2, 40], {
+      e(F, [2, 47], {
         39: [1, 67],
-        44: [1, 66]
+        44: [1, 66],
+        46: [1, 68]
       }),
-      e(O, [2, 55]),
-      e(O, [2, 56]),
+      e(O, [2, 65]),
+      e(O, [2, 66]),
       {
-        16: 68,
+        16: 69,
         60: p,
         86: C,
         100: w,
@@ -797,7 +842,7 @@ var parser = (function() {
       {
         16: 39,
         17: 40,
-        19: 69,
+        19: 70,
         60: p,
         86: C,
         100: w,
@@ -807,7 +852,7 @@ var parser = (function() {
       {
         16: 39,
         17: 40,
-        19: 70,
+        19: 71,
         60: p,
         86: C,
         100: w,
@@ -817,19 +862,19 @@ var parser = (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,
@@ -837,34 +882,34 @@ var parser = (function() {
         103: E
       },
       {
-        13: ee,
-        55: 75
+        13: te,
+        55: 76
       },
       {
-        58: 77,
-        60: [1, 78]
+        58: 78,
+        60: [1, 79]
       },
-      e(O, [2, 66]),
-      e(O, [2, 67]),
-      e(O, [2, 68]),
-      e(O, [2, 69]),
-      e(L, [2, 13], {
+      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(L, [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,
@@ -874,17 +919,17 @@ var parser = (function() {
       {
         16: 39,
         17: 40,
-        19: 86,
+        19: 87,
         60: p,
         86: C,
         100: w,
         102: T,
         103: E
       },
-      e(R, [2, 123]),
-      e(R, [2, 124]),
-      e(R, [2, 125]),
-      e(R, [2, 126]),
+      e(L, [2, 133]),
+      e(L, [2, 134]),
+      e(L, [2, 135]),
+      e(L, [2, 136]),
       e([
         1,
         8,
@@ -896,6 +941,7 @@ var parser = (function() {
         39,
         41,
         44,
+        46,
         68,
         69,
         70,
@@ -905,7 +951,7 @@ var parser = (function() {
         74,
         79,
         81
-      ], [2, 127]),
+      ], [2, 137]),
       e(D, [2, 6], {
         10: 5,
         21: 7,
@@ -924,13 +970,13 @@ var parser = (function() {
         43: 23,
         16: 39,
         17: 40,
-        5: 87,
+        5: 88,
         33: t,
         35: n,
-        37: i,
-        42: a,
+        37: r,
+        42: i,
         46: o,
-        49: s,
+        48: s,
         51: c,
         52: l,
         54: u,
@@ -952,7 +998,7 @@ var parser = (function() {
         103: E
       }),
       {
-        5: 88,
+        5: 89,
         10: 5,
         16: 39,
         17: 40,
@@ -970,12 +1016,12 @@ var parser = (function() {
         32: 17,
         33: t,
         35: n,
-        37: i,
+        37: r,
         38: 22,
-        42: a,
+        42: i,
         43: 23,
         46: o,
-        49: s,
+        48: s,
         51: c,
         52: l,
         54: u,
@@ -1000,10 +1046,10 @@ var parser = (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,
@@ -1011,7 +1057,7 @@ var parser = (function() {
         103: E
       },
       {
-        53: 91,
+        53: 92,
         66: 56,
         67: 57,
         68: k,
@@ -1020,130 +1066,146 @@ var parser = (function() {
         71: M,
         72: N,
         73: P,
-        74: F
+        74: ee
       },
-      e(O, [2, 54]),
+      e(O, [2, 64]),
       {
-        67: 92,
+        67: 93,
         73: P,
-        74: F
+        74: ee
       },
-      e(z, [2, 73], {
-        66: 93,
+      e(R, [2, 83], {
+        66: 94,
         68: k,
         69: A,
         70: j,
         71: M,
         72: N
       }),
-      e(B, [2, 74]),
-      e(B, [2, 75]),
-      e(B, [2, 76]),
-      e(B, [2, 77]),
-      e(B, [2, 78]),
-      e(te, [2, 79]),
-      e(te, [2, 80]),
+      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,
-        40: 94,
+        8: [1, 96],
+        23: 99,
+        24: 97,
+        30: 98,
+        38: 22,
+        40: 95,
+        42: i,
         43: 23,
-        46: o
+        48: s,
+        54: u,
+        56: d
       },
       {
-        16: 97,
+        16: 100,
         60: p,
         86: C,
         100: w,
         102: T
       },
       {
-        41: [1, 99],
-        45: 98,
-        51: ne
+        41: [1, 102],
+        45: 101,
+        51: B
       },
-      { 50: [1, 101] },
-      { 13: [1, 102] },
-      { 13: [1, 103] },
       {
-        79: [1, 104],
-        81: [1, 105]
+        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: 106,
+        50: H,
+        59: 110,
         60: U,
         82: W,
-        84: 107,
-        85: 108,
+        84: 111,
+        85: 112,
         86: G,
         87: K,
         88: q,
         89: J,
         90: Y
       },
-      { 60: [1, 118] },
+      { 60: [1, 122] },
       {
-        13: ee,
-        55: 119
+        13: te,
+        55: 123
       },
-      e(O, [2, 62]),
-      e(O, [2, 128]),
+      e(F, [2, 72]),
+      e(F, [2, 138]),
       {
         22: V,
-        48: H,
-        59: 120,
+        50: H,
+        59: 124,
         60: U,
-        61: [1, 121],
+        61: [1, 125],
         82: W,
-        84: 107,
-        85: 108,
+        84: 111,
+        85: 112,
         86: G,
         87: K,
         88: q,
         89: J,
         90: Y
       },
-      e(re, [2, 64]),
+      e(re, [2, 74]),
       {
         16: 39,
         17: 40,
-        19: 122,
+        19: 126,
         60: p,
         86: C,
         100: w,
         102: T,
         103: E
       },
-      e(L, [2, 16]),
-      e(L, [2, 17]),
-      e(L, [2, 18]),
-      { 39: [2, 36] },
+      e(I, [2, 16]),
+      e(I, [2, 17]),
+      e(I, [2, 18]),
       {
-        15: 124,
-        16: 84,
-        17: 85,
-        18: [1, 123],
-        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, 45], {
-        11: 125,
-        12: [1, 126]
+      }),
+      e(X, [2, 10]),
+      e(ae, [2, 55], {
+        11: 131,
+        12: ie
       }),
       e(D, [2, 7]),
-      { 9: [1, 127] },
-      e(Z, [2, 57]),
+      { 9: [1, 132] },
+      e(Z, [2, 67]),
       {
         16: 39,
         17: 40,
-        19: 128,
+        19: 133,
         60: p,
         86: C,
         100: w,
@@ -1151,69 +1213,84 @@ var parser = (function() {
         103: E
       },
       {
-        13: [1, 130],
+        13: [1, 135],
         16: 39,
         17: 40,
-        19: 129,
+        19: 134,
         60: p,
         86: C,
         100: w,
         102: T,
         103: E
       },
-      e(z, [2, 72], {
-        66: 131,
+      e(R, [2, 82], {
+        66: 136,
         68: k,
         69: A,
         70: j,
         71: M,
         72: N
       }),
-      e(z, [2, 71]),
-      { 41: [1, 132] },
+      e(R, [2, 81]),
+      { 41: [1, 137] },
       {
-        24: 96,
-        40: 133,
+        23: 99,
+        24: 97,
+        30: 98,
+        38: 22,
+        40: 138,
+        42: i,
         43: 23,
-        46: o
+        48: s,
+        54: u,
+        56: d
+      },
+      {
+        8: [1, 139],
+        41: [2, 38]
       },
       {
-        8: [1, 134],
-        41: [2, 37]
+        8: [1, 140],
+        41: [2, 41]
       },
-      e(I, [2, 41], { 39: [1, 135] }),
-      { 41: [1, 136] },
-      e(I, [2, 43]),
       {
-        41: [2, 51],
-        45: 137,
-        51: ne
+        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: 138,
+        19: 146,
         60: p,
         86: C,
         100: w,
         102: T,
         103: E
       },
-      e(O, [2, 81], { 13: [1, 139] }),
-      e(O, [2, 83], {
-        13: [1, 141],
-        77: [1, 140]
+      e(O, [2, 91], { 13: [1, 147] }),
+      e(O, [2, 93], {
+        13: [1, 149],
+        77: [1, 148]
       }),
-      e(O, [2, 87], {
-        13: [1, 142],
-        80: [1, 143]
+      e(O, [2, 97], {
+        13: [1, 150],
+        80: [1, 151]
       }),
-      { 13: [1, 144] },
-      e(O, [2, 95], { 61: ie }),
-      e(ae, [2, 97], {
-        85: 146,
+      { 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,
@@ -1222,102 +1299,143 @@ var parser = (function() {
         89: J,
         90: Y
       }),
-      e(Q, [2, 99]),
-      e(Q, [2, 101]),
-      e(Q, [2, 102]),
-      e(Q, [2, 103]),
-      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(O, [2, 96]),
-      e(O, [2, 61]),
-      e(O, [2, 63], { 61: ie }),
-      { 60: [1, 147] },
-      e(L, [2, 14]),
+      e(Q, [2, 111]),
+      e(Q, [2, 112]),
+      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: 148,
-        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, 46]),
-      { 13: [1, 149] },
+      e(X, [2, 12]),
+      e(ae, [2, 56]),
       { 1: [2, 4] },
-      e(Z, [2, 59]),
-      e(Z, [2, 58]),
+      e(Z, [2, 69]),
+      e(Z, [2, 68]),
       {
         16: 39,
         17: 40,
-        19: 150,
+        19: 158,
         60: p,
         86: C,
         100: w,
         102: T,
         103: E
       },
-      e(z, [2, 70]),
-      e(O, [2, 34]),
-      { 41: [1, 151] },
+      e(R, [2, 80]),
+      e(F, [2, 34]),
+      { 41: [1, 159] },
       {
-        24: 96,
-        40: 152,
-        41: [2, 38],
+        23: 99,
+        24: 97,
+        30: 98,
+        38: 22,
+        40: 160,
+        41: [2, 39],
+        42: i,
         43: 23,
-        46: o
+        48: s,
+        54: u,
+        56: d
       },
       {
-        45: 153,
-        51: ne
+        23: 99,
+        24: 97,
+        30: 98,
+        38: 22,
+        40: 161,
+        41: [2, 42],
+        42: i,
+        43: 23,
+        48: s,
+        54: u,
+        56: d
       },
-      e(I, [2, 42]),
-      { 41: [2, 52] },
-      e(O, [2, 50]),
-      e(O, [2, 82]),
-      e(O, [2, 84]),
-      e(O, [2, 85], { 77: [1, 154] }),
-      e(O, [2, 88]),
-      e(O, [2, 89], { 13: [1, 155] }),
-      e(O, [2, 91], {
-        13: [1, 157],
-        77: [1, 156]
+      {
+        23: 99,
+        24: 97,
+        30: 98,
+        38: 22,
+        40: 162,
+        41: [2, 45],
+        42: i,
+        43: 23,
+        48: s,
+        54: u,
+        56: d
+      },
+      {
+        45: 163,
+        51: B
+      },
+      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: 158,
-        85: 108,
+        84: 169,
+        85: 112,
         86: G,
         87: K,
         88: q,
         89: J,
         90: Y
       },
-      e(Q, [2, 100]),
-      e(re, [2, 65]),
-      { 39: [2, 11] },
-      { 14: [1, 159] },
-      e(Z, [2, 60]),
-      e(O, [2, 35]),
-      { 41: [2, 39] },
-      { 41: [1, 160] },
-      e(O, [2, 86]),
-      e(O, [2, 90]),
-      e(O, [2, 92]),
-      e(O, [2, 93], { 77: [1, 161] }),
-      e(ae, [2, 98], {
-        85: 146,
+      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,
@@ -1326,21 +1444,23 @@ var parser = (function() {
         89: J,
         90: Y
       }),
-      e(X, [2, 8]),
-      e(I, [2, 44]),
-      e(O, [2, 94])
+      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],
-      124: [2, 12],
-      127: [2, 4],
-      137: [2, 52],
-      148: [2, 11],
-      152: [2, 39]
+      127: [2, 37],
+      132: [2, 4],
+      144: [2, 62],
+      160: [2, 40],
+      161: [2, 43],
+      162: [2, 46]
     },
     parseError: /* @__PURE__ */ __name(function(e2, t2) {
       if (t2.recoverable) this.trace(e2);
@@ -1350,7 +1470,7 @@ var parser = (function() {
       }
     }, "parseError"),
     parse: /* @__PURE__ */ __name(function(e2) {
-      var t2 = this, n2 = [0], i2 = [], a2 = [null], o2 = [], s2 = this.table, c2 = "", l2 = 0, u2 = 0, d2 = 0, f2 = 2, p2 = 1, m2 = o2.slice.call(arguments, 1), h2 = Object.create(this.lexer), g2 = { yy: {} };
+      var t2 = this, n2 = [0], r2 = [], i2 = [null], o2 = [], s2 = this.table, c2 = "", l2 = 0, u2 = 0, d2 = 0, f2 = 2, p2 = 1, m2 = o2.slice.call(arguments, 1), h2 = Object.create(this.lexer), g2 = { yy: {} };
       for (var _2 in this.yy) Object.prototype.hasOwnProperty.call(this.yy, _2) && (g2.yy[_2] = this.yy[_2]);
       h2.setInput(e2, g2.yy), g2.yy.lexer = h2, g2.yy.parser = this, h2.yylloc === void 0 && (h2.yylloc = {});
       var v2 = h2.yylloc;
@@ -1358,12 +1478,12 @@ var parser = (function() {
       var y2 = h2.options && h2.options.ranges;
       typeof g2.yy.parseError == "function" ? this.parseError = g2.yy.parseError : this.parseError = Object.getPrototypeOf(this).parseError;
       function b2(e3) {
-        n2.length -= 2 * e3, a2.length -= e3, o2.length -= e3;
+        n2.length -= 2 * e3, i2.length -= e3, o2.length -= e3;
       }
       __name(b2, "popStack");
       function x2() {
-        var e3 = i2.pop() || h2.lex() || p2;
-        return typeof e3 != "number" && (e3 instanceof Array && (i2 = e3, e3 = i2.pop()), e3 = t2.symbols_[e3] || e3), e3;
+        var e3 = r2.pop() || h2.lex() || p2;
+        return typeof e3 != "number" && (e3 instanceof Array && (r2 = e3, e3 = r2.pop()), e3 = t2.symbols_[e3] || e3), e3;
       }
       __name(x2, "lex");
       for (var S2, C2, w2, T2, E2, D2 = {}, O2, k2, A2, j2; ; ) {
@@ -1381,10 +1501,10 @@ var parser = (function() {
         if (T2[0] instanceof Array && T2.length > 1) throw Error("Parse Error: multiple actions possible at state: " + w2 + ", token: " + S2);
         switch (T2[0]) {
           case 1:
-            n2.push(S2), a2.push(h2.yytext), o2.push(h2.yylloc), n2.push(T2[1]), S2 = null, C2 ? (S2 = C2, C2 = null) : (u2 = h2.yyleng, c2 = h2.yytext, l2 = h2.yylineno, v2 = h2.yylloc, d2 > 0 && d2--);
+            n2.push(S2), i2.push(h2.yytext), o2.push(h2.yylloc), n2.push(T2[1]), S2 = null, C2 ? (S2 = C2, C2 = null) : (u2 = h2.yyleng, c2 = h2.yytext, l2 = h2.yylineno, v2 = h2.yylloc, d2 > 0 && d2--);
             break;
           case 2:
-            if (k2 = this.productions_[T2[1]][1], D2.$ = a2[a2.length - k2], D2._$ = {
+            if (k2 = this.productions_[T2[1]][1], D2.$ = i2[i2.length - k2], D2._$ = {
               first_line: o2[o2.length - (k2 || 1)].first_line,
               last_line: o2[o2.length - 1].last_line,
               first_column: o2[o2.length - (k2 || 1)].first_column,
@@ -1395,10 +1515,10 @@ var parser = (function() {
               l2,
               g2.yy,
               T2[1],
-              a2,
+              i2,
               o2
             ].concat(m2)), E2 !== void 0) return E2;
-            k2 && (n2 = n2.slice(0, -1 * k2 * 2), a2 = a2.slice(0, -1 * k2), o2 = o2.slice(0, -1 * k2)), n2.push(this.productions_[T2[1]][0]), a2.push(D2.$), o2.push(D2._$), A2 = s2[n2[n2.length - 2]][n2[n2.length - 1]], n2.push(A2);
+            k2 && (n2 = n2.slice(0, -1 * k2 * 2), i2 = i2.slice(0, -1 * k2), o2 = o2.slice(0, -1 * k2)), n2.push(this.productions_[T2[1]][0]), i2.push(D2.$), o2.push(D2._$), A2 = s2[n2[n2.length - 2]][n2[n2.length - 1]], n2.push(A2);
             break;
           case 3:
             return true;
@@ -1407,7 +1527,7 @@ var parser = (function() {
       return true;
     }, "parse")
   };
-  oe.lexer = /* @__PURE__ */ (function() {
+  ce.lexer = /* @__PURE__ */ (function() {
     return {
       EOF: 1,
       parseError: /* @__PURE__ */ __name(function(e2, t2) {
@@ -1429,14 +1549,14 @@ var parser = (function() {
       unput: /* @__PURE__ */ __name(function(e2) {
         var t2 = e2.length, n2 = e2.split(/(?:\r\n?|\n)/g);
         this._input = e2 + this._input, this.yytext = this.yytext.substr(0, this.yytext.length - t2), this.offset -= t2;
-        var r = this.match.split(/(?:\r\n?|\n)/g);
+        var r2 = this.match.split(/(?:\r\n?|\n)/g);
         this.match = this.match.substr(0, this.match.length - 1), this.matched = this.matched.substr(0, this.matched.length - 1), n2.length - 1 && (this.yylineno -= n2.length - 1);
         var i2 = this.yylloc.range;
         return this.yylloc = {
           first_line: this.yylloc.first_line,
           last_line: this.yylineno + 1,
           first_column: this.yylloc.first_column,
-          last_column: n2 ? (n2.length === r.length ? this.yylloc.first_column : 0) + r[r.length - n2.length].length - n2[0].length : this.yylloc.first_column - t2
+          last_column: n2 ? (n2.length === r2.length ? this.yylloc.first_column : 0) + r2[r2.length - n2.length].length - n2[0].length : this.yylloc.first_column - t2
         }, this.options.ranges && (this.yylloc.range = [i2[0], i2[0] + this.yyleng - t2]), this.yyleng = this.yytext.length, this;
       }, "unput"),
       more: /* @__PURE__ */ __name(function() {
@@ -1467,7 +1587,7 @@ var parser = (function() {
         return e2 + this.upcomingInput() + "\n" + t2 + "^";
       }, "showPosition"),
       test_match: /* @__PURE__ */ __name(function(e2, t2) {
-        var n2, r, i2;
+        var n2, r2, i2;
         if (this.options.backtrack_lexer && (i2 = {
           yylineno: this.yylineno,
           yylloc: {
@@ -1487,14 +1607,14 @@ var parser = (function() {
           yy: this.yy,
           conditionStack: this.conditionStack.slice(0),
           done: this.done
-        }, this.options.ranges && (i2.yylloc.range = this.yylloc.range.slice(0))), r = e2[0].match(/(?:\r\n?|\n).*/g), r && (this.yylineno += r.length), this.yylloc = {
+        }, this.options.ranges && (i2.yylloc.range = this.yylloc.range.slice(0))), r2 = e2[0].match(/(?:\r\n?|\n).*/g), r2 && (this.yylineno += r2.length), this.yylloc = {
           first_line: this.yylloc.last_line,
           last_line: this.yylineno + 1,
           first_column: this.yylloc.last_column,
-          last_column: r ? r[r.length - 1].length - r[r.length - 1].match(/\r?\n?/)[0].length : this.yylloc.last_column + e2[0].length
+          last_column: r2 ? r2[r2.length - 1].length - r2[r2.length - 1].match(/\r?\n?/)[0].length : this.yylloc.last_column + e2[0].length
         }, this.yytext += e2[0], this.match += e2[0], this.matches = e2, this.yyleng = this.yytext.length, this.options.ranges && (this.yylloc.range = [this.offset, this.offset += this.yyleng]), this._more = false, this._backtrack = false, this._input = this._input.slice(e2[0].length), this.matched += e2[0], n2 = this.performAction.call(this, this.yy, this, t2, this.conditionStack[this.conditionStack.length - 1]), this.done && this._input && (this.done = false), n2) return n2;
         if (this._backtrack) {
-          for (var a2 in i2) this[a2] = i2[a2];
+          for (var a in i2) this[a] = i2[a];
           return false;
         }
         return false;
@@ -1502,18 +1622,18 @@ var parser = (function() {
       next: /* @__PURE__ */ __name(function() {
         if (this.done) return this.EOF;
         this._input || (this.done = true);
-        var e2, t2, n2, r;
+        var e2, t2, n2, r2;
         this._more || (this.yytext = "", this.match = "");
-        for (var i2 = this._currentRules(), a2 = 0; a2 < i2.length; a2++) if (n2 = this._input.match(this.rules[i2[a2]]), n2 && (!t2 || n2[0].length > t2[0].length)) {
-          if (t2 = n2, r = a2, this.options.backtrack_lexer) {
-            if (e2 = this.test_match(n2, i2[a2]), e2 !== false) return e2;
+        for (var i2 = this._currentRules(), a = 0; a < i2.length; a++) if (n2 = this._input.match(this.rules[i2[a]]), n2 && (!t2 || n2[0].length > t2[0].length)) {
+          if (t2 = n2, r2 = a, this.options.backtrack_lexer) {
+            if (e2 = this.test_match(n2, i2[a]), e2 !== false) return e2;
             if (this._backtrack) {
               t2 = false;
               continue;
             } else return false;
           } else if (!this.options.flex) break;
         }
-        return t2 ? (e2 = this.test_match(t2, i2[r]), e2 === false ? false : e2) : this._input === "" ? this.EOF : this.parseError("Lexical error on line " + (this.yylineno + 1) + ". Unrecognized text.\n" + this.showPosition(), {
+        return t2 ? (e2 = this.test_match(t2, i2[r2]), e2 === false ? false : e2) : this._input === "" ? this.EOF : this.parseError("Lexical error on line " + (this.yylineno + 1) + ". Unrecognized text.\n" + this.showPosition(), {
           text: "",
           token: null,
           line: this.yylineno
@@ -1541,7 +1661,7 @@ var parser = (function() {
         return this.conditionStack.length;
       }, "stateStackSize"),
       options: {},
-      performAction: /* @__PURE__ */ __name(function(e2, t2, n2, r) {
+      performAction: /* @__PURE__ */ __name(function(e2, t2, n2, r2) {
         switch (n2) {
           case 0:
             return 62;
@@ -1618,73 +1738,74 @@ var parser = (function() {
           case 32:
             return this.begin("namespace-body"), 39;
           case 33:
-            return this.popState(), 41;
+            this.popState(), this.less(0);
+            break;
           case 34:
-            return "EOF_IN_STRUCT";
+            return this.popState(), 41;
           case 35:
-            return 8;
+            return "EOF_IN_STRUCT";
           case 36:
-            break;
+            return 8;
           case 37:
-            return "EDGE_STATE";
+            break;
           case 38:
-            return this.begin("class"), 46;
+            return "EDGE_STATE";
           case 39:
-            return this.popState(), 8;
+            return this.begin("class"), 48;
           case 40:
-            break;
+            return this.popState(), 8;
           case 41:
-            return this.popState(), this.popState(), 41;
+            break;
           case 42:
-            return this.begin("class-body"), 39;
+            return this.popState(), this.popState(), 41;
           case 43:
-            return this.popState(), 41;
+            return this.begin("class-body"), 39;
           case 44:
-            return "EOF_IN_STRUCT";
+            return this.popState(), 41;
           case 45:
-            return "EDGE_STATE";
+            return "EOF_IN_STRUCT";
           case 46:
-            return "OPEN_IN_STRUCT";
+            return "EDGE_STATE";
           case 47:
-            break;
+            return "OPEN_IN_STRUCT";
           case 48:
-            return "MEMBER";
+            break;
           case 49:
-            return 83;
+            return "MEMBER";
           case 50:
-            return 75;
+            return 83;
           case 51:
-            return 76;
+            return 75;
           case 52:
-            return 78;
+            return 76;
           case 53:
-            return 54;
+            return 78;
           case 54:
-            return 56;
+            return 54;
           case 55:
-            return 49;
+            return 56;
           case 56:
-            return 50;
+            return 46;
           case 57:
-            return 81;
+            return 47;
           case 58:
+            return 81;
+          case 59:
             this.popState();
             break;
-          case 59:
-            return "GENERICTYPE";
           case 60:
+            return "GENERICTYPE";
+          case 61:
             this.begin("generic");
             break;
-          case 61:
+          case 62:
             this.popState();
             break;
-          case 62:
-            return "BQUOTE_STR";
           case 63:
+            return "BQUOTE_STR";
+          case 64:
             this.begin("bqstring");
             break;
-          case 64:
-            return 77;
           case 65:
             return 77;
           case 66:
@@ -1692,64 +1813,66 @@ var parser = (function() {
           case 67:
             return 77;
           case 68:
-            return 69;
+            return 77;
           case 69:
             return 69;
           case 70:
-            return 71;
+            return 69;
           case 71:
             return 71;
           case 72:
-            return 70;
+            return 71;
           case 73:
-            return 68;
+            return 70;
           case 74:
-            return 72;
+            return 68;
           case 75:
-            return 73;
+            return 72;
           case 76:
-            return 74;
+            return 73;
           case 77:
-            return 22;
+            return 74;
           case 78:
-            return 44;
+            return 22;
           case 79:
-            return 100;
+            return 44;
           case 80:
-            return 18;
+            return 100;
           case 81:
-            return "PLUS";
+            return 18;
           case 82:
-            return 87;
+            return "PLUS";
           case 83:
-            return 61;
+            return 87;
           case 84:
-            return 89;
+            return 61;
           case 85:
             return 89;
           case 86:
-            return 90;
+            return 89;
           case 87:
-            return "EQUALS";
+            return 90;
           case 88:
             return "EQUALS";
           case 89:
-            return 60;
+            return "EQUALS";
           case 90:
-            return 12;
+            return 60;
           case 91:
-            return 14;
+            return 12;
           case 92:
-            return "PUNCTUATION";
+            return 14;
           case 93:
-            return 86;
+            return "PUNCTUATION";
           case 94:
-            return 102;
+            return 86;
           case 95:
-            return 48;
+            return 102;
           case 96:
-            return 48;
+            return 50;
           case 97:
+            return 50;
+          case 98:
             return 9;
         }
       }, "anonymous"),
@@ -1788,6 +1911,7 @@ var parser = (function() {
         /^(?:\s+)/,
         /^(?:[{])/,
         /^(?:[}])/,
+        /^(?:[}])/,
         /^(?:$)/,
         /^(?:\s*(\r?\n)+)/,
         /^(?:\s+)/,
@@ -1857,13 +1981,13 @@ var parser = (function() {
         "namespace-body": {
           rules: [
             26,
-            33,
+            29,
             34,
             35,
             36,
             37,
             38,
-            49,
+            39,
             50,
             51,
             52,
@@ -1872,8 +1996,8 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
-            63,
+            58,
+            61,
             64,
             65,
             66,
@@ -1892,7 +2016,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -1902,7 +2026,8 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
@@ -1913,7 +2038,7 @@ var parser = (function() {
             30,
             31,
             32,
-            49,
+            33,
             50,
             51,
             52,
@@ -1922,8 +2047,8 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
-            63,
+            58,
+            61,
             64,
             65,
             66,
@@ -1942,7 +2067,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -1952,14 +2077,14 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
         "class-body": {
           rules: [
             26,
-            43,
             44,
             45,
             46,
@@ -1974,8 +2099,8 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
-            63,
+            58,
+            61,
             64,
             65,
             66,
@@ -1994,7 +2119,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -2004,18 +2129,18 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
         class: {
           rules: [
             26,
-            39,
             40,
             41,
             42,
-            49,
+            43,
             50,
             51,
             52,
@@ -2024,8 +2149,8 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
-            63,
+            58,
+            61,
             64,
             65,
             66,
@@ -2044,7 +2169,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -2054,7 +2179,8 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
@@ -2063,7 +2189,6 @@ var parser = (function() {
             11,
             12,
             26,
-            49,
             50,
             51,
             52,
@@ -2072,8 +2197,8 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
-            63,
+            58,
+            61,
             64,
             65,
             66,
@@ -2092,7 +2217,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -2102,7 +2227,8 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
@@ -2110,7 +2236,6 @@ var parser = (function() {
           rules: [
             9,
             26,
-            49,
             50,
             51,
             52,
@@ -2119,8 +2244,8 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
-            63,
+            58,
+            61,
             64,
             65,
             66,
@@ -2139,7 +2264,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -2149,7 +2274,8 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
@@ -2157,7 +2283,6 @@ var parser = (function() {
           rules: [
             7,
             26,
-            49,
             50,
             51,
             52,
@@ -2166,8 +2291,8 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
-            63,
+            58,
+            61,
             64,
             65,
             66,
@@ -2186,7 +2311,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -2196,7 +2321,8 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
@@ -2205,7 +2331,6 @@ var parser = (function() {
             22,
             23,
             26,
-            49,
             50,
             51,
             52,
@@ -2214,8 +2339,8 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
-            63,
+            58,
+            61,
             64,
             65,
             66,
@@ -2234,7 +2359,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -2244,7 +2369,8 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
@@ -2254,7 +2380,6 @@ var parser = (function() {
             20,
             21,
             26,
-            49,
             50,
             51,
             52,
@@ -2263,8 +2388,8 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
-            63,
+            58,
+            61,
             64,
             65,
             66,
@@ -2283,7 +2408,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -2293,14 +2418,14 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
         href: {
           rules: [
             26,
-            49,
             50,
             51,
             52,
@@ -2309,8 +2434,8 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
-            63,
+            58,
+            61,
             64,
             65,
             66,
@@ -2329,7 +2454,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -2339,14 +2464,14 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
         struct: {
           rules: [
             26,
-            49,
             50,
             51,
             52,
@@ -2355,8 +2480,8 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
-            63,
+            58,
+            61,
             64,
             65,
             66,
@@ -2375,7 +2500,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -2385,14 +2510,14 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
         generic: {
           rules: [
             26,
-            49,
             50,
             51,
             52,
@@ -2404,7 +2529,7 @@ var parser = (function() {
             58,
             59,
             60,
-            63,
+            61,
             64,
             65,
             66,
@@ -2423,7 +2548,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -2433,14 +2558,14 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
         bqstring: {
           rules: [
             26,
-            49,
             50,
             51,
             52,
@@ -2449,7 +2574,7 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
+            58,
             61,
             62,
             63,
@@ -2471,7 +2596,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -2481,7 +2606,8 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
@@ -2490,7 +2616,6 @@ var parser = (function() {
             24,
             25,
             26,
-            49,
             50,
             51,
             52,
@@ -2499,8 +2624,8 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
-            63,
+            58,
+            61,
             64,
             65,
             66,
@@ -2519,7 +2644,7 @@ var parser = (function() {
             79,
             80,
             81,
-            86,
+            82,
             87,
             88,
             89,
@@ -2529,7 +2654,8 @@ var parser = (function() {
             93,
             94,
             95,
-            97
+            96,
+            98
           ],
           inclusive: false
         },
@@ -2554,8 +2680,7 @@ var parser = (function() {
             27,
             28,
             29,
-            38,
-            49,
+            39,
             50,
             51,
             52,
@@ -2564,8 +2689,8 @@ var parser = (function() {
             55,
             56,
             57,
-            60,
-            63,
+            58,
+            61,
             64,
             65,
             66,
@@ -2599,7 +2724,8 @@ var parser = (function() {
             94,
             95,
             96,
-            97
+            97,
+            98
           ],
           inclusive: true
         }
@@ -2609,7 +2735,7 @@ var parser = (function() {
   function $() {
     this.yy = {};
   }
-  return __name($, "Parser"), $.prototype = oe, oe.Parser = $, new $();
+  return __name($, "Parser"), $.prototype = ce, ce.Parser = $, new $();
 })();
 parser.parser = parser;
 var classDiagram_default = parser, visibilityValues = [
@@ -2662,7 +2788,7 @@ var classDiagram_default = parser, visibilityValues = [
   }
 }, __name(_a, "ClassMember"), _a), MERMAID_DOM_ID_PREFIX = "classId-", classCounter = 0, sanitizeText2 = /* @__PURE__ */ __name((e) => common_default.sanitizeText(e, getConfig2()), "sanitizeText"), ClassDB = (_b = class {
   constructor() {
-    this.relations = [], this.classes = /* @__PURE__ */ new Map(), this.styleClasses = /* @__PURE__ */ new Map(), this.notes = [], 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 = {
@@ -2671,17 +2797,19 @@ var classDiagram_default = parser, visibilityValues = [
       COMPOSITION: 2,
       DEPENDENCY: 3,
       LOLLIPOP: 4
-    }, this.setupToolTips = /* @__PURE__ */ __name((e) => {
-      let t = select_default(".mermaidTooltip");
-      (t._groups || t)[0][0] === null && (t = select_default("body").append("div").attr("class", "mermaidTooltip").style("opacity", 0)), select_default(e).select("svg").selectAll("g.node").on("mouseover", (e2) => {
-        let n = select_default(e2.currentTarget);
-        if (n.attr("title") === null) return;
-        let r = this.getBoundingClientRect();
-        t.transition().duration(200).style("opacity", ".9"), t.text(n.attr("title")).style("left", window.scrollX + r.left + (r.right - r.left) / 2 + "px").style("top", window.scrollY + r.top - 14 + document.body.scrollTop + "px"), t.html(t.html().replace(/&lt;br\/&gt;/g, "<br/>")), n.classed("hover", true);
-      }).on("mouseout", (e2) => {
-        t.transition().duration(500).style("opacity", 0), select_default(e2.currentTarget).classed("hover", false);
+    }, this.setupToolTips = /* @__PURE__ */ __name((t) => {
+      let n = createTooltip();
+      select_default(t).select("svg").selectAll("g").filter(function() {
+        return select_default(this).attr("title") !== null;
+      }).on("mouseover", (t2) => {
+        let r = select_default(t2.currentTarget), a = r.attr("title");
+        if (!a) return;
+        let o = t2.currentTarget.getBoundingClientRect();
+        n.transition().duration(200).style("opacity", ".9"), n.html(purify.sanitize(a)).style("left", `${window.scrollX + o.left + o.width / 2}px`).style("top", `${window.scrollY + o.bottom + 4}px`), r.classed("hover", true);
+      }).on("mouseout", (e) => {
+        n.transition().duration(500).style("opacity", 0), select_default(e.currentTarget).classed("hover", false);
       });
-    }, "setupToolTips"), this.direction = "TB", this.setAccTitle = setAccTitle, this.getAccTitle = getAccTitle, this.setAccDescription = setAccDescription, this.getAccDescription = getAccDescription, this.setDiagramTitle = setDiagramTitle, this.getDiagramTitle = getDiagramTitle, this.getConfig = /* @__PURE__ */ __name(() => getConfig2().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 = setAccTitle, this.getAccTitle = getAccTitle, this.setAccDescription = setAccDescription, this.getAccDescription = getAccDescription, this.setDiagramTitle = setDiagramTitle, this.getDiagramTitle = getDiagramTitle, this.getConfig = /* @__PURE__ */ __name(() => getConfig2().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);
   }
   splitClassNameAndType(e) {
     let t = common_default.sanitizeText(e, getConfig2()), n = "", r = t;
@@ -2726,13 +2854,19 @@ var classDiagram_default = parser, visibilityValues = [
     };
     this.interfaces.push(n);
   }
+  setDiagramId(e) {
+    this.diagramId = e;
+  }
   lookUpDomId(e) {
     let t = common_default.sanitizeText(e, getConfig2());
-    if (this.classes.has(t)) return this.classes.get(t).domId;
+    if (this.classes.has(t)) {
+      let e2 = this.classes.get(t).domId;
+      return this.diagramId ? `${this.diagramId}-${e2}` : e2;
+    }
     throw Error("Class not found: " + t);
   }
   clear() {
-    this.relations = [], this.classes = /* @__PURE__ */ new Map(), this.notes = [], this.interfaces = [], this.functions = [], this.functions.push(this.setupToolTips.bind(this)), this.namespaces = /* @__PURE__ */ new Map(), this.namespaceCounter = 0, this.direction = "TB", 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.namespaceStack = [], this.diagramId = "", this.direction = "TB", clear();
   }
   getClass(e) {
     return this.classes.get(e);
@@ -2743,6 +2877,10 @@ var classDiagram_default = parser, visibilityValues = [
   getRelations() {
     return this.relations;
   }
+  getNote(e) {
+    let t = typeof e == "number" ? `note${e}` : e;
+    return this.notes.get(t);
+  }
   getNotes() {
     return this.notes;
   }
@@ -2773,12 +2911,13 @@ var classDiagram_default = parser, visibilityValues = [
     Array.isArray(t) && (t.reverse(), t.forEach((t2) => this.addMember(e, t2)));
   }
   addNote(e, t) {
-    let n = {
-      id: `note${this.notes.length}`,
+    let n = this.notes.size, r = {
+      id: `note${n}`,
       class: t,
-      text: e
+      text: e,
+      index: n
     };
-    this.notes.push(n);
+    return this.notes.set(r.id, r), r.id;
   }
   cleanupLabel(e) {
     return e.startsWith(":") && (e = e.substring(1)), sanitizeText2(e.trim());
@@ -2786,7 +2925,7 @@ var classDiagram_default = parser, visibilityValues = [
   setCssClass(e, t) {
     e.split(",").forEach((e2) => {
       let n = e2;
-      /\d/.exec(e2[0]) && (n = MERMAID_DOM_ID_PREFIX + n);
+      /\d/.exec(e2[0]) && (n = MERMAID_DOM_ID_PREFIX + n), n = this.splitClassNameAndType(n).className;
       let r = this.classes.get(n);
       r && (r.cssClasses += " " + t);
     });
@@ -2811,7 +2950,10 @@ var classDiagram_default = parser, visibilityValues = [
   }
   setTooltip(e, t) {
     e.split(",").forEach((e2) => {
-      t !== void 0 && (this.classes.get(e2).tooltip = sanitizeText2(t));
+      if (t !== void 0) {
+        let n = this.splitClassNameAndType(e2).className, r = this.classes.get(n);
+        r && (r.tooltip = sanitizeText2(t));
+      }
     });
   }
   getTooltip(e, t) {
@@ -2821,33 +2963,35 @@ var classDiagram_default = parser, visibilityValues = [
     let i = getConfig2();
     e.split(",").forEach((e2) => {
       let a = e2;
-      /\d/.exec(e2[0]) && (a = MERMAID_DOM_ID_PREFIX + a);
+      /\d/.exec(e2[0]) && (a = MERMAID_DOM_ID_PREFIX + a), a = this.splitClassNameAndType(a).className;
       let o = this.classes.get(a);
       o && (o.link = utils_default.formatUrl(n, i), i.securityLevel === "sandbox" ? o.linkTarget = "_top" : typeof r == "string" ? o.linkTarget = sanitizeText2(r) : o.linkTarget = "_blank");
     }), this.setCssClass(e, "clickable");
   }
   setClickEvent(e, t, n) {
     e.split(",").forEach((e2) => {
-      this.setClickFunc(e2, t, n), this.classes.get(e2).haveCallback = true;
+      this.setClickFunc(e2, t, n);
+      let r = this.splitClassNameAndType(e2).className, i = this.classes.get(r);
+      i && (i.haveCallback = true);
     }), this.setCssClass(e, "clickable");
   }
   setClickFunc(e, n, r) {
     let i = common_default.sanitizeText(e, getConfig2());
     if (getConfig2().securityLevel !== "loose" || n === void 0) return;
-    let a = i;
+    let a = this.splitClassNameAndType(i).className;
     if (this.classes.has(a)) {
-      let e2 = this.lookUpDomId(a), i2 = [];
+      let e2 = [];
       if (typeof r == "string") {
-        i2 = r.split(/,(?=(?:(?:[^"]*"){2})*[^"]*$)/);
-        for (let e3 = 0; e3 < i2.length; e3++) {
-          let t = i2[e3].trim();
-          t.startsWith('"') && t.endsWith('"') && (t = t.substr(1, t.length - 2)), i2[e3] = t;
+        e2 = r.split(/,(?=(?:(?:[^"]*"){2})*[^"]*$)/);
+        for (let t = 0; t < e2.length; t++) {
+          let n2 = e2[t].trim();
+          n2.startsWith('"') && n2.endsWith('"') && (n2 = n2.substr(1, n2.length - 2)), e2[t] = n2;
         }
       }
-      i2.length === 0 && i2.push(e2), this.functions.push(() => {
-        let r2 = document.querySelector(`[id="${e2}"]`);
-        r2 !== null && r2.addEventListener("click", () => {
-          utils_default.runFunc(n, ...i2);
+      e2.length === 0 && e2.push(a), this.functions.push(() => {
+        let r2 = this.lookUpDomId(a), i2 = document.querySelector(`[id="${r2}"]`);
+        i2 !== null && i2.addEventListener("click", () => {
+          utils_default.runFunc(n, ...e2);
         }, false);
       });
     }
@@ -2857,19 +3001,56 @@ var classDiagram_default = parser, visibilityValues = [
       t(e);
     });
   }
+  escapeHtml(e) {
+    return e.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+  }
   getDirection() {
     return this.direction;
   }
   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 e2 = 1; e2 < t.length; e2++) n[e2] = `${n[e2 - 1]}.${t[e2]}`;
+    return n;
+  }
+  createNamespaceNode(e, t, n, r = false) {
+    return {
       id: e,
+      label: t,
       classes: /* @__PURE__ */ new Map(),
-      children: {},
-      domId: MERMAID_DOM_ID_PREFIX + e + "-" + this.namespaceCounter
-    }), this.namespaceCounter++);
+      notes: /* @__PURE__ */ new Map(),
+      children: /* @__PURE__ */ new Map(),
+      domId: MERMAID_DOM_ID_PREFIX + 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 ?? (r.parent = e));
+  }
+  addNamespace(e, t) {
+    let n = _b.resolveQualifiedId(e, this.namespaceStack);
+    if (this.namespaceStack.push(n), this.namespaces.has(n)) {
+      let e2 = this.namespaces.get(n);
+      return e2.explicit = true, t && (e2.label = t), n;
+    }
+    let r = n.split("."), i = _b.getAncestorIds(n);
+    for (let e2 = 0; e2 < i.length; e2++) {
+      let n2 = i[e2], a = e2 > 0 ? i[e2 - 1] : void 0, o = e2 === i.length - 1, s = o && t ? t : r[e2];
+      this.namespaces.has(n2) ? o && (this.namespaces.get(n2).explicit = true) : this.namespaces.set(n2, this.createNamespaceNode(n2, s, a, o)), a && this.linkParentChild(a, n2);
+    }
+    return n;
+  }
+  popNamespace() {
+    this.namespaceStack.pop();
   }
   getNamespace(e) {
     return this.namespaces.get(e);
@@ -2877,10 +3058,16 @@ var classDiagram_default = parser, visibilityValues = [
   getNamespaces() {
     return this.namespaces;
   }
-  addClassesToNamespace(e, t) {
-    if (this.namespaces.has(e)) for (let n of t) {
-      let { className: t2 } = this.splitClassNameAndType(n);
-      this.classes.get(t2).parent = e, this.namespaces.get(e).classes.set(t2, this.classes.get(t2));
+  addClassesToNamespace(e, t, n) {
+    if (this.namespaces.has(e)) {
+      for (let n2 of t) {
+        let { className: t2 } = this.splitClassNameAndType(n2), r = this.getClass(t2);
+        r.parent = e, this.namespaces.get(e).classes.set(t2, r);
+      }
+      for (let t2 of n) {
+        let n2 = this.getNote(t2);
+        n2.parent = e, this.namespaces.get(e).notes.set(t2, n2);
+      }
     }
   }
   setCssStyle(e, t) {
@@ -2910,37 +3097,46 @@ var classDiagram_default = parser, visibilityValues = [
     }
     return t;
   }
+  resolveExplicitAncestor(e) {
+    let t = e;
+    for (; t; ) {
+      let e2 = this.namespaces.get(t);
+      if (!e2) return;
+      if (e2.explicit) return t;
+      t = e2.parent;
+    }
+  }
   getData() {
-    var _a2;
-    let t = [], n = [], r = getConfig2();
-    for (let e of this.namespaces.keys()) {
-      let n2 = this.namespaces.get(e);
-      if (n2) {
-        let e2 = {
-          id: n2.id,
-          label: n2.id,
-          isGroup: true,
-          padding: r.class.padding ?? 16,
-          shape: "rect",
-          cssStyles: ["fill: none", "stroke: black"],
-          look: r.look
-        };
-        t.push(e2);
-      }
+    var _a2, _b2;
+    let e = [], t = [], r = getConfig2(), i = ((_a2 = r.class) == null ? void 0 : _a2.hierarchicalNamespaces) ?? true;
+    for (let t2 of this.namespaces.values()) {
+      if (!i && !t2.explicit) continue;
+      let n = {
+        id: t2.id,
+        label: i ? t2.label : t2.id,
+        isGroup: true,
+        padding: r.class.padding ?? 16,
+        shape: "rect",
+        cssStyles: [],
+        look: r.look,
+        parentId: i ? t2.parent : void 0
+      };
+      e.push(n);
     }
-    for (let e of this.classes.keys()) {
-      let n2 = this.classes.get(e);
-      if (n2) {
-        let e2 = n2;
-        e2.parentId = n2.parent, e2.look = r.look, t.push(e2);
-      }
+    for (let t2 of this.classes.values()) {
+      let n = i ? t2.parent : this.resolveExplicitAncestor(t2.parent), a2 = {
+        ...t2,
+        type: void 0,
+        isGroup: false,
+        parentId: n,
+        look: r.look
+      };
+      e.push(a2);
     }
-    let i = 0;
-    for (let e of this.notes) {
-      i++;
-      let a = {
-        id: e.id,
-        label: e.text,
+    for (let n of this.notes.values()) {
+      let a2 = i ? n.parent : this.resolveExplicitAncestor(n.parent), o = {
+        id: n.id,
+        label: n.text,
         isGroup: false,
         shape: "note",
         padding: r.class.padding ?? 6,
@@ -2950,15 +3146,17 @@ var classDiagram_default = parser, visibilityValues = [
           `fill: ${r.themeVariables.noteBkgColor}`,
           `stroke: ${r.themeVariables.noteBorderColor}`
         ],
-        look: r.look
+        look: r.look,
+        parentId: a2,
+        labelType: "markdown"
       };
-      t.push(a);
-      let o = ((_a2 = this.classes.get(e.class)) == null ? void 0 : _a2.id) ?? "";
-      if (o) {
-        let t2 = {
-          id: `edgeNote${i}`,
-          start: e.id,
-          end: o,
+      e.push(o);
+      let s = (_b2 = this.classes.get(n.class)) == null ? void 0 : _b2.id;
+      if (s) {
+        let e2 = {
+          id: `edgeNote${n.index}`,
+          start: n.id,
+          end: s,
           type: "normal",
           thickness: "normal",
           classes: "relation",
@@ -2970,50 +3168,51 @@ var classDiagram_default = parser, visibilityValues = [
           pattern: "dotted",
           look: r.look
         };
-        n.push(t2);
+        t.push(e2);
       }
     }
-    for (let e of this.interfaces) {
-      let n2 = {
-        id: e.id,
-        label: e.label,
+    for (let t2 of this.interfaces) {
+      let n = {
+        id: t2.id,
+        label: t2.label,
         isGroup: false,
         shape: "rect",
         cssStyles: ["opacity: 0;"],
         look: r.look
       };
-      t.push(n2);
+      e.push(n);
     }
-    i = 0;
-    for (let t2 of this.relations) {
-      i++;
-      let a = {
-        id: getEdgeId(t2.id1, t2.id2, {
+    let a = 0;
+    for (let e2 of this.relations) {
+      a++;
+      let i2 = {
+        id: getEdgeId(e2.id1, e2.id2, {
           prefix: "id",
-          counter: i
+          counter: a
         }),
-        start: t2.id1,
-        end: t2.id2,
+        start: e2.id1,
+        end: e2.id2,
         type: "normal",
-        label: t2.title,
+        label: e2.title,
         labelpos: "c",
         thickness: "normal",
         classes: "relation",
-        arrowTypeStart: this.getArrowMarker(t2.relation.type1),
-        arrowTypeEnd: this.getArrowMarker(t2.relation.type2),
-        startLabelRight: t2.relationTitle1 === "none" ? "" : t2.relationTitle1,
-        endLabelLeft: t2.relationTitle2 === "none" ? "" : t2.relationTitle2,
+        arrowTypeStart: this.getArrowMarker(e2.relation.type1),
+        arrowTypeEnd: this.getArrowMarker(e2.relation.type2),
+        startLabelRight: e2.relationTitle1 === "none" ? "" : e2.relationTitle1,
+        endLabelLeft: e2.relationTitle2 === "none" ? "" : e2.relationTitle2,
         arrowheadStyle: "",
         labelStyle: ["display: inline-block"],
-        style: t2.style || "",
-        pattern: t2.relation.lineType == 1 ? "dashed" : "solid",
-        look: r.look
+        style: e2.style || "",
+        pattern: e2.relation.lineType == 1 ? "dashed" : "solid",
+        look: r.look,
+        labelType: "markdown"
       };
-      n.push(a);
+      t.push(i2);
     }
     return {
-      nodes: t,
-      edges: n,
+      nodes: e,
+      edges: t,
       other: {},
       config: r,
       direction: this.getDirection()
@@ -3031,9 +3230,37 @@ var classDiagram_default = parser, visibilityValues = [
 
 }
 
+  .cluster-label text {
+    fill: ${e.titleColor};
+  }
+  .cluster-label span {
+    color: ${e.titleColor};
+  }
+  .cluster-label span p {
+    background-color: transparent;
+  }
+
+  .cluster rect {
+    fill: ${e.clusterBkg};
+    stroke: ${e.clusterBorder};
+    stroke-width: 1px;
+  }
+
+  .cluster text {
+    fill: ${e.titleColor};
+  }
+
+  .cluster span {
+    color: ${e.titleColor};
+  }
+
 .nodeLabel, .edgeLabel {
   color: ${e.classText};
 }
+
+.noteLabel .nodeLabel, .noteLabel .edgeLabel {
+  color: ${e.noteTextColor};
+}
 .edgeLabel .label rect {
   fill: ${e.mainBkg};
 }
@@ -3058,7 +3285,7 @@ var classDiagram_default = parser, visibilityValues = [
   .node path {
     fill: ${e.mainBkg};
     stroke: ${e.nodeBorder};
-    stroke-width: 1px;
+    stroke-width: ${e.strokeWidth};
   }
 
 
@@ -3095,7 +3322,7 @@ g.classGroup line {
 
 .relation {
   stroke: ${e.lineColor};
-  stroke-width: 1;
+  stroke-width: ${e.strokeWidth};
   fill: none;
 }
 
@@ -3107,61 +3334,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;
@@ -3177,21 +3404,36 @@ 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;
+}
   ${getIconStyles()}
 `, "getStyles"), classRenderer_v3_unified_default = {
   getClasses: /* @__PURE__ */ __name(function(e, t) {
     return t.db.getClasses();
   }, "getClasses"),
-  draw: /* @__PURE__ */ __name(async function(e, r, i, a) {
-    log.info("REF0:"), log.info("Drawing class diagram (v3)", r);
-    let { securityLevel: o, state: s, layout: c } = getConfig2(), l = a.db.getData(), u = getDiagramElement(r, o);
+  draw: /* @__PURE__ */ __name(async function(e, n, i, a) {
+    log.info("REF0:"), log.info("Drawing class diagram (v3)", n);
+    let { securityLevel: o, state: s, layout: c } = getConfig2();
+    a.db.setDiagramId(n);
+    let l = a.db.getData(), u = getDiagramElement(n, o);
     l.type = a.type, l.layoutAlgorithm = getRegisteredLayoutAlgorithm(c), l.nodeSpacing = (s == null ? void 0 : s.nodeSpacing) || 50, l.rankSpacing = (s == null ? void 0 : s.rankSpacing) || 50, l.markers = [
       "aggregation",
       "extension",
       "composition",
       "dependency",
       "lollipop"
-    ], l.diagramId = r, await render(l, u), utils_default.insertTitle(u, "classDiagramTitleText", (s == null ? void 0 : s.titleTopMargin) ?? 25, a.db.getDiagramTitle()), setupViewPortForSVG(u, 8, "classDiagram", (s == null ? void 0 : s.useMaxWidth) ?? true);
+    ], l.diagramId = n, await render(l, u), utils_default.insertTitle(u, "classDiagramTitleText", (s == null ? void 0 : s.titleTopMargin) ?? 25, a.db.getDiagramTitle()), setupViewPortForSVG(u, 8, "classDiagram", (s == null ? void 0 : s.useMaxWidth) ?? true);
   }, "draw"),
   getDir: /* @__PURE__ */ __name((e, t = "TB") => {
     if (!e.doc) return t;