@diagrammo/dgmo 0.55.0 → 0.56.0

package/dist/{chunk-ETTDF3S2.js → chunk-3R67RRPC.js}

@@ -8,14 +8,14 @@ import {
 } from "./chunk-3CIOJ5YJ.js";
 import {
   layoutInlineHeader
-} from "./chunk-US3P2DQO.js";
+} from "./chunk-6VJCURWU.js";
 import {
   renderIntegratedLegend
-} from "./chunk-ASPS5O6F.js";
+} from "./chunk-QDOYT6UW.js";
 import {
   getLegendExtent,
   getMaxLegendReservedHeight
-} from "./chunk-GRXPFBYC.js";
+} from "./chunk-ES66QH6J.js";
 import {
   FONT_FAMILY
 } from "./chunk-6KFWC4CO.js";
@@ -28,12 +28,12 @@ import {
   mix,
   shapeFill,
   themeBaseBg
-} from "./chunk-JYDMBWRP.js";
+} from "./chunk-42IT4BG2.js";
 import {
   resolveActiveTagGroup,
   resolveTagColor,
   tagAttrKey
-} from "./chunk-JR7Q6GHE.js";
+} from "./chunk-D5FANMSG.js";
 
 // src/sketch/renderer.ts
 import * as d3 from "d3-selection";
@@ -213,7 +213,7 @@ function drawMarkdownBlock(container, text, opts) {
     const textEl = container.append("text").attr("x", line.x).attr("y", y).attr("font-size", fontSize);
     let cursorX = line.x;
     const segs = line.segments.slice();
-    if (clamped && isLast) {
+    if (clamped && isLast && !opts.noEllipsis) {
       segs.push({ text: ELLIPSIS, bold: false });
     }
     for (const seg of segs) {
@@ -227,7 +227,11 @@ function drawMarkdownBlock(container, text, opts) {
       cursorX += w;
     }
   }
-  return shown.length * lineHeight;
+  return {
+    height: shown.length * lineHeight,
+    shown: shown.length,
+    total: visualLines.length
+  };
 }
 
 // src/sketch/renderer.ts
@@ -237,8 +241,8 @@ var TITLE_FONT_SIZE = 18;
 var NODE_STROKE_WIDTH = 2;
 var EDGE_STROKE_WIDTH = 2;
 var EDGE_HIT_WIDTH = 18;
-var ARROWHEAD_W = 12;
-var ARROWHEAD_H = 8;
+var ARROWHEAD_W = 18;
+var ARROWHEAD_H = 12;
 var DASH = "6 3";
 var BAND_LABEL_FONT_SIZE = 19;
 var BAND_LABEL_OPACITY = 0.55;
@@ -277,14 +281,6 @@ function drawTypeBadge(g, kind, color, bx, by) {
       return;
   }
 }
-function metaRows(metadata, tagGroups) {
-  const rows = [];
-  for (const grp of tagGroups) {
-    const v = metadata[tagAttrKey(grp.name)];
-    if (v !== void 0) rows.push([grp.name, v]);
-  }
-  return rows;
-}
 var CARD_HEADER_H = 34;
 var CARD_LABEL_MAX = 15;
 var CARD_LABEL_MIN = 11;
@@ -308,7 +304,8 @@ function renderSketch(container, parsed, layout, palette, isDark, options = {})
   const {
     activeTagGroup,
     exportMode = false,
-    hideDescriptions = false
+    hideDescriptions = false,
+    splitCardIds
   } = options;
   const hideDesc = hideDescriptions || parsed.options.noDescriptions;
   const neutralFill = parsed.options.fillMode === "outline" ? themeBaseBg(palette, isDark) : mix(palette.textMuted, palette.bg, 12);
@@ -573,7 +570,7 @@ function renderSketch(container, parsed, layout, palette, isDark, options = {})
       colorsFor(node.metadata),
       palette,
       isDark,
-      hideDesc ? [] : tagGroups
+      !hideDesc && (splitCardIds?.includes(node.id) ?? false)
     );
   }
   const labelLayer = root.append("g").attr("class", "sk-edge-labels");
@@ -600,7 +597,7 @@ function drawBoxFrame(layer, box, colors, palette) {
     g.append("text").attr("x", box.x + box.w / 2).attr("y", startY + li * lineH).attr("text-anchor", "middle").attr("dominant-baseline", "central").attr("font-size", fit.fontSize).attr("font-weight", 800).attr("fill", palette.text).attr("opacity", BAND_LABEL_OPACITY).text(fit.lines[li]);
   }
 }
-function drawNode(layer, node, colors, palette, isDark, tagGroups) {
+function drawNode(layer, node, colors, palette, isDark, splitCard) {
   void isDark;
   const g = layer.append("g").attr("class", node.isCollapsedBox ? "sk-node sk-box-collapsed" : "sk-node").attr("transform", `translate(${node.x},${node.y})`).attr("data-node-id", node.id).attr("data-line-number", node.lineNumber);
   for (const [k, v] of Object.entries(node.metadata)) {
@@ -617,12 +614,11 @@ function drawNode(layer, node, colors, palette, isDark, tagGroups) {
       g.append("text").attr("x", 10).attr("y", 20 + i * lineHeight).attr("font-size", NOTE_FONT_SIZE).attr("fill", colors.text).text(line);
     });
   } else {
-    const rows = node.isCollapsedBox ? [] : metaRows(node.metadata, tagGroups);
     const badge = node.shape !== "rectangle";
     const labelInset = badge ? 22 : 0;
     const solidLike = colors.stroke === colors.fill;
     const ruleColor = solidLike ? colors.text : colors.stroke;
-    if (node.description && !node.isCollapsedBox) {
+    if (!node.isCollapsedBox && (node.description || splitCard)) {
       const fitH = fitWrapped(
         node.label,
         node.w - 24 - labelInset,
@@ -643,33 +639,37 @@ function drawNode(layer, node, colors, palette, isDark, tagGroups) {
         headerHeight: CARD_HEADER_H
       });
       g.append("line").attr("x1", 0).attr("y1", CARD_HEADER_H).attr("x2", node.w).attr("y2", CARD_HEADER_H).attr("stroke", ruleColor).attr("stroke-opacity", 0.3).attr("stroke-width", 1);
-      const inset = 12;
-      const bodyGap = 8;
-      const lh = CARD_META_FONT + 4;
-      const avail = node.h - CARD_HEADER_H - bodyGap - 8;
-      const body = g.append("g").attr("class", "sk-desc").attr("transform", `translate(${inset} ${CARD_HEADER_H + bodyGap})`);
-      drawMarkdownBlock(body, node.description, {
-        width: node.w - inset * 2,
-        fontSize: CARD_META_FONT,
-        lineHeight: lh,
-        color: colors.text,
-        // match the header label (contrast-aware in solid)
-        linkColor: colors.text,
-        maxLines: Math.max(1, Math.floor(avail / lh))
-      });
+      if (node.description) {
+        const inset = 12;
+        const bodyGap = 8;
+        const lh = CARD_META_FONT + 4;
+        const avail = node.h - CARD_HEADER_H - bodyGap - 8;
+        const body = g.append("g").attr("class", "sk-desc").attr("transform", `translate(${inset} ${CARD_HEADER_H + bodyGap})`);
+        const block = drawMarkdownBlock(body, node.description, {
+          width: node.w - inset * 2,
+          fontSize: CARD_META_FONT,
+          lineHeight: lh,
+          color: colors.text,
+          // match the header label (contrast-aware in solid)
+          linkColor: colors.text,
+          maxLines: Math.max(1, Math.floor(avail / lh)),
+          noEllipsis: true
+        });
+        if (block.total > block.shown) {
+          g.append("text").attr("class", "sk-desc-more").attr("x", node.w - 8).attr("y", node.h - 5).attr("text-anchor", "end").attr("font-size", 9).attr("fill", palette.textMuted).attr("data-line-number", node.lineNumber).style("cursor", "pointer").text(`+${block.total - block.shown} more in source`);
+        }
+      }
       if (badge) {
         drawTypeBadge(g, node.shape, colors.text, 10, (CARD_HEADER_H - 16) / 2);
       }
       return;
     }
-    const headerH = rows.length ? CARD_HEADER_H : node.h;
-    const fillTitle = rows.length === 0;
     const fit = fitWrapped(
       node.label,
       node.w - 24 - labelInset,
-      fillTitle ? CARD_TITLE_MAX : CARD_LABEL_MAX,
+      CARD_TITLE_MAX,
       CARD_LABEL_MIN,
-      fillTitle ? 3 : 2
+      3
     );
     renderNodeCard(g, {
       width: node.w,
@@ -682,18 +682,7 @@ function drawNode(layer, node, colors, palette, isDark, tagGroups) {
       labelLines: fit.lines,
       labelColor: colors.text,
       labelFontSize: fit.fontSize,
-      headerHeight: headerH,
-      ...rows.length ? {
-        meta: {
-          rows,
-          fontSize: CARD_META_FONT,
-          lineHeight: CARD_META_FONT + 5,
-          separatorGap: 8,
-          separatorColor: ruleColor,
-          textColor: solidLike ? colors.text : palette.text,
-          keyX: 12
-        }
-      } : {}
+      headerHeight: node.h
     });
     if (badge) {
       drawTypeBadge(g, node.shape, colors.text, 10, (CARD_HEADER_H - 16) / 2);
@@ -951,6 +940,8 @@ function sketchEdgeGeometry(layout, offsets) {
     const n = normalOf(side);
     return 1 - (n.x * dx + n.y * dy) / len;
   };
+  const W_BACK = 2.6;
+  const backFacingCost = (from, to, side) => W_BACK * Math.max(0, facingCost(from, to, side) - 1);
   const ctx = layout.edges.map((edge) => {
     const source = rectById.get(edge.sourceId);
     const target = rectById.get(edge.targetId);
@@ -985,6 +976,7 @@ function sketchEdgeGeometry(layout, offsets) {
   const W_NODE = 100;
   const W_EDGE = 8;
   const W_PORT = 1.5;
+  const W_PORT_SAME = 0.6;
   const isBox = (id) => portsById.has(id);
   const portClashCount = (self, s, t) => {
     const e = layout.edges[self];
@@ -1002,6 +994,44 @@ function sketchEdgeGeometry(layout, offsets) {
     }
     return n;
   };
+  const portStackCount = (self, _s, t) => {
+    const e = layout.edges[self];
+    if (isBox(e.targetId)) return 0;
+    let n = 0;
+    for (let j = 0; j < layout.edges.length; j++) {
+      if (j === self) continue;
+      const ej = layout.edges[j];
+      if (ej.targetId === e.targetId && ej.sourceId !== e.sourceId && // not reciprocal
+      chosen[j].t === t)
+        n++;
+    }
+    return n;
+  };
+  const W_TURN = 0.55;
+  const W_SCURVE = 1.8;
+  const CURVE_STRAIGHT = 0.35;
+  const curveCostPoly = (pts) => {
+    let totalTurn = 0;
+    let inflections = 0;
+    let prevSign = 0;
+    for (let i = 1; i < pts.length - 1; i++) {
+      const ax = pts[i].x - pts[i - 1].x;
+      const ay = pts[i].y - pts[i - 1].y;
+      const bx = pts[i + 1].x - pts[i].x;
+      const by = pts[i + 1].y - pts[i].y;
+      const cross = ax * by - ay * bx;
+      const dot = ax * bx + ay * by;
+      if (ax === 0 && ay === 0) continue;
+      if (bx === 0 && by === 0) continue;
+      totalTurn += Math.abs(Math.atan2(cross, dot));
+      const sign = cross > 1e-6 ? 1 : cross < -1e-6 ? -1 : 0;
+      if (sign !== 0) {
+        if (prevSign !== 0 && sign !== prevSign) inflections++;
+        prevSign = sign;
+      }
+    }
+    return totalTurn * W_TURN + inflections * W_SCURVE;
+  };
   const scoreOf = (c, g, poly, self, polys2, s, t) => {
     let edgeCross = 0;
     for (let j = 0; j < polys2.length; j++) {
@@ -1009,7 +1039,7 @@ function sketchEdgeGeometry(layout, offsets) {
       const pj = polys2[j];
       if (pj) edgeCross += polyCrossings(poly, pj);
     }
-    return pathCrossings(g, c.obstacleRects) * W_NODE + edgeCross * W_EDGE + portClashCount(self, s, t) * W_PORT + facingCost(c.source, c.target, s) + facingCost(c.target, c.source, t);
+    return pathCrossings(g, c.obstacleRects) * W_NODE + edgeCross * W_EDGE + portClashCount(self, s, t) * W_PORT + portStackCount(self, s, t) * W_PORT_SAME + curveCostPoly(poly) + facingCost(c.source, c.target, s) + facingCost(c.target, c.source, t) + backFacingCost(c.source, c.target, s) + backFacingCost(c.target, c.source, t);
   };
   const chosen = layout.edges.map(
     (_, i) => sides[i] ?? { s: "R", t: "L" }
@@ -1034,7 +1064,8 @@ function sketchEdgeGeometry(layout, offsets) {
       if (!c || !g || !p) continue;
       const cur = chosen[i];
       const curScore = scoreOf(c, g, p, i, polys, cur.s, cur.t);
-      if (curScore < W_EDGE && portClashCount(i, cur.s, cur.t) === 0) continue;
+      if (curScore < W_EDGE && portClashCount(i, cur.s, cur.t) === 0 && portStackCount(i, cur.s, cur.t) === 0 && curveCostPoly(p) < CURVE_STRAIGHT && backFacingCost(c.source, c.target, cur.s) === 0 && backFacingCost(c.target, c.source, cur.t) === 0)
+        continue;
       let bestScore = curScore;
       let bestG = g;
       let bestP = p;
@@ -1097,4 +1128,4 @@ export {
   sketchEdgeGeometry,
   renderSketchForExport
 };
-//# sourceMappingURL=chunk-ETTDF3S2.js.map
+//# sourceMappingURL=chunk-3R67RRPC.js.map

package/dist/{chunk-JYDMBWRP.js → chunk-42IT4BG2.js}

@@ -1,6 +1,6 @@
 import {
   CATEGORICAL_COLOR_ORDER
-} from "./chunk-ZKPPI6BF.js";
+} from "./chunk-EXNKNJ65.js";
 
 // src/palettes/color-utils.ts
 var HEX_TO_HSL_CACHE = /* @__PURE__ */ new Map();
@@ -241,4 +241,4 @@ export {
   getSegmentColors,
   politicalTints
 };
-//# sourceMappingURL=chunk-JYDMBWRP.js.map
+//# sourceMappingURL=chunk-42IT4BG2.js.map

package/dist/{chunk-JQLSFZZP.js → chunk-4MB4UOT5.js}

@@ -5,11 +5,11 @@ import {
   splitNameAndMeta,
   tryParseSharedOption,
   warnUnknownMetaKeys
-} from "./chunk-A2ARDILY.js";
+} from "./chunk-3KOPPSUQ.js";
 import {
   makeDgmoError,
   makeFail
-} from "./chunk-4W2PE66Q.js";
+} from "./chunk-OLMWTJVU.js";
 
 // src/cycle/parser.ts
 var BARE_EDGE_RE = /^->\s*(.*)?$/;
@@ -274,4 +274,4 @@ function parseCycle(content) {
 export {
   parseCycle
 };
-//# sourceMappingURL=chunk-JQLSFZZP.js.map
+//# sourceMappingURL=chunk-4MB4UOT5.js.map

package/dist/{chunk-ITXL2KU5.js → chunk-4MJOBVY7.js}

@@ -7,10 +7,10 @@ import {
   splitNameAndMeta,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-A2ARDILY.js";
+} from "./chunk-3KOPPSUQ.js";
 import {
   makeDgmoError
-} from "./chunk-4W2PE66Q.js";
+} from "./chunk-OLMWTJVU.js";
 
 // src/timeline/parser.ts
 var TIMELINE_DURATION_RE = /^(\d+(?:\.\d{1,2})?)(min|[dwmyhs])(\?)?$/;
@@ -314,4 +314,4 @@ export {
   parseTimelineDate,
   parseTimelineEventLine
 };
-//# sourceMappingURL=chunk-ITXL2KU5.js.map
+//# sourceMappingURL=chunk-4MJOBVY7.js.map

package/dist/{chunk-WITOJZGL.js → chunk-5J2RQGFG.js}

@@ -9,19 +9,19 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-JR7Q6GHE.js";
+} from "./chunk-D5FANMSG.js";
 import {
   extractColor,
   fillModeFromToken,
   measureIndent,
   parseFirstLine
-} from "./chunk-A2ARDILY.js";
+} from "./chunk-3KOPPSUQ.js";
 import {
   formatDgmoError,
   makeDgmoError,
   makeFail,
   suggest
-} from "./chunk-4W2PE66Q.js";
+} from "./chunk-OLMWTJVU.js";
 
 // src/block/parser.ts
 function parseBlock(content, palette) {
@@ -342,4 +342,4 @@ function parseBlockTail(tail, aliasMap) {
 export {
   parseBlock
 };
-//# sourceMappingURL=chunk-WITOJZGL.js.map
+//# sourceMappingURL=chunk-5J2RQGFG.js.map

package/dist/{chunk-FBP33UM6.js → chunk-5VLUAAAE.js}

@@ -4,16 +4,16 @@ import {
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey
-} from "./chunk-JR7Q6GHE.js";
+} from "./chunk-D5FANMSG.js";
 import {
   FILL_FAMILY_TOKENS,
   extractColor,
   measureIndent,
   parseFirstLine
-} from "./chunk-A2ARDILY.js";
+} from "./chunk-3KOPPSUQ.js";
 import {
   emit
-} from "./chunk-4W2PE66Q.js";
+} from "./chunk-OLMWTJVU.js";
 
 // src/swimlane/diagnostics.ts
 var SWIMLANE_DX = {
@@ -692,4 +692,4 @@ export {
   SWIMLANE_DIAGNOSTICS,
   parseSwimlane
 };
-//# sourceMappingURL=chunk-FBP33UM6.js.map
+//# sourceMappingURL=chunk-5VLUAAAE.js.map

package/dist/{chunk-P5XXIVEU.js → chunk-5XMDSXZT.js}

@@ -5,11 +5,11 @@ import {
   normalizeNumericToken,
   parseFirstLine,
   tryParseSharedOption
-} from "./chunk-A2ARDILY.js";
+} from "./chunk-3KOPPSUQ.js";
 import {
   makeDgmoError,
   makeFail
-} from "./chunk-4W2PE66Q.js";
+} from "./chunk-OLMWTJVU.js";
 
 // src/goal/parser.ts
 function parseGoalNumber(token) {
@@ -158,4 +158,4 @@ function parseGoal(content, palette) {
 export {
   parseGoal
 };
-//# sourceMappingURL=chunk-P5XXIVEU.js.map
+//# sourceMappingURL=chunk-5XMDSXZT.js.map

package/dist/{chunk-32HUNA33.js → chunk-5ZDHXS5N.js}

@@ -1,6 +1,6 @@
 import {
   analyzePert
-} from "./chunk-HO3RCNF6.js";
+} from "./chunk-CGLBK5Q4.js";
 import {
   computeNodeSizing,
   layoutPert
@@ -19,13 +19,16 @@ import {
 import {
   INLINE_HEADER_PAD,
   layoutInlineHeader
-} from "./chunk-US3P2DQO.js";
+} from "./chunk-6VJCURWU.js";
+import {
+  serializeSvg
+} from "./chunk-NZ5QVASG.js";
 import {
   renderIntegratedLegend
-} from "./chunk-ASPS5O6F.js";
+} from "./chunk-QDOYT6UW.js";
 import {
   getLegendExtent
-} from "./chunk-GRXPFBYC.js";
+} from "./chunk-ES66QH6J.js";
 import {
   CAPTION_BOX_PADDING_X,
   CAPTION_BOX_PADDING_Y,
@@ -42,7 +45,7 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   parsePert
-} from "./chunk-5K5XBEXT.js";
+} from "./chunk-DIKIHU52.js";
 import {
   addCalendarDays,
   formatDuration,
@@ -52,7 +55,7 @@ import {
 } from "./chunk-3TYUXC7D.js";
 import {
   LEGEND_HEIGHT
-} from "./chunk-Q5IHQ4NW.js";
+} from "./chunk-SCJ7CAJF.js";
 import {
   measureText,
   truncateText,
@@ -63,11 +66,11 @@ import {
   mix,
   shapeFill,
   themeBaseBg
-} from "./chunk-JYDMBWRP.js";
+} from "./chunk-42IT4BG2.js";
 import {
   resolveActiveTagGroup,
   resolveTagColor
-} from "./chunk-JR7Q6GHE.js";
+} from "./chunk-D5FANMSG.js";
 
 // src/pert/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -384,7 +387,7 @@ function renderPertForExport(content, theme, palette, now) {
     else svgEl.style.background = palette.bg;
     svgEl.setAttribute("xmlns", "http://www.w3.org/2000/svg");
     svgEl.style.fontFamily = FONT_FAMILY;
-    return svgEl.outerHTML;
+    return serializeSvg(svgEl);
   } finally {
     document.body.removeChild(container);
   }
@@ -1865,4 +1868,4 @@ export {
   measurePertAnalysisBlock,
   renderPertAnalysisBlock
 };
-//# sourceMappingURL=chunk-32HUNA33.js.map
+//# sourceMappingURL=chunk-5ZDHXS5N.js.map