@knowvah/dot-engine 2.0.0 → 2.0.1

package/dist/layout/fdp/normalize.d.ts

@@ -12,7 +12,8 @@ import type { Graph } from '../../model/graph.js';
 /**
  * If "normalize" is set, move the first node to the origin, then
  * rotate the layout so the first edge sits at the given angle.
+ * Returns 1 if nodes moved, else 0.
  * @see lib/neatogen/adjust.c:normalize (15.0.0)
  */
-export declare function normalizeG(g: Graph): void;
+export declare function normalizeG(g: Graph): number;
 //# sourceMappingURL=normalize.d.ts.map

package/dist/layout/fdp/normalize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../src/layout/fdp/normalize.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAyClD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,GAAG,IAAI,CA0BzC"}
+{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../src/layout/fdp/normalize.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAyClD;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM,CA6B3C"}

package/dist/layout/fdp/xlayout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xlayout.d.ts","sourceRoot":"","sources":["../../../src/layout/fdp/xlayout.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAKlD,OAAO,EACL,KAAK,OAAO,EAKb,MAAM,gBAAgB,CAAC;AAsQxB;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI,CAMxD"}
+{"version":3,"file":"xlayout.d.ts","sourceRoot":"","sources":["../../../src/layout/fdp/xlayout.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAKlD,OAAO,EACL,KAAK,OAAO,EAKb,MAAM,gBAAgB,CAAC;AAuQxB;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI,CAMxD"}

package/dist/layout/neato/fdp-adjust.d.ts

@@ -46,8 +46,8 @@ export interface AdjustData {
 export declare function getAdjustMode(flag: string | undefined): AdjustData;
 /**
  * Use `am` to decide if and how to remove node overlaps. normalize and
- * simpleScale (only active with the `normalize`/`scale` attributes) are not
- * ported (see sc-adjust module doc).
+ * simpleScale run first, whatever the mode (the `normalize` / `scale`
+ * attributes); returns non-zero if nodes moved.
  * @see lib/neatogen/adjust.c:removeOverlapWith
  */
 export declare function removeOverlapWith(g: Graph, am: AdjustData): number;

package/dist/layout/neato/fdp-adjust.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fdp-adjust.d.ts","sourceRoot":"","sources":["../../../src/layout/neato/fdp-adjust.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AA2ClD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAUzE;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAgCtD;AAED;wCACwC;AACxC,eAAO,MAAM,OAAO,IAAI,CAAC;AACzB,eAAO,MAAM,MAAM,IAAI,CAAC;AACxB,eAAO,MAAM,QAAQ,IAAI,CAAC;AAC1B,eAAO,MAAM,SAAS,IAAI,CAAC;AAC3B,eAAO,MAAM,UAAU,IAAI,CAAC;AAC5B,eAAO,MAAM,WAAW,KAAK,CAAC;AAC9B,eAAO,MAAM,OAAO,KAAK,CAAC;AAC1B,eAAO,MAAM,QAAQ,KAAK,CAAC;AAC3B,eAAO,MAAM,QAAQ,KAAK,CAAC;AAE3B,kEAAkE;AAClE,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAsBD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAMlE;AA8CD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,GAAG,MAAM,CAKlE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM,CAGhD"}
+{"version":3,"file":"fdp-adjust.d.ts","sourceRoot":"","sources":["../../../src/layout/neato/fdp-adjust.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AA6ClD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAUzE;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAgCtD;AAED;wCACwC;AACxC,eAAO,MAAM,OAAO,IAAI,CAAC;AACzB,eAAO,MAAM,MAAM,IAAI,CAAC;AACxB,eAAO,MAAM,QAAQ,IAAI,CAAC;AAC1B,eAAO,MAAM,SAAS,IAAI,CAAC;AAC3B,eAAO,MAAM,UAAU,IAAI,CAAC;AAC5B,eAAO,MAAM,WAAW,KAAK,CAAC;AAC9B,eAAO,MAAM,OAAO,KAAK,CAAC;AAC1B,eAAO,MAAM,QAAQ,KAAK,CAAC;AAC3B,eAAO,MAAM,QAAQ,KAAK,CAAC;AAE3B,kEAAkE;AAClE,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAsBD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAMlE;AA8CD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,GAAG,MAAM,CAMlE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM,CAGhD"}

package/dist/layout/neato/sc-adjust.d.ts

@@ -9,9 +9,8 @@
  * Using Constrained Optimization", Constraints 8(2):143-172, 2003 (per the
  * C source comment).
  *
- * Other overlap modes (voronoi, prism, vpsc, ortho*) remain unported; with
- * the attr unset C's getAdjustMode resolves to AM_NONE and the pass is a
- * no-op (normalize/simpleScale only fire on rare attrs, also unported).
+ * Dispatched from removeOverlapWith (fdp-adjust.ts) for overlap=scale,
+ * scalexy and compress.
  *
  * @see lib/neatogen/constraint.c:scAdjust
  * @see lib/neatogen/adjust.c:removeOverlapWith / getAdjustMode
@@ -24,10 +23,4 @@ import type { Graph } from '../../model/graph.js';
  * @see lib/neatogen/constraint.c:767 scAdjust
  */
 export declare function scAdjust(g: Graph, equal: number): number;
-/**
- * The adjustNodes overlap-mode subset reaching scAdjust; other modes are
- * no-ops (see module doc).
- * @see lib/neatogen/adjust.c:999 adjustNodes, :776 adjustMode table
- */
-export declare function adjustNodesScale(g: Graph): number;
 //# sourceMappingURL=sc-adjust.d.ts.map

package/dist/layout/neato/sc-adjust.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sc-adjust.d.ts","sourceRoot":"","sources":["../../../src/layout/neato/sc-adjust.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAsHlD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CA8CxD;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM,CAOjD"}
+{"version":3,"file":"sc-adjust.d.ts","sourceRoot":"","sources":["../../../src/layout/neato/sc-adjust.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAsHlD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CA8CxD"}

package/dist/layout/neato/simple-scale.d.ts

@@ -0,0 +1,15 @@
+/**
+ * The `scale` graph attribute: multiply every node position by (sx, sy)
+ * before overlap removal. removeOverlapWith runs it right after normalize,
+ * whatever the overlap mode.
+ *
+ * @see lib/neatogen/adjust.c:simpleScale
+ */
+import type { Graph } from '../../model/graph.js';
+/**
+ * Scale node positions by the `scale` attribute ("s" or "sx,sy"). Returns 1
+ * if nodes moved, else 0 (unset, unparsable, a zero factor, or 1,1).
+ * @see lib/neatogen/adjust.c:simpleScale
+ */
+export declare function simpleScale(g: Graph): number;
+//# sourceMappingURL=simple-scale.d.ts.map

package/dist/layout/neato/simple-scale.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"simple-scale.d.ts","sourceRoot":"","sources":["../../../src/layout/neato/simple-scale.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAuBlD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM,CAe5C"}

package/dist/render.js

@@ -41737,6 +41737,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;
@@ -43640,9 +43736,10 @@ 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");
@@ -44778,71 +44875,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;
@@ -45019,6 +45051,7 @@ function fdpXLayout(g, xpms) {
 function removeOverlapAs(g, flag) {
   if (g.nodes.size < 2) return;
   normalizeG(g);
+  simpleScale(g);
   const ntry = overlapPrismTries(flag);
   if (ntry !== null) {
     fdpAdjust(g, ntry);