@diagrammo/dgmo 0.84.0 → 0.86.0

package/dist/{chunk-Y7FTHOMD.js → chunk-LIYWJ6DV.js}

@@ -1,7 +1,9 @@
 import {
+  LABEL_REACH_WIDE,
   NODE_HEIGHT,
-  NODE_WIDTH
-} from "./chunk-WTTIODDV.js";
+  NODE_WIDTH,
+  placeEdgeLabels
+} from "./chunk-TW6WMZFW.js";
 import {
   buildPlacedNotes
 } from "./chunk-HBCAY3KR.js";
@@ -10,222 +12,12 @@ import {
 } from "./chunk-6EK55ART.js";
 import {
   measureText,
-  truncateText,
   wrapTextToWidth
 } from "./chunk-KAO7JL4I.js";
 import {
   resolveNotes
 } from "./chunk-O753JUEZ.js";
 
-// src/boxes-and-lines/label-placement.ts
-var EDGE_LABEL_FONT_SIZE = 11;
-var LABEL_MAX_WIDTH = 160;
-var MAX_LABEL_LINES = 3;
-var LABEL_LINE_HEIGHT = 1.3;
-var H_PAD = 6;
-var V_PAD = 3;
-var BOX_CLEAR_PAD = 4;
-var PERP_STEP = 8;
-var PERP_MAX = 40;
-var SLIDE_SAMPLES = 9;
-function measureEdgeLabel(label, fontSize = EDGE_LABEL_FONT_SIZE, maxWidth = LABEL_MAX_WIDTH) {
-  let lines = wrapTextToWidth(label, fontSize, maxWidth, { hardBreak: true });
-  if (lines.length > MAX_LABEL_LINES) {
-    const kept = lines.slice(0, MAX_LABEL_LINES - 1);
-    const rest = lines.slice(MAX_LABEL_LINES - 1).join(" ");
-    kept.push(truncateText(rest, fontSize, maxWidth));
-    lines = kept;
-  }
-  let textW = 0;
-  for (const ln of lines) {
-    const w = measureText(ln, fontSize);
-    if (w > textW) textW = w;
-  }
-  return {
-    lines,
-    width: textW + 2 * H_PAD,
-    height: lines.length * fontSize * LABEL_LINE_HEIGHT + 2 * V_PAD
-  };
-}
-function edgePolylineMidpoint(points) {
-  return pointAtArcFraction(points, 0.5).p;
-}
-function pointAtArcFraction(points, t) {
-  if (points.length === 0) return { p: { x: 0, y: 0 }, nx: 0, ny: 1 };
-  if (points.length === 1)
-    return { p: { x: points[0].x, y: points[0].y }, nx: 0, ny: 1 };
-  const segLen = [];
-  let total = 0;
-  for (let k = 1; k < points.length; k++) {
-    const len = Math.hypot(
-      points[k].x - points[k - 1].x,
-      points[k].y - points[k - 1].y
-    );
-    segLen.push(len);
-    total += len;
-  }
-  let want = total * Math.max(0, Math.min(1, t));
-  for (let k = 1; k < points.length; k++) {
-    const len = segLen[k - 1];
-    if (want <= len || k === points.length - 1) {
-      const f = len === 0 ? 0 : Math.min(1, want / len);
-      const ax = points[k - 1].x;
-      const ay = points[k - 1].y;
-      const bx = points[k].x;
-      const by = points[k].y;
-      const dx = bx - ax;
-      const dy = by - ay;
-      const dlen = Math.hypot(dx, dy) || 1;
-      return {
-        p: { x: ax + dx * f, y: ay + dy * f },
-        nx: -dy / dlen,
-        ny: dx / dlen
-      };
-    }
-    want -= len;
-  }
-  const last = points[points.length - 1];
-  return { p: { x: last.x, y: last.y }, nx: 0, ny: 1 };
-}
-function rectFromCenter(cx, cy, w, h) {
-  return {
-    minX: cx - w / 2,
-    minY: cy - h / 2,
-    maxX: cx + w / 2,
-    maxY: cy + h / 2
-  };
-}
-function overlapsAny(cx, cy, w, h, obstacles, pad) {
-  const minX = cx - w / 2 - pad;
-  const minY = cy - h / 2 - pad;
-  const maxX = cx + w / 2 + pad;
-  const maxY = cy + h / 2 + pad;
-  for (const o of obstacles) {
-    if (minX < o.maxX && maxX > o.minX && minY < o.maxY && maxY > o.minY)
-      return true;
-  }
-  return false;
-}
-function slideFractions() {
-  const out = [0.5];
-  for (let k = 1; k <= SLIDE_SAMPLES; k++) {
-    const off = k * 0.08;
-    if (0.5 - off >= 0.12) out.push(0.5 - off);
-    if (0.5 + off <= 0.88) out.push(0.5 + off);
-  }
-  return out;
-}
-function findClearPosition(w, h, points, obstacles) {
-  const ts = slideFractions();
-  for (const t of ts) {
-    const { p } = pointAtArcFraction(points, t);
-    if (!overlapsAny(p.x, p.y, w, h, obstacles, BOX_CLEAR_PAD)) return p;
-  }
-  for (let mag = PERP_STEP; mag <= PERP_MAX; mag += PERP_STEP) {
-    for (const t of ts) {
-      const { p, nx, ny } = pointAtArcFraction(points, t);
-      for (const sign of [-1, 1]) {
-        const x = p.x + nx * mag * sign;
-        const y = p.y + ny * mag * sign;
-        if (!overlapsAny(x, y, w, h, obstacles, BOX_CLEAR_PAD)) return { x, y };
-      }
-    }
-  }
-  return null;
-}
-function resolveLabelOverlaps(boxes) {
-  const MAX_PASSES = 8;
-  const PAD = 4;
-  for (let pass = 0; pass < MAX_PASSES; pass++) {
-    let moved = false;
-    for (let i = 0; i < boxes.length; i++) {
-      for (let j = i + 1; j < boxes.length; j++) {
-        const a = boxes[i];
-        const b = boxes[j];
-        const dx = Math.abs(a.cx - b.cx);
-        const dy = Math.abs(a.cy - b.cy);
-        const overlapX = (a.w + b.w) / 2 + PAD - dx;
-        const overlapY = (a.h + b.h) / 2 + PAD - dy;
-        if (overlapX > 0 && overlapY > 0) {
-          const shift = overlapY / 2 + 1;
-          if (a.cy < b.cy) {
-            a.cy -= shift;
-            b.cy += shift;
-          } else {
-            a.cy += shift;
-            b.cy -= shift;
-          }
-          moved = true;
-        }
-      }
-    }
-    if (!moved) break;
-  }
-}
-function placeEdgeLabels(layout, opts) {
-  const fontSize = opts?.fontSize ?? EDGE_LABEL_FONT_SIZE;
-  const maxWidth = opts?.maxWidth ?? LABEL_MAX_WIDTH;
-  const obstacles = [];
-  for (const n of layout.nodes)
-    obstacles.push(rectFromCenter(n.x, n.y, n.width, n.height));
-  for (const g of layout.groups)
-    if (g.collapsed)
-      obstacles.push(rectFromCenter(g.x, g.y, g.width, g.height));
-  const boxes = [];
-  layout.edges.forEach((e, idx) => {
-    if (!e.label || e.points.length < 2) return;
-    const m = measureEdgeLabel(e.label, fontSize, maxWidth);
-    const mid = edgePolylineMidpoint(e.points);
-    let cy = mid.y;
-    if (e.parallelCount > 1 && e.yOffset !== 0)
-      cy += (e.yOffset < 0 ? -1 : 1) * (m.height / 2);
-    boxes.push({
-      edgeIdx: idx,
-      cx: mid.x,
-      cy,
-      w: m.width,
-      h: m.height,
-      lines: m.lines,
-      resolved: true
-    });
-  });
-  for (const box of boxes) {
-    if (!overlapsAny(box.cx, box.cy, box.w, box.h, obstacles, BOX_CLEAR_PAD))
-      continue;
-    const e = layout.edges[box.edgeIdx];
-    const clear = findClearPosition(box.w, box.h, e.points, obstacles);
-    if (clear) {
-      box.cx = clear.x;
-      box.cy = clear.y;
-    } else {
-      box.resolved = false;
-    }
-  }
-  resolveLabelOverlaps(boxes);
-  for (const box of boxes) {
-    if (overlapsAny(box.cx, box.cy, box.w, box.h, obstacles, BOX_CLEAR_PAD))
-      box.resolved = false;
-  }
-  const boxByIdx = /* @__PURE__ */ new Map();
-  for (const b of boxes) boxByIdx.set(b.edgeIdx, b);
-  const edges = layout.edges.map((e, idx) => {
-    const b = boxByIdx.get(idx);
-    if (!b) return e;
-    return {
-      ...e,
-      labelX: b.cx,
-      labelY: b.cy,
-      labelWidth: b.w,
-      labelHeight: b.h,
-      labelLines: b.lines
-    };
-  });
-  return {
-    layout: { ...layout, edges },
-    unresolved: boxes.filter((b) => !b.resolved).map((b) => b.edgeIdx)
-  };
-}
-
 // src/boxes-and-lines/layout.ts
 var MARGIN = 40;
 var MAX_PARALLEL_EDGES = 5;
@@ -236,8 +28,8 @@ var DESC_LINE_HEIGHT = 1.4;
 var DESC_PADDING = 8;
 var SEPARATOR_GAP = 4;
 var MAX_DESC_LINES = 6;
-var MAX_LABEL_LINES2 = 3;
-var LABEL_LINE_HEIGHT2 = 1.3;
+var MAX_LABEL_LINES = 3;
+var LABEL_LINE_HEIGHT = 1.3;
 var LABEL_PAD = 12;
 var VALUE_ROW_FONT = 11;
 var VALUE_ROW_H = SEPARATOR_GAP + VALUE_ROW_FONT * DESC_LINE_HEIGHT + DESC_PADDING;
@@ -279,9 +71,9 @@ function estimateLabelLines(label, nodeWidth = NODE_WIDTH) {
         current = word;
       }
     }
-    if (lines <= MAX_LABEL_LINES2) return Math.min(lines, MAX_LABEL_LINES2);
+    if (lines <= MAX_LABEL_LINES) return Math.min(lines, MAX_LABEL_LINES);
   }
-  return MAX_LABEL_LINES2;
+  return MAX_LABEL_LINES;
 }
 function computeNodeSize(node, reserveValueRow) {
   if (!node.description || node.description.length === 0) {
@@ -289,7 +81,7 @@ function computeNodeSize(node, reserveValueRow) {
   }
   const w = DESC_NODE_WIDTH;
   const labelLines = estimateLabelLines(node.label, w);
-  const labelHeight = labelLines * 13 * LABEL_LINE_HEIGHT2 + LABEL_PAD;
+  const labelHeight = labelLines * 13 * LABEL_LINE_HEIGHT + LABEL_PAD;
   const maxTextWidth = w - 24;
   let totalRenderedLines = 0;
   for (const line of node.description) {
@@ -312,7 +104,7 @@ function computeNodeSize(node, reserveValueRow) {
   return { width: w, height: Math.max(NODE_HEIGHT, totalHeight) };
 }
 async function layoutBoxesAndLines(parsed, collapseInfo, layoutOptions) {
-  const { layoutBoxesAndLinesSearch } = await import("./layout-search-GRJEBAUF.js");
+  const { layoutBoxesAndLinesSearch } = await import("./layout-search-AW5VBDCV.js");
   const searchOpts = {
     ...layoutOptions?.hideDescriptions !== void 0 && {
       hideDescriptions: layoutOptions.hideDescriptions
@@ -325,6 +117,13 @@ async function layoutBoxesAndLines(parsed, collapseInfo, layoutOptions) {
     },
     ...layoutOptions?.onProgress !== void 0 && {
       onProgress: layoutOptions.onProgress
+    },
+    // Spread into the label-reserving relayout below too, via `...searchOpts`:
+    // that second search has its OWN clock, so a caller that disabled the
+    // deadline must have it disabled for both passes or the fixture that needs
+    // two passes is exactly the one still racing.
+    ...layoutOptions?.budgetMs !== void 0 && {
+      budgetMs: layoutOptions.budgetMs
     }
   };
   let topConfigs;
@@ -334,7 +133,9 @@ async function layoutBoxesAndLines(parsed, collapseInfo, layoutOptions) {
       topConfigs = cfgs;
     }
   });
-  let placed = placeEdgeLabels(applyParallelEdgeOffsets(searched));
+  const labelOpts = { groups: parsed.groups };
+  let chosen = applyParallelEdgeOffsets(searched);
+  let placed = placeEdgeLabels(chosen, labelOpts);
   if (placed.unresolved.length > 0) {
     const relaid = await layoutBoxesAndLinesSearch(parsed, collapseInfo, {
       ...searchOpts,
@@ -344,9 +145,19 @@ async function layoutBoxesAndLines(parsed, collapseInfo, layoutOptions) {
       // first search surfaced no dagre candidates.
       ...topConfigs !== void 0 && topConfigs.length > 0 && { configs: topConfigs }
     });
-    const relaidPlaced = placeEdgeLabels(applyParallelEdgeOffsets(relaid));
-    if (relaidPlaced.unresolved.length < placed.unresolved.length)
+    const relaidChosen = applyParallelEdgeOffsets(relaid);
+    const relaidPlaced = placeEdgeLabels(relaidChosen, labelOpts);
+    if (relaidPlaced.unresolved.length < placed.unresolved.length) {
       placed = relaidPlaced;
+      chosen = relaidChosen;
+    }
+  }
+  if (placed.unresolved.length > 0) {
+    const wide = placeEdgeLabels(chosen, {
+      ...labelOpts,
+      perpMax: LABEL_REACH_WIDE
+    });
+    if (wide.unresolved.length < placed.unresolved.length) placed = wide;
   }
   return attachNotes(placed.layout, parsed, layoutOptions?.collapsedNotes);
 }
@@ -517,8 +328,6 @@ function applyParallelEdgeOffsets(layout) {
 }
 
 export {
-  EDGE_LABEL_FONT_SIZE,
-  measureEdgeLabel,
   computeNodeSize,
   layoutBoxesAndLines
 };

package/dist/{chunk-HATTVAWX.js → chunk-LJFXC3IP.js}

@@ -15,7 +15,7 @@ import {
   META_LINE_HEIGHT,
   NODE_STROKE_WIDTH,
   SEPARATOR_GAP
-} from "./chunk-IIEI7VK5.js";
+} from "./chunk-XCKNFFKM.js";
 import {
   layoutInlineHeader
 } from "./chunk-3DOQOXXI.js";

package/dist/{chunk-KABGWUND.js → chunk-MSXRNVHB.js}

@@ -96,7 +96,7 @@ import {
 } from "./chunk-BAZT6CIF.js";
 import {
   parseDgmoChartType
-} from "./chunk-ECIXBEG2.js";
+} from "./chunk-AQIBKTPG.js";
 import {
   parseRaci
 } from "./chunk-3RYBTEF5.js";
@@ -106,7 +106,7 @@ import {
 } from "./chunk-UNNJCSSQ.js";
 import {
   parseLiveLink
-} from "./chunk-HMWZQ53A.js";
+} from "./chunk-7WGCQE2E.js";
 import {
   makeYearContext,
   parseDateToken,
@@ -114,8 +114,9 @@ import {
   toInternal
 } from "./chunk-DAOFNU6J.js";
 import {
+  SEQUENCE_DIAGNOSTICS,
   parseSequenceDgmo
-} from "./chunk-6EV2F6W7.js";
+} from "./chunk-VPASQOR3.js";
 import {
   parseFlowchart
 } from "./chunk-JRUEIRJB.js";
@@ -1608,6 +1609,7 @@ var REGISTRY = [
   ...PERT_DIAGNOSTICS,
   ...GRAPH_DIAGNOSTICS,
   ...COLOR_DIAGNOSTICS,
+  ...SEQUENCE_DIAGNOSTICS,
   ...SKETCH_DIAGNOSTICS,
   ...FAMILY_DIAGNOSTICS,
   ...ALIAS_DIAGNOSTICS

package/dist/{chunk-2QIGN7KL.js → chunk-MYHPRQHR.js}

@@ -25,9 +25,10 @@ import {
   CARD_RADIUS,
   CONTAINER_RADIUS,
   EDGE_LABEL_KNOCKOUT_OPACITY,
+  EDGE_LABEL_UNRESOLVED_KNOCKOUT_OPACITY,
   EDGE_STROKE_WIDTH,
   NODE_STROKE_WIDTH
-} from "./chunk-IIEI7VK5.js";
+} from "./chunk-XCKNFFKM.js";
 import {
   layoutInlineHeader
 } from "./chunk-3DOQOXXI.js";
@@ -741,7 +742,10 @@ function renderBoxesAndLines(container, parsed, layout, palette, isDark, options
     const lh = le.labelHeight ?? sEdgeLabelFontSize + 6;
     const lines = le.labelLines;
     const labelG = labelLayer.append("g").attr("class", "bl-edge-label").attr("data-line-number", String(le.lineNumber));
-    labelG.append("rect").attr("x", lx - lw / 2).attr("y", ly - lh / 2).attr("width", lw).attr("height", lh).attr("rx", 3).attr("fill", palette.bg).attr("opacity", EDGE_LABEL_KNOCKOUT_OPACITY);
+    labelG.append("rect").attr("x", lx - lw / 2).attr("y", ly - lh / 2).attr("width", lw).attr("height", lh).attr("rx", 3).attr("fill", palette.bg).attr(
+      "opacity",
+      le.labelResolved === false ? EDGE_LABEL_UNRESOLVED_KNOCKOUT_OPACITY : EDGE_LABEL_KNOCKOUT_OPACITY
+    );
     const text = labelG.append("text").attr("x", lx).attr("text-anchor", "middle").attr("font-family", FONT_FAMILY).attr("font-size", sEdgeLabelFontSize).attr("fill", palette.textMuted);
     const firstY = ly - (lines.length - 1) / 2 * labelLineHeight + sEdgeLabelFontSize / 3;
     lines.forEach((line2, k) => {

package/dist/{chunk-UJRMARNX.js → chunk-NJIGYGZS.js}

@@ -6,7 +6,7 @@ import {
   mapLegendConfig,
   mapLegendGroups,
   parsePathRings
-} from "./chunk-3MXJMZAN.js";
+} from "./chunk-BV6PKJUS.js";
 import {
   parseClock
 } from "./chunk-WP2RLGDI.js";
@@ -270,6 +270,23 @@ function renderMap(container, resolved, data, palette, isDark, onClickItem, expo
       }
     }
   );
+  drawMap(
+    container,
+    layout,
+    resolved,
+    palette,
+    isDark,
+    onClickItem,
+    exportDims
+  );
+}
+function renderMapLayout(container, layout, resolved, palette, isDark, onClickItem) {
+  d3Selection.select(container).selectAll(":not([data-d3-tooltip])").remove();
+  if (layout.width <= 0 || layout.height <= 0) return;
+  drawMap(container, layout, resolved, palette, isDark, onClickItem, void 0);
+}
+function drawMap(container, layout, resolved, palette, isDark, onClickItem, exportDims) {
+  const { width, height } = layout;
   const svg = d3Selection.select(container).append("svg").attr("width", width).attr("height", height).attr("viewBox", `0 0 ${width} ${height}`).attr("preserveAspectRatio", "xMidYMin meet").attr("xmlns", "http://www.w3.org/2000/svg").style("font-family", FONT_FAMILY).style("background", layout.background);
   svg.append("rect").attr("width", width).attr("height", height).attr("fill", layout.background);
   const defs = svg.append("defs");
@@ -779,5 +796,6 @@ function emitText(g, x, y, text, anchor, color, halo, withHalo, fontSize, italic
 
 export {
   renderMap,
+  renderMapLayout,
   renderMapForExport
 };

package/dist/{chunk-RYZNNXUV.js → chunk-PKXKWHDW.js}

@@ -1,6 +1,6 @@
 import {
   acyclicOrient
-} from "./chunk-JLGN6S4B.js";
+} from "./chunk-EWSESGC2.js";
 
 // src/swimlane/layout.ts
 var MARGIN = 30;

package/dist/{chunk-C5FEPGSJ.js → chunk-QJFT5MAH.js}

@@ -10,7 +10,7 @@ import {
 import {
   ARROWHEAD_HEIGHT,
   ARROWHEAD_WIDTH
-} from "./chunk-IIEI7VK5.js";
+} from "./chunk-XCKNFFKM.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,

package/dist/{chunk-ULCB4BLF.js → chunk-QPE646M2.js}

@@ -9,7 +9,7 @@ import {
   EDGE_DASH,
   GRID_DASH,
   scaleDash
-} from "./chunk-IIEI7VK5.js";
+} from "./chunk-XCKNFFKM.js";
 import {
   createTooltip,
   hideTooltip,

package/dist/{chunk-UNSN56OJ.js → chunk-R2K5L4UA.js}

@@ -1,6 +1,6 @@
 import {
   EDGE_DASH
-} from "./chunk-IIEI7VK5.js";
+} from "./chunk-XCKNFFKM.js";
 import {
   measureText
 } from "./chunk-KAO7JL4I.js";

package/dist/{chunk-SLMAAJPE.js → chunk-RGI64U3A.js}

@@ -1,6 +1,6 @@
 import {
   EDGE_DASH
-} from "./chunk-IIEI7VK5.js";
+} from "./chunk-XCKNFFKM.js";
 import {
   layoutInlineHeader
 } from "./chunk-3DOQOXXI.js";