@diagrammo/dgmo 0.8.3 → 0.8.5

package/src/editor/keywords.ts

@@ -0,0 +1,222 @@
+/** All supported DGMO chart types. */
+export const CHART_TYPES = new Set([
+  // Diagram types
+  'sequence',
+  'flowchart',
+  'class',
+  'er',
+  'org',
+  'kanban',
+  'c4',
+  'initiative-status',
+  'state',
+  'sitemap',
+  'infra',
+  'gantt',
+  // Data chart types
+  'bar',
+  'line',
+  'pie',
+  'doughnut',
+  'area',
+  'polar-area',
+  'radar',
+  'bar-stacked',
+  'multi-line',
+  'scatter',
+  'sankey',
+  'chord',
+  'function',
+  'heatmap',
+  'funnel',
+  // Visualization types
+  'slope',
+  'wordcloud',
+  'arc',
+  'timeline',
+  'venn',
+  'quadrant',
+]);
+
+/** Metadata keys recognized across chart types. */
+export const METADATA_KEYS = new Set([
+  'title',
+  'series',
+  'orientation',
+  'x-label',
+  'y-label',
+  'size-label',
+  'x',
+  'columns',
+  'rows',
+  'labels',
+  'rotate',
+  'max',
+  'size',
+  'order',
+  'sort',
+  'scale',
+  'values',
+  'notation',
+  'x-axis',
+  'y-axis',
+  'top-right',
+  'top-left',
+  'bottom-right',
+  'bottom-left',
+]);
+
+/** Tag declaration keyword. */
+export const TAG_KEYWORD = 'tag';
+
+/** Directive keywords — commands that configure chart behavior. */
+export const DIRECTIVE_KEYWORDS = new Set([
+  // Gantt
+  'start',
+  'era',
+  'marker',
+  'holiday',
+  'workweek',
+  'today-marker',
+  'critical-path',
+  'no-dependencies',
+  'sort',
+  // Tags
+  'tags',
+  'import',
+  'active-tag',
+  'hide',
+  // ER
+  'notation',
+  // Class
+  'extends',
+  'implements',
+  'abstract',
+  'interface',
+  'enum',
+  // C4
+  'containers',
+  'components',
+  'deployment',
+  // Infra directives
+  'sub-node-label',
+  'show-sub-node-count',
+  'no-auto-color',
+  // Infra node properties
+  'description',
+  'instances',
+  'max-rps',
+  'latency-ms',
+  'uptime',
+  'firewall-block',
+  'ratelimit-rps',
+  'cb-error-threshold',
+  'cb-latency-threshold-ms',
+  'buffer',
+  'drain-rate',
+  'retention-hours',
+  'partitions',
+  'split',
+  'slo-p90-latency-ms',
+  'slo-availability',
+  'cache-hit',
+  'concurrency',
+  'duration-ms',
+  'cold-start-ms',
+  'rps',
+  // Sequence
+  'activations',
+  'no-activations',
+  'collapse-notes',
+  'no-collapse-notes',
+  // Data charts
+  'stacked',
+  'no-label-name',
+  'no-label-value',
+  'no-label-percent',
+  // Slope
+  'period',
+  // Quadrant
+  'x-axis',
+  'y-axis',
+  'top-right',
+  'top-left',
+  'bottom-right',
+  'bottom-left',
+  // Layout
+  'direction-tb',
+  'direction-lr',
+  // Initiative-status
+  'contains',
+  // Data chart metadata
+  'title',
+  'series',
+  'orientation',
+  'x-label',
+  'y-label',
+  'size-label',
+  'columns',
+  'rows',
+  'labels',
+  'rotate',
+  'scale',
+  'values',
+]);
+
+/** Control flow keywords — structural blocks. */
+export const CONTROL_KEYWORDS = new Set([
+  'if',
+  'else',
+  'loop',
+  'parallel',
+  'note',
+]);
+
+/** Status keywords — initiative-status, kanban. */
+export const STATUS_KEYWORDS = new Set([
+  'na',
+  'todo',
+  'wip',
+  'done',
+  'blocked',
+  'in-progress',
+  'backlog',
+  'ready',
+]);
+
+/** Modifier keywords — adjust declarations. */
+export const MODIFIER_KEYWORDS = new Set([
+  'alias',
+  'aka',
+  'position',
+  'default',
+  // Sequence participant types
+  'actor',
+  'service',
+  'database',
+  'queue',
+  'cache',
+  'gateway',
+  'external',
+  'networking',
+  'frontend',
+  // C4 element types
+  'system',
+  'person',
+  'container',
+  'component',
+  // ER column modifiers
+  'pk',
+  'fk',
+  'nullable',
+  'unique',
+  // ER data types
+  'int',
+  'varchar',
+  'text',
+  'boolean',
+  'date',
+  'timestamp',
+  'float',
+  'decimal',
+]);

package/src/editor/tokens.ts

@@ -0,0 +1,30 @@
+import {
+  ChartType,
+  TagKeyword,
+  DirectiveKeyword,
+  ControlKeyword,
+  ModifierKeyword,
+} from './dgmo.grammar.terms.js';
+import {
+  CHART_TYPES,
+  TAG_KEYWORD,
+  DIRECTIVE_KEYWORDS,
+  CONTROL_KEYWORDS,
+  STATUS_KEYWORDS,
+  MODIFIER_KEYWORDS,
+} from './keywords';
+
+/**
+ * Keyword specializer for the Lezer grammar.
+ * Called on every Identifier token — returns a specialized term ID
+ * or -1 to keep it as a plain Identifier.
+ */
+export function specializeKeyword(value: string): number {
+  if (CHART_TYPES.has(value)) return ChartType;
+  if (value === TAG_KEYWORD) return TagKeyword;
+  if (DIRECTIVE_KEYWORDS.has(value)) return DirectiveKeyword;
+  if (CONTROL_KEYWORDS.has(value)) return ControlKeyword;
+  if (STATUS_KEYWORDS.has(value)) return ModifierKeyword;
+  if (MODIFIER_KEYWORDS.has(value)) return ModifierKeyword;
+  return -1;
+}

package/src/er/parser.ts

@@ -1,7 +1,13 @@
 import { resolveColor } from '../colors';
 import type { PaletteColors } from '../palettes';
 import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
-import { measureIndent, extractColor, parsePipeMetadata, parseFirstLine, OPTION_NOCOLON_RE } from '../utils/parsing';
+import {
+  measureIndent,
+  extractColor,
+  parsePipeMetadata,
+  parseFirstLine,
+  OPTION_NOCOLON_RE,
+} from '../utils/parsing';
 import { matchTagBlockHeading, validateTagValues } from '../utils/tag-groups';
 import type { TagGroup } from '../utils/tag-groups';
 import type {
@@ -82,7 +88,7 @@ const KEYWORD_TO_SYMBOL: Record<string, string> = {
 function parseRelationship(
   trimmed: string,
   lineNumber: number,
-  pushError: (line: number, message: string) => void,
+  pushError: (line: number, message: string) => void
 ): {
   source: string;
   target: string;
@@ -113,7 +119,7 @@ function parseRelationship(
     const toSym = KEYWORD_TO_SYMBOL[kw[3].toLowerCase()] ?? kw[3];
     pushError(
       lineNumber,
-      `Use symbolic cardinality (1--*, ?--1, *--*) instead of "${kw[2]}-to-${kw[3]}". Example: ${kw[1]} ${fromSym}--${toSym} ${kw[4]}`,
+      `Use symbolic cardinality (1--*, ?--1, *--*) instead of "${kw[2]}-to-${kw[3]}". Example: ${kw[1]} ${fromSym}--${toSym} ${kw[4]}`
     );
     return null;
   }
@@ -176,7 +182,8 @@ export function parseERDiagram(
     error: null,
   };
 
-  const fail = (line: number, message: string): ParsedERDiagram => {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const _fail = (line: number, message: string): ParsedERDiagram => {
     const diag = makeDgmoError(line, message);
     result.diagnostics.push(diag);
     result.error = formatDgmoError(diag);
@@ -254,7 +261,10 @@ export function parseERDiagram(
           lineNumber,
         };
         if (tagBlockMatch.alias) {
-          aliasMap.set(tagBlockMatch.alias.toLowerCase(), tagBlockMatch.name.toLowerCase());
+          aliasMap.set(
+            tagBlockMatch.alias.toLowerCase(),
+            tagBlockMatch.name.toLowerCase()
+          );
         }
         result.tagGroups.push(currentTagGroup);
         continue;
@@ -265,8 +275,13 @@ export function parseERDiagram(
     if (currentTagGroup && !contentStarted && indent > 0) {
       const { label, color } = extractColor(trimmed, palette);
       if (!color) {
-        result.diagnostics.push(makeDgmoError(lineNumber,
-          `Expected 'Value(color)' in tag group '${currentTagGroup.name}'`, 'warning'));
+        result.diagnostics.push(
+          makeDgmoError(
+            lineNumber,
+            `Expected 'Value(color)' in tag group '${currentTagGroup.name}'`,
+            'warning'
+          )
+        );
         continue;
       }
       // First entry becomes the default
@@ -339,8 +354,8 @@ export function parseERDiagram(
         makeDgmoError(
           lineNumber,
           `Relationship "${rel.source} → ${rel.target}" must be indented under the source table "${rel.source}"`,
-          'warning',
-        ),
+          'warning'
+        )
       );
       continue;
     }
@@ -367,11 +382,19 @@ export function parseERDiagram(
       currentTable = table;
       continue;
     }
+
+    // Catch-all: nothing matched this line
+    result.diagnostics.push(
+      makeDgmoError(lineNumber, `Unexpected line: '${trimmed}'.`, 'warning')
+    );
   }
 
   // Validation
   if (result.tables.length === 0 && !result.error) {
-    const diag = makeDgmoError(1, 'No tables found. Add table declarations like "users" or "orders (blue)".');
+    const diag = makeDgmoError(
+      1,
+      'No tables found. Add table declarations like "users" or "orders (blue)".'
+    );
     result.diagnostics.push(diag);
     result.error = formatDgmoError(diag);
   }
@@ -385,8 +408,9 @@ export function parseERDiagram(
     validateTagValues(
       tagEntities,
       result.tagGroups,
-      (line, msg) => result.diagnostics.push(makeDgmoError(line, msg, 'warning')),
-      suggest,
+      (line, msg) =>
+        result.diagnostics.push(makeDgmoError(line, msg, 'warning')),
+      suggest
     );
 
     // Inject defaults for tables without explicit tags
@@ -402,7 +426,11 @@ export function parseERDiagram(
   }
 
   // Warn about isolated tables (not in any relationship)
-  if (result.tables.length >= 2 && result.relationships.length >= 1 && !result.error) {
+  if (
+    result.tables.length >= 2 &&
+    result.relationships.length >= 1 &&
+    !result.error
+  ) {
     const connectedIds = new Set<string>();
     for (const rel of result.relationships) {
       connectedIds.add(rel.source);
@@ -410,7 +438,13 @@ export function parseERDiagram(
     }
     for (const table of result.tables) {
       if (!connectedIds.has(table.id)) {
-        result.diagnostics.push(makeDgmoError(table.lineNumber, `Table "${table.name}" is not connected to any other table`, 'warning'));
+        result.diagnostics.push(
+          makeDgmoError(
+            table.lineNumber,
+            `Table "${table.name}" is not connected to any other table`,
+            'warning'
+          )
+        );
       }
     }
   }