@diagrammo/dgmo 0.8.19 → 0.8.20

package/src/index.ts

@@ -5,6 +5,18 @@
 export { makeDgmoError, formatDgmoError } from './diagnostics';
 export type { DgmoError, DgmoSeverity } from './diagnostics';
 
+// ============================================================
+// Arrow helpers (in-arrow label validation)
+// ============================================================
+
+export {
+  parseInArrowLabel,
+  validateLabelCharacters,
+  matchColorParens,
+  ARROW_DIAGNOSTIC_CODES,
+} from './utils/arrows';
+export type { ParseInArrowLabelResult } from './utils/arrows';
+
 // ============================================================
 // Unified API
 // ============================================================
@@ -38,9 +50,9 @@ export {
   orderArcNodes,
   parseTimelineDate,
   addDurationToDate,
-  computeTimeTicks,
   formatDateLabel,
 } from './d3';
+export { computeTimeTicks } from './utils/time-ticks';
 export type {
   ParsedVisualization,
   VisualizationType,
@@ -73,9 +85,6 @@ export {
   RULE_COUNT,
 } from './sequence/participant-inference';
 
-export { parseQuadrant } from './dgmo-mermaid';
-export type { ParsedQuadrant } from './dgmo-mermaid';
-
 export { parseFlowchart, looksLikeFlowchart } from './graph/flowchart-parser';
 
 export { parseState, looksLikeState } from './graph/state-parser';
@@ -378,8 +387,6 @@ export type {
   LegendHandle,
   LegendPalette,
 } from './utils/legend-types';
-export { buildMermaidQuadrant } from './dgmo-mermaid';
-
 // ============================================================
 // Renderers (produce SVG output)
 // ============================================================
@@ -437,7 +444,6 @@ export {
   hexToHSL,
   hslToHex,
   hexToHSLString,
-  mute,
   tint,
   shade,
   getSeriesColors,
@@ -453,9 +459,6 @@ export {
   boldPalette,
   draculaPalette,
   monokaiPalette,
-  // Mermaid bridge
-  buildMermaidThemeVars,
-  buildThemeCSS,
 } from './palettes';
 
 export type { PaletteConfig, PaletteColors } from './palettes';
@@ -500,9 +503,3 @@ export type {
 } from './completion';
 
 export { parseFirstLine, ALL_CHART_TYPES } from './utils/parsing';
-
-// ============================================================
-// Branding
-// ============================================================
-
-export { injectBranding } from './branding';

package/src/infra/parser.ts

@@ -8,6 +8,7 @@
 
 import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
 import { resolveColorWithDiagnostic } from '../colors';
+import { parseInArrowLabel } from '../utils/arrows';
 import {
   measureIndent,
   parseFirstLine,
@@ -477,7 +478,10 @@ export function parseInfra(content: string): ParsedInfra {
       // Async labeled connection: ~label~> Target
       const asyncConnMatch = trimmed.match(ASYNC_CONNECTION_RE);
       if (asyncConnMatch) {
-        const label = asyncConnMatch[1]?.trim() || '';
+        const rawLabel = asyncConnMatch[1] ?? '';
+        const labelResult = parseInArrowLabel(rawLabel, lineNumber);
+        result.diagnostics.push(...labelResult.diagnostics);
+        const label = labelResult.label ?? '';
         const targetRaw = asyncConnMatch[2].trim();
         const pipeMeta = extractPipeMetadata(targetRaw);
         const targetName = pipeMeta.clean || targetRaw;
@@ -551,7 +555,10 @@ export function parseInfra(content: string): ParsedInfra {
       // Labeled connection: -label-> Target | split: N%, fanout: 3
       const connMatch = trimmed.match(CONNECTION_RE);
       if (connMatch) {
-        const label = connMatch[1]?.trim() || '';
+        const rawLabel = connMatch[1] ?? '';
+        const labelResult = parseInArrowLabel(rawLabel, lineNumber);
+        result.diagnostics.push(...labelResult.diagnostics);
+        const label = labelResult.label ?? '';
         const targetRaw = connMatch[2].trim();
         const pipeMeta = extractPipeMetadata(targetRaw);
         const targetName = pipeMeta.clean || targetRaw;

package/src/kanban/renderer.ts

@@ -28,7 +28,7 @@ import type {
 // Public options object
 // ============================================================
 
-export interface KanbanInteractiveOptions {
+interface KanbanInteractiveOptions {
   onNavigateToLine?: (line: number) => void;
   exportDims?: { width: number; height: number };
   activeTagGroup?: string | null;
@@ -608,7 +608,7 @@ interface SwimlaneBucket {
   cellsByColumn: Record<string, KanbanCard[]>;
 }
 
-export function bucketCardsBySwimlane(
+function bucketCardsBySwimlane(
   columns: KanbanColumn[],
   swimlaneGroup: KanbanTagGroup
 ): SwimlaneBucket[] {

package/src/palettes/color-utils.ts

@@ -84,17 +84,6 @@ export function hexToHSLString(hex: string): string {
 // Color Manipulation
 // ============================================================
 
-/**
- * Derive a muted (desaturated, darkened) variant of a color.
- * Used by the Mermaid theme generator for dark-mode fills.
- *
- * Algorithm: cap saturation at 35% and lightness at 36%.
- */
-export function mute(hex: string): string {
-  const { h, s, l } = hexToHSL(hex);
-  return hslToHex(h, Math.min(s, 35), Math.min(l, 36));
-}
-
 /**
  * Blend a color toward white (light mode quadrant fills).
  * amount: 0 = original, 1 = white
@@ -232,7 +221,10 @@ export function getSeriesColors(palette: PaletteColors): string[] {
  * saturation and lightness, guaranteeing every segment gets a unique,
  * perceptually distinct color regardless of segment count.
  */
-export function getSegmentColors(palette: PaletteColors, count: number): string[] {
+export function getSegmentColors(
+  palette: PaletteColors,
+  count: number
+): string[] {
   const base = getSeriesColors(palette);
   const unique = [...new Set(base)];
   const hsls = unique.map(hexToHSL);

package/src/palettes/index.ts

@@ -14,7 +14,6 @@ export {
   hexToHSL,
   hslToHex,
   hexToHSLString,
-  mute,
   tint,
   shade,
   getSeriesColors,
@@ -34,6 +33,3 @@ export { tokyoNightPalette } from './tokyo-night';
 
 export { draculaPalette } from './dracula';
 export { monokaiPalette } from './monokai';
-
-// Re-export Mermaid bridge
-export { buildMermaidThemeVars, buildThemeCSS } from './mermaid-bridge';

package/src/render.ts

@@ -1,6 +1,11 @@
 import { renderForExport } from './d3';
 import { renderExtendedChartForExport } from './echarts';
-import { parseDgmoChartType, getRenderCategory } from './dgmo-router';
+import {
+  parseDgmoChartType,
+  getRenderCategory,
+  parseDgmo,
+} from './dgmo-router';
+import type { DgmoError } from './diagnostics';
 import { getPalette } from './palettes/registry';
 
 /**
@@ -45,13 +50,13 @@ async function ensureDom(): Promise<void> {
  *
  * @param content - DGMO source text
  * @param options - Optional theme and palette settings
- * @returns SVG string, or empty string on error
+ * @returns Object with `svg` (SVG string, empty on error) and `diagnostics` (parse errors/warnings)
  *
  * @example
  * ```ts
  * import { render } from '@diagrammo/dgmo';
  *
- * const svg = await render(`pie Languages
+ * const { svg, diagnostics } = await render(`pie Languages
  * TypeScript: 45
  * Python: 30
  * Rust: 25`);
@@ -62,7 +67,6 @@ export async function render(
   options?: {
     theme?: 'light' | 'dark' | 'transparent';
     palette?: string;
-    branding?: boolean;
     c4Level?: 'context' | 'containers' | 'components' | 'deployment';
     c4System?: string;
     c4Container?: string;
@@ -70,14 +74,15 @@ export async function render(
     /** Legend state for export — controls which tag group is shown in exported SVG. */
     legendState?: { activeGroup?: string; hiddenAttributes?: string[] };
   }
-): Promise<string> {
+): Promise<{ svg: string; diagnostics: DgmoError[] }> {
   const theme = options?.theme ?? 'light';
   const paletteName = options?.palette ?? 'nord';
-  const branding = options?.branding ?? false;
 
   const paletteColors =
     getPalette(paletteName)[theme === 'dark' ? 'dark' : 'light'];
 
+  const { diagnostics } = parseDgmo(content);
+
   const chartType = parseDgmoChartType(content);
   const category = chartType ? getRenderCategory(chartType) : null;
 
@@ -92,18 +97,27 @@ export async function render(
     : undefined;
 
   if (category === 'data-chart') {
-    return renderExtendedChartForExport(content, theme, paletteColors, {
-      branding,
-    });
+    const svg = await renderExtendedChartForExport(
+      content,
+      theme,
+      paletteColors
+    );
+    return { svg, diagnostics };
   }
 
   // Visualization/diagram and unknown/null types all go through the unified renderer
   await ensureDom();
-  return renderForExport(content, theme, paletteColors, legendExportState, {
-    branding,
-    c4Level: options?.c4Level,
-    c4System: options?.c4System,
-    c4Container: options?.c4Container,
-    tagGroup: options?.tagGroup,
-  });
+  const svg = await renderForExport(
+    content,
+    theme,
+    paletteColors,
+    legendExportState,
+    {
+      c4Level: options?.c4Level,
+      c4System: options?.c4System,
+      c4Container: options?.c4Container,
+      tagGroup: options?.tagGroup,
+    }
+  );
+  return { svg, diagnostics };
 }

package/src/sequence/parser.ts

@@ -5,7 +5,7 @@
 import { inferParticipantType } from './participant-inference';
 import type { DgmoError } from '../diagnostics';
 import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
-import { parseArrow } from '../utils/arrows';
+import { parseArrow, parseInArrowLabel } from '../utils/arrows';
 import {
   measureIndent,
   extractColor,
@@ -945,9 +945,14 @@ export function parseSequenceDgmo(content: string): ParsedSequenceDgmo {
     }
     if (labeledArrow) {
       contentStarted = true;
-      const { from, to, label, async: isAsync } = labeledArrow;
+      const { from, to, label: rawLabel, async: isAsync } = labeledArrow;
       lastMsgFrom = from;
 
+      // TD-13/TD-14: validate in-arrow label characters
+      const labelResult = parseInArrowLabel(rawLabel, lineNumber);
+      labelResult.diagnostics.forEach((d) => result.diagnostics.push(d));
+      const label = labelResult.label ?? rawLabel;
+
       const msg: SequenceMessage = {
         from,
         to,

package/src/sequence/renderer.ts

@@ -2365,7 +2365,9 @@ export function renderSequenceDiagram(
           if (tagKey && msgTagValue) {
             labelEl.attr(`data-tag-${tagKey}`, msgTagValue.toLowerCase());
           }
-          renderInlineText(labelEl, step.label, palette);
+          // TD-1: in-arrow labels render as plain text (no markdown interpretation).
+          // Fixes the `location[]`-style silent character drop.
+          labelEl.text(step.label);
         }
       } else {
         // Normal call arrow — snap to activation box edges
@@ -2433,7 +2435,9 @@ export function renderSequenceDiagram(
           if (tagKey && msgTagValue) {
             labelEl.attr(`data-tag-${tagKey}`, msgTagValue.toLowerCase());
           }
-          renderInlineText(labelEl, step.label, palette);
+          // TD-1: in-arrow labels render as plain text (no markdown interpretation).
+          // Fixes the `location[]`-style silent character drop.
+          labelEl.text(step.label);
         }
       }
     } else {
@@ -2505,7 +2509,12 @@ export function renderSequenceDiagram(
         if (tagKey && msgTagValue) {
           labelEl.attr(`data-tag-${tagKey}`, msgTagValue.toLowerCase());
         }
-        renderInlineText(labelEl, step.label, palette);
+        // TD-1: in-arrow labels render as plain text (no markdown
+        // interpretation). Return-arrow labels are currently always empty
+        // (buildRenderSequence sets them to '') but this path is kept in
+        // sync with the call/self-call sites above to prevent a future
+        // change resurrecting the location[] silent-drop bug.
+        labelEl.text(step.label);
       }
     }
   });

package/src/sitemap/renderer.ts

@@ -704,8 +704,6 @@ export async function renderSitemapForExport(
   const { parseSitemap } = await import('./parser');
   const { layoutSitemap } = await import('./layout');
   const { getPalette } = await import('../palettes');
-  const { injectBranding } = await import('../branding');
-
   const isDark = theme === 'dark';
   const effectivePalette =
     palette ?? (isDark ? getPalette('nord').dark : getPalette('nord').light);
@@ -756,8 +754,5 @@ export async function renderSitemapForExport(
 
   const svgHtml = svgEl.outerHTML;
   document.body.removeChild(container);
-
-  const brandColor =
-    theme === 'transparent' ? '#888' : effectivePalette.textMuted;
-  return injectBranding(svgHtml, brandColor);
+  return svgHtml;
 }

package/src/utils/arrows.ts

@@ -5,6 +5,24 @@
 // Labeled arrow syntax (always left-to-right):
 //   Sync:  `-label->`
 //   Async: `~label~>`
+//
+// In-arrow label character-set contract (see docs/dgmo-language-spec.md
+// §"In-Arrow Message Labels"):
+//   - Allowed: any codepoint except the forbidden substrings and forbidden
+//     control characters below.
+//   - Forbidden substrings: "->", "~>" (arrow-token lookalikes inside labels).
+//     Use the post-colon form for labels that need these symbols:
+//       `A -> B: uses -> to chain`
+//   - Forbidden characters: C0 control chars U+0000–U+001F EXCEPT U+0009 (tab),
+//     and U+007F (DEL).
+//   - Whitespace: leading/trailing trimmed; internal runs (incl. tab, NBSP,
+//     ZWSP) preserved — never collapsed.
+//   - Plain text only: no markdown interpretation. `*`, `_`, backticks,
+//     `[`, `]`, `{`, `}` are literal characters.
+
+import type { DgmoError } from '../diagnostics';
+import { makeDgmoError } from '../diagnostics';
+import { RECOGNIZED_COLOR_NAMES } from '../colors';
 
 interface ParsedArrow {
   from: string;
@@ -13,6 +31,160 @@ interface ParsedArrow {
   async: boolean;
 }
 
+// ============================================================
+// Diagnostic codes (TD-16)
+// ============================================================
+
+/**
+ * Stable diagnostic codes for in-arrow label parsing errors.
+ *
+ * **Active codes** — emitted by the parser pipeline today:
+ *   - `ARROW_SUBSTRING_IN_LABEL` (TD-13)
+ *   - `CONTROL_CHAR_IN_LABEL` (TD-14)
+ *
+ * **Reserved codes** — declared but NOT currently emitted. These are
+ * placeholders for future tightening of the arrow-tokenization rules
+ * described in TD-9. Today's chart parsers catch these cases through
+ * their own regex machinery with different diagnostics. A follow-up
+ * spec that introduces a dedicated tokenizer can start emitting them
+ * without changing the public code shape:
+ *   - `TRAILING_ARROW_TEXT` — extra `->`/`~>` after the primary arrow
+ *   - `MIXED_ARROW_DELIMITERS` — opening delim type doesn't match arrow
+ *
+ * See `docs/dgmo-language-spec-decisions.md` → TD-16 for the rationale.
+ */
+export const ARROW_DIAGNOSTIC_CODES = {
+  /** Active: label contains `->` or `~>` substring (TD-13). */
+  ARROW_SUBSTRING_IN_LABEL: 'E_ARROW_SUBSTRING_IN_LABEL',
+  /** Active: label contains a forbidden control character (TD-14). */
+  CONTROL_CHAR_IN_LABEL: 'E_CONTROL_CHAR_IN_LABEL',
+  /** Reserved: not currently emitted by any parser. See JSDoc above. */
+  TRAILING_ARROW_TEXT: 'E_TRAILING_ARROW_TEXT',
+  /** Reserved: not currently emitted by any parser. See JSDoc above. */
+  MIXED_ARROW_DELIMITERS: 'E_MIXED_ARROW_DELIMITERS',
+} as const;
+
+// ============================================================
+// validateLabelCharacters (TD-13, TD-14)
+// ============================================================
+
+/**
+ * Validate an in-arrow label against the TD-13 and TD-14 character-set
+ * contract. Returns diagnostics (possibly empty). Does NOT mutate the label —
+ * callers that want a normalized label should trim before calling.
+ *
+ * TD-13: label must not contain the substrings "->" or "~>".
+ * TD-14: label must not contain C0 control chars other than tab, and no DEL.
+ */
+export function validateLabelCharacters(
+  label: string,
+  lineNumber: number
+): DgmoError[] {
+  const out: DgmoError[] = [];
+
+  // TD-13: forbidden substrings
+  if (label.includes('->') || label.includes('~>')) {
+    out.push(
+      makeDgmoError(
+        lineNumber,
+        'Arrow symbols (-> or ~>) are not allowed inside a label. ' +
+          'Move the label after the arrow: "A -> B: uses -> to chain". ' +
+          'See "In-Arrow Message Labels" → Forbidden.',
+        'error',
+        ARROW_DIAGNOSTIC_CODES.ARROW_SUBSTRING_IN_LABEL
+      )
+    );
+  }
+
+  // TD-14: control chars (iterate codepoints to handle surrogate pairs)
+  for (const ch of label) {
+    const cp = ch.codePointAt(0)!;
+    const isC0 = cp >= 0x00 && cp <= 0x1f && cp !== 0x09; // allow tab
+    const isDel = cp === 0x7f;
+    if (isC0 || isDel) {
+      const hex = cp.toString(16).toUpperCase().padStart(4, '0');
+      out.push(
+        makeDgmoError(
+          lineNumber,
+          `Label contains a control character (U+${hex}). ` +
+            'Remove it and use plain text.',
+          'error',
+          ARROW_DIAGNOSTIC_CODES.CONTROL_CHAR_IN_LABEL
+        )
+      );
+      break; // one diagnostic per label is enough
+    }
+  }
+
+  return out;
+}
+
+// ============================================================
+// parseInArrowLabel (TD-1, TD-8, TD-10, TD-13, TD-14)
+// ============================================================
+
+export interface ParseInArrowLabelResult {
+  /** Cleaned label (trimmed; `undefined` if empty after trim per TD-10). */
+  label: string | undefined;
+  diagnostics: DgmoError[];
+}
+
+/**
+ * Normalize and validate a raw in-arrow label.
+ *
+ * Behavior:
+ *   - Trims leading/trailing whitespace (TD-8: internal whitespace preserved).
+ *   - Empty-after-trim → `{ label: undefined }` (TD-10 normalization).
+ *   - TD-13: emits `E_ARROW_SUBSTRING_IN_LABEL` if `->` or `~>` is present.
+ *   - TD-14: emits `E_CONTROL_CHAR_IN_LABEL` for forbidden control chars.
+ *
+ * This helper is intentionally chart-agnostic: it operates on an already
+ * extracted label string, leaving each chart's existing arrow-finding
+ * tokenization in place. TD-11 color-parens is handled inside the
+ * flowchart and state `parseArrowToken` functions because those are the
+ * only charts that interpret `-(color)->` as a colored edge; they use
+ * `matchColorParens()` from this module for the shared lookup.
+ */
+export function parseInArrowLabel(
+  rawLabel: string,
+  lineNumber: number
+): ParseInArrowLabelResult {
+  const trimmed = rawLabel.trim();
+
+  // TD-10: empty/whitespace-only label normalizes to undefined
+  if (trimmed.length === 0) {
+    return { label: undefined, diagnostics: [] };
+  }
+
+  // TD-13 / TD-14 validation
+  const diagnostics = validateLabelCharacters(trimmed, lineNumber);
+
+  return { label: trimmed, diagnostics };
+}
+
+// ============================================================
+// matchColorParens — shared TD-11 helper for flowchart and state
+// ============================================================
+
+/**
+ * Test whether a string matches the TD-11 color-parens form `(colorName)`
+ * where `colorName` is one of the 11 recognized palette color names from
+ * `src/colors.ts:RECOGNIZED_COLOR_NAMES`. Returns the lowercase color name
+ * on a match, or `null` on fall-through (whole string becomes a label).
+ *
+ * Used by flowchart and state parsers to keep the color-parens recognition
+ * rule in one place — do NOT re-implement the regex in chart parsers.
+ */
+export function matchColorParens(content: string): string | null {
+  const m = content.match(/^\(([A-Za-z]+)\)$/);
+  if (!m) return null;
+  const candidate = m[1].toLowerCase();
+  if ((RECOGNIZED_COLOR_NAMES as readonly string[]).includes(candidate)) {
+    return candidate;
+  }
+  return null;
+}
+
 // Forward (call) patterns — participant names may contain spaces, so use non-greedy (.+?)
 const SYNC_LABELED_RE = /^(.+?)\s*-(.+)->\s*(.+)$/;
 const ASYNC_LABELED_RE = /^(.+?)\s*~(.+)~>\s*(.+)$/;
@@ -23,8 +195,6 @@ const RETURN_ASYNC_LABELED_RE = /^(.+?)\s*<~(.+)~\s*(.+)$/;
 const BIDI_SYNC_RE = /^(.+?)\s*<-(.+)->\s*(.+)$/;
 const BIDI_ASYNC_RE = /^(.+?)\s*<~(.+)~>\s*(.+)$/;
 
-const ARROW_CHARS = ['->', '~>'];
-
 /**
  * Try to parse a labeled arrow from a trimmed line.
  *
@@ -32,6 +202,14 @@ const ARROW_CHARS = ['->', '~>'];
  *  - `ParsedArrow` if matched and valid
  *  - `{ error: string }` if matched but invalid (deprecated syntax)
  *  - `null` if not a labeled arrow (caller should fall through to bare patterns)
+ *
+ * Note: arrow-char-in-label validation (TD-13) is NOT performed here —
+ * callers must route the returned `label` through `parseInArrowLabel` or
+ * `validateLabelCharacters` to get the unified `E_ARROW_SUBSTRING_IN_LABEL`
+ * diagnostic with the correct code. In practice this path is unreachable
+ * because arrow regexes are greedy enough to absorb inner `->`/`~>` tokens
+ * into the source/destination captures, but the check remains at the
+ * validator level for defense in depth.
  */
 export function parseArrow(
   line: string
@@ -73,15 +251,6 @@ export function parseArrow(
     // Empty label (e.g. `--> B`) — fall through to plain arrow handling
     if (!label) return null;
 
-    // Validate: no arrow chars inside label
-    for (const arrow of ARROW_CHARS) {
-      if (label.includes(arrow)) {
-        return {
-          error: 'Arrow characters (->, ~>) are not allowed inside labels',
-        };
-      }
-    }
-
     return {
       from: m[1],
       to: m[3],

package/src/utils/d3-types.ts

@@ -0,0 +1,4 @@
+export interface D3ExportDimensions {
+  width?: number;
+  height?: number;
+}

package/src/utils/legend-constants.ts

@@ -16,10 +16,6 @@ export const LEGEND_EYE_SIZE = 14;
 export const LEGEND_EYE_GAP = 6;
 export const LEGEND_ICON_W = 20;
 
-// ── Spacing constants (centralized legend system) ───────────
-export const LEGEND_TOP_PAD = 12;
-export const LEGEND_TITLE_GAP = 8;
-export const LEGEND_CONTENT_GAP = 12;
 export const LEGEND_MAX_ENTRY_ROWS = 3;
 
 // ── Proportional text measurement ────────────────────────────