@diagrammo/dgmo 0.8.15 → 0.8.17

package/src/echarts.ts

@@ -105,7 +105,7 @@ import { mix } from './palettes/color-utils';
 import { parseChart } from './chart';
 import type { ParsedChart, ChartEra } from './chart';
 import { makeDgmoError, formatDgmoError, suggest } from './diagnostics';
-import { resolveColor } from './colors';
+import { resolveColorWithDiagnostic } from './colors';
 import {
   collectIndentedValues,
   extractColor,
@@ -300,7 +300,12 @@ export function parseExtendedChart(
     if (categoryMatch) {
       const catName = categoryMatch[1].trim();
       const catColor = categoryMatch[2]
-        ? resolveColor(categoryMatch[2].trim(), palette)
+        ? (resolveColorWithDiagnostic(
+            categoryMatch[2].trim(),
+            lineNumber,
+            result.diagnostics,
+            palette
+          ) ?? null)
         : null;
       if (catColor) {
         if (!result.categoryColors) result.categoryColors = {};
@@ -332,7 +337,12 @@ export function parseExtendedChart(
         if (targetColor) result.nodeColors[target] = targetColor;
       }
       const linkColor = rawLinkColor
-        ? resolveColor(rawLinkColor.trim(), palette)
+        ? resolveColorWithDiagnostic(
+            rawLinkColor.trim(),
+            lineNumber,
+            result.diagnostics,
+            palette
+          )
         : undefined;
       if (!result.links) result.links = [];
       result.links.push({
@@ -368,7 +378,12 @@ export function parseExtendedChart(
           if (dataRow && dataRow.values.length === 1) {
             const source = sankeyStack.at(-1)!.name;
             const linkColor = valColorMatch?.[2]
-              ? resolveColor(valColorMatch[2].trim(), palette)
+              ? resolveColorWithDiagnostic(
+                  valColorMatch[2].trim(),
+                  lineNumber,
+                  result.diagnostics,
+                  palette
+                )
               : undefined;
             const { label: target, color: targetColor } = extractColor(
               dataRow.label,

package/src/er/parser.ts

@@ -1,4 +1,4 @@
-import { resolveColor } from '../colors';
+import { resolveColorWithDiagnostic } from '../colors';
 import type { PaletteColors } from '../palettes';
 import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
 import {
@@ -43,8 +43,9 @@ const TABLE_DECL_RE = /^([a-zA-Z_]\w*)(?:\s*\(([^)]+)\))?(?:\s*\|(.+))?$/;
 // Remaining tokens are constraint keywords (pk, fk, unique, nullable).
 // Handled programmatically, not with a single regex.
 
-// Indented relationship: 1-* target  or  1-label-* target
-const INDENT_REL_RE = /^([1*?])-(?:(.+)-)?([1*?])\s+([a-zA-Z_]\w*)\s*$/;
+// Indented relationship: 1-* target, 1--* target, or 1-label-* target / 1--label--* target
+const INDENT_REL_RE =
+  /^([1*?])-{1,2}(?:(.+?)-{1,2})?([1*?])\s+([a-zA-Z_]\w*)\s*$/;
 
 // Constraint keywords
 const CONSTRAINT_MAP: Record<string, ERConstraint> = {
@@ -372,7 +373,14 @@ export function parseERDiagram(
     if (tableDecl) {
       const name = tableDecl[1];
       const colorName = tableDecl[2]?.trim();
-      const color = colorName ? resolveColor(colorName, palette) : undefined;
+      const color = colorName
+        ? resolveColorWithDiagnostic(
+            colorName,
+            lineNumber,
+            result.diagnostics,
+            palette
+          )
+        : undefined;
 
       const table = getOrCreateTable(name, lineNumber);
       if (color) table.color = color;

package/src/graph/flowchart-parser.ts

@@ -1,4 +1,5 @@
-import { resolveColor } from '../colors';
+import { resolveColorWithDiagnostic } from '../colors';
+import type { DgmoError } from '../diagnostics';
 import type { PaletteColors } from '../palettes';
 import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
 import {
@@ -185,23 +186,46 @@ interface ArrowInfo {
   color?: string;
 }
 
-function parseArrowToken(token: string, palette?: PaletteColors): ArrowInfo {
+function parseArrowToken(
+  token: string,
+  palette: PaletteColors | undefined,
+  lineNumber: number,
+  diagnostics: DgmoError[]
+): ArrowInfo {
   if (token === '->') return {};
   // Color-only: -(color)->
   const colorOnly = token.match(/^-\(([^)]+)\)->$/);
   if (colorOnly) {
-    return { color: resolveColor(colorOnly[1].trim(), palette) ?? undefined };
+    return {
+      color: resolveColorWithDiagnostic(
+        colorOnly[1].trim(),
+        lineNumber,
+        diagnostics,
+        palette
+      ),
+    };
   }
   // -label(color)-> or -label->
   const m = token.match(/^-(.+?)(?:\(([^)]+)\))?->$/);
   if (m) {
     const label = m[1]?.trim() || undefined;
     let color = m[2]
-      ? (resolveColor(m[2].trim(), palette) ?? undefined)
+      ? resolveColorWithDiagnostic(
+          m[2].trim(),
+          lineNumber,
+          diagnostics,
+          palette
+        )
       : undefined;
     if (label && !color) {
       const inferred = inferArrowColor(label);
-      if (inferred) color = resolveColor(inferred, palette) ?? undefined;
+      if (inferred)
+        color = resolveColorWithDiagnostic(
+          inferred,
+          lineNumber,
+          diagnostics,
+          palette
+        );
     }
     return { label, color };
   }
@@ -327,7 +351,12 @@ export function parseFlowchart(
 
       // Check if this is an arrow token
       if (seg === '->' || /^-.+->$/.test(seg)) {
-        pendingArrow = parseArrowToken(seg, palette);
+        pendingArrow = parseArrowToken(
+          seg,
+          palette,
+          lineNumber,
+          result.diagnostics
+        );
         continue;
       }
 

package/src/graph/state-parser.ts

@@ -1,4 +1,5 @@
-import { resolveColor } from '../colors';
+import { resolveColorWithDiagnostic } from '../colors';
+import type { DgmoError } from '../diagnostics';
 import type { PaletteColors } from '../palettes';
 import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
 import {
@@ -103,16 +104,33 @@ interface ArrowInfo {
   color?: string;
 }
 
-function parseArrowToken(token: string, palette?: PaletteColors): ArrowInfo {
+function parseArrowToken(
+  token: string,
+  palette: PaletteColors | undefined,
+  lineNumber: number,
+  diagnostics: DgmoError[]
+): ArrowInfo {
   if (token === '->') return {};
   const colorOnly = token.match(/^-\(([^)]+)\)->$/);
   if (colorOnly)
-    return { color: resolveColor(colorOnly[1].trim(), palette) ?? undefined };
+    return {
+      color: resolveColorWithDiagnostic(
+        colorOnly[1].trim(),
+        lineNumber,
+        diagnostics,
+        palette
+      ),
+    };
   const m = token.match(/^-(.+?)(?:\(([^)]+)\))?->$/);
   if (m) {
     const label = m[1]?.trim() || undefined;
     const color = m[2]
-      ? (resolveColor(m[2].trim(), palette) ?? undefined)
+      ? resolveColorWithDiagnostic(
+          m[2].trim(),
+          lineNumber,
+          diagnostics,
+          palette
+        )
       : undefined;
     return { label, color };
   }
@@ -265,7 +283,12 @@ export function parseState(
       const groupLabel = groupMatch[1].trim();
       const groupColorName = groupMatch[2]?.trim();
       const groupColor = groupColorName
-        ? resolveColor(groupColorName, palette)
+        ? resolveColorWithDiagnostic(
+            groupColorName,
+            lineNumber,
+            result.diagnostics,
+            palette
+          )
         : undefined;
 
       currentGroup = {
@@ -352,7 +375,12 @@ export function parseState(
       const seg = segments[j];
 
       if (seg === '->' || /^-.+->$/.test(seg)) {
-        pendingArrow = parseArrowToken(seg, palette);
+        pendingArrow = parseArrowToken(
+          seg,
+          palette,
+          lineNumber,
+          result.diagnostics
+        );
         continue;
       }
 

package/src/index.ts

@@ -414,7 +414,15 @@ export type {
 // Colors & Palettes
 // ============================================================
 
-export { resolveColor, colorNames, nord, seriesColors } from './colors';
+export {
+  resolveColor,
+  resolveColorWithDiagnostic,
+  colorNames,
+  nord,
+  seriesColors,
+  RECOGNIZED_COLOR_NAMES,
+  isRecognizedColorName,
+} from './colors';
 
 export {
   // Registry

package/src/infra/parser.ts

@@ -7,6 +7,7 @@
 // and connections, [Group] containers, tag groups, pipe metadata.
 
 import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
+import { resolveColorWithDiagnostic } from '../colors';
 import {
   measureIndent,
   parseFirstLine,
@@ -349,9 +350,14 @@ export function parseInfra(content: string): ParsedInfra {
       const tvMatch = cleanEntry.match(TAG_VALUE_RE);
       if (tvMatch) {
         const valueName = tvMatch[1].trim();
+        const rawColor = tvMatch[2]?.trim();
+        if (rawColor) {
+          // Validate the color name; emit diagnostic if invalid
+          resolveColorWithDiagnostic(rawColor, lineNumber, result.diagnostics);
+        }
         currentTagGroup.values.push({
           name: valueName,
-          color: tvMatch[2]?.trim(),
+          color: rawColor,
         });
         if (isDefault) {
           currentTagGroup.defaultValue = valueName;

package/src/kanban/parser.ts

@@ -1,6 +1,6 @@
 import type { PaletteColors } from '../palettes';
 import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
-import { resolveColor } from '../colors';
+import { resolveColorWithDiagnostic } from '../colors';
 import {
   matchTagBlockHeading,
   stripDefaultModifier,
@@ -237,7 +237,12 @@ export function parseKanban(
       columnCounter++;
       const colName = columnMatch[1].trim();
       const colColor = columnMatch[2]
-        ? (resolveColor(columnMatch[2].trim(), palette) ?? undefined)
+        ? resolveColorWithDiagnostic(
+            columnMatch[2].trim(),
+            lineNumber,
+            result.diagnostics,
+            palette
+          )
         : undefined;
 
       // Parse pipe metadata (e.g., "| wip: 3, t: Sprint1")
@@ -298,7 +303,8 @@ export function parseKanban(
         lineNumber,
         cardCounter,
         aliasMap,
-        palette
+        palette,
+        result.diagnostics
       );
       // Cascade column metadata to card tags (card overrides on conflict)
       // Exclude 'wip' from cascading — it's a column-level property, not a card tag
@@ -381,7 +387,8 @@ function parseCardLine(
   lineNumber: number,
   counter: number,
   aliasMap: Map<string, string>,
-  palette?: PaletteColors
+  palette?: PaletteColors,
+  diagnostics?: import('../diagnostics').DgmoError[]
 ): KanbanCard {
   // Split on first pipe: Title | tag: value, tag: value
   const pipeIdx = trimmed.indexOf('|');
@@ -396,7 +403,12 @@ function parseCardLine(
   }
 
   // Extract optional color suffix from title
-  const { label: title, color } = extractColor(rawTitle, palette);
+  const { label: title, color } = extractColor(
+    rawTitle,
+    palette,
+    diagnostics,
+    lineNumber
+  );
 
   // Parse tags: comma-separated key: value pairs
   const tags: Record<string, string> = {};