@diagrammo/dgmo 0.86.0 → 0.87.0

package/dist/{chunk-HUMQIRJK.js → chunk-HTPZDZKQ.js}

@@ -1,13 +1,13 @@
 import {
   layoutERDiagram
-} from "./chunk-FAV4RDVT.js";
+} from "./chunk-2A4DQAXG.js";
 import {
   NOTE_BADGE_RADIUS,
   noteConnectorPoints,
   renderNoteBadge,
   renderNoteBox,
   renderNoteConnector
-} from "./chunk-5JO443MB.js";
+} from "./chunk-HAH5X345.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";

package/dist/{chunk-VPVWG2GH.js → chunk-J7Q4VPBJ.js}

@@ -1,6 +1,6 @@
 import {
   renderInlineText
-} from "./chunk-FWNJDD4U.js";
+} from "./chunk-S7W75MIM.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";

package/dist/{chunk-3CQS3CIO.js → chunk-LL6D3MES.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-UIUXIDBX.js";
 import {
   renderInlineText
-} from "./chunk-FWNJDD4U.js";
+} from "./chunk-S7W75MIM.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";

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

@@ -54,6 +54,21 @@ import {
   themeBaseBg
 } from "./chunk-7HWY4QAJ.js";
 
+// src/embed/escape.ts
+var HTML_ENTITIES = {
+  "&": "&",
+  "<": "&lt;",
+  ">": "&gt;",
+  '"': "&quot;",
+  "'": "&#39;"
+};
+function escapeHtml(s) {
+  return s.replace(/[&<>"']/g, (ch) => HTML_ENTITIES[ch] ?? ch);
+}
+function escapeAttr(s) {
+  return s.replace(/[&<>"']/g, (ch) => HTML_ENTITIES[ch] ?? ch);
+}
+
 // src/timeline/renderer.ts
 import * as d3Scale from "d3-scale";
 import * as d3Selection from "d3-selection";
@@ -281,7 +296,7 @@ function hideEventDatesOnScale(g) {
 }
 function buildEventTooltipHtml(ev) {
   const datePart = ev.endDate ? `${formatDateLabel(ev.date)} \u2192 ${formatDateLabel(ev.endDate)}` : formatDateLabel(ev.date);
-  return `<strong>${ev.label}</strong><br>${datePart}`;
+  return `<strong>${escapeHtml(ev.label)}</strong><br>${datePart}`;
 }
 function renderTimelineGroupLegend(g, groups, groupColorMap, textColor, palette, isDark, legendY, onHover, onLeave) {
   const PILL_H = 22;
@@ -1672,6 +1687,8 @@ function renderTimeline(container, parsed, palette, isDark, onClickItem, exportD
 }
 
 export {
+  escapeHtml,
+  escapeAttr,
   formatDateLabel,
   renderTimeline
 };

package/dist/{chunk-ERYHC4KJ.js → chunk-LSQGJN5H.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-XBJJP2HN.js";
 import {
   renderInlineText
-} from "./chunk-FWNJDD4U.js";
+} from "./chunk-S7W75MIM.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";

package/dist/{chunk-E6S2K6O2.js → chunk-N7XRBWXA.js}

@@ -6,13 +6,13 @@ import {
 } from "./chunk-DOXBS7F5.js";
 import {
   wrapNoteBody
-} from "./chunk-ZGHV4QLK.js";
+} from "./chunk-RJNZHFNG.js";
 import {
   NOTE_BULLET_INDENT
 } from "./chunk-5DH3KYFH.js";
 import {
   renderInlineText
-} from "./chunk-FWNJDD4U.js";
+} from "./chunk-S7W75MIM.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";

package/dist/{chunk-WMIKC5XO.js → chunk-NPWVOFB3.js}

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

package/dist/{chunk-MYHPRQHR.js → chunk-O6MMQQLF.js}

@@ -4,18 +4,18 @@ import {
   renderNoteBadge,
   renderNoteBox,
   renderNoteConnector
-} from "./chunk-5JO443MB.js";
+} from "./chunk-HAH5X345.js";
 import {
   appendArrowheadMarkers,
   appendReverseArrowheadMarkers
 } from "./chunk-XBJJP2HN.js";
 import {
   wrapDescriptionLines
-} from "./chunk-WMIKC5XO.js";
+} from "./chunk-NPWVOFB3.js";
 import {
   renderInlineText,
   stripInlineMarkdown
-} from "./chunk-FWNJDD4U.js";
+} from "./chunk-S7W75MIM.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";

package/dist/{chunk-GYORDNOM.js → chunk-P5V63L35.js}

@@ -1579,7 +1579,7 @@ function renderScurveBlock(svg, data, args) {
   }));
   const curve = d3Shape.line().x((d) => d.x).y((d) => d.y).curve(d3Shape.curveMonotoneX)(points);
   if (curve) {
-    const clipId = `pert-scurve-clip-${Math.random().toString(36).slice(2, 10)}`;
+    const clipId = `pert-scurve-clip-${[plotLeft, plotTop, plotW, plotH].map((v) => Math.round(v)).join("-")}`;
     block.append("clipPath").attr("id", clipId).append("rect").attr("x", plotLeft).attr("y", plotTop).attr("width", plotW).attr("height", plotH);
     block.append("path").attr("class", "pert-scurve-line").attr("d", curve).attr("fill", "none").attr("stroke", palette.colors.red).attr("stroke-width", 2).attr("clip-path", `url(#${clipId})`);
   }

package/dist/{chunk-4YA5XW43.js → chunk-PJQZWJ5I.js}

@@ -20,7 +20,7 @@ import {
 } from "./chunk-KMU65FYM.js";
 import {
   renderTimeline
-} from "./chunk-QPE646M2.js";
+} from "./chunk-LPXC4I4R.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";
@@ -1991,7 +1991,7 @@ function ctxTagOverride(ctx) {
 async function exportEventLine(ctx) {
   const { content, theme, palette } = ctx;
   const { parseEventLine } = await import("./parser-KFYRTGTC.js");
-  const { renderEventLineForExport } = await import("./renderer-RLSR7N6I.js");
+  const { renderEventLineForExport } = await import("./renderer-3CTUWCO7.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const parsed = parseEventLine(content, effectivePalette);
   if (parsed.error || parsed.events.length === 0) return "";
@@ -2119,7 +2119,7 @@ async function exportSitemap(ctx) {
   const { parseSitemap } = await import("./parser-OKB64MMN.js");
   const { layoutSitemap } = await import("./layout-LUQKAGGT.js");
   const { collapseSitemapTree } = await import("./collapse-ZWUFFCK2.js");
-  const { renderSitemap } = await import("./renderer-RUGMKHX5.js");
+  const { renderSitemap } = await import("./renderer-WH2HWE5Z.js");
   const isDark = ctx.isDark;
   const effectivePalette = await resolveExportPalette(theme, palette);
   const sitemapParsed = parseSitemap(content, effectivePalette);
@@ -2169,7 +2169,7 @@ async function exportSitemap(ctx) {
 async function exportKanban(ctx) {
   const { content, theme, palette, viewState, exportMode } = ctx;
   const { parseKanban } = await import("./parser-ACW6C6OY.js");
-  const { renderKanban } = await import("./renderer-CZJ4AMYV.js");
+  const { renderKanban } = await import("./renderer-3FF4QVGW.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const kanbanParsed = parseKanban(content, effectivePalette);
   if (kanbanParsed.error || kanbanParsed.columns.length === 0) return "";
@@ -2201,8 +2201,8 @@ async function exportKanban(ctx) {
 async function exportClass(ctx) {
   const { content, theme, palette, exportMode } = ctx;
   const { parseClassDiagram } = await import("./parser-GPW4ZHPQ.js");
-  const { layoutClassDiagram } = await import("./layout-YELNBVPC.js");
-  const { renderClassDiagram } = await import("./renderer-5JVVJBAS.js");
+  const { layoutClassDiagram } = await import("./layout-P6DTD4RT.js");
+  const { renderClassDiagram } = await import("./renderer-A4LMOBZL.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const classParsed = parseClassDiagram(content, effectivePalette);
   if (classParsed.error || classParsed.classes.length === 0) return "";
@@ -2228,8 +2228,8 @@ async function exportClass(ctx) {
 async function exportEr(ctx) {
   const { content, theme, palette, viewState, exportMode } = ctx;
   const { parseERDiagram } = await import("./parser-J4DVNL4W.js");
-  const { layoutERDiagram } = await import("./layout-6JARW64V.js");
-  const { renderERDiagram } = await import("./renderer-JEEGPLMM.js");
+  const { layoutERDiagram } = await import("./layout-EHTYSMV4.js");
+  const { renderERDiagram } = await import("./renderer-R34GJL7U.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const erParsed = parseERDiagram(content, effectivePalette);
   if (erParsed.error || erParsed.tables.length === 0) return "";
@@ -2306,8 +2306,8 @@ async function exportBoxesAndLines(ctx) {
       blHiddenTagValues.set(k, new Set(v));
     }
   }
-  const { renderBoxesAndLinesForExport } = await import("./renderer-V6LLASGN.js");
-  const { layoutBoxesAndLines } = await import("./layout-QIPCNUSB.js");
+  const { renderBoxesAndLinesForExport } = await import("./renderer-X5A5VIRD.js");
+  const { layoutBoxesAndLines } = await import("./layout-BOVTLAOT.js");
   const blLayout = await layoutBoxesAndLines(blParsed);
   const PADDING = 20;
   const titleOffset = blParsed.title ? 40 : 0;
@@ -2337,7 +2337,7 @@ async function exportBoxesAndLines(ctx) {
 async function exportSwimlane(ctx) {
   const { content, theme, palette } = ctx;
   const { parseSwimlane } = await import("./parser-ZLKYDFI5.js");
-  const { layoutSwimlane } = await import("./layout-T6TAB5OI.js");
+  const { layoutSwimlane } = await import("./layout-RANVNAKI.js");
   const { renderSwimlaneForExport } = await import("./renderer-QM23SWAM.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const swimParsed = parseSwimlane(content, effectivePalette);
@@ -2403,7 +2403,7 @@ async function exportMindmap(ctx) {
   const { parseMindmap } = await import("./parser-NGHQQGD2.js");
   const { layoutMindmap } = await import("./layout-5NPBHV5F.js");
   const { collapseMindmapTree } = await import("./collapse-SLINJQW6.js");
-  const { renderMindmap } = await import("./renderer-RH4U3UVM.js");
+  const { renderMindmap } = await import("./renderer-LODEVN3V.js");
   const isDark = ctx.isDark;
   const effectivePalette = await resolveExportPalette(theme, palette);
   const mmParsed = parseMindmap(content, effectivePalette);
@@ -2485,7 +2485,7 @@ async function exportC4(ctx) {
     layoutC4Components,
     layoutC4Deployment
   } = await import("./layout-CUFA7XJD.js");
-  const { renderC4Context, renderC4Containers } = await import("./renderer-EWJS2RAZ.js");
+  const { renderC4Context, renderC4Containers } = await import("./renderer-YDAVCRTP.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const c4Parsed = parseC4(content, effectivePalette);
   if (c4Parsed.error || c4Parsed.elements.length === 0) return "";
@@ -2520,8 +2520,8 @@ async function exportC4(ctx) {
 async function exportFlowchart(ctx) {
   const { content, theme, palette } = ctx;
   const { parseFlowchart } = await import("./flowchart-parser-GG7XBLQH.js");
-  const { layoutGraph } = await import("./layout-FMKSENGL.js");
-  const { renderFlowchart } = await import("./flowchart-renderer-H72L7BEC.js");
+  const { layoutGraph } = await import("./layout-XUW444O5.js");
+  const { renderFlowchart } = await import("./flowchart-renderer-THC6Y7EH.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const fcParsed = parseFlowchart(content, effectivePalette);
   if (fcParsed.error || fcParsed.nodes.length === 0) return "";
@@ -2543,7 +2543,7 @@ async function exportInfra(ctx) {
   const { parseInfra } = await import("./parser-DGF3ZEO6.js");
   const { computeInfra } = await import("./compute-JAP5E2E4.js");
   const { layoutInfra } = await import("./layout-SW3XWYKC.js");
-  const { renderInfra, computeInfraLegendGroups } = await import("./renderer-VKAJ52UO.js");
+  const { renderInfra, computeInfraLegendGroups } = await import("./renderer-SDUSBCJI.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const infraParsed = parseInfra(content);
   if (infraParsed.error || infraParsed.nodes.length === 0) return "";
@@ -2593,7 +2593,7 @@ async function exportPert(ctx) {
   const { parsePert } = await import("./parser-JXS4426S.js");
   const { analyzePert } = await import("./analyzer-R5UBTRO2.js");
   const { layoutPert } = await import("./layout-AM57TGN5.js");
-  const { renderPert, measurePertAnalysisBlock } = await import("./renderer-2BWRW23Z.js");
+  const { renderPert, measurePertAnalysisBlock } = await import("./renderer-RENDISO5.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const pertParsed = parsePert(content, { palette: effectivePalette });
   if (pertParsed.error || pertParsed.activities.length === 0) return "";
@@ -2680,8 +2680,8 @@ async function exportGantt(ctx) {
 async function exportState(ctx) {
   const { content, theme, palette, viewState } = ctx;
   const { parseState } = await import("./state-parser-FE3RF6XY.js");
-  const { layoutGraph } = await import("./layout-FMKSENGL.js");
-  const { renderState } = await import("./state-renderer-DDVJ43HR.js");
+  const { layoutGraph } = await import("./layout-XUW444O5.js");
+  const { renderState } = await import("./state-renderer-5IQ4OJUI.js");
   const { collapseStateGroups } = await import("./state-collapse-HCGD6IVJ.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const stateParsed = parseState(content, effectivePalette);
@@ -2719,7 +2719,7 @@ async function exportState(ctx) {
 async function exportTechRadar(ctx) {
   const { content, theme, palette, viewState, exportMode } = ctx;
   const { parseTechRadar } = await import("./parser-NOANDFJ4.js");
-  const { renderTechRadarForExport } = await import("./renderer-3AOOLHJU.js");
+  const { renderTechRadarForExport } = await import("./renderer-A6ACVK4X.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const radarParsed = parseTechRadar(content);
   if (radarParsed.error || radarParsed.quadrants.length === 0) return "";
@@ -2740,7 +2740,7 @@ async function exportTechRadar(ctx) {
 async function exportJourneyMap(ctx) {
   const { content, theme, palette, exportMode } = ctx;
   const { parseJourneyMap } = await import("./parser-C327BBE3.js");
-  const { renderJourneyMap } = await import("./renderer-E7WF75GY.js");
+  const { renderJourneyMap } = await import("./renderer-NHPKNNBD.js");
   const { layoutJourneyMap } = await import("./layout-SOPAVXIH.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const jmParsed = parseJourneyMap(content, effectivePalette);
@@ -2762,7 +2762,7 @@ async function exportJourneyMap(ctx) {
 async function exportCycle(ctx) {
   const { content, theme, palette, viewState, exportMode } = ctx;
   const { parseCycle } = await import("./parser-7OEE7QT6.js");
-  const { renderCycleForExport } = await import("./renderer-425QUIYO.js");
+  const { renderCycleForExport } = await import("./renderer-4BIMRO4X.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const cycleParsed = parseCycle(content);
   if (cycleParsed.error || cycleParsed.nodes.length === 0) return "";
@@ -2817,7 +2817,7 @@ async function exportMap(ctx) {
 async function exportPyramid(ctx) {
   const { content, theme, palette } = ctx;
   const { parsePyramid } = await import("./parser-OVQTTTUJ.js");
-  const { renderPyramidForExport } = await import("./renderer-R6VJDZFO.js");
+  const { renderPyramidForExport } = await import("./renderer-4BHOELCE.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const pyramidParsed = parsePyramid(content);
   if (pyramidParsed.error || pyramidParsed.layers.length === 0) return "";
@@ -2834,7 +2834,7 @@ async function exportPyramid(ctx) {
 async function exportRing(ctx) {
   const { content, theme, palette } = ctx;
   const { parseRing } = await import("./parser-GZ3LVF72.js");
-  const { renderRingForExport } = await import("./renderer-E5EKGIX2.js");
+  const { renderRingForExport } = await import("./renderer-2OOPQ4CH.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const ringParsed = parseRing(content);
   if (ringParsed.error || ringParsed.layers.length === 0) return "";
@@ -2898,7 +2898,7 @@ async function exportBlock(ctx) {
 async function exportGoal(ctx) {
   const { content, theme, palette } = ctx;
   const { parseGoal } = await import("./parser-SA3RAJFS.js");
-  const { renderGoalForExport } = await import("./renderer-AI2MD52D.js");
+  const { renderGoalForExport } = await import("./renderer-222OTVQV.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const parsed = parseGoal(content, effectivePalette);
   if (parsed.error) return "";
@@ -2912,7 +2912,7 @@ async function exportGoal(ctx) {
 async function exportCountdown(ctx) {
   const { content, theme, palette } = ctx;
   const { parseCountdown } = await import("./parser-LGS65QPN.js");
-  const { renderCountdownForExport } = await import("./renderer-ML2CLU25.js");
+  const { renderCountdownForExport } = await import("./renderer-DCFQDBGJ.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const parsed = parseCountdown(content, effectivePalette);
   if (parsed.error) return "";
@@ -2940,7 +2940,7 @@ async function exportClock(ctx) {
 async function exportBracket(ctx) {
   const { content, theme, palette } = ctx;
   const { parseBracket } = await import("./parser-DHSFIUPU.js");
-  const { renderBracketForExport, bracketExportDimensions } = await import("./renderer-ADX4DWRJ.js");
+  const { renderBracketForExport, bracketExportDimensions } = await import("./renderer-ELYPDPNF.js");
   const effectivePalette = await resolveExportPalette(theme, palette);
   const parsed = parseBracket(content, effectivePalette);
   if (parsed.error) return "";
@@ -3088,7 +3088,7 @@ async function exportVisualization(ctx) {
   const isDark = ctx.isDark;
   const container = createExportContainer(ctx.width, ctx.height);
   const { parseSequenceDgmo } = await import("./parser-PVIWHVGY.js");
-  const { renderSequenceDiagram } = await import("./renderer-UUWR7NGF.js");
+  const { renderSequenceDiagram } = await import("./renderer-2KVQGGTT.js");
   const seqParsed = parseSequenceDgmo(content, effectivePalette);
   if (seqParsed.error || seqParsed.participants.length === 0) return "";
   const collapsedSections = viewState?.cs ? new Set(viewState.cs) : void 0;
@@ -3145,6 +3145,14 @@ function legendRule(mark, attr, v, emphasis, dimOpacity) {
   const trigger = `svg:has([data-legend-entry="${entryLit}"]:hover)`;
   return emphasis === "lift" ? `${trigger} ${mark}[${attr}="${attrLit}"]{${LIFT_DECL}}` : `${trigger} ${mark}:not([${attr}="${attrLit}"]){opacity:${dimOpacity}}`;
 }
+function legendReverseRule(mark, attr, v, emphasis, dimOpacity) {
+  const entryLit = escCssString(v.toLowerCase());
+  const attrLit = escCssString(v);
+  const trigger = `svg:has(${mark}[${attr}="${attrLit}"]:hover)`;
+  if (emphasis === "lift")
+    return `${trigger} [data-legend-entry="${entryLit}"]{${LIFT_DECL}}`;
+  return `${trigger}:has([data-legend-entry="${entryLit}"]) [data-legend-entry]:not([data-legend-entry="${entryLit}"]){opacity:${dimOpacity}}`;
+}
 function connectionRule(spec, id, dimOpacity) {
   const lit = escCssString(id);
   const { hoverSelector, hoverAttr, edgeSelector, fromAttr, toAttr } = spec;
@@ -3197,6 +3205,13 @@ function buildHoverCss(spec, derived = {}, emphasisOverride) {
               v,
               emphasis,
               dimOpacity
+            ),
+            legendReverseRule(
+              spec.markSelector,
+              spec.groupAttr,
+              v,
+              emphasis,
+              dimOpacity
             )
           );
         }
@@ -3226,6 +3241,13 @@ function buildHoverCss(spec, derived = {}, emphasisOverride) {
             v,
             emphasis,
             dimOpacity
+          ),
+          legendReverseRule(
+            spec.markSelector,
+            derived.legendAttr,
+            v,
+            emphasis,
+            dimOpacity
           )
         );
       }

package/dist/{chunk-BHZE36F7.js → chunk-PUVTFUNH.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-R2K5L4UA.js";
 import {
   renderInlineText
-} from "./chunk-FWNJDD4U.js";
+} from "./chunk-S7W75MIM.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";

package/dist/{chunk-ETBXIKK6.js → chunk-Q2U5635V.js}

@@ -1,6 +1,6 @@
 import {
   renderInlineText
-} from "./chunk-FWNJDD4U.js";
+} from "./chunk-S7W75MIM.js";
 import {
   layoutInlineHeader
 } from "./chunk-3DOQOXXI.js";

package/dist/{chunk-TW6WMZFW.js → chunk-QT3KDDXK.js}

@@ -10,6 +10,7 @@ var NODE_HEIGHT = 60;
 var NODE_WIDTH = Math.round(NODE_HEIGHT * PHI);
 
 // src/boxes-and-lines/label-placement.ts
+import { curveBasis } from "d3-shape";
 var EDGE_LABEL_FONT_SIZE = 11;
 var LABEL_MAX_WIDTH = 160;
 var MAX_LABEL_LINES = 3;
@@ -21,6 +22,12 @@ var PERP_STEP = 8;
 var LABEL_REACH_NEAR = 40;
 var LABEL_REACH_WIDE = 56;
 var SLIDE_SAMPLES = 9;
+var CURVE_STEP = 4;
+var EDGE_CLEAR_PAD = 2;
+var GROUP_BORDER_BAND = 4;
+var GROUP_TITLE_FONT_SIZE = 14;
+var GROUP_TITLE_DEPTH = 24;
+var GROUP_LABEL_ZONE = 32;
 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) {
@@ -108,24 +115,69 @@ function slideFractions() {
   }
   return out;
 }
-function findClearPosition(w, h, points, obstacles, perpMax) {
+function findClearPosition(points, blocked, perpMax, firstSide = -1) {
   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;
+    if (!blocked(p.x, p.y)) return p;
   }
   for (let mag = PERP_STEP; mag <= perpMax; mag += PERP_STEP) {
     for (const t of ts) {
       const { p, nx, ny } = pointAtArcFraction(points, t);
-      for (const sign of [-1, 1]) {
+      for (const sign of [firstSide, -firstSide]) {
         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 };
+        if (!blocked(x, y)) return { x, y };
       }
     }
   }
   return null;
 }
+function sampleDrawnCurve(points) {
+  const out = [];
+  if (points.length < 2) return out;
+  let cx = 0;
+  let cy = 0;
+  const ctx = {
+    moveTo(x, y) {
+      out.push({ x, y });
+      cx = x;
+      cy = y;
+    },
+    lineTo(x, y) {
+      const n = Math.max(1, Math.ceil(Math.hypot(x - cx, y - cy) / CURVE_STEP));
+      for (let k = 1; k <= n; k++)
+        out.push({ x: cx + (x - cx) * k / n, y: cy + (y - cy) * k / n });
+      cx = x;
+      cy = y;
+    },
+    bezierCurveTo(x1, y1, x2, y2, x, y) {
+      const n = Math.max(
+        1,
+        Math.ceil(
+          (Math.hypot(x1 - cx, y1 - cy) + Math.hypot(x2 - x1, y2 - y1) + Math.hypot(x - x2, y - y2)) / CURVE_STEP
+        )
+      );
+      for (let k = 1; k <= n; k++) {
+        const t = k / n;
+        const u = 1 - t;
+        out.push({
+          x: u * u * u * cx + 3 * u * u * t * x1 + 3 * u * t * t * x2 + t * t * t * x,
+          y: u * u * u * cy + 3 * u * u * t * y1 + 3 * u * t * t * y2 + t * t * t * y
+        });
+      }
+      cx = x;
+      cy = y;
+    },
+    closePath() {
+    }
+  };
+  const curve = curveBasis(ctx);
+  curve.lineStart();
+  for (const p of points) curve.point(p.x, p.y);
+  curve.lineEnd();
+  return out;
+}
 function buildGroupContainers(groups) {
   const byLabel = new Map(groups.map((g) => [g.label, g]));
   const parent = /* @__PURE__ */ new Map();
@@ -218,6 +270,81 @@ function placeEdgeLabels(layout, opts) {
     obstacleCache.set(edgeIdx, out);
     return out;
   };
+  const curves = layout.edges.map((e) => {
+    const pts = sampleDrawnCurve(e.points);
+    let minX = Infinity;
+    let minY = Infinity;
+    let maxX = -Infinity;
+    let maxY = -Infinity;
+    for (const p of pts) {
+      if (p.x < minX) minX = p.x;
+      if (p.y < minY) minY = p.y;
+      if (p.x > maxX) maxX = p.x;
+      if (p.y > maxY) maxY = p.y;
+    }
+    return { pts, minX, minY, maxX, maxY };
+  });
+  const crossesOtherEdge = (edgeIdx, cx, cy, w, h) => {
+    const minX = cx - w / 2 - EDGE_CLEAR_PAD;
+    const minY = cy - h / 2 - EDGE_CLEAR_PAD;
+    const maxX = cx + w / 2 + EDGE_CLEAR_PAD;
+    const maxY = cy + h / 2 + EDGE_CLEAR_PAD;
+    for (let j = 0; j < curves.length; j++) {
+      if (j === edgeIdx) continue;
+      const c = curves[j];
+      if (c.maxX < minX || c.minX > maxX || c.maxY < minY || c.minY > maxY)
+        continue;
+      for (const p of c.pts)
+        if (p.x > minX && p.x < maxX && p.y > minY && p.y < maxY) return true;
+    }
+    return false;
+  };
+  const hasSubGroup = new Set(
+    (opts?.groups ?? []).flatMap((g) => g.parentGroup ? [g.parentGroup] : [])
+  );
+  const drawnTop = (g) => g.y - g.height / 2 - (hasSubGroup.has(g.label) ? GROUP_LABEL_ZONE : 0);
+  const titleRects = layout.groups.filter((g) => !g.collapsed).map((g) => {
+    const tw = measureText(g.label, GROUP_TITLE_FONT_SIZE, { bold: true });
+    const top = drawnTop(g);
+    return {
+      minX: g.x - tw / 2,
+      minY: top,
+      maxX: g.x + tw / 2,
+      maxY: top + GROUP_TITLE_DEPTH
+    };
+  });
+  const borderBands = (g) => {
+    const B = GROUP_BORDER_BAND;
+    const l = g.x - g.width / 2;
+    const r = g.x + g.width / 2;
+    const t = drawnTop(g);
+    const b = g.y + g.height / 2;
+    return [
+      { minX: l - B, minY: t - B, maxX: r + B, maxY: t + B },
+      { minX: l - B, minY: b - B, maxX: r + B, maxY: b + B },
+      { minX: l - B, minY: t - B, maxX: l + B, maxY: b + B },
+      { minX: r - B, minY: t - B, maxX: r + B, maxY: b + B }
+    ];
+  };
+  const preferredCache = /* @__PURE__ */ new Map();
+  const preferredFor = (edgeIdx) => {
+    const cached = preferredCache.get(edgeIdx);
+    if (cached !== void 0) return cached;
+    const e = layout.edges[edgeIdx];
+    const src = containers.get(e.source) ?? noContainers;
+    const tgt = containers.get(e.target) ?? noContainers;
+    const own = layout.groups.filter(
+      (g) => !g.collapsed && src.has(g.label) && tgt.has(g.label)
+    );
+    const out = [
+      ...obstaclesFor(edgeIdx),
+      ...titleRects,
+      ...own.flatMap(borderBands)
+    ];
+    preferredCache.set(edgeIdx, out);
+    return out;
+  };
+  const clearOfAll = (edgeIdx, cx, cy, w, h) => !overlapsAny(cx, cy, w, h, preferredFor(edgeIdx), BOX_CLEAR_PAD) && !crossesOtherEdge(edgeIdx, cx, cy, w, h);
   const boxes = [];
   layout.edges.forEach((e, idx) => {
     if (!e.label || e.points.length < 2) return;
@@ -238,10 +365,32 @@ function placeEdgeLabels(layout, opts) {
   });
   for (const box of boxes) {
     const obstacles = obstaclesFor(box.edgeIdx);
-    if (!overlapsAny(box.cx, box.cy, box.w, box.h, obstacles, BOX_CLEAR_PAD))
-      continue;
+    if (clearOfAll(box.edgeIdx, box.cx, box.cy, box.w, box.h)) continue;
     const e = layout.edges[box.edgeIdx];
-    const clear = findClearPosition(box.w, box.h, e.points, obstacles, perpMax) ?? findClearPosition(box.w, box.h, e.points, baseObstacles, perpMax);
+    const { w, h } = box;
+    const mid = pointAtArcFraction(e.points, 0.5);
+    const side = (box.cx - mid.p.x) * mid.nx + (box.cy - mid.p.y) * mid.ny > 0 ? 1 : -1;
+    const ideal = findClearPosition(
+      e.points,
+      (x, y) => !clearOfAll(box.edgeIdx, x, y, w, h),
+      perpMax,
+      side
+    );
+    if (ideal) {
+      box.cx = ideal.x;
+      box.cy = ideal.y;
+      continue;
+    }
+    if (!overlapsAny(box.cx, box.cy, w, h, obstacles, BOX_CLEAR_PAD)) continue;
+    const clear = findClearPosition(
+      e.points,
+      (x, y) => overlapsAny(x, y, w, h, obstacles, BOX_CLEAR_PAD),
+      perpMax
+    ) ?? findClearPosition(
+      e.points,
+      (x, y) => overlapsAny(x, y, w, h, baseObstacles, BOX_CLEAR_PAD),
+      perpMax
+    );
     if (clear) {
       box.cx = clear.x;
       box.cy = clear.y;

package/dist/{chunk-ZGHV4QLK.js → chunk-RJNZHFNG.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-5DH3KYFH.js";
 import {
   wrapDescriptionLines
-} from "./chunk-WMIKC5XO.js";
+} from "./chunk-NPWVOFB3.js";
 import {
   measureText
 } from "./chunk-KAO7JL4I.js";