fix compass AST

ts-graphviz · Jun 30, 2021 · dae89c2 · dae89c2
1 parent 836b3ff
commit dae89c2
Show file tree

Hide file tree

Showing 4 changed files with 298 additions and 226 deletions.
diff --git a/grammar/dot.peggy b/grammar/dot.peggy
@@ -157,7 +157,7 @@ _subgraph
         : { type: 'subgraph', body, location: location() };
     }
 
-_compass
+_compass_keyword
   = "n"
   / "ne"
   / "e"
@@ -167,6 +167,18 @@ _compass
   / "w"
   / "nw"
 
+_compass
+  = v:(
+    value:_compass_keyword { return { value, quoted: false }; }
+    / "\"" value:_compass_keyword "\"" { return { value, quoted: true }; }
+  ) {
+      return {
+        type: 'literal',
+        ...v,
+        location: location(),
+      };
+    }
+
 _literal
   = QUOTED_STRING
   / HTML_STRING

diff --git a/src/ast.ts b/src/ast.ts
@@ -117,7 +117,7 @@ export namespace AST {
     type: typeof Types.NodeRef;
     id: Literal;
     port?: Literal;
-    commpass?: Literal<Compass>;
+    compass?: Literal<Compass>;
   }
 
   /** Edge AST object. */

diff --git a/src/convert.ts b/src/convert.ts
@@ -51,7 +51,7 @@ function applyStatements(cluster: ICluster, statements: AST.ClusterStatement[]):
       case AST.Types.Edge:
         commentHolder.apply(
           cluster.edge(
-            stmt.targets.map((t) => ({ id: t.id.value, port: t.port?.value, compass: t.commpass?.value })),
+            stmt.targets.map((t) => ({ id: t.id.value, port: t.port?.value, compass: t.compass?.value })),
             stmt.body.reduce((prev, curr) => ({ ...prev, [curr.key.value]: curr.value.value }), {}),
           ),
           stmt.location,
@@ -103,7 +103,7 @@ export function convert(
       return subgraph;
     case AST.Types.Edge:
       const edge = new Edge(
-        ast.targets.map((t) => ({ id: t.id.value, port: t.port?.value, compass: t.commpass?.value })),
+        ast.targets.map((t) => ({ id: t.id.value, port: t.port?.value, compass: t.compass?.value })),
         ast.body.reduce((prev, curr) => ({ ...prev, [curr.key.value]: curr.value.value }), {}),
       );
       return edge;