@diagrammo/dgmo 0.47.0 → 0.48.1

package/src/editor/highlight-api.ts

@@ -1,596 +0,0 @@
-/**
- * Standalone DGMO syntax highlighter — no CodeMirror dependency.
- *
- * Exports:
- *   - `highlightDgmo(source)` → `HighlightToken[]` (consumer-agnostic)
- *   - `NORD_ROLE_STYLES` — inline style objects keyed by role (for React/Astro)
- *   - `ROLE_TO_ANSI` — ANSI escape codes keyed by role (for CLI)
- *
- * Uses the raw Lezer parser directly — keyword specialization is wired into
- * the grammar, so `parser.parse()` runs it automatically.
- *
- * @module @diagrammo/dgmo/highlight
- */
-
-import { parser } from './dgmo.grammar.js';
-import { REGISTRY_COLON_KEY_TOKENS } from '../directives-registry';
-
-// ============================================================
-// Types
-// ============================================================
-
-export interface HighlightToken {
-  text: string;
-  role: string;
-}
-
-// ============================================================
-// NODE_TO_ROLE — keep in sync with highlight.ts
-// ============================================================
-
-// Exported so the both-path anti-drift guard (tests/highlight-roles.test.ts)
-// can assert every emitted role has a render style (no orphan roles).
-export const NODE_TO_ROLE: Record<string, string> = {
-  Comment: 'comment',
-  ChartType: 'chartType',
-  TagKeyword: 'definitionKeyword',
-  DirectiveKeyword: 'keyword',
-  ControlKeyword: 'controlKeyword',
-  ModifierKeyword: 'modifier',
-  SyncArrow: 'operator',
-  AsyncArrow: 'operator',
-  Dash: 'operator',
-  Tilde: 'operator',
-  Star: 'operator',
-  Question: 'operator',
-  Duration: 'number',
-  DateLiteral: 'number',
-  Number: 'number',
-  Percentage: 'number',
-  SectionMarker: 'heading',
-  Url: 'url',
-  OpenBracket: 'bracket',
-  CloseBracket: 'bracket',
-  OpenParen: 'bracket',
-  CloseParen: 'bracket',
-  OpenAngle: 'bracket',
-  CloseAngle: 'bracket',
-  // `|` is no longer DGMO's metadata delimiter as of 0.18.0 (§1.4).
-  // Highlight legacy pipes in a deprecated-syntax color so authors
-  // see the migration prompt visually before the parser diagnostic
-  // fires. The lezer grammar still tokenizes `|` uniformly (it's a
-  // valid character inside arrow labels and wireframe dropdowns), so
-  // this paints surviving pipes too — acceptable noise for the
-  // signal value during the 0.17.x → 0.18.0 transition.
-  Pipe: 'deprecatedSyntax',
-  Colon: 'separator',
-  Plus: 'separator',
-  Comma: 'punctuation',
-  Punct: 'punctuation',
-  QuotedString: 'string',
-  Identifier: 'default',
-};
-
-// ============================================================
-// Entity detection — keep in sync with entity-highlight.ts
-// ============================================================
-
-/** Tokens that have grammar-level styling which should be overridden in labels. */
-const OVERRIDE_IN_LABEL = new Set([
-  'ChartType',
-  'TagKeyword',
-  'DirectiveKeyword',
-  'ControlKeyword',
-  'ModifierKeyword',
-  'Number',
-  'Percentage',
-  'Duration',
-  'DateLiteral',
-]);
-
-/** Lines starting with these are keyword-led — not entity declarations. */
-const KEYWORD_STARTS = new Set([
-  'TagKeyword',
-  'DirectiveKeyword',
-  'ControlKeyword',
-  'ModifierKeyword',
-  'SectionMarker',
-  'Comment',
-  'Duration',
-  'DateLiteral',
-]);
-
-// ============================================================
-// Core: highlightDgmo()
-// ============================================================
-
-/**
- * Tokenize DGMO source into annotated highlight spans.
- *
- * Guarantees lossless round-trip:
- *   `highlightDgmo(src).map(t => t.text).join('') === src`
- */
-export function highlightDgmo(source: string): HighlightToken[] {
-  const tree = parser.parse(source);
-  const tokens: HighlightToken[] = [];
-
-  // Phase 1: Walk tree cursor, collect leaf tokens with gap filling
-  let pos = 0;
-  const cursor = tree.cursor();
-
-  // Descend to leaves, process them, then advance via next() or parent+next()
-  function descend(): void {
-    for (;;) {
-      // Try to go deeper
-      if (cursor.firstChild()) continue;
-
-      // At a leaf — emit it
-      emitLeaf();
-
-      // Try to advance to next sibling or ascend
-      while (!cursor.nextSibling()) {
-        if (!cursor.parent()) return; // back at root — done
-      }
-
-      // Now at next sibling — loop will try to descend into it
-    }
-  }
-
-  function emitLeaf(): void {
-    const from = cursor.from;
-    const to = cursor.to;
-
-    // Fill gap before this node
-    if (from > pos) {
-      tokens.push({ text: source.slice(pos, from), role: 'default' });
-    }
-
-    // Emit this leaf node
-    if (to > from) {
-      const role = NODE_TO_ROLE[cursor.name] ?? 'default';
-      tokens.push({ text: source.slice(from, to), role });
-    }
-
-    pos = to;
-  }
-
-  descend();
-
-  // Fill trailing gap
-  if (pos < source.length) {
-    tokens.push({ text: source.slice(pos, source.length), role: 'default' });
-  }
-
-  // Phase 2: Post-process — attribute key detection
-  applyAttributeKeys(tokens);
-
-  // Phase 3: Post-process — entity detection (label override only)
-  applyLabelOverrides(tokens);
-
-  // Phase 4: Post-process — note content detection
-  applyNoteContent(tokens);
-
-  return tokens;
-}
-
-// ============================================================
-// Post-processing: attribute key detection
-// ============================================================
-
-/**
- * Colon `key: value` attribute keys that highlight as `propertyName`. This is
- * the single source of truth for attribute-key highlighting — the standalone
- * `applyAttributeKeys()` pass below and the desktop app's attribute-key
- * ViewPlugin both consume it, so the two render paths can't drift.
- */
-export const ATTRIBUTE_KEYS = new Set([
-  'emotion',
-  'role',
-  'icon',
-  'location',
-  'email',
-  'phone',
-  'type',
-  'domain',
-  'assignee',
-  'due',
-  'status',
-  'progress',
-  'offset',
-  'confidence',
-  'width',
-  'fanout',
-  'description',
-  'score',
-  'pain',
-  'opportunity',
-  'thought',
-  'collapsed',
-  'tech',
-  'span',
-  'split',
-  // Map (§24B) + boxes-and-lines per-element numeric channel keys (decision #20):
-  // `heat:` (region/box colour ramp), `size:` (POI marker), `width:` (edge stroke).
-  // `width` is already listed above (shared with cycle); `size`/`heat` added here.
-  // `value` is retained (legacy/no-op colon key) so any stray `value:` still reads
-  // as a property rather than an error highlight.
-  'size',
-  'value',
-  'label',
-  'style',
-  // Treemap + boxes-and-lines + map colour-by-value channel key
-  'heat',
-  // Infra node behavior + edge colon-keys (§4) come from the single-source
-  // directives registry — the parser accepts them only as `key: value` node
-  // properties, so they render as `propertyName`. The dual-use top-level SLO
-  // options stay bare in DIRECTIVE_KEYWORDS (see keywords.ts).
-  ...REGISTRY_COLON_KEY_TOKENS,
-]);
-
-/**
- * Reclassify Identifier tokens as 'propertyName' when they are known
- * attribute keys followed (optionally with whitespace) by a colon.
- * This provides context-aware highlighting without grammar-level changes.
- */
-function applyAttributeKeys(tokens: HighlightToken[]): void {
-  for (let i = 0; i < tokens.length - 1; i++) {
-    const t = tokens[i]!;
-    if (t.role !== 'default') continue;
-    if (!ATTRIBUTE_KEYS.has(t.text)) continue;
-
-    // Look ahead past whitespace for a colon
-    let j = i + 1;
-    while (
-      j < tokens.length &&
-      tokens[j]!.role === 'default' &&
-      tokens[j]!.text.trim() === ''
-    ) {
-      j++;
-    }
-    if (
-      j < tokens.length &&
-      tokens[j]!.text === ':' &&
-      tokens[j]!.role === 'separator'
-    ) {
-      t.role = 'propertyName';
-    }
-  }
-}
-
-// ============================================================
-// Post-processing: label overrides
-// ============================================================
-
-interface LineTokenRef {
-  /** Index into the flat token array. */
-  idx: number;
-  /** Grammar node name (looked up from role + NODE_TO_ROLE reverse). */
-  nodeName: string;
-}
-
-/**
- * Override keyword/number tokens in message-label positions to `default` role.
- *
- * A "label" is the span between the first Dash/Tilde and the last arrow on a
- * content line. Tokens in OVERRIDE_IN_LABEL within that zone get their role
- * set to `default` so they render as plain text.
- *
- * Also handles ChartType tokens on non-first content lines — they become
- * `default` in labels.
- */
-function applyLabelOverrides(tokens: HighlightToken[]): void {
-  // Build reverse map: role → possible node names (for override detection)
-  const ROLE_TO_NODES: Record<string, string[]> = {};
-  for (const [node, role] of Object.entries(NODE_TO_ROLE)) {
-    (ROLE_TO_NODES[role] ??= []).push(node);
-  }
-
-  // Split tokens into lines
-  const lines: LineTokenRef[][] = [[]];
-  for (let i = 0; i < tokens.length; i++) {
-    // In-bounds by loop guard.
-    const t = tokens[i]!;
-    // lines is initialized to `[[]]`, so always at least 1 element.
-    const currentLine = lines[lines.length - 1]!;
-    const role = t.role;
-
-    // Determine which node name this token likely had
-    let nodeName = '';
-    for (const [node, r] of Object.entries(NODE_TO_ROLE)) {
-      if (r === role) {
-        nodeName = node;
-        break;
-      }
-    }
-    // For roles mapping to multiple nodes, refine
-    if (role === 'operator') {
-      const text = t.text;
-      if (text === '->' || text.endsWith('->')) nodeName = 'SyncArrow';
-      else if (text === '~>' || text.endsWith('~>')) nodeName = 'AsyncArrow';
-      else if (text === '-') nodeName = 'Dash';
-      else if (text === '~') nodeName = 'Tilde';
-      else if (text === '*') nodeName = 'Star';
-      else if (text === '?') nodeName = 'Question';
-    } else if (role === 'number') {
-      const text = t.text;
-      if (/^\d+[smhd]$/i.test(text)) nodeName = 'Duration';
-      else if (/^\d{4}-\d{2}-\d{2}/.test(text)) nodeName = 'DateLiteral';
-      else if (text.endsWith('%')) nodeName = 'Percentage';
-      else nodeName = 'Number';
-    } else if (role === 'bracket') {
-      const text = t.text;
-      if (text === '[') nodeName = 'OpenBracket';
-      else if (text === ']') nodeName = 'CloseBracket';
-      else if (text === '(') nodeName = 'OpenParen';
-      else if (text === ')') nodeName = 'CloseParen';
-      else if (text === '<') nodeName = 'OpenAngle';
-      else if (text === '>') nodeName = 'CloseAngle';
-    } else if (role === 'separator') {
-      if (t.text === ':') nodeName = 'Colon';
-      else if (t.text === '+') nodeName = 'Plus';
-    } else if (role === 'deprecatedSyntax') {
-      if (t.text === '|') nodeName = 'Pipe';
-    } else if (role === 'punctuation') {
-      if (t.text === ',') nodeName = 'Comma';
-      else nodeName = 'Punct';
-    }
-
-    currentLine.push({ idx: i, nodeName });
-
-    // Check if token text ends with newline — start a new line
-    if (t.text.includes('\n')) {
-      lines.push([]);
-    }
-  }
-
-  // Track first content line (for ChartType handling)
-  let seenFirstContent = false;
-
-  for (const line of lines) {
-    // Skip empty lines and whitespace-only
-    // ref.idx is always a valid index into tokens (built from the same array).
-    const nonWs = line.filter((ref) => tokens[ref.idx]!.text.trim().length > 0);
-    if (nonWs.length === 0) continue;
-
-    const firstTok = nonWs[0]!;
-
-    // Skip keyword-led lines
-    if (KEYWORD_STARTS.has(firstTok.nodeName)) continue;
-
-    // First-line chart type — skip
-    if (firstTok.nodeName === 'ChartType' && !seenFirstContent) {
-      seenFirstContent = true;
-      continue;
-    }
-    seenFirstContent = true;
-
-    // Find structural boundaries within this line
-    let firstDashTildeIdx = -1;
-    let lastArrowIdx = -1;
-
-    for (let li = 0; li < nonWs.length; li++) {
-      const ref = nonWs[li]!;
-      if (
-        (ref.nodeName === 'Dash' || ref.nodeName === 'Tilde') &&
-        firstDashTildeIdx < 0
-      ) {
-        firstDashTildeIdx = li;
-      }
-      if (ref.nodeName === 'SyncArrow' || ref.nodeName === 'AsyncArrow') {
-        lastArrowIdx = li;
-      }
-    }
-
-    const hasArrow = firstDashTildeIdx >= 0 && lastArrowIdx > firstDashTildeIdx;
-
-    if (!hasArrow) continue;
-
-    // If the label zone has no Identifier tokens, it's an offset/lag
-    // pattern (e.g. --1w->), not a text label — keep grammar styling.
-    let labelHasIdentifier = false;
-    for (let li = firstDashTildeIdx + 1; li < lastArrowIdx; li++) {
-      if (nonWs[li]!.nodeName === 'Identifier') {
-        labelHasIdentifier = true;
-        break;
-      }
-    }
-    if (!labelHasIdentifier) continue;
-
-    // Override tokens in label zone (between first dash/tilde and last arrow)
-    for (let li = firstDashTildeIdx + 1; li < lastArrowIdx; li++) {
-      const ref = nonWs[li]!;
-      if (OVERRIDE_IN_LABEL.has(ref.nodeName)) {
-        tokens[ref.idx]!.role = 'default';
-      }
-      // ChartType in label also overridden
-      if (ref.nodeName === 'ChartType') {
-        tokens[ref.idx]!.role = 'default';
-      }
-    }
-  }
-}
-
-// ============================================================
-// Post-processing: note content detection
-// ============================================================
-
-const NOTE_HEAD_RE = /^note(\s|$)/i;
-
-/**
- * Detect `note` keyword lines and mark indented followers as `noteContent`.
- */
-function applyNoteContent(tokens: HighlightToken[]): void {
-  // Reconstruct lines from token text
-  const fullText = tokens.map((t) => t.text).join('');
-  const lines = fullText.split('\n');
-
-  let inNote = false;
-  let noteIndent = 0;
-  let charOffset = 0;
-
-  for (const lineText of lines) {
-    const lineStart = charOffset;
-    const lineEnd = charOffset + lineText.length;
-    const trimmed = lineText.trimStart();
-    const indent = lineText.length - trimmed.length;
-
-    if (NOTE_HEAD_RE.test(trimmed)) {
-      inNote = true;
-      noteIndent = indent;
-    } else if (inNote) {
-      if (trimmed.length === 0) {
-        // Blank line — stays in note block
-      } else if (indent > noteIndent) {
-        // Mark all tokens within this line range as noteContent
-        markTokensInRange(tokens, lineStart, lineEnd, 'noteContent');
-      } else {
-        inNote = false;
-      }
-    }
-
-    charOffset = lineEnd + 1; // +1 for the \n
-  }
-}
-
-/**
- * Set the role of all tokens overlapping [from, to) to the given role.
- */
-function markTokensInRange(
-  tokens: HighlightToken[],
-  from: number,
-  to: number,
-  role: string
-): void {
-  let pos = 0;
-  for (const token of tokens) {
-    const tokenEnd = pos + token.text.length;
-    // Token overlaps range and is not just whitespace
-    if (tokenEnd > from && pos < to && token.text.trim().length > 0) {
-      token.role = role;
-    }
-    pos = tokenEnd;
-  }
-}
-
-// ============================================================
-// NORD_ROLE_STYLES — hardcoded Nord dark palette for static contexts
-// ============================================================
-
-export const NORD_ROLE_STYLES: Record<string, Record<string, string>> = {
-  keyword: { color: '#81A1C1', fontWeight: 'bold' }, // nord9
-  controlKeyword: { color: '#B48EAD', fontWeight: 'bold' }, // nord15
-  definitionKeyword: { color: '#5E81AC', fontWeight: 'bold' }, // nord10
-  modifier: { color: '#B48EAD' }, // nord15
-  chartType: { color: '#D08770', fontWeight: 'bold' }, // nord12
-  operator: { color: '#BF616A', fontWeight: 'bold' }, // nord11
-  number: { color: '#B48EAD' }, // nord15
-  comment: { color: '#616E88', fontStyle: 'italic' },
-  heading: { color: '#D08770', fontWeight: 'bold' }, // nord12
-  bracket: { color: '#5E81AC' }, // nord10
-  separator: { color: '#88C0D0' }, // nord8
-  // Red-orange with strikethrough so legacy `|` reads as
-  // "remove this." Distinct from `operator` which is bold red.
-  deprecatedSyntax: { color: '#BF616A', textDecoration: 'line-through' }, // nord11
-  url: { color: '#88C0D0', textDecoration: 'underline' }, // nord8
-  colorAnnotation: { color: '#D08770', fontStyle: 'italic' }, // nord12
-  punctuation: { color: '#616E88' },
-  propertyName: { color: '#88C0D0' }, // nord8
-  string: { color: '#A3BE8C' }, // nord14
-  noteContent: { color: '#616E88', fontStyle: 'italic' },
-  default: {},
-};
-
-// ============================================================
-// LIGHT_ROLE_STYLES — slate-light companion to NORD_ROLE_STYLES
-// ============================================================
-
-/**
- * Light-background counterpart of NORD_ROLE_STYLES for static contexts
- * (marketing site, light-mode source panels). Same role keys — a parity test
- * (tests/block.test.ts) guards the two maps and the `.dgmo-tok-*` rules in
- * block/css.ts against drift. Colors are darker AA-targeting tones tuned for
- * a light code panel (bg ~#f3f5f8). Moved here from the site repo's
- * hand-maintained mirror (BL-114).
- */
-export const LIGHT_ROLE_STYLES: Record<string, Record<string, string>> = {
-  keyword: { color: '#3b6ea5', fontWeight: 'bold' }, // slate blue
-  controlKeyword: { color: '#7d5ba6', fontWeight: 'bold' }, // purple
-  definitionKeyword: { color: '#2f5a86', fontWeight: 'bold' }, // deep blue
-  modifier: { color: '#7d5ba6' },
-  chartType: { color: '#b8691f', fontWeight: 'bold' }, // amber
-  operator: { color: '#c0504d', fontWeight: 'bold' }, // red
-  number: { color: '#7d5ba6' },
-  comment: { color: '#677483', fontStyle: 'italic' }, // muted gray
-  heading: { color: '#b8691f', fontWeight: 'bold' },
-  bracket: { color: '#5b6672' },
-  separator: { color: '#2d7268' }, // deep teal
-  deprecatedSyntax: { color: '#c0504d', textDecoration: 'line-through' },
-  url: { color: '#3b6ea5', textDecoration: 'underline' },
-  colorAnnotation: { color: '#b8691f', fontStyle: 'italic' },
-  punctuation: { color: '#677483' },
-  propertyName: { color: '#2d7268' },
-  string: { color: '#3f7a3b' }, // forest green
-  noteContent: { color: '#677483', fontStyle: 'italic' },
-  default: {},
-};
-
-// ============================================================
-// ROLE_TO_ANSI — ANSI escape codes for CLI output
-// ============================================================
-
-export const ROLE_TO_ANSI: Record<string, string> = {
-  comment: '\x1b[3;90m', // italic dim
-  keyword: '\x1b[1;34m', // bold blue
-  controlKeyword: '\x1b[1;35m', // bold magenta
-  definitionKeyword: '\x1b[1;34m', // bold blue
-  modifier: '\x1b[35m', // magenta
-  chartType: '\x1b[1;33m', // bold yellow
-  operator: '\x1b[1;31m', // bold red
-  number: '\x1b[35m', // magenta
-  heading: '\x1b[1;33m', // bold yellow
-  bracket: '\x1b[34m', // blue
-  separator: '\x1b[36m', // cyan
-  deprecatedSyntax: '\x1b[9;31m', // strikethrough red
-  url: '\x1b[4;36m', // underline cyan
-  colorAnnotation: '\x1b[3;33m', // italic yellow
-  punctuation: '\x1b[90m', // dim
-  propertyName: '\x1b[36m', // cyan
-  string: '\x1b[32m', // green
-  noteContent: '\x1b[3;90m', // italic dim
-};
-
-const ANSI_RESET = '\x1b[0m';
-
-/**
- * Render highlighted tokens to an ANSI string for terminal display.
- */
-export function renderAnsi(
-  tokens: HighlightToken[],
-  useColor: boolean
-): string {
-  if (!useColor) {
-    return tokens.map((t) => t.text).join('');
-  }
-
-  let out = '';
-  let inStyled = false;
-
-  for (const token of tokens) {
-    const ansi = ROLE_TO_ANSI[token.role];
-    if (ansi) {
-      if (inStyled) out += ANSI_RESET;
-      out += ansi + token.text;
-      inStyled = true;
-    } else {
-      if (inStyled) {
-        out += ANSI_RESET;
-        inStyled = false;
-      }
-      out += token.text;
-    }
-  }
-
-  // Final reset to prevent terminal style leakage
-  out += ANSI_RESET;
-  return out;
-}

package/src/editor/highlight.ts

@@ -1,36 +0,0 @@
-import type { NodePropSource } from '@lezer/common';
-import { styleTags, tags as t } from '@lezer/highlight';
-
-/** Maps grammar node names to semantic highlight tags. */
-export const dgmoHighlighting: NodePropSource = styleTags({
-  Comment: t.lineComment,
-  ChartType: t.typeName,
-  TagKeyword: t.definitionKeyword,
-  DirectiveKeyword: t.keyword,
-  ControlKeyword: t.controlKeyword,
-  ModifierKeyword: t.modifier,
-  SyncArrow: t.operator,
-  AsyncArrow: t.operator,
-  Duration: t.number,
-  DateLiteral: t.number,
-  Number: t.number,
-  Percentage: t.number,
-  SectionMarker: t.heading,
-  OpenBracket: t.squareBracket,
-  CloseBracket: t.squareBracket,
-  OpenParen: t.paren,
-  CloseParen: t.paren,
-  OpenAngle: t.angleBracket,
-  CloseAngle: t.angleBracket,
-  Url: t.url,
-  QuotedString: t.string,
-  Pipe: t.separator,
-  Colon: t.separator,
-  Plus: t.separator,
-  Comma: t.punctuation,
-  Dash: t.operator,
-  Tilde: t.operator,
-  Star: t.operator,
-  Question: t.operator,
-  Punct: t.punctuation,
-});

package/src/editor/index.ts

@@ -1,27 +0,0 @@
-import { LRLanguage, LanguageSupport } from '@codemirror/language';
-import { parser } from './dgmo.grammar.js';
-import { dgmoHighlighting } from './highlight';
-
-export { CHART_TYPES, METADATA_KEYS } from './keywords';
-export { dgmoHighlighting } from './highlight';
-
-/** The raw Lezer parser for DGMO. */
-export const dgmoParser = parser.configure({
-  props: [dgmoHighlighting],
-});
-
-/** LRLanguage wrapper for CodeMirror. */
-export const dgmoLanguage = LRLanguage.define({
-  name: 'dgmo',
-  parser: dgmoParser,
-});
-
-/** Full language support (language + extensions). */
-export const dgmoLanguageSupport = new LanguageSupport(dgmoLanguage);
-
-/**
- * Drop-in replacement for the old dgmoExtension.
- * Consumers should add indentationMarkers() separately if desired
- * (from @replit/codemirror-indentation-markers).
- */
-export const dgmoExtension = dgmoLanguageSupport;