@knowvah/dot-engine 1.2.3 → 1.2.4

package/dist/render.js

@@ -5450,12 +5450,15 @@ function parseAttrs(raw) {
   }
   return out;
 }
+function normalizeTag(tag) {
+  return tag === "TH" ? "TR" : tag;
+}
 function parseCloseToken(inner) {
   const body = inner.slice(1).trim();
   const sp = body.search(/\s/);
   const tag = (sp === -1 ? body : body.slice(0, sp)).toUpperCase();
   checkTag(tag);
-  return { type: "close", tag };
+  return { type: "close", tag: normalizeTag(tag) };
 }
 function cleanText(raw) {
   const isKeep = (c) => c === " " || c === "	" || c === "\n" || c === "\r";
@@ -5489,12 +5492,13 @@ function scanTag(src, start, tokens) {
 function parseOpenToken(inner) {
   const sp = inner.search(/\s/);
   if (sp === -1) {
-    checkTag(inner.toUpperCase());
-    return { type: "open", tag: inner.toUpperCase(), attrs: parseAttrs("") };
+    const tag2 = inner.toUpperCase();
+    checkTag(tag2);
+    return { type: "open", tag: normalizeTag(tag2), attrs: parseAttrs("") };
   }
   const tag = inner.slice(0, sp).toUpperCase();
   checkTag(tag);
-  return { type: "open", tag, attrs: parseAttrs(inner.slice(sp + 1)) };
+  return { type: "open", tag: normalizeTag(tag), attrs: parseAttrs(inner.slice(sp + 1)) };
 }
 function tokenize(src) {
   const tokens = [];
@@ -5719,7 +5723,7 @@ var buildCell = (content, a) => ({
 });
 var parseCell = (s, attrs, fontStack) => buildCell(parseCellContent(s, attrs, fontStack), attrs);
 var processRowToken = (s, t, cells, fontStack) => {
-  if (t.type === "open" && (t.tag === "TD" || t.tag === "TH")) {
+  if (t.type === "open" && t.tag === "TD") {
     consume(s);
     cells.push(parseCell(s, t.attrs, fontStack));
     return;
@@ -10749,10 +10753,7 @@ function posReclbl(f, ul, sides) {
   }
 }
 function attrBool(n, g, key) {
-  const s = nodeAttr(n, g, key);
-  if (!s || s.toLowerCase() === "false" || s.toLowerCase() === "no") return false;
-  if (s.toLowerCase() === "true" || s.toLowerCase() === "yes") return true;
-  return parseInt(s, 10) !== 0;
+  return mapbool2(nodeAttr(n, g, key));
 }
 function recAttrSize(n, g) {
   const w = nodeAttr(n, g, "width");
@@ -16321,7 +16322,7 @@ function class2(g) {
 
 // src/common/edge-label-init.ts
 var MIN_FONTSIZE = 1;
-function mapbool2(s) {
+function mapbool3(s) {
   if (!s || s.toLowerCase() === "false" || s.toLowerCase() === "no") return false;
   if (s.toLowerCase() === "true" || s.toLowerCase() === "yes") return true;
   const n = parseInt(s, 10);
@@ -16352,7 +16353,7 @@ function applyLabel(e, g, fi, measurer) {
   const content = isHtml ? htmlValueContent(str) : str;
   e.info.label = makeAnyLabel(content, isHtml, fi, measurer, e);
   g.root.info.has_labels |= EDGE_LABEL;
-  e.info.label_ontop = mapbool2(e.attrs.get("labelfloat")) ? 1 : 0;
+  e.info.label_ontop = mapbool3(e.attrs.get("labelfloat")) ? 1 : 0;
 }
 function applyXLabel(e, g, fi, measurer) {
   const str = e.attrs.get("xlabel");
@@ -16548,7 +16549,7 @@ function graphInit(g, useRankdir) {
   if (fn !== -1) g.info.fontnames = fn;
   parseRatioDrawing(g);
   setClType(maptoken(g.attrs.get("clusterrank"), RANK_NAMES, rankCodes()));
-  g.info.concentrate = mapbool3(g.attrs.get("concentrate"));
+  g.info.concentrate = mapbool2(g.attrs.get("concentrate"));
   g.info.edgeLabelsDone = false;
   doGraphLabel(g, layoutMeasurer(g));
 }
@@ -16590,7 +16591,7 @@ function sameNonemptyGroup(e) {
 }
 function initEdgeConstraint(e) {
   const s = e.attrs.get("constraint");
-  if (s !== void 0 && s !== "") e.info.constraint = mapbool3(s);
+  if (s !== void 0 && s !== "") e.info.constraint = mapbool2(s);
 }
 function applyGroupPenalty(e) {
   if (!sameNonemptyGroup(e)) return;
@@ -21981,10 +21982,10 @@ function xgWeak(Xg, t, h, orig, st) {
 function isNonConstraint(e) {
   const v = e.attrs.get("constraint");
   if (!v) return false;
-  return !mapbool3(v);
+  return !mapbool2(v);
 }
 function isAStrongCluster(g) {
-  return mapbool3(g.attrs.get("compact") ?? "");
+  return mapbool2(g.attrs.get("compact") ?? "");
 }
 function dotLca(c0, c1) {
   let a = c0;
@@ -22259,7 +22260,7 @@ var clType = LOCAL;
 function setClType(t) {
   clType = t;
 }
-function mapbool3(s) {
+function mapbool2(s) {
   if (!s || s === "") return false;
   const l = s.toLowerCase();
   if (l === "false" || l === "no") return false;
@@ -22275,7 +22276,7 @@ function scaleClamp(nnodes, scale) {
 function isACluster(g) {
   if (g === g.root) return true;
   if (g.name.toLowerCase().startsWith("cluster")) return true;
-  return mapbool3(g.attrs.get("cluster"));
+  return mapbool2(g.attrs.get("cluster"));
 }
 function cleanup1ClearNode(n) {
   if (n.info.in) n.info.in.size = 0;
@@ -22623,7 +22624,7 @@ function dot1Rank(g) {
   cleanup1(g);
 }
 function dotRank(g) {
-  if (mapbool3(g.attrs.get("newrank"))) {
+  if (mapbool2(g.attrs.get("newrank"))) {
     g.info.flags = (g.info.flags ?? 0) | NEW_RANK;
     dot2Rank(g);
   } else {
@@ -28167,31 +28168,13 @@ function splay(root, key, keyOf, compare) {
 }
 
 // src/cdt/bag.ts
-function findByIdentity(start, target, key, keyOf, compare) {
-  let cur = start;
-  let parent = null;
-  while (cur !== null) {
-    if (cur.obj === target) return [cur, parent];
-    if (compare(key, keyOf(cur.obj)) !== 0) return [null, null];
-    parent = cur;
-    cur = cur.left;
-  }
-  return [null, null];
-}
-function unlinkNode(root, cur, parent) {
-  const left = cur.left;
-  const right = cur.right;
-  let replacement;
-  if (left === null) {
-    replacement = right;
-  } else {
-    const maxLeft = splayMax(left);
-    maxLeft.right = right;
-    replacement = maxLeft;
-  }
-  if (parent === null) return replacement;
-  parent.left = replacement;
-  return root;
+function removeRoot(root) {
+  const left = root.left;
+  const right = root.right;
+  if (left === null) return right;
+  const maxLeft = splayMax(left);
+  maxLeft.right = right;
+  return maxLeft;
 }
 var DtBag = class {
   _root = null;
@@ -28230,16 +28213,13 @@ var DtBag = class {
     const key = this._keyOf(obj);
     this._root = splay(this._root, key, this._keyOf, this._compare);
     if (this._compare(key, this._keyOf(this._root.obj)) !== 0) return false;
-    const [cur, parent] = findByIdentity(
-      this._root,
-      obj,
-      key,
-      this._keyOf,
-      this._compare
-    );
-    if (cur === null) return false;
-    const newRoot = unlinkNode(this._root, cur, parent);
-    this._root = newRoot;
+    while (this._root.obj !== obj) {
+      const nxt = this.next(this._root.obj);
+      if (nxt === void 0 || this._compare(key, this._keyOf(nxt)) !== 0) {
+        return false;
+      }
+    }
+    this._root = removeRoot(this._root);
     this._size--;
     return true;
   }
@@ -29090,7 +29070,7 @@ function runPlacement(gp) {
   const nObjs = gp.nodes.size + nSetLbls + nClbls + nElbls;
   const { ctx } = buildArrays(gp, nObjs, nLbls, nClbls, et);
   const forceStr = gp.attrs.get("forcelabels");
-  const force = forceStr === void 0 ? true : mapbool3(forceStr);
+  const force = forceStr === void 0 ? true : mapbool2(forceStr);
   const params = { bb: { ll: ctx.bb.ll, ur: ctx.bb.ur }, force };
   placeLabels(ctx.objs, ctx.lbls, params);
   writeBackLabels(gp, ctx.lbls, nLbls);
@@ -34320,7 +34300,7 @@ function dotPhasePostNoFinish(g) {
   removeFill(g);
   dotSameports(g);
   dotSplines(g);
-  if (mapbool3(g.attrs.get("compound") ?? g.root.attrs.get("compound"))) dotCompoundEdges(g);
+  if (mapbool2(g.attrs.get("compound") ?? g.root.attrs.get("compound"))) dotCompoundEdges(g);
 }
 function dotPhasePost(g) {
   dotPhasePostNoFinish(g);
@@ -35311,7 +35291,7 @@ function userPos(n) {
   n.info.pos = [Number(m[1]), Number(m[2])];
   n.info.posSet = true;
   const pin = n.attrs.get("pin");
-  if (m[3] === "!" || pin !== void 0 && mapbool3(pin)) n.info.pinned = true;
+  if (m[3] === "!" || pin !== void 0 && mapbool2(pin)) n.info.pinned = true;
   return true;
 }
 function assignNodeIds2(g) {
@@ -38562,7 +38542,7 @@ function splineEdgesImpl(g, sep, edgetype) {
 function splineEdges(g) {
   const edgetype = g.info.flags & 15;
   if (edgetype === EDGETYPE_NONE) return;
-  g.root.info.concentrate = mapbool3(g.root.attrs.get("concentrate"));
+  g.root.info.concentrate = mapbool2(g.root.attrs.get("concentrate"));
   for (const n of nodesInSeq(g)) {
     for (const e of n.outEdges(g)) {
       if (e.info.tail_port.dyna) e.info.tail_port = resolvePort(e.tail, e.head, e.info.tail_port);
@@ -45458,7 +45438,7 @@ function PARENT(n) {
 function isCluster(g) {
   if (g === g.root) return true;
   if (g.name.toLowerCase().startsWith("cluster")) return true;
-  return mapbool3(g.attrs.get("cluster"));
+  return mapbool2(g.attrs.get("cluster"));
 }
 function clusterInitGraph(g) {
   graphInit(g, false);
@@ -45985,7 +45965,7 @@ function walkTree(tree) {
 function isCluster2(g) {
   if (g === g.root) return true;
   if (g.name.toLowerCase().startsWith("cluster")) return true;
-  return mapbool3(g.attrs.get("cluster"));
+  return mapbool2(g.attrs.get("cluster"));
 }
 function collectClusters2(g, clusters) {
   for (const subg of g.subgraphs.values()) {
@@ -46065,7 +46045,7 @@ var PATCHWORK_LAYOUT_ENGINE = {
 // src/gvc/edge-labels.ts
 function renderEdgeLabels(e, renderer, job) {
   const obj = job.obj;
-  const spl = mapbool3(e.attrs.get("decorate") ?? "false") ? e.info.spl : void 0;
+  const spl = mapbool2(e.attrs.get("decorate") ?? "false") ? e.info.spl : void 0;
   if (obj === null) {
     renderOneLabel(e.info.label, renderer, job);
     if (spl) emitAttachment(e.info.label, spl, renderer, job);
@@ -52477,7 +52457,7 @@ var XdotParser = class _XdotParser {
     let accounted = 0;
     let j = 0;
     while (accounted < len) {
-      if (cur + j >= s.length) break;
+      if (cur + j >= s.length) return null;
       const ch = s[cur + j];
       const prev = j > 0 ? s[cur + j - 1] : "";
       out += ch;