@diagrammo/dgmo 0.7.0 → 0.7.2

package/src/gantt/types.ts

@@ -93,6 +93,7 @@ export interface GanttEra {
   endDate: string;
   label: string;
   color: string | null;
+  lineNumber: number;
 }
 
 export interface GanttMarker {
@@ -114,6 +115,9 @@ export interface GanttOptions {
   dependencies: boolean;
   sort: 'default' | 'tag';
   defaultSwimlaneGroup: string | null; // tag group name from `sort: tag:Team`
+  /** Line numbers for option/block keywords — maps key to source line */
+  optionLineNumbers: Record<string, number>;
+  holidaysLineNumber: number | null;
 }
 
 // ── Parsed Result ───────────────────────────────────────────

package/src/org/parser.ts

@@ -7,6 +7,7 @@ import {
   measureIndent,
   extractColor,
   parsePipeMetadata,
+  MULTIPLE_PIPE_WARNING,
   CHART_TYPE_RE,
   TITLE_RE,
   OPTION_RE,
@@ -280,14 +281,14 @@ export function parseOrg(
       // Otherwise it's an orphan metadata error
       if (indent === 0) {
         // Treat as a node label (e.g., "Dr. Smith: Surgeon" is a valid name)
-        const node = parseNodeLabel(trimmed, indent, lineNumber, palette, ++nodeCounter, aliasMap);
+        const node = parseNodeLabel(trimmed, indent, lineNumber, palette, ++nodeCounter, aliasMap, pushWarning);
         attachNode(node, indent, indentStack, result);
       } else {
         pushError(lineNumber, 'Metadata has no parent node');
       }
     } else {
       // It's a node label — possibly with single-line pipe-delimited metadata
-      const node = parseNodeLabel(trimmed, indent, lineNumber, palette, ++nodeCounter, aliasMap);
+      const node = parseNodeLabel(trimmed, indent, lineNumber, palette, ++nodeCounter, aliasMap, pushWarning);
       attachNode(node, indent, indentStack, result);
     }
   }
@@ -326,15 +327,16 @@ function parseNodeLabel(
   lineNumber: number,
   palette: PaletteColors | undefined,
   counter: number,
-  aliasMap: Map<string, string> = new Map()
+  aliasMap: Map<string, string> = new Map(),
+  warnFn?: (line: number, msg: string) => void,
 ): OrgNode {
-  // Check for single-line compact metadata: "Alice Park | role: Senior | location: NY"
+  // Check for single-line compact metadata: "Alice Park | role: Senior, location: NY"
   const segments = trimmed.split('|').map((s) => s.trim());
 
   let rawLabel = segments[0];
   const { label, color } = extractColor(rawLabel, palette);
 
-  const metadata = parsePipeMetadata(segments, aliasMap);
+  const metadata = parsePipeMetadata(segments, aliasMap, warnFn ? () => warnFn(lineNumber, MULTIPLE_PIPE_WARNING) : undefined);
 
   return {
     id: `node-${counter}`,

package/src/sequence/parser.ts

@@ -6,7 +6,7 @@ import { inferParticipantType } from './participant-inference';
 import type { DgmoError } from '../diagnostics';
 import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
 import { parseArrow } from '../utils/arrows';
-import { measureIndent, extractColor, parsePipeMetadata } from '../utils/parsing';
+import { measureIndent, extractColor, parsePipeMetadata, MULTIPLE_PIPE_WARNING } from '../utils/parsing';
 import type { TagGroup } from '../utils/tag-groups';
 import { matchTagBlockHeading, validateTagValues } from '../utils/tag-groups';
 
@@ -237,12 +237,13 @@ export function parseSequenceDgmo(content: string): ParsedSequenceDgmo {
   const aliasMap = new Map<string, string>();
 
   /** Split pipe metadata from a line: "core | k: v" → { core, meta } */
-  const splitPipe = (text: string): { core: string; meta?: Record<string, string> } => {
+  const splitPipe = (text: string, ln?: number): { core: string; meta?: Record<string, string> } => {
     const idx = text.indexOf('|');
     if (idx < 0) return { core: text };
     const core = text.substring(0, idx).trimEnd();
     const segments = text.substring(idx).split('|');
-    const meta = parsePipeMetadata(segments, aliasMap);
+    const warnFn = ln != null ? () => pushWarning(ln, MULTIPLE_PIPE_WARNING) : undefined;
+    const meta = parsePipeMetadata(segments, aliasMap, warnFn);
     return Object.keys(meta).length > 0 ? { core, meta } : { core };
   };
 
@@ -287,7 +288,7 @@ export function parseSequenceDgmo(content: string): ParsedSequenceDgmo {
       if (gpipeIdx >= 0) {
         const nameAndColor = groupName.substring(0, gpipeIdx).trimEnd();
         const segments = groupName.substring(gpipeIdx).split('|');
-        const meta = parsePipeMetadata(segments, aliasMap);
+        const meta = parsePipeMetadata(segments, aliasMap, () => pushWarning(lineNumber, MULTIPLE_PIPE_WARNING));
         if (Object.keys(meta).length > 0) groupMeta = meta;
         // Re-extract color from name part
         const colorSuffix = nameAndColor.match(/^(.+?)\(([^)]+)\)$/);
@@ -444,7 +445,7 @@ export function parseSequenceDgmo(content: string): ParsedSequenceDgmo {
     }
 
     // Parse "Name is a type [aka Alias]" declarations (always top-level)
-    const { core: isACore, meta: isAMeta } = splitPipe(trimmed);
+    const { core: isACore, meta: isAMeta } = splitPipe(trimmed, lineNumber);
     const isAMatch = isACore.match(IS_A_PATTERN);
     if (isAMatch) {
       contentStarted = true;
@@ -491,7 +492,7 @@ export function parseSequenceDgmo(content: string): ParsedSequenceDgmo {
     }
 
     // Parse standalone "Name position N" (no "is a" type)
-    const { core: posCore, meta: posMeta } = splitPipe(trimmed);
+    const { core: posCore, meta: posMeta } = splitPipe(trimmed, lineNumber);
     const posOnlyMatch = posCore.match(POSITION_ONLY_PATTERN);
     if (posOnlyMatch) {
       contentStarted = true;
@@ -523,7 +524,7 @@ export function parseSequenceDgmo(content: string): ParsedSequenceDgmo {
 
     // Colored participant declaration — "Name(color)" at any level
     // Color syntax is deprecated — emit warning and register without color
-    const { core: colorCore, meta: colorMeta } = splitPipe(trimmed);
+    const { core: colorCore, meta: colorMeta } = splitPipe(trimmed, lineNumber);
     const coloredMatch = colorCore.match(COLORED_PARTICIPANT_PATTERN);
     if (coloredMatch && !ARROW_PATTERN.test(colorCore)) {
       const id = coloredMatch[1];
@@ -554,7 +555,7 @@ export function parseSequenceDgmo(content: string): ParsedSequenceDgmo {
     // Bare participant name — either inside an active group (indented) or top-level declaration
     // Supports pipe metadata: "  API | c: Gateway" or "Tapin2 | l:Park"
     {
-      const { core: bareCore, meta: bareMeta } = splitPipe(trimmed);
+      const { core: bareCore, meta: bareMeta } = splitPipe(trimmed, lineNumber);
       const inGroup = activeGroup && measureIndent(raw) > 0;
       if (/^\S+$/.test(bareCore) && !ARROW_PATTERN.test(bareCore) && (inGroup || !contentStarted || bareMeta)) {
         contentStarted = true;
@@ -600,7 +601,7 @@ export function parseSequenceDgmo(content: string): ParsedSequenceDgmo {
     }
 
     // Split pipe metadata before arrow parsing (arrows use $ anchor)
-    const { core: arrowCore, meta: arrowMeta } = splitPipe(trimmed);
+    const { core: arrowCore, meta: arrowMeta } = splitPipe(trimmed, lineNumber);
 
     // Parse message lines first — arrows take priority over keywords
     // Reject "async" keyword prefix — use ~> instead

package/src/sitemap/parser.ts

@@ -11,6 +11,7 @@ import {
   measureIndent,
   extractColor,
   parsePipeMetadata,
+  MULTIPLE_PIPE_WARNING,
   CHART_TYPE_RE,
   TITLE_RE,
   OPTION_RE,
@@ -360,7 +361,7 @@ 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);
+        const node = parseNodeLabel(trimmed, lineNumber, palette, ++nodeCounter, aliasMap, pushWarning);
         attachNode(node, indent, indentStack, result);
         labelToNode.set(node.label.toLowerCase(), node);
       } else {
@@ -368,7 +369,7 @@ export function parseSitemap(
       }
     } else {
       // Node label — possibly with pipe-delimited metadata
-      const node = parseNodeLabel(trimmed, lineNumber, palette, ++nodeCounter, aliasMap);
+      const node = parseNodeLabel(trimmed, lineNumber, palette, ++nodeCounter, aliasMap, pushWarning);
       attachNode(node, indent, indentStack, result);
       labelToNode.set(node.label.toLowerCase(), node);
     }
@@ -430,11 +431,12 @@ function parseNodeLabel(
   palette: PaletteColors | undefined,
   counter: number,
   aliasMap: Map<string, string> = new Map(),
+  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);
+  const metadata = parsePipeMetadata(segments, aliasMap, warnFn ? () => warnFn(lineNumber, MULTIPLE_PIPE_WARNING) : undefined);
 
   return {
     id: `node-${counter}`,

package/src/utils/parsing.ts

@@ -118,23 +118,34 @@ export function parseSeriesNames(
   return { series, names, nameColors, newIndex };
 }
 
-/** Parse pipe-delimited metadata from segments after the first (name) segment. */
+/** Warning message for multiple pipes on a single line. */
+export const MULTIPLE_PIPE_WARNING =
+  '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.
+ */
 export function parsePipeMetadata(
   segments: string[],
   aliasMap: Map<string, string> = new Map(),
+  warnMultiplePipes?: () => void,
 ): Record<string, string> {
+  if (segments.length > 2 && warnMultiplePipes) {
+    warnMultiplePipes();
+  }
   const metadata: Record<string, string> = {};
-  for (let j = 1; j < segments.length; j++) {
-    for (const part of segments[j].split(',')) {
-      const trimmedPart = part.trim();
-      if (!trimmedPart) continue;
-      const colonIdx = trimmedPart.indexOf(':');
-      if (colonIdx > 0) {
-        const rawKey = trimmedPart.substring(0, colonIdx).trim().toLowerCase();
-        const key = aliasMap.get(rawKey) ?? rawKey;
-        const value = trimmedPart.substring(colonIdx + 1).trim();
-        metadata[key] = value;
-      }
+  const raw = segments.slice(1).join(',');
+  for (const part of raw.split(',')) {
+    const trimmedPart = part.trim();
+    if (!trimmedPart) continue;
+    const colonIdx = trimmedPart.indexOf(':');
+    if (colonIdx > 0) {
+      const rawKey = trimmedPart.substring(0, colonIdx).trim().toLowerCase();
+      const key = aliasMap.get(rawKey) ?? rawKey;
+      const value = trimmedPart.substring(colonIdx + 1).trim();
+      metadata[key] = value;
     }
   }
   return metadata;