@diagrammo/dgmo 0.8.2 → 0.8.4

package/src/sitemap/parser.ts

@@ -6,26 +6,22 @@ import type { PaletteColors } from '../palettes';
 import { resolveColor } from '../colors';
 import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
 import type { TagGroup } from '../utils/tag-groups';
-import { isTagBlockHeading, matchTagBlockHeading, validateTagValues } from '../utils/tag-groups';
+import {
+  isTagBlockHeading,
+  matchTagBlockHeading,
+  validateTagValues,
+} from '../utils/tag-groups';
 import {
   measureIndent,
   extractColor,
   parsePipeMetadata,
-  normalizeDirection,
   inferArrowColor,
-  MULTIPLE_PIPE_WARNING,
-  CHART_TYPE_RE,
-  TITLE_RE,
-  OPTION_RE,
+  MULTIPLE_PIPE_ERROR,
   parseFirstLine,
   OPTION_NOCOLON_RE,
   ALL_CHART_TYPES,
 } from '../utils/parsing';
-import type {
-  SitemapNode,
-  SitemapDirection,
-  ParsedSitemap,
-} from './types';
+import type { SitemapNode, ParsedSitemap } from './types';
 
 // ============================================================
 // Regexes
@@ -48,7 +44,7 @@ const BARE_ARROW_RE = /^->\s*(.+)$/;
 
 function parseArrowLine(
   trimmed: string,
-  palette?: PaletteColors,
+  palette?: PaletteColors
 ): { label?: string; color?: string; target: string } | null {
   // Bare arrow: -> Target
   const bareMatch = trimmed.match(BARE_ARROW_RE);
@@ -61,7 +57,7 @@ function parseArrowLine(
   if (arrowMatch) {
     const label = arrowMatch[1]?.trim() || undefined;
     let color = arrowMatch[2]
-      ? resolveColor(arrowMatch[2].trim(), palette) ?? undefined
+      ? (resolveColor(arrowMatch[2].trim(), palette) ?? undefined)
       : undefined;
     if (label && !color) {
       color = inferArrowColor(label);
@@ -92,7 +88,7 @@ export function looksLikeSitemap(content: string): boolean {
     if (!trimmed || trimmed.startsWith('//')) continue;
 
     // Skip header lines
-    if (CHART_TYPE_RE.test(trimmed) || TITLE_RE.test(trimmed)) continue;
+    if (parseFirstLine(trimmed)) continue;
     if (isTagBlockHeading(trimmed)) continue;
 
     if (/^-.*->\s*.+/.test(trimmed) || /^->\s*.+/.test(trimmed)) {
@@ -108,7 +104,7 @@ export function looksLikeSitemap(content: string): boolean {
   // Exclude flowchart: flowchart arrows connect shaped nodes like (X) -> [Y]
   // Sitemap arrows are indented under a parent node, target is plain text
   const hasFlowchartShapes =
-    /[\])][ \t]*-.*->/.test(content) || /->[ \t]*[\[(<\/]/.test(content);
+    /[\])][ \t]*-.*->/.test(content) || /->[ \t]*[[(</]/.test(content);
 
   return !hasFlowchartShapes;
 }
@@ -119,12 +115,12 @@ export function looksLikeSitemap(content: string): boolean {
 
 export function parseSitemap(
   content: string,
-  palette?: PaletteColors,
+  palette?: PaletteColors
 ): ParsedSitemap {
   const result: ParsedSitemap = {
     title: null,
     titleLineNumber: null,
-    direction: 'TB',
+    direction: 'LR',
     roots: [],
     edges: [],
     tagGroups: [],
@@ -226,10 +222,6 @@ export function parseSitemap(
         pushError(lineNumber, 'Tag groups must appear before sitemap content');
         continue;
       }
-      if (tagBlockMatch.deprecated) {
-        pushError(lineNumber, `'## ${tagBlockMatch.name}' is no longer supported — use 'tag: ${tagBlockMatch.name}' instead`);
-        continue;
-      }
       currentTagGroup = {
         name: tagBlockMatch.name,
         alias: tagBlockMatch.alias,
@@ -237,7 +229,10 @@ export function parseSitemap(
         lineNumber,
       };
       if (tagBlockMatch.alias) {
-        aliasMap.set(tagBlockMatch.alias.toLowerCase(), tagBlockMatch.name.toLowerCase());
+        aliasMap.set(
+          tagBlockMatch.alias.toLowerCase(),
+          tagBlockMatch.name.toLowerCase()
+        );
       }
       result.tagGroups.push(currentTagGroup);
       continue;
@@ -245,18 +240,22 @@ export function parseSitemap(
 
     // Generic header options (space-separated, before content/tag groups)
     // Skip lines with `|` (pipe metadata) or `->` (arrows) — those are content
-    if (!contentStarted && !currentTagGroup && measureIndent(line) === 0
-        && !trimmed.includes('|') && !trimmed.includes('->')) {
+    if (
+      !contentStarted &&
+      !currentTagGroup &&
+      measureIndent(line) === 0 &&
+      !trimmed.includes('|') &&
+      !trimmed.includes('->')
+    ) {
+      // Bare boolean: direction-tb
+      if (/^direction-tb$/i.test(trimmed)) {
+        result.direction = 'TB';
+        continue;
+      }
+
       const optMatch = trimmed.match(OPTION_NOCOLON_RE);
       if (optMatch) {
         const key = optMatch[1].trim().toLowerCase();
-        if (key === 'direction' || key === 'orientation') {
-          const dir = normalizeDirection(optMatch[2]);
-          if (dir) {
-            result.direction = dir as SitemapDirection;
-          }
-          continue;
-        }
         result.options[key] = optMatch[2].trim();
         continue;
       }
@@ -270,7 +269,7 @@ export function parseSitemap(
         if (!color) {
           pushError(
             lineNumber,
-            `Expected 'Value(color)' in tag group '${currentTagGroup.name}'`,
+            `Expected 'Value(color)' in tag group '${currentTagGroup.name}'`
           );
           continue;
         }
@@ -286,7 +285,7 @@ export function parseSitemap(
         continue;
       }
       // Non-indented line after tag group — fall through to content
-      currentTagGroup = null;
+      currentTagGroup = null; // eslint-disable-line no-useless-assignment
     }
 
     // --- Content phase ---
@@ -320,8 +319,9 @@ export function parseSitemap(
     const containerMatch = trimmed.match(CONTAINER_RE);
 
     // Check for metadata syntax: key: value
-    const metadataMatch =
-      trimmed.includes('|') ? null : trimmed.match(METADATA_RE);
+    const metadataMatch = trimmed.includes('|')
+      ? null
+      : trimmed.match(METADATA_RE);
 
     if (containerMatch) {
       const rawLabel = containerMatch[1].trim();
@@ -333,7 +333,10 @@ export function parseSitemap(
       if (pipeStr) {
         // Build segments array compatible with parsePipeMetadata (first element is label, rest are pipe parts)
         const pipeSegments = ['', pipeStr];
-        Object.assign(containerMetadata, parsePipeMetadata(pipeSegments, aliasMap));
+        Object.assign(
+          containerMetadata,
+          parsePipeMetadata(pipeSegments, aliasMap)
+        );
       }
 
       containerCounter++;
@@ -365,7 +368,14 @@ export function parseSitemap(
     } else if (metadataMatch && indentStack.length === 0) {
       // Could be a node label containing ':'
       if (indent === 0) {
-        const node = parseNodeLabel(trimmed, lineNumber, palette, ++nodeCounter, aliasMap, pushWarning);
+        const node = parseNodeLabel(
+          trimmed,
+          lineNumber,
+          palette,
+          ++nodeCounter,
+          aliasMap,
+          pushWarning
+        );
         attachNode(node, indent, indentStack, result);
         labelToNode.set(node.label.toLowerCase(), node);
       } else {
@@ -373,7 +383,14 @@ export function parseSitemap(
       }
     } else {
       // Node label — possibly with pipe-delimited metadata
-      const node = parseNodeLabel(trimmed, lineNumber, palette, ++nodeCounter, aliasMap, pushWarning);
+      const node = parseNodeLabel(
+        trimmed,
+        lineNumber,
+        palette,
+        ++nodeCounter,
+        aliasMap,
+        pushWarning
+      );
       attachNode(node, indent, indentStack, result);
       labelToNode.set(node.label.toLowerCase(), node);
     }
@@ -416,7 +433,11 @@ export function parseSitemap(
     validateTagValues(allNodes, result.tagGroups, pushWarning, suggest);
   }
 
-  if (result.roots.length === 0 && result.tagGroups.length === 0 && !result.error) {
+  if (
+    result.roots.length === 0 &&
+    result.tagGroups.length === 0 &&
+    !result.error
+  ) {
     const diag = makeDgmoError(1, 'No pages found in sitemap');
     result.diagnostics.push(diag);
     result.error = formatDgmoError(diag);
@@ -435,12 +456,16 @@ function parseNodeLabel(
   palette: PaletteColors | undefined,
   counter: number,
   aliasMap: Map<string, string> = new Map(),
-  warnFn?: (line: number, msg: string) => void,
+  warnFn?: (line: number, msg: string) => void
 ): SitemapNode {
   const segments = trimmed.split('|').map((s) => s.trim());
   const rawLabel = segments[0];
   const { label, color } = extractColor(rawLabel, palette);
-  const metadata = parsePipeMetadata(segments, aliasMap, warnFn ? () => warnFn(lineNumber, MULTIPLE_PIPE_WARNING) : undefined);
+  const metadata = parsePipeMetadata(
+    segments,
+    aliasMap,
+    warnFn ? () => warnFn(lineNumber, MULTIPLE_PIPE_ERROR) : undefined
+  );
 
   return {
     id: `node-${counter}`,
@@ -458,7 +483,7 @@ function attachNode(
   node: SitemapNode,
   indent: number,
   indentStack: { node: SitemapNode; indent: number }[],
-  result: ParsedSitemap,
+  result: ParsedSitemap
 ): void {
   // Pop stack entries with indent >= current indent
   while (indentStack.length > 0) {
@@ -471,7 +496,11 @@ function attachNode(
     const parent = indentStack[indentStack.length - 1].node;
     node.parentId = parent.id;
     // Cascade container metadata to child nodes (child overrides on conflict)
-    if (parent.isContainer && Object.keys(parent.metadata).length > 0 && !node.isContainer) {
+    if (
+      parent.isContainer &&
+      Object.keys(parent.metadata).length > 0 &&
+      !node.isContainer
+    ) {
       node.metadata = { ...parent.metadata, ...node.metadata };
     }
     parent.children.push(node);
@@ -484,7 +513,7 @@ function attachNode(
 
 function findParentNode(
   indent: number,
-  indentStack: { node: SitemapNode; indent: number }[],
+  indentStack: { node: SitemapNode; indent: number }[]
 ): SitemapNode | null {
   for (let i = indentStack.length - 1; i >= 0; i--) {
     if (indentStack[i].indent < indent) {

package/src/utils/arrows.ts

@@ -34,7 +34,7 @@ const ARROW_CHARS = ['->', '~>'];
  *  - `null` if not a labeled arrow (caller should fall through to bare patterns)
  */
 export function parseArrow(
-  line: string,
+  line: string
 ): ParsedArrow | { error: string } | null {
   // Check bidi patterns first — return error
   if (BIDI_SYNC_RE.test(line) || BIDI_ASYNC_RE.test(line)) {
@@ -47,8 +47,7 @@ export function parseArrow(
   // Check deprecated return arrow patterns — return error
   if (RETURN_SYNC_LABELED_RE.test(line) || RETURN_ASYNC_LABELED_RE.test(line)) {
     const m =
-      line.match(RETURN_SYNC_LABELED_RE) ??
-      line.match(RETURN_ASYNC_LABELED_RE);
+      line.match(RETURN_SYNC_LABELED_RE) ?? line.match(RETURN_ASYNC_LABELED_RE);
     const from = m![3];
     const to = m![1];
     const label = m![2].trim();
@@ -93,22 +92,3 @@ export function parseArrow(
 
   return null;
 }
-
-/**
- * Match an arrow segment and extract label + async flag.
- * Handles: `->`, `-label->`, `~>`, `~label~>`.
- * Returns null if no arrow pattern matched.
- */
-export function matchArrowLabel(segment: string): { label: string; async: boolean } | null {
-  // Async labeled: ~label~>
-  const asyncLabeled = segment.match(/^~(.+?)~>$/);
-  if (asyncLabeled) return { label: asyncLabeled[1].trim(), async: true };
-  // Async bare: ~>
-  if (segment.trim() === '~>') return { label: '', async: true };
-  // Sync labeled: -label->
-  const syncLabeled = segment.match(/^-(.+?)->$/);
-  if (syncLabeled) return { label: syncLabeled[1].trim(), async: false };
-  // Sync bare: ->
-  if (segment.trim() === '->') return { label: '', async: false };
-  return null;
-}

package/src/utils/duration.ts

@@ -2,12 +2,26 @@
 // Duration & Business Day Arithmetic
 // ============================================================
 
-import type { Duration, DurationUnit, GanttHolidays, Offset, Weekday } from '../gantt/types';
+import type {
+  Duration,
+  DurationUnit,
+  GanttHolidays,
+  Offset,
+  Weekday,
+} from '../gantt/types';
 
 // ── Weekday constants ─────────────────────────────────────
 
 /** JS Date.getDay() → Weekday mapping (0=Sun, 1=Mon, ..., 6=Sat) */
-const JS_DAY_TO_WEEKDAY: Weekday[] = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'];
+const JS_DAY_TO_WEEKDAY: Weekday[] = [
+  'sun',
+  'mon',
+  'tue',
+  'wed',
+  'thu',
+  'fri',
+  'sat',
+];
 
 /**
  * Check if a date is a workday (not a weekend and not a holiday).
@@ -15,7 +29,7 @@ const JS_DAY_TO_WEEKDAY: Weekday[] = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri',
 export function isWorkday(
   date: Date,
   workweek: Weekday[],
-  holidaySet: Set<string>,
+  holidaySet: Set<string>
 ): boolean {
   const dayName = JS_DAY_TO_WEEKDAY[date.getDay()];
   if (!workweek.includes(dayName)) return false;
@@ -68,7 +82,7 @@ export function addBusinessDays(
   count: number,
   workweek: Weekday[],
   holidaySet: Set<string>,
-  direction: 1 | -1 = 1,
+  direction: 1 | -1 = 1
 ): Date {
   const days = Math.round(Math.abs(count));
   if (days === 0) return new Date(startDate);
@@ -97,13 +111,19 @@ export function addGanttDuration(
   duration: Duration,
   holidays: GanttHolidays,
   holidaySet: Set<string>,
-  direction: 1 | -1 = 1,
+  direction: 1 | -1 = 1
 ): Date {
   const { amount, unit } = duration;
 
   switch (unit) {
     case 'bd':
-      return addBusinessDays(startDate, amount, holidays.workweek, holidaySet, direction);
+      return addBusinessDays(
+        startDate,
+        amount,
+        holidays.workweek,
+        holidaySet,
+        direction
+      );
 
     case 'd': {
       const result = new Date(startDate);
@@ -119,8 +139,10 @@ export function addGanttDuration(
 
     case 'm': {
       const result = new Date(startDate);
-      const wholeMonths = direction === -1 ? Math.round(amount) : Math.floor(amount);
-      const fractionalDays = direction === -1 ? 0 : Math.round((amount - wholeMonths) * 30);
+      const wholeMonths =
+        direction === -1 ? Math.round(amount) : Math.floor(amount);
+      const fractionalDays =
+        direction === -1 ? 0 : Math.round((amount - wholeMonths) * 30);
       result.setMonth(result.getMonth() + wholeMonths * direction);
       if (fractionalDays > 0) {
         result.setDate(result.getDate() + fractionalDays * direction);
@@ -131,8 +153,10 @@ export function addGanttDuration(
     case 'q': {
       const result = new Date(startDate);
       const totalMonths = amount * 3;
-      const wholeMonths = direction === -1 ? Math.round(totalMonths) : Math.floor(totalMonths);
-      const fractionalDays = direction === -1 ? 0 : Math.round((totalMonths - wholeMonths) * 30);
+      const wholeMonths =
+        direction === -1 ? Math.round(totalMonths) : Math.floor(totalMonths);
+      const fractionalDays =
+        direction === -1 ? 0 : Math.round((totalMonths - wholeMonths) * 30);
       result.setMonth(result.getMonth() + wholeMonths * direction);
       if (fractionalDays > 0) {
         result.setDate(result.getDate() + fractionalDays * direction);
@@ -142,8 +166,10 @@ export function addGanttDuration(
 
     case 'y': {
       const result = new Date(startDate);
-      const wholeYears = direction === -1 ? Math.round(amount) : Math.floor(amount);
-      const fractionalMonths = direction === -1 ? 0 : Math.round((amount - wholeYears) * 12);
+      const wholeYears =
+        direction === -1 ? Math.round(amount) : Math.floor(amount);
+      const fractionalMonths =
+        direction === -1 ? 0 : Math.round((amount - wholeYears) * 12);
       result.setFullYear(result.getFullYear() + wholeYears * direction);
       if (fractionalMonths > 0) {
         result.setMonth(result.getMonth() + fractionalMonths * direction);
@@ -221,7 +247,7 @@ export function parseGanttDate(s: string): Date {
     }
   }
 
-  const parts = datePart.split('-').map(p => parseInt(p, 10));
+  const parts = datePart.split('-').map((p) => parseInt(p, 10));
   const year = parts[0];
   const month = parts.length >= 2 ? parts[1] - 1 : 0; // JS months are 0-based
   const day = parts.length >= 3 ? parts[2] : 1;
@@ -238,11 +264,3 @@ export function formatGanttDate(date: Date): string {
   if (h === 0 && m === 0) return dateStr;
   return `${dateStr} ${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}`;
 }
-
-/**
- * Calculate the difference in calendar days between two dates.
- */
-export function daysBetween(a: Date, b: Date): number {
-  const msPerDay = 86400000;
-  return Math.round((b.getTime() - a.getTime()) / msPerDay);
-}

package/src/utils/legend-constants.ts

@@ -6,11 +6,9 @@
 export const LEGEND_HEIGHT = 28;
 export const LEGEND_PILL_PAD = 16;
 export const LEGEND_PILL_FONT_SIZE = 11;
-export const LEGEND_PILL_FONT_W = LEGEND_PILL_FONT_SIZE * 0.6;
 export const LEGEND_CAPSULE_PAD = 4;
 export const LEGEND_DOT_R = 4;
 export const LEGEND_ENTRY_FONT_SIZE = 10;
-export const LEGEND_ENTRY_FONT_W = LEGEND_ENTRY_FONT_SIZE * 0.6;
 export const LEGEND_ENTRY_DOT_GAP = 4;
 export const LEGEND_ENTRY_TRAIL = 8;
 export const LEGEND_GROUP_GAP = 12;