@statelyai/layout 0.1.2 → 0.1.3

package/dist/elkjs/index.mjs

@@ -1,5 +1,5 @@
-import { o as elkLayeredOptionDefinitions, t as getLayeredLayout } from "../layered-COIyXvwb.mjs";
-import { a as getRandomLayout, f as getFixedLayout, n as getSporeOverlapRemovalLayout, s as getRectanglePackingLayout, t as getSporeCompactionLayout, u as getBoxLayout } from "../spore-BeKUA1Mb.mjs";
+import { o as elkLayeredOptionDefinitions, t as getLayeredLayout } from "../layered-CoeH9LRO.mjs";
+import { a as getRandomLayout, f as getFixedLayout, n as getSporeOverlapRemovalLayout, s as getRectanglePackingLayout, t as getSporeCompactionLayout, u as getBoxLayout } from "../spore-BtTSZbb6.mjs";
 import { createGraph } from "@statelyai/graph";
 
 //#region src/elkjs/statechart.ts

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { A as minimizeCrossingsWithBarycenter, B as LayoutError, C as breakCyclesGreedilyByModelOrder, D as breakCyclesWithModelOrderDepthFirstSearch, E as breakCyclesWithModelOrderBreadthFirstSearch, I as routeEdgesOrthogonally, L as routeEdgesWithPolylines, M as minimizeCrossingsWithModelOrder, N as placeNodesInLayers, P as placeNodesInteractively, R as routeEdgesWithSplines, S as breakCyclesGreedily, T as breakCyclesWithDepthFirstSearch, V as UnsupportedLayoutError, _ as assignLayersInteractively, a as elkLayeredEnumValues, b as breakCyclesByStronglyConnectedConnectivity, d as assignLayersWithMinWidth, f as assignLayersWithNetworkSimplex, g as assignLayersByLongestPathToSink, h as assignLayersByLongestPath, i as toElkLayeredOptions, j as minimizeCrossingsWithMedian, k as minimizeCrossingsInteractively, m as assignLayersByDepthFirstModelOrder, n as layeredAlgorithm, o as elkLayeredOptionDefinitions, p as assignLayersByBreadthFirstModelOrder, r as fromElkLayeredOptionId, t as getLayeredLayout, u as assignLayersWithStretchWidth, v as assignLayersWithCoffmanGraham, w as breakCyclesInteractively, x as breakCyclesByStronglyConnectedNodeType, y as breakCyclesByModelOrder } from "./layered-COIyXvwb.mjs";
-import { a as getRandomLayout, c as rectanglePackingAlgorithm, d as fixedAlgorithm, f as getFixedLayout, i as sporeOverlapRemovalAlgorithm, l as boxAlgorithm, n as getSporeOverlapRemovalLayout, o as randomAlgorithm, r as sporeCompactionAlgorithm, s as getRectanglePackingLayout, t as getSporeCompactionLayout, u as getBoxLayout } from "./spore-BeKUA1Mb.mjs";
+import { A as minimizeCrossingsWithBarycenter, B as LayoutError, C as breakCyclesGreedilyByModelOrder, D as breakCyclesWithModelOrderDepthFirstSearch, E as breakCyclesWithModelOrderBreadthFirstSearch, I as routeEdgesOrthogonally, L as routeEdgesWithPolylines, M as minimizeCrossingsWithModelOrder, N as placeNodesInLayers, P as placeNodesInteractively, R as routeEdgesWithSplines, S as breakCyclesGreedily, T as breakCyclesWithDepthFirstSearch, V as UnsupportedLayoutError, _ as assignLayersInteractively, a as elkLayeredEnumValues, b as breakCyclesByStronglyConnectedConnectivity, d as assignLayersWithMinWidth, f as assignLayersWithNetworkSimplex, g as assignLayersByLongestPathToSink, h as assignLayersByLongestPath, i as toElkLayeredOptions, j as minimizeCrossingsWithMedian, k as minimizeCrossingsInteractively, m as assignLayersByDepthFirstModelOrder, n as layeredAlgorithm, o as elkLayeredOptionDefinitions, p as assignLayersByBreadthFirstModelOrder, r as fromElkLayeredOptionId, t as getLayeredLayout, u as assignLayersWithStretchWidth, v as assignLayersWithCoffmanGraham, w as breakCyclesInteractively, x as breakCyclesByStronglyConnectedNodeType, y as breakCyclesByModelOrder } from "./layered-CoeH9LRO.mjs";
+import { a as getRandomLayout, c as rectanglePackingAlgorithm, d as fixedAlgorithm, f as getFixedLayout, i as sporeOverlapRemovalAlgorithm, l as boxAlgorithm, n as getSporeOverlapRemovalLayout, o as randomAlgorithm, r as sporeCompactionAlgorithm, s as getRectanglePackingLayout, t as getSporeCompactionLayout, u as getBoxLayout } from "./spore-BtTSZbb6.mjs";
 import { getGraphIssues } from "@statelyai/graph";
 
 //#region src/layout.ts

package/dist/layered/index.mjs

@@ -1,3 +1,3 @@
-import { A as minimizeCrossingsWithBarycenter, C as breakCyclesGreedilyByModelOrder, D as breakCyclesWithModelOrderDepthFirstSearch, E as breakCyclesWithModelOrderBreadthFirstSearch, I as routeEdgesOrthogonally, L as routeEdgesWithPolylines, M as minimizeCrossingsWithModelOrder, N as placeNodesInLayers, P as placeNodesInteractively, R as routeEdgesWithSplines, S as breakCyclesGreedily, T as breakCyclesWithDepthFirstSearch, _ as assignLayersInteractively, a as elkLayeredEnumValues, b as breakCyclesByStronglyConnectedConnectivity, c as placeNodesWithLinearSegments, d as assignLayersWithMinWidth, f as assignLayersWithNetworkSimplex, g as assignLayersByLongestPathToSink, h as assignLayersByLongestPath, i as toElkLayeredOptions, j as minimizeCrossingsWithMedian, k as minimizeCrossingsInteractively, l as placeNodesWithBrandesKoepf, m as assignLayersByDepthFirstModelOrder, n as layeredAlgorithm, o as elkLayeredOptionDefinitions, p as assignLayersByBreadthFirstModelOrder, r as fromElkLayeredOptionId, s as placeNodesWithNetworkSimplex, t as getLayeredLayout, u as assignLayersWithStretchWidth, v as assignLayersWithCoffmanGraham, w as breakCyclesInteractively, x as breakCyclesByStronglyConnectedNodeType, y as breakCyclesByModelOrder } from "../layered-COIyXvwb.mjs";
+import { A as minimizeCrossingsWithBarycenter, C as breakCyclesGreedilyByModelOrder, D as breakCyclesWithModelOrderDepthFirstSearch, E as breakCyclesWithModelOrderBreadthFirstSearch, I as routeEdgesOrthogonally, L as routeEdgesWithPolylines, M as minimizeCrossingsWithModelOrder, N as placeNodesInLayers, P as placeNodesInteractively, R as routeEdgesWithSplines, S as breakCyclesGreedily, T as breakCyclesWithDepthFirstSearch, _ as assignLayersInteractively, a as elkLayeredEnumValues, b as breakCyclesByStronglyConnectedConnectivity, c as placeNodesWithLinearSegments, d as assignLayersWithMinWidth, f as assignLayersWithNetworkSimplex, g as assignLayersByLongestPathToSink, h as assignLayersByLongestPath, i as toElkLayeredOptions, j as minimizeCrossingsWithMedian, k as minimizeCrossingsInteractively, l as placeNodesWithBrandesKoepf, m as assignLayersByDepthFirstModelOrder, n as layeredAlgorithm, o as elkLayeredOptionDefinitions, p as assignLayersByBreadthFirstModelOrder, r as fromElkLayeredOptionId, s as placeNodesWithNetworkSimplex, t as getLayeredLayout, u as assignLayersWithStretchWidth, v as assignLayersWithCoffmanGraham, w as breakCyclesInteractively, x as breakCyclesByStronglyConnectedNodeType, y as breakCyclesByModelOrder } from "../layered-CoeH9LRO.mjs";
 
 export { assignLayersByBreadthFirstModelOrder, assignLayersByDepthFirstModelOrder, assignLayersByLongestPath, assignLayersByLongestPathToSink, assignLayersInteractively, assignLayersWithCoffmanGraham, assignLayersWithMinWidth, assignLayersWithNetworkSimplex, assignLayersWithStretchWidth, breakCyclesByModelOrder, breakCyclesByStronglyConnectedConnectivity, breakCyclesByStronglyConnectedNodeType, breakCyclesGreedily, breakCyclesGreedilyByModelOrder, breakCyclesInteractively, breakCyclesWithDepthFirstSearch, breakCyclesWithModelOrderBreadthFirstSearch, breakCyclesWithModelOrderDepthFirstSearch, elkLayeredEnumValues, elkLayeredOptionDefinitions, fromElkLayeredOptionId, getLayeredLayout, layeredAlgorithm, minimizeCrossingsInteractively, minimizeCrossingsWithBarycenter, minimizeCrossingsWithMedian, minimizeCrossingsWithModelOrder, placeNodesInLayers, placeNodesInteractively, placeNodesWithBrandesKoepf, placeNodesWithLinearSegments, placeNodesWithNetworkSimplex, routeEdgesOrthogonally, routeEdgesWithPolylines, routeEdgesWithSplines, toElkLayeredOptions };

package/dist/{layered-COIyXvwb.mjs → layered-CoeH9LRO.mjs}

@@ -2494,7 +2494,40 @@ function routeEdges(style) {
 			}
 			flowLayerByNodeId.set(interval.id, flowLayers.length - 1);
 		}
+		const increasing = input.direction === "right" || input.direction === "down";
+		const flowPortProtrusion = (edge, endpoint) => {
+			const node = nodeById.get(endpoint === "source" ? edge.sourceId : edge.targetId);
+			const portName = endpoint === "source" ? edge.sourcePort : edge.targetPort;
+			const port = node?.ports?.find((candidate) => candidate.name === portName);
+			if (!node || !port) return 0;
+			return input.portSettings?.(port, node)?.["port.side"] === (horizontal ? endpoint === "source" ? input.direction === "right" ? "EAST" : "WEST" : input.direction === "right" ? "WEST" : "EAST" : endpoint === "source" ? input.direction === "down" ? "SOUTH" : "NORTH" : input.direction === "down" ? "NORTH" : "SOUTH") ? horizontal ? port.width ?? 0 : port.height ?? 0 : 0;
+		};
+		const adjacentNodeIds = /* @__PURE__ */ new Map();
+		for (const edge of input.graph.edges) {
+			const sourceNeighbors = adjacentNodeIds.get(edge.sourceId) ?? /* @__PURE__ */ new Set();
+			sourceNeighbors.add(edge.targetId);
+			adjacentNodeIds.set(edge.sourceId, sourceNeighbors);
+			const targetNeighbors = adjacentNodeIds.get(edge.targetId) ?? /* @__PURE__ */ new Set();
+			targetNeighbors.add(edge.sourceId);
+			adjacentNodeIds.set(edge.targetId, targetNeighbors);
+		}
+		const feedbackComponentNodeIds = /* @__PURE__ */ new Set();
+		for (const edge of input.graph.edges) {
+			const sourceLayer = flowLayerByNodeId.get(edge.sourceId);
+			const targetLayer = flowLayerByNodeId.get(edge.targetId);
+			if (sourceLayer === void 0 || targetLayer === void 0) continue;
+			if (sourceLayer === targetLayer) continue;
+			if (increasing ? targetLayer > sourceLayer : targetLayer < sourceLayer) continue;
+			const pending = [edge.sourceId, edge.targetId];
+			while (pending.length > 0) {
+				const nodeId = pending.pop();
+				if (feedbackComponentNodeIds.has(nodeId)) continue;
+				feedbackComponentNodeIds.add(nodeId);
+				pending.push(...adjacentNodeIds.get(nodeId) ?? []);
+			}
+		}
 		const labelExtraByGap = flowLayers.slice(0, -1).map(() => 0);
+		const compactLabelCorridorGaps = /* @__PURE__ */ new Set();
 		for (const edge of input.graph.edges) {
 			const labelFlowSize = horizontal ? edge.width ?? 0 : edge.height ?? 0;
 			if (labelFlowSize <= 0) continue;
@@ -2502,8 +2535,14 @@ function routeEdges(style) {
 			const targetLayer = flowLayerByNodeId.get(edge.targetId);
 			if (sourceLayer === void 0 || targetLayer === void 0) continue;
 			if (Math.abs(sourceLayer - targetLayer) !== 1) continue;
-			const extra = (input.edgeSettings?.(edge)?.["edgeLabels.placement"] ?? "CENTER") === "CENTER" ? labelFlowSize + input.spacing.layer : labelFlowSize + Number(input.settings["spacing.edgeLabel"] ?? 2);
+			const placement$1 = input.edgeSettings?.(edge)?.["edgeLabels.placement"] ?? "CENTER";
+			const edgeNodeSpacing = Number(input.settings["spacing.edgeNodeBetweenLayers"] ?? 10);
+			const requiredGap = labelFlowSize + Math.max(input.spacing.layer, flowPortProtrusion(edge, "source") + edgeNodeSpacing) + Math.max(input.spacing.layer, flowPortProtrusion(edge, "target") + edgeNodeSpacing);
 			const gap = Math.min(sourceLayer, targetLayer);
+			const availableGap = flowLayers[gap + 1].start - flowLayers[gap].end;
+			const compactCorridor = placement$1 === "CENTER" && (increasing ? targetLayer > sourceLayer : targetLayer < sourceLayer) && !feedbackComponentNodeIds.has(edge.sourceId);
+			if (compactCorridor) compactLabelCorridorGaps.add(gap);
+			const extra = compactCorridor ? Math.max(0, requiredGap - availableGap) : placement$1 === "CENTER" ? labelFlowSize + input.spacing.layer : labelFlowSize + Number(input.settings["spacing.edgeLabel"] ?? 2);
 			labelExtraByGap[gap] = Math.max(labelExtraByGap[gap] ?? 0, extra);
 		}
 		let labelShift = 0;
@@ -2749,7 +2788,7 @@ function routeEdges(style) {
 				const slots = slotsByGap[layerNo] ?? 0;
 				const routesNearTarget = candidatesByGap[layerNo]?.some((candidate) => hasZeroFixedSideTarget(candidate.edge) && candidatesByGap[layerNo].filter(({ edge }) => edge.targetId === candidate.edge.targetId).length > candidatesByGap[layerNo].filter(({ edge }) => edge.sourceId === candidate.edge.sourceId).length);
 				const preservedGap = (existingGapByLayer[layerNo] ?? input.spacing.layer) - (routesNearTarget ? edgeEdgeSpacing : 0);
-				const gapSpacing = slots === 0 ? existingGapByLayer[layerNo] ?? input.spacing.layer : Math.max(preservesNodeFlexibilityGap || (labelExtraByGap[layerNo] ?? 0) > 0 || [...selfLoopsByNodeId].some(([id, loops]) => (flowLayerByNodeId.get(id) === layerNo || flowLayerByNodeId.get(id) === layerNo + 1) && loops.some((edge) => input.edgeSettings?.(edge)?.["edgeLabels.inline"] === true)) ? preservedGap : input.spacing.layer, 2 * edgeNodeSpacing + Math.max(0, slots - 1) * edgeEdgeSpacing);
+				const gapSpacing = slots === 0 ? existingGapByLayer[layerNo] ?? input.spacing.layer : Math.max(preservesNodeFlexibilityGap || (labelExtraByGap[layerNo] ?? 0) > 0 || compactLabelCorridorGaps.has(layerNo) || [...selfLoopsByNodeId].some(([id, loops]) => (flowLayerByNodeId.get(id) === layerNo || flowLayerByNodeId.get(id) === layerNo + 1) && loops.some((edge) => input.edgeSettings?.(edge)?.["edgeLabels.inline"] === true)) ? preservedGap : input.spacing.layer, 2 * edgeNodeSpacing + Math.max(0, slots - 1) * edgeEdgeSpacing);
 				nextStart = bounds.end + gapSpacing;
 			}
 			implicitEndpoints = implicitEdgeEndpoints(input, placement, orientation);

package/dist/{spore-BeKUA1Mb.mjs → spore-BtTSZbb6.mjs}

@@ -1,4 +1,4 @@
-import { F as placePorts, O as getPolylineMidpoint, z as JavaRandom } from "./layered-COIyXvwb.mjs";
+import { F as placePorts, O as getPolylineMidpoint, z as JavaRandom } from "./layered-CoeH9LRO.mjs";
 import { getNodeSize } from "@statelyai/graph/layout";
 
 //#region src/fixed.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statelyai/layout",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Extensible, graph-native layout algorithms for @statelyai/graph",
   "license": "EPL-2.0 OR GPL-3.0-or-later",
   "repository": {

package/src/layered/strategies.ts

@@ -3645,7 +3645,57 @@ function routeEdges(style: "ORTHOGONAL" | "POLYLINE" | "SPLINES"): EdgeRouter {
       flowLayerByNodeId.set(interval.id, flowLayers.length - 1);
     }
 
+    const increasing = input.direction === "right" || input.direction === "down";
+    const flowPortProtrusion = (edge: GraphEdge, endpoint: "source" | "target"): number => {
+      const node = nodeById.get(endpoint === "source" ? edge.sourceId : edge.targetId);
+      const portName = endpoint === "source" ? edge.sourcePort : edge.targetPort;
+      const port = node?.ports?.find((candidate) => candidate.name === portName);
+      if (!node || !port) return 0;
+      const side = input.portSettings?.(port, node)?.["port.side"];
+      const flowSide = horizontal
+        ? endpoint === "source"
+          ? input.direction === "right"
+            ? "EAST"
+            : "WEST"
+          : input.direction === "right"
+            ? "WEST"
+            : "EAST"
+        : endpoint === "source"
+          ? input.direction === "down"
+            ? "SOUTH"
+            : "NORTH"
+          : input.direction === "down"
+            ? "NORTH"
+            : "SOUTH";
+      return side === flowSide ? (horizontal ? (port.width ?? 0) : (port.height ?? 0)) : 0;
+    };
+    const adjacentNodeIds = new Map<string, Set<string>>();
+    for (const edge of input.graph.edges) {
+      const sourceNeighbors = adjacentNodeIds.get(edge.sourceId) ?? new Set<string>();
+      sourceNeighbors.add(edge.targetId);
+      adjacentNodeIds.set(edge.sourceId, sourceNeighbors);
+      const targetNeighbors = adjacentNodeIds.get(edge.targetId) ?? new Set<string>();
+      targetNeighbors.add(edge.sourceId);
+      adjacentNodeIds.set(edge.targetId, targetNeighbors);
+    }
+    const feedbackComponentNodeIds = new Set<string>();
+    for (const edge of input.graph.edges) {
+      const sourceLayer = flowLayerByNodeId.get(edge.sourceId);
+      const targetLayer = flowLayerByNodeId.get(edge.targetId);
+      if (sourceLayer === undefined || targetLayer === undefined) continue;
+      if (sourceLayer === targetLayer) continue;
+      const forward = increasing ? targetLayer > sourceLayer : targetLayer < sourceLayer;
+      if (forward) continue;
+      const pending = [edge.sourceId, edge.targetId];
+      while (pending.length > 0) {
+        const nodeId = pending.pop()!;
+        if (feedbackComponentNodeIds.has(nodeId)) continue;
+        feedbackComponentNodeIds.add(nodeId);
+        pending.push(...(adjacentNodeIds.get(nodeId) ?? []));
+      }
+    }
     const labelExtraByGap = flowLayers.slice(0, -1).map(() => 0);
+    const compactLabelCorridorGaps = new Set<number>();
     for (const edge of input.graph.edges) {
       const labelFlowSize = horizontal ? (edge.width ?? 0) : (edge.height ?? 0);
       if (labelFlowSize <= 0) continue;
@@ -3654,11 +3704,25 @@ function routeEdges(style: "ORTHOGONAL" | "POLYLINE" | "SPLINES"): EdgeRouter {
       if (sourceLayer === undefined || targetLayer === undefined) continue;
       if (Math.abs(sourceLayer - targetLayer) !== 1) continue;
       const placement = input.edgeSettings?.(edge)?.["edgeLabels.placement"] ?? "CENTER";
-      const extra =
-        placement === "CENTER"
+      const edgeNodeSpacing = Number(input.settings["spacing.edgeNodeBetweenLayers"] ?? 10);
+      // ELK models center labels as dummy layers. For an exterior port, using node-node
+      // spacing beyond the port double-counts the corridor. Treat the label as edge
+      // geometry while retaining normal layer spacing when it is the larger clearance.
+      const requiredGap =
+        labelFlowSize +
+        Math.max(input.spacing.layer, flowPortProtrusion(edge, "source") + edgeNodeSpacing) +
+        Math.max(input.spacing.layer, flowPortProtrusion(edge, "target") + edgeNodeSpacing);
+      const gap = Math.min(sourceLayer, targetLayer);
+      const availableGap = flowLayers[gap + 1]!.start - flowLayers[gap]!.end;
+      const forward = increasing ? targetLayer > sourceLayer : targetLayer < sourceLayer;
+      const compactCorridor =
+        placement === "CENTER" && forward && !feedbackComponentNodeIds.has(edge.sourceId);
+      if (compactCorridor) compactLabelCorridorGaps.add(gap);
+      const extra = compactCorridor
+        ? Math.max(0, requiredGap - availableGap)
+        : placement === "CENTER"
           ? labelFlowSize + input.spacing.layer
           : labelFlowSize + Number(input.settings["spacing.edgeLabel"] ?? 2);
-      const gap = Math.min(sourceLayer, targetLayer);
       labelExtraByGap[gap] = Math.max(labelExtraByGap[gap] ?? 0, extra);
     }
     let labelShift = 0;
@@ -4049,6 +4113,7 @@ function routeEdges(style: "ORTHOGONAL" | "POLYLINE" | "SPLINES"): EdgeRouter {
             : Math.max(
                 preservesNodeFlexibilityGap ||
                   (labelExtraByGap[layerNo] ?? 0) > 0 ||
+                  compactLabelCorridorGaps.has(layerNo) ||
                   [...selfLoopsByNodeId].some(
                     ([id, loops]) =>
                       (flowLayerByNodeId.get(id) === layerNo ||