@diagrammo/dgmo 0.8.5 → 0.8.7

package/src/kanban/renderer.ts

@@ -7,7 +7,12 @@ import { FONT_FAMILY } from '../fonts';
 import type { PaletteColors } from '../palettes';
 import { mix } from '../palettes/color-utils';
 import { renderInlineText } from '../utils/inline-markdown';
-import type { ParsedKanban, KanbanColumn, KanbanCard, KanbanTagGroup } from './types';
+import type {
+  ParsedKanban,
+  KanbanColumn,
+  KanbanCard,
+  KanbanTagGroup,
+} from './types';
 import { parseKanban } from './parser';
 import { isArchiveColumn } from './mutations';
 import {
@@ -141,13 +146,18 @@ function computeLayout(
       const metaCount = tagMeta.length + card.details.length;
       const metaHeight =
         metaCount > 0
-          ? CARD_SEPARATOR_GAP + 1 + CARD_PADDING_Y + metaCount * CARD_META_LINE_HEIGHT
+          ? CARD_SEPARATOR_GAP +
+            1 +
+            CARD_PADDING_Y +
+            metaCount * CARD_META_LINE_HEIGHT
           : 0;
       const cardHeight = CARD_HEADER_HEIGHT + CARD_PADDING_Y + metaHeight;
 
       // Account for meta label widths
       for (const m of tagMeta) {
-        const metaW = (m.label.length + 2 + m.value.length) * CARD_META_FONT_SIZE * 0.6 + CARD_PADDING_X * 2;
+        const metaW =
+          (m.label.length + 2 + m.value.length) * CARD_META_FONT_SIZE * 0.6 +
+          CARD_PADDING_X * 2;
         maxCardTextWidth = Math.max(maxCardTextWidth, metaW);
       }
 
@@ -162,7 +172,10 @@ function computeLayout(
       cardY += cardHeight + CARD_GAP;
     }
 
-    const colWidth = Math.max(COLUMN_MIN_WIDTH, maxCardTextWidth + COLUMN_PADDING * 2);
+    const colWidth = Math.max(
+      COLUMN_MIN_WIDTH,
+      maxCardTextWidth + COLUMN_PADDING * 2
+    );
 
     // Set card widths
     for (const cl of cardLayouts) {
@@ -269,7 +282,11 @@ export function renderKanban(
       if (isActive) {
         capsuleContentWidth += 4; // gap after pill
         for (const entry of group.entries) {
-          capsuleContentWidth += LEGEND_DOT_R * 2 + 4 + entry.value.length * LEGEND_ENTRY_FONT_SIZE * 0.6 + 8;
+          capsuleContentWidth +=
+            LEGEND_DOT_R * 2 +
+            4 +
+            entry.value.length * LEGEND_ENTRY_FONT_SIZE * 0.6 +
+            8;
         }
       }
       const capsuleWidth = capsuleContentWidth + capsulePad * 2;
@@ -293,10 +310,10 @@ export function renderKanban(
       legendContainer
         .append('rect')
         .attr('x', pillX)
-        .attr('y', legendY + (isActive ? capsulePad : 0))
+        .attr('y', legendY + capsulePad)
         .attr('width', pillWidth)
-        .attr('height', LEGEND_HEIGHT - (isActive ? capsulePad * 2 : 0))
-        .attr('rx', (LEGEND_HEIGHT - (isActive ? capsulePad * 2 : 0)) / 2)
+        .attr('height', LEGEND_HEIGHT - capsulePad * 2)
+        .attr('rx', (LEGEND_HEIGHT - capsulePad * 2) / 2)
         .attr('fill', pillBg)
         .attr('class', 'kanban-legend-group')
         .attr('data-legend-group', group.name.toLowerCase());
@@ -345,12 +362,16 @@ export function renderKanban(
           entryG
             .append('text')
             .attr('x', entryTextX)
-            .attr('y', legendY + LEGEND_HEIGHT / 2 + LEGEND_ENTRY_FONT_SIZE / 2 - 1)
+            .attr(
+              'y',
+              legendY + LEGEND_HEIGHT / 2 + LEGEND_ENTRY_FONT_SIZE / 2 - 1
+            )
             .attr('font-size', LEGEND_ENTRY_FONT_SIZE)
             .attr('fill', palette.textMuted)
             .text(entry.value);
 
-          entryX = entryTextX + entry.value.length * LEGEND_ENTRY_FONT_SIZE * 0.6 + 8;
+          entryX =
+            entryTextX + entry.value.length * LEGEND_ENTRY_FONT_SIZE * 0.6 + 8;
         }
         legendX += capsuleWidth + 12;
       } else {
@@ -423,10 +444,7 @@ export function renderKanban(
         .attr('x', colLayout.x + COLUMN_PADDING + nameWidth + 8)
         .attr(
           'y',
-          colLayout.y +
-            COLUMN_HEADER_HEIGHT / 2 +
-            WIP_FONT_SIZE / 2 -
-            1
+          colLayout.y + COLUMN_HEADER_HEIGHT / 2 + WIP_FONT_SIZE / 2 - 1
         )
         .attr('font-size', WIP_FONT_SIZE)
         .attr('fill', wipExceeded ? palette.colors.red : palette.textMuted)
@@ -437,7 +455,11 @@ export function renderKanban(
     // Cards
     for (const cardLayout of colLayout.cardLayouts) {
       const card = cardLayout.card;
-      const resolvedColor = resolveCardTagColor(card, parsed.tagGroups, activeTagGroup ?? null);
+      const resolvedColor = resolveCardTagColor(
+        card,
+        parsed.tagGroups,
+        activeTagGroup ?? null
+      );
       const tagMeta = resolveCardTagMeta(card, parsed.tagGroups);
       const hasMeta = tagMeta.length > 0 || card.details.length > 0;
 
@@ -481,7 +503,8 @@ export function renderKanban(
         .attr('stroke-width', CARD_STROKE_WIDTH);
 
       // Card title (inline markdown)
-      const titleEl = cg.append('text')
+      const titleEl = cg
+        .append('text')
         .attr('x', cx + CARD_PADDING_X)
         .attr('y', cy + CARD_PADDING_Y + CARD_TITLE_FONT_SIZE)
         .attr('font-size', CARD_TITLE_FONT_SIZE)
@@ -513,7 +536,8 @@ export function renderKanban(
             .attr('fill', palette.textMuted)
             .text(`${meta.label}: `);
 
-          const labelWidth = (meta.label.length + 2) * CARD_META_FONT_SIZE * 0.6;
+          const labelWidth =
+            (meta.label.length + 2) * CARD_META_FONT_SIZE * 0.6;
           cg.append('text')
             .attr('x', cx + CARD_PADDING_X + labelWidth)
             .attr('y', metaY)
@@ -526,7 +550,8 @@ export function renderKanban(
 
         // Detail lines (inline markdown)
         for (const detail of card.details) {
-          const detailEl = cg.append('text')
+          const detailEl = cg
+            .append('text')
             .attr('x', cx + CARD_PADDING_X)
             .attr('y', metaY)
             .attr('font-size', CARD_META_FONT_SIZE)

package/src/org/parser.ts

@@ -6,6 +6,7 @@ import {
   isTagBlockHeading,
   matchTagBlockHeading,
   validateTagValues,
+  stripDefaultModifier,
 } from '../utils/tag-groups';
 import {
   measureIndent,
@@ -220,11 +221,12 @@ export function parseOrg(content: string, palette?: PaletteColors): ParsedOrg {
     }
 
     // Tag group entries (indented Value(color) under tag heading)
-    // First entry is implicitly the default.
+    // First entry is the default unless another is marked `default`
     if (currentTagGroup && !contentStarted) {
       const indent = measureIndent(line);
       if (indent > 0) {
-        const { label, color } = extractColor(trimmed, palette);
+        const { text: cleanEntry, isDefault } = stripDefaultModifier(trimmed);
+        const { label, color } = extractColor(cleanEntry, palette);
         if (!color) {
           pushError(
             lineNumber,
@@ -232,8 +234,9 @@ export function parseOrg(content: string, palette?: PaletteColors): ParsedOrg {
           );
           continue;
         }
-        // First entry is the default
-        if (currentTagGroup.entries.length === 0) {
+        if (isDefault) {
+          currentTagGroup.defaultValue = label;
+        } else if (currentTagGroup.entries.length === 0) {
           currentTagGroup.defaultValue = label;
         }
         currentTagGroup.entries.push({

package/src/org/renderer.ts

@@ -4,7 +4,10 @@
 
 import * as d3Selection from 'd3-selection';
 import { FONT_FAMILY } from '../fonts';
-import { runInExportContainer, extractExportSvg } from '../utils/export-container';
+import {
+  runInExportContainer,
+  extractExportSvg,
+} from '../utils/export-container';
 import type { PaletteColors } from '../palettes';
 import { mix } from '../palettes/color-utils';
 import type { ParsedOrg } from './parser';
@@ -170,7 +173,9 @@ export function renderOrg(
   if (parsed.title) {
     const titleParent = fixedTitle ? svg : mainG;
     const titleX = fixedTitle ? width / 2 : diagramW / 2;
-    const titleY = fixedTitle ? DIAGRAM_PADDING + TITLE_FONT_SIZE : TITLE_FONT_SIZE;
+    const titleY = fixedTitle
+      ? DIAGRAM_PADDING + TITLE_FONT_SIZE
+      : TITLE_FONT_SIZE;
     const titleEl = titleParent
       .append('text')
       .attr('x', titleX)
@@ -235,10 +240,7 @@ export function renderOrg(
       cG.attr('data-node-toggle', c.nodeId)
         .attr('tabindex', '0')
         .attr('role', 'button')
-        .attr(
-          'aria-expanded',
-          String(!c.hiddenCount)
-        )
+        .attr('aria-expanded', String(!c.hiddenCount))
         .attr('aria-label', c.label);
     }
 
@@ -266,7 +268,10 @@ export function renderOrg(
     // Container label (bold, at top)
     cG.append('text')
       .attr('x', c.width / 2)
-      .attr('y', CONTAINER_HEADER_HEIGHT / 2 + CONTAINER_LABEL_FONT_SIZE / 2 - 2)
+      .attr(
+        'y',
+        CONTAINER_HEADER_HEIGHT / 2 + CONTAINER_LABEL_FONT_SIZE / 2 - 2
+      )
       .attr('text-anchor', 'middle')
       .attr('fill', palette.text)
       .attr('font-size', CONTAINER_LABEL_FONT_SIZE)
@@ -277,7 +282,9 @@ export function renderOrg(
     const metaEntries = Object.entries(c.metadata);
     if (metaEntries.length > 0) {
       // Compute max key width so values align vertically
-      const metaDisplayKeys = metaEntries.map(([k]) => displayNames.get(k) ?? k);
+      const metaDisplayKeys = metaEntries.map(
+        ([k]) => displayNames.get(k) ?? k
+      );
       const maxKeyLen = Math.max(...metaDisplayKeys.map((k) => k.length));
       const valueX = 10 + (maxKeyLen + 2) * (CONTAINER_META_FONT_SIZE * 0.6);
 
@@ -306,9 +313,11 @@ export function renderOrg(
     // Collapsed accent bar (interactive only), clipped to card shape
     if (!exportDims && c.hiddenCount && c.hiddenCount > 0) {
       const clipId = `clip-${c.nodeId}`;
-      cG.append('clipPath').attr('id', clipId)
+      cG.append('clipPath')
+        .attr('id', clipId)
         .append('rect')
-        .attr('width', c.width).attr('height', c.height)
+        .attr('width', c.width)
+        .attr('height', c.height)
         .attr('rx', CONTAINER_RADIUS);
       cG.append('rect')
         .attr('x', COLLAPSE_BAR_INSET)
@@ -319,7 +328,6 @@ export function renderOrg(
         .attr('clip-path', `url(#${clipId})`)
         .attr('class', 'org-collapse-bar');
     }
-
   }
 
   // Render edges
@@ -350,10 +358,7 @@ export function renderOrg(
 
     const nodeG = contentG
       .append('g')
-      .attr(
-        'transform',
-        `translate(${node.x - node.width / 2}, ${node.y})`
-      )
+      .attr('transform', `translate(${node.x - node.width / 2}, ${node.y})`)
       .attr('class', 'org-node')
       .attr('data-line-number', String(node.lineNumber)) as GSelection;
 
@@ -428,7 +433,9 @@ export function renderOrg(
         .attr('stroke-width', 1);
 
       // Metadata rows — compute max key width so values align vertically
-      const metaDisplayKeys = metaEntries.map(([k]) => displayNames.get(k) ?? k);
+      const metaDisplayKeys = metaEntries.map(
+        ([k]) => displayNames.get(k) ?? k
+      );
       const maxKeyLen = Math.max(...metaDisplayKeys.map((k) => k.length));
       const valueX = 10 + (maxKeyLen + 2) * (META_FONT_SIZE * 0.6);
 
@@ -461,9 +468,12 @@ export function renderOrg(
     // Collapsed accent bar (interactive only), clipped to card shape
     if (!exportDims && node.hiddenCount && node.hiddenCount > 0) {
       const clipId = `clip-${node.id}`;
-      nodeG.append('clipPath').attr('id', clipId)
+      nodeG
+        .append('clipPath')
+        .attr('id', clipId)
         .append('rect')
-        .attr('width', node.width).attr('height', node.height)
+        .attr('width', node.width)
+        .attr('height', node.height)
         .attr('rx', CARD_RADIUS);
       nodeG
         .append('rect')
@@ -475,7 +485,6 @@ export function renderOrg(
         .attr('clip-path', `url(#${clipId})`)
         .attr('class', 'org-collapse-bar');
     }
-
   }
 
   // Render legend — kanban-style pills.
@@ -494,7 +503,7 @@ export function renderOrg(
     let fixedPositions: Map<string, number> | undefined;
     if (fixedLegend && visibleGroups.length > 0) {
       fixedPositions = new Map();
-      const effectiveW = (g: typeof visibleGroups[0]) =>
+      const effectiveW = (g: (typeof visibleGroups)[0]) =>
         activeTagGroup != null ? g.width : g.minifiedWidth;
       const totalW =
         visibleGroups.reduce((s, g) => s + effectiveW(g), 0) +
@@ -511,10 +520,7 @@ export function renderOrg(
       ? svg
           .append('g')
           .attr('class', 'org-legend-fixed')
-          .attr(
-            'transform',
-            `translate(0, ${DIAGRAM_PADDING + titleReserve})`
-          )
+          .attr('transform', `translate(0, ${DIAGRAM_PADDING + titleReserve})`)
       : contentG;
     const legendParent = legendParentBase;
     if (fixedLegend && activeTagGroup) {
@@ -556,8 +562,8 @@ export function renderOrg(
       }
 
       const pillXOff = isActive ? LEGEND_CAPSULE_PAD : 0;
-      const pillYOff = isActive ? LEGEND_CAPSULE_PAD : 0;
-      const pillH = LEGEND_HEIGHT - (isActive ? LEGEND_CAPSULE_PAD * 2 : 0);
+      const pillYOff = LEGEND_CAPSULE_PAD;
+      const pillH = LEGEND_HEIGHT - LEGEND_CAPSULE_PAD * 2;
 
       // Pill background
       gEl
@@ -610,7 +616,8 @@ export function renderOrg(
           .attr('opacity', isHidden ? 0.4 : 0.7);
 
         // Transparent hit area for easier clicking
-        eyeG.append('rect')
+        eyeG
+          .append('rect')
           .attr('x', eyeX - hitPad)
           .attr('y', eyeY - hitPad)
           .attr('width', LEGEND_EYE_SIZE + hitPad * 2)
@@ -618,7 +625,8 @@ export function renderOrg(
           .attr('fill', 'transparent')
           .attr('pointer-events', 'all');
 
-        eyeG.append('path')
+        eyeG
+          .append('path')
           .attr('d', isHidden ? EYE_CLOSED_PATH : EYE_OPEN_PATH)
           .attr('transform', `translate(${eyeX}, ${eyeY})`)
           .attr('fill', 'none')
@@ -655,7 +663,10 @@ export function renderOrg(
             .attr('fill', palette.textMuted)
             .text(entryLabel);
 
-          entryX = textX + measureLegendText(entryLabel, LEGEND_ENTRY_FONT_SIZE) + LEGEND_ENTRY_TRAIL;
+          entryX =
+            textX +
+            measureLegendText(entryLabel, LEGEND_ENTRY_FONT_SIZE) +
+            LEGEND_ENTRY_TRAIL;
         }
       }
     }

package/src/sequence/parser.ts

@@ -15,7 +15,11 @@ import {
   OPTION_NOCOLON_RE,
 } from '../utils/parsing';
 import type { TagGroup } from '../utils/tag-groups';
-import { matchTagBlockHeading, validateTagValues } from '../utils/tag-groups';
+import {
+  matchTagBlockHeading,
+  validateTagValues,
+  stripDefaultModifier,
+} from '../utils/tag-groups';
 
 /** Known sequence-diagram options that take a value (space-separated). */
 const KNOWN_SEQ_OPTIONS = new Set(['active-tag']);
@@ -594,9 +598,10 @@ export function parseSequenceDgmo(content: string): ParsedSequenceDgmo {
     }
 
     // Tag group entries (indented Value(color) under tag heading)
-    // First entry is automatically the default (no `default` keyword needed)
+    // First entry is the default unless another is marked `default`
     if (currentTagGroup && !contentStarted && measureIndent(raw) > 0) {
-      const { label, color } = extractColor(trimmed);
+      const { text: cleanEntry, isDefault } = stripDefaultModifier(trimmed);
+      const { label, color } = extractColor(cleanEntry);
       if (!color) {
         pushError(
           lineNumber,
@@ -604,8 +609,9 @@ export function parseSequenceDgmo(content: string): ParsedSequenceDgmo {
         );
         continue;
       }
-      // First entry is the default
-      if (currentTagGroup.entries.length === 0) {
+      if (isDefault) {
+        currentTagGroup.defaultValue = label;
+      } else if (currentTagGroup.entries.length === 0) {
         currentTagGroup.defaultValue = label;
       }
       currentTagGroup.entries.push({ value: label, color, lineNumber });