@diagrammo/dgmo 0.53.0 → 0.55.0

package/dist/{chunk-65V6IRFN.js → chunk-2ZJXKJSI.js}

@@ -7,12 +7,16 @@ import {
 import {
   ScaleContext
 } from "./chunk-YYVTBZZC.js";
+import {
+  layoutInlineHeader
+} from "./chunk-US3P2DQO.js";
 import {
   renderIntegratedLegend
-} from "./chunk-W5KMNC5U.js";
+} from "./chunk-ASPS5O6F.js";
 import {
+  getLegendExtent,
   getMaxLegendReservedHeight
-} from "./chunk-774C2FF3.js";
+} from "./chunk-GRXPFBYC.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -21,29 +25,30 @@ import {
 import {
   FONT_FAMILY
 } from "./chunk-6KFWC4CO.js";
+import {
+  measureText,
+  truncateText
+} from "./chunk-4ASYQ347.js";
 import {
   contrastText,
   mix,
   shapeFill,
   themeBaseBg
 } from "./chunk-JYDMBWRP.js";
-import {
-  measureText,
-  truncateText
-} from "./chunk-4ASYQ347.js";
 import {
   isSequenceBlock,
   isSequenceNote,
   isSequenceSection
-} from "./chunk-22OQWBWD.js";
+} from "./chunk-VMWSZCAK.js";
 import {
   resolveActiveTagGroup,
   tagAttrKey
-} from "./chunk-CMVZWP32.js";
+} from "./chunk-JR7Q6GHE.js";
 import {
   fillModeFromOptions,
+  legendInlineRequested,
   legendSuppressed
-} from "./chunk-YJVA3QUU.js";
+} from "./chunk-A2ARDILY.js";
 
 // src/sequence/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -537,7 +542,6 @@ function applyPositionOverrides(participants) {
   return result;
 }
 function applyGroupOrdering(participants, groups, messages = []) {
-  if (groups.length === 0) return [...participants];
   const idToGroup = /* @__PURE__ */ new Map();
   for (const group of groups) {
     for (const id of group.participantIds) {
@@ -1005,8 +1009,33 @@ function renderSequenceDiagram(container, parsed, palette, isDark, _onNavigateTo
   };
   const noLegend = legendSuppressed(parsedOptions);
   const legendTopSpace = parsed.tagGroups.length > 0 && !noLegend ? getMaxLegendReservedHeight(legendConfig, containerWidth) + LEGEND_FIXED_GAP : 0;
+  const inlineRequested = legendInlineRequested(parsedOptions);
+  const hasLegendForHeader = parsed.tagGroups.length > 0 && !noLegend;
+  const legendExtent = inlineRequested && hasLegendForHeader ? getLegendExtent(
+    {
+      ...legendConfig,
+      position: {
+        placement: "top-center",
+        titleRelation: "inline-with-title"
+      }
+    },
+    { activeGroup: activeTagGroup ?? null },
+    containerWidth
+  ) : { width: 0, height: 0 };
+  const header = layoutInlineHeader({
+    requested: inlineRequested,
+    title: title ?? "",
+    hasLegend: hasLegendForHeader,
+    legendWidth: legendExtent.width,
+    legendHeight: legendExtent.height,
+    containerWidth,
+    titleBandHeight: titleOffset,
+    legendReserve: legendTopSpace,
+    titleBaselineY: ctx.structural(TITLE_Y),
+    titleFontSize: ctx.text(TITLE_FONT_SIZE)
+  });
   const groupOffset = parsed.groups.length > 0 ? GROUP_PADDING_TOP + GROUP_LABEL_SIZE : 0;
-  const participantStartY = sTopMargin + titleOffset + legendTopSpace + sParticipantYOffset + groupOffset;
+  const participantStartY = sTopMargin + titleOffset + (header.inline ? 0 : legendTopSpace) + sParticipantYOffset + groupOffset;
   const lifelineStartY0 = participantStartY + sBoxH;
   const hasActors = participants.some((p) => p.type === "actor");
   const messageStartOffset = sMsgStartOffset + (hasActors ? 20 : 0) + (parsed.groups.length > 0 ? GROUP_PADDING_BOTTOM : 0);
@@ -1171,56 +1200,63 @@ function renderSequenceDiagram(container, parsed, palette, isDark, _onNavigateTo
     });
   };
   buildParticipantX();
-  let contentLeft = 0;
-  let contentRight = svgWidth;
-  for (const step of renderSteps) {
-    if (!step.label) continue;
-    const labelW = measureText(step.label, 12);
-    if (step.from === step.to) {
-      const px = participantX.get(step.from);
-      if (px !== void 0) {
-        const loopRight = px + sActivationWidth / 2 + sSelfCallWidth + 5 + labelW;
-        contentRight = Math.max(contentRight, loopRight);
-      }
-    } else {
-      const fromX = participantX.get(step.from);
-      const toX = participantX.get(step.to);
-      if (fromX !== void 0 && toX !== void 0) {
-        const midX = (fromX + toX) / 2;
-        contentLeft = Math.min(contentLeft, midX - labelW / 2);
-        contentRight = Math.max(contentRight, midX + labelW / 2);
+  const labelSafety = sActivationWidth / 2 + 2;
+  const scanNotes = (els, acc) => {
+    for (const el of els) {
+      if (isSequenceNote(el)) {
+        const note = el;
+        const pos = effectiveNotePosition(note);
+        if (pos === "right") {
+          const px = participantX.get(note.participantId);
+          if (px !== void 0) {
+            const sc = isNoteAfterSelfCall(note);
+            const rOff = sc ? sActivationWidth / 2 + sSelfCallWidth + sNoteGap : sActivationWidth + sNoteGap;
+            const maxW = noteEffectiveMaxW(note.participantId, pos, sc);
+            acc.right = Math.max(acc.right, px + rOff + maxW);
+          }
+        }
+      } else if (isSequenceBlock(el)) {
+        scanNotes(el.children, acc);
+        scanNotes(el.elseChildren, acc);
+        if (el.elseIfBranches) {
+          for (const b of el.elseIfBranches) scanNotes(b.children, acc);
+        }
       }
     }
-  }
-  if (elements) {
-    const scanNotes = (els) => {
-      for (const el of els) {
-        if (isSequenceNote(el)) {
-          const note = el;
-          const pos = effectiveNotePosition(note);
-          if (pos === "right") {
-            const px = participantX.get(note.participantId);
-            if (px !== void 0) {
-              const sc = isNoteAfterSelfCall(note);
-              const rOff = sc ? sActivationWidth / 2 + sSelfCallWidth + sNoteGap : sActivationWidth + sNoteGap;
-              const maxW = noteEffectiveMaxW(note.participantId, pos, sc);
-              contentRight = Math.max(contentRight, px + rOff + maxW);
-            }
-          }
-        } else if (isSequenceBlock(el)) {
-          scanNotes(el.children);
-          scanNotes(el.elseChildren);
-          if (el.elseIfBranches) {
-            for (const b of el.elseIfBranches) scanNotes(b.children);
-          }
+  };
+  for (let pass = 0; pass < 4; pass++) {
+    let contentLeft = 0;
+    let contentRight = svgWidth;
+    for (const step of renderSteps) {
+      if (!step.label) continue;
+      const labelW = measureText(step.label, 12);
+      if (step.from === step.to) {
+        const px = participantX.get(step.from);
+        if (px !== void 0) {
+          const loopRight = px + sActivationWidth / 2 + sSelfCallWidth + 5 + labelW + labelSafety;
+          contentRight = Math.max(contentRight, loopRight);
+        }
+      } else {
+        const fromX = participantX.get(step.from);
+        const toX = participantX.get(step.to);
+        if (fromX !== void 0 && toX !== void 0) {
+          const midX = (fromX + toX) / 2;
+          contentLeft = Math.min(contentLeft, midX - labelW / 2 - labelSafety);
+          contentRight = Math.max(
+            contentRight,
+            midX + labelW / 2 + labelSafety
+          );
         }
       }
-    };
-    scanNotes(elements);
-  }
-  const neededLeftPad = Math.max(0, -contentLeft);
-  const neededRightPad = Math.max(0, contentRight - svgWidth);
-  if (neededLeftPad > 0 || neededRightPad > 0) {
+    }
+    if (elements) {
+      const acc = { right: contentRight };
+      scanNotes(elements, acc);
+      contentRight = acc.right;
+    }
+    const neededLeftPad = Math.max(0, -contentLeft);
+    const neededRightPad = Math.max(0, contentRight - svgWidth);
+    if (neededLeftPad <= 0.5 && neededRightPad <= 0.5) break;
     leftMargin += neededLeftPad;
     rightMargin += neededRightPad;
     totalWidth = Math.max(leftMargin + diagramWidth + rightMargin, sBoxW + 40);
@@ -1271,7 +1307,7 @@ function renderSequenceDiagram(container, parsed, palette, isDark, _onNavigateTo
     }
   };
   if (showTitle) {
-    const titleEl = svg.append("text").attr("class", "chart-title").attr("x", svgWidth / 2).attr("y", ctx.structural(TITLE_Y)).attr("text-anchor", "middle").attr("fill", palette.text).attr("font-size", ctx.text(TITLE_FONT_SIZE)).attr("font-weight", TITLE_FONT_WEIGHT).text(title);
+    const titleEl = svg.append("text").attr("class", "chart-title").attr("x", header.inline ? header.titleX : svgWidth / 2).attr("y", ctx.structural(TITLE_Y)).attr("text-anchor", header.inline ? header.titleAnchor : "middle").attr("fill", palette.text).attr("font-size", ctx.text(TITLE_FONT_SIZE)).attr("font-weight", TITLE_FONT_WEIGHT).text(title);
     if (parsed.titleLineNumber) {
       titleEl.attr("data-line-number", parsed.titleLineNumber);
     }
@@ -1757,9 +1793,19 @@ function renderSequenceDiagram(container, parsed, palette, isDark, _onNavigateTo
   if (hasTagGroups) {
     const legendY = sTopMargin + titleOffset;
     const legendCallbacks = {};
-    const legendG = svg.append("g").attr("class", "sequence-legend").attr("transform", `translate(0,${legendY})`);
+    const legendG = svg.append("g").attr("class", "sequence-legend").attr(
+      "transform",
+      header.inline ? `translate(${header.legendX}, ${header.legendY})` : `translate(0,${legendY})`
+    );
     renderIntegratedLegend(legendG, {
       ...legendConfig,
+      // Inline → left-origin so the wrapper's right-flush translate lands the
+      // legend at the header's right edge; stacked → centered below the title
+      // (identical to legendConfig.position, so the stacked path is unchanged).
+      position: {
+        placement: "top-center",
+        titleRelation: header.inline ? "inline-with-title" : "below-title"
+      },
       palette,
       isDark,
       width: svgWidth,
@@ -1861,4 +1907,4 @@ export {
   renderSequenceDiagram,
   buildNoteMessageMap
 };
-//# sourceMappingURL=chunk-65V6IRFN.js.map
+//# sourceMappingURL=chunk-2ZJXKJSI.js.map

package/dist/{chunk-PYO4TJJ3.js → chunk-32HUNA33.js}

@@ -16,9 +16,16 @@ import {
 import {
   ScaleContext
 } from "./chunk-YYVTBZZC.js";
+import {
+  INLINE_HEADER_PAD,
+  layoutInlineHeader
+} from "./chunk-US3P2DQO.js";
 import {
   renderIntegratedLegend
-} from "./chunk-W5KMNC5U.js";
+} from "./chunk-ASPS5O6F.js";
+import {
+  getLegendExtent
+} from "./chunk-GRXPFBYC.js";
 import {
   CAPTION_BOX_PADDING_X,
   CAPTION_BOX_PADDING_Y,
@@ -35,7 +42,7 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   parsePert
-} from "./chunk-P3H7QVDH.js";
+} from "./chunk-5K5XBEXT.js";
 import {
   addCalendarDays,
   formatDuration,
@@ -43,24 +50,24 @@ import {
   formatSlackValue,
   formatSprintCell
 } from "./chunk-3TYUXC7D.js";
-import {
-  contrastText,
-  mix,
-  shapeFill,
-  themeBaseBg
-} from "./chunk-JYDMBWRP.js";
 import {
   LEGEND_HEIGHT
-} from "./chunk-4RGZFA7H.js";
+} from "./chunk-Q5IHQ4NW.js";
 import {
   measureText,
   truncateText,
   wrapTextToWidth
 } from "./chunk-4ASYQ347.js";
+import {
+  contrastText,
+  mix,
+  shapeFill,
+  themeBaseBg
+} from "./chunk-JYDMBWRP.js";
 import {
   resolveActiveTagGroup,
   resolveTagColor
-} from "./chunk-CMVZWP32.js";
+} from "./chunk-JR7Q6GHE.js";
 
 // src/pert/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -229,25 +236,54 @@ function renderPert(container, resolved, layout, palette, isDark, options = {})
   const scaledHeight = layout.height + sDiagramPad * 2 + sTitleHeight + sLegendBlockHeight + analysisBlockHeight + fieldLegendBlockHeight;
   const svgW = ctx.isBelowFloor ? exportWidth : scaledWidth;
   const svgH = ctx.isBelowFloor ? exportHeight : scaledHeight;
+  const inlineRequested = resolved.options.legendInline === true && showTagLegend;
+  const legendExtent = inlineRequested ? getLegendExtent(
+    {
+      groups: resolved.tagGroups.map((g) => ({
+        name: g.name,
+        entries: g.entries
+      })),
+      position: {
+        placement: "top-center",
+        titleRelation: "inline-with-title"
+      },
+      mode: options.exportMode ? "export" : "preview"
+    },
+    { activeGroup: tagLegendActive },
+    svgW
+  ) : { width: 0, height: 0 };
+  const header = layoutInlineHeader({
+    requested: inlineRequested,
+    title: effectiveTitle ?? "",
+    hasLegend: showTagLegend,
+    legendWidth: legendExtent.width,
+    legendHeight: legendExtent.height,
+    containerWidth: svgW,
+    titleBandHeight: sTitleHeight,
+    legendReserve: sLegendBlockHeight,
+    titleBaselineY: sTitleY,
+    titleFontSize: sTitleFontSize
+  });
   const svg = d3Selection.select(container).append("svg").attr("width", ctx.isBelowFloor ? "100%" : svgW).attr("height", svgH).attr("viewBox", `0 0 ${svgW} ${svgH}`).attr("preserveAspectRatio", "xMidYMin meet").style("font-family", FONT_FAMILY);
   const defs = svg.append("defs");
   buildArrowheads(defs, palette, sArrowheadW, sArrowheadH);
   if (effectiveTitle) {
-    svg.append("text").attr("class", "pert-title chart-title").attr("x", svgW / 2).attr("y", sTitleY).attr("text-anchor", "middle").attr("fill", palette.text).attr("font-size", sTitleFontSize).attr("font-weight", TITLE_FONT_WEIGHT).text(effectiveTitle);
+    svg.append("text").attr("class", "pert-title chart-title").attr("x", header.titleX).attr("y", sTitleY).attr("text-anchor", header.titleAnchor).attr("fill", palette.text).attr("font-size", sTitleFontSize).attr("font-weight", TITLE_FONT_WEIGHT).text(effectiveTitle);
   }
   if (effectiveSubtitle) {
     const subtitleY = effectiveTitle ? sTitleY + ctx.aesthetic(26) : sTitleY;
     svg.append("text").attr("class", "pert-subtitle").attr("x", svgW / 2).attr("y", subtitleY).attr("text-anchor", "middle").attr("fill", palette.textMuted).attr("font-size", sSubtitleFontSize).attr("font-weight", 400).text(effectiveSubtitle);
   }
   const offsetX = Math.max(sDiagramPad, (svgW - layout.width) / 2);
-  const offsetY = sDiagramPad + sTitleHeight + sLegendBlockHeight;
+  const offsetY = sDiagramPad + sTitleHeight + (header.inline ? 0 : sLegendBlockHeight);
   if (showTagLegend) {
     const tagLegendY = sDiagramPad + sTitleHeight + sLegendTopGap;
     renderTagLegendRow(svg, resolved, palette, isDark, {
-      x: 0,
-      y: tagLegendY,
-      width: svgW,
+      x: header.inline ? svgW - INLINE_HEADER_PAD - legendExtent.width : 0,
+      y: header.inline ? header.legendY : tagLegendY,
+      width: header.inline ? legendExtent.width : svgW,
       activeGroup: tagLegendActive,
+      inline: header.inline,
       ...options.exportMode !== void 0 && {
         exportMode: options.exportMode
       }
@@ -1337,7 +1373,7 @@ function renderCaptionBlock(svg, bullets, args) {
 }
 function renderTagLegendRow(svg, resolved, palette, isDark, args) {
   if (resolved.tagGroups.length === 0) return;
-  const { x, y, width, activeGroup, exportMode } = args;
+  const { x, y, width, activeGroup, exportMode, inline } = args;
   const groups = resolved.tagGroups.map((g) => ({
     name: g.name,
     entries: g.entries.map((e) => ({ value: e.value, color: e.color }))
@@ -1349,7 +1385,13 @@ function renderTagLegendRow(svg, resolved, palette, isDark, args) {
     palette,
     isDark,
     width,
-    activeGroup
+    activeGroup,
+    ...inline && {
+      position: {
+        placement: "top-center",
+        titleRelation: "inline-with-title"
+      }
+    }
   });
 }
 function renderFieldLegendBlock(svg, args) {
@@ -1823,4 +1865,4 @@ export {
   measurePertAnalysisBlock,
   renderPertAnalysisBlock
 };
-//# sourceMappingURL=chunk-PYO4TJJ3.js.map
+//# sourceMappingURL=chunk-32HUNA33.js.map

package/dist/{chunk-UK6DKJLD.js → chunk-3BFXELBL.js}

@@ -1,7 +1,7 @@
 import {
   extractDatePrefix,
   parseTimelineDate
-} from "./chunk-6AUZPPAV.js";
+} from "./chunk-ITXL2KU5.js";
 import {
   makeYearContext,
   parseDateToken,
@@ -16,7 +16,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-CMVZWP32.js";
+} from "./chunk-JR7Q6GHE.js";
 import {
   EVENT_LINE_REGISTRY,
   extractColor,
@@ -27,7 +27,7 @@ import {
   tryParseSharedOption,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-YJVA3QUU.js";
+} from "./chunk-A2ARDILY.js";
 import {
   emit,
   formatDgmoError,
@@ -133,6 +133,7 @@ var TBD_RE = /^TBD\b/i;
 var SIDE_RE = /^side\s+(above|below|alternate)\b/i;
 var ERA_RE = /^\[([^\]]+)\]\s*(.*)$/;
 var ERA_COLLAPSED_RE = /\bcollapsed:\s*(true|false)\b/i;
+var NOW_RE = /^now\b\s*(.*)$/i;
 var SECTION_SEAM_RE = /^section\b/i;
 var DIRECTION_RE = /^direction\s+(\w+)/i;
 function parseEventLine(content, palette) {
@@ -150,6 +151,7 @@ function parseEventLine(content, palette) {
     titleLineNumber: null,
     events: [],
     eras: [],
+    now: null,
     tagGroups: [],
     options,
     diagnostics: [],
@@ -344,6 +346,44 @@ function parseEventLine(content, palette) {
         options.noLegend = true;
         continue;
       }
+      if (trimmed.toLowerCase() === "legend-inline") {
+        options.legendInline = true;
+        continue;
+      }
+      {
+        const nowMatch = trimmed.match(NOW_RE);
+        if (nowMatch) {
+          const rest = nowMatch[1].trim();
+          if (!rest) {
+            result.now = {
+              computed: true,
+              date: null,
+              dateValue: null,
+              label: "now",
+              lineNumber
+            };
+          } else {
+            const prefix = extractDatePrefix(rest, dateCtx);
+            if (prefix) {
+              const label = prefix.remainder?.trim() || "now";
+              result.now = {
+                computed: false,
+                date: prefix.startDate,
+                dateValue: parseTimelineDate(prefix.startDate),
+                label,
+                lineNumber
+              };
+            } else {
+              result.diagnostics.push(
+                emit(EVENT_LINE_DX.BAD_DATE, lineNumber, {
+                  token: rest.split(/\s+/)[0]
+                })
+              );
+            }
+          }
+          continue;
+        }
+      }
       {
         const fm = fillModeFromToken(trimmed);
         if (fm !== null) {
@@ -419,6 +459,13 @@ function parseEventLine(content, palette) {
     });
   }
   validateEventDateOrder(result.events, eraFlaggedLines, result.diagnostics);
+  if (result.now && !options.scale) {
+    result.diagnostics.push(
+      emit(EVENT_LINE_DX.UNSUPPORTED, result.now.lineNumber, {
+        reason: "the `now` marker needs a to-scale axis; it is ignored under `no-scale`."
+      })
+    );
+  }
   return result;
 }
 function resolveFutureEvents(events) {
@@ -618,4 +665,4 @@ export {
   EVENT_LINE_DIAGNOSTICS,
   parseEventLine
 };
-//# sourceMappingURL=chunk-UK6DKJLD.js.map
+//# sourceMappingURL=chunk-3BFXELBL.js.map

package/dist/{chunk-RW5PEJ7D.js → chunk-3BZJ5KD5.js}

@@ -8,14 +8,14 @@ import {
   resolveActiveTagGroup,
   stripDefaultModifier,
   tagAttrKey
-} from "./chunk-CMVZWP32.js";
+} from "./chunk-JR7Q6GHE.js";
 import {
   extractColor,
   fillModeFromToken,
   measureIndent,
   parseFirstLine,
   splitNameAndMeta
-} from "./chunk-YJVA3QUU.js";
+} from "./chunk-A2ARDILY.js";
 import {
   makeDgmoError,
   makeFail
@@ -214,6 +214,10 @@ function parseBracket(content, palette) {
       else result.mode = lower;
       continue;
     }
+    if (lower === "legend-inline") {
+      result.legendInline = true;
+      continue;
+    }
     if (lower === "no-legend") {
       result.noLegend = true;
       continue;
@@ -388,4 +392,4 @@ function parseBracket(content, palette) {
 export {
   parseBracket
 };
-//# sourceMappingURL=chunk-RW5PEJ7D.js.map
+//# sourceMappingURL=chunk-3BZJ5KD5.js.map