@diagrammo/dgmo 0.93.0 → 0.95.0

package/dist/{chunk-TNV4F5WA.js → chunk-7IALGIOI.js}

@@ -1,11 +1,11 @@
 import {
   searchPlacement
-} from "./chunk-LDDDKWL6.js";
+} from "./chunk-2J2CWWWK.js";
 import {
   buildPlacedNotes,
   noteCanvasShift,
   resolveNotes
-} from "./chunk-NJJCTEBM.js";
+} from "./chunk-KLBTJEIK.js";
 import {
   measureText
 } from "./chunk-KAO7JL4I.js";

package/dist/{chunk-MB2SQF7N.js → chunk-7WEYXYLC.js}

@@ -1,6 +1,6 @@
 import {
   stripInlineMarkdown
-} from "./chunk-65GPEV5V.js";
+} from "./chunk-QKPOIJBT.js";
 
 // src/utils/wrapped-desc.ts
 var BULLET_PREFIX = "\u2022 ";

package/dist/{chunk-4RY5D5RE.js → chunk-AM42TLSZ.js}

@@ -620,6 +620,88 @@ function layoutEdgeLabels(args) {
   return chosen;
 }
 
+// src/map/dot-labels.ts
+var DOT_LABEL_GAP = 3;
+function dotLabelRect(dot, w, h, side) {
+  const GAP2 = DOT_LABEL_GAP;
+  switch (side) {
+    case "right":
+      return { x: dot.cx + dot.r + GAP2, y: dot.cy - h / 2, w, h };
+    case "left":
+      return { x: dot.cx - dot.r - GAP2 - w, y: dot.cy - h / 2, w, h };
+    case "above":
+      return { x: dot.cx - w / 2, y: dot.cy - dot.r - GAP2 - h, w, h };
+    case "below":
+      return { x: dot.cx - w / 2, y: dot.cy + dot.r + GAP2, w, h };
+    // Diagonal corners: offset both axes by (r+GAP)/√2 so the box's near
+    // corner clears the dot rim by the same gap as a cardinal side.
+    case "below-right": {
+      const d = (dot.r + GAP2) * 0.7071;
+      return { x: dot.cx + d, y: dot.cy + d, w, h };
+    }
+    case "below-left": {
+      const d = (dot.r + GAP2) * 0.7071;
+      return { x: dot.cx - d - w, y: dot.cy + d, w, h };
+    }
+    case "above-right": {
+      const d = (dot.r + GAP2) * 0.7071;
+      return { x: dot.cx + d, y: dot.cy - d - h, w, h };
+    }
+    case "above-left": {
+      const d = (dot.r + GAP2) * 0.7071;
+      return { x: dot.cx - d - w, y: dot.cy - d - h, w, h };
+    }
+  }
+}
+function dotLabelFits(rect, width, height, collides) {
+  return rect.x >= 0 && rect.x + rect.w <= width && rect.y >= 0 && rect.y + rect.h <= height && !collides(rect);
+}
+var CLEAR_CAP = 48;
+var CLEAR_W = 8;
+var WATER_W = 0.25;
+var LEGIBILITY = {
+  right: 160,
+  left: 160,
+  above: 100,
+  below: 100,
+  "below-right": 0,
+  "below-left": 0,
+  "above-right": 0,
+  "above-left": 0
+};
+var ALL_SIDES = Object.keys(LEGIBILITY);
+function ptSegDist(px, py, ax, ay, bx, by) {
+  const dx = bx - ax;
+  const dy = by - ay;
+  const len2 = dx * dx + dy * dy;
+  let t = len2 > 0 ? ((px - ax) * dx + (py - ay) * dy) / len2 : 0;
+  t = Math.max(0, Math.min(1, t));
+  return Math.hypot(px - (ax + t * dx), py - (ay + t * dy));
+}
+function clearanceOf(rect, ownId, dots, segments) {
+  const cxL = rect.x + rect.w / 2;
+  const cyL = rect.y + rect.h / 2;
+  let d = CLEAR_CAP;
+  for (const q of dots) {
+    if (q.id === ownId) continue;
+    d = Math.min(d, Math.hypot(q.cx - cxL, q.cy - cyL) - q.r);
+  }
+  for (const s of segments)
+    d = Math.min(d, ptSegDist(cxL, cyL, s[0], s[1], s[2], s[3]));
+  return Math.max(0, d);
+}
+function placeDotLabel(args) {
+  const { dot, w, h, width, height, collides, dots, segments, openness } = args;
+  let best = null;
+  for (const side of ALL_SIDES) {
+    const rect = dotLabelRect(dot, w, h, side);
+    if (!dotLabelFits(rect, width, height, collides)) continue;
+    const v = CLEAR_W * clearanceOf(rect, dot.id, dots, segments) + WATER_W * openness(rect) + LEGIBILITY[side];
+    if (best === null || v > best.v) best = { side, rect, v };
+  }
+  return best && { side: best.side, rect: best.rect };
+}
+
 // src/map/connectors.ts
 var W_MIN = 1.25;
 var W_MAX = 8;
@@ -2920,7 +3002,7 @@ function layoutMap(resolvedIn, data, size, opts) {
       const text = labelText(p);
       return { text, w: measureLegendText(text, FONT2) };
     };
-    const GAP2 = 3;
+    const GAP2 = DOT_LABEL_GAP;
     const POI_EDGE_CLEAR = Math.max(
       20,
       Math.round(Math.min(width, height) * 0.03)
@@ -2932,46 +3014,7 @@ function layoutMap(resolvedIn, data, size, opts) {
       if (arr) arr.push(p);
       else clusterMembersById.set(p.clusterId, [p]);
     }
-    const inlineRect = (p, w, side) => {
-      switch (side) {
-        case "right":
-          return { x: p.cx + p.r + GAP2, y: p.cy - poiLabH / 2, w, h: poiLabH };
-        case "left":
-          return {
-            x: p.cx - p.r - GAP2 - w,
-            y: p.cy - poiLabH / 2,
-            w,
-            h: poiLabH
-          };
-        case "above":
-          return {
-            x: p.cx - w / 2,
-            y: p.cy - p.r - GAP2 - poiLabH,
-            w,
-            h: poiLabH
-          };
-        case "below":
-          return { x: p.cx - w / 2, y: p.cy + p.r + GAP2, w, h: poiLabH };
-        // Diagonal corners: offset both axes by (r+GAP)/√2 so the box's near
-        // corner clears the dot rim by the same gap as a cardinal side.
-        case "below-right": {
-          const d = (p.r + GAP2) * 0.7071;
-          return { x: p.cx + d, y: p.cy + d, w, h: poiLabH };
-        }
-        case "below-left": {
-          const d = (p.r + GAP2) * 0.7071;
-          return { x: p.cx - d - w, y: p.cy + d, w, h: poiLabH };
-        }
-        case "above-right": {
-          const d = (p.r + GAP2) * 0.7071;
-          return { x: p.cx + d, y: p.cy - d - poiLabH, w, h: poiLabH };
-        }
-        case "above-left": {
-          const d = (p.r + GAP2) * 0.7071;
-          return { x: p.cx - d - w, y: p.cy - d - poiLabH, w, h: poiLabH };
-        }
-      }
-    };
+    const inlineRect = (p, w, side) => dotLabelRect(p, w, poiLabH, side);
     const pushInline = (p, text, w, side, clusterId) => {
       const rect = inlineRect(p, w, side);
       obstacles.push(rect);
@@ -2992,10 +3035,6 @@ function layoutMap(resolvedIn, data, size, opts) {
         ...clusterId !== void 0 && { clusterMember: clusterId }
       });
     };
-    const inlineFits = (p, w, side) => {
-      const rect = inlineRect(p, w, side);
-      return rect.x >= 0 && rect.x + rect.w <= width && rect.y >= 0 && rect.y + rect.h <= height && !collides(rect);
-    };
     const GROUP_R = 30;
     const groups2 = [];
     for (const p of ordered) {
@@ -3135,7 +3174,7 @@ function layoutMap(resolvedIn, data, size, opts) {
         ];
         const side = order.find((s) => {
           const rect = inlineRect(p, w, s);
-          return rect.x >= 0 && rect.x + rect.w <= width && rect.y >= 0 && rect.y + rect.h <= height && !collides(rect) && !temp.some((t) => rectsOverlap(t, rect));
+          return dotLabelFits(rect, width, height, collides) && !temp.some((t) => rectsOverlap(t, rect));
         });
         if (side === void 0) return false;
         temp.push(inlineRect(p, w, side));
@@ -3154,62 +3193,28 @@ function layoutMap(resolvedIn, data, size, opts) {
       const side = cleanR && cleanL ? defaultColumnSide(items) : cleanR ? "right" : cleanL ? "left" : defaultColumnSide(items);
       commitColumn(items, side, clusterId);
     }
-    const CLEAR_CAP = 48;
-    const CLEAR_W = 8;
-    const WATER_W = 0.25;
-    const ptSegDist = (px, py, ax, ay, bx, by) => {
-      const dx = bx - ax;
-      const dy = by - ay;
-      const len2 = dx * dx + dy * dy;
-      let t = len2 > 0 ? ((px - ax) * dx + (py - ay) * dy) / len2 : 0;
-      t = Math.max(0, Math.min(1, t));
-      return Math.hypot(px - (ax + t * dx), py - (ay + t * dy));
-    };
-    const clearanceOf = (rect, ownId) => {
-      const cxL = rect.x + rect.w / 2;
-      const cyL = rect.y + rect.h / 2;
-      let d = CLEAR_CAP;
-      for (const q of pois) {
-        if (q.id === ownId) continue;
-        d = Math.min(d, Math.hypot(q.cx - cxL, q.cy - cyL) - q.r);
-      }
-      for (const s of legSegments)
-        d = Math.min(d, ptSegDist(cxL, cyL, s[0], s[1], s[2], s[3]));
-      return Math.max(0, d);
-    };
-    const LEGIBILITY = {
-      right: 160,
-      left: 160,
-      above: 100,
-      below: 100,
-      "below-right": 0,
-      "below-left": 0,
-      "above-right": 0,
-      "above-left": 0
-    };
-    const ALL_SIDES = Object.keys(LEGIBILITY);
-    const placementScore = (p, w, side) => {
-      const rect = inlineRect(p, w, side);
-      return CLEAR_W * clearanceOf(rect, p.id) + WATER_W * openness(rect) + LEGIBILITY[side];
-    };
     const maxExtent = MAX_CLUSTER_EXTENT_FACTOR * Math.min(width, height);
     const clusterPending = [];
     for (const g of groups2) {
       const items = makeItems(g);
       if (g.length === 1) {
         const { p, text, w } = items[0];
-        const scored = ALL_SIDES.filter((s) => inlineFits(p, w, s)).map(
-          (s) => ({
-            s,
-            v: placementScore(p, w, s)
-          })
-        );
-        if (scored.length === 0) {
+        const placed = placeDotLabel({
+          dot: p,
+          w,
+          h: poiLabH,
+          width,
+          height,
+          collides,
+          dots: pois,
+          segments: legSegments,
+          openness
+        });
+        if (placed === null) {
           commitColumn(items, defaultColumnSide(items));
           continue;
         }
-        const side = scored.reduce((b, c) => c.v > b.v ? c : b).s;
-        pushInline(p, text, w, side);
+        pushInline(p, text, w, placed.side);
         continue;
       }
       const left = Math.min(...items.map((o) => o.p.cx - o.p.r));

package/dist/{chunk-J43OCO22.js → chunk-BCV2VJTM.js}

@@ -1,11 +1,11 @@
 import {
   searchPlacement
-} from "./chunk-LDDDKWL6.js";
+} from "./chunk-2J2CWWWK.js";
 import {
   buildPlacedNotes,
   noteCanvasShift,
   resolveNotes
-} from "./chunk-NJJCTEBM.js";
+} from "./chunk-KLBTJEIK.js";
 import {
   measureText
 } from "./chunk-KAO7JL4I.js";

package/dist/{chunk-7OWK5K5C.js → chunk-BH2SF4TT.js}

@@ -8,10 +8,10 @@ import {
 } from "./chunk-VLC6WNRD.js";
 import {
   wrapDescriptionLines
-} from "./chunk-MB2SQF7N.js";
+} from "./chunk-7WEYXYLC.js";
 import {
   renderInlineText
-} from "./chunk-65GPEV5V.js";
+} from "./chunk-QKPOIJBT.js";
 import {
   FONT_FAMILY
 } from "./chunk-ICLB27PZ.js";

package/dist/{chunk-UVX3IYXF.js → chunk-BTP2BMWN.js}

@@ -15,16 +15,16 @@ import {
 } from "./chunk-CDM6XMOT.js";
 import {
   looksLikeFlowchart
-} from "./chunk-M6ZQAFPD.js";
+} from "./chunk-IY62DXT2.js";
 import {
   looksLikeState
-} from "./chunk-M4NV5PPU.js";
+} from "./chunk-LJGE43SG.js";
 import {
   looksLikeERDiagram
-} from "./chunk-Q7Y6JQ3R.js";
+} from "./chunk-S4SJ4LLY.js";
 import {
   looksLikeClassDiagram
-} from "./chunk-KCMGIYPO.js";
+} from "./chunk-5XBYLYYI.js";
 import {
   parseFirstLine
 } from "./chunk-TIIZIAGS.js";

package/dist/{chunk-MUJVNSEW.js → chunk-C6G36F5S.js}

@@ -7,7 +7,7 @@ import {
 } from "./chunk-2CW5ZTNH.js";
 import {
   layoutInlineHeader
-} from "./chunk-42UJ23H3.js";
+} from "./chunk-UIEKW4SG.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,