@diagrammo/dgmo 0.89.0 → 0.91.0

package/dist/{chunk-ZNNVI5SR.js → chunk-CU2PZLZP.js}

@@ -1,7 +1,10 @@
+import {
+  searchPlacement
+} from "./chunk-JJUDOR4I.js";
 import {
   noteCanvasShift,
   placeNotes
-} from "./chunk-6EK55ART.js";
+} from "./chunk-Q3N7PI3B.js";
 import {
   noteBoxSize
 } from "./chunk-RJNZHFNG.js";
@@ -22,6 +25,7 @@ function computeNodeHeight(shape) {
   if (shape === "pseudostate") return 24;
   return shape === "decision" ? 60 : 50;
 }
+var newDagreGraph = () => new dagre.graphlib.Graph({ compound: true });
 function layoutGraph(graph, options) {
   const collapsedChildCounts = options?.collapsedChildCounts;
   const originalGroups = options?.originalGroups;
@@ -45,33 +49,14 @@ function layoutGraph(graph, options) {
   if (allNodes.length === 0) {
     return { nodes: [], edges: [], groups: [], width: 0, height: 0 };
   }
-  const g = new dagre.graphlib.Graph({ compound: true });
-  g.setGraph({
-    rankdir: graph.direction,
-    nodesep: 50,
-    ranksep: 60,
-    edgesep: 20
-  });
-  g.setDefaultEdgeLabel(() => ({}));
   const nodeDataMap = /* @__PURE__ */ new Map();
   for (const node of allNodes) {
     nodeDataMap.set(node.id, node);
   }
-  if (graph.groups) {
-    for (const group of graph.groups) {
-      g.setNode(group.id, {
-        label: group.label,
-        clusterLabelPos: "top"
-      });
-    }
-  }
   const notesSuppressed = graph.options?.["no-notes"] === "on";
   const noteByNode = notesSuppressed || !graph.notes ? /* @__PURE__ */ new Map() : resolveNotes(graph.notes, graph.nodes);
   const noteGeoms = /* @__PURE__ */ new Map();
   for (const node of allNodes) {
-    const width = computeNodeWidth(node.label, node.shape);
-    const height = computeNodeHeight(node.shape);
-    g.setNode(node.id, { label: node.label, width, height });
     const note = noteByNode.get(node.id);
     if (note) {
       const size = noteBoxSize(note.body);
@@ -84,9 +69,6 @@ function layoutGraph(graph, options) {
         endLineNumber: note.endLineNumber
       });
     }
-    if (node.group && graph.groups?.some((gr) => gr.id === node.group)) {
-      g.setParent(node.id, node.group);
-    }
   }
   const edgeDataMap = /* @__PURE__ */ new Map();
   for (const edge of graph.edges) {
@@ -102,15 +84,55 @@ function layoutGraph(graph, options) {
     }
     group.push(edge);
   }
-  for (const group of outgoingBySource.values()) {
-    for (let i = group.length - 1; i >= 0; i--) {
-      const edge = group[i];
-      g.setEdge(edge.source, edge.target, {
+  const edgeOrder = [];
+  for (const group of outgoingBySource.values())
+    for (let i = group.length - 1; i >= 0; i--) edgeOrder.push(group[i]);
+  const place = (ranker, shuffle) => {
+    const ord = shuffle ?? ((a) => a.slice());
+    const g2 = newDagreGraph();
+    g2.setGraph({
+      rankdir: graph.direction,
+      ranker,
+      nodesep: 50,
+      ranksep: 60,
+      edgesep: 20
+    });
+    g2.setDefaultEdgeLabel(() => ({}));
+    if (graph.groups) {
+      for (const group of graph.groups) {
+        g2.setNode(group.id, {
+          label: group.label,
+          clusterLabelPos: "top"
+        });
+      }
+    }
+    for (const node of ord(allNodes)) {
+      const width = computeNodeWidth(node.label, node.shape);
+      const height = computeNodeHeight(node.shape);
+      g2.setNode(node.id, { label: node.label, width, height });
+      if (node.group && graph.groups?.some((gr) => gr.id === node.group)) {
+        g2.setParent(node.id, node.group);
+      }
+    }
+    for (const edge of ord(edgeOrder)) {
+      g2.setEdge(edge.source, edge.target, {
         label: edge.label ?? ""
       });
     }
-  }
-  dagre.layout(g);
+    dagre.layout(g2);
+    return g2;
+  };
+  const { g, edgePoints } = searchPlacement(graph.direction, place, (lay) => ({
+    nodes: allNodes.map((n) => {
+      const p = lay.node(n.id);
+      return { id: n.id, x: p.x, y: p.y, width: p.width, height: p.height };
+    }),
+    edges: graph.edges.map((e) => ({
+      source: e.source,
+      target: e.target,
+      points: lay.edge(e.source, e.target)?.points ?? []
+    }))
+  }));
   const collapsedGroupIds = collapsedChildCounts ? new Set(collapsedChildCounts.keys()) : /* @__PURE__ */ new Set();
   const basePositioned = allNodes.map((node) => {
     const pos = g.node(node.id);
@@ -179,12 +201,12 @@ function layoutGraph(graph, options) {
       }
     };
   });
-  const layoutEdges = graph.edges.map((edge) => {
+  const layoutEdges = graph.edges.map((edge, i) => {
     const edgeData = g.edge(edge.source, edge.target);
     return {
       source: edge.source,
       target: edge.target,
-      points: edgeData?.points ?? [],
+      points: edgePoints?.[i] ?? edgeData?.points ?? [],
       ...edge.label !== void 0 && { label: edge.label },
       lineNumber: edge.lineNumber
     };

package/dist/{chunk-CUYHST3B.js → chunk-CVZBLHHW.js}

@@ -10,7 +10,7 @@ import {
 import {
   injectDefaultTagMetadata,
   resolveTagColor
-} from "./chunk-L5AFONQU.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   measureText,
   truncateText

package/dist/{chunk-Y7PSAHAY.js → chunk-CXIPV2FY.js}

@@ -7,10 +7,10 @@ import {
   mutedFill,
   resolveCellColor,
   resolveColorMode
-} from "./chunk-HUNDJTTH.js";
+} from "./chunk-53BJIOLF.js";
 import {
   renderIntegratedLegend
-} from "./chunk-7SX4IY6T.js";
+} from "./chunk-QVKTAU7P.js";
 import {
   getMaxLegendReservedHeight
 } from "./chunk-NS7L7YKH.js";
@@ -19,7 +19,7 @@ import {
 } from "./chunk-ICLB27PZ.js";
 import {
   tagAttrKey
-} from "./chunk-L5AFONQU.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   LEGEND_GROUP_GAP
 } from "./chunk-I6GGMCTV.js";

package/dist/{chunk-NRPELUB6.js → chunk-D7DXNQW5.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-BDXC7MDK.js";
 import {
   renderIntegratedLegend
-} from "./chunk-7SX4IY6T.js";
+} from "./chunk-QVKTAU7P.js";
 import {
   FONT_FAMILY
 } from "./chunk-ICLB27PZ.js";
@@ -13,7 +13,7 @@ import {
   resolveActiveTagGroup,
   resolveTagColor,
   tagAttrKey
-} from "./chunk-L5AFONQU.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   getSeriesColors,
   mix,

package/dist/{chunk-YMFQLWZ2.js → chunk-D7PP35BA.js}

@@ -9,7 +9,7 @@ import {
   injectDefaultTagMetadata,
   resolveTagColor,
   tagAttrKey
-} from "./chunk-L5AFONQU.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   LEGEND_CAPSULE_PAD,
   LEGEND_DOT_R,

package/dist/{chunk-RGWYZR3S.js → chunk-DLX7MEN4.js}

@@ -18,10 +18,10 @@ import {
   UNTAGGED_TAG_COLOR,
   resolveTagColor,
   tagAttrKey
-} from "./chunk-L5AFONQU.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   fillModeFromOptions
-} from "./chunk-44GP7PD5.js";
+} from "./chunk-MPJQMMBZ.js";
 import {
   contrastText,
   mix,