@knowvah/dot-engine 2.6.5 → 2.6.7

package/dist/index.js

@@ -155,21 +155,21 @@ function peg$parse(input, options) {
   const peg$r22 = /^[^\n]/;
   const peg$e0 = peg$literalExpectation("{", false);
   const peg$e1 = peg$literalExpectation("}", false);
-  const peg$e2 = peg$literalExpectation(";", false);
-  const peg$e3 = peg$literalExpectation("=", false);
-  const peg$e4 = peg$literalExpectation("[", false);
-  const peg$e5 = peg$literalExpectation("]", false);
-  const peg$e6 = peg$classExpectation([";", ","], false, false, false);
-  const peg$e7 = peg$literalExpectation(":", false);
-  const peg$e8 = peg$otherExpectation("edge operator");
-  const peg$e9 = peg$literalExpectation("->", false);
-  const peg$e10 = peg$literalExpectation("--", false);
-  const peg$e11 = peg$literalExpectation("+", false);
-  const peg$e12 = peg$literalExpectation('"', false);
-  const peg$e13 = peg$literalExpectation('\\"', false);
-  const peg$e14 = peg$literalExpectation("\\\n", false);
-  const peg$e15 = peg$literalExpectation("\\", false);
-  const peg$e16 = peg$anyExpectation();
+  const peg$e2 = peg$anyExpectation();
+  const peg$e3 = peg$literalExpectation(";", false);
+  const peg$e4 = peg$literalExpectation("=", false);
+  const peg$e5 = peg$literalExpectation("[", false);
+  const peg$e6 = peg$literalExpectation("]", false);
+  const peg$e7 = peg$classExpectation([";", ","], false, false, false);
+  const peg$e8 = peg$literalExpectation(":", false);
+  const peg$e9 = peg$otherExpectation("edge operator");
+  const peg$e10 = peg$literalExpectation("->", false);
+  const peg$e11 = peg$literalExpectation("--", false);
+  const peg$e12 = peg$literalExpectation("+", false);
+  const peg$e13 = peg$literalExpectation('"', false);
+  const peg$e14 = peg$literalExpectation('\\"', false);
+  const peg$e15 = peg$literalExpectation("\\\n", false);
+  const peg$e16 = peg$literalExpectation("\\", false);
   const peg$e17 = peg$classExpectation(['"', "\\"], true, false, false);
   const peg$e18 = peg$literalExpectation("<", false);
   const peg$e19 = peg$literalExpectation(">", false);
@@ -201,86 +201,90 @@ function peg$parse(input, options) {
   const peg$e45 = peg$classExpectation(["\n"], true, false, false);
   const peg$e46 = peg$literalExpectation("\n", false);
   const peg$e47 = peg$literalExpectation("#", false);
-  function peg$f0(s, t, id, stmts) {
+  function peg$f0(s, t, id, stmts, end) {
     return {
       type: "graph",
       strict: s,
       directed: t,
       id,
-      stmts
+      stmts,
+      end
     };
   }
   function peg$f1() {
-    return { type: "graph", strict: false, directed: false, id: null, stmts: [] };
+    return { type: "graph", strict: false, directed: false, id: null, stmts: [], end: text().length };
   }
   function peg$f2() {
-    return true;
+    return offset();
   }
   function peg$f3() {
-    return false;
+    return true;
   }
   function peg$f4() {
-    return true;
+    return false;
   }
   function peg$f5() {
+    return true;
+  }
+  function peg$f6() {
     return false;
   }
-  function peg$f6(a) {
+  function peg$f7(a) {
     return a;
   }
-  function peg$f7() {
+  function peg$f8() {
     return null;
   }
-  function peg$f8(s) {
+  function peg$f9(s) {
     return s;
   }
-  function peg$f9(stmts) {
+  function peg$f10(stmts) {
     return stmts;
   }
-  function peg$f10(s) {
+  function peg$f11(s) {
     return s;
   }
-  function peg$f11(s) {
+  function peg$f12(s) {
     return s;
   }
-  function peg$f12(t, m, attrs) {
+  function peg$f13(t, m, attrs) {
     if (m) console.error("Warning: attribute macros not implemented");
     return { type: "attr", target: t, attrs };
   }
-  function peg$f13(a) {
+  function peg$f14(a) {
     return { type: "assign", key: a.key, value: a.value };
   }
-  function peg$f14() {
+  function peg$f15() {
     return true;
   }
-  function peg$f15() {
+  function peg$f16() {
     return false;
   }
-  function peg$f16() {
+  function peg$f17() {
     return "graph";
   }
-  function peg$f17() {
+  function peg$f18() {
     return "node";
   }
-  function peg$f18() {
+  function peg$f19() {
     return "edge";
   }
-  function peg$f19(defs, rest) {
+  function peg$f20(defs, rest) {
     return defs.concat(rest);
   }
-  function peg$f20() {
+  function peg$f21() {
     return [];
   }
-  function peg$f21(a) {
+  function peg$f22(a) {
     return a;
   }
-  function peg$f22(pairs) {
+  function peg$f23(pairs) {
     return pairs;
   }
-  function peg$f23(k, v) {
+  function peg$f24(k, v) {
     return { key: k, value: v };
   }
-  function peg$f24(head, chain, attrs) {
+  function peg$f25(head, chain, attrs) {
     if (chain.length > 0) {
       const nodes = [head].concat(chain);
       return { type: "edge", nodes, attrs };
@@ -291,70 +295,70 @@ function peg$parse(input, options) {
       return { type: "node", id: head, attrs };
     }
   }
-  function peg$f25(s) {
+  function peg$f26(s) {
     return s;
   }
-  function peg$f26(n) {
+  function peg$f27(n) {
     return n;
   }
-  function peg$f27(id, port, compass) {
+  function peg$f28(id, port, compass) {
     return { id, port, compass };
   }
-  function peg$f28(id, port) {
+  function peg$f29(id, port) {
     return { id, port, compass: null };
   }
-  function peg$f29(id) {
+  function peg$f30(id) {
     return { id, port: null, compass: null };
   }
-  function peg$f30(s, rest) {
+  function peg$f31(s, rest) {
     return [s].concat(rest);
   }
-  function peg$f31() {
+  function peg$f32() {
     return [];
   }
-  function peg$f32(id, stmts) {
+  function peg$f33(id, stmts) {
     return { type: "subgraph", id, stmts };
   }
-  function peg$f33(stmts) {
+  function peg$f34(stmts) {
     return { type: "subgraph", id: null, stmts };
   }
-  function peg$f34(stmts) {
+  function peg$f35(stmts) {
     return { type: "subgraph", id: null, stmts };
   }
-  function peg$f35(first, s) {
+  function peg$f36(first, s) {
     return s;
   }
-  function peg$f36(first, rest) {
+  function peg$f37(first, rest) {
     return rest.length > 0 ? first + rest.join("") : first;
   }
-  function peg$f37(chars) {
+  function peg$f38(chars) {
     return chars.join("");
   }
-  function peg$f38() {
+  function peg$f39() {
     return '"';
   }
-  function peg$f39() {
+  function peg$f40() {
     return "";
   }
-  function peg$f40(c) {
+  function peg$f41(c) {
     return "\\" + c;
   }
-  function peg$f41(content) {
+  function peg$f42(content) {
     return "
" + content;
   }
-  function peg$f42(chars) {
+  function peg$f43(chars) {
     return chars.join("");
   }
-  function peg$f43(nested2, content) {
+  function peg$f44(nested2, content) {
     return "<" + content + ">";
   }
-  function peg$f44(n) {
+  function peg$f45(n) {
     return n;
   }
-  function peg$f45(first, rest) {
+  function peg$f46(first, rest) {
     return first + rest.join("");
   }
-  function peg$f46(s) {
+  function peg$f47(s) {
     return Array.isArray(s) ? s.flat(Infinity).filter((x) => x !== null && x !== void 0).join("") : String(s);
   }
   let peg$currPos = options.peg$currPos | 0;
@@ -530,9 +534,9 @@ function peg$parse(input, options) {
               }
             }
             if (s122 !== peg$FAILED) {
-              s13 = peg$parse_();
+              s13 = peg$parseGraphEof();
               peg$savedPos = s0;
-              s0 = peg$f0(s2, s4, s6, s10);
+              s0 = peg$f0(s2, s4, s6, s10, s13);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -562,6 +566,36 @@ function peg$parse(input, options) {
     }
     return s0;
   }
+  function peg$parseGraphEof() {
+    let s0, s12, s2;
+    s0 = peg$currPos;
+    s12 = [];
+    if (input.length > peg$currPos) {
+      s2 = input.charAt(peg$currPos);
+      peg$currPos++;
+    } else {
+      s2 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e2);
+      }
+    }
+    while (s2 !== peg$FAILED) {
+      s12.push(s2);
+      if (input.length > peg$currPos) {
+        s2 = input.charAt(peg$currPos);
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e2);
+        }
+      }
+    }
+    peg$savedPos = s0;
+    s12 = peg$f2();
+    s0 = s12;
+    return s0;
+  }
   function peg$parseOptStrict() {
     let s0, s12, s2;
     s0 = peg$currPos;
@@ -569,7 +603,7 @@ function peg$parse(input, options) {
     if (s12 !== peg$FAILED) {
       s2 = peg$parse_();
       peg$savedPos = s0;
-      s0 = peg$f2();
+      s0 = peg$f3();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -578,7 +612,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s12 = "";
       peg$savedPos = s0;
-      s12 = peg$f3();
+      s12 = peg$f4();
       s0 = s12;
     }
     return s0;
@@ -589,7 +623,7 @@ function peg$parse(input, options) {
     s12 = peg$parseDigraphKw();
     if (s12 !== peg$FAILED) {
       peg$savedPos = s0;
-      s12 = peg$f4();
+      s12 = peg$f5();
     }
     s0 = s12;
     if (s0 === peg$FAILED) {
@@ -597,7 +631,7 @@ function peg$parse(input, options) {
       s12 = peg$parseGraphKw();
       if (s12 !== peg$FAILED) {
         peg$savedPos = s0;
-        s12 = peg$f5();
+        s12 = peg$f6();
       }
       s0 = s12;
     }
@@ -610,7 +644,7 @@ function peg$parse(input, options) {
     if (s12 !== peg$FAILED) {
       s2 = peg$parse_();
       peg$savedPos = s0;
-      s0 = peg$f6(s12);
+      s0 = peg$f7(s12);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -619,7 +653,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s12 = "";
       peg$savedPos = s0;
-      s12 = peg$f7();
+      s12 = peg$f8();
       s0 = s12;
     }
     return s0;
@@ -633,7 +667,7 @@ function peg$parse(input, options) {
     if (s3 !== peg$FAILED) {
       s4 = peg$parse_();
       peg$savedPos = s2;
-      s2 = peg$f8(s3);
+      s2 = peg$f9(s3);
     } else {
       peg$currPos = s2;
       s2 = peg$FAILED;
@@ -645,14 +679,14 @@ function peg$parse(input, options) {
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
         peg$savedPos = s2;
-        s2 = peg$f8(s3);
+        s2 = peg$f9(s3);
       } else {
         peg$currPos = s2;
         s2 = peg$FAILED;
       }
     }
     peg$savedPos = s0;
-    s12 = peg$f9(s12);
+    s12 = peg$f10(s12);
     s0 = s12;
     return s0;
   }
@@ -669,7 +703,7 @@ function peg$parse(input, options) {
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e2);
+          peg$fail(peg$e3);
         }
       }
       if (s4 !== peg$FAILED) {
@@ -684,7 +718,7 @@ function peg$parse(input, options) {
         s3 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f10(s12);
+      s0 = peg$f11(s12);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -701,7 +735,7 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e2);
+            peg$fail(peg$e3);
           }
         }
         if (s4 !== peg$FAILED) {
@@ -716,7 +750,7 @@ function peg$parse(input, options) {
           s3 = null;
         }
         peg$savedPos = s0;
-        s0 = peg$f11(s12);
+        s0 = peg$f12(s12);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -735,7 +769,7 @@ function peg$parse(input, options) {
         s4 = peg$parseAttrListReq();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f12(s12, s3, s4);
+          s0 = peg$f13(s12, s3, s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -753,7 +787,7 @@ function peg$parse(input, options) {
       s12 = peg$parseAttrAssignment();
       if (s12 !== peg$FAILED) {
         peg$savedPos = s0;
-        s12 = peg$f13(s12);
+        s12 = peg$f14(s12);
       }
       s0 = s12;
     }
@@ -771,13 +805,13 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e3);
+          peg$fail(peg$e4);
         }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
         peg$savedPos = s0;
-        s0 = peg$f14();
+        s0 = peg$f15();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -790,7 +824,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s12 = "";
       peg$savedPos = s0;
-      s12 = peg$f15();
+      s12 = peg$f16();
       s0 = s12;
     }
     return s0;
@@ -801,7 +835,7 @@ function peg$parse(input, options) {
     s12 = peg$parseGraphKw();
     if (s12 !== peg$FAILED) {
       peg$savedPos = s0;
-      s12 = peg$f16();
+      s12 = peg$f17();
     }
     s0 = s12;
     if (s0 === peg$FAILED) {
@@ -809,7 +843,7 @@ function peg$parse(input, options) {
       s12 = peg$parseNodeKw();
       if (s12 !== peg$FAILED) {
         peg$savedPos = s0;
-        s12 = peg$f17();
+        s12 = peg$f18();
       }
       s0 = s12;
       if (s0 === peg$FAILED) {
@@ -817,7 +851,7 @@ function peg$parse(input, options) {
         s12 = peg$parseEdgeKw();
         if (s12 !== peg$FAILED) {
           peg$savedPos = s0;
-          s12 = peg$f18();
+          s12 = peg$f19();
         }
         s0 = s12;
       }
@@ -834,7 +868,7 @@ function peg$parse(input, options) {
     } else {
       s2 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e4);
+        peg$fail(peg$e5);
       }
     }
     if (s2 !== peg$FAILED) {
@@ -847,14 +881,14 @@ function peg$parse(input, options) {
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e5);
+          peg$fail(peg$e6);
         }
       }
       if (s6 !== peg$FAILED) {
         s7 = peg$parseAttrList();
         if (s7 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f19(s4, s7);
+          s0 = peg$f20(s4, s7);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -876,7 +910,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s12 = "";
       peg$savedPos = s0;
-      s12 = peg$f20();
+      s12 = peg$f21();
       s0 = s12;
     }
     return s0;
@@ -896,7 +930,7 @@ function peg$parse(input, options) {
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e6);
+          peg$fail(peg$e7);
         }
       }
       if (s6 !== peg$FAILED) {
@@ -911,7 +945,7 @@ function peg$parse(input, options) {
         s5 = null;
       }
       peg$savedPos = s2;
-      s2 = peg$f21(s3);
+      s2 = peg$f22(s3);
     } else {
       peg$currPos = s2;
       s2 = peg$FAILED;
@@ -929,7 +963,7 @@ function peg$parse(input, options) {
         } else {
           s6 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e6);
+            peg$fail(peg$e7);
           }
         }
         if (s6 !== peg$FAILED) {
@@ -944,14 +978,14 @@ function peg$parse(input, options) {
           s5 = null;
         }
         peg$savedPos = s2;
-        s2 = peg$f21(s3);
+        s2 = peg$f22(s3);
       } else {
         peg$currPos = s2;
         s2 = peg$FAILED;
       }
     }
     peg$savedPos = s0;
-    s12 = peg$f22(s12);
+    s12 = peg$f23(s12);
     s0 = s12;
     return s0;
   }
@@ -967,7 +1001,7 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e3);
+          peg$fail(peg$e4);
         }
       }
       if (s3 !== peg$FAILED) {
@@ -975,7 +1009,7 @@ function peg$parse(input, options) {
         s5 = peg$parseAtom();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f23(s12, s5);
+          s0 = peg$f24(s12, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1002,7 +1036,7 @@ function peg$parse(input, options) {
         s5 = peg$parseAttrList();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f24(s12, s3, s5);
+          s0 = peg$f25(s12, s3, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1023,7 +1057,7 @@ function peg$parse(input, options) {
     s12 = peg$parseSubgraph();
     if (s12 !== peg$FAILED) {
       peg$savedPos = s0;
-      s12 = peg$f25(s12);
+      s12 = peg$f26(s12);
     }
     s0 = s12;
     if (s0 === peg$FAILED) {
@@ -1031,7 +1065,7 @@ function peg$parse(input, options) {
       s12 = peg$parseNode();
       if (s12 !== peg$FAILED) {
         peg$savedPos = s0;
-        s12 = peg$f26(s12);
+        s12 = peg$f27(s12);
       }
       s0 = s12;
     }
@@ -1049,7 +1083,7 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e7);
+          peg$fail(peg$e8);
         }
       }
       if (s3 !== peg$FAILED) {
@@ -1063,7 +1097,7 @@ function peg$parse(input, options) {
           } else {
             s7 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e7);
+              peg$fail(peg$e8);
             }
           }
           if (s7 !== peg$FAILED) {
@@ -1071,7 +1105,7 @@ function peg$parse(input, options) {
             s9 = peg$parseAtom();
             if (s9 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f27(s12, s5, s9);
+              s0 = peg$f28(s12, s5, s9);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -1103,7 +1137,7 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e7);
+            peg$fail(peg$e8);
           }
         }
         if (s3 !== peg$FAILED) {
@@ -1111,7 +1145,7 @@ function peg$parse(input, options) {
           s5 = peg$parseAtom();
           if (s5 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f28(s12, s5);
+            s0 = peg$f29(s12, s5);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -1129,7 +1163,7 @@ function peg$parse(input, options) {
         s12 = peg$parseAtom();
         if (s12 !== peg$FAILED) {
           peg$savedPos = s0;
-          s12 = peg$f29(s12);
+          s12 = peg$f30(s12);
         }
         s0 = s12;
       }
@@ -1148,7 +1182,7 @@ function peg$parse(input, options) {
         s5 = peg$parseEdgeChain();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f30(s3, s5);
+          s0 = peg$f31(s3, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1165,7 +1199,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s12 = "";
       peg$savedPos = s0;
-      s12 = peg$f31();
+      s12 = peg$f32();
       s0 = s12;
     }
     return s0;
@@ -1179,7 +1213,7 @@ function peg$parse(input, options) {
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e9);
+        peg$fail(peg$e10);
       }
     }
     if (s0 === peg$FAILED) {
@@ -1189,7 +1223,7 @@ function peg$parse(input, options) {
       } else {
         s0 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e10);
+          peg$fail(peg$e11);
         }
       }
     }
@@ -1197,7 +1231,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s12 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e8);
+        peg$fail(peg$e9);
       }
     }
     return s0;
@@ -1236,7 +1270,7 @@ function peg$parse(input, options) {
             }
             if (s9 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f32(s3, s7);
+              s0 = peg$f33(s3, s7);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -1287,7 +1321,7 @@ function peg$parse(input, options) {
             }
             if (s7 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f33(s5);
+              s0 = peg$f34(s5);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -1331,7 +1365,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f34(s3);
+              s0 = peg$f35(s3);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -1362,7 +1396,7 @@ function peg$parse(input, options) {
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e11);
+          peg$fail(peg$e12);
         }
       }
       if (s5 !== peg$FAILED) {
@@ -1370,7 +1404,7 @@ function peg$parse(input, options) {
         s7 = peg$parseQAtom();
         if (s7 !== peg$FAILED) {
           peg$savedPos = s3;
-          s3 = peg$f35(s12, s7);
+          s3 = peg$f36(s12, s7);
         } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -1389,7 +1423,7 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e11);
+            peg$fail(peg$e12);
           }
         }
         if (s5 !== peg$FAILED) {
@@ -1397,7 +1431,7 @@ function peg$parse(input, options) {
           s7 = peg$parseQAtom();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s3;
-            s3 = peg$f35(s12, s7);
+            s3 = peg$f36(s12, s7);
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
@@ -1408,7 +1442,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f36(s12, s2);
+      s0 = peg$f37(s12, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1435,7 +1469,7 @@ function peg$parse(input, options) {
     } else {
       s12 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e12);
+        peg$fail(peg$e13);
       }
     }
     if (s12 !== peg$FAILED) {
@@ -1451,12 +1485,12 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e12);
+          peg$fail(peg$e13);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f37(s2);
+        s0 = peg$f38(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1476,12 +1510,12 @@ function peg$parse(input, options) {
     } else {
       s12 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e13);
+        peg$fail(peg$e14);
       }
     }
     if (s12 !== peg$FAILED) {
       peg$savedPos = s0;
-      s12 = peg$f38();
+      s12 = peg$f39();
     }
     s0 = s12;
     if (s0 === peg$FAILED) {
@@ -1492,12 +1526,12 @@ function peg$parse(input, options) {
       } else {
         s12 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e14);
+          peg$fail(peg$e15);
         }
       }
       if (s12 !== peg$FAILED) {
         peg$savedPos = s0;
-        s12 = peg$f39();
+        s12 = peg$f40();
       }
       s0 = s12;
       if (s0 === peg$FAILED) {
@@ -1508,7 +1542,7 @@ function peg$parse(input, options) {
         } else {
           s12 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e15);
+            peg$fail(peg$e16);
           }
         }
         if (s12 !== peg$FAILED) {
@@ -1518,12 +1552,12 @@ function peg$parse(input, options) {
           } else {
             s2 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e16);
+              peg$fail(peg$e2);
             }
           }
           if (s2 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f40(s2);
+            s0 = peg$f41(s2);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -1572,7 +1606,7 @@ function peg$parse(input, options) {
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f41(s2);
+        s0 = peg$f42(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1593,7 +1627,7 @@ function peg$parse(input, options) {
       s2 = peg$parseHtmlChar();
     }
     peg$savedPos = s0;
-    s12 = peg$f42(s12);
+    s12 = peg$f43(s12);
     s0 = s12;
     return s0;
   }
@@ -1623,7 +1657,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f43(s12, s2);
+          s0 = peg$f44(s12, s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1668,7 +1702,7 @@ function peg$parse(input, options) {
         s2 = peg$parseName();
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f44(s2);
+          s0 = peg$f45(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1716,7 +1750,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f45(s12, s2);
+      s0 = peg$f46(s12, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1874,7 +1908,7 @@ function peg$parse(input, options) {
     }
     if (s12 !== peg$FAILED) {
       peg$savedPos = s0;
-      s12 = peg$f46(s12);
+      s12 = peg$f47(s12);
     }
     s0 = s12;
     return s0;
@@ -3149,7 +3183,7 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e16);
+            peg$fail(peg$e2);
           }
         }
         if (s5 !== peg$FAILED) {
@@ -3191,7 +3225,7 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e16);
+              peg$fail(peg$e2);
             }
           }
           if (s5 !== peg$FAILED) {
@@ -3281,7 +3315,7 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e16);
+            peg$fail(peg$e2);
           }
         }
         peg$silentFails--;
@@ -3358,7 +3392,7 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e16);
+            peg$fail(peg$e2);
           }
         }
         peg$silentFails--;
@@ -4801,8 +4835,9 @@ function parse(src) {
     }
     throw err;
   }
+  const lexed = src.slice(0, ast.end);
   try {
-    validateEdgeOperators(src, ast.directed);
+    validateEdgeOperators(lexed, ast.directed);
   } catch (err) {
     const offset = err instanceof ParseError ? err.location.offset : void 0;
     if (offset !== void 0) {
@@ -4811,7 +4846,7 @@ function parse(src) {
     }
     throw err;
   }
-  warnNumberAmbiguities(src, src.length);
+  warnNumberAmbiguities(lexed, lexed.length);
   return buildFromAst(ast);
 }
 
@@ -10652,13 +10687,14 @@ function skipSpace(text, i) {
   return j;
 }
 var byteLength = (s) => new TextEncoder().encode(s).length;
-function fedBytes(unit, isText) {
-  if (!isText) return byteLength(unit);
-  let text = unit.replace(/&([^;&<]*);/g, (m, name) => {
+function fedText(piece, endsUnit) {
+  const text = piece.replace(/&([^;&<]*);/g, (m, name) => {
     return name.length >= 2 && Object.hasOwn(HTML_ENTITIES, name) ? `&#${HTML_ENTITIES[name]};` : m;
   });
-  if (text.endsWith("]")) text = `${text.slice(0, -1)}&#93;`;
-  return byteLength(text);
+  return endsUnit && text.endsWith("]") ? `${text.slice(0, -1)}&#93;` : text;
+}
+function fedBytes(unit, isText) {
+  return byteLength(isText ? fedText(unit, true) : unit);
 }
 function scanValue(text, j) {
   const q = text[j];
@@ -10760,26 +10796,45 @@ function scanMarkup(text, p) {
   if (c === "!") return { scan: scanDeclaration(text, p), kind: "tag" };
   return { scan: scanStartTag(text, p), kind: "tag" };
 }
-function scanContent(text, base) {
+var CDATA_OPEN = "<![CDATA[";
+var CDATA_CLOSE = "]]>";
+function scanCdata(text, p, base, dataOf, tokens) {
+  const close = text.indexOf(CDATA_CLOSE, p);
+  const end = close < 0 ? text.length : close;
+  if (end > p) tokens.push({ kind: "cdata", start: base + p, end: base + end, data: dataOf(base + p, base + end) });
+  return close < 0 ? -1 : close + CDATA_CLOSE.length;
+}
+function scanText(text, p, base, tokens) {
+  const e = text.indexOf("<", p);
+  const end = e < 0 ? text.length : e;
+  tokens.push({ kind: "text", start: base + p, end: base + end });
+  return end;
+}
+function scanContent(text, base, inCdata, dataOf) {
   const tokens = [];
   let p = 0;
+  let inSection = inCdata;
   while (p < text.length) {
+    if (inSection || text.startsWith(CDATA_OPEN, p)) {
+      const after2 = scanCdata(text, inSection ? p : p + CDATA_OPEN.length, base, dataOf, tokens);
+      if (after2 < 0) return { tokens, consumed: text.length, inCdata: true };
+      inSection = false;
+      p = after2;
+      continue;
+    }
     if (text[p] !== "<") {
-      const e = text.indexOf("<", p);
-      const end = e < 0 ? text.length : e;
-      tokens.push({ kind: "text", start: base + p, end: base + end });
-      p = end;
+      p = scanText(text, p, base, tokens);
       continue;
     }
     const { scan, kind } = scanMarkup(text, p);
-    if (scan.kind === "invalid") return { tokens, consumed: p, invalid: base + scan.offset };
-    if (scan.kind === "partial") return { tokens, consumed: p };
+    if (scan.kind === "invalid") return { tokens, consumed: p, invalid: base + scan.offset, inCdata: false };
+    if (scan.kind === "partial") return { tokens, consumed: p, inCdata: false };
     const tok = { kind, start: base + p, end: base + scan.end };
     if (scan.dup !== void 0) tok.dup = base + scan.dup;
     tokens.push(tok);
     p = scan.end;
   }
-  return { tokens, consumed: p };
+  return { tokens, consumed: p, inCdata: inSection };
 }
 var InputBuffer = class {
   size = 0;
@@ -10830,24 +10885,42 @@ var ExpatFeed = class {
   buffer = new InputBuffer();
   heldStart = 0;
   fedEnd = 0;
+  inCdata = false;
+  /** Source ranges of the text units fed so far: their bytes went through findNext's rewrite. */
+  textUnits = [];
   /** Start of the token expat still holds, or undefined when it holds nothing. */
   get held() {
     return this.heldStart < this.fedEnd ? this.heldStart : void 0;
   }
-  /** One `XML_Parse(parser, src[start, end), nbytes, 0)`. */
-  feed(start, end, nbytes) {
-    this.buffer.append(nbytes);
+  /** One `XML_Parse(parser, src[start, end), nbytes, 0)`; `isText` for a text unit. */
+  feed(start, end, isText) {
+    if (isText) this.textUnits.push([start, end]);
+    this.buffer.append(fedBytes(this.src.slice(start, end), isText));
     this.fedEnd = end;
     if (!this.buffer.enough) return { tokens: [] };
     const text = this.src.slice(this.heldStart, end);
-    const scan = scanContent(text, this.heldStart);
+    const scan = scanContent(text, this.heldStart, this.inCdata, (a, b) => this.fedBetween(a, b));
     if (scan.invalid !== void 0) {
       return { tokens: scan.tokens, invalid: { message: XML_ERROR_INVALID_TOKEN, offset: scan.invalid } };
     }
+    this.inCdata = scan.inCdata;
     this.heldStart += scan.consumed;
     this.buffer.consumedTo(byteLength(this.src.slice(this.heldStart, end)), scan.consumed > 0);
     return { tokens: scan.tokens };
   }
+  /** What expat read for source offsets [start, end): text-unit pieces as findNext rewrote them. */
+  fedBetween(start, end) {
+    let out = "";
+    let p = start;
+    for (const [us, ue] of this.textUnits) {
+      if (ue <= p || us >= end) continue;
+      if (us > p) out += this.src.slice(p, us);
+      const e = Math.min(ue, end);
+      out += fedText(this.src.slice(Math.max(us, p), e), e === ue);
+      p = e;
+    }
+    return out + this.src.slice(p, end);
+  }
 };
 var XML_PREDEFINED_ENTITIES = /* @__PURE__ */ new Set(["lt", "gt", "amp", "quot", "apos"]);
 var ENTITY_NAME = /^[A-Za-z_:][\w.:-]*$/;
@@ -10872,6 +10945,46 @@ function parseTagChunk(chunk) {
   return { close, selfClose: !close && body.endsWith("/"), name };
 }
 
+// src/common/htmltable-lex-chardata.ts
+var initialCharData = () => ({ inCell: true, xb: "" });
+function startInCell(name, inCell) {
+  if (name === "TABLE" || name === "TR" || name === "TH") return false;
+  return name === "TD" ? true : inCell;
+}
+function endInCell(name, inCell) {
+  if (name === "TABLE") return true;
+  return name === "TD" ? false : inCell;
+}
+function tagInCell(st, tag) {
+  const name = tag.name.toUpperCase();
+  if (tag.close) {
+    st.inCell = endInCell(name, st.inCell);
+    return;
+  }
+  st.inCell = startInCell(name, st.inCell);
+  if (tag.selfClose) st.inCell = endInCell(name, st.inCell);
+}
+function keepLostText(st, lost) {
+  for (const t of lost) if (t.type === "text") st.xb += t.value;
+}
+function releaseXb(st, first) {
+  if (st.xb === "") return;
+  if (first.type === "text") first.value = st.xb + first.value;
+  else if (first.type === "open" && first.tag === "TABLE") first.heldText = st.xb;
+  else return;
+  st.xb = "";
+}
+function cleanText(decoded) {
+  return decoded.replace(/[\x00-\x1f]/g, "");
+}
+function textTokens(raw) {
+  return charDataTokens(htmlEntityUTF8(raw));
+}
+function charDataTokens(decoded) {
+  const clean = cleanText(decoded);
+  return clean.length > 0 ? [{ type: "text", value: clean }] : [];
+}
+
 // src/common/htmltable-lex-units.ts
 var UNCLOSED_COMMENT = "Warning: Unclosed comment\n";
 var LABEL_CLOSED = "Warning: Label closed before end of HTML element\n";
@@ -10976,20 +11089,17 @@ function parseCloseToken(inner) {
   checkTag(tag);
   return { type: "close", tag: normalizeTag(tag) };
 }
-function cleanText(raw) {
-  const isKeep = (c) => c === " " || c === "	" || c === "\n" || c === "\r";
-  return raw.replace(/[\x00-\x1f\x7f]/g, (c) => isKeep(c) ? c : "");
-}
-function textTokens(raw) {
-  const clean = htmlEntityUTF8(cleanText(raw));
-  return clean.length > 0 ? [{ type: "text", value: clean }] : [];
-}
+var EMPTY_ELEMENTS = /* @__PURE__ */ new Set(["BR", "HR", "VR", "IMG"]);
 function tagTokens(text) {
   const inner = text.slice(1, -1).trim();
   if (inner.startsWith("/")) return [parseCloseToken(inner)];
   if (inner.endsWith("/")) {
     const open = parseOpenToken(inner.slice(0, -1).trim());
-    return [open, { type: "close", tag: open.tag }];
+    if (EMPTY_ELEMENTS.has(open.tag)) return [open, { type: "close", tag: open.tag }];
+    const close = { type: "close", tag: open.tag };
+    if (open.warnings !== void 0) close.warnings = open.warnings;
+    if (open.warn === true) close.warn = true;
+    return [close];
   }
   return [parseOpenToken(inner)];
 }
@@ -11062,6 +11172,7 @@ function eventTokens(site) {
   const { src, tok, st } = site;
   const text = src.slice(tok.start, tok.end);
   if (tok.kind === "comment" || tok.kind === "pi") return [];
+  if (tok.kind === "cdata") return charDataTokens(tok.data ?? "");
   if (tok.kind === "tag") {
     checkTagToken(site);
     return tagTokens(text);
@@ -11087,7 +11198,13 @@ function absorb(carry, lost) {
 function eventGroups(run, res) {
   const groups = [];
   for (const tok of res.tokens) {
-    const tokens = eventTokens({ src: run.src, tok, st: run.st });
+    let tokens = eventTokens({ src: run.src, tok, st: run.st });
+    if (tok.kind === "tag") {
+      const tag = parseTagChunk(run.src.slice(tok.start, tok.end));
+      if (tag !== void 0) tagInCell(run.cd, tag);
+    } else if (!run.cd.inCell) {
+      tokens = [];
+    }
     if (tokens.length > 0) groups.push({ tokens, tok });
   }
   if (res.invalid !== void 0) {
@@ -11098,6 +11215,7 @@ function eventGroups(run, res) {
 }
 function deliver(run, last) {
   const first = last.tokens[0];
+  releaseXb(run.cd, first);
   attachCarry(run.carry, first);
   const info = { src: run.src, pos: last.tok.start, end: last.tok.end, context: run.st.prev + run.st.curr };
   const prev = run.tokens.at(-1);
@@ -11112,7 +11230,10 @@ function deliver(run, last) {
 function runEvents(run, res) {
   const groups = eventGroups(run, res);
   const last = groups.pop();
-  for (const g of groups) absorb(run.carry, g.tokens);
+  for (const g of groups) {
+    absorb(run.carry, g.tokens);
+    keepLostText(run.cd, g.tokens);
+  }
   if (last !== void 0) deliver(run, last);
 }
 function appendString(into, more) {
@@ -11143,7 +11264,8 @@ function tokenizeDeferred(src, label = { start: 0, end: src.length }) {
     tokens: [],
     st: { stack: [], prev: "", curr: "" },
     expat: new ExpatFeed(src),
-    carry: { warnings: [], warn: false }
+    carry: { warnings: [], warn: false },
+    cd: initialCharData()
   };
   let error;
   try {
@@ -11152,8 +11274,7 @@ function tokenizeDeferred(src, label = { start: 0, end: src.length }) {
       run.st.curr = src.slice(u.start, u.end);
       run.carry.warnings.push(...u.warnings);
       if (u.warn) run.carry.warn = true;
-      const nbytes = fedBytes(run.st.curr, !run.st.curr.startsWith("<"));
-      runEvents(run, run.expat.feed(u.start, u.end, nbytes));
+      runEvents(run, run.expat.feed(u.start, u.end, !run.st.curr.startsWith("<")));
     }
     const held = run.expat.held;
     if (held !== void 0) error = unfinishedError(run, held);
@@ -11318,7 +11439,8 @@ var tableFont = (fontStack) => {
 var MSG_SYNTAX_ERROR = "syntax error";
 var MSG_TEXT_BEFORE_TABLE = "Syntax error: non-space string used before <TABLE>";
 var MSG_TEXT_AFTER_TABLE = "Syntax error: non-space string used after </TABLE>";
-var nonSpace = (text) => /[^ \t\n\r]/.test(text);
+var nonSpace = (text) => /[^ ]/.test(text);
+var heldNonSpace = (tbl) => tbl?.type === "open" && nonSpace(tbl.heldText ?? "");
 var parseError = (s, tok, message) => {
   if (tok !== void 0) emitWarnings(s, tok);
   else emitEof(s);
@@ -11339,41 +11461,29 @@ var applyBrTag = (s, t, fontStack, items) => {
   items.push({ br: true, brAlign: parseAlign(t.attrs["align"] ?? ""), ...fontItemProps(font) });
   consumeClose(s, "BR");
 };
-var applyFontTag = (s, t, fontStack, items) => {
-  consume(s);
-  const font = fontStack[fontStack.length - 1] ?? {};
-  fontStack.push(mergeFontState(font, {
-    fontColor: t.attrs["color"],
-    fontFace: t.attrs["face"],
-    fontSize: num(t.attrs["point-size"])
-  }));
+var parseStyledText = (s, tag, fontStack, items) => {
   const inner = parseText(s, fontStack);
   fontStack.pop();
-  items.push(...inner.items);
   const nxt = peek(s);
-  if (nxt?.type === "close" && nxt.tag === "FONT") consume(s);
+  if (inner.items.length === 0 || nxt?.type !== "close" || nxt.tag !== tag) {
+    throw parseError(s, nxt, MSG_SYNTAX_ERROR);
+  }
+  items.push(...inner.items);
+  consume(s);
 };
-var applyInlineTag = (s, t, fontStack, items) => {
+var applyStyleTag = (s, t, fontStack, items) => {
   consume(s);
-  const font = fontStack[fontStack.length - 1] ?? {};
-  fontStack.push(mergeFontState(font, inlineFontState(t.tag, t.attrs)));
-  const inner = parseText(s, fontStack);
-  fontStack.pop();
-  items.push(...inner.items);
-  const nxt = peek(s);
-  if (nxt?.type === "close" && nxt.tag === t.tag) consume(s);
+  const own = t.tag === "FONT" ? { fontColor: t.attrs["color"], fontFace: t.attrs["face"], fontSize: num(t.attrs["point-size"]) } : inlineFontState(t.tag, t.attrs);
+  fontStack.push(mergeFontState(fontStack[fontStack.length - 1] ?? {}, own));
+  parseStyledText(s, t.tag, fontStack, items);
 };
 var applyOpenTag = (s, t, fontStack, items) => {
   if (t.tag === "BR") {
     applyBrTag(s, t, fontStack, items);
     return true;
   }
-  if (t.tag === "FONT") {
-    applyFontTag(s, t, fontStack, items);
-    return true;
-  }
-  if (isInlineTag(t.tag)) {
-    applyInlineTag(s, t, fontStack, items);
+  if (t.tag === "FONT" || isInlineTag(t.tag)) {
+    applyStyleTag(s, t, fontStack, items);
     return true;
   }
   return false;
@@ -11416,7 +11526,7 @@ var parseFontTable = (s, open, fontStack) => {
   fontStack.push(wrapperFont(open, fontStack));
   const textBefore = skipStrings(s);
   const tblTok = peek(s);
-  if (textBefore && tblTok !== void 0) throw parseError(s, tblTok, MSG_TEXT_BEFORE_TABLE);
+  if ((textBefore || heldNonSpace(tblTok)) && tblTok !== void 0) throw parseError(s, tblTok, MSG_TEXT_BEFORE_TABLE);
   const table = parseTable(s, fontStack);
   const textAfter = skipStrings(s);
   const close = peek(s);
@@ -11445,7 +11555,7 @@ var parseImgContent = (s, t, cellAttrs) => {
 };
 var scanCellTable = (s, t, fontStack, st) => {
   if (st.kind === "image" || st.kind === "table") throw parseError(s, t, MSG_SYNTAX_ERROR);
-  if (st.textNonSpace) throw parseError(s, t, MSG_TEXT_BEFORE_TABLE);
+  if (st.textNonSpace || heldNonSpace(t)) throw parseError(s, t, MSG_TEXT_BEFORE_TABLE);
   const tbl = parseTable(s, fontStack);
   st.kind = "table";
   return [tbl];
@@ -11600,14 +11710,14 @@ var consumeRowHr = (s, rows) => {
 var findFirstRealToken = (tokens, start) => {
   for (let i = start; i < tokens.length; i++) {
     const tk = tokens[i];
-    if (tk.type !== "text" || tk.value.trim() !== "") return tk;
+    if (tk.type !== "text" || nonSpace(tk.value)) return tk;
   }
   return void 0;
 };
 var skipLeadingWs = (s) => {
   while (true) {
     const nxt = peek(s);
-    if (!nxt || nxt.type !== "text" || nxt.value.trim() !== "") break;
+    if (!nxt || nxt.type !== "text" || nonSpace(nxt.value)) break;
     consume(s);
   }
 };
@@ -11633,6 +11743,7 @@ var parseFontTableLabel = (s, open, fontStack) => {
 };
 var parseTableLabel = (s, fontStack) => {
   skipLeadingWs(s);
+  if (heldNonSpace(peek(s))) throw parseError(s, peek(s), MSG_TEXT_BEFORE_TABLE);
   const table = parseTable(s, fontStack);
   finishTableLabel(s);
   return { kind: "table", table };