@aranzatech/diagrams-bpmn 0.3.1 → 0.3.2

package/dist/layout/index.d.cts

@@ -1,13 +1,13 @@
 import { LayoutResult, LayoutOptions } from '@aranzatech/diagrams-core/types';
 export { applyLayoutResultToDiagram } from '@aranzatech/diagrams-core/layout';
-import { d as BpmnRFNode, c as BpmnRFEdge } from '../types-CggktCqr.cjs';
+import { d as BpmnRFNode, c as BpmnRFEdge } from '../types-CDp9kWQ4.cjs';
 import { BpmnDiagramState } from '../modeling/index.cjs';
 import '@xyflow/react';
-import '../types-BYN4Zuee.cjs';
-import '../types-BX_o95GC.cjs';
+import '../types-nvF59RGF.cjs';
+import '../types-dQUuSnV5.cjs';
 import '@aranzatech/diagrams-core';
 import '@aranzatech/diagrams-core/serialization';
-import '../catalog-DAGDhO-D.cjs';
+import '../catalog-DG-sz0VM.cjs';
 
 /**
  * ELK-based auto-layout for BPMN diagrams.

package/dist/layout/index.d.ts

@@ -1,13 +1,13 @@
 import { LayoutResult, LayoutOptions } from '@aranzatech/diagrams-core/types';
 export { applyLayoutResultToDiagram } from '@aranzatech/diagrams-core/layout';
-import { d as BpmnRFNode, c as BpmnRFEdge } from '../types-DmDODKlh.js';
+import { d as BpmnRFNode, c as BpmnRFEdge } from '../types-CuDL2YGL.js';
 import { BpmnDiagramState } from '../modeling/index.js';
 import '@xyflow/react';
-import '../types-BYN4Zuee.js';
-import '../types-D7zel9dq.js';
+import '../types-nvF59RGF.js';
+import '../types-X5FyP8oS.js';
 import '@aranzatech/diagrams-core';
 import '@aranzatech/diagrams-core/serialization';
-import '../catalog-Q1QmKLDD.js';
+import '../catalog-DNIyjHbl.js';
 
 /**
  * ELK-based auto-layout for BPMN diagrams.

package/dist/layout/index.js

@@ -249,17 +249,17 @@ function assignRows(nodes, forwardEdges, columns, gatewayPairs) {
 
 // src/layout/bpmn-custom-layout.ts
 var LANE_LABEL_W = 28;
-var LANE_H_PAD = 40;
-var COL_GAP = 100;
-var ROW_HEIGHT = 100;
-var ROW_GAP = 80;
-var LANE_V_PAD = 60;
-var POOL_H_PAD = 80;
-var POOL_V_GAP = 60;
-var LANE_MIN_H = 200;
-var POOL_MIN_W = 840;
+var LANE_H_PAD = 32;
+var COL_GAP = 60;
+var ROW_HEIGHT = 90;
+var ROW_GAP = 50;
+var LANE_V_PAD = 48;
+var POOL_H_PAD = 64;
+var POOL_V_GAP = 48;
+var LANE_MIN_H = 180;
+var POOL_MIN_W = 720;
 var POOL_INNER_PAD = 10;
-var BACK_EDGE_CLEARANCE = 70;
+var BACK_EDGE_CLEARANCE = 56;
 var LAYOUT_ARTIFACT_TYPES = /* @__PURE__ */ new Set([
   "DataObject",
   "DataObjectReference",
@@ -276,12 +276,38 @@ var COLLAPSED_SUBPROCESS_TYPES = /* @__PURE__ */ new Set([
   "EventSubProcess",
   "AdHocSubProcess"
 ]);
+var LAYOUT_TASK_TYPES = /* @__PURE__ */ new Set([
+  "Task",
+  "UserTask",
+  "ServiceTask",
+  "ScriptTask",
+  "ManualTask",
+  "BusinessRuleTask",
+  "ReceiveTask",
+  "SendTask",
+  "CallActivity"
+]);
+var TASK_LAYOUT_MIN_W = 130;
+var TASK_LAYOUT_MIN_H = 80;
 function nW(node) {
   return node.width ?? node.measured?.width ?? 120;
 }
 function nH(node) {
   return node.height ?? node.measured?.height ?? 60;
 }
+function layoutW(node) {
+  return LAYOUT_TASK_TYPES.has(node.data.elementType) ? Math.max(nW(node), TASK_LAYOUT_MIN_W) : nW(node);
+}
+function layoutH(node) {
+  return LAYOUT_TASK_TYPES.has(node.data.elementType) ? Math.max(nH(node), TASK_LAYOUT_MIN_H) : nH(node);
+}
+function applyLayoutMinSize(node) {
+  if (!LAYOUT_TASK_TYPES.has(node.data.elementType)) return node;
+  const w = layoutW(node);
+  const h = layoutH(node);
+  if (w === nW(node) && h === nH(node)) return node;
+  return { ...node, width: w, height: h, measured: { width: w, height: h } };
+}
 var BOUNDARY_SPACING = 10;
 function repositionBoundaryEvents(boundaryEvents, positionedContent) {
   if (boundaryEvents.length === 0) return [];
@@ -307,8 +333,8 @@ function repositionBoundaryEvents(boundaryEvents, positionedContent) {
     }
     const hostGroup = byHost.get(hostId);
     const siblingIdx = hostGroup.findIndex((n) => n.id === be.id);
-    const hostW = nW(host);
-    const hostH = nH(host);
+    const hostW = layoutW(host);
+    const hostH = layoutH(host);
     const beH = nH(be);
     const totalGroupW = hostGroup.reduce((s, b) => s + nW(b), 0) + (hostGroup.length - 1) * BOUNDARY_SPACING;
     const groupStartX = host.position.x + hostW / 2 - totalGroupW / 2;
@@ -349,7 +375,7 @@ function layoutSubProcess(children, edges) {
   for (let c = 0; c <= maxCol; c++) colW.set(c, 0);
   for (const node of mainChildren) {
     const c = columns.get(node.id) ?? 0;
-    colW.set(c, Math.max(colW.get(c) ?? 0, nW(node)));
+    colW.set(c, Math.max(colW.get(c) ?? 0, layoutW(node)));
   }
   const colX = /* @__PURE__ */ new Map();
   let cumX = 0;
@@ -368,12 +394,11 @@ function layoutSubProcess(children, edges) {
   const positionedChildren = mainChildren.map((node) => {
     const c = columns.get(node.id) ?? 0;
     const r = rows.get(node.id) ?? 0;
-    const colOffset = (colX.get(c) ?? 0) + (colW.get(c) ?? 120) / 2 - nW(node) / 2;
-    const rowOffset = (r - minRow) * (ROW_HEIGHT + ROW_GAP) + ROW_HEIGHT / 2 - nH(node) / 2;
-    return {
-      ...node,
-      position: { x: SP_PAD + colOffset, y: SP_PAD + rowOffset }
-    };
+    const lw = layoutW(node);
+    const lh = layoutH(node);
+    const colOffset = (colX.get(c) ?? 0) + (colW.get(c) ?? 120) / 2 - lw / 2;
+    const rowOffset = (r - minRow) * (ROW_HEIGHT + ROW_GAP) + ROW_HEIGHT / 2 - lh / 2;
+    return applyLayoutMinSize({ ...node, position: { x: SP_PAD + colOffset, y: SP_PAD + rowOffset } });
   });
   const positionedBoundaries = repositionBoundaryEvents(boundaryEvents, positionedChildren);
   return {
@@ -406,8 +431,7 @@ function layoutPool(pool, lanes, content, allEdges) {
       height: h
     };
   }
-  const lanePositionsDistinct = lanes.some((l) => Math.abs(l.position.y) > 10);
-  const sortedLanes = lanePositionsDistinct ? [...lanes].sort((a, b) => a.position.y - b.position.y) : [...lanes];
+  const sortedLanes = [...lanes].sort((a, b) => a.position.y - b.position.y);
   const hasLanes = sortedLanes.length > 0;
   const laneIdSet = new Set(sortedLanes.map((l) => l.id));
   const nodeLaneId = /* @__PURE__ */ new Map();
@@ -456,7 +480,7 @@ function layoutPool(pool, lanes, content, allEdges) {
   for (let c = 0; c <= maxCol; c++) colW.set(c, 0);
   for (const node of mainContent) {
     const c = columns.get(node.id) ?? 0;
-    colW.set(c, Math.max(colW.get(c) ?? 0, nW(node)));
+    colW.set(c, Math.max(colW.get(c) ?? 0, layoutW(node)));
   }
   const colX = /* @__PURE__ */ new Map();
   let cumX = 0;
@@ -483,14 +507,16 @@ function layoutPool(pool, lanes, content, allEdges) {
     const laneId = nodeLaneId.get(node.id) ?? "_pool_";
     const stat = laneStats.get(laneId);
     const lYOff = laneY.get(laneId) ?? 0;
-    const colOffset = (colX.get(c) ?? 0) + (colW.get(c) ?? 120) / 2 - nW(node) / 2;
-    const rowOffset = (r - stat.minRow) * (ROW_HEIGHT + ROW_GAP) + ROW_HEIGHT / 2 - nH(node) / 2;
+    const lw = layoutW(node);
+    const lh = layoutH(node);
+    const colOffset = (colX.get(c) ?? 0) + (colW.get(c) ?? 120) / 2 - lw / 2;
+    const rowOffset = (r - stat.minRow) * (ROW_HEIGHT + ROW_GAP) + ROW_HEIGHT / 2 - lh / 2;
     const contentH_stat = stat.rowCount * ROW_HEIGHT + Math.max(0, stat.rowCount - 1) * ROW_GAP;
     const vertTopOffset = Math.max(LANE_V_PAD, (stat.height - contentH_stat) / 2);
     const isLaneChild = hasLanes && !!node.parentId && node.parentId !== pool.id;
     const x = isLaneChild ? LANE_LABEL_W + LANE_H_PAD + colOffset : POOL_H_PAD + colOffset;
     const y = isLaneChild ? vertTopOffset + rowOffset : lYOff + vertTopOffset + rowOffset;
-    return { ...node, position: { x, y } };
+    return applyLayoutMinSize({ ...node, position: { x, y } });
   });
   const NODE_MIN_GAP = 24;
   const resolvedContent = [...positionedContent];
@@ -499,13 +525,13 @@ function layoutPool(pool, lanes, content, allEdges) {
     for (let k = 1; k < laneNodeIndices.length; k++) {
       const prev = resolvedContent[laneNodeIndices[k - 1].i];
       const curr = resolvedContent[laneNodeIndices[k].i];
-      const prevBottom = prev.position.y + nH(prev);
+      const prevBottom = prev.position.y + layoutH(prev);
       const currTop = curr.position.y;
       const prevTop = prev.position.y;
-      const currBottom = curr.position.y + nH(curr);
+      const currBottom = curr.position.y + layoutH(curr);
       const yOverlap = prevBottom + NODE_MIN_GAP > currTop && currBottom + NODE_MIN_GAP > prevTop;
       if (!yOverlap) continue;
-      const prevRight = prev.position.x + nW(prev);
+      const prevRight = prev.position.x + layoutW(prev);
       if (prevRight + NODE_MIN_GAP > curr.position.x) {
         resolvedContent[laneNodeIndices[k].i] = {
           ...curr,
@@ -550,6 +576,11 @@ function gapMidX(sAbs, sW, tAbs, tW) {
   const rightLeftEdge = Math.max(sAbs.x, tAbs.x);
   return leftRightEdge < rightLeftEdge ? (leftRightEdge + rightLeftEdge) / 2 : sAbs.x + sW / 2;
 }
+function routeMidX(sAbs, sW, tAbs, tW) {
+  const leftEdge = Math.min(sAbs.x + sW, tAbs.x + tW);
+  const rightEdge = Math.max(sAbs.x, tAbs.x);
+  return leftEdge < rightEdge ? leftEdge + (rightEdge - leftEdge) * 0.35 : sAbs.x + sW / 2;
+}
 var SAME_ROW_THRESHOLD = 15;
 function routeEdges(edges, layoutNodes, backEdgeIds, laneIds, poolIds) {
   const byId = new Map(layoutNodes.map((n) => [n.id, n]));
@@ -661,7 +692,7 @@ function routeEdges(edges, layoutNodes, backEdgeIds, laneIds, poolIds) {
           { x: tCX, y: exitsTop ? tAbs.y + tH : tAbs.y }
         ];
       } else {
-        const midX = gapMidX(sAbs, sW, tAbs, tW);
+        const midX = routeMidX(sAbs, sW, tAbs, tW);
         routingPoints = [
           { x: sAbs.x + sW, y: sCY },
           { x: midX, y: sCY },