@diagrammo/dgmo 0.8.3 → 0.8.4

package/src/editor/dgmo.grammar

@@ -0,0 +1,69 @@
+@top Document { (newline | Comment | ContentLine)* }
+
+ContentLine { contentPart+ newline }
+
+contentPart {
+  SyncArrow | AsyncArrow |
+  Duration | DateLiteral | Percentage | Number |
+  SectionMarker |
+  Url |
+  OpenBracket | CloseBracket | OpenParen | CloseParen | OpenAngle | CloseAngle |
+  ColorAnnotation |
+  Pipe | Colon | Comma | Plus | Dash | Tilde | Star | Question |
+  ChartType |
+  TagKeyword | DirectiveKeyword | ControlKeyword | ModifierKeyword |
+  Identifier |
+  Punct
+}
+
+@skip { spaces }
+
+@tokens {
+  spaces { $[ \t]+ }
+  newline { "\n" }
+
+  Comment { "//" ![\n]* }
+
+  SyncArrow { "->" }
+  AsyncArrow { "~>" }
+
+  Duration { $[0-9]+ ("." $[0-9]+)? ("min" | "bd" | "h" | "d" | "w" | "m" | "q" | "y") "?"? }
+  DateLiteral { $[0-9] $[0-9] $[0-9] $[0-9] "-" $[0-9] $[0-9] ("-" $[0-9] $[0-9])? }
+  Percentage { $[0-9]+ ("." $[0-9]+)? "%" }
+  Number { $[0-9]+ ("." $[0-9]+)? }
+
+  SectionMarker { "==" }
+  Url { "http" "s"? "://" ![ \t\n|,)\]>]+ }
+  ColorAnnotation { "(" $[a-z\-]+ ")" }
+
+  Pipe { "|" }
+  Colon { ":" }
+  Comma { "," }
+  Plus { "+" }
+  Dash { "-" }
+  Tilde { "~" }
+  Star { "*" }
+  Question { "?" }
+  OpenBracket { "[" }
+  CloseBracket { "]" }
+  OpenParen { "(" }
+  CloseParen { ")" }
+  OpenAngle { "<" }
+  CloseAngle { ">" }
+
+  Identifier { $[a-zA-Z_] ($[a-zA-Z0-9_./&?=@#!'+] | "-" $[a-zA-Z_./&?=@#!'+])* }
+
+  Punct { ![$[ \t\n] }
+
+  @precedence {
+    Comment, SyncArrow, AsyncArrow,
+    Duration, DateLiteral, Percentage, Number, SectionMarker, Url, ColorAnnotation,
+    Pipe, Colon, Comma, Plus, Dash, Tilde, Star, Question,
+    OpenBracket, CloseBracket, OpenParen, CloseParen, OpenAngle, CloseAngle,
+    Identifier, Punct
+  }
+}
+
+@external specialize {Identifier} specializeKeyword from "./tokens" {
+  ChartType, TagKeyword, DirectiveKeyword, ControlKeyword, ModifierKeyword
+}

package/src/editor/dgmo.grammar.d.ts

@@ -0,0 +1,2 @@
+import { LRParser } from '@lezer/lr';
+export declare const parser: LRParser;

package/src/editor/dgmo.grammar.js

@@ -0,0 +1,18 @@
+// This file was generated by lezer-generator. You probably shouldn't edit it.
+import {LRParser} from "@lezer/lr"
+import {specializeKeyword} from "./tokens"
+export const parser = LRParser.deserialize({
+  version: 14,
+  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[]^_`ghijklmnoabcdefpqk~",
+  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 ColorAnnotation Pipe Colon Comma Plus Dash Tilde Star Question Identifier Punct",
+  maxTerm: 40,
+  skippedNodes: [0],
+  repeatNodeCount: 2,
+  tokenData: "9q~RxOX#oXY#tYZ$PZp#opq#tqt#oux#oxy$Uyz$tz{${{|%S|}%Z}!O%b!O!P#o!P!Q%q!Q![&b![!],v!]!^#o!^!_,}!_!`-U!`!a-c!a!b-j!b!c#o!c!}-q!}#O0w#O#P#o#P#Q0|#Q#R#o#R#S-q#S#T#o#T#[-q#[#]1T#]#o-q#o#p#o#p#q9T#q#r#o#r#s9[#s;'S#o;'S;=`9k<%lO#o~#tOq~~#yQv~XY#tpq#t~$UOw~~$]Qc~q~}!O$c#T#o$c~$fRyz$o}!O$c#T#o$c~$tOg~~${Od~q~~%SOn~q~~%ZOk~q~~%bOj~q~~%iPl~q~!`!a%l~%qOX~~%vPq~!P!Q%y~&OSV~OY%yZ;'S%y;'S;=`&[<%lO%y~&_P;=`<%l%y~&iY^~q~uv'X!O!P'^!Q![(z#U#V(U#W#X([#[#]([#a#b(i#e#f([#k#l([#m#n([~'^O]~~'aP!Q!['d~'iX^~uv'X!Q!['d#U#V(U#W#X([#[#]([#a#b(i#e#f([#k#l([#m#n([~(XP#W#X([~(aPZ~!a!b(d~(iOZ~~(nQZ~!a!b(d#]#^(t~(wP#b#c([~)PY^~uv'X!O!P'^!Q![)o#U#V(U#W#X([#[#]([#a#b(i#e#f([#k#l([#m#n([~)tY^~uv'X!O!P'^!Q![*d#U#V(U#W#X([#[#]([#a#b(i#e#f([#k#l([#m#n([~*iZ^~uv'X}!O+[!O!P'^!Q![,R#U#V(U#W#X([#[#]([#a#b(i#e#f([#k#l([#m#n([~+_P!Q![+b~+eP!Q![+h~+mP[~}!O+p~+sP!Q![+v~+yP!Q![+|~,RO[~~,WY^~uv'X!O!P'^!Q![,R#U#V(U#W#X([#[#]([#a#b(i#e#f([#k#l([#m#n([~,}Oi~q~~-UOe~q~~-ZPq~!_!`-^~-cO_~~-jOf~q~~-qOo~q~~-x_p~q~qr.wst.wvw.wwx.w{|.w}!O/{!O!P.w!P!Q.w!Q![.w!_!`.w!a!b.w!b!c.w!c!}.w#R#S.w#T#o.w~.|_p~qr.wst.wvw.wwx.w{|.w}!O/{!O!P.w!P!Q.w!Q![.w!_!`.w!a!b.w!b!c.w!c!}.w#R#S.w#T#o.w~0O]qr.wst.wvw.wwx.w{|.w!O!P.w!P!Q.w!_!`.w!a!b.w!b!c.w!c!}.w#R#S.w#T#o.w~0|Oa~~1TOb~q~~1[ap~q~qr.wst.wvw.wwx.w{|.w}!O/{!O!P.w!P!Q.w!Q![.w!_!`.w!a!b.w!b!c.w!c!}.w#R#S.w#T#h.w#h#i2a#i#o.w~2fap~qr.wst.wvw.wwx.w{|.w}!O/{!O!P.w!P!Q.w!Q![.w!_!`.w!a!b.w!b!c.w!c!}.w#R#S.w#T#h.w#h#i3k#i#o.w~3pap~qr.wst.wvw.wwx.w{|.w}!O/{!O!P.w!P!Q.w!Q![.w!_!`.w!a!b.w!b!c.w!c!}.w#R#S.w#T#d.w#d#e4u#e#o.w~4zbp~qr.wst.wvw.wwx.w{|.w}!O/{!O!P.w!P!Q.w!Q![.w![!]6S!_!`.w!a!b.w!b!c.w!c!}.w#R#S.w#T#g.w#g#h7|#h#o.w~6VP!P!Q6Y~6]P!P!Q6`~6cYOX7RZp7Rqy7Rz|7R}!`7R!a#P7R#Q#p7R#q;'S7R;'S;=`7v<%lO7R~7WY`~OX7RZp7Rqy7Rz|7R}!`7R!a#P7R#Q#p7R#q;'S7R;'S;=`7v<%lO7R~7yP;=`<%l7R~8R`p~qr.wst.wvw.wwx.w{|.w}!O/{!O!P.w!P!Q.w!Q![.w![!]6S!_!`.w!a!b.w!b!c.w!c!}.w#R#S.w#T#o.w~9[Oh~q~~9cPm~q~!`!a9f~9kOY~~9nP;=`<%l#o",
+  tokenizers: [0],
+  topRules: {"Document":[0,6]},
+  specialized: [{term: 32, get: (value, stack) => (specializeKeyword(value, stack) << 1), external: specializeKeyword}],
+  tokenPrec: 204
+})

package/src/editor/dgmo.grammar.terms.d.ts

@@ -0,0 +1,5 @@
+export declare const ChartType: number;
+export declare const TagKeyword: number;
+export declare const DirectiveKeyword: number;
+export declare const ControlKeyword: number;
+export declare const ModifierKeyword: number;

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

@@ -0,0 +1,35 @@
+// This file was generated by lezer-generator. You probably shouldn't edit it.
+export const
+  ChartType = 1,
+  TagKeyword = 2,
+  DirectiveKeyword = 3,
+  ControlKeyword = 4,
+  ModifierKeyword = 5,
+  Document = 6,
+  Comment = 7,
+  ContentLine = 8,
+  SyncArrow = 9,
+  AsyncArrow = 10,
+  Duration = 11,
+  DateLiteral = 12,
+  Percentage = 13,
+  Number = 14,
+  SectionMarker = 15,
+  Url = 16,
+  OpenBracket = 17,
+  CloseBracket = 18,
+  OpenParen = 19,
+  CloseParen = 20,
+  OpenAngle = 21,
+  CloseAngle = 22,
+  ColorAnnotation = 23,
+  Pipe = 24,
+  Colon = 25,
+  Comma = 26,
+  Plus = 27,
+  Dash = 28,
+  Tilde = 29,
+  Star = 30,
+  Question = 31,
+  Identifier = 32,
+  Punct = 33

package/src/editor/highlight.ts

@@ -0,0 +1,36 @@
+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,
+  ColorAnnotation: t.atom,
+  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

@@ -0,0 +1,28 @@
+import { LRLanguage, LanguageSupport } from '@codemirror/language';
+import type { Extension } from '@codemirror/state';
+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: Extension = dgmoLanguageSupport;

package/src/editor/keywords.ts

@@ -0,0 +1,220 @@
+/** 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',
+  // 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'
+          )
+        );
       }
     }
   }