@aranzatech/diagrams-bpmn 0.3.0 → 0.3.2

package/dist/xml/index.cjs

@@ -779,6 +779,9 @@ var TRIGGER_TO_EVENT_DEF = {
 function asElements(v) {
   return Array.isArray(v) ? v : [];
 }
+function asLaneSets(value) {
+  return asElements(value);
+}
 function asString(v) {
   return typeof v === "string" && v.trim() ? v.trim() : void 0;
 }
@@ -833,6 +836,11 @@ function extractLaneMembership(process) {
       if (child) walkLaneSet(child);
     }
   }
+  const laneSets = asLaneSets(process.laneSets);
+  if (laneSets.length > 0) {
+    for (const laneSet2 of laneSets) walkLaneSet(laneSet2);
+    return map;
+  }
   const laneSet = process.laneSet;
   if (laneSet) walkLaneSet(laneSet);
   return map;
@@ -933,15 +941,39 @@ function extractAranzaExtensions(el) {
     if (ft) result.flowableType = ft;
     const fde = asString(elAttrs["flowable:delegateExpression"]);
     if (fde) result.flowableDelegateExpression = fde;
+    const fc = asString(elAttrs["flowable:class"]);
+    if (fc) result.flowableClass = fc;
+    const fe = asString(elAttrs["flowable:expression"]);
+    if (fe) result.flowableExpression = fe;
     const fk = asString(elAttrs["flowable:formKey"]);
     if (fk) result.formKey = fk;
     const cu = asString(elAttrs["flowable:candidateUsers"]);
     if (cu) result.candidateUsers = cu;
     const cg = asString(elAttrs["flowable:candidateGroups"]);
     if (cg) result.candidateGroups = cg;
+    const dueDate2 = asString(elAttrs["flowable:dueDate"]);
+    if (dueDate2) result.dueDate = dueDate2;
+    const skipExpression2 = asString(elAttrs["flowable:skipExpression"]);
+    if (skipExpression2) result.skipExpression = skipExpression2;
+    const businessCalendarName2 = asString(elAttrs["flowable:businessCalendarName"]);
+    if (businessCalendarName2) result.businessCalendarName = businessCalendarName2;
+    const resultVariable = asString(elAttrs["flowable:resultVariable"]);
+    if (resultVariable) result.resultVariable = resultVariable;
+    const ruleVariablesInput = asString(elAttrs["flowable:ruleVariablesInput"]);
+    if (ruleVariablesInput) result.ruleVariablesInput = ruleVariablesInput;
+    const ruleNames = asString(elAttrs["flowable:rules"]);
+    if (ruleNames) result.ruleNames = ruleNames;
+    const exclude = asString(elAttrs["flowable:exclude"]);
+    if (exclude === "true") result.excludeRules = true;
+    else if (exclude === "false") result.excludeRules = false;
   }
   const ext = el.extensionElements;
-  if (!ext) return result;
+  if (!ext) {
+    if (result.flowableType === "http" && !result.serviceConfig) {
+      result.serviceConfig = { implementation: "http" };
+    }
+    return result;
+  }
   const extValues = asElements(ext.values);
   const inlineDecision = extValues.find((v) => v.$type === "aranza:InlineDecision");
   if (inlineDecision) {
@@ -956,7 +988,12 @@ function extractAranzaExtensions(el) {
     }
   }
   const taskConfig = extValues.find((v) => v.$type === "aranza:TaskConfig");
-  if (!taskConfig) return result;
+  if (!taskConfig) {
+    if (result.flowableType === "http" && !result.serviceConfig) {
+      result.serviceConfig = { implementation: "http" };
+    }
+    return result;
+  }
   const priority = asString(taskConfig.priority);
   if (priority === "critical" || priority === "high" || priority === "medium" || priority === "low") {
     result.priority = priority;
@@ -1016,6 +1053,9 @@ function extractAranzaExtensions(el) {
   if (skipExpression) result.skipExpression = skipExpression;
   const businessCalendarName = asString(taskConfig.businessCalendarName);
   if (businessCalendarName) result.businessCalendarName = businessCalendarName;
+  if (!result.serviceConfig && result.flowableType === "http") {
+    result.serviceConfig = { implementation: "http" };
+  }
   return result;
 }
 function extractCompletionCondition(el) {
@@ -1133,8 +1173,8 @@ function buildNode(el, elementType, parentId, ctx, nodes) {
 }
 function buildEdge(el, edgeType, ctx, edges) {
   const id = el.id;
-  const source = el.sourceRef?.id;
-  const target = el.targetRef?.id;
+  const source = extractReferenceId(el.sourceRef);
+  const target = extractReferenceId(el.targetRef);
   if (!source || !target) {
     ctx.warnings.push(`Edge "${id}" missing source or target \u2014 skipped.`);
     return;
@@ -1169,6 +1209,21 @@ function buildEdge(el, edgeType, ctx, edges) {
   if (waypoints?.length) data.routingPoints = waypoints;
   edges.push({ id, type: edgeType, source, target, data });
 }
+function extractReferenceId(value) {
+  if (Array.isArray(value)) {
+    for (const entry of value) {
+      const id = extractReferenceId(entry);
+      if (id) return id;
+    }
+    return void 0;
+  }
+  if (typeof value === "string") return value;
+  if (value && typeof value === "object") {
+    const id = value.id;
+    return typeof id === "string" ? id : void 0;
+  }
+  return void 0;
+}
 function handleCollaboration(collaboration, ctx, nodes, edges) {
   for (const participant of asElements(collaboration.participants)) {
     const id = participant.id;
@@ -1194,9 +1249,12 @@ function handleCollaboration(collaboration, ctx, nodes, edges) {
         nodes,
         edges
       );
-      const laneSet = processRef.laneSet;
-      if (laneSet) {
-        addLaneNodes(laneSet, id, ctx, nodes);
+      const laneSets = asLaneSets(processRef.laneSets);
+      if (laneSets.length > 0) {
+        for (const laneSet of laneSets) addLaneNodes(laneSet, id, ctx, nodes);
+      } else {
+        const laneSet = processRef.laneSet;
+        if (laneSet) addLaneNodes(laneSet, id, ctx, nodes);
       }
     }
   }
@@ -1253,8 +1311,13 @@ async function parseBpmnXml(xml) {
       handleCollaboration(rootEl, ctx, nodes, edges);
     } else if (rootEl.$type === "bpmn:Process") {
       const laneMembership = extractLaneMembership(rootEl);
-      const laneSet = rootEl.laneSet;
-      if (laneSet) addLaneNodes(laneSet, void 0, ctx, nodes);
+      const laneSets = asLaneSets(rootEl.laneSets);
+      if (laneSets.length > 0) {
+        for (const laneSet of laneSets) addLaneNodes(laneSet, void 0, ctx, nodes);
+      } else {
+        const laneSet = rootEl.laneSet;
+        if (laneSet) addLaneNodes(laneSet, void 0, ctx, nodes);
+      }
       walkFlowElements(
         [...asElements(rootEl.flowElements), ...asElements(rootEl.artifacts)],
         void 0,
@@ -1557,6 +1620,13 @@ function buildAranzaExtensionElements(moddle, node) {
   return moddle.create("bpmn:ExtensionElements", { values });
 }
 var ARTIFACT_ELEMENT_TYPES = /* @__PURE__ */ new Set(["Annotation", "Group"]);
+var DATA_ASSOCIATION_SOURCE_TYPES = /* @__PURE__ */ new Set([
+  "DataObject",
+  "DataObjectReference",
+  "DataStore",
+  "DataStoreReference",
+  "DataInput"
+]);
 function buildSemanticModel(moddle, nodes, edges, opts) {
   const defId = opts.id ?? "Definitions_1";
   const defName = opts.name;
@@ -1664,6 +1734,7 @@ 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)).filter((n) => !(n.data.elementType === "DataStore" && referencedDataStoreIds.has(n.id)));
   const myLanes = laneNodes.filter((l) => poolId ? l.parentId === poolId : true);
+  const nodeById = new Map(myNodes.map((node) => [node.id, node]));
   const presentDataObjectIds = new Set(
     myNodes.filter((n) => n.data.elementType === "DataObject").map((n) => n.id)
   );
@@ -1695,7 +1766,7 @@ function buildProcess(moddle, allNodes, allEdges, poolId, laneNodes, processId,
     (e) => (e.data?.edgeType === "sequenceFlow" || e.data?.edgeType === "association" || e.data?.edgeType === "dataAssociation") && myNodeIds.has(e.source) && myNodeIds.has(e.target)
   );
   for (const edge of myEdges) {
-    const edgeMeta = buildEdgeElement(moddle, edge);
+    const edgeMeta = buildEdgeElement(moddle, edge, nodeById);
     if (!edgeMeta) continue;
     if (edge.data?.edgeType === "association") {
       artifacts.push(edgeMeta);
@@ -1741,10 +1812,12 @@ function buildProcess(moddle, allNodes, allEdges, poolId, laneNodes, processId,
         flowNodeRef: myNodes.filter((n) => n.parentId === l.id).map((n) => ({ id: n.id }))
       })
     );
-    process.laneSet = moddle.create("bpmn:LaneSet", {
-      id: `LaneSet_${processId}`,
-      lanes: laneElements
-    });
+    process.laneSets = [
+      moddle.create("bpmn:LaneSet", {
+        id: `LaneSet_${processId}`,
+        lanes: laneElements
+      })
+    ];
   }
   return process;
 }
@@ -1852,6 +1925,7 @@ function buildNestedFlowElements(moddle, parent, allNodes, allEdges) {
   const referencedDataStoreIds = collectReferencedDataStoreIds(allNodes);
   const childNodes = allNodes.filter((node) => node.parentId === parent.id).filter((node) => !(node.data.elementType === "DataStore" && referencedDataStoreIds.has(node.id)));
   const childNodeIds = new Set(childNodes.map((node) => node.id));
+  const childNodeById = new Map(childNodes.map((node) => [node.id, node]));
   const flowElements = [];
   const artifacts = [];
   const presentDataObjectIds = new Set(
@@ -1880,7 +1954,7 @@ function buildNestedFlowElements(moddle, parent, allNodes, allEdges) {
   }
   for (const edge of allEdges) {
     if (!childNodeIds.has(edge.source) || !childNodeIds.has(edge.target)) continue;
-    const element = buildEdgeElement(moddle, edge);
+    const element = buildEdgeElement(moddle, edge, childNodeById);
     if (!element) continue;
     if (edge.data?.edgeType === "association") {
       artifacts.push(element);
@@ -1890,16 +1964,23 @@ function buildNestedFlowElements(moddle, parent, allNodes, allEdges) {
   }
   return { flowElements, artifacts };
 }
-function buildEdgeElement(moddle, edge) {
+function buildEdgeElement(moddle, edge, nodeById) {
   if (!edge.data) return null;
-  const moddleType = EDGE_TYPE_TO_MODDLE[edge.data.edgeType];
+  const sourceNode = nodeById.get(edge.source);
+  const dataAssociationIsInput = edge.data.edgeType === "dataAssociation" && DATA_ASSOCIATION_SOURCE_TYPES.has(sourceNode?.data.elementType ?? "");
+  const moddleType = edge.data.edgeType === "dataAssociation" ? dataAssociationIsInput ? "bpmn:DataInputAssociation" : "bpmn:DataOutputAssociation" : EDGE_TYPE_TO_MODDLE[edge.data.edgeType];
   if (!moddleType) return null;
   const attrs = {
     id: edge.id,
-    name: edge.data.label ?? "",
-    sourceRef: { id: edge.source },
-    targetRef: { id: edge.target }
+    name: edge.data.label ?? ""
   };
+  if (edge.data.edgeType === "dataAssociation") {
+    attrs.sourceRef = [{ id: edge.source }];
+    attrs.targetRef = { id: edge.target };
+  } else {
+    attrs.sourceRef = { id: edge.source };
+    attrs.targetRef = { id: edge.target };
+  }
   if (edge.data.documentation) {
     attrs.documentation = [
       moddle.create("bpmn:Documentation", { text: edge.data.documentation })
@@ -1952,7 +2033,7 @@ function buildBpmnDI(moddle, definitions, nodes, edges) {
     );
   }
   const rootEls = definitions.rootElements;
-  const planeElement = rootEls?.[0];
+  const planeElement = rootEls?.find((element) => element.$type === "bpmn:Collaboration") ?? rootEls?.find((element) => element.$type === "bpmn:Process") ?? rootEls?.[0];
   const plane = moddle.create("bpmndi:BPMNPlane", {
     id: "BPMNPlane_1",
     bpmnElement: planeElement ?? { id: "unknown" },