@diagrammo/dgmo 0.8.2 → 0.8.4

package/src/utils/parsing.ts

@@ -11,14 +11,41 @@ import type { PaletteColors } from '../palettes';
 /** Complete set of recognized chart type identifiers. */
 export const ALL_CHART_TYPES = new Set([
   // data charts
-  'bar', 'line', 'pie', 'doughnut', 'area', 'polar-area', 'radar',
-  'bar-stacked', 'multi-line', 'scatter', 'sankey', 'chord', 'function',
-  'heatmap', 'funnel',
+  'bar',
+  'line',
+  'pie',
+  'doughnut',
+  'area',
+  'polar-area',
+  'radar',
+  'bar-stacked',
+  'multi-line',
+  'scatter',
+  'sankey',
+  'chord',
+  'function',
+  'heatmap',
+  'funnel',
   // visualizations
-  'slope', 'wordcloud', 'arc', 'timeline', 'venn', 'quadrant',
+  'slope',
+  'wordcloud',
+  'arc',
+  'timeline',
+  'venn',
+  'quadrant',
   // diagrams
-  'sequence', 'flowchart', 'class', 'er', 'org', 'kanban', 'c4',
-  'initiative-status', 'state', 'sitemap', 'infra', 'gantt',
+  'sequence',
+  'flowchart',
+  'class',
+  'er',
+  'org',
+  'kanban',
+  'c4',
+  'initiative-status',
+  'state',
+  'sitemap',
+  'infra',
+  'gantt',
 ]);
 
 /** Measure leading whitespace of a line, normalizing tabs to 4 spaces. */
@@ -38,7 +65,7 @@ export const COLOR_SUFFIX_RE = /\(([^)]+)\)\s*$/;
 /** Extract an optional trailing color suffix from a label, resolving via palette. */
 export function extractColor(
   label: string,
-  palette?: PaletteColors,
+  palette?: PaletteColors
 ): { label: string; color?: string } {
   const m = label.match(COLOR_SUFFIX_RE);
   if (!m) return { label };
@@ -49,24 +76,9 @@ export function extractColor(
   };
 }
 
-/** @deprecated Matches `chart: <type>` header lines. Remove after all parsers migrate. */
-export const CHART_TYPE_RE = /^chart\s*:\s*(.+)/i;
-
-/** @deprecated Matches `title: <text>` header lines. Remove after all parsers migrate. */
-export const TITLE_RE = /^title\s*:\s*(.+)/i;
-
-/** @deprecated Matches `option: value` header lines. Remove after all parsers migrate. */
-export const OPTION_RE = /^([a-z][a-z0-9-]*)\s*:\s*(.+)$/i;
-
 /** Matches `option value` header lines (space-separated, no colon). */
 export const OPTION_NOCOLON_RE = /^([a-z][a-z0-9-]*)\s+(.+)$/i;
 
-/** Matches `# GroupName` lines — alternate group notation. */
-export const GROUP_HASH_RE = /^#\s+(.+)$/;
-
-/** Matches `## ...` lines — parse error with helpful hint. */
-export const DOUBLE_HASH_RE = /^##\s/;
-
 // ── New shared utilities ─────────────────────────────────────
 
 /**
@@ -76,29 +88,12 @@ export const DOUBLE_HASH_RE = /^##\s/;
  * Returns `null` if the first token is not a recognized chart type.
  */
 export function parseFirstLine(
-  line: string,
+  line: string
 ): { chartType: string; title: string | undefined } | null {
   const trimmed = line.trim();
   if (!trimmed || trimmed.startsWith('//')) return null;
 
-  // Try old-style `chart: type` first (for transition)
-  const oldMatch = trimmed.match(CHART_TYPE_RE);
-  if (oldMatch) {
-    const parts = oldMatch[1].trim();
-    // Could be `chart: gantt My Title` — first token is type
-    const spaceIdx = parts.indexOf(' ');
-    if (spaceIdx === -1) {
-      const ct = parts.toLowerCase();
-      return ALL_CHART_TYPES.has(ct) ? { chartType: ct, title: undefined } : null;
-    }
-    const ct = parts.substring(0, spaceIdx).toLowerCase();
-    if (ALL_CHART_TYPES.has(ct)) {
-      return { chartType: ct, title: parts.substring(spaceIdx + 1).trim() || undefined };
-    }
-    return null;
-  }
-
-  // New-style: first token is chart type, rest is title
+  // First token is chart type, rest is title
   const spaceIdx = trimmed.indexOf(' ');
   if (spaceIdx === -1) {
     const ct = trimmed.toLowerCase();
@@ -106,7 +101,10 @@ export function parseFirstLine(
   }
   const firstToken = trimmed.substring(0, spaceIdx).toLowerCase();
   if (!ALL_CHART_TYPES.has(firstToken)) return null;
-  return { chartType: firstToken, title: trimmed.substring(spaceIdx + 1).trim() || undefined };
+  return {
+    chartType: firstToken,
+    title: trimmed.substring(spaceIdx + 1).trim() || undefined,
+  };
 }
 
 /** Result of `prescanOptions()` — options collected from a two-pass scan. */
@@ -137,7 +135,7 @@ export interface PrescanResult {
 export function prescanOptions(
   lines: string[],
   knownOptions: Set<string>,
-  knownBooleans: Set<string> = new Set(),
+  knownBooleans: Set<string> = new Set()
 ): PrescanResult {
   const options: Record<string, string> = {};
   const booleans = new Set<string>();
@@ -152,12 +150,15 @@ export function prescanOptions(
 
     // Strip inline comments
     const commentIdx = trimmed.indexOf(' //');
-    const effective = commentIdx >= 0 ? trimmed.substring(0, commentIdx).trim() : trimmed;
+    const effective =
+      commentIdx >= 0 ? trimmed.substring(0, commentIdx).trim() : trimmed;
     if (!effective) continue;
 
     // Extract first token
     const spaceIdx = effective.indexOf(' ');
-    const firstToken = (spaceIdx === -1 ? effective : effective.substring(0, spaceIdx)).toLowerCase();
+    const firstToken = (
+      spaceIdx === -1 ? effective : effective.substring(0, spaceIdx)
+    ).toLowerCase();
 
     // Check for bare boolean (presence = on)
     if (spaceIdx === -1 && knownBooleans.has(firstToken)) {
@@ -210,8 +211,10 @@ export function normalizeGroupedNumber(token: string): string | null {
  */
 export function stripQuotes(token: string): string {
   if (token.length >= 2) {
-    if ((token[0] === '"' && token[token.length - 1] === '"') ||
-        (token[0] === "'" && token[token.length - 1] === "'")) {
+    if (
+      (token[0] === '"' && token[token.length - 1] === '"') ||
+      (token[0] === "'" && token[token.length - 1] === "'")
+    ) {
       return token.substring(1, token.length - 1);
     }
   }
@@ -228,7 +231,10 @@ export function tokenizeQuoteAware(input: string): string[] {
   let i = 0;
   while (i < input.length) {
     // Skip whitespace
-    if (input[i] === ' ' || input[i] === '\t') { i++; continue; }
+    if (input[i] === ' ' || input[i] === '\t') {
+      i++;
+      continue;
+    }
 
     // Quoted token
     if (input[i] === '"' || input[i] === "'") {
@@ -261,7 +267,7 @@ export function tokenizeQuoteAware(input: string): string[] {
  */
 export function collectIndentedValues(
   lines: string[],
-  startIndex: number,
+  startIndex: number
 ): { values: string[]; lineNumbers: number[]; newIndex: number } {
   const values: string[] = [];
   const lineNumbers: number[] = [];
@@ -293,7 +299,7 @@ export function parseSeriesNames(
   value: string,
   lines: string[],
   lineIndex: number,
-  palette?: PaletteColors,
+  palette?: PaletteColors
 ): {
   series: string;
   names: string[];
@@ -304,10 +310,13 @@ export function parseSeriesNames(
   let rawNames: string[];
   let series: string;
   let newIndex = lineIndex;
-  let nameLineNumbers: number[] = [];
+  let nameLineNumbers: number[] = []; // eslint-disable-line no-useless-assignment
   if (value) {
     series = value;
-    rawNames = value.split(',').map((s) => s.trim()).filter(Boolean);
+    rawNames = value
+      .split(',')
+      .map((s) => s.trim())
+      .filter(Boolean);
     // Inline series names all share the same line number
     nameLineNumbers = rawNames.map(() => lineIndex + 1);
   } else {
@@ -330,18 +339,6 @@ export function parseSeriesNames(
   return { series, names, nameColors, nameLineNumbers, newIndex };
 }
 
-/**
- * Normalize a direction/orientation value to canonical form ('LR' | 'TB').
- * Accepts 'lr', 'tb', 'horizontal', 'vertical' (case-insensitive).
- * Returns null if the value is not recognized.
- */
-export function normalizeDirection(value: string): 'LR' | 'TB' | null {
-  const v = value.trim().toLowerCase();
-  if (v === 'lr' || v === 'horizontal') return 'LR';
-  if (v === 'tb' || v === 'vertical') return 'TB';
-  return null;
-}
-
 /**
  * Infer arrow color from label text.
  * Returns a named palette color or undefined if no inference applies.
@@ -350,30 +347,43 @@ export function normalizeDirection(value: string): 'LR' | 'TB' | null {
 export function inferArrowColor(label: string): string | undefined {
   const lower = label.toLowerCase();
   // Green: positive/affirmative
-  if (lower === 'yes' || lower === 'success' || lower === 'ok' || lower === 'true') return 'green';
+  if (
+    lower === 'yes' ||
+    lower === 'success' ||
+    lower === 'ok' ||
+    lower === 'true'
+  )
+    return 'green';
   // Red: negative/failure
-  if (lower === 'no' || lower === 'fail' || lower === 'error' || lower === 'false') return 'red';
+  if (
+    lower === 'no' ||
+    lower === 'fail' ||
+    lower === 'error' ||
+    lower === 'false'
+  )
+    return 'red';
   // Orange: uncertain/warning
   if (lower === 'maybe' || lower === 'warning') return 'orange';
   return undefined;
 }
 
-/** Warning message for multiple pipes on a single line. */
-export const MULTIPLE_PIPE_WARNING =
+/** Error message for multiple pipes on a single line. */
+export const MULTIPLE_PIPE_ERROR =
   'Use a single "|" to start metadata, then separate items with commas.';
 
 /**
  * Parse metadata from segments after the first (name) segment.
  * A single `|` separates the label from metadata; items after the pipe are comma-delimited.
- * Multiple pipes are treated as commas for backward compatibility but trigger a warning.
+ * Multiple pipes produce an error.
  */
 export function parsePipeMetadata(
   segments: string[],
   aliasMap: Map<string, string> = new Map(),
-  warnMultiplePipes?: () => void,
+  errorMultiplePipes?: () => void
 ): Record<string, string> {
-  if (segments.length > 2 && warnMultiplePipes) {
-    warnMultiplePipes();
+  if (segments.length > 2) {
+    if (errorMultiplePipes) errorMultiplePipes();
+    return {};
   }
   const metadata: Record<string, string> = {};
   const raw = segments.slice(1).join(',');

package/src/utils/tag-groups.ts

@@ -26,25 +26,15 @@ export interface TagBlockMatch {
   name: string;
   alias: string | undefined;
   colorHint: string | undefined;
-  /** true when the heading used `## …` (deprecated) */
-  deprecated: boolean;
   /** Inline tag values parsed from single-line form (e.g., `tag Priority p High(red), Low(blue)`) */
   inlineValues?: string[];
 }
 
 // ── Regexes ─────────────────────────────────────────────────
 
-/** @deprecated Old syntax: `tag: GroupName [alias X] [(color)]` — remove after migration. */
-export const TAG_BLOCK_RE =
-  /^tag:\s+(.+?)(?:\s+alias\s+(\w+))?(?:\s*\(([^)]+)\))?\s*$/i;
-
-/** New canonical syntax: line starting with `tag` keyword (no colon). */
+/** Canonical syntax: line starting with `tag` keyword (no colon). */
 export const TAG_BLOCK_NOCOLON_RE = /^tag\s+/i;
 
-/** @deprecated Legacy syntax: `## GroupName [alias X] [(color)]` */
-export const GROUP_HEADING_RE =
-  /^##\s+(.+?)(?:\s+alias\s+(\w+))?(?:\s*\(([^)]+)\))?\s*$/;
-
 // ── Alias Inference ─────────────────────────────────────────
 
 /** Returns true if the token looks like an alias: 1-4 lowercase ASCII characters. */
@@ -54,9 +44,9 @@ function isAliasToken(token: string): boolean {
 
 // ── Matchers ────────────────────────────────────────────────
 
-/** Returns true if `trimmed` is a tag block heading in any syntax. */
+/** Returns true if `trimmed` is a tag block heading. */
 export function isTagBlockHeading(trimmed: string): boolean {
-  return TAG_BLOCK_NOCOLON_RE.test(trimmed) || TAG_BLOCK_RE.test(trimmed) || GROUP_HEADING_RE.test(trimmed);
+  return TAG_BLOCK_NOCOLON_RE.test(trimmed);
 }
 
 /**
@@ -173,7 +163,6 @@ export function parseTagDeclaration(line: string): TagBlockMatch | null {
     name,
     alias,
     colorHint,
-    deprecated: false,
     inlineValues: inlineValues && inlineValues.length > 0 ? inlineValues : undefined,
   };
 }
@@ -310,31 +299,5 @@ export function injectDefaultTagMetadata(
 // ── Matchers ────────────────────────────────────────────────
 
 export function matchTagBlockHeading(trimmed: string): TagBlockMatch | null {
-  // Try new no-colon syntax first: `tag Name [alias] [Values...]`
-  const nocolonResult = parseTagDeclaration(trimmed);
-  if (nocolonResult) return nocolonResult;
-
-  // Try old colon syntax: `tag: GroupName [alias X] [(color)]`
-  const tagMatch = trimmed.match(TAG_BLOCK_RE);
-  if (tagMatch) {
-    return {
-      name: tagMatch[1].trim(),
-      alias: tagMatch[2] || undefined,
-      colorHint: tagMatch[3] || undefined,
-      deprecated: false,
-    };
-  }
-
-  // Fall back to legacy ## syntax
-  const groupMatch = trimmed.match(GROUP_HEADING_RE);
-  if (groupMatch) {
-    return {
-      name: groupMatch[1].trim(),
-      alias: groupMatch[2] || undefined,
-      colorHint: groupMatch[3] || undefined,
-      deprecated: true,
-    };
-  }
-
-  return null;
+  return parseTagDeclaration(trimmed);
 }

package/src/infra/serialize.ts

@@ -1,67 +0,0 @@
-// ============================================================
-// Infra Scenario Serializer
-// ============================================================
-//
-// Converts interactive overrides into a `scenario:` DSL block.
-// Only includes properties that differ from the base diagram.
-
-import type { ParsedInfra, InfraComputeParams } from './types';
-
-/**
- * Serialize interactive overrides as a DSL `scenario:` block.
- * Returns an empty string if nothing differs from the base diagram.
- */
-export function serializeScenario(name: string, parsed: ParsedInfra, overrides: InfraComputeParams): string {
-  const lines: string[] = [];
-
-  // Edge RPS override
-  const edgeNode = parsed.nodes.find((n) => n.isEdge);
-  if (edgeNode && overrides.rps != null) {
-    const baseRps = edgeNode.properties.find((p) => p.key === 'rps');
-    const baseVal = baseRps ? (typeof baseRps.value === 'number' ? baseRps.value : parseFloat(String(baseRps.value)) || 0) : 0;
-    if (overrides.rps !== baseVal) {
-      lines.push(`  ${edgeNode.id}`);
-      lines.push(`    rps: ${overrides.rps}`);
-    }
-  }
-
-  // Instance overrides and property overrides per node
-  const instanceOv = overrides.instanceOverrides ?? {};
-  const propOv = overrides.propertyOverrides ?? {};
-
-  for (const node of parsed.nodes) {
-    if (node.isEdge) continue;
-
-    const nodeLines: string[] = [];
-
-    // Instance override
-    if (instanceOv[node.id] != null) {
-      const baseProp = node.properties.find((p) => p.key === 'instances');
-      const baseVal = baseProp ? (typeof baseProp.value === 'number' ? baseProp.value : parseFloat(String(baseProp.value)) || 1) : 1;
-      if (instanceOv[node.id] !== baseVal) {
-        nodeLines.push(`    instances: ${instanceOv[node.id]}`);
-      }
-    }
-
-    // Property overrides
-    const nodePropOv = propOv[node.id];
-    if (nodePropOv) {
-      for (const [key, val] of Object.entries(nodePropOv)) {
-        const baseProp = node.properties.find((p) => p.key === key);
-        const baseVal = baseProp ? (typeof baseProp.value === 'number' ? baseProp.value : parseFloat(String(baseProp.value)) || 0) : 0;
-        if (val !== baseVal) {
-          nodeLines.push(`    ${key}: ${val}`);
-        }
-      }
-    }
-
-    if (nodeLines.length > 0) {
-      lines.push(`  ${node.id}`);
-      lines.push(...nodeLines);
-    }
-  }
-
-  if (lines.length === 0) return '';
-
-  return `scenario: ${name}\n${lines.join('\n')}\n`;
-}