@diagrammo/dgmo 0.96.0 → 0.98.0

package/dist/{chunk-WLGOIMTI.js → chunk-FDVUD3PR.js}

@@ -11,7 +11,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-LGUFJ7Y2.js";
+} from "./chunk-KW3CC7SB.js";
 import {
   AliasRegistry,
   OPTION_NOCOLON_RE,
@@ -23,7 +23,7 @@ import {
   splitNameAndMeta,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   formatDgmoError,
   makeDgmoError,
@@ -32,7 +32,7 @@ import {
 } from "./chunk-BYU54C3S.js";
 
 // src/org/parser.ts
-var CONTAINER_RE = /^\[([^\]]+)\](?:\s+collapsed:\s*(\S+))?$/;
+var CONTAINER_RE = /^\[([^\]]+)\](?:\s+collapsed:\s*(\S+)|\s+(collapsed))?$/;
 var METADATA_RE = /^([^:]+):\s*(.+)$/;
 var KNOWN_OPTIONS = /* @__PURE__ */ new Set([
   "sub-node-label",
@@ -238,7 +238,7 @@ function parseOrg(content, palette) {
         // The same-line collapse marker (capture 2, §6.4.1). Goes into metadata
         // rather than the typed field so the one post-parse lift handles every
         // route — same-line here, indented under the header, or under a person.
-        metadata: containerMatch[2] !== void 0 ? { collapsed: containerMatch[2] } : {},
+        metadata: containerMatch[2] !== void 0 ? { collapsed: containerMatch[2] } : containerMatch[3] !== void 0 ? { collapsed: "true" } : {},
         children: [],
         parentId: null,
         isContainer: true,

package/dist/{chunk-IU7XKZA6.js → chunk-FK6HZYGK.js}

@@ -1,21 +1,20 @@
 import {
-  BODY_TERMS,
   getFigure,
   resolvePartKey
-} from "./chunk-H7AXCRO7.js";
+} from "./chunk-453IWXZ3.js";
 import {
   AUTO_TAG_COLOR_SENTINEL,
   finalizeAutoTagColors,
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey
-} from "./chunk-LGUFJ7Y2.js";
+} from "./chunk-KW3CC7SB.js";
 import {
   extractColor,
   fillModeFromToken,
   measureIndent,
   parseFirstLine
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   emit
 } from "./chunk-BYU54C3S.js";
@@ -250,17 +249,8 @@ function parseBody(content, palette) {
     diagnostics
   };
 }
-function extractSymbols(docText) {
-  const parsed = parseBody(docText);
-  const figures = (parsed.options.views.length ? parsed.options.views : ["front"]).map((v) => getFigure(parsed.options.sex, v));
-  const entities = BODY_TERMS.filter(
-    (t) => t === "left" || t === "right" || figures.some((f) => resolvePartKey(f, t))
-  );
-  return { kind: "body", entities };
-}
 
 export {
   BODY_DIAGNOSTICS,
-  parseBody,
-  extractSymbols
+  parseBody
 };

package/dist/{chunk-67RKJEKF.js → chunk-FTRW6YGU.js}

@@ -1,31 +1,37 @@
+import {
+  collapsedJourneyPhasesFromSource
+} from "./chunk-NTDWVTEY.js";
 import {
   TAG_STRIP_HEIGHT,
   layoutJourneyMap,
   scoreToColor,
   scoreToCurveY
-} from "./chunk-5H7SA5ZD.js";
+} from "./chunk-GFQFLLP3.js";
 import {
   parseJourneyMap
-} from "./chunk-GM2SLMQW.js";
+} from "./chunk-TMB4YY3J.js";
 import {
   serializeSvg
-} from "./chunk-CYRB2JTN.js";
+} from "./chunk-YLKPRT6U.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";
+import {
+  renderCollapseBar
+} from "./chunk-42AZPI2W.js";
 import {
   CARD_RADIUS,
   CONTAINER_RADIUS,
   GRID_DASH,
   NODE_STROKE_WIDTH
-} from "./chunk-XCKNFFKM.js";
+} from "./chunk-WH6E6SHC.js";
 import {
   renderIntegratedLegend
-} from "./chunk-PGD6CNWO.js";
+} from "./chunk-DFEVFLEG.js";
 import {
   NOTE_BULLET_INDENT,
   wrapNoteBody
-} from "./chunk-67N26CER.js";
+} from "./chunk-DA2GIHAY.js";
 import {
   renderInlineText
 } from "./chunk-QKPOIJBT.js";
@@ -35,15 +41,15 @@ import {
 import {
   resolveActiveTagGroup,
   tagAttrKey
-} from "./chunk-LGUFJ7Y2.js";
+} from "./chunk-KW3CC7SB.js";
 import {
   fillModeFromOptions
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   measureText,
   truncateText,
   wrapTextToWidth
-} from "./chunk-KAO7JL4I.js";
+} from "./chunk-PU5X3P3T.js";
 import {
   contrastText,
   mix,
@@ -374,6 +380,9 @@ function renderJourneyMap(container, parsed, palette, isDark, options) {
     for (const pl of layout.phases) {
       const isCollapsed = collapsedPhases.has(pl.phase.name);
       const phaseG = phasesG.append("g").attr("class", "journey-phase").attr("data-line-number", pl.phase.lineNumber);
+      if (pl.phase.steps.length > 0) {
+        phaseG.attr("data-group-toggle", pl.phase.name).attr("aria-expanded", String(!isCollapsed)).attr("role", "button").attr("aria-label", pl.phase.name);
+      }
       const colBg = isDark ? mix(palette.surface, palette.bg, 50) : mix(palette.surface, palette.bg, 30);
       phaseG.append("rect").attr("x", pl.x).attr("y", pl.y).attr("width", pl.width).attr("height", pl.height).attr("rx", CONTAINER_RADIUS).attr("fill", colBg);
       phaseG.append("rect").attr("x", pl.x).attr("y", pl.y).attr("width", pl.width).attr("height", COLUMN_HEADER_HEIGHT).attr("rx", CONTAINER_RADIUS).attr("fill", pl.headerColor);
@@ -405,6 +414,19 @@ function renderJourneyMap(container, parsed, palette, isDark, options) {
           }
         });
       }
+      if (pl.phase.steps.length > 0) {
+        renderCollapseBar(phaseG, {
+          expanded: !isCollapsed,
+          x: pl.x,
+          y: pl.y,
+          width: pl.width,
+          height: pl.height,
+          rx: CONTAINER_RADIUS,
+          fill: pl.headerColor,
+          clipId: `journey-phase-clip-${pl.phase.lineNumber}`,
+          prefix: "journey"
+        });
+      }
       if (isCollapsed) {
         const COLLAPSED_CARD_H = 26;
         const COLLAPSED_GAP = 6;
@@ -857,11 +879,13 @@ function renderJourneyMapForExport(content, theme, palette) {
     return "";
   }
   const isDark = theme === "dark";
-  const layout = layoutJourneyMap(parsed, palette, { isDark });
+  const collapsedPhases = collapsedJourneyPhasesFromSource(parsed);
+  const layout = layoutJourneyMap(parsed, palette, { isDark, collapsedPhases });
   const container = document.createElement("div");
   renderJourneyMap(container, parsed, palette, isDark, {
     exportDims: { width: layout.totalWidth, height: layout.totalHeight },
-    exportMode: true
+    exportMode: true,
+    collapsedPhases
   });
   const svgEl = container.querySelector("svg");
   if (!svgEl) return "";

package/dist/{chunk-2M3K6GD2.js → chunk-FTW2E2YH.js}

@@ -5,14 +5,14 @@ import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
   TITLE_Y
-} from "./chunk-VLC6WNRD.js";
+} from "./chunk-GULGSH2Z.js";
 import {
   ARROWHEAD_HEIGHT,
   ARROWHEAD_WIDTH
-} from "./chunk-XCKNFFKM.js";
+} from "./chunk-WH6E6SHC.js";
 import {
   renderIntegratedLegend
-} from "./chunk-PGD6CNWO.js";
+} from "./chunk-DFEVFLEG.js";
 import {
   wrapDescriptionLines
 } from "./chunk-7WEYXYLC.js";
@@ -24,14 +24,14 @@ import {
 } from "./chunk-ICLB27PZ.js";
 import {
   fillModeFromOptions
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   LEGEND_HEIGHT
-} from "./chunk-UOCWYLYT.js";
+} from "./chunk-OZXKW5NA.js";
 import {
   measureText,
   wrapTextToWidth
-} from "./chunk-KAO7JL4I.js";
+} from "./chunk-PU5X3P3T.js";
 import {
   contrastText,
   shapeFill

package/dist/{chunk-5P2L5QXE.js → chunk-FZVCS2XY.js}

@@ -1,8 +1,11 @@
+import {
+  COLLAPSE_BAR_HEIGHT
+} from "./chunk-WH6E6SHC.js";
 import {
   CHAR_WIDTH_RATIO,
   measureText,
   truncateText
-} from "./chunk-KAO7JL4I.js";
+} from "./chunk-PU5X3P3T.js";
 
 // src/infra/layout.ts
 import dagre from "@dagrejs/dagre";
@@ -12,7 +15,6 @@ var META_LINE_HEIGHT = 14;
 var NODE_SEPARATOR_GAP = 4;
 var NODE_PAD_BOTTOM = 10;
 var ROLE_DOT_ROW = 12;
-var COLLAPSE_BAR_HEIGHT = 6;
 var NODE_FONT_SIZE = 13;
 var META_FONT_SIZE = 10;
 var EDGE_LABEL_FONT_SIZE = 11;

package/dist/chunk-G24NSISJ.js

@@ -0,0 +1,69 @@
+// src/boxes-and-lines/collapse.ts
+function collapseBoxesAndLines(parsed, collapsedGroups) {
+  const originalGroups = parsed.groups;
+  if (collapsedGroups.size === 0) {
+    return { parsed, collapsedChildCounts: /* @__PURE__ */ new Map(), originalGroups };
+  }
+  const groupByLabel = /* @__PURE__ */ new Map();
+  for (const group of parsed.groups) {
+    groupByLabel.set(group.label, group);
+  }
+  const nodeToGroup = /* @__PURE__ */ new Map();
+  const collapsedChildCounts = /* @__PURE__ */ new Map();
+  function collectDescendants(groupLabel) {
+    const group = groupByLabel.get(groupLabel);
+    if (!group) return [];
+    const descendants = [];
+    for (const child of group.children) {
+      descendants.push(child);
+      if (groupByLabel.has(child)) {
+        descendants.push(...collectDescendants(child));
+      }
+    }
+    return descendants;
+  }
+  for (const groupLabel of collapsedGroups) {
+    const group = groupByLabel.get(groupLabel);
+    if (!group) continue;
+    const groupId = `__group_${groupLabel}`;
+    const allDescendants = collectDescendants(groupLabel);
+    for (const child of allDescendants) {
+      nodeToGroup.set(child, groupId);
+    }
+    collapsedChildCounts.set(groupLabel, group.children.length);
+  }
+  const nodes = parsed.nodes.filter((n) => !nodeToGroup.has(n.label));
+  const edgeKeys = /* @__PURE__ */ new Set();
+  const edges = [];
+  for (const edge of parsed.edges) {
+    const src = nodeToGroup.get(edge.source) ?? edge.source;
+    const tgt = nodeToGroup.get(edge.target) ?? edge.target;
+    if (src === tgt) continue;
+    const key = `${src}|${tgt}|${edge.label ?? ""}`;
+    if (edgeKeys.has(key)) continue;
+    edgeKeys.add(key);
+    edges.push({ ...edge, source: src, target: tgt });
+  }
+  const groups = parsed.groups.filter(
+    (g) => !collapsedGroups.has(g.label) && !nodeToGroup.has(g.label)
+  );
+  return {
+    parsed: { ...parsed, nodes, edges, groups },
+    collapsedChildCounts,
+    originalGroups
+  };
+}
+function collapsedBLGroupsFromSource(parsed) {
+  return new Set(parsed.groups.filter((g) => g.collapsed).map((g) => g.label));
+}
+function unionCollapsedBLGroups(parsed, runtime) {
+  const set = collapsedBLGroupsFromSource(parsed);
+  for (const label of runtime ?? []) set.add(label);
+  return set;
+}
+
+export {
+  collapseBoxesAndLines,
+  collapsedBLGroupsFromSource,
+  unionCollapsedBLGroups
+};

package/dist/{chunk-4B45SNZH.js → chunk-G36XKXWT.js}

@@ -1,31 +1,32 @@
 import {
-  CYLINDER_RY,
-  QUEUE_CAP,
   collectCardMetadata,
   layoutC4Components,
   layoutC4Containers,
   layoutC4Context,
   layoutC4Deployment
-} from "./chunk-ZBOIYC2G.js";
+} from "./chunk-NXOIH5JK.js";
+import {
+  CYLINDER_RY,
+  QUEUE_CAP
+} from "./chunk-VTGGPBLW.js";
 import {
   appendArrowheadMarkers,
   appendReverseArrowheadMarkers
 } from "./chunk-XBJJP2HN.js";
 import {
   serializeSvg
-} from "./chunk-CYRB2JTN.js";
+} from "./chunk-YLKPRT6U.js";
 import {
   parseC4
-} from "./chunk-BD4O4D2A.js";
+} from "./chunk-5WZYJC2P.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT
-} from "./chunk-VLC6WNRD.js";
+} from "./chunk-GULGSH2Z.js";
 import {
   ARROWHEAD_HEIGHT,
   ARROWHEAD_WIDTH,
   CARD_RADIUS,
-  COLLAPSE_BAR_HEIGHT,
   CONTAINER_RADIUS,
   EDGE_DASH,
   EDGE_LABEL_KNOCKOUT_OPACITY,
@@ -34,10 +35,10 @@ import {
   META_FONT_SIZE,
   META_LINE_HEIGHT,
   NODE_STROKE_WIDTH
-} from "./chunk-XCKNFFKM.js";
+} from "./chunk-WH6E6SHC.js";
 import {
   renderIntegratedLegend
-} from "./chunk-PGD6CNWO.js";
+} from "./chunk-DFEVFLEG.js";
 import {
   preprocessDescriptionLine
 } from "./chunk-IYULMRBE.js";
@@ -50,17 +51,17 @@ import {
 import {
   resolveGroupTagColor,
   tagAttrKey
-} from "./chunk-LGUFJ7Y2.js";
+} from "./chunk-KW3CC7SB.js";
 import {
   fillModeFromOptions
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   LEGEND_HEIGHT
-} from "./chunk-UOCWYLYT.js";
+} from "./chunk-OZXKW5NA.js";
 import {
   measureText,
   wrapTextToWidth
-} from "./chunk-KAO7JL4I.js";
+} from "./chunk-PU5X3P3T.js";
 import {
   contrastText,
   groupFill,
@@ -71,6 +72,7 @@ import {
 // src/c4/renderer.ts
 import * as d3Selection from "d3-selection";
 import * as d3Shape from "d3-shape";
+var C4_DRILL_BAR_HEIGHT = 6;
 var DIAGRAM_PADDING = 20;
 var MAX_SCALE = 3;
 var TITLE_HEIGHT = 30;
@@ -300,7 +302,7 @@ function renderC4Context(container, parsed, layout, palette, isDark, onClickItem
     if (node.drillable) {
       const clipId = `clip-drill-${node.id.replace(/\s+/g, "-")}`;
       nodeG.append("clipPath").attr("id", clipId).append("rect").attr("x", -w / 2).attr("y", -h / 2).attr("width", w).attr("height", h).attr("rx", CARD_RADIUS);
-      nodeG.append("rect").attr("x", -w / 2).attr("y", h / 2 - COLLAPSE_BAR_HEIGHT).attr("width", w).attr("height", COLLAPSE_BAR_HEIGHT).attr("fill", fillMode === "solid" ? onFillText : stroke).attr("clip-path", `url(#${clipId})`).attr("class", "c4-drill-bar");
+      nodeG.append("rect").attr("x", -w / 2).attr("y", h / 2 - C4_DRILL_BAR_HEIGHT).attr("width", w).attr("height", C4_DRILL_BAR_HEIGHT).attr("fill", fillMode === "solid" ? onFillText : stroke).attr("clip-path", `url(#${clipId})`).attr("class", "c4-drill-bar");
     }
   }
   if (hasLegend) {
@@ -985,7 +987,7 @@ function renderC4Containers(container, parsed, layout, palette, isDark, onClickI
     if (node.drillable) {
       const clipId = `clip-drill-${node.id.replace(/\s+/g, "-")}`;
       nodeG.append("clipPath").attr("id", clipId).append("rect").attr("x", -w / 2).attr("y", -h / 2).attr("width", w).attr("height", h).attr("rx", CARD_RADIUS);
-      nodeG.append("rect").attr("x", -w / 2).attr("y", h / 2 - COLLAPSE_BAR_HEIGHT).attr("width", w).attr("height", COLLAPSE_BAR_HEIGHT).attr("fill", fillMode === "solid" ? onFillText : stroke).attr("clip-path", `url(#${clipId})`).attr("class", "c4-drill-bar");
+      nodeG.append("rect").attr("x", -w / 2).attr("y", h / 2 - C4_DRILL_BAR_HEIGHT).attr("width", w).attr("height", C4_DRILL_BAR_HEIGHT).attr("fill", fillMode === "solid" ? onFillText : stroke).attr("clip-path", `url(#${clipId})`).attr("class", "c4-drill-bar");
     }
   }
   if (hasLegend) {

package/dist/{chunk-5H7SA5ZD.js → chunk-GFQFLLP3.js}

@@ -1,10 +1,10 @@
 import {
   fillModeFromOptions
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   measureText,
   wrapTextToWidth
-} from "./chunk-KAO7JL4I.js";
+} from "./chunk-PU5X3P3T.js";
 import {
   mix,
   shapeFill

package/dist/{chunk-MAYTYF5S.js → chunk-GMJBBFKC.js}

@@ -4,7 +4,7 @@ import {
 import {
   resolveNotes,
   tryCollectNote
-} from "./chunk-HH3DHNQA.js";
+} from "./chunk-UWWQECLC.js";
 import {
   displayName,
   normalizeName
@@ -18,7 +18,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-LGUFJ7Y2.js";
+} from "./chunk-KW3CC7SB.js";
 import {
   AliasRegistry,
   ER_REGISTRY,
@@ -32,7 +32,7 @@ import {
   tryParseSharedOption,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   resolveColorWithDiagnostic
 } from "./chunk-3J7O3CU6.js";

package/dist/{chunk-5BG4OSWJ.js → chunk-GNQYARON.js}

@@ -1,21 +1,21 @@
 import {
   layoutClassDiagram
-} from "./chunk-VJ7NLYFE.js";
+} from "./chunk-DYI73PFY.js";
 import {
   extractExportSvg,
   runInExportContainer
-} from "./chunk-TOHTKLKE.js";
+} from "./chunk-Q5Q5JLRT.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";
 import {
   layoutInlineHeader
-} from "./chunk-R5L5E3TC.js";
+} from "./chunk-REKLKGR6.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
   TITLE_Y
-} from "./chunk-VLC6WNRD.js";
+} from "./chunk-GULGSH2Z.js";
 import {
   ARROWHEAD_HEIGHT,
   ARROWHEAD_WIDTH,
@@ -23,23 +23,19 @@ import {
   EDGE_LABEL_KNOCKOUT_OPACITY,
   EDGE_STROKE_WIDTH,
   NODE_STROKE_WIDTH
-} from "./chunk-XCKNFFKM.js";
+} from "./chunk-WH6E6SHC.js";
 import {
   renderIntegratedLegend
-} from "./chunk-PGD6CNWO.js";
+} from "./chunk-DFEVFLEG.js";
 import {
   getLegendExtent
-} from "./chunk-JILEYZ2V.js";
+} from "./chunk-VVL2KKG4.js";
 import {
   parseClassDiagram
-} from "./chunk-M4ZUIW3J.js";
+} from "./chunk-Z6V73LD6.js";
 import {
-  NOTE_BADGE_RADIUS,
-  noteConnectorPoints,
-  renderNoteBadge,
-  renderNoteBox,
-  renderNoteConnector
-} from "./chunk-67N26CER.js";
+  renderNodeNote
+} from "./chunk-DA2GIHAY.js";
 import {
   FONT_FAMILY
 } from "./chunk-ICLB27PZ.js";
@@ -47,13 +43,13 @@ import {
   fillModeFromOptions,
   legendInlineRequested,
   legendSuppressed
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   LEGEND_HEIGHT
-} from "./chunk-UOCWYLYT.js";
+} from "./chunk-OZXKW5NA.js";
 import {
   measureText
-} from "./chunk-KAO7JL4I.js";
+} from "./chunk-PU5X3P3T.js";
 import {
   contrastText,
   shapeFill
@@ -374,46 +370,13 @@ function renderClassDiagram(container, parsed, layout, palette, isDark, onClickI
       }
     }
     if (node.note) {
-      if (node.note.collapsed) {
-        renderNoteBadge(
-          nodeG,
-          {
-            x: w / 2 - NOTE_BADGE_RADIUS - 3,
-            y: -h / 2 + NOTE_BADGE_RADIUS + 3
-          },
-          palette,
-          {
-            isDark,
-            ...node.note.color && { color: node.note.color },
-            lineNumber: node.note.lineNumber,
-            endLineNumber: node.note.endLineNumber
-          }
-        );
-      } else {
-        const [cx1, cy1, cx2, cy2] = noteConnectorPoints(
-          { width: w, height: h },
-          node.note
-        );
-        renderNoteConnector(nodeG, cx1, cy1, cx2, cy2, palette);
-        renderNoteBox(
-          nodeG,
-          {
-            x: node.note.x,
-            y: node.note.y,
-            width: node.note.width,
-            height: node.note.height
-          },
-          node.note.lines,
-          palette,
-          {
-            isDark,
-            ...node.note.color && { color: node.note.color },
-            lineNumber: node.note.lineNumber,
-            endLineNumber: node.note.endLineNumber,
-            interactive: true
-          }
-        );
-      }
+      renderNodeNote(
+        nodeG,
+        { width: w, height: h },
+        node.note,
+        palette,
+        isDark
+      );
     }
   }
 }