@diagrammo/dgmo 0.93.0 → 0.95.0

package/dist/{charts-d3-ERYYVGP6.js → charts-d3-SZV2SFTM.js}

@@ -2,7 +2,7 @@ import {
   D3_DATA_CHART_TYPES,
   renderDataChartD3,
   supportsD3DataChart
-} from "./chunk-KCHQVED5.js";
+} from "./chunk-YQMIKX54.js";
 import "./chunk-H6BT45SN.js";
 import "./chunk-KMU65FYM.js";
 import "./chunk-EPDBWATV.js";
@@ -10,7 +10,7 @@ import "./chunk-6XLMTAEX.js";
 import "./chunk-2CW5ZTNH.js";
 import "./chunk-TOHTKLKE.js";
 import "./chunk-CYRB2JTN.js";
-import "./chunk-42UJ23H3.js";
+import "./chunk-UIEKW4SG.js";
 import "./chunk-VLC6WNRD.js";
 import "./chunk-JILEYZ2V.js";
 import "./chunk-GXCDD6NG.js";

package/dist/{chunk-J6AEKIRQ.js → chunk-2I4UQG7W.js}

@@ -1,6 +1,6 @@
 import {
   buildMapProjection
-} from "./chunk-4RY5D5RE.js";
+} from "./chunk-AM42TLSZ.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_Y

package/dist/{chunk-LDDDKWL6.js → chunk-2J2CWWWK.js}

@@ -4,7 +4,7 @@ import {
   countSplineCrossings,
   deroutePierces,
   searchBudget
-} from "./chunk-ADVGV3P7.js";
+} from "./chunk-VB4VMB2I.js";
 
 // src/utils/placement-search.ts
 var SEARCH_RANKERS = ["tight-tree", "longest-path"];

package/dist/{chunk-QDRCWVV3.js → chunk-4EX4OKGZ.js}

@@ -11,6 +11,9 @@ import {
 import {
   appendArrowheadMarkers
 } from "./chunk-XBJJP2HN.js";
+import {
+  placeEdgeLabels
+} from "./chunk-IN7XI6NO.js";
 import {
   parseInfra
 } from "./chunk-UXNA2H2V.js";
@@ -19,7 +22,7 @@ import {
 } from "./chunk-24YPR5EH.js";
 import {
   layoutInlineHeader
-} from "./chunk-42UJ23H3.js";
+} from "./chunk-UIEKW4SG.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -48,7 +51,7 @@ import {
 } from "./chunk-IYULMRBE.js";
 import {
   renderInlineText
-} from "./chunk-65GPEV5V.js";
+} from "./chunk-QKPOIJBT.js";
 import {
   FONT_FAMILY
 } from "./chunk-ICLB27PZ.js";
@@ -968,17 +971,66 @@ function renderEdgePaths(svg, edges, nodes, groups, palette, _isDark, animate, d
     }
   }
 }
+function placeInfraEdgeLabels(routes, edges, nodes, groups, fontSize) {
+  const adapted = {
+    nodes: nodes.map((n) => ({
+      label: n.id,
+      x: n.x,
+      y: n.y,
+      width: n.width,
+      height: n.height
+    })),
+    groups: groups.map((g) => ({
+      label: g.id,
+      lineNumber: g.lineNumber,
+      x: g.x + g.width / 2,
+      y: g.y + g.height / 2,
+      width: g.width,
+      height: g.height,
+      collapsed: false
+    })),
+    width: 0,
+    height: 0,
+    edges: edges.map((e, idx) => ({
+      source: e.sourceId,
+      target: e.targetId,
+      ...e.label && { label: e.label },
+      bidirectional: false,
+      lineNumber: e.lineNumber,
+      points: routes[idx] ?? [],
+      yOffset: 0,
+      parallelCount: 1,
+      metadata: {}
+    }))
+  };
+  const blGroups = groups.map((g) => ({
+    label: g.id,
+    children: nodes.filter((n) => n.groupId === g.id).map((n) => n.id),
+    lineNumber: g.lineNumber,
+    metadata: {}
+  }));
+  const placed = placeEdgeLabels(adapted, {
+    fontSize,
+    maxWidth: Number.POSITIVE_INFINITY,
+    groups: blGroups
+  });
+  const out = /* @__PURE__ */ new Map();
+  placed.layout.edges.forEach((e, idx) => {
+    if (e.labelX !== void 0 && e.labelY !== void 0)
+      out.set(idx, { x: e.labelX, y: e.labelY });
+  });
+  return out;
+}
 function renderEdgeLabels(svg, edges, nodes, groups, palette, _isDark, animate, direction, sc = buildScaledConstants(ScaleContext.identity())) {
   const nodeMap = nodeMapWithGroups(nodes, groups);
   const { srcPts, tgtPts } = computePortPts(edges, nodeMap, direction);
-  for (const edge of edges) {
-    if (edge.points.length === 0) continue;
-    if (!edge.label) continue;
+  const routes = edges.map((edge) => {
+    if (edge.points.length === 0) return [];
     const sourceNode = nodeMap.get(edge.sourceId);
     const targetNode = nodeMap.get(edge.targetId);
-    if (!sourceNode || !targetNode) continue;
+    if (!sourceNode || !targetNode) return [];
     const key = `${edge.sourceId}:${edge.targetId}`;
-    const wps = edgeWaypoints(
+    return edgeWaypoints(
       sourceNode,
       targetNode,
       groups,
@@ -988,7 +1040,18 @@ function renderEdgeLabels(svg, edges, nodes, groups, palette, _isDark, animate,
       srcPts.get(key),
       tgtPts.get(key)
     );
-    const midPt = wps[Math.floor(wps.length / 2)];
+  });
+  const labelPts = placeInfraEdgeLabels(
+    routes,
+    edges,
+    nodes,
+    groups,
+    EDGE_LABEL_FONT_SIZE
+  );
+  for (const [idx, edge] of edges.entries()) {
+    if (!edge.label) continue;
+    const wps = routes[idx];
+    const midPt = labelPts.get(idx);
     if (!midPt) continue;
     const labelText = edge.label;
     const g = svg.append("g").attr("class", animate ? "infra-edge-label" : "");

package/dist/{chunk-A5WIAMCT.js → chunk-4UVCTLRH.js}

@@ -4,7 +4,7 @@ import {
 import {
   resolveNotes,
   tryCollectNote
-} from "./chunk-NJJCTEBM.js";
+} from "./chunk-KLBTJEIK.js";
 import {
   normalizeName
 } from "./chunk-NOTA6TEI.js";

package/dist/{chunk-KCMGIYPO.js → chunk-5XBYLYYI.js}

@@ -4,7 +4,7 @@ import {
 import {
   resolveNotes,
   tryCollectNote
-} from "./chunk-NJJCTEBM.js";
+} from "./chunk-KLBTJEIK.js";
 import {
   displayName,
   normalizeName

package/dist/{chunk-XUTR7GNT.js → chunk-62GLKE6Q.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-24YPR5EH.js";
 import {
   layoutInlineHeader
-} from "./chunk-42UJ23H3.js";
+} from "./chunk-UIEKW4SG.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -30,10 +30,10 @@ import {
 } from "./chunk-VSAKEMDD.js";
 import {
   wrapDescriptionLines
-} from "./chunk-MB2SQF7N.js";
+} from "./chunk-7WEYXYLC.js";
 import {
   renderInlineText
-} from "./chunk-65GPEV5V.js";
+} from "./chunk-QKPOIJBT.js";
 import {
   FONT_FAMILY
 } from "./chunk-ICLB27PZ.js";
@@ -64,7 +64,17 @@ import {
 import * as d3Selection from "d3-selection";
 
 // src/sequence/collapse.ts
-function applyCollapseProjection(parsed, collapsedGroups) {
+function isCollapsibleGroup(group) {
+  return group.participantIds.length > 1;
+}
+function collapsedGroupId(group, groups) {
+  const shared = groups.some((g) => g !== group && g.name === group.name);
+  return shared ? `${group.name}@${group.lineNumber}` : group.name;
+}
+function applyCollapseProjection(parsed, requestedGroups) {
+  const collapsedGroups = new Set(
+    parsed.groups.filter((g) => requestedGroups.has(g.lineNumber) && isCollapsibleGroup(g)).map((g) => g.lineNumber)
+  );
   if (collapsedGroups.size === 0) {
     return {
       participants: parsed.participants,
@@ -88,37 +98,37 @@ function applyCollapseProjection(parsed, collapsedGroups) {
     return false;
   };
   const memberToGroup = /* @__PURE__ */ new Map();
-  const collapsedGroupNames = /* @__PURE__ */ new Set();
+  const virtualIds = /* @__PURE__ */ new Set();
+  const groupById = /* @__PURE__ */ new Map();
   const byDepth = [...parsed.groups].sort((a, b) => a.depth - b.depth);
   for (const group of byDepth) {
     if (!collapsedGroups.has(group.lineNumber)) continue;
     if (insideCollapsed(group)) continue;
-    collapsedGroupNames.add(group.name);
+    const id = collapsedGroupId(group, parsed.groups);
+    virtualIds.add(id);
+    groupById.set(id, group);
     for (const memberId of group.participantIds) {
       if (!memberToGroup.has(memberId)) {
-        memberToGroup.set(memberId, group.name);
+        memberToGroup.set(memberId, id);
       }
     }
   }
   const participants = [];
   const insertedGroups = /* @__PURE__ */ new Set();
   for (const p of parsed.participants) {
-    const groupName = memberToGroup.get(p.id);
-    if (groupName) {
-      if (!insertedGroups.has(groupName)) {
-        insertedGroups.add(groupName);
-        const group = parsed.groups.find(
-          (g) => g.name === groupName && collapsedGroups.has(g.lineNumber)
-        );
+    const groupId = memberToGroup.get(p.id);
+    if (groupId) {
+      if (!insertedGroups.has(groupId)) {
+        insertedGroups.add(groupId);
+        const group = groupById.get(groupId);
         participants.push({
-          id: groupName,
-          // already ParticipantId from memberToGroup value type
-          label: groupName,
+          id: groupId,
+          label: group.name,
           type: "default",
           lineNumber: group.lineNumber
         });
       }
-    } else if (collapsedGroupNames.has(p.id)) {
+    } else if (virtualIds.has(p.id)) {
     } else {
       participants.push(p);
     }
@@ -617,6 +627,22 @@ function applyPositionOverrides(participants) {
   }
   return result;
 }
+function foldCollapsedParticipants(parsed, view) {
+  const expanded = applyPositionOverrides(
+    applyGroupOrdering(parsed.participants, parsed.groups, parsed.messages)
+  );
+  const byId = new Map(view.participants.map((p) => [p.id, p]));
+  const result = [];
+  const placed = /* @__PURE__ */ new Set();
+  for (const p of expanded) {
+    const id = view.collapsedGroupIds.get(p.id) ?? p.id;
+    const target = byId.get(id);
+    if (!target || placed.has(id)) continue;
+    placed.add(id);
+    result.push(target);
+  }
+  return result;
+}
 function applyGroupOrdering(participants, groups, messages = []) {
   const idToGroup = /* @__PURE__ */ new Map();
   for (const group of groups) {
@@ -720,9 +746,17 @@ function layoutSequence(parsed, containerWidth, options) {
 }
 function layoutSequencePass(parsed, containerWidth, options, fit) {
   const { title, options: parsedOptions } = parsed;
-  const effectiveCollapsedGroups = options?.collapsedGroups ? new Set(options.collapsedGroups) : new Set(
+  const requestedCollapsedGroups = options?.collapsedGroups ? new Set(options.collapsedGroups) : new Set(
     parsed.groups.filter((g) => g.collapsed).map((g) => g.lineNumber)
   );
+  const collapsibleGroupLines = new Set(
+    parsed.groups.filter(isCollapsibleGroup).map((g) => g.lineNumber)
+  );
+  const effectiveCollapsedGroups = new Set(
+    parsed.groups.map((g) => g.lineNumber).filter(
+      (line) => requestedCollapsedGroups.has(line) && collapsibleGroupLines.has(line)
+    )
+  );
   const collapsed = effectiveCollapsedGroups.size > 0 ? applyCollapseProjection(parsed, effectiveCollapsedGroups) : null;
   const messages = collapsed ? collapsed.messages : parsed.messages;
   const elements = collapsed ? collapsed.elements : parsed.elements;
@@ -742,9 +776,8 @@ function layoutSequencePass(parsed, containerWidth, options, fit) {
     if (number === void 0) return step.label;
     return step.label ? `${number}. ${step.label}` : String(number);
   };
-  const sourceParticipants = collapsed ? collapsed.participants : parsed.participants;
-  const participants = applyPositionOverrides(
-    applyGroupOrdering(sourceParticipants, groups, messages)
+  const participants = collapsed ? foldCollapsedParticipants(parsed, collapsed) : applyPositionOverrides(
+    applyGroupOrdering(parsed.participants, parsed.groups, parsed.messages)
   );
   if (participants.length === 0) return null;
   const groupBoundaryIds = /* @__PURE__ */ new Set();
@@ -1496,7 +1529,8 @@ function layoutSequencePass(parsed, containerWidth, options, fit) {
     const padBottom = hasExpandedGroup ? groupBottomPad(group.depth, maxGroupDepth) : 0;
     const height = sBoxH + padTop + padBottom;
     const barHeight = ctx.structural(COLLAPSE_BAR_HEIGHT);
-    collapsedGroupBoxes.set(group.name, {
+    collapsedGroupBoxes.set(collapsedGroupId(group, parsed.groups), {
+      name: group.name,
       lineNumber: group.lineNumber,
       depth: group.depth,
       participantIds: group.participantIds,
@@ -2040,7 +2074,14 @@ function renderSequenceDiagram(container, parsed, palette, isDark, _onNavigateTo
     const groupTagColor = getTagColor(groupTagValue);
     const fillColor = groupTagColor ? mix(groupTagColor, themeBaseBg(palette, isDark), isDark ? 15 : 20) : isDark ? palette.surface : palette.bg;
     const strokeColor = groupTagColor ?? palette.textMuted;
-    const groupG = svg.append("g").attr("class", "group-box-wrapper").attr("data-group-toggle", "").attr("data-group-line", String(group.lineNumber)).attr("tabindex", "0").attr("role", "button").attr("aria-expanded", "true").attr("aria-label", groupToggleName(group.name, group.participantIds)).attr("cursor", "pointer");
+    const source = parsed.groups.find((g) => g.lineNumber === group.lineNumber);
+    const collapsible = source !== void 0 && isCollapsibleGroup(source);
+    const groupG = svg.append("g").attr("class", "group-box-wrapper");
+    if (collapsible) groupG.attr("data-group-toggle", "");
+    groupG.attr("data-group-line", String(group.lineNumber));
+    if (collapsible) {
+      groupG.attr("data-line-number", String(group.lineNumber)).attr("role", "button").attr("aria-expanded", "true").attr("aria-label", groupToggleName(group.name, group.participantIds)).attr("cursor", "pointer");
+    }
     groupG.append("rect").attr("x", frame.x).attr("y", frame.y).attr("width", frame.width).attr("height", frame.height).attr("rx", 6).attr("fill", fillColor).attr("stroke", strokeColor).attr("stroke-width", 1).attr("stroke-opacity", 0.5).attr("pointer-events", "none").attr("class", "group-box");
     groupG.append("rect").attr("x", frame.x).attr("y", frame.y).attr("width", frame.width).attr("height", frame.headerHeight).attr("fill", "transparent").attr("class", "group-label-hit");
     groupG.append("text").attr("x", frame.labelX).attr("y", frame.labelY).attr("text-anchor", "middle").attr("fill", strokeColor).attr("font-size", sGroupLabelSize).attr("font-weight", GROUP_LABEL_WEIGHT).attr("opacity", 0.7).attr("pointer-events", "none").attr("class", "group-label").text(group.name);
@@ -2077,10 +2118,7 @@ function renderSequenceDiagram(container, parsed, palette, isDark, _onNavigateTo
       const participantG = svg.select(
         `.participant[data-participant-id="${participant.id}"]`
       );
-      participantG.attr("data-group-toggle", "").attr("data-group-line", String(meta.lineNumber)).attr("tabindex", "0").attr("role", "button").attr("aria-expanded", "false").attr(
-        "aria-label",
-        groupToggleName(participant.id, meta.participantIds)
-      ).attr("cursor", "pointer");
+      participantG.attr("data-group-toggle", "").attr("data-group-line", String(meta.lineNumber)).attr("data-line-number", String(meta.lineNumber)).attr("role", "button").attr("aria-expanded", "false").attr("aria-label", groupToggleName(meta.name, meta.participantIds)).attr("cursor", "pointer");
       const pFill = effectiveTagColor ? mix(effectiveTagColor, themeBaseBg(palette, isDark), isDark ? 30 : 40) : isDark ? mix(palette.overlay, palette.surface, 50) : mix(palette.bg, palette.surface, 50);
       const pStroke = effectiveTagColor ?? palette.border;
       participantG.append("rect").attr("x", -boxW / 2).attr("y", -padTop).attr("width", boxW).attr("height", fullH).attr("rx", 6).attr("fill", pFill).attr("stroke", pStroke).attr("stroke-width", 1.5);
@@ -2146,7 +2184,7 @@ function renderSequenceDiagram(container, parsed, palette, isDark, _onNavigateTo
     const secY = band.y;
     const isCollapsed = band.collapsed;
     const lineColor = palette.textMuted;
-    const sectionG = svg.append("g").attr("data-section-toggle", "").attr("data-line-number", String(sec.lineNumber)).attr("data-section", "").attr("tabindex", "0").attr("role", "button").attr("aria-expanded", String(!isCollapsed));
+    const sectionG = svg.append("g").attr("data-section-toggle", "").attr("data-line-number", String(sec.lineNumber)).attr("data-section", "").attr("role", "button").attr("aria-expanded", String(!isCollapsed));
     const BAND_HEIGHT = band.height;
     const bandFill = isCollapsed ? legendChromeColors(palette, isDark).groupBg : lineColor;
     const bandOpacity = isCollapsed ? 1 : isDark ? 0.1 : 0.08;
@@ -2424,6 +2462,7 @@ export {
   buildRenderSequence,
   computeActivations,
   applyPositionOverrides,
+  foldCollapsedParticipants,
   applyGroupOrdering,
   layoutSequence,
   renderSequenceDiagram,

package/dist/{chunk-D6PVMUCX.js → chunk-67N26CER.js}

@@ -1,9 +1,9 @@
 import {
   wrapDescriptionLines
-} from "./chunk-MB2SQF7N.js";
+} from "./chunk-7WEYXYLC.js";
 import {
   renderInlineText
-} from "./chunk-65GPEV5V.js";
+} from "./chunk-QKPOIJBT.js";
 import {
   measureText
 } from "./chunk-KAO7JL4I.js";
@@ -98,7 +98,7 @@ function renderNoteBox(parent, rect, lines, palette, opts) {
     noteG.attr("data-line-end", String(opts.endLineNumber));
   }
   if (interactive) {
-    noteG.style("cursor", "pointer").attr("role", "button").attr("tabindex", "0").attr("aria-expanded", "true").attr("aria-label", "Collapse note");
+    noteG.style("cursor", "pointer").attr("role", "button").attr("aria-expanded", "true").attr("aria-label", "Collapse note");
   }
   const boxPath = noteG.append("path").attr(
     "d",
@@ -136,7 +136,7 @@ var NOTE_BADGE_OPACITY = 0.6;
 function renderNoteBadge(parent, center, palette, opts) {
   const fill = noteBoxFill(palette, opts.isDark, opts.color);
   const accent = noteAccent(palette, opts.color);
-  const g = parent.append("g").attr("class", "note note-badge").attr("data-note-toggle", "").attr("transform", `translate(${center.x}, ${center.y})`).attr("opacity", NOTE_BADGE_OPACITY).style("cursor", "pointer").attr("role", "button").attr("tabindex", "0").attr("aria-expanded", "false").attr("aria-label", "Expand note");
+  const g = parent.append("g").attr("class", "note note-badge").attr("data-note-toggle", "").attr("transform", `translate(${center.x}, ${center.y})`).attr("opacity", NOTE_BADGE_OPACITY).style("cursor", "pointer").attr("role", "button").attr("aria-expanded", "false").attr("aria-label", "Expand note");
   if (opts.lineNumber !== void 0) {
     g.attr("data-line-number", String(opts.lineNumber));
   }