@diagrammo/dgmo 0.8.2 → 0.8.4

package/src/graph/flowchart-parser.ts

@@ -4,22 +4,12 @@ import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
 import {
   measureIndent,
   extractColor,
-  normalizeDirection,
   inferArrowColor,
   parseFirstLine,
   OPTION_NOCOLON_RE,
-  GROUP_HASH_RE,
-  DOUBLE_HASH_RE,
   ALL_CHART_TYPES,
 } from '../utils/parsing';
-import type {
-  ParsedGraph,
-  GraphNode,
-  GraphEdge,
-  GraphGroup,
-  GraphShape,
-  GraphDirection,
-} from './types';
+import type { ParsedGraph, GraphNode, GraphEdge, GraphShape } from './types';
 
 // ============================================================
 // Helpers
@@ -40,10 +30,7 @@ interface NodeRef {
  * Try to parse a node reference from a text fragment.
  * Order matters: subroutine & document before process.
  */
-function parseNodeRef(
-  text: string,
-  palette?: PaletteColors
-): NodeRef | null {
+function parseNodeRef(text: string, palette?: PaletteColors): NodeRef | null {
   const t = text.trim();
   if (!t) return null;
 
@@ -51,7 +38,12 @@ function parseNodeRef(
   let m = t.match(/^\[\[([^\]]+)\]\]$/);
   if (m) {
     const { label, color } = extractColor(m[1].trim(), palette);
-    return { id: nodeId('subroutine', label), label, shape: 'subroutine', color };
+    return {
+      id: nodeId('subroutine', label),
+      label,
+      shape: 'subroutine',
+      color,
+    };
   }
 
   // Document: [Label~]
@@ -103,7 +95,12 @@ function splitArrows(line: string): string[] {
   const segments: string[] = [];
   let lastIndex = 0;
   // Simpler approach: find all `->` positions, then determine if there's a label prefix
-  const arrowPositions: { start: number; end: number; label?: string; color?: string }[] = [];
+  const arrowPositions: {
+    start: number;
+    end: number;
+    label?: string;
+    color?: string;
+  }[] = [];
 
   // Find all -> occurrences
   let searchFrom = 0;
@@ -128,10 +125,14 @@ function splitArrows(line: string): string[] {
         scanBack--;
       }
       // Check if this `-` could be the start of the arrow
-      if (line[scanBack] === '-' && (scanBack === 0 || /\s/.test(line[scanBack - 1]))) {
+      if (
+        line[scanBack] === '-' &&
+        (scanBack === 0 || /\s/.test(line[scanBack - 1]))
+      ) {
         // Content between opening `-` and `->` (strip trailing `-` that is part of `->`)
         let arrowContent = line.substring(scanBack + 1, idx);
-        if (arrowContent.endsWith('-')) arrowContent = arrowContent.slice(0, -1);
+        if (arrowContent.endsWith('-'))
+          arrowContent = arrowContent.slice(0, -1);
         // Parse label and color from arrow content
         const colorMatch = arrowContent.match(/\(([^)]+)\)\s*$/);
         if (colorMatch) {
@@ -163,7 +164,8 @@ function splitArrows(line: string): string[] {
     }
     // Arrow marker
     let arrowToken = '->';
-    if (arrow.label && arrow.color) arrowToken = `-${arrow.label}(${arrow.color})->`;
+    if (arrow.label && arrow.color)
+      arrowToken = `-${arrow.label}(${arrow.color})->`;
     else if (arrow.label) arrowToken = `-${arrow.label}->`;
     else if (arrow.color) arrowToken = `-(${arrow.color})->`;
     segments.push(arrowToken);
@@ -194,7 +196,9 @@ function parseArrowToken(token: string, palette?: PaletteColors): ArrowInfo {
   const m = token.match(/^-(.+?)(?:\(([^)]+)\))?->$/);
   if (m) {
     const label = m[1]?.trim() || undefined;
-    let color = m[2] ? resolveColor(m[2].trim(), palette) ?? undefined : undefined;
+    let color = m[2]
+      ? (resolveColor(m[2].trim(), palette) ?? undefined)
+      : undefined;
     if (label && !color) {
       color = inferArrowColor(label);
     }
@@ -238,11 +242,6 @@ export function parseFlowchart(
   let contentStarted = false;
   let firstLineParsed = false;
 
-  // Group support
-  let currentGroup: GraphGroup | null = null;
-  let groupIndent = -1;
-  const groups: GraphGroup[] = [];
-
   function getOrCreateNode(ref: NodeRef, lineNumber: number): GraphNode {
     const existing = nodeMap.get(ref.id);
     if (existing) return existing;
@@ -253,15 +252,10 @@ export function parseFlowchart(
       shape: ref.shape,
       lineNumber,
       ...(ref.color && { color: ref.color }),
-      ...(currentGroup && { group: currentGroup.id }),
     };
     nodeMap.set(ref.id, node);
     result.nodes.push(node);
 
-    if (currentGroup && !currentGroup.nodeIds.includes(ref.id)) {
-      currentGroup.nodeIds.push(ref.id);
-    }
-
     return node;
   }
 
@@ -418,45 +412,19 @@ export function parseFlowchart(
       }
     }
 
-    // ## group headings — emit helpful error
-    if (DOUBLE_HASH_RE.test(trimmed)) {
-      result.diagnostics.push(
-        makeDgmoError(lineNumber, 'Use `#` for groups \u2014 nesting is done with indentation.', 'error')
-      );
-      continue;
-    }
-
-    // # GroupName — alternate group notation
-    const hashGroupMatch = trimmed.match(GROUP_HASH_RE);
-    if (hashGroupMatch) {
-      const { label, color } = extractColor(hashGroupMatch[1].trim(), palette);
-      currentGroup = {
-        id: `group:${label.toLowerCase()}`,
-        label,
-        nodeIds: [],
-        lineNumber,
-        ...(color && { color }),
-      };
-      groupIndent = indent;
-      groups.push(currentGroup);
-      continue;
-    }
-
     // Options (space-separated, before content)
     if (!contentStarted) {
+      // Bare boolean: direction-lr
+      if (/^direction-lr$/i.test(trimmed)) {
+        result.direction = 'LR';
+        continue;
+      }
+
       const optMatch = trimmed.match(OPTION_NOCOLON_RE);
       if (optMatch && !trimmed.includes('->')) {
         const key = optMatch[1].toLowerCase();
         const value = optMatch[2].trim();
 
-        if (key === 'direction' || key === 'orientation') {
-          const dir = normalizeDirection(value);
-          if (dir) {
-            result.direction = dir;
-          }
-          continue;
-        }
-
         // Boolean: no-color = color off
         if (key === 'no-color') {
           result.options['color'] = 'off';
@@ -469,21 +437,16 @@ export function parseFlowchart(
       }
     }
 
-    // Close current group when indent returns to or below the group level
-    if (currentGroup && indent <= groupIndent) {
-      currentGroup = null;
-      groupIndent = -1;
-    }
-
     // Content line (nodes and edges)
     processContentLine(trimmed, lineNumber, indent);
   }
 
-  if (groups.length > 0) result.groups = groups;
-
   // Validation: no nodes found
   if (result.nodes.length === 0 && !result.error) {
-    const diag = makeDgmoError(1, 'No nodes found. Add flowchart content with shape syntax like [Process] or (Start).');
+    const diag = makeDgmoError(
+      1,
+      'No nodes found. Add flowchart content with shape syntax like [Process] or (Start).'
+    );
     result.diagnostics.push(diag);
     result.error = formatDgmoError(diag);
   }
@@ -497,7 +460,13 @@ export function parseFlowchart(
     }
     for (const node of result.nodes) {
       if (!connectedIds.has(node.id)) {
-        result.diagnostics.push(makeDgmoError(node.lineNumber, `Node "${node.label}" is not connected to any other node`, 'warning'));
+        result.diagnostics.push(
+          makeDgmoError(
+            node.lineNumber,
+            `Node "${node.label}" is not connected to any other node`,
+            'warning'
+          )
+        );
       }
     }
   }
@@ -533,7 +502,7 @@ export function looksLikeFlowchart(content: string): boolean {
   // Look for patterns like `[X] ->` or `-> [X]` or `(X) ->` etc.
   const shapeNearArrow =
     /[\])][ \t]*-.*->/.test(content) || // shape ] or ) followed by arrow
-    /->[ \t]*[\[(<\/]/.test(content); // arrow followed by shape opener
+    /->[ \t]*[[(</]/.test(content); // arrow followed by shape opener
 
   return shapeNearArrow;
 }
@@ -557,7 +526,11 @@ export function extractSymbols(docText: string): DiagramSymbols {
   for (const rawLine of docText.split('\n')) {
     const line = rawLine.trim();
     // Skip old-style colon metadata and new-style space-separated options
-    if (inMetadata && (/^[a-z-]+\s*:/i.test(line) || /^[a-z-]+\s+\S/i.test(line))) continue;
+    if (
+      inMetadata &&
+      (/^[a-z-]+\s*:/i.test(line) || /^[a-z-]+\s+\S/i.test(line))
+    )
+      continue;
     inMetadata = false;
     if (line.length === 0 || /^\s/.test(rawLine)) continue;
     const m = NODE_ID_RE.exec(line);

package/src/graph/state-parser.ts

@@ -4,17 +4,11 @@ import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
 import {
   measureIndent,
   extractColor,
-  normalizeDirection,
   parseFirstLine,
   OPTION_NOCOLON_RE,
   ALL_CHART_TYPES,
 } from '../utils/parsing';
-import type {
-  ParsedGraph,
-  GraphNode,
-  GraphGroup,
-  GraphDirection,
-} from './types';
+import type { ParsedGraph, GraphNode, GraphGroup } from './types';
 
 // ============================================================
 // Constants
@@ -37,7 +31,12 @@ const GROUP_BRACKET_RE = /^\[([^\]]+)\](?:\(([^)]+)\))?\s*$/;
  */
 function splitArrows(line: string): string[] {
   const segments: string[] = [];
-  const arrowPositions: { start: number; end: number; label?: string; color?: string }[] = [];
+  const arrowPositions: {
+    start: number;
+    end: number;
+    label?: string;
+    color?: string;
+  }[] = [];
 
   let searchFrom = 0;
   while (searchFrom < line.length) {
@@ -53,9 +52,13 @@ function splitArrows(line: string): string[] {
       while (scanBack > 0 && line[scanBack] !== '-') {
         scanBack--;
       }
-      if (line[scanBack] === '-' && (scanBack === 0 || /\s/.test(line[scanBack - 1]))) {
+      if (
+        line[scanBack] === '-' &&
+        (scanBack === 0 || /\s/.test(line[scanBack - 1]))
+      ) {
         let arrowContent = line.substring(scanBack + 1, idx);
-        if (arrowContent.endsWith('-')) arrowContent = arrowContent.slice(0, -1);
+        if (arrowContent.endsWith('-'))
+          arrowContent = arrowContent.slice(0, -1);
         const colorMatch = arrowContent.match(/\(([^)]+)\)\s*$/);
         if (colorMatch) {
           color = colorMatch[1].trim();
@@ -82,7 +85,8 @@ function splitArrows(line: string): string[] {
     if (beforeText || i === 0) segments.push(beforeText);
 
     let arrowToken = '->';
-    if (arrow.label && arrow.color) arrowToken = `-${arrow.label}(${arrow.color})->`;
+    if (arrow.label && arrow.color)
+      arrowToken = `-${arrow.label}(${arrow.color})->`;
     else if (arrow.label) arrowToken = `-${arrow.label}->`;
     else if (arrow.color) arrowToken = `-(${arrow.color})->`;
     segments.push(arrowToken);
@@ -102,11 +106,14 @@ interface ArrowInfo {
 function parseArrowToken(token: string, palette?: PaletteColors): ArrowInfo {
   if (token === '->') return {};
   const colorOnly = token.match(/^-\(([^)]+)\)->$/);
-  if (colorOnly) return { color: resolveColor(colorOnly[1].trim(), palette) ?? undefined };
+  if (colorOnly)
+    return { color: resolveColor(colorOnly[1].trim(), palette) ?? undefined };
   const m = token.match(/^-(.+?)(?:\(([^)]+)\))?->$/);
   if (m) {
     const label = m[1]?.trim() || undefined;
-    const color = m[2] ? resolveColor(m[2].trim(), palette) ?? undefined : undefined;
+    const color = m[2]
+      ? (resolveColor(m[2].trim(), palette) ?? undefined)
+      : undefined;
     return { label, color };
   }
   return {};
@@ -123,13 +130,20 @@ interface NodeRef {
   color?: string;
 }
 
-function parseStateNodeRef(text: string, palette?: PaletteColors): NodeRef | null {
+function parseStateNodeRef(
+  text: string,
+  palette?: PaletteColors
+): NodeRef | null {
   const t = text.trim();
   if (!t) return null;
 
   // Pseudostate: [*]
   if (t === '[*]') {
-    return { id: PSEUDOSTATE_ID, label: PSEUDOSTATE_LABEL, shape: 'pseudostate' };
+    return {
+      id: PSEUDOSTATE_ID,
+      label: PSEUDOSTATE_LABEL,
+      shape: 'pseudostate',
+    };
   }
 
   // State: bare text with optional (color) suffix
@@ -154,7 +168,7 @@ export function parseState(
   const lines = content.split('\n');
   const result: ParsedGraph = {
     type: 'state',
-    direction: 'TB',
+    direction: 'LR',
     nodes: [],
     edges: [],
     options: {},
@@ -268,19 +282,17 @@ export function parseState(
 
     // Options (space-separated, before content)
     if (!contentStarted) {
+      // Bare boolean: direction-tb
+      if (/^direction-tb$/i.test(trimmed)) {
+        result.direction = 'TB';
+        continue;
+      }
+
       const optMatch = trimmed.match(OPTION_NOCOLON_RE);
       if (optMatch && !trimmed.includes('->')) {
         const key = optMatch[1].toLowerCase();
         const value = optMatch[2].trim();
 
-        if (key === 'direction' || key === 'orientation') {
-          const dir = normalizeDirection(value);
-          if (dir) {
-            result.direction = dir;
-          }
-          continue;
-        }
-
         // Boolean: no-color = color off
         if (key === 'no-color') {
           result.options['color'] = 'off';
@@ -353,7 +365,13 @@ export function parseState(
         // Use explicit source if available, else implicit from indent
         const sourceId = lastNodeId ?? implicitSourceId;
         if (sourceId) {
-          addEdge(sourceId, node.id, lineNumber, pendingArrow.label, pendingArrow.color);
+          addEdge(
+            sourceId,
+            node.id,
+            lineNumber,
+            pendingArrow.label,
+            pendingArrow.color
+          );
         }
         pendingArrow = null;
       }
@@ -370,7 +388,10 @@ export function parseState(
 
   // Validation: no nodes found
   if (result.nodes.length === 0 && !result.error) {
-    const diag = makeDgmoError(1, 'No states found. Add state transitions like: Idle -> Active');
+    const diag = makeDgmoError(
+      1,
+      'No states found. Add state transitions like: Idle -> Active'
+    );
     result.diagnostics.push(diag);
     result.error = formatDgmoError(diag);
   }
@@ -384,7 +405,13 @@ export function parseState(
     }
     for (const node of result.nodes) {
       if (!connectedIds.has(node.id)) {
-        result.diagnostics.push(makeDgmoError(node.lineNumber, `State "${node.label}" is not connected to any other state`, 'warning'));
+        result.diagnostics.push(
+          makeDgmoError(
+            node.lineNumber,
+            `State "${node.label}" is not connected to any other state`,
+            'warning'
+          )
+        );
       }
     }
   }