@diagrammo/dgmo 0.2.7 → 0.2.8

package/dist/index.d.cts

@@ -546,6 +546,7 @@ interface SequenceNote {
     position: 'right' | 'left';
     participantId: string;
     lineNumber: number;
+    endLineNumber: number;
 }
 type SequenceElement = SequenceMessage | SequenceBlock | SequenceSection | SequenceNote;
 declare function isSequenceBlock(el: SequenceElement): el is SequenceBlock;

package/dist/index.d.ts

@@ -546,6 +546,7 @@ interface SequenceNote {
     position: 'right' | 'left';
     participantId: string;
     lineNumber: number;
+    endLineNumber: number;
 }
 type SequenceElement = SequenceMessage | SequenceBlock | SequenceSection | SequenceNote;
 declare function isSequenceBlock(el: SequenceElement): el is SequenceBlock;

package/dist/index.js

@@ -528,22 +528,19 @@ function parseSequenceDgmo(content) {
       const notePosition = noteSingleMatch[1]?.toLowerCase() || "right";
       let noteParticipant = noteSingleMatch[2] || null;
       if (!noteParticipant) {
-        if (!lastMsgFrom) {
-          result.error = `Line ${lineNumber}: note requires a preceding message`;
-          return result;
-        }
+        if (!lastMsgFrom) continue;
         noteParticipant = lastMsgFrom;
       }
       if (!result.participants.some((p) => p.id === noteParticipant)) {
-        result.error = `Line ${lineNumber}: note references unknown participant '${noteParticipant}'`;
-        return result;
+        continue;
       }
       const note = {
         kind: "note",
         text: noteSingleMatch[3].trim(),
         position: notePosition,
         participantId: noteParticipant,
-        lineNumber
+        lineNumber,
+        endLineNumber: lineNumber
       };
       currentContainer().push(note);
       continue;
@@ -553,15 +550,11 @@ function parseSequenceDgmo(content) {
       const notePosition = noteMultiMatch[1]?.toLowerCase() || "right";
       let noteParticipant = noteMultiMatch[2] || null;
       if (!noteParticipant) {
-        if (!lastMsgFrom) {
-          result.error = `Line ${lineNumber}: note requires a preceding message`;
-          return result;
-        }
+        if (!lastMsgFrom) continue;
         noteParticipant = lastMsgFrom;
       }
       if (!result.participants.some((p) => p.id === noteParticipant)) {
-        result.error = `Line ${lineNumber}: note references unknown participant '${noteParticipant}'`;
-        return result;
+        continue;
       }
       const noteLines = [];
       while (i + 1 < lines.length) {
@@ -573,16 +566,15 @@ function parseSequenceDgmo(content) {
         noteLines.push(nextTrimmed);
         i++;
       }
-      if (noteLines.length === 0) {
-        result.error = `Line ${lineNumber}: multi-line note has no content \u2014 add indented lines or use 'note: text'`;
-        return result;
-      }
+      if (noteLines.length === 0) continue;
       const note = {
         kind: "note",
         text: noteLines.join("\n"),
         position: notePosition,
         participantId: noteParticipant,
-        lineNumber
+        lineNumber,
+        endLineNumber: i + 1
+        // i has advanced past the body lines (1-based)
       };
       currentContainer().push(note);
       continue;
@@ -630,7 +622,7 @@ var init_parser = __esm({
     ARROW_RETURN_PATTERN = /^(.+?)\s*<-\s*(.+)$/;
     UML_RETURN_PATTERN = /^(\w+\([^)]*\))\s*:\s*(.+)$/;
     NOTE_SINGLE = /^note(?:\s+(right|left)\s+of\s+(\S+))?\s*:\s*(.+)$/i;
-    NOTE_MULTI = /^note(?:\s+(right|left)\s+of\s+(\S+))?\s*$/i;
+    NOTE_MULTI = /^note(?:\s+(right|left)\s+of\s+([^\s:]+))?\s*:?\s*$/i;
   }
 });
 
@@ -2543,14 +2535,16 @@ __export(renderer_exports, {
 import * as d3Selection2 from "d3-selection";
 function parseInlineMarkdown(text) {
   const spans = [];
-  const regex = /\*\*(.+?)\*\*|\*(.+?)\*|`(.+?)`|\[(.+?)\]\((.+?)\)|([^*`[]+)/g;
+  const regex = /\*\*(.+?)\*\*|__(.+?)__|\*(.+?)\*|_(.+?)_|`(.+?)`|\[(.+?)\]\((.+?)\)|([^*_`[]+)/g;
   let match;
   while ((match = regex.exec(text)) !== null) {
     if (match[1]) spans.push({ text: match[1], bold: true });
-    else if (match[2]) spans.push({ text: match[2], italic: true });
-    else if (match[3]) spans.push({ text: match[3], code: true });
-    else if (match[4]) spans.push({ text: match[4], href: match[5] });
-    else if (match[6]) spans.push({ text: match[6] });
+    else if (match[2]) spans.push({ text: match[2], bold: true });
+    else if (match[3]) spans.push({ text: match[3], italic: true });
+    else if (match[4]) spans.push({ text: match[4], italic: true });
+    else if (match[5]) spans.push({ text: match[5], code: true });
+    else if (match[6]) spans.push({ text: match[6], href: match[7] });
+    else if (match[8]) spans.push({ text: match[8] });
   }
   return spans;
 }
@@ -2949,6 +2943,34 @@ function renderSequenceDiagram(container, parsed, palette, isDark, _onNavigateTo
   if (elements && elements.length > 0) {
     markBlockSpacing(elements);
   }
+  const NOTE_OFFSET_BELOW = 16;
+  const computeNoteHeight = (text) => {
+    const lines = wrapTextLines(text, NOTE_CHARS_PER_LINE);
+    return lines.length * NOTE_LINE_H + NOTE_PAD_V * 2;
+  };
+  const markNoteSpacing = (els) => {
+    for (let i = 0; i < els.length; i++) {
+      const el = els[i];
+      if (isSequenceNote(el)) {
+        const noteH = computeNoteHeight(el.text);
+        const nextIdx = i + 1 < els.length ? findFirstMsgIndex([els[i + 1]]) : -1;
+        if (nextIdx >= 0) {
+          addExtra(nextIdx, noteH + NOTE_OFFSET_BELOW);
+        }
+      } else if (isSequenceBlock(el)) {
+        markNoteSpacing(el.children);
+        if (el.elseIfBranches) {
+          for (const branch of el.elseIfBranches) {
+            markNoteSpacing(branch.children);
+          }
+        }
+        markNoteSpacing(el.elseChildren);
+      }
+    }
+  };
+  if (elements && elements.length > 0) {
+    markNoteSpacing(elements);
+  }
   const preSectionMsgIndices = [];
   const sectionRegions = [];
   {
@@ -3460,8 +3482,8 @@ function renderSequenceDiagram(container, parsed, palette, isDark, _onNavigateTo
         );
         const isRight = el.position === "right";
         const noteX = isRight ? px + ACTIVATION_WIDTH + NOTE_GAP : px - ACTIVATION_WIDTH - NOTE_GAP - noteW;
-        const noteTopY = noteY - noteH / 2;
-        const noteG = svg.append("g").attr("class", "note").attr("data-note-toggle", "").attr("data-line-number", String(el.lineNumber));
+        const noteTopY = noteY + NOTE_OFFSET_BELOW;
+        const noteG = svg.append("g").attr("class", "note").attr("data-note-toggle", "").attr("data-line-number", String(el.lineNumber)).attr("data-line-end", String(el.endLineNumber));
         noteG.append("path").attr(
           "d",
           [
@@ -3481,13 +3503,16 @@ function renderSequenceDiagram(container, parsed, palette, isDark, _onNavigateTo
             `L ${noteX + noteW} ${noteTopY + NOTE_FOLD}`
           ].join(" ")
         ).attr("fill", "none").attr("stroke", palette.textMuted).attr("stroke-width", 0.75).attr("class", "note-fold");
-        const connectorNoteX = isRight ? noteX : noteX + noteW;
-        const connectorLifeX = isRight ? px + ACTIVATION_WIDTH / 2 : px - ACTIVATION_WIDTH / 2;
-        noteG.append("line").attr("x1", connectorNoteX).attr("y1", noteY).attr("x2", connectorLifeX).attr("y2", noteY).attr("stroke", palette.textMuted).attr("stroke-width", 0.75).attr("stroke-dasharray", "3 2").attr("class", "note-connector");
         wrappedLines.forEach((line3, li) => {
           const textY = noteTopY + NOTE_PAD_V + (li + 1) * NOTE_LINE_H - 3;
-          const textEl = noteG.append("text").attr("x", noteX + NOTE_PAD_H).attr("y", textY).attr("fill", palette.text).attr("font-size", NOTE_FONT_SIZE).attr("class", "note-text");
-          const spans = parseInlineMarkdown(line3);
+          const isBullet = line3.startsWith("- ");
+          const bulletIndent = isBullet ? 10 : 0;
+          const displayLine = isBullet ? line3.slice(2) : line3;
+          const textEl = noteG.append("text").attr("x", noteX + NOTE_PAD_H + bulletIndent).attr("y", textY).attr("fill", palette.text).attr("font-size", NOTE_FONT_SIZE).attr("class", "note-text");
+          if (isBullet) {
+            noteG.append("text").attr("x", noteX + NOTE_PAD_H).attr("y", textY).attr("fill", palette.text).attr("font-size", NOTE_FONT_SIZE).text("\u2022");
+          }
+          const spans = parseInlineMarkdown(displayLine);
           for (const span of spans) {
             if (span.href) {
               const a = textEl.append("a").attr("href", span.href);