@diagrammo/dgmo 0.86.0 → 0.88.0

package/dist/{chunk-XFMQSFS4.js → chunk-YMG7JDEY.js}

@@ -1,9 +1,9 @@
 import {
   wrapDescriptionLines
-} from "./chunk-WMIKC5XO.js";
+} from "./chunk-NPWVOFB3.js";
 import {
   renderInlineText
-} from "./chunk-FWNJDD4U.js";
+} from "./chunk-S7W75MIM.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";
@@ -842,7 +842,7 @@ function renderSequenceDiagram(container, parsed, palette, isDark, _onNavigateTo
     }
     msgToLastStep.set(step.messageIndex, si);
   });
-  const findAssociatedLastStep = (note) => {
+  const closestPrecedingMsgIndex = (note) => {
     let closestMsgIndex = -1;
     let closestLine = -1;
     for (let mi = 0; mi < messages.length; mi++) {
@@ -852,9 +852,15 @@ function renderSequenceDiagram(container, parsed, palette, isDark, _onNavigateTo
         closestMsgIndex = mi;
       }
     }
-    if (closestMsgIndex >= 0 && hiddenMsgIndices.has(closestMsgIndex)) {
-      return -1;
-    }
+    return closestMsgIndex;
+  };
+  const isNoteHiddenByCollapse = (note) => {
+    const closestMsgIndex = closestPrecedingMsgIndex(note);
+    return closestMsgIndex >= 0 && hiddenMsgIndices.has(closestMsgIndex);
+  };
+  const findAssociatedLastStep = (note) => {
+    if (isNoteHiddenByCollapse(note)) return -1;
+    const closestMsgIndex = closestPrecedingMsgIndex(note);
     if (closestMsgIndex < 0) return -1;
     return msgToLastStep.get(closestMsgIndex) ?? -1;
   };
@@ -942,6 +948,10 @@ function renderSequenceDiagram(container, parsed, palette, isDark, _onNavigateTo
     for (let i = 0; i < els.length; i++) {
       const el = els[i];
       if (isSequenceNote(el)) {
+        if (isNoteHiddenByCollapse(el)) {
+          while (i + 1 < els.length && isSequenceNote(els[i + 1])) i++;
+          continue;
+        }
         const firstOffset = noteOffsetBelow(el);
         let totalExtent = firstOffset;
         let j = i;

package/dist/chunk-Z6DXWULM.js

@@ -0,0 +1,23 @@
+// src/utils/safe-href.ts
+var ALLOWED_SCHEMES = ["http", "https", "mailto"];
+var SCHEME_RE = /^([a-z][a-z0-9+.-]*):/i;
+var LEADING_TRIM_RE = /^[\x00-\x20]+/;
+var URL_STRIP_RE = /[\x09\x0A\x0D]/g;
+function safeHref(url) {
+  if (typeof url !== "string") return null;
+  const trimmed = url.replace(URL_STRIP_RE, "").replace(LEADING_TRIM_RE, "");
+  if (trimmed.length === 0) return null;
+  const match = SCHEME_RE.exec(trimmed);
+  if (!match) {
+    return url;
+  }
+  const scheme = match[1].toLowerCase();
+  if (ALLOWED_SCHEMES.includes(scheme)) {
+    return url;
+  }
+  return null;
+}
+
+export {
+  safeHref
+};

package/dist/{chunk-PBEH52A2.js → chunk-ZNNVI5SR.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-6EK55ART.js";
 import {
   noteBoxSize
-} from "./chunk-ZGHV4QLK.js";
+} from "./chunk-RJNZHFNG.js";
 import {
   resolveNotes
 } from "./chunk-O753JUEZ.js";

package/dist/{flowchart-renderer-H72L7BEC.js → flowchart-renderer-THC6Y7EH.js}

@@ -1,16 +1,17 @@
 import {
   renderFlowchart,
   renderFlowchartForExport
-} from "./chunk-4ELXLATB.js";
+} from "./chunk-XUDGZJTJ.js";
 import "./chunk-26EVL454.js";
-import "./chunk-PBEH52A2.js";
-import "./chunk-5JO443MB.js";
+import "./chunk-ZNNVI5SR.js";
+import "./chunk-HAH5X345.js";
 import "./chunk-XBJJP2HN.js";
 import "./chunk-6EK55ART.js";
-import "./chunk-ZGHV4QLK.js";
+import "./chunk-RJNZHFNG.js";
 import "./chunk-5DH3KYFH.js";
-import "./chunk-WMIKC5XO.js";
-import "./chunk-FWNJDD4U.js";
+import "./chunk-NPWVOFB3.js";
+import "./chunk-S7W75MIM.js";
+import "./chunk-Z6DXWULM.js";
 import "./chunk-EPDBWATV.js";
 import "./chunk-24YPR5EH.js";
 import "./chunk-XCKNFFKM.js";

package/dist/index.d.ts

@@ -102,6 +102,73 @@ declare function attachDataChartInteractions(svg: SVGSVGElement, opts?: DataChar
 declare const D3_DATA_CHART_TYPES: Set<string>;
 declare function supportsD3DataChart(type: string): boolean;
 
+/**
+ * The supported sanitizing boundary for renderer output that is about to land
+ * in a live document.
+ *
+ * Renderer output is trusted only as far as the renderer that produced it, and
+ * every host — the desktop app, the web editor, Obsidian, the script-tag
+ * drop-ins, this library's own `mountD3DataChart` — puts that output into the
+ * DOM. This module is what they call first. It lives here, beside `safe-href`,
+ * rather than inside `src/auto/shared.ts` where it started: that module is the
+ * browser-embed bundle's private toolbox, reachable only from the two IIFE
+ * script-tag builds, so a host importing `@diagrammo/dgmo` could not call the
+ * sanitizer at all however much it wanted to.
+ *
+ * 🔴 **Parse into a DETACHED holder, take the `<svg>`, sanitize, insert.** All
+ * four steps, in that order:
+ *
+ * ```ts
+ * const holder = document.createElement('div');
+ * holder.innerHTML = svg;          // inert: nothing here is connected yet
+ * const svgEl = holder.querySelector('svg');
+ * if (svgEl) {
+ *   sanitizeSvgInPlace(svgEl);
+ *   container.replaceChildren(svgEl);
+ * }
+ * ```
+ *
+ * Sanitizing *after* assigning into a live container is too late: connecting
+ * the subtree is what creates a nested browsing context for an `<iframe>` and
+ * runs a custom element's `connectedCallback`, both synchronously inside the
+ * assignment. And taking only the `<svg>` is half the safety — moving every
+ * child of the holder across would connect whatever a hostile document put
+ * *beside* the diagram. `auto/index.ts` and `element/index.ts` have always done
+ * both; `mount.ts` learned them on diagrammo/diagrammo#884.
+ *
+ * 🔴 **What this does NOT do**, so a caller is not misled about the contract:
+ *
+ * - It does not parse CSS. An `@import` or a `url()` inside a `<style>`
+ *   element passes through untouched.
+ * - It removes the elements listed in `REMOVED_TAGS` and nothing else. That
+ *   set is the script-execution and remote-content surface as of
+ *   diagrammo/diagrammo#884; an element neither it nor the attribute scrub
+ *   below names survives, so a caller sanitizing *arbitrary* HTML rather than
+ *   dgmo renderer output needs its own allowlist on top.
+ * - It does not stop a resource load that an attribute alone starts —
+ *   `<img src>` fetches whether or not the node is connected. What protects
+ *   that case is the `on*` strip, not the detached holder.
+ * - It is no substitute for escaping where a renderer interpolates author
+ *   text (see `src/embed/escape.ts`).
+ *
+ * Browser-only — it needs a live DOM. There is nothing to sanitize on the
+ * rasterising path, which never builds a document.
+ */
+/**
+ * Strip script-execution surface from a freshly parsed SVG tree before it
+ * lands in the live DOM. This is the safety net that lets us build SVG from
+ * markup without trusting renderer output to be fully sanitized.
+ *
+ * Removes every element in `REMOVED_TAGS`, any SMIL element animating an
+ * `href`, any `on*` event-handler attribute, and any `href`/`xlink:href`
+ * failing the `safeHref` allowlist.
+ *
+ * Mutates `root` and returns nothing. Call it on a detached holder — see the
+ * module comment above for why the order matters, and for what this does not
+ * cover.
+ */
+declare function sanitizeSvgInPlace(root: Element): void;
+
 /**
  * The full diagnostic catalog, sorted by code. Every coded diagnostic
  * dgmo can emit — its severity, owning chart type, canonical message,
@@ -206,4 +273,4 @@ interface DecodedDiagramUrl {
  */
 declare function decodeDiagramUrl(url: string): DecodedDiagramUrl | null;
 
-export { CompactViewState, D3_DATA_CHART_TYPES, type DataChartInteractionOpts, type DecodedDiagramUrl, DgmoError, DiagnosticSpec, type EncodeDiagramUrlOptions, MapDataSource, type MountD3Opts, type MountedD3Chart, type NormalizeSvgForEmbedOptions, PaletteConfig, type RenderOptions, type RenderResult, Theme, attachDataChartInteractions, decodeDiagramUrl, defaultEmbedBackground, encodeDiagramUrl, getDiagnosticSpec, getEmbedSvgViewBox, listDiagnosticCodes, mountD3DataChart, normalizeSvgForEmbed, render, supportsD3DataChart };
+export { CompactViewState, D3_DATA_CHART_TYPES, type DataChartInteractionOpts, type DecodedDiagramUrl, DgmoError, DiagnosticSpec, type EncodeDiagramUrlOptions, MapDataSource, type MountD3Opts, type MountedD3Chart, type NormalizeSvgForEmbedOptions, PaletteConfig, type RenderOptions, type RenderResult, Theme, attachDataChartInteractions, decodeDiagramUrl, defaultEmbedBackground, encodeDiagramUrl, getDiagnosticSpec, getEmbedSvgViewBox, listDiagnosticCodes, mountD3DataChart, normalizeSvgForEmbed, render, sanitizeSvgInPlace, supportsD3DataChart };

package/dist/index.js

@@ -9,9 +9,13 @@ import {
   searchMapLocations,
   themes
 } from "./chunk-SQAG3UXH.js";
+import {
+  safeHref
+} from "./chunk-Z6DXWULM.js";
 import {
   render
-} from "./chunk-4YA5XW43.js";
+} from "./chunk-VW52W5F6.js";
+import "./chunk-ABP5BUD6.js";
 import {
   renderErrorCard
 } from "./chunk-D4M25W6R.js";
@@ -34,7 +38,7 @@ import "./chunk-KMU65FYM.js";
 import "./chunk-EPDBWATV.js";
 import "./chunk-7UDAIP6W.js";
 import "./chunk-2CW5ZTNH.js";
-import "./chunk-QPE646M2.js";
+import "./chunk-JLETTWUJ.js";
 import "./chunk-YRYKTYMQ.js";
 import "./chunk-24YPR5EH.js";
 import {
@@ -124,6 +128,50 @@ import {
 } from "./chunk-BYU54C3S.js";
 import "./chunk-5WRI5ZAA.js";
 
+// src/utils/sanitize-svg.ts
+var XLINK_NS = "http://www.w3.org/1999/xlink";
+var REMOVED_TAGS = "script, foreignObject, iframe, object, embed, frame, base, link, meta";
+var ANIMATION_TAGS = new Set(
+  ["animate", "set", "animateTransform", "animateMotion"].map(
+    (t) => t.toLowerCase()
+  )
+);
+var ANIMATED_URL_ATTRS = /* @__PURE__ */ new Set(["href", "xlink:href"]);
+function isUrlAnimation(node) {
+  if (!ANIMATION_TAGS.has(node.localName.toLowerCase())) return false;
+  const target = (node.getAttribute("attributeName") ?? "").trim().toLowerCase();
+  return ANIMATED_URL_ATTRS.has(target);
+}
+function scrubElement(node) {
+  for (const attr of Array.from(node.attributes)) {
+    if (attr.name.toLowerCase().startsWith("on")) {
+      node.removeAttribute(attr.name);
+    }
+  }
+  if (node.hasAttribute("href")) {
+    const safe = safeHref(node.getAttribute("href"));
+    if (safe === null) node.removeAttribute("href");
+  }
+  if (node.hasAttributeNS(XLINK_NS, "href")) {
+    const v = node.getAttributeNS(XLINK_NS, "href");
+    if (safeHref(v) === null) {
+      node.removeAttributeNS(XLINK_NS, "href");
+    }
+  }
+}
+function sanitizeSvgInPlace(root) {
+  const dangerous = root.querySelectorAll(REMOVED_TAGS);
+  dangerous.forEach((n) => n.remove());
+  const all = [root, ...Array.from(root.querySelectorAll("*"))];
+  for (const node of all) {
+    if (isUrlAnimation(node)) {
+      node.remove();
+      continue;
+    }
+    scrubElement(node);
+  }
+}
+
 // src/charts-d3/interactions.ts
 var NS = "http://www.w3.org/2000/svg";
 var STYLE_ID = "dgmo-chart-interactions-style";
@@ -134,7 +182,8 @@ function ensureStyle(svg, muted) {
   style.id = STYLE_ID;
   style.textContent = `
     .dgmo-series,.dgmo-datum,.dgmo-tick,.dgmo-ptlabel{transition:opacity .12s ease}
-    .dgmo-series.dgmo-dim,.dgmo-datum.dgmo-dim,.dgmo-ptlabel.dgmo-dim{opacity:.18}
+    [data-legend-entry]{transition:opacity .12s ease}
+    .dgmo-series.dgmo-dim,.dgmo-datum.dgmo-dim,.dgmo-ptlabel.dgmo-dim,[data-legend-entry].dgmo-dim{opacity:.18}
     .dgmo-tick.dgmo-faded{opacity:.22}
     .dgmo-datum{cursor:pointer}
     .dgmo-axis-label{cursor:pointer}
@@ -177,6 +226,9 @@ function attachDataChartInteractions(svg, opts = {}) {
     svg.querySelectorAll(".dgmo-series")
   );
   const datums = Array.from(svg.querySelectorAll(".dgmo-datum"));
+  const legendEntries = Array.from(
+    svg.querySelectorAll(".chart-legend [data-legend-entry]")
+  );
   const circles = Array.from(
     svg.querySelectorAll(".dgmo-pt")
   );
@@ -247,6 +299,15 @@ function attachDataChartInteractions(svg, opts = {}) {
   const ptLabels = Array.from(
     svg.querySelectorAll(".dgmo-ptlabel")
   );
+  const dimLegendExcept = (el) => {
+    const name = el?.getAttribute("data-series-name") ?? el?.getAttribute("data-emph-key") ?? null;
+    const paired = name != null && legendEntries.some((e) => e.getAttribute("data-series-name") === name);
+    for (const e of legendEntries)
+      e.classList.toggle(
+        "dgmo-dim",
+        paired && e.getAttribute("data-series-name") !== name
+      );
+  };
   const dimDatumsExcept = (el) => {
     for (const d of datums) d.classList.toggle("dgmo-dim", d !== el);
     const line = el?.getAttribute("data-line-number");
@@ -255,6 +316,7 @@ function attachDataChartInteractions(svg, opts = {}) {
         "dgmo-dim",
         line == null || l.getAttribute("data-line-number") !== line
       );
+    dimLegendExcept(el);
   };
   const dimByKey = (el) => {
     const key = el.getAttribute("data-emph-key");
@@ -263,11 +325,13 @@ function attachDataChartInteractions(svg, opts = {}) {
       if (key) d.classList.toggle("dgmo-dim", dk !== key);
       else d.classList.toggle("dgmo-dim", d !== el);
     }
+    dimLegendExcept(el);
   };
   const clearDim = () => {
     for (const d of datums) d.classList.remove("dgmo-dim");
     for (const g of seriesGroups) g.classList.remove("dgmo-dim");
     for (const l of ptLabels) l.classList.remove("dgmo-dim");
+    for (const e of legendEntries) e.classList.remove("dgmo-dim");
     reapplyAxisPin();
   };
   let axisPin = null;
@@ -513,9 +577,6 @@ function attachDataChartInteractions(svg, opts = {}) {
     svg.addEventListener("mousemove", onSvgMove);
   svg.addEventListener("mouseleave", onLeave);
   svg.addEventListener("click", onClick);
-  const legendEntries = Array.from(
-    svg.querySelectorAll(".chart-legend [data-legend-entry]")
-  );
   const emphasizeSeries = (name) => {
     for (const g of seriesGroups) {
       const sn = g.getAttribute("data-series-name");
@@ -637,7 +698,14 @@ function mountD3DataChart(container, content, opts = {}) {
       interaction.destroy();
       interaction = null;
     }
-    container.innerHTML = svg;
+    const holder = document.createElement("div");
+    holder.innerHTML = svg;
+    const parsed = holder.querySelector("svg");
+    container.innerHTML = "";
+    if (parsed) {
+      sanitizeSvgInPlace(parsed);
+      container.append(parsed);
+    }
     const el = container.querySelector("svg");
     if (el) {
       const pal = paletteOf(current);
@@ -750,6 +818,7 @@ export {
   palettes,
   render2 as render,
   resolvePaletteOrFallback,
+  sanitizeSvgInPlace,
   searchMapLocations,
   supportsD3DataChart,
   themes,

package/dist/{layout-QIPCNUSB.js → layout-BOVTLAOT.js}

@@ -1,14 +1,15 @@
 import {
   computeNodeSize,
   layoutBoxesAndLines
-} from "./chunk-LIYWJ6DV.js";
-import "./chunk-TW6WMZFW.js";
-import "./chunk-HBCAY3KR.js";
+} from "./chunk-XIFK423U.js";
+import "./chunk-QT3KDDXK.js";
+import "./chunk-HTNLLT34.js";
 import "./chunk-6EK55ART.js";
-import "./chunk-ZGHV4QLK.js";
+import "./chunk-RJNZHFNG.js";
 import "./chunk-5DH3KYFH.js";
-import "./chunk-WMIKC5XO.js";
-import "./chunk-FWNJDD4U.js";
+import "./chunk-NPWVOFB3.js";
+import "./chunk-S7W75MIM.js";
+import "./chunk-Z6DXWULM.js";
 import "./chunk-ICLB27PZ.js";
 import "./chunk-KAO7JL4I.js";
 import "./chunk-O753JUEZ.js";

package/dist/{layout-6JARW64V.js → layout-EHTYSMV4.js}

@@ -1,12 +1,13 @@
 import {
   layoutERDiagram
-} from "./chunk-FAV4RDVT.js";
-import "./chunk-HBCAY3KR.js";
+} from "./chunk-2A4DQAXG.js";
+import "./chunk-HTNLLT34.js";
 import "./chunk-6EK55ART.js";
-import "./chunk-ZGHV4QLK.js";
+import "./chunk-RJNZHFNG.js";
 import "./chunk-5DH3KYFH.js";
-import "./chunk-WMIKC5XO.js";
-import "./chunk-FWNJDD4U.js";
+import "./chunk-NPWVOFB3.js";
+import "./chunk-S7W75MIM.js";
+import "./chunk-Z6DXWULM.js";
 import "./chunk-ICLB27PZ.js";
 import "./chunk-KAO7JL4I.js";
 import "./chunk-O753JUEZ.js";

package/dist/{layout-YELNBVPC.js → layout-P6DTD4RT.js}

@@ -1,12 +1,13 @@
 import {
   layoutClassDiagram
-} from "./chunk-BP4BT5TH.js";
-import "./chunk-HBCAY3KR.js";
+} from "./chunk-CLQIXD2C.js";
+import "./chunk-HTNLLT34.js";
 import "./chunk-6EK55ART.js";
-import "./chunk-ZGHV4QLK.js";
+import "./chunk-RJNZHFNG.js";
 import "./chunk-5DH3KYFH.js";
-import "./chunk-WMIKC5XO.js";
-import "./chunk-FWNJDD4U.js";
+import "./chunk-NPWVOFB3.js";
+import "./chunk-S7W75MIM.js";
+import "./chunk-Z6DXWULM.js";
 import "./chunk-ICLB27PZ.js";
 import "./chunk-KAO7JL4I.js";
 import "./chunk-O753JUEZ.js";

package/dist/{layout-T6TAB5OI.js → layout-RANVNAKI.js}

@@ -1,8 +1,8 @@
 import {
   layoutSwimlane
-} from "./chunk-PKXKWHDW.js";
-import "./chunk-EWSESGC2.js";
-import "./chunk-TW6WMZFW.js";
+} from "./chunk-AUS7V54P.js";
+import "./chunk-EJS3K44P.js";
+import "./chunk-QT3KDDXK.js";
 import "./chunk-KAO7JL4I.js";
 import "./chunk-5WRI5ZAA.js";
 export {

package/dist/{layout-FMKSENGL.js → layout-XUW444O5.js}

@@ -1,11 +1,12 @@
 import {
   layoutGraph
-} from "./chunk-PBEH52A2.js";
+} from "./chunk-ZNNVI5SR.js";
 import "./chunk-6EK55ART.js";
-import "./chunk-ZGHV4QLK.js";
+import "./chunk-RJNZHFNG.js";
 import "./chunk-5DH3KYFH.js";
-import "./chunk-WMIKC5XO.js";
-import "./chunk-FWNJDD4U.js";
+import "./chunk-NPWVOFB3.js";
+import "./chunk-S7W75MIM.js";
+import "./chunk-Z6DXWULM.js";
 import "./chunk-ICLB27PZ.js";
 import "./chunk-KAO7JL4I.js";
 import "./chunk-NXMESY4J.js";

package/dist/{layout-search-AW5VBDCV.js → layout-search-VKSBUCDM.js}

@@ -1,22 +1,23 @@
 import {
   computeNodeSize
-} from "./chunk-LIYWJ6DV.js";
+} from "./chunk-XIFK423U.js";
 import {
   clipEndpointsToNodes,
   groupedTierCandidates
-} from "./chunk-EWSESGC2.js";
+} from "./chunk-EJS3K44P.js";
 import {
   EDGE_LABEL_FONT_SIZE,
   NODE_HEIGHT,
   NODE_WIDTH,
   measureEdgeLabel
-} from "./chunk-TW6WMZFW.js";
-import "./chunk-HBCAY3KR.js";
+} from "./chunk-QT3KDDXK.js";
+import "./chunk-HTNLLT34.js";
 import "./chunk-6EK55ART.js";
-import "./chunk-ZGHV4QLK.js";
+import "./chunk-RJNZHFNG.js";
 import "./chunk-5DH3KYFH.js";
-import "./chunk-WMIKC5XO.js";
-import "./chunk-FWNJDD4U.js";
+import "./chunk-NPWVOFB3.js";
+import "./chunk-S7W75MIM.js";
+import "./chunk-Z6DXWULM.js";
 import "./chunk-ICLB27PZ.js";
 import "./chunk-KAO7JL4I.js";
 import "./chunk-O753JUEZ.js";
@@ -813,7 +814,8 @@ var ESCALATE_THRESHOLD = 4;
 var ESCALATE_MAX_N = 45;
 var ESCALATE_SEEDS = 18;
 var ESCALATE_REFINE = 10;
-var DEFAULT_SEARCH_BUDGET_MS = 5e3;
+var SEARCH_WORK_CAP = 36e3;
+var MIN_SEARCH_CANDIDATES = 6;
 function rng2(s) {
   return () => {
     s |= 0;
@@ -910,7 +912,7 @@ function countSplineCrossings(layout, floor = Infinity) {
     if (g.collapsed) center.set("__group_" + g.label, { x: g.x, y: g.y });
   const polys = flatPolys(layout);
   const edges = layout.edges;
-  const R = 34;
+  const R2 = 34 * 34;
   let total = 0;
   for (let a = 0; a < polys.length; a++)
     for (let b = a + 1; b < polys.length; b++) {
@@ -928,6 +930,8 @@ function countSplineCrossings(layout, floor = Infinity) {
       for (let i = 1; i < ap.length; i++) {
         const a0 = ap[i - 1], a1 = ap[i];
         const axMin = a0.x < a1.x ? a0.x : a1.x, axMax = a0.x > a1.x ? a0.x : a1.x, ayMin = a0.y < a1.y ? a0.y : a1.y, ayMax = a0.y > a1.y ? a0.y : a1.y;
+        if (axMax < B.x0 || axMin > B.x1 || ayMax < B.y0 || ayMin > B.y1)
+          continue;
         for (let j = 1; j < bp.length; j++) {
           const b0 = bp[j - 1], b1 = bp[j];
           if (axMax < (b0.x < b1.x ? b0.x : b1.x)) continue;
@@ -936,9 +940,9 @@ function countSplineCrossings(layout, floor = Infinity) {
           if ((b0.y > b1.y ? b0.y : b1.y) < ayMin) continue;
           const p = segPoint(a0, a1, b0, b1);
           if (!p) continue;
-          if (sh0 && Math.hypot(p.x - sh0.x, p.y - sh0.y) < R) continue;
-          if (sh1 && Math.hypot(p.x - sh1.x, p.y - sh1.y) < R) continue;
-          if (!hits.some((h) => Math.hypot(h.x - p.x, h.y - p.y) < 6))
+          if (sh0 && (p.x - sh0.x) ** 2 + (p.y - sh0.y) ** 2 < R2) continue;
+          if (sh1 && (p.x - sh1.x) ** 2 + (p.y - sh1.y) ** 2 < R2) continue;
+          if (!hits.some((h) => (h.x - p.x) ** 2 + (h.y - p.y) ** 2 < 36))
             hits.push(p);
         }
       }
@@ -947,19 +951,25 @@ function countSplineCrossings(layout, floor = Infinity) {
     }
   return total;
 }
-function pointSegDist(p, a, b) {
+function pointSegDist2(p, a, b) {
   const dx = b.x - a.x, dy = b.y - a.y;
   const len2 = dx * dx + dy * dy;
-  if (len2 < 1e-9) return Math.hypot(p.x - a.x, p.y - a.y);
-  let t = ((p.x - a.x) * dx + (p.y - a.y) * dy) / len2;
-  t = Math.max(0, Math.min(1, t));
-  return Math.hypot(p.x - (a.x + t * dx), p.y - (a.y + t * dy));
+  let qx = p.x - a.x, qy = p.y - a.y;
+  if (len2 >= 1e-9) {
+    let t = (qx * dx + qy * dy) / len2;
+    t = t < 0 ? 0 : t > 1 ? 1 : t;
+    qx -= t * dx;
+    qy -= t * dy;
+  }
+  return qx * qx + qy * qy;
 }
-function distToPoly(p, poly) {
-  let m = Infinity;
-  for (let i = 1; i < poly.length; i++)
-    m = Math.min(m, pointSegDist(p, poly[i - 1], poly[i]));
-  return m;
+function nearPoly(p, poly, dist) {
+  if (p.x < poly.x0 - dist || p.x > poly.x1 + dist || p.y < poly.y0 - dist || p.y > poly.y1 + dist)
+    return false;
+  const d2 = dist * dist, pts = poly.pts;
+  for (let i = 1; i < pts.length; i++)
+    if (pointSegDist2(p, pts[i - 1], pts[i]) < d2) return true;
+  return false;
 }
 function pointRectDist(p, r) {
   const dx = Math.max(r.x - r.w / 2 - p.x, 0, p.x - (r.x + r.w / 2));
@@ -1010,7 +1020,7 @@ function detectEdgeOverlaps(layout, opts) {
       };
       for (const p of A.pts) {
         const nearShared = shr0 !== void 0 && pointRectDist(p, shr0) < nodeClear || shr1 !== void 0 && pointRectDist(p, shr1) < nodeClear;
-        const covered = !nearShared && distToPoly(p, B.pts) < dist;
+        const covered = !nearShared && nearPoly(p, B, dist);
         if (covered) {
           if (run.length)
             runLen += Math.hypot(
@@ -1434,8 +1444,6 @@ async function layoutBoxesAndLinesSearch(parsed, collapseInfo, opts) {
   const YIELD_EVERY_MS = 30;
   const searchStart = performance.now();
   let lastYield = searchStart;
-  const budgetMs = opts?.budgetMs ?? DEFAULT_SEARCH_BUDGET_MS;
-  const overBudget = () => budgetMs > 0 && performance.now() - searchStart > budgetMs;
   const collapsedGroupLabels = /* @__PURE__ */ new Set();
   if (collapseInfo) {
     const missing = /* @__PURE__ */ new Set();
@@ -1694,10 +1702,16 @@ async function layoutBoxesAndLinesSearch(parsed, collapseInfo, opts) {
     };
   }
   const n = parsed.nodes.length;
-  const seedCount = opts?.seeds ?? (n <= 12 ? 80 : n <= 22 ? 40 : n <= 35 ? 22 : 10);
+  const seedCount = opts?.seeds ?? (n <= 12 ? 20 : n <= 22 ? 40 : n <= 35 ? 22 : 10);
   const REFINE_K = opts?.refineK ?? 6;
   const lambda = opts?.lambda ?? DEFAULT_LAMBDA;
   const prev = opts?.previousPositions;
+  const searchSize = Math.max(1, n + parsed.edges.length);
+  const maxCandidates = Math.max(
+    MIN_SEARCH_CANDIDATES,
+    Math.floor(SEARCH_WORK_CAP / Math.pow(searchSize, 1.5))
+  );
+  let attempts = 0;
   const configs = [];
   if (opts?.configs) {
     configs.push(...opts.configs);
@@ -1737,7 +1751,15 @@ async function layoutBoxesAndLinesSearch(parsed, collapseInfo, opts) {
   };
   const pool = [];
   const cfgOf = /* @__PURE__ */ new Map();
+  const perfect = [];
+  let seedsChecked = false;
   for (const cfg of configs) {
+    if (!opts?.configs && cfg.seed !== void 0 && !seedsChecked) {
+      seedsChecked = true;
+      for (const lay of pool) if (badness(lay, 0) === 0) perfect.push(lay);
+      if (perfect.length) break;
+    }
+    attempts++;
     try {
       const lay = place(cfg);
       pool.push(lay);
@@ -1745,7 +1767,7 @@ async function layoutBoxesAndLinesSearch(parsed, collapseInfo, opts) {
     } catch {
     }
     await step("Optimizing layout");
-    if (pool.length && overBudget()) break;
+    if (pool.length && attempts >= maxCandidates) break;
   }
   if (!pool.length) {
     const plain = {
@@ -1813,6 +1835,12 @@ async function layoutBoxesAndLinesSearch(parsed, collapseInfo, opts) {
     if (cfg) topConfigs.push(cfg);
     await step("Refining layout");
   }
+  for (const lay of perfect) {
+    if (pool.indexOf(lay) < refineK) continue;
+    consider(lay);
+    const cfg = cfgOf.get(lay);
+    if (cfg) topConfigs.push(cfg);
+  }
   if (!opts?.configs && bestBad >= ESCALATE_THRESHOLD && n <= ESCALATE_MAX_N) {
     const extra = [];
     for (let s = seedCount; s < seedCount + ESCALATE_SEEDS; s++) {
@@ -1822,13 +1850,14 @@ async function layoutBoxesAndLinesSearch(parsed, collapseInfo, opts) {
         ranksep: 60,
         seed: s
       };
+      attempts++;
       try {
         const lay = place(cfg);
         extra.push(lay);
         cfgOf.set(lay, cfg);
       } catch {
       }
-      if (overBudget()) break;
+      if (attempts >= maxCandidates) break;
     }
     const extraKey = /* @__PURE__ */ new Map();
     for (const lay of extra)

package/dist/{renderer-AI2MD52D.js → renderer-222OTVQV.js}

@@ -1,9 +1,10 @@
 import {
   renderGoal,
   renderGoalForExport
-} from "./chunk-H6AFNCN3.js";
+} from "./chunk-XVSJYAK7.js";
 import "./chunk-LNO3ASX5.js";
-import "./chunk-FWNJDD4U.js";
+import "./chunk-S7W75MIM.js";
+import "./chunk-Z6DXWULM.js";
 import "./chunk-VLC6WNRD.js";
 import "./chunk-ICLB27PZ.js";
 import "./chunk-KAO7JL4I.js";