@uipath/maestro-tool 1.204.0 → 1.205.0-preview.258

package/dist/{tidy-service-thmayk2h.js → tidy-service-mepxtxqm.js}

@@ -8,28 +8,32 @@ import {
 import {
   readFlowWorkflow,
   writeFlowWorkflow
-} from "./packager-tool-b39nrh8y.js";
-import"./packager-tool-yv10w46z.js";
-import"./packager-tool-x2py933t.js";
+} from "./packager-tool-sga4h8yj.js";
+import"./packager-tool-zgm0r4yp.js";
+import"./packager-tool-6sm17vbx.js";
+import"./packager-tool-tzc6xsp3.js";
 import {
   DEFAULT_LAYOUT_OPTIONS,
   GRID_SPACING,
   resolveHeight,
   resolveWidth,
   snapToGrid
-} from "./packager-tool-ts5t1nmn.js";
-import"./packager-tool-5jb06280.js";
+} from "./packager-tool-sxqtxw0e.js";
+import"./packager-tool-d1kd88zq.js";
+import"./packager-tool-y4tyghzf.js";
 import {
   generateNodeVariables
-} from "./packager-tool-kveaemqp.js";
-import"./packager-tool-nase5ajk.js";
+} from "./packager-tool-msecps3h.js";
+import"./packager-tool-rp7pny4t.js";
 import"./packager-tool-nkrmjr3a.js";
-import"./packager-tool-xdxr3ync.js";
+import"./packager-tool-hdxtgckw.js";
 import"./packager-tool-rs6jm14d.js";
 import"./packager-tool-hk1gxnth.js";
-import"./packager-tool-7q6z6npd.js";
+import"./packager-tool-mgcz986r.js";
+import"./packager-tool-xj0agqpk.js";
+import"./packager-tool-pcvhcn2k.js";
 import"./packager-tool-sc961w0q.js";
-import"./packager-tool-d88rqwk8.js";
+import"./packager-tool-6z1hsm2h.js";
 import"./packager-tool-dxz4sejs.js";
 import"./packager-tool-sztqqbxp.js";
 import"./packager-tool-gbgfwx8f.js";
@@ -43,7 +47,8 @@ import"./packager-tool-mcaf4ewf.js";
 import"./packager-tool-4mna26cc.js";
 import"./packager-tool-c23zrhj8.js";
 import"./packager-tool-yvcrdbgp.js";
-import"./packager-tool-z1qbc0qf.js";
+import"./packager-tool-sm8ertv4.js";
+import"./packager-tool-wv85dhy2.js";
 import {
   __require,
   __toESM
@@ -119,13 +124,8 @@ function buildArtifactParentWrappers(artifactGroups) {
   }
   return Array.from(wrapperMap.values());
 }
-var ARTIFACT_GROUP_SPACING = 96;
-var ARTIFACT_HORIZONTAL_SPACING = ARTIFACT_GROUP_SPACING / 2;
-var edgeNodeClearance = (options) => snapToGrid(options.layerSpacing / 2);
-var EDGE_EDGE_CLEARANCE_PX = GRID_SPACING;
-var GRID_PADDING = `[top=${GRID_SPACING},left=${GRID_SPACING},bottom=${GRID_SPACING},right=${GRID_SPACING}]`;
-function makeGroupId(group) {
-  return `${group.parentId}__${group.sourceHandle}_group`;
+function elkPortId(nodeId, handleId) {
+  return `${nodeId}_${handleId}`;
 }
 function computeElkPortIndices(ports) {
   const bySide = /* @__PURE__ */ new Map;
@@ -144,6 +144,50 @@ function computeElkPortIndices(ports) {
   }
   return result;
 }
+function buildElkPorts(nodeId, ports) {
+  const elkIndices = computeElkPortIndices([...ports]);
+  return ports.map((port) => ({
+    id: elkPortId(nodeId, port.id),
+    layoutOptions: { "port.side": port.side, "port.index": (elkIndices.get(port.id) ?? port.index).toString() }
+  }));
+}
+function buildInsetElkPorts(nodeId, ports, real, inset) {
+  const inflatedWidth = inset.left + real.width + inset.right;
+  const inflatedHeight = inset.top + real.height + inset.bottom;
+  const bySide = /* @__PURE__ */ new Map;
+  for (const p of ports) {
+    if (!bySide.has(p.side))
+      bySide.set(p.side, []);
+    bySide.get(p.side).push(p);
+  }
+  const result = [];
+  for (const [side, sidePorts] of bySide) {
+    const sorted = [...sidePorts].sort((a, b) => a.index - b.index);
+    sorted.forEach((port, i) => {
+      const along = (i + 1) / (sorted.length + 1);
+      let x;
+      let y;
+      if (side === "EAST" || side === "WEST") {
+        x = side === "EAST" ? inflatedWidth : 0;
+        y = inset.top + real.height * along;
+      } else {
+        x = inset.left + real.width * along;
+        y = side === "SOUTH" ? inflatedHeight : 0;
+      }
+      result.push({ id: elkPortId(nodeId, port.id), x, y, layoutOptions: { "port.side": side } });
+    });
+  }
+  return result;
+}
+var edgeNodeClearance = (layerSpacing) => snapToGrid(layerSpacing / 2);
+var EDGE_EDGE_CLEARANCE_PX = 1 * GRID_SPACING;
+var ARTIFACT_GROUP_SPACING = 96;
+var ARTIFACT_HORIZONTAL_SPACING = ARTIFACT_GROUP_SPACING / 2;
+var FLOW_EDGE_STRAIGHTNESS_PRIORITY = "2";
+var GRID_PADDING = `[top=${GRID_SPACING},left=${GRID_SPACING},bottom=${GRID_SPACING},right=${GRID_SPACING}]`;
+function makeGroupId(group) {
+  return `${group.parentId}__${group.sourceHandle}_group`;
+}
 var warmElkLayoutChunk = () => import("./elk.bundled-vpsbxz0p.js").then((m)=>__toESM(m.default,1));
 var ElkLayoutEngine = class {
   constructor(elk) {
@@ -167,6 +211,7 @@ var ElkLayoutEngine = class {
     const { artifactGroups, artifactNodeIds } = analyzeArtifactConnections(edges, nodePortsMap);
     const graph = this.buildHierarchicalGraph(nodes, edges, nodePortsMap, artifactGroups, artifactNodeIds, options);
     const elk = await this.getElk();
+    await this.freezeWrappers(graph, elk);
     const layouted = await elk.layout(graph);
     const updatedNodes = this.extractNodePositions(nodes, layouted);
     const edgeWaypoints = this.extractEdgeWaypoints(layouted, new Set(edges.map((e) => e.id)));
@@ -207,12 +252,7 @@ var ElkLayoutEngine = class {
     };
   }
   createElkNode(node, nodePortsMap) {
-    const ports = nodePortsMap.get(node.id) ?? [];
-    const elkIndices = computeElkPortIndices(ports);
-    const elkPorts = ports.map((port) => ({
-      id: `${node.id}_${port.id}`,
-      layoutOptions: { "port.side": port.side, "port.index": (elkIndices.get(port.id) ?? port.index).toString() }
-    }));
+    const elkPorts = buildElkPorts(node.id, nodePortsMap.get(node.id) ?? []);
     return {
       id: node.id,
       width: resolveWidth(node),
@@ -362,7 +402,12 @@ var ElkLayoutEngine = class {
       } else {
         targetRef = edge.target;
       }
-      elkEdges.push({ id: edge.id, sources: [sourceRef], targets: [targetRef] });
+      elkEdges.push({
+        id: edge.id,
+        sources: [sourceRef],
+        targets: [targetRef],
+        layoutOptions: { "org.eclipse.elk.layered.priority.straightness": FLOW_EDGE_STRAIGHTNESS_PRIORITY }
+      });
     }
     return elkEdges;
   }
@@ -370,6 +415,31 @@ var ElkLayoutEngine = class {
     const ports = nodePortsMap.get(nodeId);
     return ports != null && ports.some((p) => p.id === handleId);
   }
+  async freezeWrappers(root, elk) {
+    for (const child of root.children ?? []) {
+      if (!child.id.endsWith("_wrapper") || !child.children)
+        continue;
+      const parentId = child.id.slice(0, -"_wrapper".length);
+      const laid = await elk.layout(structuredClone(child));
+      const parent = laid.children?.find((c) => c.id === parentId);
+      if (!parent || laid.width === undefined || laid.height === undefined)
+        continue;
+      const parentCenterY = (parent.y ?? 0) + (parent.height ?? 0) / 2;
+      child.children = laid.children;
+      child.edges = laid.edges;
+      child.width = laid.width;
+      child.height = laid.height;
+      child.layoutOptions = {
+        "elk.algorithm": "fixed",
+        "elk.padding": "[top=0,left=0,bottom=0,right=0]",
+        portConstraints: "FIXED_POS"
+      };
+      child.ports = child.ports?.map((port) => {
+        const side = port.layoutOptions?.["port.side"];
+        return { ...port, x: side === "EAST" ? laid.width : 0, y: parentCenterY, layoutOptions: { "port.side": side ?? "WEST" } };
+      });
+    }
+  }
   extractNodePositions(nodes, layouted) {
     const nodePositions = /* @__PURE__ */ new Map;
     for (const child of layouted.children ?? []) {
@@ -434,10 +504,10 @@ var ElkLayoutEngine = class {
         if (options.minimizeCrossings) {
           opts["elk.layered.crossingMinimization.strategy"] = "LAYER_SWEEP";
         }
-        opts["elk.layered.cycleBreaking.strategy"] = "GREEDY_MODEL_ORDER";
+        opts["elk.layered.cycleBreaking.strategy"] = "DEPTH_FIRST";
         opts["elk.spacing.edgeNode"] = options.nodeSpacing.toString();
         opts["elk.spacing.edgeEdge"] = EDGE_EDGE_CLEARANCE_PX.toString();
-        opts["elk.layered.spacing.edgeNodeBetweenLayers"] = edgeNodeClearance(options).toString();
+        opts["elk.layered.spacing.edgeNodeBetweenLayers"] = edgeNodeClearance(options.layerSpacing).toString();
         opts["elk.edgeRouting"] = "ORTHOGONAL";
         break;
       case "mrtree":
@@ -466,15 +536,16 @@ var ElkLayoutEngine = class {
   }
 };
 var SPINE_STRAIGHTNESS_PRIORITY = "1";
-function findSpineEdgeIds(childIds, edges) {
+function findSpineEdgeIds(childIds, edges, portOwner) {
   if (childIds.length === 0 || edges.length === 0)
     return /* @__PURE__ */ new Set;
   const idSet = new Set(childIds);
+  const nodeOf = (ref) => portOwner?.get(ref) ?? ref;
   const outDegree = new Map(childIds.map((id) => [id, 0]));
   const inDegree = new Map(childIds.map((id) => [id, 0]));
   for (const e of edges) {
-    const src = e.sources[0];
-    const tgt = e.targets[0];
+    const src = nodeOf(e.sources[0]);
+    const tgt = nodeOf(e.targets[0]);
     if (!idSet.has(src) || !idSet.has(tgt) || src === tgt)
       continue;
     outDegree.set(src, (outDegree.get(src) ?? 0) + 1);
@@ -482,8 +553,8 @@ function findSpineEdgeIds(childIds, edges) {
   }
   const spine = /* @__PURE__ */ new Set;
   for (const e of edges) {
-    const src = e.sources[0];
-    const tgt = e.targets[0];
+    const src = nodeOf(e.sources[0]);
+    const tgt = nodeOf(e.targets[0]);
     if (!idSet.has(src) || !idSet.has(tgt) || src === tgt)
       continue;
     if ((outDegree.get(src) ?? 0) === 1 && (inDegree.get(tgt) ?? 0) === 1) {
@@ -495,17 +566,31 @@ function findSpineEdgeIds(childIds, edges) {
 function buildTidyElkContainer(containerId, params) {
   const directChildren = params.childrenByParent.get(containerId) ?? [];
   const localEdges = params.edgesByParent.get(containerId) ?? [];
+  const portOwner = /* @__PURE__ */ new Map;
   const elkChildren = directChildren.map((child) => {
-    if (child.isContainer)
-      return buildTidyElkContainer(child.id, params);
+    const portInfos = params.portsById?.get(child.id) ?? [];
+    if (child.isContainer) {
+      const ports2 = buildElkPorts(child.id, portInfos);
+      for (const port of ports2)
+        portOwner.set(port.id, child.id);
+      const nested = buildTidyElkContainer(child.id, params);
+      if (ports2.length === 0)
+        return nested;
+      return { ...nested, ports: ports2, layoutOptions: { ...nested.layoutOptions, portConstraints: "FIXED_ORDER" } };
+    }
     const oh = params.overhangById?.get(child.id);
+    const inflated = !!oh && (oh.top > 0 || oh.bottom > 0 || oh.left > 0 || oh.right > 0);
+    const ports = inflated ? buildInsetElkPorts(child.id, portInfos, child, oh) : buildElkPorts(child.id, portInfos);
+    for (const port of ports)
+      portOwner.set(port.id, child.id);
     return {
       id: child.id,
       width: child.width + (oh?.left ?? 0) + (oh?.right ?? 0),
-      height: child.height + (oh?.top ?? 0) + (oh?.bottom ?? 0)
+      height: child.height + (oh?.top ?? 0) + (oh?.bottom ?? 0),
+      ...ports.length > 0 ? { ports, layoutOptions: { portConstraints: inflated ? "FIXED_POS" : "FIXED_ORDER" } } : {}
     };
   });
-  const spineEdgeIds = findSpineEdgeIds(directChildren.map((c) => c.id), localEdges);
+  const spineEdgeIds = findSpineEdgeIds(directChildren.map((c) => c.id), localEdges, portOwner);
   const annotatedEdges = localEdges.map((e) => spineEdgeIds.has(e.id) ? { ...e, layoutOptions: { ...e.layoutOptions, "org.eclipse.elk.layered.priority.straightness": SPINE_STRAIGHTNESS_PRIORITY } } : e);
   return {
     id: containerId,
@@ -521,7 +606,13 @@ function buildTidyElkContainer(containerId, params) {
       "elk.layered.nodePlacement.bk.fixedAlignment": "BALANCED",
       "elk.layered.considerModelOrder.strategy": "NODES_AND_EDGES",
       "elk.layered.crossingMinimization.forceNodeModelOrder": "true",
-      ...params.orthogonalRouting ? { "elk.edgeRouting": "ORTHOGONAL" } : {},
+      "elk.layered.cycleBreaking.strategy": "DEPTH_FIRST",
+      ...params.orthogonalRouting ? {
+        "elk.edgeRouting": "ORTHOGONAL",
+        "elk.spacing.edgeNode": String(params.nodeSpacing),
+        "elk.spacing.edgeEdge": String(EDGE_EDGE_CLEARANCE_PX),
+        "elk.layered.spacing.edgeNodeBetweenLayers": String(edgeNodeClearance(params.layerSpacing))
+      } : {},
       "elk.hierarchyHandling": "SEPARATE_CHILDREN",
       "elk.nodeSize.constraints": "MINIMUM_SIZE",
       "elk.nodeSize.minimum": `(${params.fit.minWidth},${params.fit.minHeight})`
@@ -539,7 +630,7 @@ function applyTidyContainerLayout(node, updates, containerOffsets, params) {
   const { fit } = params;
   const horizontal = params.direction === "RIGHT" || params.direction === "LEFT";
   const children = node.children ?? [];
-  const isContainerElkNode = node.layoutOptions !== undefined;
+  const isContainerElkNode = node.children !== undefined;
   if (children.length === 0) {
     if (isContainerElkNode) {
       const w = params.snapUp(Math.max(fit.minWidth, node.width ?? 0));
@@ -571,6 +662,20 @@ function applyTidyContainerLayout(node, updates, containerOffsets, params) {
     if (y + h > maxY)
       maxY = y + h;
   }
+  for (const edge of node.edges ?? []) {
+    for (const section of edge.sections ?? []) {
+      for (const bend of section.bendPoints ?? []) {
+        if (bend.x < minX)
+          minX = bend.x;
+        if (bend.y < minY)
+          minY = bend.y;
+        if (bend.x > maxX)
+          maxX = bend.x;
+        if (bend.y > maxY)
+          maxY = bend.y;
+      }
+    }
+  }
   const bboxWidth = maxX - minX;
   const bboxHeight = maxY - minY;
   const finalWidth = params.snapUp(Math.max(fit.minWidth, bboxWidth + fit.paddingLeft + fit.paddingRight));
@@ -1079,4 +1184,4 @@ export {
   tidyFlow
 };
 
-//# debugId=B3AD39A0EA33C3CE64756E2164756E21
+//# debugId=4EC9703E2F51C1B764756E2164756E21