@marimo-team/islands 0.20.1 → 0.20.3-dev76

package/dist/{chunk-LHMN2FUI-CgYPnxfN.js → chunk-TQ3KTPDO-CGsUIC73.js}

@@ -1,5 +1,5 @@
 var _a;
-import { f as __name, g as createDefaultSharedCoreModule, h as createDefaultCoreModule, i as CommonValueConverter, m as inject, p as EmptyFileSystem, s as MermaidGeneratedSharedModule, t as AbstractMermaidTokenBuilder, u as RadarGeneratedModule } from "./chunk-FPAJGGOC-quWdfNUB.js";
+import { f as __name, g as createDefaultSharedCoreModule, h as createDefaultCoreModule, i as CommonValueConverter, m as inject, p as EmptyFileSystem, s as MermaidGeneratedSharedModule, t as AbstractMermaidTokenBuilder, u as RadarGrammarGeneratedModule } from "./chunk-TCCFYFTB-DdLCbCTn.js";
 var RadarTokenBuilder = (_a = class extends AbstractMermaidTokenBuilder {
   constructor() {
     super(["radar-beta"]);
@@ -9,7 +9,7 @@ var RadarTokenBuilder = (_a = class extends AbstractMermaidTokenBuilder {
   ValueConverter: /* @__PURE__ */ __name(() => new CommonValueConverter(), "ValueConverter")
 } };
 function createRadarServices(e = EmptyFileSystem) {
-  let u = inject(createDefaultSharedCoreModule(e), MermaidGeneratedSharedModule), d = inject(createDefaultCoreModule({ shared: u }), RadarGeneratedModule, RadarModule);
+  let u = inject(createDefaultSharedCoreModule(e), MermaidGeneratedSharedModule), d = inject(createDefaultCoreModule({ shared: u }), RadarGrammarGeneratedModule, RadarModule);
   return u.ServiceRegistry.register(d), {
     shared: u,
     Radar: d

package/dist/{chunk-TZMSLE5B-XW3duOft.js → chunk-TZMSLE5B-B3eYTGCw.js}

@@ -1,6 +1,6 @@
-import { r as __name } from "./src-jICM_d2B.js";
-import { k as lineBreakRegex } from "./chunk-ABZYJK2D-BwNsaa1P.js";
-import { t as require_dist } from "./dist-BYznkC5E.js";
+import { r as __name } from "./src-CHUphWwL.js";
+import { k as lineBreakRegex } from "./chunk-ABZYJK2D-CRwanrkd.js";
+import { t as require_dist } from "./dist-Bymy0kEH.js";
 var import_dist = require_dist(), drawRect = /* @__PURE__ */ __name((e, a) => {
   let o = e.append("rect");
   if (o.attr("x", a.x), o.attr("y", a.y), o.attr("fill", a.fill), o.attr("stroke", a.stroke), o.attr("width", a.width), o.attr("height", a.height), a.name && o.attr("name", a.name), a.rx && o.attr("rx", a.rx), a.ry && o.attr("ry", a.ry), a.attrs !== void 0) for (let e2 in a.attrs) o.attr(e2, a.attrs[e2]);

package/dist/{chunk-O7ZBX7Z2-CdpLwOP0.js → chunk-UMXZTB3W--LdAK3Bv.js}

@@ -1,5 +1,5 @@
 var _a, _b;
-import { f as __name, g as createDefaultSharedCoreModule, h as createDefaultCoreModule, m as inject, n as AbstractMermaidValueConverter, p as EmptyFileSystem, r as ArchitectureGeneratedModule, s as MermaidGeneratedSharedModule, t as AbstractMermaidTokenBuilder } from "./chunk-FPAJGGOC-quWdfNUB.js";
+import { f as __name, g as createDefaultSharedCoreModule, h as createDefaultCoreModule, m as inject, n as AbstractMermaidValueConverter, p as EmptyFileSystem, r as ArchitectureGrammarGeneratedModule, s as MermaidGeneratedSharedModule, t as AbstractMermaidTokenBuilder } from "./chunk-TCCFYFTB-DdLCbCTn.js";
 var ArchitectureTokenBuilder = (_a = class extends AbstractMermaidTokenBuilder {
   constructor() {
     super(["architecture"]);
@@ -15,7 +15,7 @@ var ArchitectureTokenBuilder = (_a = class extends AbstractMermaidTokenBuilder {
   ValueConverter: /* @__PURE__ */ __name(() => new ArchitectureValueConverter(), "ValueConverter")
 } };
 function createArchitectureServices(e = EmptyFileSystem) {
-  let d = inject(createDefaultSharedCoreModule(e), MermaidGeneratedSharedModule), f = inject(createDefaultCoreModule({ shared: d }), ArchitectureGeneratedModule, ArchitectureModule);
+  let d = inject(createDefaultSharedCoreModule(e), MermaidGeneratedSharedModule), f = inject(createDefaultCoreModule({ shared: d }), ArchitectureGrammarGeneratedModule, ArchitectureModule);
   return d.ServiceRegistry.register(f), {
     shared: d,
     Architecture: f

package/dist/classDiagram-2ON5EDUG-C7C-oefv.js

@@ -0,0 +1,30 @@
+import "./purify.es-CyOIw8ru.js";
+import "./chunk-S3R3BYOJ-CsnX6RKs.js";
+import { r as __name } from "./src-CHUphWwL.js";
+import "./chunk-ABZYJK2D-CRwanrkd.js";
+import "./chunk-HN2XXSSU-CzO5Phf0.js";
+import "./chunk-CVBHYZKI-D8iwHsLF.js";
+import "./chunk-ATLVNIR6-CMMCMvOK.js";
+import "./dist-Bymy0kEH.js";
+import "./chunk-JA3XYJ7Z-Cmt--e0q.js";
+import "./chunk-JZLCHNYA-CkyMJnI9.js";
+import "./chunk-QXUST7PY-DYuD50pU.js";
+import "./chunk-N4CR4FBY-BJfHtJbD.js";
+import "./chunk-FMBD7UC4-XTL4xAvH.js";
+import "./chunk-55IACEB6-Dj8CzJvE.js";
+import "./chunk-QN33PNHL-WOLIPUAJ.js";
+import { i as styles_default, n as classDiagram_default, r as classRenderer_v3_unified_default, t as ClassDB } from "./chunk-B4BG7PRW-BNsHrGHG.js";
+var diagram = {
+  parser: classDiagram_default,
+  get db() {
+    return new ClassDB();
+  },
+  renderer: classRenderer_v3_unified_default,
+  styles: styles_default,
+  init: /* @__PURE__ */ __name((e) => {
+    e.class || (e.class = {}), e.class.arrowMarkerAbsolute = e.arrowMarkerAbsolute;
+  }, "init")
+};
+export {
+  diagram
+};

package/dist/classDiagram-v2-WZHVMYZB-UTw37Gg8.js

@@ -0,0 +1,30 @@
+import "./purify.es-CyOIw8ru.js";
+import "./chunk-S3R3BYOJ-CsnX6RKs.js";
+import { r as __name } from "./src-CHUphWwL.js";
+import "./chunk-ABZYJK2D-CRwanrkd.js";
+import "./chunk-HN2XXSSU-CzO5Phf0.js";
+import "./chunk-CVBHYZKI-D8iwHsLF.js";
+import "./chunk-ATLVNIR6-CMMCMvOK.js";
+import "./dist-Bymy0kEH.js";
+import "./chunk-JA3XYJ7Z-Cmt--e0q.js";
+import "./chunk-JZLCHNYA-CkyMJnI9.js";
+import "./chunk-QXUST7PY-DYuD50pU.js";
+import "./chunk-N4CR4FBY-BJfHtJbD.js";
+import "./chunk-FMBD7UC4-XTL4xAvH.js";
+import "./chunk-55IACEB6-Dj8CzJvE.js";
+import "./chunk-QN33PNHL-WOLIPUAJ.js";
+import { i as styles_default, n as classDiagram_default, r as classRenderer_v3_unified_default, t as ClassDB } from "./chunk-B4BG7PRW-BNsHrGHG.js";
+var diagram = {
+  parser: classDiagram_default,
+  get db() {
+    return new ClassDB();
+  },
+  renderer: classRenderer_v3_unified_default,
+  styles: styles_default,
+  init: /* @__PURE__ */ __name((e) => {
+    e.class || (e.class = {}), e.class.arrowMarkerAbsolute = e.arrowMarkerAbsolute;
+  }, "init")
+};
+export {
+  diagram
+};

package/dist/{clike-B90WKs4D.js → clike-CLJYUAWw.js}

@@ -1,4 +1,4 @@
-import { a as objectiveC, c as squirrel, i as kotlin, n as csharp, o as objectiveCpp, r as dart, s as scala, t as clike } from "./clike-CEtUBPHD.js";
+import { a as objectiveC, c as squirrel, i as kotlin, n as csharp, o as objectiveCpp, r as dart, s as scala, t as clike } from "./clike-CFhUNtI5.js";
 export {
   csharp,
   dart,

package/dist/clojure-B2uhdQPa.js

@@ -0,0 +1,4 @@
+import { t as clojure } from "./clojure-CX7oovsp.js";
+export {
+  clojure
+};

package/dist/{clone-V9hndNcj.js → clone-BJrS4PdE.js}

@@ -1,4 +1,4 @@
-import { i as _baseClone_default } from "./graphlib-CwMnCnQ9.js";
+import { d as _baseClone_default } from "./reduce-BXFHs7IQ.js";
 var CLONE_SYMBOLS_FLAG = 4;
 function clone(r) {
   return _baseClone_default(r, CLONE_SYMBOLS_FLAG);

package/dist/cmake-B9WXyQcc.js

@@ -0,0 +1,4 @@
+import { t as cmake } from "./cmake-C29AR2kk.js";
+export {
+  cmake
+};

package/dist/cobol-CPD3EJfO.js

@@ -0,0 +1,4 @@
+import { t as cobol } from "./cobol-CNkuRW9i.js";
+export {
+  cobol
+};

package/dist/{code-block-37QAKDTI-zh5AeoJo.js → code-block-37QAKDTI-DV_ZyoUh.js}

@@ -1,6 +1,6 @@
 import { s as __toESM } from "./chunk-BNovOVIE.js";
 import { t as require_react } from "./react-Bs6Z0kvn.js";
-import { i as cr, n as ao, r as b, t as N } from "./chunk-5FQGJX7Z-pOElJy8t.js";
+import { i as cr, n as ao, r as b, t as N } from "./chunk-5FQGJX7Z-BkzUmppO.js";
 import { t as require_jsx_runtime } from "./jsx-runtime-CTBg5pdT.js";
 var import_react = /* @__PURE__ */ __toESM(require_react(), 1), import_jsx_runtime = /* @__PURE__ */ __toESM(require_jsx_runtime(), 1), H = b("block", "before:content-[counter(line)]", "before:inline-block", "before:[counter-increment:line]", "before:w-6", "before:mr-4", "before:text-[13px]", "before:text-right", "before:text-muted-foreground/50", "before:font-mono", "before:select-none"), k = (0, import_react.memo)(({ children: e, result: o, language: s, className: c, ...u }) => {
   let d = (0, import_react.useMemo)(() => ({

package/dist/coffeescript-KD9TnEnS.js

@@ -0,0 +1,4 @@
+import { t as coffeeScript } from "./coffeescript-BJAbfGam.js";
+export {
+  coffeeScript
+};

package/dist/commonlisp-DNEULz_Q.js

@@ -0,0 +1,4 @@
+import { t as commonLisp } from "./commonlisp-BTNhj2l9.js";
+export {
+  commonLisp
+};

package/dist/{constants-BGRTDzdW.js → constants-D1Tbg_6B.js}

@@ -1,5 +1,6 @@
-import { C as isObject_default } from "./_baseFor-B69PDbIz.js";
-import { n as toNumber_default, t as now_default } from "./now-Dwu5ou19.js";
+import { B as isObject_default } from "./isArrayLikeObject-Btu-i6_P.js";
+import { t as toNumber_default } from "./toNumber-By7s5JC_.js";
+import { t as now_default } from "./now-BxlRp0OQ.js";
 var FUNC_ERROR_TEXT = "Expected a function", nativeMax = Math.max, nativeMin = Math.min;
 function debounce(o, s, c) {
   var l, u, d, f, p, m, h = 0, g = false, _ = false, v = true;

package/dist/{cose-bilkent-S5V4N54A-BK1nIR2J.js → cose-bilkent-S5V4N54A-BCDTZDay.js}

@@ -1,6 +1,6 @@
 import { s as __toESM, t as __commonJSMin } from "./chunk-BNovOVIE.js";
-import { i as log, r as __name, t as select_default } from "./src-jICM_d2B.js";
-import { t as cytoscape$1 } from "./cytoscape.esm-CgJFiP_E.js";
+import { i as log, r as __name, t as select_default } from "./src-CHUphWwL.js";
+import { t as cytoscape$1 } from "./cytoscape.esm-BXzSsA6N.js";
 var require_layout_base = /* @__PURE__ */ __commonJSMin(((e, t) => {
   (function(n, r) {
     typeof e == "object" && typeof t == "object" ? t.exports = r() : typeof define == "function" && define.amd ? define([], r) : typeof e == "object" ? e.layoutBase = r() : n.layoutBase = r();

package/dist/crystal-DVPNgAPQ.js

@@ -0,0 +1,4 @@
+import { t as crystal } from "./crystal-CZc0nIm9.js";
+export {
+  crystal
+};

package/dist/css-fq3a1AH1.js

@@ -0,0 +1,4 @@
+import { n as mkCSS, t as gss } from "./css-L2-0OTXc.js";
+export {
+  gss
+};

package/dist/cypher-Dtzq0BP7.js

@@ -0,0 +1,4 @@
+import { t as cypher } from "./cypher-Dnc6MXl0.js";
+export {
+  cypher
+};

package/dist/d-DcZudIhJ.js

@@ -0,0 +1,4 @@
+import { t as d } from "./d-C6X9iIga.js";
+export {
+  d
+};

package/dist/{dagre-6UL2VRFP-BArPH353.js → dagre-6UL2VRFP-BgsUhJrV.js}

@@ -1,29 +1,30 @@
-import { n as isUndefined_default, t as Graph } from "./graphlib-CwMnCnQ9.js";
-import { t as clone_default } from "./clone-V9hndNcj.js";
-import { t as layout } from "./dagre-Dcgyn_Uy.js";
-import { i as map_default } from "./min-ypdVXicC.js";
-import "./purify.es-D4vaFt5N.js";
-import "./chunk-S3R3BYOJ-C_1SJcWo.js";
-import { i as log, r as __name } from "./src-jICM_d2B.js";
-import { b as getConfig2 } from "./chunk-ABZYJK2D-BwNsaa1P.js";
-import "./chunk-HN2XXSSU-BsB4dtgF.js";
-import { t as getSubGraphTitleMargins } from "./chunk-CVBHYZKI-Bb2XMuXJ.js";
-import "./chunk-ATLVNIR6-DtFMAawc.js";
-import "./dist-BYznkC5E.js";
-import "./chunk-JA3XYJ7Z-n8UTzfok.js";
-import { a as insertNode, c as positionNode, i as insertCluster, l as setNodeElem, n as clear2, t as clear$1, u as updateNodeBounds } from "./chunk-JZLCHNYA-ChKqHUdB.js";
-import { a as positionEdgeLabel, i as markers_default, n as insertEdge, r as insertEdgeLabel, t as clear } from "./chunk-QXUST7PY-ClIEpoCT.js";
-function write(C) {
+import { n as isUndefined_default } from "./reduce-BXFHs7IQ.js";
+import { t as clone_default } from "./clone-BJrS4PdE.js";
+import { t as layout } from "./dagre-CyZCGfV_.js";
+import { a as map_default } from "./min-CMDDtXJP.js";
+import { t as Graph } from "./graphlib-DZnBMcsX.js";
+import "./purify.es-CyOIw8ru.js";
+import "./chunk-S3R3BYOJ-CsnX6RKs.js";
+import { i as log, r as __name } from "./src-CHUphWwL.js";
+import { b as getConfig2 } from "./chunk-ABZYJK2D-CRwanrkd.js";
+import "./chunk-HN2XXSSU-CzO5Phf0.js";
+import { t as getSubGraphTitleMargins } from "./chunk-CVBHYZKI-D8iwHsLF.js";
+import "./chunk-ATLVNIR6-CMMCMvOK.js";
+import "./dist-Bymy0kEH.js";
+import "./chunk-JA3XYJ7Z-Cmt--e0q.js";
+import { a as insertNode, c as positionNode, i as insertCluster, l as setNodeElem, n as clear2, t as clear$1, u as updateNodeBounds } from "./chunk-JZLCHNYA-CkyMJnI9.js";
+import { a as positionEdgeLabel, i as markers_default, n as insertEdge, r as insertEdgeLabel, t as clear } from "./chunk-QXUST7PY-DYuD50pU.js";
+function write(w) {
   var T = {
     options: {
-      directed: C.isDirected(),
-      multigraph: C.isMultigraph(),
-      compound: C.isCompound()
+      directed: w.isDirected(),
+      multigraph: w.isMultigraph(),
+      compound: w.isCompound()
     },
-    nodes: writeNodes(C),
-    edges: writeEdges(C)
+    nodes: writeNodes(w),
+    edges: writeEdges(w)
   };
-  return isUndefined_default(C.graph()) || (T.value = clone_default(C.graph())), T;
+  return isUndefined_default(w.graph()) || (T.value = clone_default(w.graph())), T;
 }
 function writeNodes(C) {
   return map_default(C.nodes(), function(w) {
@@ -129,32 +130,32 @@ var clusterDb = /* @__PURE__ */ new Map(), descendants = /* @__PURE__ */ new Map
       log.warn("Fix Replacing with XXX", T, E, C2.name), r.setEdge(T, E, w, C2.name);
     }
   }), log.warn("Adjusted Graph", write(r)), extractor(r, 0), log.trace(clusterDb);
-}, "adjustClustersAndEdges"), extractor = /* @__PURE__ */ __name((r, w) => {
+}, "adjustClustersAndEdges"), extractor = /* @__PURE__ */ __name((r, C) => {
   var _a, _b;
-  if (log.warn("extractor - ", w, write(r), r.children("D")), w > 10) {
+  if (log.warn("extractor - ", C, write(r), r.children("D")), C > 10) {
     log.error("Bailing out");
     return;
   }
-  let T = r.nodes(), E = false;
-  for (let C of T) {
-    let w2 = r.children(C);
-    E || (E = w2.length > 0);
+  let w = r.nodes(), T = false;
+  for (let C2 of w) {
+    let w2 = r.children(C2);
+    T || (T = w2.length > 0);
   }
-  if (!E) {
+  if (!T) {
     log.debug("Done, no node has children", r.nodes());
     return;
   }
-  log.debug("Nodes = ", T, w);
-  for (let E2 of T) if (log.debug("Extracting node", E2, clusterDb, clusterDb.has(E2) && !clusterDb.get(E2).externalConnections, !r.parent(E2), r.node(E2), r.children("D"), " Depth ", w), !clusterDb.has(E2)) log.debug("Not a cluster", E2, w);
-  else if (!clusterDb.get(E2).externalConnections && r.children(E2) && r.children(E2).length > 0) {
-    log.warn("Cluster without external connections, without a parent and with children", E2, w);
-    let T2 = r.graph().rankdir === "TB" ? "LR" : "TB";
-    ((_b = (_a = clusterDb.get(E2)) == null ? void 0 : _a.clusterData) == null ? void 0 : _b.dir) && (T2 = clusterDb.get(E2).clusterData.dir, log.warn("Fixing dir", clusterDb.get(E2).clusterData.dir, T2));
+  log.debug("Nodes = ", w, C);
+  for (let T2 of w) if (log.debug("Extracting node", T2, clusterDb, clusterDb.has(T2) && !clusterDb.get(T2).externalConnections, !r.parent(T2), r.node(T2), r.children("D"), " Depth ", C), !clusterDb.has(T2)) log.debug("Not a cluster", T2, C);
+  else if (!clusterDb.get(T2).externalConnections && r.children(T2) && r.children(T2).length > 0) {
+    log.warn("Cluster without external connections, without a parent and with children", T2, C);
+    let w2 = r.graph().rankdir === "TB" ? "LR" : "TB";
+    ((_b = (_a = clusterDb.get(T2)) == null ? void 0 : _a.clusterData) == null ? void 0 : _b.dir) && (w2 = clusterDb.get(T2).clusterData.dir, log.warn("Fixing dir", clusterDb.get(T2).clusterData.dir, w2));
     let O = new Graph({
       multigraph: true,
       compound: true
     }).setGraph({
-      rankdir: T2,
+      rankdir: w2,
       nodesep: 50,
       ranksep: 50,
       marginx: 8,
@@ -162,18 +163,18 @@ var clusterDb = /* @__PURE__ */ new Map(), descendants = /* @__PURE__ */ new Map
     }).setDefaultEdgeLabel(function() {
       return {};
     });
-    log.warn("Old graph before copy", write(r)), copy(E2, r, O, E2), r.setNode(E2, {
+    log.warn("Old graph before copy", write(r)), copy(T2, r, O, T2), r.setNode(T2, {
       clusterNode: true,
-      id: E2,
-      clusterData: clusterDb.get(E2).clusterData,
-      label: clusterDb.get(E2).label,
+      id: T2,
+      clusterData: clusterDb.get(T2).clusterData,
+      label: clusterDb.get(T2).label,
       graph: O
-    }), log.warn("New graph after copy node: (", E2, ")", write(O)), log.debug("Old graph after copy", write(r));
-  } else log.warn("Cluster ** ", E2, " **not meeting the criteria !externalConnections:", !clusterDb.get(E2).externalConnections, " no parent: ", !r.parent(E2), " children ", r.children(E2) && r.children(E2).length > 0, r.children("D"), w), log.debug(clusterDb);
-  T = r.nodes(), log.warn("New list of nodes", T);
-  for (let C of T) {
-    let T2 = r.node(C);
-    log.warn(" Now next level", C, T2), (T2 == null ? void 0 : T2.clusterNode) && extractor(T2.graph, w + 1);
+    }), log.warn("New graph after copy node: (", T2, ")", write(O)), log.debug("Old graph after copy", write(r));
+  } else log.warn("Cluster ** ", T2, " **not meeting the criteria !externalConnections:", !clusterDb.get(T2).externalConnections, " no parent: ", !r.parent(T2), " children ", r.children(T2) && r.children(T2).length > 0, r.children("D"), C), log.debug(clusterDb);
+  w = r.nodes(), log.warn("New list of nodes", w);
+  for (let T2 of w) {
+    let w2 = r.node(T2);
+    log.warn(" Now next level", T2, w2), (w2 == null ? void 0 : w2.clusterNode) && extractor(w2.graph, C + 1);
   }
 }, "extractor"), sorter = /* @__PURE__ */ __name((r, C) => {
   if (C.length === 0) return [];
@@ -182,7 +183,7 @@ var clusterDb = /* @__PURE__ */ new Map(), descendants = /* @__PURE__ */ new Map
     let T = sorter(r, r.children(C2));
     w = [...w, ...T];
   }), w;
-}, "sorter"), sortNodesByHierarchy = /* @__PURE__ */ __name((r) => sorter(r, r.children()), "sortNodesByHierarchy"), recursiveRender = /* @__PURE__ */ __name(async (r, C, w, E, k, M) => {
+}, "sorter"), sortNodesByHierarchy = /* @__PURE__ */ __name((r) => sorter(r, r.children()), "sortNodesByHierarchy"), recursiveRender = /* @__PURE__ */ __name(async (r, C, T, E, k, M) => {
   log.warn("Graph in recursive render:XAX", write(C), k);
   let N = C.graph().rankdir;
   log.trace("Dir in recursive render - dir:", N);
@@ -190,61 +191,61 @@ var clusterDb = /* @__PURE__ */ new Map(), descendants = /* @__PURE__ */ new Map
   C.nodes() ? log.info("Recursive render XXX", C.nodes()) : log.info("No nodes found for", C), C.edges().length > 0 && log.info("Recursive edges", C.edge(C.edges()[0]));
   let F = P.insert("g").attr("class", "clusters"), I = P.insert("g").attr("class", "edgePaths"), L = P.insert("g").attr("class", "edgeLabels"), R = P.insert("g").attr("class", "nodes");
   await Promise.all(C.nodes().map(async function(r2) {
-    let T = C.node(r2);
+    let w = C.node(r2);
     if (k !== void 0) {
       let w2 = JSON.parse(JSON.stringify(k.clusterData));
       log.trace("Setting data for parent cluster XXX\n Node.id = ", r2, "\n data=", w2.height, "\nParent cluster", k.height), C.setNode(k.id, w2), C.parent(r2) || (log.trace("Setting parent", r2, k.id), C.setParent(r2, k.id, w2));
     }
-    if (log.info("(Insert) Node XXX" + r2 + ": " + JSON.stringify(C.node(r2))), T == null ? void 0 : T.clusterNode) {
-      log.info("Cluster identified XBX", r2, T.width, C.node(r2));
+    if (log.info("(Insert) Node XXX" + r2 + ": " + JSON.stringify(C.node(r2))), w == null ? void 0 : w.clusterNode) {
+      log.info("Cluster identified XBX", r2, w.width, C.node(r2));
       let { ranksep: O, nodesep: k2 } = C.graph();
-      T.graph.setGraph({
-        ...T.graph.graph(),
+      w.graph.setGraph({
+        ...w.graph.graph(),
         ranksep: O + 25,
         nodesep: k2
       });
-      let A = await recursiveRender(R, T.graph, w, E, C.node(r2), M), j = A.elem;
-      updateNodeBounds(T, j), T.diff = A.diff || 0, log.info("New compound node after recursive render XAX", r2, "width", T.width, "height", T.height), setNodeElem(j, T);
-    } else C.children(r2).length > 0 ? (log.trace("Cluster - the non recursive path XBX", r2, T.id, T, T.width, "Graph:", C), log.trace(findNonClusterChild(T.id, C)), clusterDb.set(T.id, {
-      id: findNonClusterChild(T.id, C),
-      node: T
+      let A = await recursiveRender(R, w.graph, T, E, C.node(r2), M), j = A.elem;
+      updateNodeBounds(w, j), w.diff = A.diff || 0, log.info("New compound node after recursive render XAX", r2, "width", w.width, "height", w.height), setNodeElem(j, w);
+    } else C.children(r2).length > 0 ? (log.trace("Cluster - the non recursive path XBX", r2, w.id, w, w.width, "Graph:", C), log.trace(findNonClusterChild(w.id, C)), clusterDb.set(w.id, {
+      id: findNonClusterChild(w.id, C),
+      node: w
     })) : (log.trace("Node - the non recursive path XAX", r2, R, C.node(r2), N), await insertNode(R, C.node(r2), {
       config: M,
       dir: N
     }));
   })), await (/* @__PURE__ */ __name(async () => {
     let r2 = C.edges().map(async function(r3) {
-      let w2 = C.edge(r3.v, r3.w, r3.name);
-      log.info("Edge " + r3.v + " -> " + r3.w + ": " + JSON.stringify(r3)), log.info("Edge " + r3.v + " -> " + r3.w + ": ", r3, " ", JSON.stringify(C.edge(r3))), log.info("Fix", clusterDb, "ids:", r3.v, r3.w, "Translating: ", clusterDb.get(r3.v), clusterDb.get(r3.w)), await insertEdgeLabel(L, w2);
+      let w = C.edge(r3.v, r3.w, r3.name);
+      log.info("Edge " + r3.v + " -> " + r3.w + ": " + JSON.stringify(r3)), log.info("Edge " + r3.v + " -> " + r3.w + ": ", r3, " ", JSON.stringify(C.edge(r3))), log.info("Fix", clusterDb, "ids:", r3.v, r3.w, "Translating: ", clusterDb.get(r3.v), clusterDb.get(r3.w)), await insertEdgeLabel(L, w);
     });
     await Promise.all(r2);
   }, "processEdges"))(), log.info("Graph before layout:", JSON.stringify(write(C))), log.info("############################################# XXX"), log.info("###                Layout                 ### XXX"), log.info("############################################# XXX"), layout(C), log.info("Graph after layout:", JSON.stringify(write(C)));
   let z = 0, { subGraphTitleTotalMargin: B } = getSubGraphTitleMargins(M);
   return await Promise.all(sortNodesByHierarchy(C).map(async function(r2) {
     var _a;
-    let w2 = C.node(r2);
-    if (log.info("Position XBX => " + r2 + ": (" + w2.x, "," + w2.y, ") width: ", w2.width, " height: ", w2.height), w2 == null ? void 0 : w2.clusterNode) w2.y += B, log.info("A tainted cluster node XBX1", r2, w2.id, w2.width, w2.height, w2.x, w2.y, C.parent(r2)), clusterDb.get(w2.id).node = w2, positionNode(w2);
+    let w = C.node(r2);
+    if (log.info("Position XBX => " + r2 + ": (" + w.x, "," + w.y, ") width: ", w.width, " height: ", w.height), w == null ? void 0 : w.clusterNode) w.y += B, log.info("A tainted cluster node XBX1", r2, w.id, w.width, w.height, w.x, w.y, C.parent(r2)), clusterDb.get(w.id).node = w, positionNode(w);
     else if (C.children(r2).length > 0) {
-      log.info("A pure cluster node XBX1", r2, w2.id, w2.x, w2.y, w2.width, w2.height, C.parent(r2)), w2.height += B, C.node(w2.parentId);
-      let T = (w2 == null ? void 0 : w2.padding) / 2 || 0, E2 = ((_a = w2 == null ? void 0 : w2.labelBBox) == null ? void 0 : _a.height) || 0, O = E2 - T || 0;
-      log.debug("OffsetY", O, "labelHeight", E2, "halfPadding", T), await insertCluster(F, w2), clusterDb.get(w2.id).node = w2;
+      log.info("A pure cluster node XBX1", r2, w.id, w.x, w.y, w.width, w.height, C.parent(r2)), w.height += B, C.node(w.parentId);
+      let T2 = (w == null ? void 0 : w.padding) / 2 || 0, E2 = ((_a = w == null ? void 0 : w.labelBBox) == null ? void 0 : _a.height) || 0, O = E2 - T2 || 0;
+      log.debug("OffsetY", O, "labelHeight", E2, "halfPadding", T2), await insertCluster(F, w), clusterDb.get(w.id).node = w;
     } else {
-      let r3 = C.node(w2.parentId);
-      w2.y += B / 2, log.info("A regular node XBX1 - using the padding", w2.id, "parent", w2.parentId, w2.width, w2.height, w2.x, w2.y, "offsetY", w2.offsetY, "parent", r3, r3 == null ? void 0 : r3.offsetY, w2), positionNode(w2);
+      let r3 = C.node(w.parentId);
+      w.y += B / 2, log.info("A regular node XBX1 - using the padding", w.id, "parent", w.parentId, w.width, w.height, w.x, w.y, "offsetY", w.offsetY, "parent", r3, r3 == null ? void 0 : r3.offsetY, w), positionNode(w);
     }
   })), C.edges().forEach(function(r2) {
-    let T = C.edge(r2);
-    log.info("Edge " + r2.v + " -> " + r2.w + ": " + JSON.stringify(T), T), T.points.forEach((r3) => r3.y += B / 2), positionEdgeLabel(T, insertEdge(I, T, clusterDb, w, C.node(r2.v), C.node(r2.w), E));
+    let w = C.edge(r2);
+    log.info("Edge " + r2.v + " -> " + r2.w + ": " + JSON.stringify(w), w), w.points.forEach((r3) => r3.y += B / 2), positionEdgeLabel(w, insertEdge(I, w, clusterDb, T, C.node(r2.v), C.node(r2.w), E));
   }), C.nodes().forEach(function(r2) {
-    let w2 = C.node(r2);
-    log.info(r2, w2.type, w2.diff), w2.isGroup && (z = w2.diff);
+    let w = C.node(r2);
+    log.info(r2, w.type, w.diff), w.isGroup && (z = w.diff);
   }), log.warn("Returning from recursive render XAX", P, z), {
     elem: P,
     diff: z
   };
-}, "recursiveRender"), render = /* @__PURE__ */ __name(async (r, w) => {
+}, "recursiveRender"), render = /* @__PURE__ */ __name(async (r, C) => {
   var _a, _b, _c, _d, _e, _f;
-  let T = new Graph({
+  let w = new Graph({
     multigraph: true,
     compound: true
   }).setGraph({
@@ -255,15 +256,15 @@ var clusterDb = /* @__PURE__ */ new Map(), descendants = /* @__PURE__ */ new Map
     marginy: 8
   }).setDefaultEdgeLabel(function() {
     return {};
-  }), E = w.select("g");
-  markers_default(E, r.markers, r.type, r.diagramId), clear2(), clear(), clear$1(), clear4(), r.nodes.forEach((r2) => {
-    T.setNode(r2.id, { ...r2 }), r2.parentId && T.setParent(r2.id, r2.parentId);
+  }), T = C.select("g");
+  markers_default(T, r.markers, r.type, r.diagramId), clear2(), clear(), clear$1(), clear4(), r.nodes.forEach((r2) => {
+    w.setNode(r2.id, { ...r2 }), r2.parentId && w.setParent(r2.id, r2.parentId);
   }), log.debug("Edges:", r.edges), r.edges.forEach((r2) => {
     if (r2.start === r2.end) {
-      let C = r2.start, w2 = C + "---" + C + "---1", E2 = C + "---" + C + "---2", D = T.node(C);
-      T.setNode(w2, {
-        domId: w2,
-        id: w2,
+      let C2 = r2.start, T2 = C2 + "---" + C2 + "---1", E = C2 + "---" + C2 + "---2", D = w.node(C2);
+      w.setNode(T2, {
+        domId: T2,
+        id: T2,
         parentId: D.parentId,
         labelStyle: "",
         label: "",
@@ -272,9 +273,9 @@ var clusterDb = /* @__PURE__ */ new Map(), descendants = /* @__PURE__ */ new Map
         style: "",
         width: 10,
         height: 10
-      }), T.setParent(w2, D.parentId), T.setNode(E2, {
-        domId: E2,
-        id: E2,
+      }), w.setParent(T2, D.parentId), w.setNode(E, {
+        domId: E,
+        id: E,
         parentId: D.parentId,
         labelStyle: "",
         padding: 0,
@@ -283,13 +284,13 @@ var clusterDb = /* @__PURE__ */ new Map(), descendants = /* @__PURE__ */ new Map
         style: "",
         width: 10,
         height: 10
-      }), T.setParent(E2, D.parentId);
+      }), w.setParent(E, D.parentId);
       let O2 = structuredClone(r2), k = structuredClone(r2), A = structuredClone(r2);
-      O2.label = "", O2.arrowTypeEnd = "none", O2.id = C + "-cyclic-special-1", k.arrowTypeStart = "none", k.arrowTypeEnd = "none", k.id = C + "-cyclic-special-mid", A.label = "", D.isGroup && (O2.fromCluster = C, A.toCluster = C), A.id = C + "-cyclic-special-2", A.arrowTypeStart = "none", T.setEdge(C, w2, O2, C + "-cyclic-special-0"), T.setEdge(w2, E2, k, C + "-cyclic-special-1"), T.setEdge(E2, C, A, C + "-cyc<lic-special-2");
-    } else T.setEdge(r2.start, r2.end, { ...r2 }, r2.id);
-  }), log.warn("Graph at first:", JSON.stringify(write(T))), adjustClustersAndEdges(T), log.warn("Graph after XAX:", JSON.stringify(write(T)));
+      O2.label = "", O2.arrowTypeEnd = "none", O2.id = C2 + "-cyclic-special-1", k.arrowTypeStart = "none", k.arrowTypeEnd = "none", k.id = C2 + "-cyclic-special-mid", A.label = "", D.isGroup && (O2.fromCluster = C2, A.toCluster = C2), A.id = C2 + "-cyclic-special-2", A.arrowTypeStart = "none", w.setEdge(C2, T2, O2, C2 + "-cyclic-special-0"), w.setEdge(T2, E, k, C2 + "-cyclic-special-1"), w.setEdge(E, C2, A, C2 + "-cyc<lic-special-2");
+    } else w.setEdge(r2.start, r2.end, { ...r2 }, r2.id);
+  }), log.warn("Graph at first:", JSON.stringify(write(w))), adjustClustersAndEdges(w), log.warn("Graph after XAX:", JSON.stringify(write(w)));
   let O = getConfig2();
-  await recursiveRender(E, T, r.type, r.diagramId, void 0, O);
+  await recursiveRender(T, w, r.type, r.diagramId, void 0, O);
 }, "render");
 export {
   render