@knowvah/dot-engine 2.2.0 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knowvah/dot-engine",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "Faithful TypeScript port of Graphviz (dot, neato, fdp, sfdp, circo, twopi, osage, patchwork) — no C: no native binary, no WASM. Oracle-verified against the C implementation, runs in the browser.",
   "keywords": [
     "graphviz",
@@ -76,10 +76,12 @@
     "docs:brand": "node docs-site/copy-brand-assets.mjs",
     "docs:copy-reports": "node docs-site/copy-reports.mjs",
     "docs:copy-goldens": "node docs-site/copy-goldens.mjs",
+    "docs:i18n-status": "node scripts/docs-i18n-status.mjs",
+    "docs:i18n-hashes": "node scripts/docs-i18n-status.mjs --write-hashes",
     "docs:api": "typedoc",
-    "docs:dev": "npm run docs:brand && npm run docs:copy-reports && npm run docs:copy-goldens && npm run docs:api && vitepress dev docs-site",
+    "docs:dev": "npm run docs:brand && npm run docs:copy-reports && npm run docs:copy-goldens && npm run docs:i18n-hashes && npm run docs:api && vitepress dev docs-site",
     "predocs:build": "npm run parser:regen",
-    "docs:build": "npm run docs:brand && npm run docs:copy-reports && npm run docs:copy-goldens && npm run docs:api && vitepress build docs-site",
+    "docs:build": "npm run docs:brand && npm run docs:copy-reports && npm run docs:copy-goldens && npm run docs:i18n-hashes && npm run docs:api && vitepress build docs-site",
     "docs:preview": "vitepress preview docs-site",
     "release": "semantic-release",
     "publish:check": "npm run typecheck && npm run build && npm pack --dry-run",

package/src/layout/dot/edge-route.ts

@@ -33,8 +33,8 @@ import { ShapeKind, type ShapeDesc } from '../../common/types.js';
 import {
   collectNonAdjacentFlatGroup, routeFlatEdgeGroupFaithful,
 } from './splines-flat-multi.js';
-import { makeFlatLabeledEdge, makeAdjFlatNoPortEdge } from './splines-flat-labeled.js';
-import { EDGETYPE_SPLINE, swapEndsP, swapEdgeSpline, getMainEdge } from './splines.js';
+import { makeFlatLabeledEdge, makeAdjFlatNoPortEdge, isAdjFlatCandidate } from './splines-flat-labeled.js';
+import { edgeType, swapEndsP, swapEdgeSpline, getMainEdge } from './splines.js';
 import { FLATORDER } from './fastgr.js';
 import { IGNORED } from './rank.js';
 import { buildDotSinfo } from './self-loop.js';
@@ -312,9 +312,18 @@ function isAdjacentPortFlat(e: GraphEdge, g: Graph): boolean {
     && isFlatAdjacent(g, e) && hasDefinedPort(e);
 }
 
-/** True when x is an unrouted adjacent same-rank flat edge with a port. */
+/** True when x is an unrouted adjacent same-rank flat edge (port or not): C
+ *  groups by main edge only, so a port-less sibling joins the aux call. */
 function isGroupableFlat(x: GraphEdge, g: Graph): boolean {
-  return x.info.spl === undefined && isAdjacentPortFlat(x, g);
+  return x.info.spl === undefined && x.tail.info.rank !== undefined
+    && x.tail.info.rank === x.head.info.rank && isFlatAdjacent(g, x);
+}
+
+/** True when a port-less adjacent flat edge shares its group with a ported one:
+ *  C's `ports` flag covers the whole group, so it routes via the aux graph. */
+function joinsPortedFlatGroup(e: GraphEdge, g: Graph): boolean {
+  return isAdjFlatCandidate(e) && isGroupableFlat(e, g)
+    && collectAdjacentFlatGroup(e, g).some(hasDefinedPort);
 }
 
 /**
@@ -362,7 +371,7 @@ function routeFaithfulSidePort(e: GraphEdge, g: Graph): boolean {
   // @see lib/dotgen/dotsplines.c:dot_splines_ (ED_adjacent edge-group loop)
   if (sameRank && isFlatAdjacent(g, e)) {
     const group = collectAdjacentFlatGroup(e, g);
-    return makeFlatAdjEdges(g, group, group.length, EDGETYPE_SPLINE) === 0
+    return makeFlatAdjEdges(g, group, group.length, edgeType(g)) === 0
       && e.info.spl !== undefined;
   }
   // Non-adjacent flats: C groups identical-port siblings into ONE make_flat_edge
@@ -372,7 +381,7 @@ function routeFaithfulSidePort(e: GraphEdge, g: Graph): boolean {
   // @see lib/dotgen/dotsplines.c:make_flat_edge, make_flat_bottom_edges
   if (sameRank) {
     const group = collectNonAdjacentFlatGroup(e, g);
-    return routeFlatEdgeGroupFaithful(g, group, group.length) && e.info.spl !== undefined;
+    return routeFlatEdgeGroupFaithful(g, group, group.length, edgeType(g)) && e.info.spl !== undefined;
   }
   const pts = routeRegularEdgeFaithful(g, e);
   if (pts === null) return false;
@@ -410,6 +419,7 @@ function routeFlatEdge(e: GraphEdge, g: Graph): boolean {
   // above (make_flat_adj_edges → makeSimpleFlatLabels). Both decline for every
   // other edge, so only labeled flats are diverted. @see dotsplines.c:1527-1533
   if (makeFlatLabeledEdge(g, e)) return true;
+  if (joinsPortedFlatGroup(e, g) && routeFaithfulSidePort(e, g)) return true;
   if (makeAdjFlatNoPortEdge(g, e)) return true;
   if ((hasSidePort(e) || isAdjacentPortFlat(e, g)) && routeFaithfulSidePort(e, g)) return true;
   // Non-adjacent unlabeled flat with no side port (e.g. a same-rank cross-cluster
@@ -419,7 +429,7 @@ function routeFlatEdge(e: GraphEdge, g: Graph): boolean {
       && e.info.label === undefined && !isFlatAdjacent(g, e)) {
     const group = collectNonAdjacentFlatGroup(e, g);
     if (group.length > 0
-        && routeFlatEdgeGroupFaithful(g, group, group.length)
+        && routeFlatEdgeGroupFaithful(g, group, group.length, edgeType(g))
         && e.info.spl !== undefined) return true;
   }
   return false;

package/src/layout/dot/ortho-adapter.ts

@@ -58,7 +58,9 @@ function buildNodes(nodeArr: Node[]): OrthoNodeArr {
  * parallel multi-edge) is skipped. This is ortho's own concentrate mechanism,
  * distinct from class2's `edge_type == IGNORED` marking, and the keep-first
  * decision depends on this iteration order matching C's.
- * Self-loops (tail === head) are routed elsewhere and excluded here.
+ * Self-loops (tail === head) are gathered like any other edge; orthoEdges
+ * routes them via addLoop. Only Concentrate dedup skips edges.
+ * @see lib/ortho/ortho.c:orthoEdges
  * @see lib/ortho/ortho.c:1207-1228 (orthoEdges edge gather + Concentrate PS)
  */
 function buildEdges(
@@ -74,7 +76,6 @@ function buildEdges(
     const oes = outIndex.get(n);
     if (oes === undefined) continue;
     for (const e of oes) {
-      if (e.tail === e.head) continue;
       if (concentrate) {
         const ti = e.tail.id;
         const hi = e.head.id;
@@ -103,7 +104,7 @@ function buildEdges(
   return result;
 }
 
-/** Build an OrthoGraph from the dot Graph (tail≠head edges only). */
+/** Build an OrthoGraph from the dot Graph (every out-edge, self-loops included). */
 export function buildOrthoGraph(g: Graph): OrthoGraph {
   const nodeArr = nodesInSeq(g);
   const orthoNodes = buildNodes(nodeArr);

package/src/layout/dot/splines-flat-multi.ts

@@ -22,10 +22,12 @@ import type { Edge } from '../../model/edge.js';
 import type { Node } from '../../model/node.js';
 import type { Port, Box } from '../../model/geom.js';
 import type { Path, PathendT } from '../../common/types.js';
-import { routeSplines } from '../../common/splines-routespl.js';
+import { routeSplines, routePolylines } from '../../common/splines-routespl.js';
 import { clipAndInstall } from '../../common/splines-clip.js';
 import { graphRanksep } from './position-aux.js';
 import { buildDotSinfo } from './self-loop.js';
+import { EDGETYPE_LINE, EDGETYPE_SPLINE } from './splines.js';
+import { makeSimpleFlat } from './splines-flat-labeled.js';
 import {
   isFlatAdjacent, makeFlatEndBox, topBoxes, bottomBoxes, flatSide, flatVspace,
   freshFlatPath, assembleFlatPath, flatBboxCtx,
@@ -41,6 +43,8 @@ interface GroupRouteCtx {
   tlast: Box;
   hlast: Box;
   bottom: boolean;
+  /** Edge type: SPLINE routes with routesplines, anything else routepolylines. */
+  et: number;
   stepx: number;
   stepy: number;
   /** Geometric left end node of the channel (lower order). routeSplines yields
@@ -132,7 +136,8 @@ function routeGroupEdge(e: Edge, i: number, c: GroupRouteCtx): boolean {
     ? bottomBoxes(c.tlast, c.hlast, endStepX, endStepY, c.stepy)
     : topBoxes(c.tlast, c.hlast, endStepX, endStepY, c.stepy);
   assembleFlatPath(c.P, copyPathEnd(c.tend), copyPathEnd(c.hend), mid);
-  const pts = routeSplines(c.P);
+  // @see lib/dotgen/dotsplines.c:1603-1607 (et == EDGETYPE_SPLINE ? routesplines : routepolylines)
+  const pts = c.et === EDGETYPE_SPLINE ? routeSplines(c.P) : routePolylines(c.P);
   if (pts === null || pts.length === 0) return false;
   // routeSplines returns points left→right (tend = leftNode). Reverse for an edge
   // whose tail is the right node so the points run tail→head; pass ignoreSwap so
@@ -149,12 +154,20 @@ function routeGroupEdge(e: Edge, i: number, c: GroupRouteCtx): boolean {
  * makeFlatEnd tail+head; for i in 0..cnt-1 route edge i nested by (i+1)*step.
  * Installs spl on every edges[i]; returns true iff all installed. cnt=1 reduces
  * to routeFlatEdgeFaithful (AD-1). `edges` must be group-ordered (collect...).
+ * `et == EDGETYPE_LINE` short-circuits to makeSimpleFlat (C 1535-1537); the
+ * corridor router is routesplines only for EDGETYPE_SPLINE, else routepolylines.
  * @see lib/dotgen/dotsplines.c:make_flat_edge, make_flat_bottom_edges
  */
-export function routeFlatEdgeGroupFaithful(g: Graph, edges: Edge[], cnt: number): boolean {
+export function routeFlatEdgeGroupFaithful(
+  g: Graph, edges: Edge[], cnt: number, et: number,
+): boolean {
   const lead = edges[0];
   if (g.info.rank === undefined || lead.tail.info.rank === undefined
     || lead.head.info.rank !== lead.tail.info.rank) return false;
+  if (et === EDGETYPE_LINE) {
+    makeSimpleFlat(edges, et);
+    return true;
+  }
   // C makefwdedge: build the channel left→right by node order, else the middle
   // box inverts for a right-to-left (tail right of head) flat edge.
   const tailIsLeft = (lead.tail.info.order ?? 0) <= (lead.head.info.order ?? 0);
@@ -179,7 +192,7 @@ export function routeFlatEdgeGroupFaithful(g: Graph, edges: Edge[], cnt: number)
   const stepy = flatVspace(g, leftNode, !bottom) / (cnt + 1);
   const rc: GroupRouteCtx = {
     P, tend, hend, tlast: tend.boxes[tend.boxn - 1], hlast: hend.boxes[hend.boxn - 1],
-    bottom, stepx, stepy, leftNode,
+    bottom, et, stepx, stepy, leftNode,
   };
   for (let i = 0; i < cnt; i++) {
     if (!routeGroupEdge(edges[i], i, rc)) return false;

package/src/layout/dot/splines-flat.ts

@@ -21,11 +21,11 @@ import { dotRank } from './rank.js';
 import { dotMincross } from './mincross.js';
 import { dotPosition } from './position.js';
 import { dotSameports } from './sameport.js';
-import { dotSplines_, swapEndsP, swapEdgeSpline } from './splines.js';
+import { dotSplines_, swapEndsP, swapEdgeSpline, EDGETYPE_SPLINE } from './splines.js';
 import { makePort } from '../../model/edgeInfo.js';
 import { beginPath } from '../../common/splines-path-begin.js';
 import { endPath } from '../../common/splines-path-end.js';
-import { routeSplines } from '../../common/splines-routespl.js';
+import { routeSplines, routePolylines } from '../../common/splines-routespl.js';
 import { addBox, resolvePort } from '../../common/splines-path-shared.js';
 import { TOP, BOTTOM, FLATEDGE } from '../../common/splines-constants.js';
 import {
@@ -363,8 +363,11 @@ function normalizeCopiedFlatSpline(orig: Edge, auxe: Edge): void {
  * makeSimpleFlat branch are out of scope (callers gate on a side port).
  * @see lib/dotgen/dotsplines.c:make_flat_adj_edges
  */
-export function makeFlatAdjEdges(g: Graph, edges: Edge[], cnt: number, _et: number): number {
+export function makeFlatAdjEdges(g: Graph, edges: Edge[], cnt: number, et: number): number {
   const aux = buildFlatAux(g, edges, cnt);
+  // C setEdgeType(auxg, et); inlined (index.ts's setEdgeType would be an import cycle).
+  // @see lib/dotgen/dotsplines.c:make_flat_adj_edges
+  aux.auxg.info.flags = (aux.auxg.info.flags & ~0xf) | (et & 0xf);
   dotInitNodeEdge(aux.auxg);
   dotRank(aux.auxg);
   if (dotMincross(aux.auxg) !== 0) return 1;
@@ -571,12 +574,11 @@ export function assembleFlatPath(P: Path, tend: PathendT, hend: PathendT, mid: B
  * faithful `beginPath → routeSplines → endPath → clipAndInstall` pipeline.
  * Returns spline control points in graphviz-internal (y-up) coordinates, or
  * null when the edge is not a same-rank edge. Does NOT clip or install — the
- * caller (routeOneEdge) does that via clipAndInstall, mirroring how SR3 wires
- * the regular faithful path.
+ * caller (routeOneEdge) does that via clipAndInstall (as the regular path).
  *
  * @see lib/dotgen/dotsplines.c:make_flat_edge (cnt=1, non-adjacent spline)
  */
-export function routeFlatEdgeFaithful(g: Graph, e: Edge): Point[] | null {
+export function routeFlatEdgeFaithful(g: Graph, e: Edge, et: number): Point[] | null {
   const tn = e.tail;
   const r = tn.info.rank;
   if (g.info.rank === undefined || r === undefined || e.head.info.rank !== r) return null;
@@ -588,11 +590,9 @@ export function routeFlatEdgeFaithful(g: Graph, e: Edge): Point[] | null {
   const hend = makeFlatEndBox({ ctx, P, e, n: e.head, side, ranksep, isBegin: false });
   const stepx = (g.info.nodesep ?? 18) / 2;
   const stepy = flatVspace(g, tn, !bottom) / 2;
-  const tlast = tend.boxes[tend.boxn - 1];
-  const hlast = hend.boxes[hend.boxn - 1];
-  const mid = bottom
-    ? bottomBoxes(tlast, hlast, stepx, stepy, stepy)
-    : topBoxes(tlast, hlast, stepx, stepy, stepy);
+  const [tlast, hlast] = [tend.boxes[tend.boxn - 1], hend.boxes[hend.boxn - 1]];
+  const mid = (bottom ? bottomBoxes : topBoxes)(tlast, hlast, stepx, stepy, stepy);
   assembleFlatPath(P, tend, hend, mid);
-  return routeSplines(P);
+  // @see lib/dotgen/dotsplines.c:1603-1607
+  return et === EDGETYPE_SPLINE ? routeSplines(P) : routePolylines(P);
 }

package/src/parser/dot.js

@@ -291,12 +291,11 @@ function peg$parse(input, options) {
   function peg$f15() {    return "node";  }
   function peg$f16() {    return "edge";  }
   function peg$f17(defs, rest) {    return defs.concat(rest);  }
-  function peg$f18(defs) {    return defs;  }
-  function peg$f19() {    return [];  }
-  function peg$f20(a) {    return a;  }
-  function peg$f21(pairs) {    return pairs;  }
-  function peg$f22(k, v) {    return { key: k, value: v };  }
-  function peg$f23(head, chain, attrs) {
+  function peg$f18() {    return [];  }
+  function peg$f19(a) {    return a;  }
+  function peg$f20(pairs) {    return pairs;  }
+  function peg$f21(k, v) {    return { key: k, value: v };  }
+  function peg$f22(head, chain, attrs) {
     if (chain.length > 0) {
       const nodes = [head].concat(chain);
       return { type: "edge", nodes: nodes, attrs: attrs };
@@ -310,28 +309,28 @@ function peg$parse(input, options) {
       return { type: "node", id: head, attrs: attrs };
     }
   }
-  function peg$f24(s) {    return s;  }
-  function peg$f25(n) {    return n;  }
-  function peg$f26(id, port, compass) {    return { id: id, port: port, compass: compass };  }
-  function peg$f27(id, port) {    return { id: id, port: port, compass: null };  }
-  function peg$f28(id) {    return { id: id, port: null, compass: null };  }
-  function peg$f29(s, rest) {    return [s].concat(rest);  }
-  function peg$f30() {    return [];  }
-  function peg$f31(id, stmts) {    return { type: "subgraph", id: id, stmts: stmts };  }
+  function peg$f23(s) {    return s;  }
+  function peg$f24(n) {    return n;  }
+  function peg$f25(id, port, compass) {    return { id: id, port: port, compass: compass };  }
+  function peg$f26(id, port) {    return { id: id, port: port, compass: null };  }
+  function peg$f27(id) {    return { id: id, port: null, compass: null };  }
+  function peg$f28(s, rest) {    return [s].concat(rest);  }
+  function peg$f29() {    return [];  }
+  function peg$f30(id, stmts) {    return { type: "subgraph", id: id, stmts: stmts };  }
+  function peg$f31(stmts) {    return { type: "subgraph", id: null, stmts: stmts };  }
   function peg$f32(stmts) {    return { type: "subgraph", id: null, stmts: stmts };  }
-  function peg$f33(stmts) {    return { type: "subgraph", id: null, stmts: stmts };  }
-  function peg$f34(first, s) {    return s;  }
-  function peg$f35(first, rest) {    return rest.length > 0 ? first + rest.join("") : first;  }
-  function peg$f36(chars) {    return chars.join("");  }
-  function peg$f37() {    return '"';  }
-  function peg$f38() {    return '';  }
-  function peg$f39(c) {    return '\\' + c;  }
-  function peg$f40(content) {    return "\u0001" + content;  }
-  function peg$f41(chars) {    return chars.join("");  }
-  function peg$f42(nested, content) {    return "<" + content + ">";  }
-  function peg$f43(n) {    return n;  }
-  function peg$f44(first, rest) {    return first + rest.join("");  }
-  function peg$f45(s) {    return Array.isArray(s) ? s.flat(Infinity).filter(x => x !== null && x !== undefined).join("") : String(s);  }
+  function peg$f33(first, s) {    return s;  }
+  function peg$f34(first, rest) {    return rest.length > 0 ? first + rest.join("") : first;  }
+  function peg$f35(chars) {    return chars.join("");  }
+  function peg$f36() {    return '"';  }
+  function peg$f37() {    return '';  }
+  function peg$f38(c) {    return '\\' + c;  }
+  function peg$f39(content) {    return "\u0001" + content;  }
+  function peg$f40(chars) {    return chars.join("");  }
+  function peg$f41(nested, content) {    return "<" + content + ">";  }
+  function peg$f42(n) {    return n;  }
+  function peg$f43(first, rest) {    return first + rest.join("");  }
+  function peg$f44(s) {    return Array.isArray(s) ? s.flat(Infinity).filter(x => x !== null && x !== undefined).join("") : String(s);  }
   let peg$currPos = options.peg$currPos | 0;
   let peg$savedPos = peg$currPos;
   const peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -749,7 +748,7 @@ function peg$parse(input, options) {
     s1 = peg$parseAttrType();
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
-      s3 = peg$parseAttrList();
+      s3 = peg$parseAttrListReq();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
         s0 = peg$f12(s1, s3);
@@ -806,7 +805,7 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseAttrList() {
+  function peg$parseAttrListReq() {
     let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
@@ -846,45 +845,20 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+
+    return s0;
+  }
+
+  function peg$parseAttrList() {
+    let s0, s1;
+
+    s0 = peg$parseAttrListReq();
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      s1 = peg$parse_();
-      if (input.charCodeAt(peg$currPos) === 91) {
-        s2 = peg$c3;
-        peg$currPos++;
-      } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e3); }
-      }
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parse_();
-        s4 = peg$parseAttrDefs();
-        s5 = peg$parse_();
-        if (input.charCodeAt(peg$currPos) === 93) {
-          s6 = peg$c4;
-          peg$currPos++;
-        } else {
-          s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e4); }
-        }
-        if (s6 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f18(s4);
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-      if (s0 === peg$FAILED) {
-        s0 = peg$currPos;
-        s1 = '';
-        peg$savedPos = s0;
-        s1 = peg$f19();
-        s0 = s1;
-      }
+      s1 = '';
+      peg$savedPos = s0;
+      s1 = peg$f18();
+      s0 = s1;
     }
 
     return s0;
@@ -919,7 +893,7 @@ function peg$parse(input, options) {
         s5 = null;
       }
       peg$savedPos = s2;
-      s2 = peg$f20(s3);
+      s2 = peg$f19(s3);
     } else {
       peg$currPos = s2;
       s2 = peg$FAILED;
@@ -950,14 +924,14 @@ function peg$parse(input, options) {
           s5 = null;
         }
         peg$savedPos = s2;
-        s2 = peg$f20(s3);
+        s2 = peg$f19(s3);
       } else {
         peg$currPos = s2;
         s2 = peg$FAILED;
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f21(s1);
+    s1 = peg$f20(s1);
     s0 = s1;
 
     return s0;
@@ -982,7 +956,7 @@ function peg$parse(input, options) {
         s5 = peg$parseAtom();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f22(s1, s5);
+          s0 = peg$f21(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1012,7 +986,7 @@ function peg$parse(input, options) {
         s5 = peg$parseAttrList();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f23(s1, s3, s5);
+          s0 = peg$f22(s1, s3, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1036,7 +1010,7 @@ function peg$parse(input, options) {
     s1 = peg$parseSubgraph();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f24(s1);
+      s1 = peg$f23(s1);
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -1044,7 +1018,7 @@ function peg$parse(input, options) {
       s1 = peg$parseNode();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f25(s1);
+        s1 = peg$f24(s1);
       }
       s0 = s1;
     }
@@ -1083,7 +1057,7 @@ function peg$parse(input, options) {
             s9 = peg$parseAtom();
             if (s9 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f26(s1, s5, s9);
+              s0 = peg$f25(s1, s5, s9);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -1121,7 +1095,7 @@ function peg$parse(input, options) {
           s5 = peg$parseAtom();
           if (s5 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f27(s1, s5);
+            s0 = peg$f26(s1, s5);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -1139,7 +1113,7 @@ function peg$parse(input, options) {
         s1 = peg$parseAtom();
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f28(s1);
+          s1 = peg$f27(s1);
         }
         s0 = s1;
       }
@@ -1161,7 +1135,7 @@ function peg$parse(input, options) {
         s5 = peg$parseEdgeChain();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f29(s3, s5);
+          s0 = peg$f28(s3, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1178,7 +1152,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = '';
       peg$savedPos = s0;
-      s1 = peg$f30();
+      s1 = peg$f29();
       s0 = s1;
     }
 
@@ -1245,7 +1219,7 @@ function peg$parse(input, options) {
             }
             if (s9 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f31(s3, s7);
+              s0 = peg$f30(s3, s7);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -1292,7 +1266,7 @@ function peg$parse(input, options) {
             }
             if (s7 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f32(s5);
+              s0 = peg$f31(s5);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -1332,7 +1306,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f33(s3);
+              s0 = peg$f32(s3);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -1372,7 +1346,7 @@ function peg$parse(input, options) {
         s7 = peg$parseQAtom();
         if (s7 !== peg$FAILED) {
           peg$savedPos = s3;
-          s3 = peg$f34(s1, s7);
+          s3 = peg$f33(s1, s7);
         } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -1397,7 +1371,7 @@ function peg$parse(input, options) {
           s7 = peg$parseQAtom();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s3;
-            s3 = peg$f34(s1, s7);
+            s3 = peg$f33(s1, s7);
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
@@ -1408,7 +1382,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f35(s1, s2);
+      s0 = peg$f34(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1458,7 +1432,7 @@ function peg$parse(input, options) {
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f36(s2);
+        s0 = peg$f35(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1484,7 +1458,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f37();
+      s1 = peg$f36();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -1498,7 +1472,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f38();
+        s1 = peg$f37();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
@@ -1520,7 +1494,7 @@ function peg$parse(input, options) {
           }
           if (s2 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f39(s2);
+            s0 = peg$f38(s2);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -1566,7 +1540,7 @@ function peg$parse(input, options) {
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f40(s2);
+        s0 = peg$f39(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1590,7 +1564,7 @@ function peg$parse(input, options) {
       s2 = peg$parseHtmlChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f41(s1);
+    s1 = peg$f40(s1);
     s0 = s1;
 
     return s0;
@@ -1619,7 +1593,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f42(s1, s2);
+          s0 = peg$f41(s1, s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1665,7 +1639,7 @@ function peg$parse(input, options) {
         s2 = peg$parseName();
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f43(s2);
+          s0 = peg$f42(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1710,7 +1684,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f44(s1, s2);
+      s0 = peg$f43(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1908,7 +1882,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f45(s1);
+      s1 = peg$f44(s1);
     }
     s0 = s1;
 

package/src/parser/dot.pegjs

@@ -57,7 +57,7 @@ Stmt
 // grammar.y: attrtype : T_graph | T_node | T_edge
 // grammar.y: graphattrdefs : attrassignment  (bare key=value at graph level)
 AttrStmt
-  = t:AttrType _ attrs:AttrList
+  = t:AttrType _ attrs:AttrListReq
     { return { type: "attr", target: t, attrs: attrs }; }
   / a:AttrAssignment
     { return { type: "assign", key: a.key, value: a.value }; }
@@ -68,13 +68,14 @@ AttrType
   / NodeKw   { return "node"; }
   / EdgeKw   { return "edge"; }
 
-// grammar.y: optattr : attrlist | /* empty */
-// grammar.y: attrlist : optattr '[' optattrdefs ']'
-AttrList
+// grammar.y: attrlist : optattr '[' optattrdefs ']'   (one or more bracket groups)
+AttrListReq
   = _ "[" _ defs:AttrDefs _ "]" rest:AttrList
     { return defs.concat(rest); }
-  / _ "[" _ defs:AttrDefs _ "]"
-    { return defs; }
+
+// grammar.y: optattr : attrlist | /* empty */
+AttrList
+  = AttrListReq
   / "" { return []; }
 
 // grammar.y: optattrdefs : optattrdefs attrdefs | /* empty */