@aranzatech/diagrams-bpmn 0.2.10 → 0.2.12

package/dist/layout/index.js

@@ -1,9 +1,97 @@
 import { getBpmnNodeSize } from '../chunk-UAWLUDKC.js';
 import '../chunk-RLAJNRF2.js';
 import '../chunk-L5Z22RLX.js';
-import { dagreLayout, applyLayoutResultToDiagram } from '@aranzatech/diagrams-core/layout';
+import { elkLayout, dagreLayout, applyLayoutResultToDiagram } from '@aranzatech/diagrams-core/layout';
 export { applyLayoutResultToDiagram } from '@aranzatech/diagrams-core/layout';
 
+var BPMN_CONTAINER_TYPES = /* @__PURE__ */ new Set([
+  "Pool",
+  "Lane",
+  "SubProcess",
+  "Transaction",
+  "EventSubProcess",
+  "AdHocSubProcess"
+]);
+var CONTAINER_MIN_SIZE = {
+  Pool: { w: 560, h: 160 },
+  Lane: { w: 480, h: 100 },
+  SubProcess: { w: 200, h: 120 },
+  Transaction: { w: 200, h: 120 },
+  EventSubProcess: { w: 200, h: 120 },
+  AdHocSubProcess: { w: 200, h: 120 }
+};
+var CONTAINER_PADDING = {
+  Pool: "[top=20,left=30,bottom=20,right=20]",
+  Lane: "[top=20,left=50,bottom=20,right=50]",
+  SubProcess: "[top=20,left=30,bottom=20,right=30]",
+  Transaction: "[top=20,left=30,bottom=20,right=30]",
+  EventSubProcess: "[top=20,left=30,bottom=20,right=30]",
+  AdHocSubProcess: "[top=20,left=30,bottom=20,right=30]"
+};
+async function bpmnElkLayout(nodes, edges) {
+  const poolsWithLanes = /* @__PURE__ */ new Set();
+  for (const node of nodes) {
+    if (node.data.elementType === "Lane" && node.parentId) {
+      poolsWithLanes.add(node.parentId);
+    }
+  }
+  const result = await elkLayout(
+    nodes,
+    edges,
+    {
+      direction: "LR",
+      getNodeSize: (node) => {
+        const bNode = node;
+        if (BPMN_CONTAINER_TYPES.has(bNode.data.elementType)) return void 0;
+        return getBpmnNodeSize(bNode);
+      },
+      isContainerNode: (node) => BPMN_CONTAINER_TYPES.has(node.data.elementType),
+      getNodeLayoutOptions: (node) => {
+        const type = node.data.elementType;
+        if (!BPMN_CONTAINER_TYPES.has(type)) return void 0;
+        const min = CONTAINER_MIN_SIZE[type];
+        const dir = type === "Pool" && poolsWithLanes.has(node.id) ? "DOWN" : "RIGHT";
+        return {
+          "elk.direction": dir,
+          "elk.nodeSize.constraints": "MINIMUM_SIZE",
+          ...min ? { "elk.nodeSize.minimum": `[w=${min.w},h=${min.h}]` } : {},
+          ...CONTAINER_PADDING[type] ? { "elk.padding": CONTAINER_PADDING[type] } : {}
+        };
+      },
+      elk: {
+        "elk.algorithm": "layered",
+        "elk.direction": "RIGHT",
+        "elk.hierarchyHandling": "INCLUDE_CHILDREN",
+        "elk.edgeRouting": "ORTHOGONAL",
+        "elk.layered.spacing.nodeNodeBetweenLayers": "80",
+        "elk.layered.spacing.edgeNodeBetweenLayers": "20",
+        "elk.spacing.nodeNode": "40",
+        "elk.spacing.componentComponent": "60"
+      }
+    }
+  );
+  const nodeMap = new Map(result.nodes.map((n) => [n.id, n]));
+  const edgeMap = new Map(result.edges.map((e) => [e.id, e]));
+  const updatedNodes = nodes.map((node) => {
+    const laid = nodeMap.get(node.id);
+    if (!laid) return node;
+    return { ...node, position: laid.position, width: laid.width, height: laid.height };
+  });
+  const updatedEdges = edges.map((edge) => {
+    const laid = edgeMap.get(edge.id);
+    if (!laid) return edge;
+    const nextData = { ...edge.data };
+    if (laid.points && laid.points.length > 0) {
+      nextData.routingPoints = laid.points;
+    } else {
+      delete nextData.routingPoints;
+    }
+    return { ...edge, data: nextData };
+  });
+  return { nodes: updatedNodes, edges: updatedEdges };
+}
+
+// src/layout/index.ts
 async function bpmnDagreLayout(nodes, edges, options = {}) {
   return dagreLayout(nodes, edges, {
     ...options,
@@ -14,6 +102,6 @@ function applyBpmnLayoutResult(state, result) {
   return applyLayoutResultToDiagram(state, result);
 }
 
-export { applyBpmnLayoutResult, bpmnDagreLayout };
+export { applyBpmnLayoutResult, bpmnDagreLayout, bpmnElkLayout };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map

package/dist/layout/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/layout/index.ts"],"names":[],"mappings":";;;;;;AAcA,eAAsB,eAAA,CACpB,KAAA,EACA,KAAA,EACA,OAAA,GAAyB,EAAC,EACH;AACvB,EAAA,OAAO,WAAA,CAAY,OAAwB,KAAA,EAAwB;AAAA,IACjE,GAAG,OAAA;AAAA,IACH,WAAA,EAAa,CAAC,IAAA,KAAS,eAAA,CAAgB,IAAkB;AAAA,GAC1D,CAAA;AACH;AAMO,SAAS,qBAAA,CACd,OACA,MAAA,EACkB;AAClB,EAAA,OAAO,0BAAA,CAA2B,OAAO,MAAM,CAAA;AACjD","file":"index.js","sourcesContent":["import type { DiagramEdge, LayoutOptions, LayoutResult } from \"@aranzatech/diagrams-core/types\";\nimport { dagreLayout, applyLayoutResultToDiagram } from \"@aranzatech/diagrams-core/layout\";\nimport type { DiagramNode } from \"@aranzatech/diagrams-core/types\";\nimport type { BpmnRFNode, BpmnRFEdge } from \"../xml/types\";\nimport { getBpmnNodeSize } from \"../modeling\";\nimport type { BpmnDiagramState } from \"../modeling\";\n\nexport { applyLayoutResultToDiagram };\n\n/**\n * Dagre layout pre-configured for BPMN diagrams.\n * Uses BPMN-specific node sizes (events 52×52, gateways 64×64, tasks 192×64, etc.)\n * instead of the generic fallback, which prevents overlaps and poor spacing.\n */\nexport async function bpmnDagreLayout(\n  nodes: BpmnRFNode[],\n  edges: BpmnRFEdge[],\n  options: LayoutOptions = {},\n): Promise<LayoutResult> {\n  return dagreLayout(nodes as DiagramNode[], edges as DiagramEdge[], {\n    ...options,\n    getNodeSize: (node) => getBpmnNodeSize(node as BpmnRFNode),\n  });\n}\n\n/**\n * Applies a bpmn dagre layout result back to the diagram state.\n * Convenience wrapper so callers only need one import.\n */\nexport function applyBpmnLayoutResult(\n  state: BpmnDiagramState,\n  result: LayoutResult,\n): BpmnDiagramState {\n  return applyLayoutResultToDiagram(state, result) as BpmnDiagramState;\n}\n"]}
+{"version":3,"sources":["../../src/layout/elk.ts","../../src/layout/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import { elkLayout } from \"@aranzatech/diagrams-core/layout\";\nimport type { DiagramNode, DiagramEdge } from \"@aranzatech/diagrams-core/types\";\nimport type { BpmnRFNode, BpmnRFEdge } from \"../xml/types\";\nimport type { BpmnElementType } from \"../elements/types\";\nimport { getBpmnNodeSize } from \"../modeling\";\n\n// Container types that ELK auto-sizes based on their children.\nconst BPMN_CONTAINER_TYPES = new Set<BpmnElementType>([\n  \"Pool\",\n  \"Lane\",\n  \"SubProcess\",\n  \"Transaction\",\n  \"EventSubProcess\",\n  \"AdHocSubProcess\",\n]);\n\nconst CONTAINER_MIN_SIZE: Partial<Record<BpmnElementType, { w: number; h: number }>> = {\n  Pool: { w: 560, h: 160 },\n  Lane: { w: 480, h: 100 },\n  SubProcess: { w: 200, h: 120 },\n  Transaction: { w: 200, h: 120 },\n  EventSubProcess: { w: 200, h: 120 },\n  AdHocSubProcess: { w: 200, h: 120 },\n};\n\n// Left padding includes the pool label strip (≈30 px).\nconst CONTAINER_PADDING: Partial<Record<BpmnElementType, string>> = {\n  Pool: \"[top=20,left=30,bottom=20,right=20]\",\n  Lane: \"[top=20,left=50,bottom=20,right=50]\",\n  SubProcess: \"[top=20,left=30,bottom=20,right=30]\",\n  Transaction: \"[top=20,left=30,bottom=20,right=30]\",\n  EventSubProcess: \"[top=20,left=30,bottom=20,right=30]\",\n  AdHocSubProcess: \"[top=20,left=30,bottom=20,right=30]\",\n};\n\n/**\n * ELK-based auto-layout for BPMN diagrams.\n *\n * Direction policy — always LEFT-TO-RIGHT to match screen anatomy:\n * - Root: RIGHT — free nodes and pools flow LR on the canvas.\n * - Pool that contains Lanes: DOWN internally so lanes stack top-to-bottom\n *   (standard horizontal-pool anatomy); the pool itself is still placed LR.\n * - Pool without lanes, Lane, SubProcess, Transaction, AdHoc: RIGHT — content\n *   flows left-to-right inside the container.\n * - All edges get ORTHOGONAL routing in a single INCLUDE_CHILDREN pass so\n *   cross-pool and cross-lane edges are routed correctly.\n * - Containers auto-resize to fit their children.\n */\nexport async function bpmnElkLayout(\n  nodes: BpmnRFNode[],\n  edges: BpmnRFEdge[],\n): Promise<{ nodes: BpmnRFNode[]; edges: BpmnRFEdge[] }> {\n  // Pools that contain at least one Lane child need DOWN internal direction so\n  // the lanes stack vertically (standard horizontal BPMN pool).\n  const poolsWithLanes = new Set<string>();\n  for (const node of nodes) {\n    if (node.data.elementType === \"Lane\" && node.parentId) {\n      poolsWithLanes.add(node.parentId);\n    }\n  }\n\n  const result = await elkLayout(\n    nodes as unknown as DiagramNode[],\n    edges as unknown as DiagramEdge[],\n    {\n      direction: \"LR\",\n      getNodeSize: (node) => {\n        const bNode = node as unknown as BpmnRFNode;\n        if (BPMN_CONTAINER_TYPES.has(bNode.data.elementType)) return undefined;\n        return getBpmnNodeSize(bNode);\n      },\n      isContainerNode: (node) =>\n        BPMN_CONTAINER_TYPES.has((node as unknown as BpmnRFNode).data.elementType),\n      getNodeLayoutOptions: (node) => {\n        const type = (node as unknown as BpmnRFNode).data.elementType;\n        if (!BPMN_CONTAINER_TYPES.has(type)) return undefined;\n        const min = CONTAINER_MIN_SIZE[type];\n        // Pool with Lanes: DOWN so lanes stack top-to-bottom inside the pool.\n        // Everything else (Lane content, SubProcess, free tasks): RIGHT (LR).\n        const dir = type === \"Pool\" && poolsWithLanes.has(node.id) ? \"DOWN\" : \"RIGHT\";\n        return {\n          \"elk.direction\": dir,\n          \"elk.nodeSize.constraints\": \"MINIMUM_SIZE\",\n          ...(min ? { \"elk.nodeSize.minimum\": `[w=${min.w},h=${min.h}]` } : {}),\n          ...(CONTAINER_PADDING[type] ? { \"elk.padding\": CONTAINER_PADDING[type] } : {}),\n        };\n      },\n      elk: {\n        \"elk.algorithm\": \"layered\",\n        \"elk.direction\": \"RIGHT\",\n        \"elk.hierarchyHandling\": \"INCLUDE_CHILDREN\",\n        \"elk.edgeRouting\": \"ORTHOGONAL\",\n        \"elk.layered.spacing.nodeNodeBetweenLayers\": \"80\",\n        \"elk.layered.spacing.edgeNodeBetweenLayers\": \"20\",\n        \"elk.spacing.nodeNode\": \"40\",\n        \"elk.spacing.componentComponent\": \"60\",\n      },\n    },\n  );\n\n  const nodeMap = new Map(result.nodes.map((n) => [n.id, n]));\n  const edgeMap = new Map(result.edges.map((e) => [e.id, e]));\n\n  const updatedNodes = nodes.map((node) => {\n    const laid = nodeMap.get(node.id);\n    if (!laid) return node;\n    return { ...node, position: laid.position, width: laid.width, height: laid.height };\n  });\n\n  const updatedEdges = edges.map((edge) => {\n    const laid = edgeMap.get(edge.id);\n    if (!laid) return edge;\n    const nextData = { ...edge.data };\n    if (laid.points && laid.points.length > 0) {\n      nextData.routingPoints = laid.points;\n    } else {\n      delete nextData.routingPoints;\n    }\n    return { ...edge, data: nextData };\n  });\n\n  return { nodes: updatedNodes, edges: updatedEdges as BpmnRFEdge[] };\n}\n","import type { DiagramEdge, LayoutOptions, LayoutResult } from \"@aranzatech/diagrams-core/types\";\nimport { dagreLayout, applyLayoutResultToDiagram } from \"@aranzatech/diagrams-core/layout\";\nimport type { DiagramNode } from \"@aranzatech/diagrams-core/types\";\nimport type { BpmnRFNode, BpmnRFEdge } from \"../xml/types\";\nimport { getBpmnNodeSize } from \"../modeling\";\nimport type { BpmnDiagramState } from \"../modeling\";\n\nexport { applyLayoutResultToDiagram };\nexport { bpmnElkLayout } from \"./elk\";\n\n/**\n * Dagre layout pre-configured for BPMN diagrams.\n * Uses BPMN-specific node sizes (events 52×52, gateways 64×64, tasks 192×64, etc.)\n * instead of the generic fallback, which prevents overlaps and poor spacing.\n */\nexport async function bpmnDagreLayout(\n  nodes: BpmnRFNode[],\n  edges: BpmnRFEdge[],\n  options: LayoutOptions = {},\n): Promise<LayoutResult> {\n  return dagreLayout(nodes as DiagramNode[], edges as DiagramEdge[], {\n    ...options,\n    getNodeSize: (node) => getBpmnNodeSize(node as BpmnRFNode),\n  });\n}\n\n/**\n * Applies a bpmn dagre layout result back to the diagram state.\n * Convenience wrapper so callers only need one import.\n */\nexport function applyBpmnLayoutResult(\n  state: BpmnDiagramState,\n  result: LayoutResult,\n): BpmnDiagramState {\n  return applyLayoutResultToDiagram(state, result) as BpmnDiagramState;\n}\n"]}

package/dist/modeling/index.d.cts

@@ -1,8 +1,8 @@
 import { ModelingRules, ClipboardState, DiagramSnapshot, DiagramState, DiagramEventBus, ResizeHandlePosition, DiagramCommand, ConnectionValidator, SmartGuideResult, SelectionState, LayoutCacheOptions, LayoutCache, EdgeLabelOffsetOptions, EdgeLabelLayout, CommandStackState, Viewport, LayoutFn } from '@aranzatech/diagrams-core';
 import { DiagramDocument, CreateDiagramDocumentOptions } from '@aranzatech/diagrams-core/serialization';
-import { c as BpmnEdgeType, b as BpmnEdgeData, f as BpmnElementType, m as BpmnNodeData } from '../types-BTuiBv7p.cjs';
-import { d as BpmnRFNode, c as BpmnRFEdge } from '../types-C7tONwP5.cjs';
-export { g as getBpmnElementSize, i as isBpmnElementResizable } from '../catalog-Ch3YT0-0.cjs';
+import { c as BpmnEdgeType, b as BpmnEdgeData, f as BpmnElementType, m as BpmnNodeData } from '../types-hgmLfRA9.cjs';
+import { d as BpmnRFNode, c as BpmnRFEdge } from '../types-44yNtMtO.cjs';
+export { g as getBpmnElementSize, i as isBpmnElementResizable } from '../catalog-DUfPajtM.cjs';
 import '@xyflow/react';
 
 type BpmnDiagramState = DiagramState<BpmnRFNode, BpmnRFEdge>;

package/dist/modeling/index.d.ts

@@ -1,8 +1,8 @@
 import { ModelingRules, ClipboardState, DiagramSnapshot, DiagramState, DiagramEventBus, ResizeHandlePosition, DiagramCommand, ConnectionValidator, SmartGuideResult, SelectionState, LayoutCacheOptions, LayoutCache, EdgeLabelOffsetOptions, EdgeLabelLayout, CommandStackState, Viewport, LayoutFn } from '@aranzatech/diagrams-core';
 import { DiagramDocument, CreateDiagramDocumentOptions } from '@aranzatech/diagrams-core/serialization';
-import { c as BpmnEdgeType, b as BpmnEdgeData, f as BpmnElementType, m as BpmnNodeData } from '../types-BTuiBv7p.js';
-import { d as BpmnRFNode, c as BpmnRFEdge } from '../types-DSDMCAre.js';
-export { g as getBpmnElementSize, i as isBpmnElementResizable } from '../catalog-BOwJOaXV.js';
+import { c as BpmnEdgeType, b as BpmnEdgeData, f as BpmnElementType, m as BpmnNodeData } from '../types-hgmLfRA9.js';
+import { d as BpmnRFNode, c as BpmnRFEdge } from '../types-kI1SiQB4.js';
+export { g as getBpmnElementSize, i as isBpmnElementResizable } from '../catalog-BKdtbOQT.js';
 import '@xyflow/react';
 
 type BpmnDiagramState = DiagramState<BpmnRFNode, BpmnRFEdge>;

package/dist/{types-C7tONwP5.d.cts → types-44yNtMtO.d.cts}

@@ -1,5 +1,5 @@
 import { Node, Edge } from '@xyflow/react';
-import { m as BpmnNodeData, b as BpmnEdgeData, a as BpmnDefinitionsSet } from './types-BTuiBv7p.cjs';
+import { m as BpmnNodeData, b as BpmnEdgeData, a as BpmnDefinitionsSet } from './types-hgmLfRA9.cjs';
 
 type BpmnRFNode = Node<BpmnNodeData>;
 type BpmnRFEdge = Edge<BpmnEdgeData>;

package/dist/{types-BTuiBv7p.d.cts → types-hgmLfRA9.d.cts}

@@ -172,8 +172,24 @@ interface BpmnNodeData extends Record<string, unknown> {
     candidateUsers?: string;
     /** UserTask: comma-separated Flowable group ids that can claim this task. */
     candidateGroups?: string;
+    /** UserTask: ISO-8601 due date or FEEL expression evaluated at task creation. */
+    dueDate?: string;
+    /** UserTask: FEEL expression; when truthy the task is skipped. */
+    skipExpression?: string;
+    /** UserTask: name of the business calendar used to compute the due date. */
+    businessCalendarName?: string;
+    /** DataObjectReference: id of the backing bpmn:DataObject element. */
+    dataObjectRef?: string;
     /** AdHocSubProcess: FEEL expression that determines when the sub-process completes. */
     completionCondition?: string;
+    /** Loop / multi-instance type: none | loop | sequentialMultiple | parallelMultiple. */
+    loopType?: string;
+    /** StandardLoopCharacteristics: FEEL condition evaluated before each iteration. */
+    loopCondition?: string;
+    /** MultiInstanceLoopCharacteristics: number of instances as a FEEL expression. */
+    loopCardinality?: string;
+    /** MultiInstanceLoopCharacteristics: FEEL condition to stop before all instances finish. */
+    loopCompletionCondition?: string;
 }
 interface BpmnEdgeData extends Record<string, unknown> {
     label?: string;

package/dist/{types-BTuiBv7p.d.ts → types-hgmLfRA9.d.ts}

@@ -172,8 +172,24 @@ interface BpmnNodeData extends Record<string, unknown> {
     candidateUsers?: string;
     /** UserTask: comma-separated Flowable group ids that can claim this task. */
     candidateGroups?: string;
+    /** UserTask: ISO-8601 due date or FEEL expression evaluated at task creation. */
+    dueDate?: string;
+    /** UserTask: FEEL expression; when truthy the task is skipped. */
+    skipExpression?: string;
+    /** UserTask: name of the business calendar used to compute the due date. */
+    businessCalendarName?: string;
+    /** DataObjectReference: id of the backing bpmn:DataObject element. */
+    dataObjectRef?: string;
     /** AdHocSubProcess: FEEL expression that determines when the sub-process completes. */
     completionCondition?: string;
+    /** Loop / multi-instance type: none | loop | sequentialMultiple | parallelMultiple. */
+    loopType?: string;
+    /** StandardLoopCharacteristics: FEEL condition evaluated before each iteration. */
+    loopCondition?: string;
+    /** MultiInstanceLoopCharacteristics: number of instances as a FEEL expression. */
+    loopCardinality?: string;
+    /** MultiInstanceLoopCharacteristics: FEEL condition to stop before all instances finish. */
+    loopCompletionCondition?: string;
 }
 interface BpmnEdgeData extends Record<string, unknown> {
     label?: string;

package/dist/{types-DSDMCAre.d.ts → types-kI1SiQB4.d.ts}

@@ -1,5 +1,5 @@
 import { Node, Edge } from '@xyflow/react';
-import { m as BpmnNodeData, b as BpmnEdgeData, a as BpmnDefinitionsSet } from './types-BTuiBv7p.js';
+import { m as BpmnNodeData, b as BpmnEdgeData, a as BpmnDefinitionsSet } from './types-hgmLfRA9.js';
 
 type BpmnRFNode = Node<BpmnNodeData>;
 type BpmnRFEdge = Edge<BpmnEdgeData>;

package/dist/validation/index.d.cts

@@ -1,6 +1,6 @@
-import { d as BpmnRFNode, c as BpmnRFEdge } from '../types-C7tONwP5.cjs';
+import { d as BpmnRFNode, c as BpmnRFEdge } from '../types-44yNtMtO.cjs';
 import '@xyflow/react';
-import '../types-BTuiBv7p.cjs';
+import '../types-hgmLfRA9.cjs';
 
 type BpmnValidationSeverity = "error" | "warning" | "info";
 interface BpmnValidationIssue {

package/dist/validation/index.d.ts

@@ -1,6 +1,6 @@
-import { d as BpmnRFNode, c as BpmnRFEdge } from '../types-DSDMCAre.js';
+import { d as BpmnRFNode, c as BpmnRFEdge } from '../types-kI1SiQB4.js';
 import '@xyflow/react';
-import '../types-BTuiBv7p.js';
+import '../types-hgmLfRA9.js';
 
 type BpmnValidationSeverity = "error" | "warning" | "info";
 interface BpmnValidationIssue {

package/dist/xml/index.cjs

@@ -26,7 +26,11 @@ var ARANZA_DESCRIPTOR = {
         { name: "formKey", isAttr: true, type: "String" },
         // UserTask: Flowable task assignment — comma-separated ids
         { name: "candidateUsers", isAttr: true, type: "String" },
-        { name: "candidateGroups", isAttr: true, type: "String" }
+        { name: "candidateGroups", isAttr: true, type: "String" },
+        // UserTask: scheduling + skip expression
+        { name: "dueDate", isAttr: true, type: "String" },
+        { name: "skipExpression", isAttr: true, type: "String" },
+        { name: "businessCalendarName", isAttr: true, type: "String" }
       ]
     }
   ],
@@ -933,6 +937,12 @@ function extractAranzaExtensions(el) {
   if (candidateUsers) result.candidateUsers = candidateUsers;
   const candidateGroups = asString(taskConfig.candidateGroups);
   if (candidateGroups) result.candidateGroups = candidateGroups;
+  const dueDate = asString(taskConfig.dueDate);
+  if (dueDate) result.dueDate = dueDate;
+  const skipExpression = asString(taskConfig.skipExpression);
+  if (skipExpression) result.skipExpression = skipExpression;
+  const businessCalendarName = asString(taskConfig.businessCalendarName);
+  if (businessCalendarName) result.businessCalendarName = businessCalendarName;
   return result;
 }
 function extractCompletionCondition(el) {
@@ -941,6 +951,25 @@ function extractCompletionCondition(el) {
   if (typeof cc === "string") return cc.trim() || void 0;
   return asString(cc.body);
 }
+function extractLoopCharacteristics(el) {
+  const lc = el.loopCharacteristics;
+  if (!lc) return {};
+  if (lc.$type === "bpmn:StandardLoopCharacteristics") {
+    const loopCondition = asString(lc.loopCondition?.body);
+    return { loopType: "loop", ...loopCondition ? { loopCondition } : {} };
+  }
+  if (lc.$type === "bpmn:MultiInstanceLoopCharacteristics") {
+    const loopType = lc.isSequential === true ? "sequentialMultiple" : "parallelMultiple";
+    const loopCardinality = asString(lc.loopCardinality?.body);
+    const loopCompletionCondition = asString(lc.completionCondition?.body);
+    return {
+      loopType,
+      ...loopCardinality ? { loopCardinality } : {},
+      ...loopCompletionCondition ? { loopCompletionCondition } : {}
+    };
+  }
+  return {};
+}
 function walkFlowElements(elements, parentId, ctx, nodes, edges) {
   for (const el of elements) {
     const { $type, id } = el;
@@ -958,7 +987,7 @@ function walkFlowElements(elements, parentId, ctx, nodes, edges) {
     }
     buildNode(el, elementType, parentId, ctx, nodes);
     if ($type === "bpmn:SubProcess" || $type === "bpmn:Transaction" || $type === "bpmn:AdHocSubProcess") {
-      const children = asElements(el.flowElements);
+      const children = [...asElements(el.flowElements), ...asElements(el.artifacts)];
       const laneMembership = extractLaneMembership(el);
       walkFlowElements(children, id, { ...ctx, laneMembership }, nodes, edges);
     }
@@ -971,7 +1000,7 @@ function buildNode(el, elementType, parentId, ctx, nodes) {
   const x = shape?.x ?? ctx.autoX.value;
   const y = shape?.y ?? 100;
   if (!shape) ctx.autoX.value += (meta?.defaultWidth ?? 120) + 20;
-  const label = asString(el.name);
+  const label = elementType === "Annotation" ? asString(el.text) ?? asString(el.name) : asString(el.name);
   const documentation = extractDocumentation(el);
   const trigger = extractTrigger(el);
   const eventDefinition = extractEventDefinition(el);
@@ -982,6 +1011,8 @@ function buildNode(el, elementType, parentId, ctx, nodes) {
   const scriptFormat = elementType === "ScriptTask" ? asString(el.scriptFormat) : void 0;
   const script = elementType === "ScriptTask" ? asString(el.script) : void 0;
   const completionCondition = elementType === "AdHocSubProcess" ? extractCompletionCondition(el) : void 0;
+  const loopChars = extractLoopCharacteristics(el);
+  const dataObjectRef = elementType === "DataObjectReference" ? asString(el.dataObjectRef?.id) : void 0;
   const data = {
     elementType,
     ...label ? { label } : {},
@@ -1002,6 +1033,8 @@ function buildNode(el, elementType, parentId, ctx, nodes) {
     ...scriptFormat ? { scriptFormat } : {},
     ...script ? { script } : {},
     ...completionCondition ? { completionCondition } : {},
+    ...dataObjectRef ? { dataObjectRef } : {},
+    ...loopChars,
     ...aranzaExt
   };
   if (elementType === "SubProcess" || elementType === "Transaction" || elementType === "EventSubProcess" || elementType === "AdHocSubProcess") {
@@ -1034,11 +1067,14 @@ function buildEdge(el, edgeType, ctx, edges) {
   const label = asString(el.name);
   const documentation = extractDocumentation(el);
   const condExpr = el.conditionExpression;
+  const rawDir = asString(el.associationDirection);
+  const associationDirection = edgeType === "association" && rawDir ? rawDir.toLowerCase() : void 0;
   const data = {
     edgeType,
     ...label ? { label } : {},
     ...documentation ? { documentation } : {},
-    ...condExpr?.body ? { conditionExpression: condExpr.body } : {}
+    ...condExpr?.body ? { conditionExpression: condExpr.body } : {},
+    ...associationDirection ? { associationDirection } : {}
   };
   const waypoints = ctx.waypoints.get(id);
   if (waypoints?.length) data.routingPoints = waypoints;
@@ -1063,7 +1099,7 @@ function handleCollaboration(collaboration, ctx, nodes, edges) {
     if (processRef) {
       const laneMembership = extractLaneMembership(processRef);
       walkFlowElements(
-        asElements(processRef.flowElements),
+        [...asElements(processRef.flowElements), ...asElements(processRef.artifacts)],
         id,
         { ...ctx, laneMembership },
         nodes,
@@ -1095,7 +1131,7 @@ function addLaneNodes(laneSet, poolId, ctx, nodes) {
       data: { elementType: "Lane", ...label ? { label } : {} },
       width: shape?.width ?? 570,
       height: shape?.height ?? 120,
-      parentId: poolId
+      ...poolId ? { parentId: poolId } : {}
     });
     const child = lane.childLaneSet;
     if (child) addLaneNodes(child, poolId, ctx, nodes);
@@ -1129,9 +1165,9 @@ async function parseBpmnXml(xml) {
     } else if (rootEl.$type === "bpmn:Process") {
       const laneMembership = extractLaneMembership(rootEl);
       const laneSet = rootEl.laneSet;
-      if (laneSet) addLaneNodes(laneSet, "", ctx, nodes);
+      if (laneSet) addLaneNodes(laneSet, void 0, ctx, nodes);
       walkFlowElements(
-        asElements(rootEl.flowElements),
+        [...asElements(rootEl.flowElements), ...asElements(rootEl.artifacts)],
         void 0,
         { ...ctx, laneMembership },
         nodes,
@@ -1304,7 +1340,10 @@ function buildAranzaExtensionElements(moddle, node) {
   const formKey = typeof node.data.formKey === "string" ? node.data.formKey : void 0;
   const candidateUsers = typeof node.data.candidateUsers === "string" ? node.data.candidateUsers : void 0;
   const candidateGroups = typeof node.data.candidateGroups === "string" ? node.data.candidateGroups : void 0;
-  if (!priority && !owner && !sla && !connector && !action && !flowableType && !flowableDelegateExpression && !decisionRef && !formKey && !candidateUsers && !candidateGroups) {
+  const dueDate = typeof node.data.dueDate === "string" ? node.data.dueDate : void 0;
+  const skipExpression = typeof node.data.skipExpression === "string" ? node.data.skipExpression : void 0;
+  const businessCalendarName = typeof node.data.businessCalendarName === "string" ? node.data.businessCalendarName : void 0;
+  if (!priority && !owner && !sla && !connector && !action && !flowableType && !flowableDelegateExpression && !decisionRef && !formKey && !candidateUsers && !candidateGroups && !dueDate && !skipExpression && !businessCalendarName) {
     return null;
   }
   const configAttrs = {};
@@ -1319,9 +1358,13 @@ function buildAranzaExtensionElements(moddle, node) {
   if (formKey) configAttrs.formKey = formKey;
   if (candidateUsers) configAttrs.candidateUsers = candidateUsers;
   if (candidateGroups) configAttrs.candidateGroups = candidateGroups;
+  if (dueDate) configAttrs.dueDate = dueDate;
+  if (skipExpression) configAttrs.skipExpression = skipExpression;
+  if (businessCalendarName) configAttrs.businessCalendarName = businessCalendarName;
   const taskConfig = moddle.create("aranza:TaskConfig", configAttrs);
   return moddle.create("bpmn:ExtensionElements", { values: [taskConfig] });
 }
+var ARTIFACT_ELEMENT_TYPES = /* @__PURE__ */ new Set(["Annotation", "Group"]);
 function buildSemanticModel(moddle, nodes, edges, opts) {
   const defId = opts.id ?? "Definitions_1";
   const defName = opts.name;
@@ -1417,10 +1460,31 @@ function buildProcess(moddle, allNodes, allEdges, poolId, laneNodes, processId,
   };
   const myNodes = (poolId ? allNodes.filter((n) => belongsToPool(n)) : allNodes.filter((n) => n.data.elementType !== "Pool" && n.data.elementType !== "Lane")).filter((n) => !isInsideSubProcess(n));
   const myLanes = laneNodes.filter((l) => poolId ? l.parentId === poolId : true);
+  const presentDataObjectIds = new Set(
+    myNodes.filter((n) => n.data.elementType === "DataObject").map((n) => n.id)
+  );
   const flowElements = [];
+  const artifacts = [];
+  for (const node of myNodes) {
+    if (node.data.elementType === "DataObjectReference") {
+      const explicitRef = typeof node.data.dataObjectRef === "string" ? node.data.dataObjectRef : null;
+      if (!explicitRef || !presentDataObjectIds.has(explicitRef)) {
+        const syntheticId = `DataObject_${node.id}`;
+        if (!presentDataObjectIds.has(syntheticId)) {
+          flowElements.push(moddle.create("bpmn:DataObject", { id: syntheticId }));
+          presentDataObjectIds.add(syntheticId);
+        }
+      }
+    }
+  }
   for (const node of myNodes) {
     const el = buildFlowElement(moddle, node, allNodes, allEdges);
-    if (el) flowElements.push(el);
+    if (!el) continue;
+    if (ARTIFACT_ELEMENT_TYPES.has(node.data.elementType)) {
+      artifacts.push(el);
+    } else {
+      flowElements.push(el);
+    }
   }
   const myNodeIds = new Set(myNodes.map((n) => n.id));
   const myEdges = allEdges.filter(
@@ -1428,7 +1492,12 @@ function buildProcess(moddle, allNodes, allEdges, poolId, laneNodes, processId,
   );
   for (const edge of myEdges) {
     const edgeMeta = buildEdgeElement(moddle, edge);
-    if (edgeMeta) flowElements.push(edgeMeta);
+    if (!edgeMeta) continue;
+    if (edge.data?.edgeType === "association") {
+      artifacts.push(edgeMeta);
+    } else {
+      flowElements.push(edgeMeta);
+    }
   }
   const elementById = new Map(
     flowElements.filter((element) => typeof element.id === "string").map((element) => [element.id, element])
@@ -1444,7 +1513,8 @@ function buildProcess(moddle, allNodes, allEdges, poolId, laneNodes, processId,
   const process = moddle.create("bpmn:Process", {
     id: processId,
     isExecutable: opts.process?.executable ?? true,
-    flowElements
+    flowElements,
+    ...artifacts.length > 0 ? { artifacts } : {}
   });
   if (opts.process?.documentation) {
     process.documentation = [
@@ -1476,6 +1546,10 @@ function buildFlowElement(moddle, node, allNodes, allEdges) {
     id: node.id,
     name: label ?? ""
   };
+  if (elementType === "Annotation") {
+    delete attrs.name;
+    attrs.text = label ?? "";
+  }
   if (node.data.documentation) {
     attrs.documentation = [
       moddle.create("bpmn:Documentation", { text: node.data.documentation })
@@ -1494,22 +1568,16 @@ function buildFlowElement(moddle, node, allNodes, allEdges) {
   if (elementType === "CallActivity" && node.data.calledElement) {
     attrs.calledElement = node.data.calledElement;
   }
+  if (elementType === "DataObjectReference") {
+    const refId = typeof node.data.dataObjectRef === "string" ? node.data.dataObjectRef : `DataObject_${node.id}`;
+    attrs.dataObjectRef = { id: refId };
+  }
   if (elementType === "ScriptTask") {
     const scriptFormat = typeof node.data.scriptFormat === "string" ? node.data.scriptFormat : void 0;
     const script = typeof node.data.script === "string" ? node.data.script : void 0;
     if (scriptFormat) attrs.scriptFormat = scriptFormat;
     if (script) attrs.script = script;
   }
-  if (elementType === "UserTask") {
-    const flowableAttrs = {};
-    const fk = typeof node.data.formKey === "string" ? node.data.formKey : void 0;
-    const cu = typeof node.data.candidateUsers === "string" ? node.data.candidateUsers : void 0;
-    const cg = typeof node.data.candidateGroups === "string" ? node.data.candidateGroups : void 0;
-    if (fk) flowableAttrs["flowable:formKey"] = fk;
-    if (cu) flowableAttrs["flowable:candidateUsers"] = cu;
-    if (cg) flowableAttrs["flowable:candidateGroups"] = cg;
-    if (Object.keys(flowableAttrs).length > 0) attrs.$attrs = flowableAttrs;
-  }
   if (elementType === "ServiceTask") {
     const flowableAttrs = {};
     const flowableType = typeof node.data.flowableType === "string" ? node.data.flowableType : void 0;
@@ -1526,7 +1594,9 @@ function buildFlowElement(moddle, node, allNodes, allEdges) {
   if (aranzaConfig) attrs.extensionElements = aranzaConfig;
   const isSubProcess = elementType === "SubProcess" || elementType === "Transaction" || elementType === "EventSubProcess" || elementType === "AdHocSubProcess";
   if (isSubProcess) {
-    attrs.flowElements = buildNestedFlowElements(moddle, node, allNodes, allEdges);
+    const nested = buildNestedFlowElements(moddle, node, allNodes, allEdges);
+    attrs.flowElements = nested.flowElements;
+    if (nested.artifacts.length > 0) attrs.artifacts = nested.artifacts;
     if (elementType === "EventSubProcess" || node.data.subProcessVariant === "event") {
       attrs.triggeredByEvent = true;
     }
@@ -1536,6 +1606,29 @@ function buildFlowElement(moddle, node, allNodes, allEdges) {
       });
     }
   }
+  const loopType = typeof node.data.loopType === "string" ? node.data.loopType : "none";
+  if (loopType && loopType !== "none") {
+    if (loopType === "loop") {
+      const lcAttrs = { id: uid("LoopChar", node.id) };
+      const loopCondition = typeof node.data.loopCondition === "string" ? node.data.loopCondition : void 0;
+      if (loopCondition) {
+        lcAttrs.loopCondition = moddle.create("bpmn:FormalExpression", { body: loopCondition });
+      }
+      attrs.loopCharacteristics = moddle.create("bpmn:StandardLoopCharacteristics", lcAttrs);
+    } else {
+      const isSequential = loopType === "sequentialMultiple";
+      const lcAttrs = { id: uid("LoopChar", node.id), isSequential };
+      const loopCardinality = typeof node.data.loopCardinality === "string" ? node.data.loopCardinality : void 0;
+      const loopCompletionCondition = typeof node.data.loopCompletionCondition === "string" ? node.data.loopCompletionCondition : void 0;
+      if (loopCardinality) {
+        lcAttrs.loopCardinality = moddle.create("bpmn:FormalExpression", { body: loopCardinality });
+      }
+      if (loopCompletionCondition) {
+        lcAttrs.completionCondition = moddle.create("bpmn:FormalExpression", { body: loopCompletionCondition });
+      }
+      attrs.loopCharacteristics = moddle.create("bpmn:MultiInstanceLoopCharacteristics", lcAttrs);
+    }
+  }
   const element = moddle.create(moddleType, attrs);
   return element;
 }
@@ -1543,16 +1636,42 @@ function buildNestedFlowElements(moddle, parent, allNodes, allEdges) {
   const childNodes = allNodes.filter((node) => node.parentId === parent.id);
   const childNodeIds = new Set(childNodes.map((node) => node.id));
   const flowElements = [];
+  const artifacts = [];
+  const presentDataObjectIds = new Set(
+    childNodes.filter((n) => n.data.elementType === "DataObject").map((n) => n.id)
+  );
+  for (const node of childNodes) {
+    if (node.data.elementType === "DataObjectReference") {
+      const explicitRef = typeof node.data.dataObjectRef === "string" ? node.data.dataObjectRef : null;
+      if (!explicitRef || !presentDataObjectIds.has(explicitRef)) {
+        const syntheticId = `DataObject_${node.id}`;
+        if (!presentDataObjectIds.has(syntheticId)) {
+          flowElements.push(moddle.create("bpmn:DataObject", { id: syntheticId }));
+          presentDataObjectIds.add(syntheticId);
+        }
+      }
+    }
+  }
   for (const child of childNodes) {
     const element = buildFlowElement(moddle, child, allNodes, allEdges);
-    if (element) flowElements.push(element);
+    if (!element) continue;
+    if (ARTIFACT_ELEMENT_TYPES.has(child.data.elementType)) {
+      artifacts.push(element);
+    } else {
+      flowElements.push(element);
+    }
   }
   for (const edge of allEdges) {
     if (!childNodeIds.has(edge.source) || !childNodeIds.has(edge.target)) continue;
     const element = buildEdgeElement(moddle, edge);
-    if (element) flowElements.push(element);
+    if (!element) continue;
+    if (edge.data?.edgeType === "association") {
+      artifacts.push(element);
+    } else {
+      flowElements.push(element);
+    }
   }
-  return flowElements;
+  return { flowElements, artifacts };
 }
 function buildEdgeElement(moddle, edge) {
   if (!edge.data) return null;
@@ -1574,6 +1693,9 @@ function buildEdgeElement(moddle, edge) {
       body: edge.data.conditionExpression
     });
   }
+  if (edge.data.edgeType === "association" && edge.data.associationDirection && edge.data.associationDirection !== "none") {
+    attrs.associationDirection = edge.data.associationDirection === "both" ? "Both" : "One";
+  }
   return moddle.create(moddleType, attrs);
 }
 function buildBpmnDI(moddle, definitions, nodes, edges) {