@uipath/flow-tool 1.204.0-preview.255 → 1.205.0-preview.256

package/dist/services/flow-validate-service.d.ts

@@ -52,6 +52,13 @@ export interface FlowValidateOptions {
      * enables current-manifest validation.
      */
     currentManifests?: ManifestForCurrentValidation[];
+    /**
+     * Read the current manifests from the shared node cache that
+     * `registry pull` writes (`~/.uipath/nodes/`, 30-minute TTL, keyed by
+     * tenant) instead of always fetching them. Default `true`; `false` is
+     * `flow validate --force`: refetch, then refresh the cache.
+     */
+    manifestCache?: boolean;
     /**
      * Promote connector-binding shape warnings (MST-9810) to errors. By
      * default, an unbound Managed HTTP node carrying a connector-shaped label
@@ -83,6 +90,7 @@ export declare class FlowValidateService {
     private readonly availableModelNames?;
     private readonly validateCurrentManifests;
     private readonly currentManifestOverrides?;
+    private readonly manifestCache;
     private readonly strictBindings;
     private readonly strictExpressions;
     private readonly connectorCatalogOverride?;
@@ -288,6 +296,24 @@ export declare class FlowValidateService {
     private validateEdgeReferences;
     private validateNodeTypeDefinitions;
     private validateUniqueIds;
+    /**
+     * Node IDs and edge IDs share ONE namespace across the whole file: the
+     * root graph and every `subflows` entry. `validateUniqueIds` checks each
+     * scope's nodes and edges on their own; this catches every other overlap:
+     * the same ID in two scopes, or one ID used by both a node and an edge
+     * (in the same scope or in different ones).
+     *
+     * Pack flattens every subflow into one BPMN document, where tasks and
+     * sequence flows are all XML elements with document-wide IDs. A repeated
+     * ID makes it keep one element and drop the other (a second subflow's node
+     * or sequence flow silently disappears), or crash in layout with
+     * `Cannot read properties of undefined (reading 'get')` / `(reading 'di')`.
+     * Example: flow-builder-sdk#938 emitted `edge_ref_4` in both
+     * `subflows.first` and `subflows.second`; validate passed, pack failed.
+     *
+     * Reported once per ID, naming each kind and scope that uses it.
+     */
+    private validateFileWideIdUniqueness;
     /** Uniqueness check for `variables.globals` IDs; called once per scope (root + each subflow). */
     private validateGlobalVariableUniqueness;
     /**
@@ -385,6 +411,11 @@ export declare class FlowValidateService {
      * value has a way in regardless of `triggerNodeId`.
      */
     private validateUnboundInputGlobals;
+    /**
+     * Data Fabric nodes naming an entity the solution authors, with no binding.
+     * The rule lives in packager-tool-flow so the pack gate runs it too.
+     */
+    private validateInlineEntityBindings;
     /**
      * Resource-node bindings integrity (residual roadmap §A4, [MST-9712]).
      *
@@ -475,6 +506,26 @@ export declare class FlowValidateService {
      * fixes registration; renaming the file or directory fixes the layout).
      */
     private validateSolutionRegistrationAndLayout;
+    /**
+     * In-solution process references must point at something in the solution
+     * (UiPath/cli#4837).
+     *
+     * A node that calls a sibling project carries a definition from
+     * `registry get --local`: tagged `in-solution`, with the sibling's
+     * `projectId` and its process resource key as `model.bindings.resourceKey`.
+     * That key is valid only when it is a process resource's `key` under
+     * `resources/solution_folder/process/`. Anything else (a removed project,
+     * a key `refresh` has since replaced, or the `.uipx` id of a project with
+     * no process resource yet, which earlier builds of `registry --local`
+     * handed out and the next `refresh` replaces) validates clean and calls
+     * nothing at runtime.
+     *
+     * Only definitions tagged `in-solution` with a `process` binding are
+     * checked: a deployed process also has a GUID in its node type, and it is
+     * not expected to be in the solution. Severity follows the other binding rules: a warning, an error
+     * under `--strict-bindings`.
+     */
+    private validateInSolutionProcessKeys;
     /**
      * Best-effort path canonicalization for the registration-comparison
      * call site. Returns `fs.realpath(p)` when the call succeeds, and

package/dist/services/inline-entity-resolver.d.ts

@@ -0,0 +1,22 @@
+/**
+ * flow-tool's side of the unbound-entity rule: the lookup `node add` /
+ * `node configure` bind with, and the `debug` / `eval` pre-flight. The reader
+ * lives in packager-tool-datafabric so the pack gate can share it.
+ */
+import type { IFileSystem } from "@uipath/filesystem";
+import { readSolutionInlineEntities } from "@uipath/packager-tool-datafabric";
+import { type InlineEntity, type ScannedWorkflow, type UnboundInlineEntityNode } from "@uipath/packager-tool-flow";
+export { readSolutionInlineEntities };
+/** The locally authored entity `entityName` names, or `undefined` — not ours to wire. */
+export declare function resolveInlineEntity(fs: IFileSystem, flowFilePath: string, entityName: string): Promise<InlineEntity | undefined>;
+/** Raised before packaging when a Data Fabric node is unbound. */
+export declare class UnboundInlineEntityError extends Error {
+    readonly code = "UnboundInlineEntity";
+    readonly instructions: string;
+    constructor(nodes: UnboundInlineEntityNode[], flowFilePath: string);
+}
+/**
+ * Pre-flight for `flow debug` and `flow eval`, which run no flow validation of
+ * their own; without it the first sign is `Entity <Name> does not exist`.
+ */
+export declare function assertInlineEntitiesBound(fs: IFileSystem, flowFilePath: string, workflow: ScannedWorkflow): Promise<void>;

package/dist/services/node-service.d.ts

@@ -1,4 +1,4 @@
-import type { NodeInstance, Workflow } from "@uipath/flow-core";
+import type { Binding, NodeInstance, Workflow } from "@uipath/flow-core";
 import { type ConnectorInfo } from "@uipath/maestro-sdk";
 import { type InlineActivityInput } from "./inline-activity-service.js";
 export { InlineActivityError } from "./inline-activity-service.js";
@@ -102,6 +102,26 @@ export declare const PROCESS_NODE_PREFIXES: string[];
 export declare function isProcessNode(manifest: {
     nodeType: string;
 }): boolean;
+/**
+ * Manifest-shaped overload of `isEntityNodeType`, which lives in
+ * `@uipath/packager-tool-flow` beside the unbound-entity rule that reads it.
+ */
+export declare function isEntityNode(manifest: {
+    nodeType: string;
+}): boolean;
+/**
+ * Build a Data Fabric node's `Entity` bindings from `inputs.entityConfig`,
+ * mirroring the canvas `useEntitySelectionBindings`. Manifests declare no
+ * `model.bindings`. Capital `Entity`: packaging matches case-sensitively.
+ */
+export declare function createEntityBindings(node: NodeInstance): Binding[];
+/**
+ * Fill `_resourceKey` / `_folderKey` from the solution's entity resource when
+ * the node names one and has no identity yet — what the canvas picker stores —
+ * and write the resource's own casing into `entityName`, since the lookup folds
+ * case. A node keyed to something else (e.g. a tenant entity) is left alone.
+ */
+export declare function resolveEntityIdentity(filePath: string, node: NodeInstance): Promise<void>;
 export interface ProcessTarget {
     /**
      * The key the runtime routes on: the definition's

package/dist/services/packaging-utils.d.ts

@@ -1,6 +1,6 @@
 import type { IFileSystem } from "@uipath/filesystem";
 import { type EntryPoint, type PackagingBinding, type PackagingNode, type PackagingNodeManifest, type PackagingWorkflowVariables } from "@uipath/flow-schema";
-import { isInlineAgentNodeType, RuntimeProfile, readInlineAgentSource } from "@uipath/packager-tool-flow";
+import { type FlowWithSubflows, isInlineAgentNodeType, RuntimeProfile, readInlineAgentSource } from "@uipath/packager-tool-flow";
 export interface FlowFileNode {
     id: string;
     type: string;
@@ -8,7 +8,8 @@ export interface FlowFileNode {
     display?: Record<string, unknown>;
     inputs?: Record<string, unknown>;
     outputs?: Record<string, unknown>;
-    model?: Record<string, unknown>;
+    /** `unknown` to match flow-core's `NodeInstance.model`. */
+    model?: unknown;
     [key: string]: unknown;
 }
 export { isInlineAgentNodeType, readInlineAgentSource };
@@ -22,6 +23,12 @@ export { isInlineAgentNodeType, readInlineAgentSource };
  * and does NOT remap fields, so we do that here.
  */
 export declare function fileNodesToPackagingNodes(nodes: FlowFileNode[]): PackagingNode[];
+/**
+ * Packaging nodes for the whole flow, subflows appended last, so a subflow
+ * node's bindings reach `bindings_v2.json`. Derive entry points from top-level
+ * nodes only (`PackagingArtifactOptions.entryPointNodes`).
+ */
+export declare function flowToPackagingNodes(workflow: FlowWithSubflows<FlowFileNode> | undefined | null): PackagingNode[];
 /** Packaged inline agent with entry point and file metadata. */
 export interface InlineAgentPackage {
     /** The agent's projectId UUID (directory name). */
@@ -44,6 +51,12 @@ export interface PackagingArtifactOptions {
     additionalEntryPoints?: EntryPoint[];
     additionalBindingsJsons?: Array<PackagingBindingsJson | undefined>;
     packageDescriptorJson?: Record<string, unknown>;
+    /**
+     * Nodes for entry points and `operate.json`; defaults to `packagingNodes`.
+     * Pass top-level nodes: `isStartEventNode` matches any type containing
+     * "trigger", so subflow nodes could become extra entry points.
+     */
+    entryPointNodes?: PackagingNode[];
     /**
      * Resolved by the caller from the directory that actually holds the
      * sentinel — the source project, or the staging copy when staging copied

package/dist/{shared-utils-pnbvyyb2.js → shared-utils-tqnx96mg.js}

@@ -6,8 +6,9 @@ import {
 } from "./packager-tool-eypvc2kv.js";
 import {
   readStdin
-} from "./packager-tool-02f63a08.js";
-import"./packager-tool-3h2ktz6q.js";
+} from "./packager-tool-apawc11t.js";
+import"./packager-tool-t7ahhaer.js";
+import"./packager-tool-myhbp761.js";
 import"./packager-tool-1yh8g550.js";
 export {
   VALID_PACKAGE_NAME_REGEX,
@@ -17,4 +18,4 @@ export {
   readStdin
 };
 
-//# debugId=5DDAF54C1A74EC3564756E2164756E21
+//# debugId=EFE8CE929B4DCF5B64756E2164756E21

package/dist/solution-auth-8qz5pw7z.js

@@ -0,0 +1,14 @@
+import {
+  getSolutionAuthContext
+} from "./packager-tool-9era57c0.js";
+import"./packager-tool-kn86394c.js";
+import"./packager-tool-0gctz400.js";
+import"./packager-tool-qa9gftnj.js";
+import"./packager-tool-yc4kw997.js";
+import"./packager-tool-myhbp761.js";
+import"./packager-tool-1yh8g550.js";
+export {
+  getSolutionAuthContext
+};
+
+//# debugId=63A23B7A7462225464756E2164756E21

package/dist/solution-discovery-vqravtkh.js

@@ -0,0 +1,44 @@
+import {
+  buildInSolutionNodes,
+  describeProjectsWithoutProcessResource,
+  explainNodeTypeWithoutProcessResource,
+  findProjectsWithoutProcessResource,
+  findSolutionFromCwd,
+  loadResourceKeyMap,
+  readSolutionAt,
+  resolveProjectEntryPointIO,
+  resourcesRefreshCommand,
+  solutionSearchDirs,
+  unknownContractWarning
+} from "./packager-tool-phw8ydjx.js";
+import {
+  setAgentProjectMetadataReader
+} from "./packager-tool-8qp60s20.js";
+import"./packager-tool-dwd6cc01.js";
+import"./packager-tool-paq9c70w.js";
+import"./packager-tool-wze74wyk.js";
+import"./packager-tool-pcvhcn2k.js";
+import"./packager-tool-sc961w0q.js";
+import"./packager-tool-6z1hsm2h.js";
+import"./packager-tool-jysvpt8p.js";
+import"./packager-tool-pxqras8k.js";
+import"./packager-tool-apawc11t.js";
+import"./packager-tool-t7ahhaer.js";
+import"./packager-tool-myhbp761.js";
+import"./packager-tool-1yh8g550.js";
+export {
+  buildInSolutionNodes,
+  describeProjectsWithoutProcessResource,
+  explainNodeTypeWithoutProcessResource,
+  findProjectsWithoutProcessResource,
+  findSolutionFromCwd,
+  loadResourceKeyMap,
+  readSolutionAt,
+  resolveProjectEntryPointIO,
+  resourcesRefreshCommand,
+  setAgentProjectMetadataReader,
+  solutionSearchDirs,
+  unknownContractWarning
+};
+
+//# debugId=47D98DFD77852D2D64756E2164756E21

package/dist/{tidy-service-j70ccg27.js → tidy-service-tqjea6g2.js}

@@ -8,29 +8,32 @@ import {
 import {
   readFlowWorkflow,
   writeFlowWorkflow
-} from "./packager-tool-v37kemg5.js";
-import"./packager-tool-zgm9mqrh.js";
+} from "./packager-tool-sphnextf.js";
+import"./packager-tool-thnkpqwc.js";
 import {
   DEFAULT_LAYOUT_OPTIONS,
   GRID_SPACING,
   resolveHeight,
   resolveWidth,
   snapToGrid
-} from "./packager-tool-h9tzz0qd.js";
-import"./packager-tool-hhy1gr2k.js";
-import"./packager-tool-stq8800d.js";
-import"./packager-tool-nkrmjr3a.js";
+} from "./packager-tool-961vsbsc.js";
+import"./packager-tool-jgfzfqjm.js";
+import"./packager-tool-qcqb9hf8.js";
 import {
   generateNodeVariables
-} from "./packager-tool-tyg399d6.js";
+} from "./packager-tool-wze74wyk.js";
+import"./packager-tool-pacrqxv2.js";
+import"./packager-tool-nkrmjr3a.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-eq46jxm5.js";
 import"./packager-tool-868re2t3.js";
 import"./packager-tool-gbgfwx8f.js";
-import"./packager-tool-d88rqwk8.js";
+import"./packager-tool-6z1hsm2h.js";
 import"./packager-tool-jysvpt8p.js";
 import"./packager-tool-bhqx9kez.js";
 import"./packager-tool-p79yh9ww.js";
@@ -38,8 +41,9 @@ import"./packager-tool-pxqras8k.js";
 import"./packager-tool-z83pga0z.js";
 import"./packager-tool-6ejqwbw9.js";
 import"./packager-tool-mcaf4ewf.js";
-import"./packager-tool-02f63a08.js";
-import"./packager-tool-3h2ktz6q.js";
+import"./packager-tool-apawc11t.js";
+import"./packager-tool-t7ahhaer.js";
+import"./packager-tool-myhbp761.js";
 import"./packager-tool-4mna26cc.js";
 import"./packager-tool-c23zrhj8.js";
 import {
@@ -117,13 +121,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;
@@ -142,6 +141,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) {
@@ -165,6 +208,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)));
@@ -205,12 +249,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),
@@ -360,7 +399,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;
   }
@@ -368,6 +412,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 ?? []) {
@@ -432,10 +501,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":
@@ -464,15 +533,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);
@@ -480,8 +550,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) {
@@ -493,17 +563,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,
@@ -519,7 +603,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})`
@@ -537,7 +627,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));
@@ -569,6 +659,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));
@@ -1077,4 +1181,4 @@ export {
   tidyFlow
 };
 
-//# debugId=0381B64E0226B5AC64756E2164756E21
+//# debugId=88A4B545E923A28F64756E2164756E21

package/dist/tool.js

@@ -1,28 +1,31 @@
 import {
   metadata,
   registerCommands
-} from "./packager-tool-gb4sm499.js";
-import"./packager-tool-tf3d2y8z.js";
-import"./packager-tool-mx0gg6yh.js";
+} from "./packager-tool-vd3rn4fj.js";
+import"./packager-tool-aw9v0raw.js";
+import"./packager-tool-10vc8pq4.js";
+import"./packager-tool-q8akejne.js";
 import"./packager-tool-27avrkyk.js";
-import"./packager-tool-h7cjs093.js";
-import"./packager-tool-py93409h.js";
-import"./packager-tool-peawy22c.js";
-import"./packager-tool-t3ysatjd.js";
-import"./packager-tool-w5a1hhyj.js";
-import"./packager-tool-3dc9gz35.js";
+import"./packager-tool-4kr6g0zw.js";
+import"./packager-tool-2z0r1f32.js";
+import"./packager-tool-ymma2s85.js";
+import"./packager-tool-tqjfdpda.js";
+import"./packager-tool-frjt46rb.js";
+import"./packager-tool-hxyjn885.js";
+import"./packager-tool-xk78j7dz.js";
 import"./packager-tool-8qp60s20.js";
-import"./packager-tool-6h69pd2a.js";
-import"./packager-tool-qa9gftnj.js";
+import"./packager-tool-kn86394c.js";
 import"./packager-tool-0gctz400.js";
+import"./packager-tool-qa9gftnj.js";
 import"./packager-tool-yc4kw997.js";
 import"./packager-tool-eypvc2kv.js";
-import"./packager-tool-02f63a08.js";
-import"./packager-tool-3h2ktz6q.js";
+import"./packager-tool-apawc11t.js";
+import"./packager-tool-t7ahhaer.js";
+import"./packager-tool-myhbp761.js";
 import"./packager-tool-1yh8g550.js";
 export {
   metadata,
   registerCommands
 };
 
-//# debugId=AF39B1B8CADA91DC64756E2164756E21
+//# debugId=7B70BBCE49EB8EAF64756E2164756E21