@diagrammo/dgmo 0.91.0 → 0.91.1

package/dist/advanced.js

@@ -349,7 +349,7 @@ import {
   renderSlopeChart,
   renderVenn,
   renderWordCloud
-} from "./chunk-3LINSNJT.js";
+} from "./chunk-KA5CSR44.js";
 import {
   layoutBracket
 } from "./chunk-ABP5BUD6.js";
@@ -415,7 +415,7 @@ import "./chunk-BDXC7MDK.js";
 import {
   renderLegendSvg,
   renderLegendSvgFromConfig
-} from "./chunk-KFXY5IW2.js";
+} from "./chunk-27KA4VV6.js";
 import "./chunk-KMU65FYM.js";
 import "./chunk-EPDBWATV.js";
 import {

package/dist/block.js

@@ -4,7 +4,7 @@ import {
 } from "./chunk-D3K4U3ZM.js";
 import {
   render
-} from "./chunk-3LINSNJT.js";
+} from "./chunk-KA5CSR44.js";
 import "./chunk-ABP5BUD6.js";
 import {
   docsLink,
@@ -26,7 +26,7 @@ import "./chunk-A2RUBBVT.js";
 import "./chunk-3YTAOMMN.js";
 import "./chunk-IUBCDNT2.js";
 import "./chunk-BDXC7MDK.js";
-import "./chunk-KFXY5IW2.js";
+import "./chunk-27KA4VV6.js";
 import "./chunk-KMU65FYM.js";
 import "./chunk-EPDBWATV.js";
 import "./chunk-HFG7KQOY.js";

package/dist/{charts-d3-YXD6VGZQ.js → charts-d3-KSA5UKVJ.js}

@@ -2,7 +2,7 @@ import {
   D3_DATA_CHART_TYPES,
   renderDataChartD3,
   supportsD3DataChart
-} from "./chunk-KFXY5IW2.js";
+} from "./chunk-27KA4VV6.js";
 import "./chunk-KMU65FYM.js";
 import "./chunk-EPDBWATV.js";
 import "./chunk-HFG7KQOY.js";

package/dist/{chunk-KFXY5IW2.js → chunk-27KA4VV6.js}

@@ -1600,6 +1600,35 @@ function renderSankey(svg, chart, width, height, colors, bgColor, textColor, top
   const maxRank = Math.max(...[...node.values()].map((n) => n.rank));
   const layers = Array.from({ length: maxRank + 1 }, () => []);
   for (const n of node.values()) layers[n.rank].push(n);
+  const segs = [];
+  const chains = /* @__PURE__ */ new Map();
+  for (const l of forwardLinks) {
+    const t = node.get(l.target);
+    let prev = node.get(l.source);
+    const chain = [];
+    for (let r = prev.rank + 1; r <= t.rank; r++) {
+      let next = t;
+      if (r < t.rank) {
+        next = {
+          name: `${l.source}\u241F${l.target}\u241F${r}`,
+          rank: r,
+          value: l.value,
+          order: prev.order,
+          x: 0,
+          y: 0,
+          h: 0,
+          raw: prev.raw,
+          virtual: true
+        };
+        layers[r].push(next);
+      }
+      const seg = { s: prev, t: next, value: l.value, sy: 0, ty: 0 };
+      chain.push(seg);
+      segs.push(seg);
+      prev = next;
+    }
+    chains.set(l, chain);
+  }
   let plotLeft = 16;
   const top = topInset + 8;
   const rightPad = 16;
@@ -1657,7 +1686,7 @@ function renderSankey(svg, chart, width, height, colors, bgColor, textColor, top
     const order = forward ? [...layers.keys()] : [...layers.keys()].reverse();
     for (const r of order) {
       for (const n of layers[r]) {
-        const neigh = forward ? forwardLinks.filter((l) => l.target === n.name).map((l) => node.get(l.source)) : forwardLinks.filter((l) => l.source === n.name).map((l) => node.get(l.target));
+        const neigh = forward ? segs.filter((g) => g.t === n).map((g) => g.s) : segs.filter((g) => g.s === n).map((g) => g.t);
         n.order = neigh.length ? neigh.reduce((a, m) => a + center(m), 0) / neigh.length : center(n);
       }
       placeLayer(layers[r]);
@@ -1665,9 +1694,23 @@ function renderSankey(svg, chart, width, height, colors, bgColor, textColor, top
   }
   const outOff = /* @__PURE__ */ new Map();
   const inOff = /* @__PURE__ */ new Map();
-  for (const n of node.values()) {
-    outOff.set(n.name, n.y);
-    inOff.set(n.name, n.y);
+  for (const layer of layers) {
+    for (const n of layer) {
+      outOff.set(n, n.y);
+      inOff.set(n, n.y);
+    }
+  }
+  const slot = (n, th, off) => {
+    const y = off.get(n);
+    off.set(n, y + th);
+    return y;
+  };
+  for (const g of [...segs].sort(
+    (a, b) => a.s.y !== b.s.y ? a.s.y - b.s.y : a.t.y - b.t.y
+  )) {
+    const th = g.value * valueScale;
+    g.sy = slot(g.s, th, outOff);
+    g.ty = slot(g.t, th, inOff);
   }
   const ordered = [
     ...[...forwardLinks].sort((a, b) => {
@@ -1683,18 +1726,15 @@ function renderSankey(svg, chart, width, height, colors, bgColor, textColor, top
     const s = node.get(l.source);
     const t = node.get(l.target);
     const th = l.value * valueScale;
-    const sy = outOff.get(s.name);
-    const ty = inOff.get(t.name);
-    outOff.set(s.name, sy + th);
-    inOff.set(t.name, ty + th);
     const sx = s.x + NODE_W;
     const tx = t.x;
-    const cx0 = sx + (tx - sx) * 0.5;
     const raw = l.color ?? s.raw;
     const color = solid ? raw : mix(raw, bgColor, 45);
     const opacity = linkDimmed(l) ? RIBBON_FILL_OPACITY * EMPHASIS_DIM_OPACITY : RIBBON_FILL_OPACITY;
     let ribbon;
     if (backEdges.has(l)) {
+      const sy = slot(s, th, outOff);
+      const ty = slot(t, th, inOff);
       const lane = laneY + th / 2;
       laneY += th + LOOP_GAP;
       const k = th;
@@ -1705,10 +1745,20 @@ function renderSankey(svg, chart, width, height, colors, bgColor, textColor, top
         `M${sx},${y1} C${sx + k},${y1} ${sx + k},${lane} ${sx},${lane} L${tx},${lane} C${tx - k},${lane} ${tx - k},${y2} ${tx},${y2}`
       ).attr("fill", "none").attr("stroke", color).attr("stroke-width", th).attr("stroke-opacity", opacity);
     } else {
-      ribbon = svg.append("path").attr(
-        "d",
-        `M${sx},${sy} C${cx0},${sy} ${cx0},${ty} ${tx},${ty} L${tx},${ty + th} C${cx0},${ty + th} ${cx0},${sy + th} ${sx},${sy + th} Z`
-      ).attr("fill", color).attr("fill-opacity", opacity);
+      const chain = chains.get(l);
+      const top2 = [];
+      const bottom = [];
+      chain.forEach((g, i) => {
+        const gx = g.s.x + NODE_W;
+        const cx = (gx + g.t.x) / 2;
+        top2.push(
+          `${i === 0 ? "M" : "L"}${gx},${g.sy} C${cx},${g.sy} ${cx},${g.ty} ${g.t.x},${g.ty}`
+        );
+        bottom.unshift(
+          `L${g.t.x},${g.ty + th} C${cx},${g.ty + th} ${cx},${g.sy + th} ${gx},${g.sy + th}`
+        );
+      });
+      ribbon = svg.append("path").attr("d", `${top2.join(" ")} ${bottom.join(" ")} Z`).attr("fill", color).attr("fill-opacity", opacity);
     }
     tagDatum(ribbon, {
       line: l.lineNumber,

package/dist/{chunk-3LINSNJT.js → chunk-KA5CSR44.js}

@@ -32,7 +32,7 @@ import {
 } from "./chunk-IUBCDNT2.js";
 import {
   renderDataChartD3
-} from "./chunk-KFXY5IW2.js";
+} from "./chunk-27KA4VV6.js";
 import {
   computeQuadrantPointLabels
 } from "./chunk-KMU65FYM.js";
@@ -2089,7 +2089,7 @@ async function renderForExport(content, theme, palette, viewState, options) {
   const renderContent = override?.content ?? content;
   const detectedType = override?.type ?? detectedTypeRaw;
   if (detectedType !== null) {
-    const { supportsD3DataChart, renderDataChartD3: renderDataChartD32 } = await import("./charts-d3-YXD6VGZQ.js");
+    const { supportsD3DataChart, renderDataChartD3: renderDataChartD32 } = await import("./charts-d3-KSA5UKVJ.js");
     if (supportsD3DataChart(detectedType)) {
       return renderDataChartD32(renderContent, theme, palette, {
         ...options?.width !== void 0 && { width: options.width },

package/dist/index.js

@@ -14,7 +14,7 @@ import {
 } from "./chunk-Z6DXWULM.js";
 import {
   render
-} from "./chunk-3LINSNJT.js";
+} from "./chunk-KA5CSR44.js";
 import "./chunk-ABP5BUD6.js";
 import {
   renderErrorCard
@@ -39,7 +39,7 @@ import {
   D3_DATA_CHART_TYPES,
   renderDataChartD3,
   supportsD3DataChart
-} from "./chunk-KFXY5IW2.js";
+} from "./chunk-27KA4VV6.js";
 import "./chunk-KMU65FYM.js";
 import "./chunk-EPDBWATV.js";
 import "./chunk-HFG7KQOY.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diagrammo/dgmo",
-  "version": "0.91.0",
+  "version": "0.91.1",
   "description": "DGMO diagram markup language — parser, renderer, and color system",
   "license": "MIT",
   "author": "Diagrammo LLC",
@@ -116,7 +116,7 @@
     "check:duplication": "jscpd ./src",
     "check:deadcode": "knip",
     "check:spelling": "cspell \"src/**/*.ts\" \"tests/**/*.ts\"",
-    "check:all": "pnpm check:node-modules && pnpm check:install-lock && pnpm check:deadcode && pnpm check:spelling && pnpm check:duplication && pnpm check:circular && pnpm check:deps && pnpm check:dep-ranges && pnpm check:security && node --test scripts/check-api.test.mjs && pnpm build && bash scripts/check-api.sh check && pnpm check:publish && pnpm check:types",
+    "check:all": "pnpm check:node-modules && pnpm check:install-lock && pnpm check:deadcode && pnpm check:spelling && pnpm check:duplication && pnpm check:circular && pnpm check:deps && pnpm check:dep-ranges && pnpm check:security && node --test scripts/check-api.test.mjs && node --test scripts/prepack-sourcemaps.test.mjs && pnpm build && bash scripts/check-api.sh check && pnpm check:publish && pnpm check:types",
     "check:circular": "node --test scripts/check-circular.test.mjs && madge --circular --extensions ts src/ --json | node scripts/check-circular.mjs",
     "check:deps": "depcheck --ignores='@diagrammo/dgmo,@diagrammo/dgmo-mcp,@codemirror/language,@lezer/*,lint-staged,tsup,axe-core,type-coverage'",
     "check:node-modules": "node --test scripts/check-node-modules.test.mjs && node scripts/check-node-modules.mjs",