@aranzatech/diagrams-bpmn 0.1.3 → 0.2.1

package/dist/xml/index.cjs

@@ -40,7 +40,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   IntermediateCatchEvent: {
     label: "Intermediate Catch Event",
-    icon: "Clock",
+    icon: "Clock3",
     category: "event",
     defaultWidth: 36,
     defaultHeight: 36,
@@ -54,7 +54,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   IntermediateThrowEvent: {
     label: "Intermediate Throw Event",
-    icon: "Zap",
+    icon: "Send",
     category: "event",
     defaultWidth: 36,
     defaultHeight: 36,
@@ -68,7 +68,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   BoundaryEvent: {
     label: "Boundary Event",
-    icon: "AlertCircle",
+    icon: "AlarmClock",
     category: "event",
     defaultWidth: 36,
     defaultHeight: 36,
@@ -84,7 +84,7 @@ var BPMN_ELEMENT_CATALOG = {
   // ─── Tasks ───────────────────────────────────────────────────────────────────
   Task: {
     label: "Task",
-    icon: "Square",
+    icon: "CheckSquare",
     category: "task",
     defaultWidth: 120,
     defaultHeight: 60,
@@ -98,7 +98,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   UserTask: {
     label: "User Task",
-    icon: "User",
+    icon: "UserRound",
     category: "task",
     defaultWidth: 120,
     defaultHeight: 60,
@@ -112,7 +112,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   ServiceTask: {
     label: "Service Task",
-    icon: "Settings",
+    icon: "Cog",
     category: "task",
     defaultWidth: 120,
     defaultHeight: 60,
@@ -154,7 +154,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   BusinessRuleTask: {
     label: "Business Rule Task",
-    icon: "Scale",
+    icon: "Table2",
     category: "task",
     defaultWidth: 120,
     defaultHeight: 60,
@@ -168,7 +168,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   ReceiveTask: {
     label: "Receive Task",
-    icon: "Mail",
+    icon: "Inbox",
     category: "task",
     defaultWidth: 120,
     defaultHeight: 60,
@@ -211,7 +211,7 @@ var BPMN_ELEMENT_CATALOG = {
   // ─── Gateways ────────────────────────────────────────────────────────────────
   ExclusiveGateway: {
     label: "Exclusive Gateway",
-    icon: "GitBranch",
+    icon: "X",
     category: "gateway",
     defaultWidth: 50,
     defaultHeight: 50,
@@ -224,7 +224,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   InclusiveGateway: {
     label: "Inclusive Gateway",
-    icon: "GitMerge",
+    icon: "Circle",
     category: "gateway",
     defaultWidth: 50,
     defaultHeight: 50,
@@ -237,7 +237,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   ParallelGateway: {
     label: "Parallel Gateway",
-    icon: "GitFork",
+    icon: "Plus",
     category: "gateway",
     defaultWidth: 50,
     defaultHeight: 50,
@@ -278,7 +278,7 @@ var BPMN_ELEMENT_CATALOG = {
   // ─── Containers ───────────────────────────────────────────────────────────────
   SubProcess: {
     label: "Sub-Process",
-    icon: "Layout",
+    icon: "PlusSquare",
     category: "container",
     defaultWidth: 350,
     defaultHeight: 200,
@@ -293,7 +293,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   Transaction: {
     label: "Transaction",
-    icon: "CreditCard",
+    icon: "Receipt",
     category: "container",
     defaultWidth: 350,
     defaultHeight: 200,
@@ -308,7 +308,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   EventSubProcess: {
     label: "Event Sub-Process",
-    icon: "Workflow",
+    icon: "CircleDotDashed",
     category: "container",
     defaultWidth: 350,
     defaultHeight: 200,
@@ -323,7 +323,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   AdHocSubProcess: {
     label: "Ad-Hoc Sub-Process",
-    icon: "Shuffle",
+    icon: "Waves",
     category: "container",
     defaultWidth: 350,
     defaultHeight: 200,
@@ -338,7 +338,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   Pool: {
     label: "Pool",
-    icon: "Columns",
+    icon: "Rows3",
     category: "container",
     defaultWidth: 600,
     defaultHeight: 200,
@@ -353,7 +353,7 @@ var BPMN_ELEMENT_CATALOG = {
   },
   Lane: {
     label: "Lane",
-    icon: "AlignJustify",
+    icon: "PanelTop",
     category: "container",
     defaultWidth: 600,
     defaultHeight: 120,
@@ -569,6 +569,30 @@ var BPMN_ELEMENT_CATALOG = {
     canBeEnd: false
   }
 };
+var BPMN_RESIZABLE_ELEMENT_TYPES = [
+  "Task",
+  "UserTask",
+  "ServiceTask",
+  "ScriptTask",
+  "ManualTask",
+  "BusinessRuleTask",
+  "ReceiveTask",
+  "SendTask",
+  "CallActivity",
+  "SubProcess",
+  "Transaction",
+  "EventSubProcess",
+  "AdHocSubProcess",
+  "Pool",
+  "Lane",
+  "Annotation",
+  "Group",
+  "SubConversation",
+  "ChoreographyTask",
+  "SubChoreography",
+  "CallChoreography"
+];
+new Set(BPMN_RESIZABLE_ELEMENT_TYPES);
 
 // src/xml/mapper.ts
 var MODDLE_TO_ELEMENT_TYPE = {
@@ -592,8 +616,8 @@ var MODDLE_TO_ELEMENT_TYPE = {
   "bpmn:EventBasedGateway": "EventBasedGateway",
   "bpmn:ComplexGateway": "ComplexGateway",
   "bpmn:SubProcess": "SubProcess",
-  "bpmn:AdHocSubProcess": "SubProcess",
-  "bpmn:Transaction": "SubProcess",
+  "bpmn:AdHocSubProcess": "AdHocSubProcess",
+  "bpmn:Transaction": "Transaction",
   "bpmn:TextAnnotation": "Annotation",
   "bpmn:Group": "Group",
   "bpmn:DataObject": "DataObject",
@@ -631,6 +655,9 @@ var ELEMENT_TYPE_TO_MODDLE = {
   EventBasedGateway: "bpmn:EventBasedGateway",
   ComplexGateway: "bpmn:ComplexGateway",
   SubProcess: "bpmn:SubProcess",
+  Transaction: "bpmn:Transaction",
+  EventSubProcess: "bpmn:SubProcess",
+  AdHocSubProcess: "bpmn:AdHocSubProcess",
   Pool: "bpmn:Participant",
   Lane: "bpmn:Lane",
   Annotation: "bpmn:TextAnnotation",
@@ -695,6 +722,10 @@ function asElements(v) {
 function asString(v) {
   return typeof v === "string" && v.trim() ? v.trim() : void 0;
 }
+function extractDocumentation(el) {
+  const [doc] = asElements(el.documentation);
+  return asString(doc?.text);
+}
 function extractDiagramInfo(definitions) {
   const shapes = /* @__PURE__ */ new Map();
   const waypoints = /* @__PURE__ */ new Map();
@@ -750,6 +781,7 @@ function extractTrigger(el) {
 function extractSubProcessVariant(el) {
   if (el.$type === "bpmn:Transaction") return "transaction";
   if (el.$type === "bpmn:AdHocSubProcess") return "adhoc";
+  if (el.$type === "bpmn:SubProcess" && el.triggeredByEvent === true) return "event";
   if (el.triggeredByEvent === true) return "event";
   return "embedded";
 }
@@ -763,7 +795,7 @@ function walkFlowElements(elements, parentId, ctx, nodes, edges) {
       continue;
     }
     if ($type === "bpmn:LaneSet") continue;
-    const elementType = MODDLE_TO_ELEMENT_TYPE[$type];
+    const elementType = $type === "bpmn:SubProcess" && el.triggeredByEvent === true ? "EventSubProcess" : MODDLE_TO_ELEMENT_TYPE[$type];
     if (!elementType) {
       ctx.warnings.push(`Unknown element type "${$type}" (id=${id}) \u2014 skipped.`);
       continue;
@@ -784,22 +816,26 @@ function buildNode(el, elementType, parentId, ctx, nodes) {
   const y = shape?.y ?? 100;
   if (!shape) ctx.autoX.value += (meta?.defaultWidth ?? 120) + 20;
   const label = asString(el.name);
+  const documentation = extractDocumentation(el);
   const trigger = extractTrigger(el);
   const isNonInterrupting = el.cancelActivity === false;
+  const attachedToRef = el.attachedToRef?.id;
   const data = {
     elementType,
     ...label ? { label } : {},
+    ...documentation ? { documentation } : {},
     ...trigger ? { trigger } : {},
-    ...isNonInterrupting ? { isNonInterrupting: true } : {}
+    ...isNonInterrupting ? { isNonInterrupting: true } : {},
+    ...attachedToRef ? { attachedToRef } : {}
   };
-  if (elementType === "SubProcess") {
+  if (elementType === "SubProcess" || elementType === "Transaction" || elementType === "EventSubProcess" || elementType === "AdHocSubProcess") {
     const variant = extractSubProcessVariant(el);
     if (variant) data.subProcessVariant = variant;
     const isExpanded = shape?.isExpanded ?? true;
     data.isExpanded = isExpanded;
   }
   const laneId = ctx.laneMembership.get(id);
-  const effectiveParentId = laneId ?? parentId;
+  const effectiveParentId = attachedToRef ?? laneId ?? parentId;
   const node = {
     id,
     type: elementType,
@@ -820,10 +856,12 @@ function buildEdge(el, edgeType, ctx, edges) {
     return;
   }
   const label = asString(el.name);
+  const documentation = extractDocumentation(el);
   const condExpr = el.conditionExpression;
   const data = {
     edgeType,
     ...label ? { label } : {},
+    ...documentation ? { documentation } : {},
     ...condExpr?.body ? { conditionExpression: condExpr.body } : {}
   };
   const waypoints = ctx.waypoints.get(id);
@@ -924,7 +962,46 @@ async function parseBpmnXml(xml) {
       );
     }
   }
-  return { nodes, edges, warnings };
+  const defaultFlowById = /* @__PURE__ */ new Set();
+  const nodeIds = new Set(nodes.map((node) => node.id));
+  for (const rootEl of asElements(rootElement.rootElements)) {
+    collectDefaultFlows(rootEl, defaultFlowById);
+  }
+  const normalizedEdges = edges.map((edge) => {
+    if (!defaultFlowById.has(edge.id)) return edge;
+    const data = {
+      edgeType: edge.data?.edgeType ?? edge.type,
+      ...edge.data ?? {},
+      isDefault: true
+    };
+    return { ...edge, data };
+  });
+  return {
+    nodes: normalizeChildPositions(nodes, nodeIds),
+    edges: normalizedEdges,
+    warnings
+  };
+}
+function collectDefaultFlows(el, defaultFlowById) {
+  const defaultRef = el.default;
+  if (defaultRef?.id) defaultFlowById.add(defaultRef.id);
+  for (const child of asElements(el.rootElements)) collectDefaultFlows(child, defaultFlowById);
+  for (const child of asElements(el.flowElements)) collectDefaultFlows(child, defaultFlowById);
+}
+function normalizeChildPositions(nodes, nodeIds) {
+  const absoluteById = new Map(nodes.map((node) => [node.id, node.position]));
+  return nodes.map((node) => {
+    if (!node.parentId || !nodeIds.has(node.parentId)) return node;
+    const parentPosition = absoluteById.get(node.parentId);
+    if (!parentPosition) return node;
+    return {
+      ...node,
+      position: {
+        x: node.position.x - parentPosition.x,
+        y: node.position.y - parentPosition.y
+      }
+    };
+  });
 }
 function uid(prefix, id) {
   return `${prefix}_${id}`;
@@ -932,19 +1009,6 @@ function uid(prefix, id) {
 function asNodes(nodes, types) {
   return nodes.filter((n) => types.includes(n.data.elementType));
 }
-function buildFlowableAttrs(data) {
-  const attrs = {};
-  if (data.flowableAssignee) attrs["flowable:assignee"] = data.flowableAssignee;
-  if (data.flowableCandidateGroups) attrs["flowable:candidateGroups"] = data.flowableCandidateGroups;
-  if (data.flowableCandidateUsers) attrs["flowable:candidateUsers"] = data.flowableCandidateUsers;
-  if (data.flowableFormKey) attrs["flowable:formKey"] = data.flowableFormKey;
-  if (data.flowableDueDate) attrs["flowable:dueDate"] = data.flowableDueDate;
-  if (data.flowableType) attrs["flowable:type"] = data.flowableType;
-  if (data.flowableExpression) attrs["flowable:expression"] = data.flowableExpression;
-  if (data.flowableClass) attrs["flowable:class"] = data.flowableClass;
-  if (data.flowableDelegateExpression) attrs["flowable:delegateExpression"] = data.flowableDelegateExpression;
-  return attrs;
-}
 function buildSemanticModel(moddle, nodes, edges, opts) {
   const defId = opts.id ?? "Definitions_1";
   const defName = opts.name;
@@ -1003,13 +1067,32 @@ function buildSemanticModel(moddle, nodes, edges, opts) {
   return definitions;
 }
 function buildProcess(moddle, allNodes, allEdges, poolId, laneNodes, processId) {
-  const myNodes = poolId ? allNodes.filter(
-    (n) => n.parentId === poolId || laneNodes.some((l) => l.id === n.parentId && l.parentId === poolId)
-  ) : allNodes.filter((n) => n.data.elementType !== "Pool" && n.data.elementType !== "Lane");
+  const subProcessIds = new Set(
+    allNodes.filter(
+      (n) => n.data.elementType === "SubProcess" || n.data.elementType === "Transaction" || n.data.elementType === "EventSubProcess" || n.data.elementType === "AdHocSubProcess"
+    ).map((n) => n.id)
+  );
+  const isInsideSubProcess = (node) => {
+    let parentId = node.parentId;
+    while (parentId) {
+      if (subProcessIds.has(parentId)) return true;
+      parentId = allNodes.find((candidate) => candidate.id === parentId)?.parentId;
+    }
+    return false;
+  };
+  const belongsToPool = (node) => {
+    let parentId = node.parentId;
+    while (parentId) {
+      if (parentId === poolId) return true;
+      parentId = allNodes.find((candidate) => candidate.id === parentId)?.parentId;
+    }
+    return false;
+  };
+  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 flowElements = [];
   for (const node of myNodes) {
-    const el = buildFlowElement(moddle, node);
+    const el = buildFlowElement(moddle, node, allNodes, allEdges);
     if (el) flowElements.push(el);
   }
   const myNodeIds = new Set(myNodes.map((n) => n.id));
@@ -1020,6 +1103,17 @@ function buildProcess(moddle, allNodes, allEdges, poolId, laneNodes, processId)
     const edgeMeta = buildEdgeElement(moddle, edge);
     if (edgeMeta) flowElements.push(edgeMeta);
   }
+  const elementById = new Map(
+    flowElements.filter((element) => typeof element.id === "string").map((element) => [element.id, element])
+  );
+  for (const edge of myEdges) {
+    if (!edge.data?.isDefault) continue;
+    const sourceElement = elementById.get(edge.source);
+    const edgeElement = elementById.get(edge.id);
+    if (sourceElement && edgeElement) {
+      sourceElement.default = edgeElement;
+    }
+  }
   const process = moddle.create("bpmn:Process", {
     id: processId,
     isExecutable: true,
@@ -1040,7 +1134,7 @@ function buildProcess(moddle, allNodes, allEdges, poolId, laneNodes, processId)
   }
   return process;
 }
-function buildFlowElement(moddle, node, _allNodes, _allEdges) {
+function buildFlowElement(moddle, node, allNodes, allEdges) {
   const { elementType, label, trigger } = node.data;
   if (elementType === "Pool" || elementType === "Lane") return null;
   const moddleType = ELEMENT_TYPE_TO_MODDLE[elementType];
@@ -1049,25 +1143,46 @@ function buildFlowElement(moddle, node, _allNodes, _allEdges) {
     id: node.id,
     name: label ?? ""
   };
+  if (node.data.documentation) {
+    attrs.documentation = [
+      moddle.create("bpmn:Documentation", { text: node.data.documentation })
+    ];
+  }
   if (trigger && trigger !== "none") {
     const defType = TRIGGER_TO_EVENT_DEF[trigger];
     if (defType) {
       attrs.eventDefinitions = [moddle.create(defType, { id: uid("EventDef", node.id) })];
     }
   }
-  if (elementType === "SubProcess" && node.data.subProcessVariant === "transaction") {
-    return moddle.create("bpmn:Transaction", attrs);
+  if (elementType === "BoundaryEvent") {
+    attrs.attachedToRef = { id: node.data.attachedToRef ?? node.parentId };
+    attrs.cancelActivity = node.data.isNonInterrupting ? false : true;
   }
-  if (elementType === "SubProcess" && node.data.subProcessVariant === "adhoc") {
-    return moddle.create("bpmn:AdHocSubProcess", attrs);
+  const isSubProcess = elementType === "SubProcess" || elementType === "Transaction" || elementType === "EventSubProcess" || elementType === "AdHocSubProcess";
+  if (isSubProcess) {
+    attrs.flowElements = buildNestedFlowElements(moddle, node, allNodes, allEdges);
+    if (elementType === "EventSubProcess" || node.data.subProcessVariant === "event") {
+      attrs.triggeredByEvent = true;
+    }
   }
   const element = moddle.create(moddleType, attrs);
-  const flowableAttrs = buildFlowableAttrs(node.data);
-  if (Object.keys(flowableAttrs).length > 0) {
-    element.$attrs = flowableAttrs;
-  }
   return element;
 }
+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 = [];
+  for (const child of childNodes) {
+    const element = buildFlowElement(moddle, child, allNodes, allEdges);
+    if (element) 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);
+  }
+  return flowElements;
+}
 function buildEdgeElement(moddle, edge) {
   if (!edge.data) return null;
   const moddleType = EDGE_TYPE_TO_MODDLE[edge.data.edgeType];
@@ -1078,6 +1193,11 @@ function buildEdgeElement(moddle, edge) {
     sourceRef: { id: edge.source },
     targetRef: { id: edge.target }
   };
+  if (edge.data.documentation) {
+    attrs.documentation = [
+      moddle.create("bpmn:Documentation", { text: edge.data.documentation })
+    ];
+  }
   if (edge.data.conditionExpression) {
     attrs.conditionExpression = moddle.create("bpmn:FormalExpression", {
       body: edge.data.conditionExpression
@@ -1088,13 +1208,14 @@ function buildEdgeElement(moddle, edge) {
 function buildBpmnDI(moddle, definitions, nodes, edges) {
   const shapes = [];
   const edgeShapes = [];
+  const absolutePositionById = buildAbsolutePositionMap(nodes);
   for (const node of nodes) {
     const meta = BPMN_ELEMENT_CATALOG[node.data.elementType];
     const w = node.width ?? meta?.defaultWidth ?? 120;
     const h = node.height ?? meta?.defaultHeight ?? 60;
     const bounds = moddle.create("dc:Bounds", {
-      x: node.position.x,
-      y: node.position.y,
+      x: absolutePositionById.get(node.id)?.x ?? node.position.x,
+      y: absolutePositionById.get(node.id)?.y ?? node.position.y,
       width: w,
       height: h
     });
@@ -1109,9 +1230,9 @@ function buildBpmnDI(moddle, definitions, nodes, edges) {
     shapes.push(shape);
   }
   for (const edge of edges) {
-    const waypoints = edge.data?.routingPoints?.map(
+    const waypoints = resolveEdgeWaypoints(edge, nodes, absolutePositionById).map(
       (p) => moddle.create("dc:Point", { x: p.x, y: p.y })
-    ) ?? [];
+    );
     edgeShapes.push(
       moddle.create("bpmndi:BPMNEdge", {
         id: uid("BPMNEdge", edge.id),
@@ -1133,6 +1254,46 @@ function buildBpmnDI(moddle, definitions, nodes, edges) {
   });
   definitions.diagrams = [diagram];
 }
+function resolveEdgeWaypoints(edge, nodes, absolutePositionById) {
+  if (edge.data?.routingPoints && edge.data.routingPoints.length >= 2) {
+    return edge.data.routingPoints;
+  }
+  const source = nodes.find((node) => node.id === edge.source);
+  const target = nodes.find((node) => node.id === edge.target);
+  if (!source || !target) return [];
+  const sourceMeta = BPMN_ELEMENT_CATALOG[source.data.elementType];
+  const targetMeta = BPMN_ELEMENT_CATALOG[target.data.elementType];
+  const sourcePosition = absolutePositionById.get(source.id) ?? source.position;
+  const targetPosition = absolutePositionById.get(target.id) ?? target.position;
+  return [
+    {
+      x: sourcePosition.x + (source.width ?? sourceMeta.defaultWidth) / 2,
+      y: sourcePosition.y + (source.height ?? sourceMeta.defaultHeight) / 2
+    },
+    {
+      x: targetPosition.x + (target.width ?? targetMeta.defaultWidth) / 2,
+      y: targetPosition.y + (target.height ?? targetMeta.defaultHeight) / 2
+    }
+  ];
+}
+function buildAbsolutePositionMap(nodes) {
+  const nodeById = new Map(nodes.map((node) => [node.id, node]));
+  const absoluteById = /* @__PURE__ */ new Map();
+  function resolve(node) {
+    const cached = absoluteById.get(node.id);
+    if (cached) return cached;
+    const parent = node.parentId ? nodeById.get(node.parentId) : void 0;
+    const parentPosition = parent ? resolve(parent) : { x: 0, y: 0 };
+    const absolute = {
+      x: parentPosition.x + node.position.x,
+      y: parentPosition.y + node.position.y
+    };
+    absoluteById.set(node.id, absolute);
+    return absolute;
+  }
+  for (const node of nodes) resolve(node);
+  return absoluteById;
+}
 async function serializeBpmnXml(nodes, edges, opts = {}) {
   const moddle = new bpmnModdle.BpmnModdle();
   const definitions = buildSemanticModel(moddle, nodes, edges, opts);