@knowvah/dot-engine 2.6.1 → 2.6.2

package/dist/layout/pack/poly-place.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"poly-place.d.ts","sourceRoot":"","sources":["../../../src/layout/pack/poly-place.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAgD3C;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAgB9D;AAgRD;;;;;GAKG;AACH,wBAAgB,UAAU,CACxB,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GACpD,KAAK,EAAE,GAAG,IAAI,CAkEhB"}
+{"version":3,"file":"poly-place.d.ts","sourceRoot":"","sources":["../../../src/layout/pack/poly-place.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAgC3C;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAgB9D;AA2RD;;;;;GAKG;AACH,wBAAgB,UAAU,CACxB,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GACpD,KAAK,EAAE,GAAG,IAAI,CAkEhB"}

package/dist/render.js

@@ -34092,6 +34092,57 @@ function polyRects(ng, bbs, pinfo) {
   return places;
 }
 
+// src/common/pointset.ts
+function cmpPair(a, b) {
+  if (a.x > b.x) return 1;
+  if (a.x < b.x) return -1;
+  if (a.y > b.y) return 1;
+  if (a.y < b.y) return -1;
+  return 0;
+}
+var PointSet = class {
+  byX = /* @__PURE__ */ new Map();
+  n = 0;
+  /**
+   * Insert (x, y). A duplicate keeps the point inserted first, as `dtinsert`
+   * returns the existing object and the new one is freed.
+   * @see lib/common/pointset.c:addPS
+   */
+  addPS(x, y) {
+    let col = this.byX.get(x);
+    if (col === void 0) {
+      col = /* @__PURE__ */ new Map();
+      this.byX.set(x, col);
+    }
+    if (col.has(y)) return;
+    col.set(y, { x, y });
+    this.n++;
+  }
+  /** @see lib/common/pointset.c:inPS */
+  inPS(pt) {
+    return this.byX.get(pt.x)?.has(pt.y) ?? false;
+  }
+  /** @see lib/common/pointset.c:isInPS */
+  isInPS(x, y) {
+    return this.byX.get(x)?.has(y) ?? false;
+  }
+  /** @see lib/common/pointset.c:sizeOf */
+  sizeOf() {
+    return this.n;
+  }
+  /**
+   * The points in dictionary order (`dtflatten` walks the ordered set).
+   * @see lib/common/pointset.c:pointsOf
+   */
+  pointsOf() {
+    const pts = [];
+    for (const col of this.byX.values()) {
+      for (const p of col.values()) pts.push({ x: p.x, y: p.y });
+    }
+    return pts.sort(cmpPair);
+  }
+};
+
 // src/layout/pack/poly-place.ts
 var C_AVG = 100;
 function grid(x, s) {
@@ -34103,21 +34154,6 @@ function cval2(v, s) {
 function cell(p, s) {
   return { x: cval2(p.x, s), y: cval2(p.y, s) };
 }
-var PointSet = class {
-  m = /* @__PURE__ */ new Map();
-  add(x, y) {
-    this.m.set(`${x},${y}`, { x, y });
-  }
-  has(p) {
-    return this.m.has(`${p.x},${p.y}`);
-  }
-  points() {
-    return [...this.m.values()];
-  }
-  get size() {
-    return this.m.size;
-  }
-};
 function computeStep2(bbs, margin) {
   const a = C_AVG * bbs.length - 1;
   let b = 0;
@@ -34135,7 +34171,7 @@ function computeStep2(bbs, margin) {
 function lineXDominant(st, ps) {
   let d = st.ay - (st.ax >> 1);
   for (; ; ) {
-    ps.add(st.x, st.y);
+    ps.addPS(st.x, st.y);
     if (st.x === st.x2) return;
     if (d >= 0) {
       st.y += st.sy;
@@ -34148,7 +34184,7 @@ function lineXDominant(st, ps) {
 function lineYDominant(st, ps) {
   let d = st.ax - (st.ay >> 1);
   for (; ; ) {
-    ps.add(st.x, st.y);
+    ps.addPS(st.x, st.y);
     if (st.y === st.y2) return;
     if (d >= 0) {
       st.x += st.sx;
@@ -34180,7 +34216,7 @@ function fillLine(p, q, ps) {
 }
 function fillRect(LL, UR, ps) {
   for (let x = LL.x; x <= UR.x; x++) {
-    for (let y = LL.y; y <= UR.y; y++) ps.add(x, y);
+    for (let y = LL.y; y <= UR.y; y++) ps.addPS(x, y);
   }
 }
 function roundedCell(p, ssize) {
@@ -34232,7 +34268,7 @@ function genBox3(bb0, ssize, margin, center) {
   const UR = roundedCell({ x: center.x + bbW + margin, y: center.y + bbH + margin }, ssize);
   fillRect(LL, UR, ps);
   return {
-    cells: ps.points(),
+    cells: ps.pointsOf(),
     perim: grid(bb0.ur.x - bb0.ll.x + 2 * margin, ssize) + grid(bb0.ur.y - bb0.ll.y + 2 * margin, ssize),
     index: 0
   };
@@ -34264,42 +34300,38 @@ function genPoly(root, g, bb, ssize, pinfo, center) {
   };
   for (const n of g.nodes.values()) coverNode(n, ctx);
   return {
-    cells: ps.points(),
+    cells: ps.pointsOf(),
     perim: grid(bb.ur.x - bb.ll.x + 2 * pinfo.margin, ssize) + grid(bb.ur.y - bb.ll.y + 2 * pinfo.margin, ssize),
     index: 0
   };
 }
 function fits2(x, y, info, ctx) {
   for (const c of info.cells) {
-    if (ctx.ps.has({ x: c.x + x, y: c.y + y })) return false;
+    if (ctx.ps.isInPS(c.x + x, c.y + y)) return false;
   }
   const bb = ctx.bbs[info.index];
   const LL = { x: cround(bb.ll.x), y: cround(bb.ll.y) };
   ctx.places[info.index] = { x: Math.imul(ctx.step, x) - LL.x, y: Math.imul(ctx.step, y) - LL.y };
-  for (const c of info.cells) ctx.ps.add(c.x + x, c.y + y);
+  for (const c of info.cells) ctx.ps.addPS(c.x + x, c.y + y);
   return true;
 }
-function* ringWide(bnd) {
-  let x = 0;
-  let y = -bnd;
-  for (; x < bnd; x++) yield [x, y];
-  for (; y < bnd; y++) yield [x, y];
-  for (; x > -bnd; x--) yield [x, y];
-  for (; y > -bnd; y--) yield [x, y];
-  for (; x < 0; x++) yield [x, y];
-}
-function* ringTall(bnd) {
-  let y = 0;
-  let x = -bnd;
-  for (; y > -bnd; y--) yield [x, y];
-  for (; x < bnd; x++) yield [x, y];
-  for (; y < bnd; y++) yield [x, y];
-  for (; x > -bnd; x--) yield [x, y];
-  for (; y > 0; y--) yield [x, y];
+function leg(c, dx, dy, end, info, ctx) {
+  for (; (dx !== 0 ? c.x : c.y) !== end; c.x += dx, c.y += dy) {
+    if (fits2(c.x, c.y, info, ctx)) return true;
+  }
+  return false;
+}
+function ringWide(bnd, info, ctx) {
+  const c = { x: 0, y: -bnd };
+  return leg(c, 1, 0, bnd, info, ctx) || leg(c, 0, 1, bnd, info, ctx) || leg(c, -1, 0, -bnd, info, ctx) || leg(c, 0, -1, -bnd, info, ctx) || leg(c, 1, 0, 0, info, ctx);
+}
+function ringTall(bnd, info, ctx) {
+  const c = { x: -bnd, y: 0 };
+  return leg(c, 0, -1, -bnd, info, ctx) || leg(c, 1, 0, bnd, info, ctx) || leg(c, 0, 1, bnd, info, ctx) || leg(c, -1, 0, -bnd, info, ctx) || leg(c, 0, -1, 0, info, ctx);
 }
 function placeFixed(info, ctx, center) {
   ctx.places[info.index] = { x: -center.x, y: -center.y };
-  for (const c of info.cells) ctx.ps.add(c.x, c.y);
+  for (const c of info.cells) ctx.ps.addPS(c.x, c.y);
 }
 function placeGraph2(i, info, ctx) {
   const bb = ctx.bbs[info.index];
@@ -34311,10 +34343,7 @@ function placeGraph2(i, info, ctx) {
   if (fits2(0, 0, info, ctx)) return;
   const wide = Math.ceil(bb.ur.x - bb.ll.x) >= Math.ceil(bb.ur.y - bb.ll.y);
   for (let bnd = 1; ; bnd++) {
-    const ring = wide ? ringWide(bnd) : ringTall(bnd);
-    for (const [x, y] of ring) {
-      if (fits2(x, y, info, ctx)) return;
-    }
+    if (wide ? ringWide(bnd, info, ctx) : ringTall(bnd, info, ctx)) return;
   }
 }
 function polyGraphs(gs, root, pinfo, bbs) {