@aranzatech/diagrams-bpmn 0.2.11 → 0.2.12

package/dist/index.cjs

@@ -2518,7 +2518,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" }
       ]
     }
   ],
@@ -2835,6 +2839,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) {
@@ -2843,6 +2853,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;
@@ -2860,7 +2889,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);
     }
@@ -2873,7 +2902,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);
@@ -2884,6 +2913,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 } : {},
@@ -2904,6 +2935,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") {
@@ -2936,11 +2969,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;
@@ -2965,7 +3001,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,
@@ -2997,7 +3033,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);
@@ -3031,9 +3067,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,
@@ -3206,7 +3242,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 = {};
@@ -3221,9 +3260,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;
@@ -3319,10 +3362,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(
@@ -3330,7 +3394,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])
@@ -3346,7 +3415,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 = [
@@ -3378,6 +3448,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 })
@@ -3396,22 +3470,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;
@@ -3428,7 +3496,9 @@ function buildFlowElement(moddle, node, allNodes, allEdges) {
   if (aranzaConfig) attrs.extensionElements = aranzaConfig;
   const isSubProcess2 = elementType === "SubProcess" || elementType === "Transaction" || elementType === "EventSubProcess" || elementType === "AdHocSubProcess";
   if (isSubProcess2) {
-    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;
     }
@@ -3438,6 +3508,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;
 }
@@ -3445,16 +3538,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;
@@ -3476,6 +3595,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) {