@knowvah/dot-engine 2.0.0 → 2.0.2

package/dist/render.js

@@ -19277,10 +19277,7 @@ function walkNodesAndEdges(g, renderer, job, info) {
   }
 }
 
-// src/gvc/device.ts
-function renderClusterLabel(sg, renderer, job) {
-  renderOneLabel(sg.info.label, renderer, job, false);
-}
+// src/gvc/device-transform.ts
 function transformPoint(p, job) {
   if ((job.flags & GVRENDER_DOES_TRANSFORM) !== 0) {
     return p;
@@ -19300,6 +19297,50 @@ function buildPoint(x, y) {
   const pt = { x, y };
   return pt;
 }
+
+// src/gvc/device-labels.ts
+var VALIGN_TOP = "t".charCodeAt(0);
+var VALIGN_BOTTOM = "b".charCodeAt(0);
+function labelFirstSpanY(lp) {
+  if (lp.valign === VALIGN_TOP) return lp.pos.y + lp.space.y / 2 - lp.fontsize;
+  if (lp.valign === VALIGN_BOTTOM) {
+    return lp.pos.y - lp.space.y / 2 + lp.dimen.y - lp.fontsize;
+  }
+  return lp.pos.y + lp.dimen.y / 2 - lp.fontsize;
+}
+function labelSpanX(lp, just) {
+  if (just === "l") return lp.pos.x - lp.space.x / 2;
+  if (just === "r") return lp.pos.x + lp.space.x / 2;
+  return lp.pos.x;
+}
+function renderOneLabel(lp, renderer, job, requireSet = true) {
+  if (!lp) return;
+  if (requireSet && !lp.set) return;
+  if (lp.html) {
+    if (lp.u.kind === "html") {
+      const html = lp.u.html;
+      const pos = lp.pos;
+      withLabelEmitState(job, () => emitHtmlLabel(html, pos, renderer, job));
+    }
+    return;
+  }
+  if (lp.u.kind !== "txt" || lp.u.nspans < 1) return;
+  let y = labelFirstSpanY(lp);
+  for (let i = 0; i < lp.u.nspans; i++) {
+    const span = lp.u.span[i];
+    if (!span) break;
+    gvrenderTextspan(renderer, { x: labelSpanX(lp, span.just), y }, span, job);
+    y -= span.size.y;
+  }
+}
+function renderNodeXLabel(n, renderer, job) {
+  renderOneLabel(n.info.xlabel, renderer, job);
+}
+function renderClusterLabel(sg, renderer, job) {
+  renderOneLabel(sg.info.label, renderer, job, false);
+}
+
+// src/gvc/device.ts
 function labelTextOf2(lp) {
   return lp?.text ?? null;
 }
@@ -19374,43 +19415,6 @@ function renderEdge(e, renderer, job) {
     job.popObj();
   }
 }
-var VALIGN_TOP = "t".charCodeAt(0);
-var VALIGN_BOTTOM = "b".charCodeAt(0);
-function labelFirstSpanY(lp) {
-  if (lp.valign === VALIGN_TOP) return lp.pos.y + lp.space.y / 2 - lp.fontsize;
-  if (lp.valign === VALIGN_BOTTOM) {
-    return lp.pos.y - lp.space.y / 2 + lp.dimen.y - lp.fontsize;
-  }
-  return lp.pos.y + lp.dimen.y / 2 - lp.fontsize;
-}
-function labelSpanX(lp, just) {
-  if (just === "l") return lp.pos.x - lp.space.x / 2;
-  if (just === "r") return lp.pos.x + lp.space.x / 2;
-  return lp.pos.x;
-}
-function renderOneLabel(lp, renderer, job, requireSet = true) {
-  if (!lp) return;
-  if (requireSet && !lp.set) return;
-  if (lp.html) {
-    if (lp.u.kind === "html") {
-      const html = lp.u.html;
-      const pos = lp.pos;
-      withLabelEmitState(job, () => emitHtmlLabel(html, pos, renderer, job));
-    }
-    return;
-  }
-  if (lp.u.kind !== "txt" || lp.u.nspans < 1) return;
-  let y = labelFirstSpanY(lp);
-  for (let i = 0; i < lp.u.nspans; i++) {
-    const span = lp.u.span[i];
-    if (!span) break;
-    gvrenderTextspan(renderer, { x: labelSpanX(lp, span.just), y }, span, job);
-    y -= span.size.y;
-  }
-}
-function renderNodeXLabel(n, renderer, job) {
-  renderOneLabel(n.info.xlabel, renderer, job);
-}
 function renderGraphLabel(g, renderer, job) {
   setHtmlAnchorObj(svgGraphId(g, job), labelTextOf2(g.info.label), job.obj ?? void 0);
   renderOneLabel(g.info.label, renderer, job, false);
@@ -41737,6 +41741,102 @@ function scAdjust(g, equal) {
   return 1;
 }
 
+// src/layout/neato/simple-scale.ts
+var ISZERO = (d) => Math.abs(d) < 1e-9;
+var LF = /^\s*([+-]?(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?)/;
+function scanPair(p) {
+  const m1 = LF.exec(p);
+  if (m1 === null) return [];
+  const rest = p.slice(m1[0].length);
+  if (!rest.startsWith(",")) return [parseFloat(m1[1])];
+  const m2 = LF.exec(rest.slice(1));
+  return m2 === null ? [parseFloat(m1[1])] : [parseFloat(m1[1]), parseFloat(m2[1])];
+}
+function simpleScale(g) {
+  const p = aggetGraph(g, "scale");
+  if (p === void 0) return 0;
+  const sc = scanPair(p);
+  if (sc.length === 0) return 0;
+  const x = sc[0];
+  if (ISZERO(x)) return 0;
+  const y = sc.length === 1 ? x : sc[1];
+  if (ISZERO(y)) return 0;
+  if (y === 1 && x === 1) return 0;
+  for (const n of g.nodes.values()) {
+    n.info.pos[0] *= x;
+    n.info.pos[1] *= y;
+  }
+  return 1;
+}
+
+// src/layout/fdp/normalize.ts
+function mapbool5(s) {
+  const t = s.toLowerCase();
+  if (t === "false" || t === "no") return false;
+  if (t === "true" || t === "yes") return true;
+  const v = parseInt(s, 10);
+  return !Number.isNaN(v) && v !== 0;
+}
+function angleSet(g) {
+  const a = aggetGraph(g, "normalize");
+  if (a === void 0 || a === "") return null;
+  const ang = parseAngle2(a);
+  if (ang === null) return null;
+  return wrapDegrees(ang) / 180 * Math.PI;
+}
+function parseAngle2(a) {
+  const m = /^\s*[+-]?(?:\d+\.?\d*|\.\d+)(?:[eE][-+]?\d+)?/.exec(a);
+  if (m !== null) return parseFloat(m[0]);
+  return mapbool5(a) ? 0 : null;
+}
+function wrapDegrees(ang) {
+  while (ang > 180) ang -= 360;
+  while (ang <= -180) ang += 360;
+  return ang;
+}
+function normalizeG(g) {
+  const phi0 = angleSet(g);
+  if (phi0 === null) return 0;
+  const nodes = [...g.nodes.values()];
+  const first = nodes[0];
+  if (first === void 0) return 0;
+  const px = first.info.pos[0];
+  const py = first.info.pos[1];
+  for (const v of nodes) {
+    v.info.pos[0] -= px;
+    v.info.pos[1] -= py;
+  }
+  const ret = px || py ? 1 : 0;
+  let e = null;
+  for (const v of nodes) {
+    const out = v.outEdges(g);
+    if (out.length > 0) {
+      e = out[0];
+      break;
+    }
+  }
+  if (e === null) return ret;
+  const phi = phi0 - Math.atan2(
+    e.head.info.pos[1] - e.tail.info.pos[1],
+    e.head.info.pos[0] - e.tail.info.pos[0]
+  );
+  if (!phi) return ret;
+  rotateAll(nodes, e.tail, phi);
+  return 1;
+}
+function rotateAll(nodes, orig, phi) {
+  const ox = orig.info.pos[0];
+  const oy = orig.info.pos[1];
+  const cosv = Math.cos(phi);
+  const sinv = Math.sin(phi);
+  for (const v of nodes) {
+    const x = v.info.pos[0] - ox;
+    const y = v.info.pos[1] - oy;
+    v.info.pos[0] = x * cosv - y * sinv + ox;
+    v.info.pos[1] = x * sinv + y * cosv + oy;
+  }
+}
+
 // src/layout/neato/constraint-adjust.ts
 var AM_ORTHO = 5;
 var AM_ORTHO_YX = 6;
@@ -43597,7 +43697,15 @@ var ADJUST_MODES = /* @__PURE__ */ new Map([
   ["porthoxy", [AM_PORTHOXY, "xy pseudo-orthogonal constraints"]],
   ["porthoyx", [AM_PORTHOYX, "yx pseudo-orthogonal constraints"]]
 ]);
+function warnUnrecognizedOverlap(flag) {
+  if (flag === void 0 || flag === "") return;
+  const s = flag.toLowerCase();
+  if (s.startsWith("prism") || NAMED_MODES.has(s)) return;
+  if (mapBoolDflt(flag, false) === mapBoolDflt(flag, true)) return;
+  console.warn(`Unrecognized overlap value "${flag}" - using false`);
+}
 function getAdjustMode(flag) {
+  warnUnrecognizedOverlap(flag);
   const ntry = overlapPrismTries(flag);
   if (ntry !== null) return { mode: AM_PRISM, print: "prism", value: ntry };
   const named = ADJUST_MODES.get((flag ?? "").toLowerCase());
@@ -43640,13 +43748,17 @@ function adjustVoronoi(g, am) {
 }
 function removeOverlapWith(g, am) {
   if (g.nodes.size < 2) return 0;
-  if (am.mode === AM_NONE) return 0;
-  if (am.mode > AM_SCALE) return adjustLate(g, am);
-  return am.mode === AM_SCALE ? sAdjustGraph(g) : adjustVoronoi(g, am);
+  const nret = normalizeG(g) + simpleScale(g);
+  if (am.mode === AM_NONE) return nret;
+  if (am.mode > AM_SCALE) return nret + adjustLate(g, am);
+  return nret + (am.mode === AM_SCALE ? sAdjustGraph(g) : adjustVoronoi(g, am));
 }
 function adjustNodesFull(g) {
-  const flag = g.attrs.get("overlap") ?? g.root.attrs.get("overlap");
-  return removeOverlapWith(g, getAdjustMode(flag));
+  if (g.nodes.size < 2) return 0;
+  return removeOverlapWith(g, graphAdjustMode(g));
+}
+function graphAdjustMode(g) {
+  return getAdjustMode(g.attrs.get("overlap") ?? g.root.attrs.get("overlap"));
 }
 
 // src/layout/twopi/init.ts
@@ -44013,8 +44125,8 @@ function parseModel(g) {
   if (!s) return MODEL_SHORTPATH2;
   return MODEL_MAP[s] ?? MODEL_SHORTPATH2;
 }
-function maybeRemoveOverlap(g) {
-  adjustNodesFull(g);
+function maybeRemoveOverlap(g, am) {
+  removeOverlapWith(g, am);
 }
 function neatoLayout(g) {
   graphInit(g, false);
@@ -44029,13 +44141,14 @@ function neatoLayout(g) {
     for (const e of g.edges) initEdgeLabels(e, g, measurer);
   }
   const mode = parseMode(g);
+  const am = graphAdjustMode(g);
   const model = parseModel(g);
   const { graphs: comps, pinned } = neatoPack(g, mode) >= 0 ? pccomps(g, "_neato_cc") : { graphs: [g], pinned: false };
   if (comps.length > 1) {
-    layoutComponents(g, comps, mode, model, pinned);
+    layoutComponents(g, comps, { mode, model, am }, pinned);
   } else {
     solveModel2(g, mode, model);
-    maybeRemoveOverlap(g);
+    maybeRemoveOverlap(g, am);
     splineEdgesShifted(g);
   }
   addClusters(g);
@@ -44071,11 +44184,11 @@ function addClusters(g) {
   g.info.clust = clusters;
   g.info.n_cluster = clusters.length;
 }
-function layoutComponents(g, comps, mode, model, pinned) {
+function layoutComponents(g, comps, solve2, pinned) {
   for (const gc of comps) {
     setEdgeTypeFromAttr(gc, EDGETYPE_LINE);
-    solveModel2(gc, mode, model);
-    maybeRemoveOverlap(gc);
+    solveModel2(gc, solve2.mode, solve2.model);
+    maybeRemoveOverlap(gc, solve2.am);
     splineEdgesShifted(gc);
   }
   const pinfo = {
@@ -44778,71 +44891,6 @@ function fdpTLayout(g, xpms) {
   if (reset2) resetParams();
 }
 
-// src/layout/fdp/normalize.ts
-function mapbool5(s) {
-  const t = s.toLowerCase();
-  if (t === "false" || t === "no") return false;
-  if (t === "true" || t === "yes") return true;
-  const v = parseInt(s, 10);
-  return !Number.isNaN(v) && v !== 0;
-}
-function angleSet(g) {
-  const a = aggetGraph(g, "normalize");
-  if (a === void 0 || a === "") return null;
-  const ang = parseAngle2(a);
-  if (ang === null) return null;
-  return wrapDegrees(ang) * (Math.PI / 180);
-}
-function parseAngle2(a) {
-  const m = /^-?[\d.]+(?:[eE][-+]?\d+)?/.exec(a);
-  if (m !== null) return parseFloat(m[0]);
-  return mapbool5(a) ? 0 : null;
-}
-function wrapDegrees(ang) {
-  while (ang > 180) ang -= 360;
-  while (ang <= -180) ang += 360;
-  return ang;
-}
-function normalizeG(g) {
-  const phi0 = angleSet(g);
-  if (phi0 === null) return;
-  const nodes = [...g.nodes.values()];
-  const first = nodes[0];
-  if (first === void 0) return;
-  const px = first.info.pos[0];
-  const py = first.info.pos[1];
-  for (const v of nodes) {
-    v.info.pos[0] -= px;
-    v.info.pos[1] -= py;
-  }
-  let e = null;
-  for (const v of nodes) {
-    const out = v.outEdges(g);
-    if (out.length > 0) {
-      e = out[0];
-      break;
-    }
-  }
-  if (e === null) return;
-  const phi = phi0 - Math.atan2(
-    e.head.info.pos[1] - e.tail.info.pos[1],
-    e.head.info.pos[0] - e.tail.info.pos[0]
-  );
-  if (phi) rotateAll(nodes, e.tail, phi);
-}
-function rotateAll(nodes, orig, phi) {
-  const ox = orig.info.pos[0];
-  const oy = orig.info.pos[1];
-  const cosv = Math.cos(phi);
-  const sinv = Math.sin(phi);
-  for (const v of nodes) {
-    const x = v.info.pos[0] - ox;
-    const y = v.info.pos[1] - oy;
-    v.info.pos[0] = x * cosv - y * sinv + ox;
-    v.info.pos[1] = x * sinv + y * cosv + oy;
-  }
-}
-
 // src/layout/fdp/xlayout.ts
 var DFLT_OVERLAP = "9:prism";
 var PS2INCH3 = (x) => x / 72;
@@ -45018,7 +45066,9 @@ function fdpXLayout(g, xpms) {
 }
 function removeOverlapAs(g, flag) {
   if (g.nodes.size < 2) return;
+  warnUnrecognizedOverlap(flag);
   normalizeG(g);
+  simpleScale(g);
   const ntry = overlapPrismTries(flag);
   if (ntry !== null) {
     fdpAdjust(g, ntry);
@@ -46167,6 +46217,7 @@ function resolveControl(g) {
   const pad = { x: DFLT_MARGIN / 72, y: DFLT_MARGIN / 72 };
   const overlap5 = aggetGraph(g, "overlap");
   const flag = overlap5 === void 0 ? "prism0" : overlap5;
+  warnUnrecognizedOverlap(flag);
   const ntry = overlapPrismTries(flag);
   if (ntry !== null) {
     ctrl.overlap = ntry;
@@ -55087,16 +55138,9 @@ function collectEdge(acc, e) {
   addLabel(acc, e.attrs.get("headlabel"), lfi);
   addLabel(acc, e.attrs.get("taillabel"), lfi);
 }
-function graphLabelFont(sg) {
-  const get = (k) => sg.attrs.get(k) ?? sg.graphDefaultsSnapshot?.get(k);
-  return {
-    fontname: get("fontname") ?? DEFAULT_FONTNAME,
-    fontsize: parseFloat(get("fontsize") ?? "") || DEFAULT_FONTSIZE2
-  };
-}
 function collectGraphLabels(acc, sg, root) {
   if (isACluster(sg)) {
-    addLabel(acc, sg.attrs.get("label") ?? sg.graphDefaultsSnapshot?.get("label"), graphLabelFont(sg));
+    addLabel(acc, sg.attrs.get("label") ?? sg.graphDefaultsSnapshot?.get("label"), readFontParams(sg));
   }
   for (const child of sg.subgraphs.values()) collectGraphLabels(acc, child, root);
 }
@@ -55156,13 +55200,6 @@ async function loadFonts(fontSet, fonts, timeoutMs) {
 
 // src/async/render-async.ts
 var DEFAULT_FONT_TIMEOUT_MS = 3e3;
-function checkRenderArgs2(g, format, opts) {
-  if (typeof g !== "object" || g === null) throw invalidArgType("g", "object", g);
-  if (typeof format !== "string") throw invalidArgType("format", "string", format);
-  if (opts !== void 0 && (typeof opts !== "object" || opts === null)) {
-    throw invalidArgType("opts", "object or undefined", opts);
-  }
-}
 function defaultFontSet() {
   const doc = Reflect.get(globalThis, "document");
   if (typeof doc !== "object" || doc === null) return void 0;
@@ -55198,7 +55235,7 @@ async function prefetchAll(g, opts) {
   return { fontIssues, sizes, bytes };
 }
 async function renderAsync(g, format, opts) {
-  checkRenderArgs2(g, format, opts);
+  checkRenderArgs(g, format, opts);
   const engine = opts?.engine ?? "dot";
   try {
     const { fontIssues, sizes, bytes } = await prefetchAll(g, opts);