@g1cloud/bpmn-modeler-next 5.0.0-alpha.29 → 5.0.0-alpha.30

package/dist/bpmn-modeler.js

@@ -1098,17 +1098,17 @@ function kg(e) {
   };
   function V(N, G = !1) {
     var le = null, He = null, ct, q = 0, pe = !1, fe = !1, ce = 0, ue = 0, ee, z, F, U, Me, Et, P, _, y, D = "", I = 0, W;
-    function se(et, St) {
-      var en = et.indexOf(":");
+    function se(tt, St) {
+      var en = tt.indexOf(":");
       if (en === -1)
-        return et;
-      var tn = x[et.substring(0, en)];
-      return tn ? St === tn ? et.substr(en + 1) : tn + et.substr(en) : (A(Hx(et.substring(0, en))), null);
+        return tt;
+      var tn = x[tt.substring(0, en)];
+      return tn ? St === tn ? tt.substr(en + 1) : tn + tt.substr(en) : (A(Hx(tt.substring(0, en))), null);
     }
     function Se() {
       if (W !== null)
         return W;
-      var et, St, en = g && x.xmlns, tn = g && m ? [] : null, it = I, Rt = D, nn = Rt.length, qr, rn, xn, wn, _t, xi = {}, No = /* @__PURE__ */ new Set(), mn, Ge, Ke;
+      var tt, St, en = g && x.xmlns, tn = g && m ? [] : null, it = I, Rt = D, nn = Rt.length, qr, rn, xn, wn, _t, xi = {}, No = /* @__PURE__ */ new Set(), mn, Ge, Ke;
       e:
         for (; it < nn; it++)
           if (mn = !1, Ge = Rt.charCodeAt(it), !(Ge === 32 || Ge < 14 && Ge > 8)) {
@@ -1145,16 +1145,16 @@ function kg(e) {
             }
             if (m) {
               if (rn = _t === "xmlns" ? "xmlns" : _t.charCodeAt(0) === 120 && _t.substr(0, 6) === "xmlns:" ? _t.substr(6) : null, rn !== null) {
-                if (et = wr(xn), St = Yu(rn), wn = M[et], !wn) {
-                  if (rn === "xmlns" || St in x && x[St] !== et)
+                if (tt = wr(xn), St = Yu(rn), wn = M[tt], !wn) {
+                  if (rn === "xmlns" || St in x && x[St] !== tt)
                     do
                       wn = "ns" + q++;
                     while (typeof x[wn] < "u");
                   else
                     wn = rn;
-                  M[et] = wn;
+                  M[tt] = wn;
                 }
-                x[rn] !== wn && (qr || (x = zx(x), qr = !0), x[rn] = wn, rn === "xmlns" && (x[Yu(wn)] = et, en = wn), x[St] = et), xi[_t] = xn;
+                x[rn] !== wn && (qr || (x = zx(x), qr = !0), x[rn] = wn, rn === "xmlns" && (x[Yu(wn)] = tt, en = wn), x[St] = tt), xi[_t] = xn;
                 continue;
               }
               tn.push(_t, xn);
@@ -1168,7 +1168,7 @@ function kg(e) {
       return W = xi;
     }
     function qe() {
-      for (var et = /(\r\n|\r|\n)/g, St = 0, en = 0, tn = 0, it = ue, Rt, nn; ce >= tn && (Rt = et.exec(N), !(!Rt || (it = Rt[0].length + Rt.index, it > ce))); )
+      for (var tt = /(\r\n|\r|\n)/g, St = 0, en = 0, tn = 0, it = ue, Rt, nn; ce >= tn && (Rt = tt.exec(N), !(!Rt || (it = Rt[0].length + Rt.index, it > ce))); )
         St += 1, tn = it;
       return ce == -1 ? (en = it, nn = N.substring(ue)) : ue === 0 ? nn = N.substring(ue, ce) : (en = ce - tn, nn = ue == -1 ? N.substring(ce) : N.substring(ce, ue + 1)), {
         data: nn,
@@ -6461,7 +6461,7 @@ function Jw(e, t) {
   const s = a.y > o.y, c = s ? o : a, u = s ? a : o, l = n.filter((G) => G.id !== o.id && G.id !== a.id && G.y >= c.y + c.height && G.y + G.height <= u.y).sort((G, le) => G.y - le.y);
   if (!l.length) return null;
   const p = l[0], f = l[l.length - 1], d = (c.y + c.height + p.y) / 2, h = (f.y + f.height + u.y) / 2, m = s ? d : h, g = s ? h : d, R = e.waypoints[0], w = e.waypoints[e.waypoints.length - 1], b = Qi(t), x = t.edges.filter((G) => G.id !== e.id), S = Zi(e, x), M = ni(e, b).length;
-  if (S === 0 && M === 0) return null;
+  if (S === 0 && M === 0 || M === 0 && e.waypoints.length === 2) return null;
   const L = Math.min(...l.map((G) => G.x)), A = Math.max(...l.map((G) => G.x + G.width)), H = (R.x + w.x) / 2, V = (G) => G.filter((le, He) => He === 0 || !(Mt(le.x, G[He - 1].x) && Mt(le.y, G[He - 1].y)));
   let N;
   for (let G = L; G <= A; G += Qw) {
@@ -7250,9 +7250,9 @@ function bE(e, t) {
         if ($e.node.lane !== C || ($e.band ?? 0) !== 0 || !$e.node.type.endsWith("Gateway")) continue;
         const Te = { in: /* @__PURE__ */ new Set(), out: /* @__PURE__ */ new Set(), cross: /* @__PURE__ */ new Set() };
         for (const ye of m) {
-          const Qe = ye.flow.source === $e.node.id;
-          if (!Qe && ye.flow.target !== $e.node.id) continue;
-          const Ct = S.get(Qe ? ye.flow.target : ye.flow.source);
+          const Je = ye.flow.source === $e.node.id;
+          if (!Je && ye.flow.target !== $e.node.id) continue;
+          const Ct = S.get(Je ? ye.flow.target : ye.flow.source);
           if (!Ct || Ct.node.participant !== $e.node.participant || !Ct.node.lane) continue;
           let gn, Ft = !1;
           if (Ct.node.lane !== C) {
@@ -7263,15 +7263,15 @@ function bE(e, t) {
             const Pt = T.get(Ct.band ?? 0) ?? $;
             gn = Pt > $ ? "down" : Pt < $ ? "up" : void 0;
           }
-          gn && (Te[Qe ? "out" : "in"].add(gn), Ft && Te.cross.add(gn));
+          gn && (Te[Je ? "out" : "in"].add(gn), Ft && Te.cross.add(gn));
         }
         for (const ye of ["up", "down"]) Te.in.has(ye) && Te.out.has(ye) && Te.cross.has(ye) && j.add(ye);
       }
       if (j.size !== 1) continue;
       const [Z] = j, Q = Math.max(...T.values()), te = Z === "down" ? Q : 0;
       if ($ === te) continue;
-      const ae = [...T.entries()].filter(([$e]) => $e !== 0).sort(($e, Te) => $e[1] - Te[1]), ze = [...Array(Q + 1).keys()].filter(($e) => $e !== te), tt = /* @__PURE__ */ new Map([[0, te]]);
-      ae.forEach(([$e], Te) => tt.set($e, ze[Te])), q.set(C, tt);
+      const ae = [...T.entries()].filter(([$e]) => $e !== 0).sort(($e, Te) => $e[1] - Te[1]), ze = [...Array(Q + 1).keys()].filter(($e) => $e !== te), Qe = /* @__PURE__ */ new Map([[0, te]]);
+      ae.forEach(([$e], Te) => Qe.set($e, ze[Te])), q.set(C, Qe);
     }
   }
   const pe = (E) => {
@@ -7301,17 +7301,17 @@ function bE(e, t) {
       const Z = ue(B);
       if (Z === void 0 || T($, Z) !== T($, 0)) continue;
       const Q = T($, Z), te = m.filter((ye) => ye.flow.source === B.node.id).map((ye) => S.get(ye.flow.target)).filter((ye) => !!ye && (ye.node.lane ?? `pool:${ye.node.participant ?? ""}`) === $), ae = te.filter((ye) => {
-        const Qe = ue(ye);
-        return Qe !== void 0 && T($, Qe) === Q && (E.get(ye.node.id) ?? 0) === 1;
+        const Je = ue(ye);
+        return Je !== void 0 && T($, Je) === Q && (E.get(ye.node.id) ?? 0) === 1;
       }), ze = te.some((ye) => {
-        const Qe = ue(ye);
-        return Qe !== void 0 && T($, Qe) > Q;
+        const Je = ue(ye);
+        return Je !== void 0 && T($, Je) > Q;
       });
       if (ae.length !== 1 || !ze) continue;
-      const tt = new Set(te.flatMap((ye) => C(ye.node.id)));
-      if (!m.some((ye) => ye.flow.target === B.node.id && tt.has(ye.flow.source))) continue;
+      const Qe = new Set(te.flatMap((ye) => C(ye.node.id)));
+      if (!m.some((ye) => ye.flow.target === B.node.id && Qe.has(ye.flow.source))) continue;
       const Te = /* @__PURE__ */ new Map();
-      for (const [ye, Qe] of j) Te.set(ye, Qe + 1);
+      for (const [ye, Je] of j) Te.set(ye, Je + 1);
       Te.set(-1, 0), q.set($, Te);
       for (const ye of C(ae[0].node.id)) S.has(ye) && (ce.set(ye, -1), z.add(ye));
       ee.add(B.node.id);
@@ -7352,8 +7352,8 @@ function bE(e, t) {
       width: $,
       height: te,
       isExpanded: !0
-    }), ze = n.createShape(ae, { x: 100 + $ / 2, y: P + te / 2 }, u()), tt = C.lanes ?? [];
-    if (tt.length && n.splitLane(ze, tt.length), tt.length) {
+    }), ze = n.createShape(ae, { x: 100 + $ / 2, y: P + te / 2 }, u()), Qe = C.lanes ?? [];
+    if (Qe.length && n.splitLane(ze, Qe.length), Qe.length) {
       const $e = o.filter(
         (Te) => {
           var ye;
@@ -7361,12 +7361,12 @@ function bE(e, t) {
         }
       ).sort((Te, ye) => Te.y - ye.y);
       if ($e.forEach((Te, ye) => {
-        const Qe = tt[ye];
-        Qe && n.updateProperties(Te, { id: Qe.id, name: Qe.name });
+        const Je = Qe[ye];
+        Je && n.updateProperties(Te, { id: Je.id, name: Je.name });
       }), j.some((Te) => Te !== ze.height / B)) {
         let Te = ze.y;
-        $e.forEach((ye, Qe) => {
-          const Ct = j[Qe];
+        $e.forEach((ye, Je) => {
+          const Ct = j[Je];
           n.resizeShape(ye, { x: ye.x, y: Te, width: ye.width, height: Ct }), Te += Ct;
         });
       }
@@ -7436,7 +7436,7 @@ function bE(e, t) {
         return ge.y + Math.min(ge.height / 2, G) + Oe * H;
       }
       return T ? T.y + N + Oe * H : ne;
-    }, ae = (Ie) => Ie.participant ? p(Ie.participant) : u(), ze = 30, tt = (Ie, Oe, ne, ge) => {
+    }, ae = (Ie) => Ie.participant ? p(Ie.participant) : u(), ze = 30, Qe = (Ie, Oe, ne, ge) => {
       const de = ne - Oe.width / 2, Ne = ge - Oe.height / 2;
       return (Ie.children ?? []).find(
         (Xe) => !("waypoints" in Xe && Xe.waypoints) && Xe.type !== "bpmn:Lane" && Xe.type !== "label" && typeof Xe.x == "number" && de < Xe.x + Xe.width + ze && de + Oe.width + ze > Xe.x && Ne < Xe.y + Xe.height && Ne + Oe.height > Xe.y
@@ -7446,14 +7446,14 @@ function bE(e, t) {
       if (Xe)
         for (let Re = 0; Re < 4; Re++) {
           const Ce = te(ne, Wt + Re, Ne);
-          if (!tt(Ie, Oe, de, Ce))
+          if (!Qe(Ie, Oe, de, Ce))
             return Z(ne, Wt + Re), { x: de, y: Ce };
         }
       const J = Q(ne, ge, Ne);
       Xe && Z(ne, Wt);
       let Ye = de;
       for (let Re = 0; Re < 64; Re++) {
-        const Ce = tt(Ie, Oe, Ye, J);
+        const Ce = Qe(Ie, Oe, Ye, J);
         if (!Ce) break;
         Ye = Ce.x + Ce.width + V + Oe.width / 2;
       }
@@ -7464,7 +7464,7 @@ function bE(e, t) {
       const Oe = W(Ie.node, Ie.band), ne = fe(Ie), ge = Ie.node.lane ? `${Ie.node.lane}|${ne ?? ""}` : ne !== void 0 ? `band:${ne}` : "", de = ae(Ie.node), Ne = $e(de, Oe, Ie.node.lane, ne, ye.get(ge) ?? B, $);
       n.createShape(Oe, Ne, de), ye.set(ge, Ne.x + Oe.width + V), !Ie.node.lane && ne === void 0 && ($ += 160);
     }
-    const Qe = /* @__PURE__ */ new Set(), Ct = /* @__PURE__ */ new Map(), gn = /* @__PURE__ */ new Map(), Ft = /* @__PURE__ */ new Map();
+    const Je = /* @__PURE__ */ new Set(), Ct = /* @__PURE__ */ new Map(), gn = /* @__PURE__ */ new Map(), Ft = /* @__PURE__ */ new Map();
     if (E && He.has(`pool:${E}`)) {
       const Ie = /* @__PURE__ */ new Map();
       for (const J of C.flows) Ie.set(J.flow.target, (Ie.get(J.flow.target) ?? 0) + 1);
@@ -7504,22 +7504,22 @@ function bE(e, t) {
           if (xe.flow.source !== J.node.id) continue;
           const Ve = S.get(xe.flow.target);
           if (!Ve || Ve.node.lane !== J.node.lane || (Ie.get(Ve.node.id) ?? 0) !== 1) continue;
-          const Je = fe(Ve);
-          if (Je === void 0) continue;
-          const pn = Q(Ve.node.lane, Je, Number.NaN);
+          const et = fe(Ve);
+          if (et === void 0) continue;
+          const pn = Q(Ve.node.lane, et, Number.NaN);
           if (Number.isNaN(pn)) continue;
           const br = de(Ve.node.id), Ut = Ne(br);
-          Ut && Re.push({ subtree: br, band: Je, row: pn, dir: Ut });
+          Ut && Re.push({ subtree: br, band: et, row: pn, dir: Ut });
         }
         if (!Re.some((xe) => xe.dir === "up") || !Re.some((xe) => xe.dir === "down") || !Re.some((xe) => xe.dir === "up" && Re.some((Ve) => Ve.dir === "down" && Ve.row < xe.row))) continue;
         const pt = [...Re].sort((xe, Ve) => xe.row - Ve.row);
         [...Re.filter((xe) => xe.dir === "up"), ...Re.filter((xe) => xe.dir === "down")].sort(
           (xe, Ve) => xe.dir === Ve.dir ? xe.row - Ve.row : xe.dir === "up" ? -1 : 1
         ).forEach((xe, Ve) => {
-          const Je = pt[Ve].band;
-          if (Je !== xe.band) {
+          const et = pt[Ve].band;
+          if (et !== xe.band) {
             ne.add(J.node.id);
-            for (const pn of xe.subtree) fe(pn) === xe.band && ce.set(pn.node.id, Je);
+            for (const pn of xe.subtree) fe(pn) === xe.band && ce.set(pn.node.id, et);
           }
         });
       }
@@ -7552,11 +7552,11 @@ function bE(e, t) {
         }
         const Ve = xe.find((Ut) => (Re.get(Ut.band) ?? Ut.band) === Ce);
         if (!Ve || Xe(Ve.subtree) === Ze || Ne(Ve.subtree) === Ze) continue;
-        const Je = xe.find((Ut) => Ut !== Ve && Xe(Ut.subtree) === Ze);
-        if (!Je) continue;
-        const pn = Ve.band, br = Je.band;
+        const et = xe.find((Ut) => Ut !== Ve && Xe(Ut.subtree) === Ze);
+        if (!et) continue;
+        const pn = Ve.band, br = et.band;
         for (const Ut of Ve.subtree) ue(Ut) === pn && ce.set(Ut.node.id, br);
-        for (const Ut of Je.subtree) ue(Ut) === br && ce.set(Ut.node.id, pn);
+        for (const Ut of et.subtree) ue(Ut) === br && ce.set(Ut.node.id, pn);
         ne.add(J.node.id);
       }
       for (const J of C.nodes) {
@@ -7564,8 +7564,8 @@ function bE(e, t) {
         const Ye = Oe(J);
         if (Number.isNaN(Ye) || b.some(
           (xe) => {
-            var Ve, Je;
-            return (((Ve = xe.placement) == null ? void 0 : Ve.anchor) ?? (xe.association ? xe.association.source === xe.annotation.id ? xe.association.target : xe.association.source : void 0)) === J.node.id && ((Je = xe.placement) == null ? void 0 : Je.side.startsWith("bottom"));
+            var Ve, et;
+            return (((Ve = xe.placement) == null ? void 0 : Ve.anchor) ?? (xe.association ? xe.association.source === xe.annotation.id ? xe.association.target : xe.association.source : void 0)) === J.node.id && ((et = xe.placement) == null ? void 0 : et.side.startsWith("bottom"));
           }
         )) continue;
         let Ce, pt = !1, Ze;
@@ -7573,10 +7573,10 @@ function bE(e, t) {
           if (xe.flow.source !== J.node.id) continue;
           const Ve = S.get(xe.flow.target);
           if (!Ve || !Ve.node.lane && fe(Ve) === void 0) continue;
-          const Je = Oe(Ve);
-          Number.isNaN(Je) || (Math.abs(Je - Ye) < 0.5 && (pt = !0), Je > Ye ? !Ce || Je > Ce.row ? Ce = { id: Ve.node.id, row: Je, count: 1 } : Je === Ce.row && Ce.count++ : Je < Ye && Ve.node.lane === J.node.lane && (!Ze || Je > Ze.row ? Ze = { op: Ve, row: Je, count: 1 } : Je === Ze.row && Ze.count++));
+          const et = Oe(Ve);
+          Number.isNaN(et) || (Math.abs(et - Ye) < 0.5 && (pt = !0), et > Ye ? !Ce || et > Ce.row ? Ce = { id: Ve.node.id, row: et, count: 1 } : et === Ce.row && Ce.count++ : et < Ye && Ve.node.lane === J.node.lane && (!Ze || et > Ze.row ? Ze = { op: Ve, row: et, count: 1 } : et === Ze.row && Ze.count++));
         }
-        Ce && Ce.count === 1 && (Ie.get(Ce.id) ?? 0) === 1 && !ne.has(J.node.id) && Qe.add(Ce.id), !pt && Ze && Ze.count === 1 && (Ie.get(Ze.op.node.id) ?? 0) === 1 && !ee.has(J.node.id) && Ct.set(Ze.op.node.id, { lane: J.node.lane, band: ue(J) });
+        Ce && Ce.count === 1 && (Ie.get(Ce.id) ?? 0) === 1 && !ne.has(J.node.id) && Je.add(Ce.id), !pt && Ze && Ze.count === 1 && (Ie.get(Ze.op.node.id) ?? 0) === 1 && !ee.has(J.node.id) && Ct.set(Ze.op.node.id, { lane: J.node.lane, band: ue(J) });
       }
       const Wt = /* @__PURE__ */ new Map();
       for (const J of g) Wt.set(J.flow.target, [...Wt.get(J.flow.target) ?? [], J]);
@@ -7589,12 +7589,12 @@ function bE(e, t) {
         if (!Ze) continue;
         const xe = Ze.get(0) ?? 0, Ve = (Ze.get(ue(J) ?? 0) ?? xe) - xe;
         if (Ve === 0) continue;
-        const Je = Ce.y < T.y;
-        if (Je && Ve < 0 || !Je && Ve > 0) continue;
+        const et = Ce.y < T.y;
+        if (et && Ve < 0 || !et && Ve > 0) continue;
         let pn;
         for (const [br, Ut] of Ze) {
           const Fn = Ut - xe;
-          (Je && Fn < 0 && (!pn || Fn < pn.row) || !Je && Fn > 0 && (!pn || Fn > pn.row)) && (pn = { band: br, row: Fn });
+          (et && Fn < 0 && (!pn || Fn < pn.row) || !et && Fn > 0 && (!pn || Fn > pn.row)) && (pn = { band: br, row: Fn });
         }
         pn && gn.set(J.node.id, { lane: J.node.lane, band: pn.band });
       }
@@ -7618,10 +7618,10 @@ function bE(e, t) {
                 Ye,
                 xe ? xe.lane : J.node.lane,
                 xe ? xe.band : Re,
-                Qe.has(Ne.target) ? pt.x + pt.width / 2 : Ze,
+                Je.has(Ne.target) ? pt.x + pt.width / 2 : Ze,
                 Number.NaN
-              ), Je = n.createShape(Ye, Ve, Ce);
-              Qe.has(Ne.target) && Ft.set(Ne.target, Ze - (Je.x + Je.width / 2)), n.connect(Xe, Je, { type: "bpmn:SequenceFlow", businessObject: I(Ne) });
+              ), et = n.createShape(Ye, Ve, Ce);
+              Je.has(Ne.target) && Ft.set(Ne.target, Ze - (et.x + et.width / 2)), n.connect(Xe, et, { type: "bpmn:SequenceFlow", businessObject: I(Ne) });
             } else
               s.append(Xe, Ye, {
                 connection: { type: "bpmn:SequenceFlow", businessObject: I(Ne) }
@@ -7658,7 +7658,7 @@ function bE(e, t) {
       }
     }
     return B;
-  }, et = (E, C = () => !0) => {
+  }, tt = (E, C = () => !0) => {
     const T = l(E);
     if (!T) return [];
     const B = [T], $ = /* @__PURE__ */ new Set([E]);
@@ -7682,12 +7682,12 @@ function bE(e, t) {
     if (!T || !B) continue;
     const $ = E.source !== void 0 ? l(E.source) : B.source, j = B.target;
     if (!$ || !j || j.id === T.id) continue;
-    const Z = lt(E.target), Q = new Set(Z.map((Te) => Te.id)), te = Math.min(...Z.map((Te) => Te.x)), ae = Math.max(...Z.map((Te) => Te.x + Te.width)), ze = $.x + $.width, tt = ae - te + qe * 2 - (j.x - ze);
-    if (tt > 0) {
-      const Te = f(T), ye = (Te == null ? void 0 : Te.children) ?? [], Qe = (Ft) => Ft.type === "bpmn:Lane", Ct = ye.filter(
-        (Ft) => !("waypoints" in Ft && Ft.waypoints) && !Qe(Ft) && !Q.has(Ft.id) && Ft.x >= j.x
-      ), gn = Te ? [Te, ...ye.filter((Ft) => Qe(Ft))] : [];
-      Ct.length && n.createSpace(Ct, gn, { x: tt, y: 0 }, "e", j.x - 1);
+    const Z = lt(E.target), Q = new Set(Z.map((Te) => Te.id)), te = Math.min(...Z.map((Te) => Te.x)), ae = Math.max(...Z.map((Te) => Te.x + Te.width)), ze = $.x + $.width, Qe = ae - te + qe * 2 - (j.x - ze);
+    if (Qe > 0) {
+      const Te = f(T), ye = (Te == null ? void 0 : Te.children) ?? [], Je = (Ft) => Ft.type === "bpmn:Lane", Ct = ye.filter(
+        (Ft) => !("waypoints" in Ft && Ft.waypoints) && !Je(Ft) && !Q.has(Ft.id) && Ft.x >= j.x
+      ), gn = Te ? [Te, ...ye.filter((Ft) => Je(Ft))] : [];
+      Ct.length && n.createSpace(Ct, gn, { x: Qe, y: 0 }, "e", j.x - 1);
     }
     const $e = C.node.lane || C.band !== void 0 ? T.y + T.height / 2 : $.y + $.height / 2;
     n.moveElements(Z, {
@@ -7720,8 +7720,8 @@ function bE(e, t) {
           if (!Z || !te || te.type === "bpmn:Participant") continue;
           const ae = te.x + te.width / 2;
           if (ae < T.x + 10 || ae > T.x + T.width - 10) continue;
-          const ze = T.y > te.y, tt = ze ? te.y + te.height : te.y, $e = ze ? T.y : T.y + T.height, Te = j.flow.source === C.participant.id ? [{ x: ae, y: $e }, { x: ae, y: tt }] : [{ x: ae, y: tt }, { x: ae, y: $e }], ye = Ht(o), Qe = { ...ye.edges.find((Ct) => Ct.id === j.flow.id), waypoints: Te };
-          ni(Qe, Qi(ye)).length || n.updateWaypoints(Z, Te);
+          const ze = T.y > te.y, Qe = ze ? te.y + te.height : te.y, $e = ze ? T.y : T.y + T.height, Te = j.flow.source === C.participant.id ? [{ x: ae, y: $e }, { x: ae, y: Qe }] : [{ x: ae, y: Qe }, { x: ae, y: $e }], ye = Ht(o), Je = { ...ye.edges.find((Ct) => Ct.id === j.flow.id), waypoints: Te };
+          ni(Je, Qi(ye)).length || n.updateWaypoints(Z, Te);
         }
     }
   };
@@ -7877,10 +7877,10 @@ function bE(e, t) {
     for (const Q of Z) {
       const te = (zf = S.get(Q.id)) == null ? void 0 : zf.node.participant, ae = te ? l(te) : void 0;
       if (!ae) continue;
-      const ze = [...S.values()].filter((Pt) => Pt.node.participant === te).map((Pt) => Pt.node.id), tt = (Pt) => Pt.map((En) => l(En)).filter((En) => !!En), Te = [et(Q.id, (Pt) => {
+      const ze = [...S.values()].filter((Pt) => Pt.node.participant === te).map((Pt) => Pt.node.id), Qe = (Pt) => Pt.map((En) => l(En)).filter((En) => !!En), Te = [tt(Q.id, (Pt) => {
         var En;
         return ((En = S.get(Pt.id)) == null ? void 0 : En.node.participant) === te;
-      }), tt(ze)].filter((Pt) => Pt.length), ye = Q.width + V, Qe = xn(E.flow.id), Ct = _t(E.flow.id), gn = () => xn(E.flow.id) < Qe && _t(E.flow.id) >= Ct;
+      }), Qe(ze)].filter((Pt) => Pt.length), ye = Q.width + V, Je = xn(E.flow.id), Ct = _t(E.flow.id), gn = () => xn(E.flow.id) < Je && _t(E.flow.id) >= Ct;
       let Ft = !1;
       for (const Pt of Te) {
         for (let En = 1; En <= nn; En++)
@@ -7910,8 +7910,8 @@ function bE(e, t) {
       if (Z <= V + 1) continue;
       const Q = p(B.node.participant), te = lt(T, ($e) => $e.x >= $.x), ae = rn(), ze = xi(te, Q, -(Z - V));
       if (!ze) continue;
-      const tt = rn();
-      (tt.bad > ae.bad || tt.crossings >= ae.crossings) && ze();
+      const Qe = rn();
+      (Qe.bad > ae.bad || Qe.crossings >= ae.crossings || Qe.straight < ae.straight) && ze();
     }
   }
   tn(!0);
@@ -7993,33 +7993,33 @@ function bE(e, t) {
       if (!B.selfId) return !1;
       const ge = o.get(ne);
       return !!ge && (((de = ge.source) == null ? void 0 : de.id) === B.selfId || ((Ne = ge.target) == null ? void 0 : Ne.id) === B.selfId);
-    }, ae = Q.edges.filter((ne) => !te(ne.id)).flatMap(_n), ze = Ys(Q).filter((ne) => ne.owner !== B.selfId).map((ne) => ne.rect), tt = (ne) => ({
+    }, ae = Q.edges.filter((ne) => !te(ne.id)).flatMap(_n), ze = Ys(Q).filter((ne) => ne.owner !== B.selfId).map((ne) => ne.rect), Qe = (ne) => ({
       x0: ne.x - $.width / 2 - Yt,
       x1: ne.x + $.width / 2 + Yt,
       y0: ne.y - $.height / 2 - Yt,
       y1: ne.y + $.height / 2 + Yt
     }), $e = (ne) => {
-      const ge = tt(ne);
+      const ge = Qe(ne);
       return Z.some((de) => ge.x0 < de.x + de.width && ge.x1 > de.x && ge.y0 < de.y + de.height && ge.y1 > de.y);
     }, Te = (ne) => {
-      const ge = tt(ne);
+      const ge = Qe(ne);
       return ae.some(
         (de) => de.axis === "h" ? de.at > ge.y0 && de.at < ge.y1 && de.lo < ge.x1 && de.hi > ge.x0 : de.at > ge.x0 && de.at < ge.x1 && de.lo < ge.y1 && de.hi > ge.y0
       );
     }, ye = (ne) => {
-      const ge = tt(ne);
+      const ge = Qe(ne);
       return ze.some((de) => ge.x0 < de.x + de.width && ge.x1 > de.x && ge.y0 < de.y + de.height && ge.y1 > de.y);
-    }, Qe = (ne) => $e(ne) || Te(ne) || ye(ne), Ct = (ne) => ne.x - $.width / 2 >= T.x && ne.x + $.width / 2 <= T.x + T.width && ne.y - $.height / 2 >= T.y && ne.y + $.height / 2 <= T.y + T.height;
+    }, Je = (ne) => $e(ne) || Te(ne) || ye(ne), Ct = (ne) => ne.x - $.width / 2 >= T.x && ne.x + $.width / 2 <= T.x + T.width && ne.y - $.height / 2 >= T.y && ne.y + $.height / 2 <= T.y + T.height;
     if (B.placement) {
       const ne = (J) => J.startsWith("top") ? J.replace(/^top/, "bottom") : J.replace(/^bottom/, "top"), ge = (J) => J.endsWith("left") ? J.replace(/left$/, "right") : J.replace(/right$/, "left"), de = B.placement.side, Ne = [de, ne(de), ge(de), ne(ge(de)), "top", "bottom", "left", "right", "top-left", "top-right", "bottom-left", "bottom-right"], Xe = B.placement.offset ?? 50;
       let Wt = j(de, Xe);
-      if (Qe(Wt)) {
+      if (Je(Wt)) {
         const J = /* @__PURE__ */ new Set();
         for (const Ye of Ne) {
           if (J.has(Ye)) continue;
           J.add(Ye);
           const Re = j(Ye, Xe);
-          if (Ct(Re) && !Qe(Re)) {
+          if (Ct(Re) && !Je(Re)) {
             Wt = Re;
             break;
           }
@@ -8029,13 +8029,13 @@ function bE(e, t) {
     }
     const gn = B.from, Ft = T.x + Yt + $.width / 2, Pt = T.x + T.width - Yt - $.width / 2, En = T.y + Yt + $.height / 2, Ie = T.y + T.height - Yt - $.height / 2;
     let Oe = { x: Math.min(Pt, Math.max(Ft, gn.x)), y: Math.min(Ie, Math.max(En, gn.y)) };
-    if (Qe(Oe)) {
+    if (Je(Oe)) {
       const ne = (E.width + $.width) / 2 + Yt, de = [
         { x: Oe.x + ne, y: Oe.y },
         { x: Oe.x - ne, y: Oe.y },
         { x: Oe.x, y: Oe.y - $.height - Yt },
         { x: Oe.x, y: Oe.y + $.height + Yt }
-      ].filter(Ct).find((Ne) => !Qe(Ne));
+      ].filter(Ct).find((Ne) => !Je(Ne));
       de && (Oe = de);
     }
     return Oe;
@@ -8050,10 +8050,10 @@ function bE(e, t) {
     const C = E.association, T = ((Gf = E.placement) == null ? void 0 : Gf.anchor) ?? (C ? C.source === E.annotation.id ? C.target : C.source : void 0), B = T ? l(T) : void 0, $ = B ? Nf(B) : void 0, j = Qb(E.annotation.text ?? "");
     let Z;
     if ($ && E.placement) {
-      const [ze, tt] = vu[E.placement.side], $e = E.placement.offset ?? 50;
+      const [ze, Qe] = vu[E.placement.side], $e = E.placement.offset ?? 50;
       Z = {
         x: $.x + $.width / 2 + ze * ($.width / 2 + j.width / 2 + $e),
-        y: $.y + $.height / 2 + tt * ($.height / 2 + j.height / 2 + $e)
+        y: $.y + $.height / 2 + Qe * ($.height / 2 + j.height / 2 + $e)
       };
     } else $ ? (Z = {
       x: $.x + $.width / 2 + 180 + Bo % 3 * 260,
@@ -8075,7 +8075,7 @@ function bE(e, t) {
       Q
     );
     if (C) {
-      const ze = (tt) => tt === E.annotation.id ? ae : p(tt);
+      const ze = (Qe) => Qe === E.annotation.id ? ae : p(Qe);
       n.connect(
         ze(C.source),
         ze(C.target),
@@ -11604,7 +11604,7 @@ function zr(e, t, n, i, r, o, a) {
       });
     }
     if (y === "conditional-flow-marker") {
-      var et = he("path", {
+      var tt = he("path", {
         d: "M 0 10 L 8 6 L 16 10 L 8 14 Z",
         ...l({
           fill: D,
@@ -11612,7 +11612,7 @@ function zr(e, t, n, i, r, o, a) {
         })
       });
       f(_, {
-        element: et,
+        element: tt,
         ref: { x: -1, y: 10 },
         scale: 0.5,
         parentGfx: P
@@ -11747,11 +11747,11 @@ function zr(e, t, n, i, r, o, a) {
             mx: 0.5,
             my: 0.5
           }
-        }), et = D / 2, St = I / 2;
+        }), tt = D / 2, St = I / 2;
         x(P, lt, {
           strokeWidth: 1,
           stroke: ie(_, c, y.stroke),
-          transform: "rotate(" + qe * 30 + "," + St + "," + et + ")"
+          transform: "rotate(" + qe * 30 + "," + St + "," + tt + ")"
         });
       }
       return se;
@@ -12247,7 +12247,7 @@ function zr(e, t, n, i, r, o, a) {
       stroke: ie(D, c, y.stroke),
       width: I,
       height: I
-    }, se = X(P).isInterrupting, Se = se ? 0 : 3, qe = se ? 1 : 1.2, lt = 20, et = (I - lt) / 2, St = "translate(" + et + "," + et + ")";
+    }, se = X(P).isInterrupting, Se = se ? 0 : 3, qe = se ? 1 : 1.2, lt = 20, tt = (I - lt) / 2, St = "translate(" + tt + "," + tt + ")";
     m(_, lt, lt, {
       fill: W.fill,
       stroke: W.stroke,
@@ -12609,11 +12609,11 @@ function zr(e, t, n, i, r, o, a) {
             x: qe.x,
             y: qe.y
           }
-        }), et = {
+        }), tt = {
           strokeWidth: 1
         };
-        I.get("messageVisibleKind") === "initiating" ? (et.fill = W, et.stroke = se) : (et.fill = se, et.stroke = W);
-        var St = x(P, lt, et), en = D.get("messageRef"), tn = en.get("name"), it = le(P, tn, {
+        I.get("messageVisibleKind") === "initiating" ? (tt.fill = W, tt.stroke = se) : (tt.fill = se, tt.stroke = W);
+        var St = x(P, lt, tt), en = D.get("messageRef"), tn = en.get("name"), it = le(P, tn, {
           align: "center-top",
           fitBox: !0,
           style: {
@@ -12680,7 +12680,7 @@ function zr(e, t, n, i, r, o, a) {
       } else {
         var lt = Fo(_, y);
         W || (lt.height = Hn(_, y), lt.width = Rn(_, y));
-        var et = le(P, Se, {
+        var tt = le(P, Se, {
           box: lt,
           align: "center-middle",
           style: {
@@ -12689,7 +12689,7 @@ function zr(e, t, n, i, r, o, a) {
         });
         if (!W) {
           var St = -1 * Rn(_, y);
-          ks(et, 0, -St, 270);
+          ks(tt, 0, -St, 270);
         }
       }
       return se.get("participantMultiplicity") && N("ParticipantMultiplicityMarker", P, _, y), D;