flowink 0.1.0 → 0.1.1

package/README.md

@@ -92,12 +92,8 @@ flowchart TB
  │        │
  ╲────────╱
     ┌┘ │
-    │  └─────┐
-    │    no  │
-yes │        │
-    │        │
-    │        │
-    ▼        ▼
+yes │  └─────┐
+    ▼    no  ▼
 ┌───────┐┌───────┐
 │ Ship  ││ Wait  │
 └───────┘└───────┘
@@ -190,8 +186,6 @@ flowchart TB
 | +--------+ |
 |     |      |
 +-----|------+
-      |
-      |
       v
    +------+
    | Text |

package/dist/index.js

@@ -2274,19 +2274,49 @@ async function layout(graph) {
     });
   }
   const result = fromElkGraph(context, laidOut);
-  if (needsWireClearance(context.graph, result)) expandGrid(result);
+  compactVerticalChannels(result);
+  separateAdjacentRoutes(result);
   return placeLabels(result);
 }
-function needsWireClearance(graph, layoutGraph) {
-  const pairs = /* @__PURE__ */ new Set();
-  const reverse = /* @__PURE__ */ new Set();
-  for (const edge of graph.edges) {
-    const pair = pairKey(edge.source, edge.target);
-    if (pairs.has(pair) || reverse.has(pairKey(edge.target, edge.source))) return true;
-    pairs.add(pair);
-    reverse.add(pair);
+function compactVerticalChannels(layoutGraph) {
+  const fixed = /* @__PURE__ */ new Set();
+  for (const box of layoutGraph.boxes) {
+    fixed.add(box.y);
+    fixed.add(box.y + box.height - 1);
+    const end = box.kind === "subgraph" ? box.y + 1 + box.lines.length : box.y + box.height;
+    for (let y = box.y; y < end; y += 1) fixed.add(y);
+  }
+  for (const edge of layoutGraph.edges) {
+    for (const point of edge.points) fixed.add(point.y);
+    if (edge.arrowStart !== "none" && edge.arrowEnd !== "none") {
+      const first = edge.points[0];
+      const last = edge.points.at(-1);
+      const next = edge.points.find((point) => point.x !== first.x || point.y !== first.y);
+      const previous = [...edge.points].reverse().find((point) => point.x !== last.x || point.y !== last.y);
+      if (next) fixed.add(first.y + Math.sign(next.y - first.y));
+      if (previous) fixed.add(last.y + Math.sign(previous.y - last.y));
+    }
+  }
+  const rows = [...fixed].sort((a, b) => a - b);
+  const removed = [];
+  for (let i = 1; i < rows.length; i += 1) {
+    for (let y = rows[i - 1] + 2; y < rows[i]; y += 1) removed.push(y);
+  }
+  const map = (value) => value - removed.filter((y) => y < value).length;
+  for (const box of layoutGraph.boxes) {
+    const bottom = map(box.y + box.height - 1);
+    box.y = map(box.y);
+    box.height = bottom - box.y + 1;
   }
-  const segments = layoutGraph.edges.flatMap((edge) => edge.points.slice(1).map((b, index) => ({
+  for (const edge of layoutGraph.edges) {
+    for (const point of edge.points) point.y = map(point.y);
+    if (edge.label) edge.label.y = map(edge.label.y);
+  }
+  layoutGraph.height = map(layoutGraph.height);
+}
+function separateAdjacentRoutes(layoutGraph) {
+  const gaps = { x: /* @__PURE__ */ new Set(), y: /* @__PURE__ */ new Set() };
+  const segments = layoutGraph.edges.filter((edge) => edge.stroke !== "invisible").flatMap((edge) => edge.points.slice(1).map((b, index) => ({
     id: edge.id,
     a: edge.points[index],
     b,
@@ -2300,31 +2330,29 @@ function needsWireClearance(graph, layoutGraph) {
     const varying = a.horizontal ? "x" : "y";
     const distance = Math.abs(a.a[fixed] - b.a[fixed]);
     const overlap = Math.min(Math.max(a.a[varying], a.b[varying]), Math.max(b.a[varying], b.b[varying])) - Math.max(Math.min(a.a[varying], a.b[varying]), Math.min(b.a[varying], b.b[varying]));
-    if (distance === 1 && overlap >= 1) return true;
+    if (distance === 1 && overlap >= 1) gaps[fixed].add(Math.min(a.a[fixed], b.a[fixed]));
   }
-  return false;
-}
-function expandGrid(layoutGraph) {
+  const map = (axis, value) => value + [...gaps[axis]].filter((gap) => gap < value).length;
   for (const box of layoutGraph.boxes) {
-    box.x *= 2;
-    box.y *= 2;
-    box.width = Math.max(1, (box.width - 1) * 2 + 1);
-    box.height = Math.max(1, (box.height - 1) * 2 + 1);
+    const right = map("x", box.x + box.width - 1);
+    const bottom = map("y", box.y + box.height - 1);
+    box.x = map("x", box.x);
+    box.y = map("y", box.y);
+    box.width = right - box.x + 1;
+    box.height = bottom - box.y + 1;
   }
   for (const edge of layoutGraph.edges) {
     for (const point of edge.points) {
-      point.x *= 2;
-      point.y *= 2;
+      point.x = map("x", point.x);
+      point.y = map("y", point.y);
     }
     if (edge.label) {
-      edge.label.x *= 2;
-      edge.label.y *= 2;
-      edge.label.width = Math.max(1, (edge.label.width - 1) * 2 + 1);
-      edge.label.height = Math.max(1, (edge.label.height - 1) * 2 + 1);
+      edge.label.x = map("x", edge.label.x);
+      edge.label.y = map("y", edge.label.y);
     }
   }
-  layoutGraph.width = Math.max(1, layoutGraph.width * 2);
-  layoutGraph.height = Math.max(1, layoutGraph.height * 2);
+  layoutGraph.width = map("x", layoutGraph.width);
+  layoutGraph.height = map("y", layoutGraph.height);
 }
 function makeContext(graph) {
   if (!graph || typeof graph !== "object") invalid("A FlowGraph object is required.");