@diagrammo/dgmo 0.15.0 → 0.16.0

package/src/echarts.ts

@@ -367,12 +367,15 @@ export function parseExtendedChart(
     }
 
     // [Category] container header with optional color: [Category Name] or [Category Name](color)
-    const categoryMatch = trimmed.match(/^\[(.+?)\](?:\s*\(([^)]+)\))?\s*$/);
+    // Category brackets with optional trailing-token color (§1.5):
+    // `[Name]` or `[Name] color`. Per universal rule, color is a bare token.
+    const categoryMatch = trimmed.match(/^\[(.+?)\](?:\s+(\S+))?\s*$/);
     if (categoryMatch) {
       const catName = categoryMatch[1].trim();
-      const catColor = categoryMatch[2]
+      const rawCatColor = categoryMatch[2]?.trim();
+      const catColor = rawCatColor
         ? (resolveColorWithDiagnostic(
-            categoryMatch[2].trim(),
+            rawCatColor,
             lineNumber,
             result.diagnostics,
             palette
@@ -388,9 +391,14 @@ export function parseExtendedChart(
       continue;
     }
 
-    // Sankey/chord link syntax: Source -> Target Value (directed) or Source -- Target Value (undirected)
+    // Sankey/chord link syntax (§1.5 universal trailing-token):
+    //   `Source -> Target value`           (directed, no link color)
+    //   `Source -> Target value linkColor` (directed, trailing-token link color)
+    //   `Source -- Target value`           (undirected)
+    // Link color (if present) must be a recognized lowercase palette word.
+    // Source/target labels still accept trailing-token color via extractColor.
     const arrowMatch = trimmed.match(
-      /^(.+?)\s*(->|--)\s*(.+?)\s+(-?[\d,_]+(?:\.[\d]+)?)\s*(?:\(([^)]+)\))?\s*$/
+      /^(.+?)\s*(->|--)\s*(.+?)\s+(-?[\d,_]+(?:\.[\d]+)?)(?:\s+(red|orange|yellow|green|blue|purple|teal|cyan|gray|black|white))?\s*$/
     );
     if (arrowMatch) {
       const [, rawSource, arrow, rawTarget, rawVal, rawLinkColor] = arrowMatch;
@@ -441,13 +449,22 @@ export function parseExtendedChart(
           sankeyStack.pop();
         }
         if (sankeyStack.length > 0) {
-          // Parse "TargetName value (linkColor)" or "TargetName(nodeColor) value (linkColor)"
-          // Strip trailing (color) annotation before parseDataRowValues — it can't handle it
+          // Indented sankey child (§1.5 trailing-token):
+          //   `TargetName value`                  — link, no link color
+          //   `TargetName value linkColor`        — link with link color
+          //   `TargetName nodeColor value`        — node-colored child
+          //   `TargetName nodeColor value linkColor` — both
+          // Strategy: peel a trailing recognized color word (after the value)
+          // first, then run parseDataRowValues on the remainder. Trailing
+          // tokens that aren't recognized colors stay in the data row.
           const valColorMatch = trimmed.match(
-            /(-?[\d,_]+(?:\.[\d]+)?)\s*\(([^)]+)\)\s*$/
+            /(-?[\d,_]+(?:\.[\d]+)?)\s+(red|orange|yellow|green|blue|purple|teal|cyan|gray|black|white)\s*$/
           );
           const strippedLine = valColorMatch
-            ? trimmed.replace(/\s*\([^)]+\)\s*$/, '')
+            ? trimmed.replace(
+                /\s+(red|orange|yellow|green|blue|purple|teal|cyan|gray|black|white)\s*$/,
+                ''
+              )
             : trimmed;
           const dataRow = parseDataRowValues(strippedLine);
           if (dataRow && dataRow.values.length === 1) {
@@ -1026,7 +1043,7 @@ function buildChordOption(
   isDark: boolean,
   textColor: string,
   colors: string[],
-  bg: string,
+  _bg: string,
   titleConfig: EChartsOption['title']
 ): EChartsOption {
   // Extract unique nodes from links
@@ -1185,7 +1202,7 @@ function evaluateExpression(expr: string, x: number): number {
 function buildFunctionOption(
   parsed: ParsedExtendedChart,
   palette: PaletteColors,
-  isDark: boolean,
+  _isDark: boolean,
   textColor: string,
   axisLineColor: string,
   gridOpacity: number,
@@ -2092,7 +2109,7 @@ function buildFunnelOption(
   isDark: boolean,
   textColor: string,
   colors: string[],
-  bg: string,
+  _bg: string,
   titleConfig: EChartsOption['title']
 ): EChartsOption {
   // Sort data descending by value for funnel ordering
@@ -2464,7 +2481,7 @@ function buildBarOption(
   splitLineColor: string,
   gridOpacity: number,
   colors: string[],
-  bg: string,
+  _bg: string,
   titleConfig: EChartsOption['title'],
   chartWidth?: number
 ): EChartsOption {
@@ -2893,7 +2910,7 @@ function buildPieOption(
   isDark: boolean,
   textColor: string,
   colors: string[],
-  bg: string,
+  _bg: string,
   titleConfig: EChartsOption['title'],
   isDoughnut: boolean
 ): EChartsOption {
@@ -3021,7 +3038,7 @@ function buildPolarAreaOption(
   isDark: boolean,
   textColor: string,
   colors: string[],
-  bg: string,
+  _bg: string,
   titleConfig: EChartsOption['title']
 ): EChartsOption {
   const data = parsed.data.map((d, i) => {
@@ -3079,7 +3096,7 @@ function buildBarStackedOption(
   splitLineColor: string,
   gridOpacity: number,
   colors: string[],
-  bg: string,
+  _bg: string,
   titleConfig: EChartsOption['title'],
   chartWidth?: number
 ): EChartsOption {
@@ -3282,11 +3299,11 @@ export async function renderExtendedChartForExport(
       // In static export, expand the first group so entries are visible
       // Extract grid offsets for plot-area-centered legend
       const grid = option.grid as Record<string, unknown> | undefined;
-      const gridLeftPct = grid?.left
-        ? parseFloat(String(grid.left))
+      const gridLeftPct = grid?.['left']
+        ? parseFloat(String(grid['left']))
         : undefined;
-      const gridRightPct = grid?.right
-        ? parseFloat(String(grid.right))
+      const gridRightPct = grid?.['right']
+        ? parseFloat(String(grid['right']))
         : undefined;
       const { svg: legendSvgStr } = renderLegendSvg(legendGroups, {
         palette: effectivePalette,

package/src/editor/dgmo.grammar

@@ -8,7 +8,6 @@ contentPart {
   SectionMarker |
   Url |
   OpenBracket | CloseBracket | OpenParen | CloseParen | OpenAngle | CloseAngle |
-  ColorAnnotation |
   Pipe | Colon | Comma | Plus | Dash | Tilde | Star | Question |
   ChartType |
   TagKeyword | DirectiveKeyword | ControlKeyword | ModifierKeyword |
@@ -38,7 +37,6 @@ contentPart {
 
   SectionMarker { "==" }
   Url { "http" "s"? "://" ![ \t\n|,)\]>]+ }
-  ColorAnnotation { "(" $[a-z\-]+ ")" }
 
   Pipe { "|" }
   Colon { ":" }
@@ -66,7 +64,7 @@ contentPart {
 
   @precedence {
     Comment, SyncArrow, AsyncArrow,
-    Duration, DateLiteral, Percentage, Number, SectionMarker, Url, ColorAnnotation,
+    Duration, DateLiteral, Percentage, Number, SectionMarker, Url,
     Pipe, Colon, Comma, Plus, Dash, Tilde, Star, Question,
     OpenBracket, CloseBracket, OpenParen, CloseParen, OpenAngle, CloseAngle,
     QuotedString, Identifier, Punct

package/src/editor/dgmo.grammar.js

@@ -3,16 +3,16 @@ import {LRParser} from "@lezer/lr"
 import {specializeKeyword} from "./tokens"
 export const parser = LRParser.deserialize({
   version: 14,
-  states: "!WQVQPOOOOQO'#DV'#DVOOQO'#DQ'#DQO%cQPO'#CdOOQO'#DP'#DPQVQPOOOOQO-E7O-E7OOOQO,59O,59OOOQO-E6}-E6}",
-  stateData: "&X~OwOS~OPPOQPORPOSPOTPOVSOXPOYPOZPO[PO]PO^PO_PO`POaPObPOcPOdPOePOfPOgPOhPOiPOjPOkPOlPOmPOnPOoPOpPOqPOrPOxSO~OPPOQPORPOSPOTPOXPOYPOZPO[PO]PO^PO_PO`POaPObPOcPOdPOePOfPOgPOhPOiPOjPOkPOlPOmPOnPOoPOpPOqPOrPO~OxVO~P#`OVXYZ[]^_`ghijklmnoabcdefpqrk~",
-  goto: "!czPPPPPPPP{PPPPPPPPPPPPPPPPPPPPPPPPPP!P!VPPPP!^TSOTQTORWTSROTRURVQORT",
-  nodeNames: "⚠ ChartType TagKeyword DirectiveKeyword ControlKeyword ModifierKeyword Document Comment ContentLine SyncArrow AsyncArrow Duration DateLiteral Percentage Number SectionMarker Url OpenBracket CloseBracket OpenParen CloseParen OpenAngle CloseAngle ColorAnnotation Pipe Colon Comma Plus Dash Tilde Star Question QuotedString Identifier Punct",
-  maxTerm: 41,
+  states: "!WQVQPOOOOQO'#DU'#DUOOQO'#DP'#DPO%]QPO'#CdOOQO'#DO'#DOQVQPOOOOQO-E6}-E6}OOQO,59O,59OOOQO-E6|-E6|",
+  stateData: "&Q~OvOS~OPPOQPORPOSPOTPOVSOXPOYPOZPO[PO]PO^PO_PO`POaPObPOcPOdPOePOfPOgPOhPOiPOjPOkPOlPOmPOnPOoPOpPOqPOwSO~OPPOQPORPOSPOTPOXPOYPOZPO[PO]PO^PO_PO`POaPObPOcPOdPOePOfPOgPOhPOiPOjPOkPOlPOmPOnPOoPOpPOqPO~OwVO~P#]OVXYZ[]^_`ghijklmnabcdefopqk~",
+  goto: "!byPPPPPPPPzPPPPPPPPPPPPPPPPPPPPPPPPP!O!UPPPP!]TSOTQTORWTSROTRURVQORT",
+  nodeNames: "⚠ ChartType TagKeyword DirectiveKeyword ControlKeyword ModifierKeyword Document Comment ContentLine SyncArrow AsyncArrow Duration DateLiteral Percentage Number SectionMarker Url OpenBracket CloseBracket OpenParen CloseParen OpenAngle CloseAngle Pipe Colon Comma Plus Dash Tilde Star Question QuotedString Identifier Punct",
+  maxTerm: 40,
   skippedNodes: [0],
   repeatNodeCount: 2,
-  tokenData: "=_~RzOX#uXY#zYZ$VZp#upq#zqr#urs$[st#uux#uxy%eyz&Tz{&[{|&c|}&j}!O&q!O!P#u!P!Q'Q!Q!['q![!]0d!]!^#u!^!_0k!_!`0r!`!a1P!a!b1W!b!c#u!c!}1_!}#O4e#O#P#u#P#Q4j#Q#R#u#R#S1_#S#T#u#T#[1_#[#]4q#]#o1_#o#p#u#p#q<q#q#r#u#r#s<x#s;'S#u;'S;=`=X<%lO#u~#zOr~~$PQw~XY#zpq#z~$[Ox~~$aUr~OY$sZr$srs%Ys;'S$s;'S;=`%_<%lO$s~$vUOY$sZr$srs%Ys;'S$s;'S;=`%_<%lO$s~%_Op~~%bP;=`<%l$s~%lQc~r~}!O%r#T#o%r~%uRyz&O}!O%r#T#o%r~&TOg~~&[Od~r~~&cOn~r~~&jOk~r~~&qOj~r~~&xPl~r~!`!a&{~'QOX~~'VPr~!P!Q'Y~'_SV~OY'YZ;'S'Y;'S;=`'k<%lO'Y~'nP;=`<%l'Y~'x]^~r~uv(q|}(v!O!P)s!Q![+d#R#S0O#U#V*n#W#X*t#[#]*t#a#b+R#e#f*t#g#h*t#k#l*t#m#n*t~(vO]~~(yP!Q![(|~)PP!Q![)S~)VP!Q![)Y~)_Q^~|}(v!O!P)e~)hP!Q![)k~)pP^~!Q![)k~)vP!Q![)y~*OY^~uv(q!Q![)y#U#V*n#W#X*t#[#]*t#a#b+R#e#f*t#g#h*t#k#l*t#m#n*t~*qP#W#X*t~*yPZ~!a!b*|~+ROZ~~+WQZ~!a!b*|#]#^+^~+aP#b#c*t~+i]^~uv(q|}(v!O!P)s!Q![,b#R#S0O#U#V*n#W#X*t#[#]*t#a#b+R#e#f*t#g#h*t#k#l*t#m#n*t~,g]^~uv(q|}(v!O!P)s!Q![-`#R#S0O#U#V*n#W#X*t#[#]*t#a#b+R#e#f*t#g#h*t#k#l*t#m#n*t~-e]^~uv(q}!O.^!O!P)s!Q![/T#R#S0O#U#V*n#W#X*t#[#]*t#a#b+R#e#f*t#g#h*t#k#l*t#m#n*t~.aP!Q![.d~.gP!Q![.j~.oP[~}!O.r~.uP!Q![.x~.{P!Q![/O~/TO[~~/Y[^~uv(q!O!P)s!Q![/T#R#S0O#U#V*n#W#X*t#[#]*t#a#b+R#e#f*t#g#h*t#k#l*t#m#n*t~0RP!Q![0U~0ZR^~!O!P)e!Q![0U#R#S0O~0kOi~r~~0rOe~r~~0wPr~!_!`0z~1PO_~~1WOf~r~~1_Oo~r~~1f_q~r~qr2est2evw2ewx2e{|2e}!O3i!O!P2e!P!Q2e!Q![2e!_!`2e!a!b2e!b!c2e!c!}2e#R#S2e#T#o2e~2j_q~qr2est2evw2ewx2e{|2e}!O3i!O!P2e!P!Q2e!Q![2e!_!`2e!a!b2e!b!c2e!c!}2e#R#S2e#T#o2e~3l]qr2est2evw2ewx2e{|2e!O!P2e!P!Q2e!_!`2e!a!b2e!b!c2e!c!}2e#R#S2e#T#o2e~4jOa~~4qOb~r~~4xaq~r~qr2est2evw2ewx2e{|2e}!O3i!O!P2e!P!Q2e!Q![2e!_!`2e!a!b2e!b!c2e!c!}2e#R#S2e#T#h2e#h#i5}#i#o2e~6Saq~qr2est2evw2ewx2e{|2e}!O3i!O!P2e!P!Q2e!Q![2e!_!`2e!a!b2e!b!c2e!c!}2e#R#S2e#T#h2e#h#i7X#i#o2e~7^aq~qr2est2evw2ewx2e{|2e}!O3i!O!P2e!P!Q2e!Q![2e!_!`2e!a!b2e!b!c2e!c!}2e#R#S2e#T#d2e#d#e8c#e#o2e~8hbq~qr2est2evw2ewx2e{|2e}!O3i!O!P2e!P!Q2e!Q![2e![!]9p!_!`2e!a!b2e!b!c2e!c!}2e#R#S2e#T#g2e#g#h;j#h#o2e~9sP!P!Q9v~9yP!P!Q9|~:PYOX:oZp:oqy:oz|:o}!`:o!a#P:o#Q#p:o#q;'S:o;'S;=`;d<%lO:o~:tY`~OX:oZp:oqy:oz|:o}!`:o!a#P:o#Q#p:o#q;'S:o;'S;=`;d<%lO:o~;gP;=`<%l:o~;o`q~qr2est2evw2ewx2e{|2e}!O3i!O!P2e!P!Q2e!Q![2e![!]9p!_!`2e!a!b2e!b!c2e!c!}2e#R#S2e#T#o2e~<xOh~r~~=PPm~r~!`!a=S~=XOY~~=[P;=`<%l#u",
+  tokenData: "<v~RzOX#uXY#zYZ$VZp#upq#zqr#urs$[st#uux#uxy%eyz%lz{%s{|%z|}&R}!O&Y!O!P#u!P!Q&i!Q!['Y![!]/{!]!^#u!^!_0S!_!`0Z!`!a0h!a!b0o!b!c#u!c!}0v!}#O3|#O#P#u#P#Q4R#Q#R#u#R#S0v#S#T#u#T#[0v#[#]4Y#]#o0v#o#p#u#p#q<Y#q#r#u#r#s<a#s;'S#u;'S;=`<p<%lO#u~#zOq~~$PQv~XY#zpq#z~$[Ow~~$aUq~OY$sZr$srs%Ys;'S$s;'S;=`%_<%lO$s~$vUOY$sZr$srs%Ys;'S$s;'S;=`%_<%lO$s~%_Oo~~%bP;=`<%l$s~%lOc~q~~%sOd~q~~%zOm~q~~&ROj~q~~&YOi~q~~&aPk~q~!`!a&d~&iOX~~&nPq~!P!Q&q~&vSV~OY&qZ;'S&q;'S;=`'S<%lO&q~'VP;=`<%l&q~'a]^~q~uv(Y|}(_!O!P)[!Q![*{#R#S/g#U#V*V#W#X*]#[#]*]#a#b*j#e#f*]#g#h*]#k#l*]#m#n*]~(_O]~~(bP!Q![(e~(hP!Q![(k~(nP!Q![(q~(vQ^~|}(_!O!P(|~)PP!Q![)S~)XP^~!Q![)S~)_P!Q![)b~)gY^~uv(Y!Q![)b#U#V*V#W#X*]#[#]*]#a#b*j#e#f*]#g#h*]#k#l*]#m#n*]~*YP#W#X*]~*bPZ~!a!b*e~*jOZ~~*oQZ~!a!b*e#]#^*u~*xP#b#c*]~+Q]^~uv(Y|}(_!O!P)[!Q![+y#R#S/g#U#V*V#W#X*]#[#]*]#a#b*j#e#f*]#g#h*]#k#l*]#m#n*]~,O]^~uv(Y|}(_!O!P)[!Q![,w#R#S/g#U#V*V#W#X*]#[#]*]#a#b*j#e#f*]#g#h*]#k#l*]#m#n*]~,|]^~uv(Y}!O-u!O!P)[!Q![.l#R#S/g#U#V*V#W#X*]#[#]*]#a#b*j#e#f*]#g#h*]#k#l*]#m#n*]~-xP!Q![-{~.OP!Q![.R~.WP[~}!O.Z~.^P!Q![.a~.dP!Q![.g~.lO[~~.q[^~uv(Y!O!P)[!Q![.l#R#S/g#U#V*V#W#X*]#[#]*]#a#b*j#e#f*]#g#h*]#k#l*]#m#n*]~/jP!Q![/m~/rR^~!O!P(|!Q![/m#R#S/g~0SOh~q~~0ZOe~q~~0`Pq~!_!`0c~0hO_~~0oOf~q~~0vOn~q~~0}_p~q~qr1|st1|vw1|wx1|{|1|}!O3Q!O!P1|!P!Q1|!Q![1|!_!`1|!a!b1|!b!c1|!c!}1|#R#S1|#T#o1|~2R_p~qr1|st1|vw1|wx1|{|1|}!O3Q!O!P1|!P!Q1|!Q![1|!_!`1|!a!b1|!b!c1|!c!}1|#R#S1|#T#o1|~3T]qr1|st1|vw1|wx1|{|1|!O!P1|!P!Q1|!_!`1|!a!b1|!b!c1|!c!}1|#R#S1|#T#o1|~4ROa~~4YOb~q~~4aap~q~qr1|st1|vw1|wx1|{|1|}!O3Q!O!P1|!P!Q1|!Q![1|!_!`1|!a!b1|!b!c1|!c!}1|#R#S1|#T#h1|#h#i5f#i#o1|~5kap~qr1|st1|vw1|wx1|{|1|}!O3Q!O!P1|!P!Q1|!Q![1|!_!`1|!a!b1|!b!c1|!c!}1|#R#S1|#T#h1|#h#i6p#i#o1|~6uap~qr1|st1|vw1|wx1|{|1|}!O3Q!O!P1|!P!Q1|!Q![1|!_!`1|!a!b1|!b!c1|!c!}1|#R#S1|#T#d1|#d#e7z#e#o1|~8Pbp~qr1|st1|vw1|wx1|{|1|}!O3Q!O!P1|!P!Q1|!Q![1|![!]9X!_!`1|!a!b1|!b!c1|!c!}1|#R#S1|#T#g1|#g#h;R#h#o1|~9[P!P!Q9_~9bP!P!Q9e~9hYOX:WZp:Wqy:Wz|:W}!`:W!a#P:W#Q#p:W#q;'S:W;'S;=`:{<%lO:W~:]Y`~OX:WZp:Wqy:Wz|:W}!`:W!a#P:W#Q#p:W#q;'S:W;'S;=`:{<%lO:W~;OP;=`<%l:W~;W`p~qr1|st1|vw1|wx1|{|1|}!O3Q!O!P1|!P!Q1|!Q![1|![!]9X!_!`1|!a!b1|!b!c1|!c!}1|#R#S1|#T#o1|~<aOg~q~~<hPl~q~!`!a<k~<pOY~~<sP;=`<%l#u",
   tokenizers: [0],
   topRules: {"Document":[0,6]},
-  specialized: [{term: 33, get: (value, stack) => (specializeKeyword(value, stack) << 1), external: specializeKeyword}],
-  tokenPrec: 210
+  specialized: [{term: 32, get: (value, stack) => (specializeKeyword(value, stack) << 1), external: specializeKeyword}],
+  tokenPrec: 204
 })

package/src/editor/dgmo.grammar.terms.js

@@ -22,15 +22,14 @@ export const
   CloseParen = 20,
   OpenAngle = 21,
   CloseAngle = 22,
-  ColorAnnotation = 23,
-  Pipe = 24,
-  Colon = 25,
-  Comma = 26,
-  Plus = 27,
-  Dash = 28,
-  Tilde = 29,
-  Star = 30,
-  Question = 31,
-  QuotedString = 32,
-  Identifier = 33,
-  Punct = 34
+  Pipe = 23,
+  Colon = 24,
+  Comma = 25,
+  Plus = 26,
+  Dash = 27,
+  Tilde = 28,
+  Star = 29,
+  Question = 30,
+  QuotedString = 31,
+  Identifier = 32,
+  Punct = 33

package/src/editor/highlight-api.ts

@@ -46,7 +46,6 @@ const NODE_TO_ROLE: Record<string, string> = {
   Percentage: 'number',
   SectionMarker: 'heading',
   Url: 'url',
-  ColorAnnotation: 'colorAnnotation',
   OpenBracket: 'bracket',
   CloseBracket: 'bracket',
   OpenParen: 'bracket',

package/src/editor/highlight.ts

@@ -23,7 +23,6 @@ export const dgmoHighlighting: NodePropSource = styleTags({
   OpenAngle: t.angleBracket,
   CloseAngle: t.angleBracket,
   Url: t.url,
-  ColorAnnotation: t.atom,
   Pipe: t.separator,
   Colon: t.separator,
   Plus: t.separator,

package/src/er/parser.ts

@@ -46,15 +46,15 @@ function tableId(name: string): string {
 // Regex patterns
 // ============================================================
 
-// Table declaration: name or name (color) or name | key: value
-// Multi-word names allowed; quote `"name with reserved chars"` if the name
-// contains pipe / paren / colon. Captures:
+// Table declaration: `name`, `name color` (trailing-token §1.5), or
+// `name | key: value`. Multi-word names allowed; quote `"name with reserved
+// chars"` if the name contains pipe / paren / colon. Captures:
 //   1: quoted-name content (without surrounding quotes), or undefined
 //   2: bare-name (trimmed at call site), or undefined
-//   3: color (inside parens), or undefined
+//   3: trailing-token color (recognized palette word), or undefined
 //   4: pipe metadata (without leading `|`), or undefined
 const TABLE_DECL_RE =
-  /^(?:"([^"]+)"|([a-zA-Z_][^|":(]*?))(?:\s*\(([^)]+)\))?(?:\s*\|(.+))?$/;
+  /^(?:"([^"]+)"|([a-zA-Z_][^|":(]*?))(?:\s+(red|orange|yellow|green|blue|purple|teal|cyan|gray|black|white))?(?:\s*\|(.+))?$/;
 
 // Column: name [type] [constraints...]  — space-separated, no colon, no brackets
 // First token is always the name. Second token is the type if it's not a constraint keyword.
@@ -229,14 +229,6 @@ export function parseERDiagram(
     error: null,
   };
 
-  // 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);
-    return result;
-  };
-
   const pushError = (line: number, message: string): void => {
     const diag = makeDgmoError(line, message);
     result.diagnostics.push(diag);
@@ -358,7 +350,7 @@ export function parseERDiagram(
         result.diagnostics.push(
           makeDgmoError(
             lineNumber,
-            `Expected 'Value(color)' in tag group '${currentTagGroup.name}'`,
+            `Expected 'Value color' in tag group '${currentTagGroup.name}'`,
             'warning'
           )
         );
@@ -502,7 +494,7 @@ export function parseERDiagram(
   if (result.tables.length === 0 && !result.error) {
     const diag = makeDgmoError(
       1,
-      'No tables found. Add table declarations like "users" or "orders (blue)".'
+      'No tables found. Add table declarations like "users" or "orders blue".'
     );
     result.diagnostics.push(diag);
     result.error = formatDgmoError(diag);
@@ -628,7 +620,7 @@ export function looksLikeERDiagram(content: string): boolean {
 // Symbol extraction (for completion API)
 // ============================================================
 
-import type { DiagramSymbols } from '../completion';
+import type { DiagramSymbols } from '../completion-types';
 
 /**
  * Extract table names (entities) and ER keywords from document text.
@@ -640,15 +632,22 @@ export function extractSymbols(docText: string): DiagramSymbols {
   for (const rawLine of docText.split('\n')) {
     const line = rawLine.trim();
     if (inMetadata && /^er(\s|$)/i.test(line)) continue;
-    if (inMetadata && OPTION_NOCOLON_RE.test(line)) continue; // option line
-    inMetadata = false;
-    if (line.length === 0) continue;
+    // Under §1.5 trailing-token, `Users blue` matches OPTION_NOCOLON_RE
+    // (key=Users, value=blue) but is actually a table with a color.
+    // Detect tables FIRST so they aren't swallowed by the option fallback.
     if (/^\s/.test(rawLine)) continue; // indented = column definition, not table
+    if (line.length === 0) continue;
     const m = TABLE_DECL_RE.exec(line);
     if (m) {
       const name = (m[1] ?? m[2] ?? '').trim();
-      if (name) entities.push(name);
+      if (name) {
+        inMetadata = false;
+        entities.push(name);
+        continue;
+      }
     }
+    if (inMetadata && OPTION_NOCOLON_RE.test(line)) continue; // option line
+    inMetadata = false;
   }
   return {
     kind: 'er',

package/src/er/renderer.ts

@@ -225,7 +225,8 @@ export function renderERDiagram(
   exportDims?: { width?: number; height?: number },
   activeTagGroup?: string | null,
   /** When false, semantic role colors are suppressed and entities use a neutral color. */
-  semanticColorsActive?: boolean
+  semanticColorsActive?: boolean,
+  exportMode?: boolean
 ): void {
   d3Selection.select(container).selectAll(':not([data-d3-tooltip])').remove();
 
@@ -340,7 +341,7 @@ export function renderERDiagram(
     semanticRoles !== null && (semanticColorsActive ?? true);
 
   // ── Edges (behind nodes) ──
-  const useLabels = parsed.options.notation === 'labels';
+  const useLabels = parsed.options['notation'] === 'labels';
 
   for (const edge of layout.edges) {
     if (edge.points.length < 2) continue;
@@ -560,7 +561,7 @@ export function renderERDiagram(
     const legendConfig: LegendConfig = {
       groups: parsed.tagGroups,
       position: { placement: 'top-center', titleRelation: 'below-title' },
-      mode: 'fixed',
+      mode: exportMode ? 'export' : 'preview',
     };
     const legendState: LegendState = { activeGroup: activeTagGroup ?? null };
     const legendG = svg
@@ -602,7 +603,7 @@ export function renderERDiagram(
       const legendConfig: LegendConfig = {
         groups: semanticGroups,
         position: { placement: 'top-center', titleRelation: 'below-title' },
-        mode: 'fixed',
+        mode: exportMode ? 'export' : 'preview',
       };
       const legendState: LegendState = {
         activeGroup: semanticActive ? 'Role' : null,
@@ -653,10 +654,21 @@ export function renderERDiagramForExport(
   document.body.appendChild(container);
 
   try {
-    renderERDiagram(container, parsed, layout, palette, isDark, undefined, {
-      width: exportWidth,
-      height: exportHeight,
-    });
+    renderERDiagram(
+      container,
+      parsed,
+      layout,
+      palette,
+      isDark,
+      undefined,
+      {
+        width: exportWidth,
+        height: exportHeight,
+      },
+      undefined,
+      undefined,
+      true
+    );
 
     const svgEl = container.querySelector('svg');
     if (!svgEl) return '';

package/src/gantt/calculator.ts

@@ -9,7 +9,7 @@
 // 3. Forward pass: resolve dates using universal max rule
 // 4. (Optional) Critical path: backward pass to find zero-slack chain
 
-import { makeDgmoError, formatDgmoError } from '../diagnostics';
+import { makeDgmoError } from '../diagnostics';
 import type { DgmoError } from '../diagnostics';
 import type {
   ParsedGantt,
@@ -67,14 +67,6 @@ export function calculateSchedule(parsed: ParsedGantt): ResolvedSchedule {
     diagnostics.push(makeDgmoError(line, message, 'warning'));
   };
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const _fail = (line: number, message: string): ResolvedSchedule => {
-    const diag = makeDgmoError(line, message);
-    diagnostics.push(diag);
-    result.error = formatDgmoError(diag);
-    return result;
-  };
-
   // ── Build holiday set ───────────────────────────────────
 
   const holidaySet = buildHolidaySet(parsed.holidays);
@@ -124,8 +116,6 @@ export function calculateSchedule(parsed: ParsedGantt): ResolvedSchedule {
   // ── Resolve explicit -> dependencies ────────────────────
 
   for (const task of allTasks) {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const _node = taskMap.get(task.id)!;
     for (const dep of task.dependencies) {
       const resolved = resolveTaskName(dep.targetName, allTasks);
       if (isResolverError(resolved)) {

package/src/gantt/parser.ts

@@ -380,7 +380,7 @@ export function parseGantt(
         currentTagGroup = null;
         // fall through to process this line normally
       } else {
-        // Parse tag entry: `Value(color)` or `Value`
+        // Parse tag entry: `Value color` or `Value`
         // First entry is the default unless another is marked `default`
         if (COMMENT_RE.test(line)) continue;
         const { text: cleanEntry, isDefault } = stripDefaultModifier(line);
@@ -435,15 +435,15 @@ export function parseGantt(
             metaAliasMap,
             () => warn(lineNumber, MULTIPLE_PIPE_ERROR)
           );
-          if (meta.lag || meta.lead) {
-            const key = meta.lag ? 'lag' : 'lead';
+          if (meta['lag'] || meta['lead']) {
+            const key = meta['lag'] ? 'lag' : 'lead';
             softError(
               lineNumber,
               `"${key}" is no longer supported — use "offset: ${meta[key]}" instead.${key === 'lead' ? ' Negate the value for lead behavior: "offset: -...".' : ''}`
             );
           }
-          if (meta.offset) {
-            const raw = meta.offset;
+          if (meta['offset']) {
+            const raw = meta['offset'];
             if (raw.trim().startsWith('+')) {
               warn(
                 lineNumber,
@@ -903,15 +903,15 @@ export function parseGantt(
           metaAliasMap,
           () => warn(lineNumber, MULTIPLE_PIPE_ERROR)
         );
-        if (meta.lag || meta.lead) {
-          const key = meta.lag ? 'lag' : 'lead';
+        if (meta['lag'] || meta['lead']) {
+          const key = meta['lag'] ? 'lag' : 'lead';
           softError(
             lineNumber,
             `"${key}" is no longer supported — use "offset: ${meta[key]}" instead.${key === 'lead' ? ' Negate the value for lead behavior: "offset: -...".' : ''}`
           );
         }
-        if (meta.offset) {
-          const raw = meta.offset;
+        if (meta['offset']) {
+          const raw = meta['offset'];
           if (raw.trim().startsWith('+')) {
             warn(
               lineNumber,
@@ -1023,9 +1023,9 @@ export function parseGantt(
 
     // Extract progress from metadata or shorthand
     let progress: number | null = null;
-    if (metadata.progress) {
-      progress = parseFloat(metadata.progress);
-      delete metadata.progress;
+    if (metadata['progress']) {
+      progress = parseFloat(metadata['progress']);
+      delete metadata['progress'];
     }
     // Check for progress shorthand: `| 80%` or `| t:X, 80%`
     for (const part of segments.slice(1).join(',').split(',')) {
@@ -1037,8 +1037,8 @@ export function parseGantt(
     }
 
     // Reject lag/lead — use offset instead
-    if (metadata.lag || metadata.lead) {
-      const key = metadata.lag ? 'lag' : 'lead';
+    if (metadata['lag'] || metadata['lead']) {
+      const key = metadata['lag'] ? 'lag' : 'lead';
       softError(
         ln,
         `"${key}" is no longer supported — use "offset: ${metadata[key]}" instead.${key === 'lead' ? ' Negate the value for lead behavior: "offset: -...".' : ''}`
@@ -1047,8 +1047,8 @@ export function parseGantt(
 
     // Extract task-level offset from metadata
     let taskOffset: Offset | undefined;
-    if (metadata.offset) {
-      const raw = metadata.offset;
+    if (metadata['offset']) {
+      const raw = metadata['offset'];
       if (raw.trim().startsWith('+')) {
         warn(
           ln,
@@ -1063,7 +1063,7 @@ export function parseGantt(
           );
         }
       }
-      delete metadata.offset;
+      delete metadata['offset'];
     }
 
     // Inherit metadata from parent groups (tag inheritance)

package/src/gantt/renderer.ts

@@ -208,6 +208,7 @@ export interface GanttInteractiveOptions {
   collapsedLanes?: Set<string>;
   onToggleLane?: (laneName: string) => void;
   viewMode?: boolean;
+  exportMode?: boolean;
 }
 
 // ── Main Renderer ───────────────────────────────────────────
@@ -439,7 +440,8 @@ export function renderGantt(
             ).attr('display', active ? null : 'none');
           }
           drawLegend();
-        }
+        },
+        options?.exportMode ?? false
       );
     }
   }
@@ -1973,7 +1975,7 @@ function renderTagLegend(
   isDark: boolean,
   hasCriticalPath: boolean,
   criticalPathActive: boolean,
-  optionLineNumbers: Record<string, number>,
+  _optionLineNumbers: Record<string, number>,
   onToggle?: (groupName: string) => void,
   onToggleControlsExpand?: () => void,
   currentSwimlaneGroup?: string | null,
@@ -1983,7 +1985,8 @@ function renderTagLegend(
   controlsExpanded = false,
   hasDependencies = false,
   dependenciesActive = false,
-  onControlsToggle?: (toggleId: string, active: boolean) => void
+  onControlsToggle?: (toggleId: string, active: boolean) => void,
+  exportMode = false
 ): void {
   // Build visible groups: active group expanded + swimlane group as compact pill
   let visibleGroups: TagGroup[];
@@ -2117,7 +2120,7 @@ function renderTagLegend(
         placement: 'top-center' as const,
         titleRelation: 'below-title' as const,
       },
-      mode: 'fixed' as const,
+      mode: exportMode ? 'export' : 'preview',
       capsulePillAddonWidth: iconReserve,
       controlsGroup:
         controlsToggles.length > 0 ? { toggles: controlsToggles } : undefined,
@@ -2263,7 +2266,7 @@ function renderTagLegend(
         placement: 'top-center' as const,
         titleRelation: 'below-title' as const,
       },
-      mode: 'fixed' as const,
+      mode: exportMode ? 'export' : 'preview',
       controlsGroup: { toggles: controlsToggles },
     };
 
@@ -3633,7 +3636,7 @@ function resolveTaskColor(
 function renderTimeScaleHorizontal(
   g: d3Selection.Selection<SVGGElement, unknown, null, undefined>,
   scale: d3Scale.ScaleLinear<number, number>,
-  innerWidth: number,
+  _innerWidth: number,
   innerHeight: number,
   textColor: string
 ): void {