@diagrammo/dgmo 0.48.2 → 0.50.0

package/dist/chunk-L2ZTFHAY.js

@@ -0,0 +1,331 @@
+import {
+  encodeDiagramUrl
+} from "./chunk-NISQC5KW.js";
+import {
+  FONT_FAMILY
+} from "./chunk-6KFWC4CO.js";
+import {
+  measureText,
+  truncateText
+} from "./chunk-5LWQH6QV.js";
+
+// src/error-card.ts
+var MONO_FAMILY = "ui-monospace, SFMono-Regular, 'SF Mono', Menlo, Consolas, monospace";
+var W = 660;
+var PAD = 24;
+var CONTENT_W = W - PAD * 2;
+var MAX_ERRORS = 4;
+var MONO_CH = 0.6;
+var CODE_FS = 12.5;
+function renderErrorCard(errors, source, palette, theme) {
+  const c = palette[theme === "dark" ? "dark" : "light"];
+  const isTransparent = theme === "transparent";
+  const card = c.surface;
+  const codeBg = c.bg;
+  const border = c.border;
+  const danger = c.destructive ?? c.colors.red;
+  const text = c.text;
+  const muted = c.textMuted;
+  const srcLines = source.split("\n");
+  const shown = errors.slice(0, MAX_ERRORS);
+  const overflow = errors.length - shown.length;
+  const parts = [];
+  let y = PAD + 8;
+  parts.push(frownMark(PAD + 14, y + 12, danger));
+  parts.push(
+    `<text x="${PAD + 38}" y="${y + 11}" fill="${text}" font-family="${FONT_FAMILY}" font-size="16" font-weight="700">Couldn't render this diagram</text>`,
+    `<text x="${W - PAD}" y="${y + 10}" text-anchor="end" fill="${muted}" font-family="${FONT_FAMILY}" font-size="12" font-weight="600" letter-spacing="0.5">dgmo</text>`
+  );
+  y += 24;
+  const errLabel = errors.length === 1 ? "1 error" : `${errors.length} errors`;
+  parts.push(
+    `<text x="${PAD + 38}" y="${y + 4}" fill="${muted}" font-family="${FONT_FAMILY}" font-size="12.5">${errLabel} \u2014 fix the lines below and re-render</text>`
+  );
+  y += 22;
+  parts.push(
+    `<line x1="${PAD}" y1="${y}" x2="${W - PAD}" y2="${y}" stroke="${border}" stroke-width="1"/>`
+  );
+  y += 24;
+  for (const e of shown) {
+    const hasLine = e.line > 0;
+    let msgX = PAD;
+    if (hasLine) {
+      const label = e.column ? `Line ${e.line}:${e.column}` : `Line ${e.line}`;
+      const badgeW = 14 + label.length * 7;
+      parts.push(
+        `<rect x="${PAD}" y="${y - 13}" width="${badgeW}" height="19" rx="4" fill="${danger}"/>`,
+        `<text x="${PAD + badgeW / 2}" y="${y + 1}" text-anchor="middle" fill="${c.bg}" font-family="${FONT_FAMILY}" font-size="11.5" font-weight="700">${escapeXml(label)}</text>`
+      );
+      msgX = PAD + badgeW + 12;
+    }
+    const lines = wrapMessage(e.message, CONTENT_W - (msgX - PAD), CONTENT_W);
+    lines.forEach((line, i) => {
+      parts.push(
+        `<text x="${i === 0 ? msgX : PAD}" y="${y + 1}" fill="${text}" font-family="${FONT_FAMILY}" font-size="13">${escapeXml(line)}</text>`
+      );
+      if (i < lines.length - 1) y += 18;
+    });
+    y += 24;
+    if (hasLine) {
+      const CTX = 2;
+      const first = Math.max(1, e.line - CTX);
+      const last = Math.min(srcLines.length, e.line + CTX);
+      const rowH = 18;
+      const hasCaret = e.column !== void 0 && e.column > 0;
+      const gutterW = `${last}`.length * CODE_FS * MONO_CH + 16;
+      const codeX = PAD + gutterW;
+      const codeMaxW = CONTENT_W - gutterW - 12;
+      const topY = y - 14;
+      const rowCount = last - first + 1;
+      const blockH = rowCount * rowH + (hasCaret ? 14 : 0) + 10;
+      const rowParts = [];
+      let ry = y + 3;
+      for (let n = first; n <= last; n++) {
+        const raw = (srcLines[n - 1] ?? "").replace(/\t/g, "  ");
+        const codeText = truncateText(raw, CODE_FS, codeMaxW);
+        const isBad = n === e.line;
+        if (isBad) {
+          rowParts.push(
+            `<rect x="${PAD + 1}" y="${ry - 13}" width="${CONTENT_W - 2}" height="${rowH}" fill="${danger}" fill-opacity="0.16"/>`
+          );
+        }
+        rowParts.push(
+          `<text x="${PAD + 8}" y="${ry + 1}" fill="${isBad ? danger : muted}" font-family="${MONO_FAMILY}" font-size="${CODE_FS}" font-weight="${isBad ? 700 : 400}">${escapeXml(`${n}`)}</text>`,
+          `<text x="${codeX}" y="${ry + 1}" fill="${text}" font-family="${MONO_FAMILY}" font-size="${CODE_FS}" xml:space="preserve">${escapeXml(codeText)}</text>`
+        );
+        if (isBad && hasCaret) {
+          const caretX = codeX + (e.column - 1) * CODE_FS * MONO_CH;
+          rowParts.push(
+            `<text x="${caretX}" y="${ry + 15}" fill="${danger}" font-family="${MONO_FAMILY}" font-size="${CODE_FS}" font-weight="700">^</text>`
+          );
+          ry += 14;
+        }
+        ry += rowH;
+      }
+      parts.push(
+        `<rect x="${PAD}" y="${topY}" width="${CONTENT_W}" height="${blockH}" rx="5" fill="${codeBg}" stroke="${border}" stroke-width="1"/>`,
+        `<line x1="${codeX - 8}" y1="${topY}" x2="${codeX - 8}" y2="${topY + blockH}" stroke="${border}" stroke-width="1"/>`,
+        rowParts.join("")
+      );
+      y = topY + blockH + 10;
+    }
+    y += 14;
+  }
+  if (overflow > 0) {
+    parts.push(
+      `<text x="${PAD}" y="${y}" fill="${muted}" font-family="${FONT_FAMILY}" font-size="12.5" font-style="italic">+ ${overflow} more error${overflow === 1 ? "" : "s"}</text>`
+    );
+    y += 22;
+  }
+  y += 2;
+  parts.push(
+    `<line x1="${PAD}" y1="${y}" x2="${W - PAD}" y2="${y}" stroke="${border}" stroke-width="1"/>`
+  );
+  y += 24;
+  const encoded = encodeDiagramUrl(source);
+  const editUrl = "url" in encoded && encoded.url ? encoded.url : "https://online.diagrammo.app";
+  const iconSize = 18;
+  const linkColor = c.colors.blue ?? c.text;
+  parts.push(
+    `<a href="${escapeXml(editUrl)}" target="_blank" rel="noopener noreferrer">` + diagrammoIcon(PAD, y - 14, iconSize) + `<text x="${PAD + iconSize + 8}" y="${y}" fill="${linkColor}" font-family="${FONT_FAMILY}" font-size="12.5" font-weight="600" text-decoration="underline">Edit &amp; fix this diagram at online.diagrammo.app \u2197</text></a>`
+  );
+  y += 8;
+  const height = Math.round(y + PAD - 14);
+  const pageBg = isTransparent ? "" : `<rect width="100%" height="100%" fill="${c.bg}"/>`;
+  return [
+    `<svg xmlns="http://www.w3.org/2000/svg" width="${W}" height="${height}" viewBox="0 0 ${W} ${height}" font-family="${FONT_FAMILY}">`,
+    pageBg,
+    `<rect x="0.5" y="0.5" width="${W - 1}" height="${height - 1}" rx="10" fill="${card}" stroke="${border}" stroke-width="1"/>`,
+    parts.join(""),
+    `</svg>`
+  ].join("");
+}
+function wrapMessage(message, firstWidth, fullWidth) {
+  const words = message.split(/\s+/).filter(Boolean);
+  if (words.length === 0) return [""];
+  const lines = [];
+  let cur = "";
+  for (const word of words) {
+    const limit = lines.length === 0 ? firstWidth : fullWidth;
+    const test = cur ? `${cur} ${word}` : word;
+    if (measureText(test, 13) <= limit || !cur) {
+      cur = test;
+    } else {
+      lines.push(cur);
+      cur = word;
+    }
+  }
+  if (cur) lines.push(cur);
+  return lines;
+}
+function frownMark(cx, cy, color) {
+  const r = 12;
+  return [
+    `<circle cx="${cx}" cy="${cy}" r="${r}" fill="none" stroke="${color}" stroke-width="2"/>`,
+    `<circle cx="${cx - 4.5}" cy="${cy - 3}" r="1.6" fill="${color}"/>`,
+    `<circle cx="${cx + 4.5}" cy="${cy - 3}" r="1.6" fill="${color}"/>`,
+    `<path d="M ${cx - 5} ${cy + 6} Q ${cx} ${cy + 1} ${cx + 5} ${cy + 6}" fill="none" stroke="${color}" stroke-width="2" stroke-linecap="round"/>`
+  ].join("");
+}
+function diagrammoIcon(x, y, size) {
+  const s = size / 100;
+  return `<g transform="translate(${x} ${y}) scale(${s})"><rect width="100" height="100" rx="18" fill="#1f2933"/><path d="M41 71 L41 63.51 A28 28 0 1 1 59 63.51 L59 71" fill="none" stroke="#c9a227" stroke-width="6" stroke-linecap="round" stroke-linejoin="round"/><rect x="36" y="43" width="7" height="9" rx="1.9" fill="#c0504d"/><rect x="45" y="37" width="7" height="15" rx="1.9" fill="#5b9357"/><rect x="54" y="30" width="7" height="22" rx="1.9" fill="#3b6ea5"/><rect x="36" y="75" width="28" height="4.6" rx="2.3" fill="#7d5ba6"/><rect x="36" y="82" width="28" height="4.6" rx="2.3" fill="#7d5ba6"/><rect x="36" y="89" width="28" height="4.6" rx="2.3" fill="#7d5ba6"/></g>`;
+}
+function escapeXml(s) {
+  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+
+// src/utils/svg-embed.ts
+function normalizeSvgForEmbed(input) {
+  let svg = input;
+  const rootMatch = svg.match(/<svg[^>]*>/);
+  const rootTag = rootMatch?.[0] ?? "";
+  if (rootTag && !rootTag.includes("viewBox")) {
+    const wh = rootTag.match(/width="(\d+)"[^>]*height="(\d+)"/);
+    if (wh) {
+      svg = svg.replace(/<svg/, `<svg viewBox="0 0 ${wh[1]} ${wh[2]}"`);
+    }
+  }
+  const tight = computeBBox(svg);
+  if (tight && tight.width > 0 && tight.height > 0) {
+    const pad = 16;
+    const x = tight.x - pad;
+    const y = tight.y - pad;
+    const w = tight.width + pad * 2;
+    const h = tight.height + pad * 2;
+    const canvas = readViewBox(svg);
+    const TOL = 2;
+    const MIN_COVERAGE = 0.5;
+    const trustworthy = !canvas || x >= canvas.x - TOL && y >= canvas.y - TOL && x + w <= canvas.x + canvas.width + TOL && y + h <= canvas.y + canvas.height + TOL && w >= canvas.width * MIN_COVERAGE && h >= canvas.height * MIN_COVERAGE;
+    if (trustworthy) {
+      const vb = `${x} ${y} ${w} ${h}`;
+      svg = svg.replace(/(<svg[^>]*?)viewBox="[^"]*"/, `$1viewBox="${vb}"`);
+    }
+  }
+  svg = svg.replace(/(<svg[^>]*?) width="[^"]*"/g, "$1");
+  svg = svg.replace(/(<svg[^>]*?) height="[^"]*"/g, "$1");
+  svg = svg.replace(/<svg\s{2,}/g, "<svg ");
+  return svg;
+}
+function getEmbedSvgViewBox(svg) {
+  const tight = computeBBox(svg);
+  if (!tight || tight.width <= 0 || tight.height <= 0) return null;
+  const pad = 16;
+  return {
+    x: tight.x - pad,
+    y: tight.y - pad,
+    width: tight.width + pad * 2,
+    height: tight.height + pad * 2
+  };
+}
+function readViewBox(svg) {
+  const m = svg.match(/<svg[^>]*?\bviewBox="([^"]+)"/);
+  if (!m) return null;
+  const n = m[1].trim().split(/[\s,]+/).map(Number);
+  if (n.length !== 4 || n.some((v) => !Number.isFinite(v)) || n[2] <= 0 || n[3] <= 0)
+    return null;
+  return { x: n[0], y: n[1], width: n[2], height: n[3] };
+}
+function computeBBox(svg) {
+  const xs = [];
+  const ys = [];
+  function push(x, y) {
+    if (Number.isFinite(x) && Number.isFinite(y)) {
+      xs.push(x);
+      ys.push(y);
+    }
+  }
+  function attr(tag, name) {
+    const m = tag.match(new RegExp(`\\b${name}="([^"]*)"`));
+    if (!m) return null;
+    const n = parseFloat(m[1]);
+    return Number.isFinite(n) ? n : null;
+  }
+  for (const m of svg.matchAll(/<rect\b[^>]*?\/?>/g)) {
+    const tag = m[0];
+    const x = attr(tag, "x");
+    const y = attr(tag, "y");
+    const w = attr(tag, "width");
+    const h = attr(tag, "height");
+    if (x !== null && y !== null && w !== null && h !== null) {
+      push(x, y);
+      push(x + w, y + h);
+    }
+  }
+  for (const m of svg.matchAll(/<line\b[^>]*?\/?>/g)) {
+    const tag = m[0];
+    const x1 = attr(tag, "x1");
+    const y1 = attr(tag, "y1");
+    const x2 = attr(tag, "x2");
+    const y2 = attr(tag, "y2");
+    if (x1 !== null && y1 !== null && x2 !== null && y2 !== null) {
+      push(x1, y1);
+      push(x2, y2);
+    }
+  }
+  for (const m of svg.matchAll(/<circle\b[^>]*?\/?>/g)) {
+    const tag = m[0];
+    const cx = attr(tag, "cx");
+    const cy = attr(tag, "cy");
+    const r = attr(tag, "r");
+    if (cx !== null && cy !== null && r !== null) {
+      push(cx - r, cy - r);
+      push(cx + r, cy + r);
+    }
+  }
+  for (const m of svg.matchAll(/<ellipse\b[^>]*?\/?>/g)) {
+    const tag = m[0];
+    const cx = attr(tag, "cx");
+    const cy = attr(tag, "cy");
+    const rx = attr(tag, "rx");
+    const ry = attr(tag, "ry");
+    if (cx !== null && cy !== null && rx !== null && ry !== null) {
+      push(cx - rx, cy - ry);
+      push(cx + rx, cy + ry);
+    }
+  }
+  for (const m of svg.matchAll(/<text\b([^>]*?)>([\s\S]*?)<\/text>/g)) {
+    const tag = `<text${m[1]}>`;
+    const text = m[2].replace(/<[^>]+>/g, "");
+    const x = attr(tag, "x");
+    const y = attr(tag, "y");
+    if (x !== null && y !== null) {
+      const w = text.length * 7;
+      const anchor = tag.match(/\btext-anchor="([^"]*)"/)?.[1] ?? "start";
+      const left = anchor === "middle" ? x - w / 2 : anchor === "end" ? x - w : x;
+      const right = anchor === "middle" ? x + w / 2 : anchor === "end" ? x : x + w;
+      push(left, y - 14);
+      push(right, y + 4);
+    }
+  }
+  for (const m of svg.matchAll(/<path\b[^>]*?\bd="([^"]+)"/g)) {
+    const d = m[1];
+    const nums = d.match(/-?\d+(?:\.\d+)?/g);
+    if (!nums) continue;
+    for (let i = 0; i + 1 < nums.length; i += 2) {
+      push(parseFloat(nums[i]), parseFloat(nums[i + 1]));
+    }
+  }
+  for (const m of svg.matchAll(
+    /<(?:polygon|polyline)\b[^>]*?\bpoints="([^"]+)"/g
+  )) {
+    const nums = m[1].match(/-?\d+(?:\.\d+)?/g);
+    if (!nums) continue;
+    for (let i = 0; i + 1 < nums.length; i += 2) {
+      push(parseFloat(nums[i]), parseFloat(nums[i + 1]));
+    }
+  }
+  if (xs.length === 0 || ys.length === 0) return null;
+  const minX = Math.min(...xs);
+  const maxX = Math.max(...xs);
+  const minY = Math.min(...ys);
+  const maxY = Math.max(...ys);
+  return { x: minX, y: minY, width: maxX - minX, height: maxY - minY };
+}
+
+export {
+  renderErrorCard,
+  normalizeSvgForEmbed,
+  getEmbedSvgViewBox
+};
+//# sourceMappingURL=chunk-L2ZTFHAY.js.map

package/dist/{chunk-B7JUCQUA.js → chunk-M5RXSRO2.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-PDKUANDZ.js";
 import {
   layoutGraph
-} from "./chunk-T3UBLACL.js";
+} from "./chunk-SCQ5VPUF.js";
 import {
   appendArrowheadMarkers
 } from "./chunk-LP7EC4MI.js";
@@ -32,14 +32,14 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   measureText
-} from "./chunk-WCT3NYCV.js";
+} from "./chunk-5LWQH6QV.js";
 import {
   contrastText,
   shapeFill
 } from "./chunk-P6T66CCZ.js";
 import {
   parseFlowchart
-} from "./chunk-LIOHW36Z.js";
+} from "./chunk-GBE54KY6.js";
 
 // src/graph/flowchart-renderer.ts
 import * as d3Selection from "d3-selection";
@@ -527,4 +527,4 @@ export {
   renderFlowchart,
   renderFlowchartForExport
 };
-//# sourceMappingURL=chunk-B7JUCQUA.js.map
+//# sourceMappingURL=chunk-M5RXSRO2.js.map

package/dist/{chunk-ULOEATBZ.js → chunk-NFFIKVNO.js}

@@ -5,29 +5,33 @@ import {
   formatPct,
   resolveCellColor,
   resolveColorMode
-} from "./chunk-IZMRON6C.js";
+} from "./chunk-CVV36CWI.js";
 import {
   renderIntegratedLegend
-} from "./chunk-PWIHZ6NJ.js";
+} from "./chunk-QUJGFNFN.js";
 import {
   getMaxLegendReservedHeight
-} from "./chunk-YAA6IID3.js";
+} from "./chunk-7UEMZREK.js";
 import {
   FONT_FAMILY
 } from "./chunk-6KFWC4CO.js";
 import {
   LEGEND_GROUP_GAP
-} from "./chunk-QOOUC2J5.js";
+} from "./chunk-HQCHYB5F.js";
 import {
   measureText
-} from "./chunk-WCT3NYCV.js";
+} from "./chunk-5LWQH6QV.js";
 import {
+  contrastRatio,
   contrastText,
-  getSeriesColors
+  getSeriesColors,
+  hexToHSL,
+  hslToHex,
+  relativeLuminance
 } from "./chunk-P6T66CCZ.js";
 import {
   tagAttrKey
-} from "./chunk-QLCCJEJI.js";
+} from "./chunk-WCUHAQKB.js";
 
 // src/treemap/renderer-radial.ts
 import * as d3Selection from "d3-selection";
@@ -149,6 +153,7 @@ var LEGEND_POSITION = {
 };
 var MIN_LABEL_SWEEP = 6 * Math.PI / 180;
 var MIN_LABEL_FS = 8;
+var LABEL_BASE_FS = 16;
 function renderTreemapRadialForExport(container, parsed, palette, isDark, exportDims, options) {
   renderTreemapRadial(container, parsed, palette, isDark, exportDims, {
     exportMode: true,
@@ -271,58 +276,130 @@ function drawCenterDisc(plot, parsed, discRadius, total, isEmpty, palette) {
     return;
   }
   const title = parsed.title ?? "";
-  const totalStr = compactNumber(total);
+  const totalStr = groupedNumber(total);
   const titleFs = clampFs(15, discRadius);
-  const totalFs = clampFs(22, discRadius);
+  const totalFs = fitFs(totalStr, clampFs(22, discRadius), maxW);
   if (title) {
     const t = disc.append("text").attr("class", "dgmo-treemap-disc-title").attr("text-anchor", "middle").attr("y", -4).attr("fill", ink).attr("font-size", titleFs).attr("font-weight", 600).text(clip(title, maxW, titleFs));
     if (parsed.titleLineNumber !== null) {
       t.attr("data-line-number", parsed.titleLineNumber);
     }
   }
-  disc.append("text").attr("class", "dgmo-treemap-disc-total").attr("text-anchor", "middle").attr("y", title ? titleFs : 8).attr("fill", ink).attr("font-size", totalFs).attr("font-weight", 700).text(clip(totalStr, maxW, totalFs));
+  disc.append("text").attr("class", "dgmo-treemap-disc-total").attr("text-anchor", "middle").attr("y", title ? titleFs : 8).attr("fill", ink).attr("font-size", totalFs).attr("font-weight", 700).text(totalStr);
+}
+function groupedNumber(v) {
+  const rounded = Math.round(v * 100) / 100;
+  const neg = rounded < 0 ? "-" : "";
+  const [int, frac] = String(Math.abs(rounded)).split(".");
+  const grouped = int.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+  return frac ? `${neg}${grouped}.${frac}` : `${neg}${grouped}`;
 }
 function drawArcLabel(g, defs, pathId, cell, opts, palette, fill) {
   const sweep = cell.endAngle - cell.startAngle;
   if (sweep < MIN_LABEL_SWEEP) return;
   const ringThickness = cell.outerR - cell.innerR;
   if (ringThickness < 10) return;
-  const ink = contrastText(
-    fill,
-    palette.textOnFillLight,
-    palette.textOnFillDark
-  );
+  const ink = tonalInk(fill, palette.textOnFillLight, palette.textOnFillDark);
   const rMid = (cell.innerR + cell.outerR) / 2;
-  const maxFs = clampFs(13, ringThickness);
+  const maxFs = clampFs(LABEL_BASE_FS, ringThickness);
+  const name = cell.label;
   const valParts = [
     opts.noValues ? "" : compactNumber(cell.value),
     opts.noPercent ? "" : formatPct(cell.pctOfRoot)
   ].filter(Boolean);
   const valStr = valParts.join(" \xB7 ");
-  const full = valStr ? `${cell.label} ${valStr}` : cell.label;
-  const availLen = sweep * rMid * 0.94;
-  let fs = maxFs;
-  const wAtMax = measureText(full, maxFs);
-  if (wAtMax > availLen) {
-    fs = Math.max(MIN_LABEL_FS, Math.floor(maxFs * availLen / wAtMax));
+  const valFsBase = Math.max(MIN_LABEL_FS, Math.round(maxFs * 0.82));
+  const lineGap = Math.round((maxFs + valFsBase) * 0.6);
+  const blockExtent = lineGap + 0.35 * maxFs + 0.35 * valFsBase + 4;
+  if (valStr && ringThickness >= blockExtent) {
+    const nameOuter = !isBottomHalf(cell);
+    const rName = rMid + (nameOuter ? 1 : -1) * (lineGap / 2);
+    const rVal = rMid + (nameOuter ? -1 : 1) * (lineGap / 2);
+    const nameAvail = sweep * rName * 0.94;
+    const nameFs = fitFs(name, maxFs, nameAvail);
+    const nameText = clip(name, nameAvail, nameFs);
+    if (nameText) {
+      drawCurvedLine(
+        g,
+        defs,
+        `${pathId}-n`,
+        cell,
+        rName,
+        nameFs,
+        600,
+        nameText,
+        ink
+      );
+      const valAvail = sweep * rVal * 0.94;
+      const valFs = fitFs(valStr, valFsBase, valAvail);
+      const valText = clip(valStr, valAvail, valFs);
+      if (valText) {
+        drawCurvedLine(
+          g,
+          defs,
+          `${pathId}-v`,
+          cell,
+          rVal,
+          valFs,
+          500,
+          valText,
+          ink
+        );
+      }
+      return;
+    }
   }
+  const full = valStr ? `${name} ${valStr}` : name;
+  const availLen = sweep * rMid * 0.94;
+  const fs = fitFs(full, maxFs, availLen);
   const text = clip(full, availLen, fs);
   if (!text) return;
-  drawCurvedLabel(g, defs, pathId, cell, rMid, fs, text, ink);
+  drawCurvedLine(g, defs, pathId, cell, rMid, fs, 600, text, ink);
 }
-function drawCurvedLabel(g, defs, pathId, cell, rMid, fs, text, ink) {
+function isBottomHalf(cell) {
   const mid = (cell.startAngle + cell.endAngle) / 2;
-  const bottom = mid > Math.PI / 2 && mid < 3 * Math.PI / 2;
-  const rPath = bottom ? rMid + fs * 0.32 : rMid - fs * 0.32;
+  return mid > Math.PI / 2 && mid < 3 * Math.PI / 2;
+}
+function fitFs(text, maxFs, availLen) {
+  const w = measureText(text, maxFs);
+  if (w <= availLen) return maxFs;
+  return Math.max(MIN_LABEL_FS, Math.floor(maxFs * availLen / w));
+}
+function drawCurvedLine(g, defs, pathId, cell, centerR, fs, weight, text, ink) {
+  const bottom = isBottomHalf(cell);
+  const rPath = bottom ? centerR + fs * 0.32 : centerR - fs * 0.32;
   const [a0, a1] = bottom ? [cell.endAngle, cell.startAngle] : [cell.startAngle, cell.endAngle];
   const p0x = Math.sin(a0) * rPath;
   const p0y = -Math.cos(a0) * rPath;
   const p1x = Math.sin(a1) * rPath;
   const p1y = -Math.cos(a1) * rPath;
   const sweepFlag = bottom ? 0 : 1;
-  const d = `M ${p0x.toFixed(2)} ${p0y.toFixed(2)} A ${rPath.toFixed(2)} ${rPath.toFixed(2)} 0 0 ${sweepFlag} ${p1x.toFixed(2)} ${p1y.toFixed(2)}`;
+  const largeArc = cell.endAngle - cell.startAngle > Math.PI ? 1 : 0;
+  const d = `M ${p0x.toFixed(2)} ${p0y.toFixed(2)} A ${rPath.toFixed(2)} ${rPath.toFixed(2)} 0 ${largeArc} ${sweepFlag} ${p1x.toFixed(2)} ${p1y.toFixed(2)}`;
   defs.append("path").attr("id", pathId).attr("d", d);
-  g.append("text").attr("class", "dgmo-treemap-label").attr("font-size", fs).attr("font-weight", 600).attr("fill", ink).append("textPath").attr("href", `#${pathId}`).attr("startOffset", "50%").attr("text-anchor", "middle").text(text);
+  g.append("text").attr("class", "dgmo-treemap-label").attr("font-size", fs).attr("font-weight", weight).attr("fill", ink).append("textPath").attr("href", `#${pathId}`).attr("startOffset", "50%").attr("text-anchor", "middle").text(text);
+}
+var INK_MIN_CONTRAST = 3;
+function tonedCandidate(h, s, fill, dark) {
+  const sat = dark ? Math.min(85, Math.max(s, 55)) : Math.min(72, Math.max(42, s));
+  let l = dark ? 34 : 80;
+  let ink = hslToHex(h, sat, l);
+  for (let i = 0; i < 30 && contrastRatio(ink, fill) < INK_MIN_CONTRAST; i++) {
+    l += dark ? -3 : 3;
+    if (l <= 3 || l >= 97) break;
+    ink = hslToHex(h, sat, l);
+  }
+  return { ink, ok: contrastRatio(ink, fill) >= INK_MIN_CONTRAST };
+}
+function tonalInk(fill, onLight, onDark) {
+  const { h, s } = hexToHSL(fill);
+  const dark = tonedCandidate(h, s, fill, true);
+  const light = tonedCandidate(h, s, fill, false);
+  const preferLight = relativeLuminance(fill) <= 0.45;
+  if (dark.ok && light.ok) return preferLight ? light.ink : dark.ink;
+  if (dark.ok) return dark.ink;
+  if (light.ok) return light.ink;
+  return contrastText(fill, onLight, onDark);
 }
 function clampFs(base, thickness) {
   return Math.max(8, Math.min(base, Math.round(thickness * 0.9)));
@@ -344,4 +421,4 @@ export {
   renderTreemapRadialForExport,
   renderTreemapRadial
 };
-//# sourceMappingURL=chunk-ULOEATBZ.js.map
+//# sourceMappingURL=chunk-NFFIKVNO.js.map