@diagrammo/dgmo 0.8.4 → 0.8.6

package/src/index.ts

@@ -27,13 +27,8 @@ export type { RenderCategory } from './dgmo-router';
 // Parsers
 // ============================================================
 
-export { parseChart } from './chart';
-export type {
-  ParsedChart,
-  ChartType,
-  ChartDataPoint,
-  ChartEra,
-} from './chart';
+export { parseChart, parseDataRowValues } from './chart';
+export type { ParsedChart, ChartType, ChartDataPoint, ChartEra } from './chart';
 
 export { parseExtendedChart } from './echarts';
 export type { ParsedExtendedChart, ExtendedChartType } from './echarts';
@@ -46,7 +41,13 @@ export {
   computeTimeTicks,
   formatDateLabel,
 } from './d3';
-export type { ParsedVisualization, VisualizationType, D3ExportDimensions, ArcLink, ArcNodeGroup } from './d3';
+export type {
+  ParsedVisualization,
+  VisualizationType,
+  D3ExportDimensions,
+  ArcLink,
+  ArcNodeGroup,
+} from './d3';
 
 export {
   parseSequenceDgmo,
@@ -99,7 +100,10 @@ export type {
   ClassLayoutEdge,
 } from './class/layout';
 
-export { renderClassDiagram, renderClassDiagramForExport } from './class/renderer';
+export {
+  renderClassDiagram,
+  renderClassDiagramForExport,
+} from './class/renderer';
 
 export { parseERDiagram, looksLikeERDiagram } from './er/parser';
 
@@ -113,11 +117,7 @@ export type {
 } from './er/types';
 
 export { layoutERDiagram } from './er/layout';
-export type {
-  ERLayoutResult,
-  ERLayoutNode,
-  ERLayoutEdge,
-} from './er/layout';
+export type { ERLayoutResult, ERLayoutNode, ERLayoutEdge } from './er/layout';
 
 export { renderERDiagram, renderERDiagramForExport } from './er/renderer';
 
@@ -136,10 +136,7 @@ export { parseInlineMarkdown, truncateBareUrl } from './utils/inline-markdown';
 export type { InlineSpan } from './utils/inline-markdown';
 
 export { parseOrg } from './org/parser';
-export type {
-  ParsedOrg,
-  OrgNode,
-} from './org/parser';
+export type { ParsedOrg, OrgNode } from './org/parser';
 
 export { layoutOrg } from './org/layout';
 export type {
@@ -159,7 +156,11 @@ export type {
   KanbanTagGroup,
   KanbanTagEntry,
 } from './kanban/types';
-export { computeCardMove, computeCardArchive, isArchiveColumn } from './kanban/mutations';
+export {
+  computeCardMove,
+  computeCardArchive,
+  isArchiveColumn,
+} from './kanban/mutations';
 export { renderKanban, renderKanbanForExport } from './kanban/renderer';
 
 export { parseC4 } from './c4/parser';
@@ -176,7 +177,13 @@ export type {
   C4TagEntry,
 } from './c4/types';
 
-export { layoutC4Context, layoutC4Containers, layoutC4Components, layoutC4Deployment, rollUpContextRelationships } from './c4/layout';
+export {
+  layoutC4Context,
+  layoutC4Containers,
+  layoutC4Components,
+  layoutC4Deployment,
+  rollUpContextRelationships,
+} from './c4/layout';
 export type {
   C4LayoutResult,
   C4LayoutNode,
@@ -197,30 +204,27 @@ export {
   renderC4DeploymentForExport,
 } from './c4/renderer';
 
-export { parseInitiativeStatus, looksLikeInitiativeStatus } from './initiative-status/parser';
+export { parseBoxesAndLines } from './boxes-and-lines/parser';
 export type {
-  ParsedInitiativeStatus,
-  ISNode,
-  ISEdge,
-  ISGroup,
-  InitiativeStatus,
-} from './initiative-status/types';
-
-export { layoutInitiativeStatus } from './initiative-status/layout';
+  ParsedBoxesAndLines,
+  BLNode,
+  BLEdge,
+  BLGroup,
+} from './boxes-and-lines/types';
+export { layoutBoxesAndLines } from './boxes-and-lines/layout';
 export type {
-  ISLayoutResult,
-  ISLayoutNode,
-  ISLayoutEdge,
-  ISLayoutGroup,
-} from './initiative-status/layout';
-
-export { renderInitiativeStatus, renderInitiativeStatusForExport } from './initiative-status/renderer';
-export type { ISRenderOptions } from './initiative-status/renderer';
-
-export { collapseInitiativeStatus } from './initiative-status/collapse';
-export type { CollapseResult } from './initiative-status/collapse';
+  BLLayoutResult,
+  BLLayoutNode,
+  BLLayoutEdge,
+  BLLayoutGroup,
+} from './boxes-and-lines/layout';
+export {
+  renderBoxesAndLines,
+  renderBoxesAndLinesForExport,
+} from './boxes-and-lines/renderer';
 
-export { filterInitiativeStatusByTags } from './initiative-status/filter';
+export { collapseBoxesAndLines } from './boxes-and-lines/collapse';
+export type { BLCollapseResult } from './boxes-and-lines/collapse';
 
 export { parseSitemap, looksLikeSitemap } from './sitemap/parser';
 
@@ -247,16 +251,42 @@ export { collapseSitemapTree } from './sitemap/collapse';
 
 // ── Infra Chart ────────────────────────────────────────────
 export { parseInfra } from './infra/parser';
-export type { ParsedInfra, InfraNode, InfraEdge, InfraGroup, InfraTagGroup, InfraProperty, InfraDiagnostic, InfraComputeParams, InfraBehaviorKey } from './infra/types';
+export type {
+  ParsedInfra,
+  InfraNode,
+  InfraEdge,
+  InfraGroup,
+  InfraTagGroup,
+  InfraProperty,
+  InfraDiagnostic,
+  InfraComputeParams,
+  InfraBehaviorKey,
+} from './infra/types';
 export { INFRA_BEHAVIOR_KEYS } from './infra/types';
 export { computeInfra } from './infra/compute';
-export type { ComputedInfraModel, ComputedInfraNode, ComputedInfraEdge, InfraLatencyPercentiles, InfraAvailabilityPercentiles, InfraCbState } from './infra/types';
+export type {
+  ComputedInfraModel,
+  ComputedInfraNode,
+  ComputedInfraEdge,
+  InfraLatencyPercentiles,
+  InfraAvailabilityPercentiles,
+  InfraCbState,
+} from './infra/types';
 export { validateInfra, validateComputed } from './infra/validation';
 export { inferRoles, collectDiagramRoles } from './infra/roles';
 export type { InfraRole } from './infra/roles';
 export { layoutInfra } from './infra/layout';
-export type { InfraLayoutResult, InfraLayoutNode, InfraLayoutEdge, InfraLayoutGroup } from './infra/layout';
-export { renderInfra, parseAndLayoutInfra, computeInfraLegendGroups } from './infra/renderer';
+export type {
+  InfraLayoutResult,
+  InfraLayoutNode,
+  InfraLayoutEdge,
+  InfraLayoutGroup,
+} from './infra/layout';
+export {
+  renderInfra,
+  parseAndLayoutInfra,
+  computeInfraLegendGroups,
+} from './infra/renderer';
 export type { InfraLegendGroup, InfraPlaybackState } from './infra/renderer';
 export type { CollapsedSitemapResult } from './sitemap/collapse';
 
@@ -264,7 +294,13 @@ export type { CollapsedSitemapResult } from './sitemap/collapse';
 export { parseGantt } from './gantt/parser';
 export { calculateSchedule } from './gantt/calculator';
 export { renderGantt, buildTagLaneRowList } from './gantt/renderer';
-export type { GanttInteractiveOptions, GanttRow, GanttGroupRow, GanttTaskRow, GanttLaneHeaderRow } from './gantt/renderer';
+export type {
+  GanttInteractiveOptions,
+  GanttRow,
+  GanttGroupRow,
+  GanttTaskRow,
+  GanttLaneHeaderRow,
+} from './gantt/renderer';
 export { resolveTaskName, collectTasks } from './gantt/resolver';
 export type {
   ParsedGantt,
@@ -288,7 +324,11 @@ export { collapseOrgTree } from './org/collapse';
 export type { CollapsedOrgResult } from './org/collapse';
 
 export { resolveOrgImports } from './org/resolver';
-export type { ReadFileFn, ResolveImportsResult, ImportSource } from './org/resolver';
+export type {
+  ReadFileFn,
+  ResolveImportsResult,
+  ImportSource,
+} from './org/resolver';
 
 export { layoutGraph } from './graph/layout';
 export type {
@@ -298,13 +338,23 @@ export type {
   LayoutGroup,
 } from './graph/layout';
 
-export { renderFlowchart, renderFlowchartForExport } from './graph/flowchart-renderer';
+export {
+  renderFlowchart,
+  renderFlowchartForExport,
+} from './graph/flowchart-renderer';
 
 // ============================================================
 // Config Builders (produce framework-specific config objects)
 // ============================================================
 
-export { buildExtendedChartOption, buildSimpleChartOption, renderExtendedChartForExport, getExtendedChartLegendGroups, getSimpleChartLegendGroups, computeScatterLabelGraphics } from './echarts';
+export {
+  buildExtendedChartOption,
+  buildSimpleChartOption,
+  renderExtendedChartForExport,
+  getExtendedChartLegendGroups,
+  getSimpleChartLegendGroups,
+  computeScatterLabelGraphics,
+} from './echarts';
 export type { ScatterLabelPoint } from './echarts';
 export { renderLegendSvg, type LegendGroupData } from './utils/legend-svg';
 export { LEGEND_HEIGHT } from './utils/legend-constants';
@@ -403,7 +453,13 @@ export {
   PIPE_METADATA,
   extractTagDeclarations,
 } from './completion';
-export type { DiagramSymbols, ExtractFn, DirectiveSpec, DirectiveValueSpec, PipeKeySpec } from './completion';
+export type {
+  DiagramSymbols,
+  ExtractFn,
+  DirectiveSpec,
+  DirectiveValueSpec,
+  PipeKeySpec,
+} from './completion';
 
 export { parseFirstLine, ALL_CHART_TYPES } from './utils/parsing';
 

package/src/infra/parser.ts

@@ -12,7 +12,7 @@ import {
   parseFirstLine,
   OPTION_NOCOLON_RE,
 } from '../utils/parsing';
-import { matchTagBlockHeading } from '../utils/tag-groups';
+import { matchTagBlockHeading, stripDefaultModifier } from '../utils/tag-groups';
 import type {
   ParsedInfra,
   InfraNode,
@@ -338,17 +338,19 @@ export function parseInfra(content: string): ParsedInfra {
 
     // ---- Indented lines ----
 
-    // Tag value inside tag group — first value is the default
+    // Tag value inside tag group — first value is the default unless another is marked `default`
     if (currentTagGroup && indent > 0) {
-      const tvMatch = trimmed.match(TAG_VALUE_RE);
+      const { text: cleanEntry, isDefault } = stripDefaultModifier(trimmed);
+      const tvMatch = cleanEntry.match(TAG_VALUE_RE);
       if (tvMatch) {
         const valueName = tvMatch[1].trim();
         currentTagGroup.values.push({
           name: valueName,
           color: tvMatch[2]?.trim(),
         });
-        // First value is the default
-        if (currentTagGroup.values.length === 1) {
+        if (isDefault) {
+          currentTagGroup.defaultValue = valueName;
+        } else if (currentTagGroup.values.length === 1) {
           currentTagGroup.defaultValue = valueName;
         }
         continue;

package/src/infra/renderer.ts

@@ -2069,8 +2069,8 @@ function renderLegend(
     }
 
     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

package/src/kanban/parser.ts

@@ -1,7 +1,7 @@
 import type { PaletteColors } from '../palettes';
 import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
 import { resolveColor } from '../colors';
-import { matchTagBlockHeading } from '../utils/tag-groups';
+import { matchTagBlockHeading, stripDefaultModifier } from '../utils/tag-groups';
 import {
   measureIndent,
   extractColor,
@@ -166,11 +166,12 @@ export function parseKanban(
     }
 
     // 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) {
           warn(
             lineNumber,
@@ -178,8 +179,9 @@ export function parseKanban(
           );
           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/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({