@diagrammo/dgmo 0.55.0 → 0.56.0

package/dist/{chunk-MEQYZZFR.js → chunk-6IVXRTXH.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-RT7ACF77.js";
 import {
   makeDgmoError
-} from "./chunk-4W2PE66Q.js";
+} from "./chunk-OLMWTJVU.js";
 
 // src/sketch/geometry.ts
 var SKETCH_PHI = (1 + Math.sqrt(5)) / 2;
@@ -72,6 +72,16 @@ function collapseSketch(parsed, collapsedLabels) {
 }
 
 // src/sketch/layout.ts
+function resolveAutoFlags(f = {}) {
+  return {
+    normalizeOrigin: f.normalizeOrigin ?? true,
+    sortRootsBySource: f.sortRootsBySource ?? true,
+    resolveOverlap: f.resolveOverlap ?? true,
+    groupCollisionAsRect: f.groupCollisionAsRect ?? true,
+    flowPlaceUnpositioned: f.flowPlaceUnpositioned ?? true,
+    avoidEdges: f.avoidEdges ?? true
+  };
+}
 function unitRect(c, r) {
   return { c, r, w: SKETCH_SEP, h: SKETCH_SEP };
 }
@@ -104,7 +114,7 @@ function nearestFree(base, occupied) {
   }
   return { c: base.c, r: base.r };
 }
-function layoutChildren(box, nodesById, warn) {
+function layoutChildren(box, nodesById, warn, flags) {
   const occupied = [];
   const children = [];
   const pending = [];
@@ -116,13 +126,17 @@ function layoutChildren(box, nodesById, warn) {
       continue;
     }
     const target = unitRect(node.at.c, node.at.r);
-    const spot = nearestFree(target, occupied);
+    const spot = flags.resolveOverlap ? nearestFree(target, occupied) : { c: node.at.c, r: node.at.r };
     if (spot.c !== node.at.c || spot.r !== node.at.r) {
       warn(node.lineNumber, node.label);
     }
     occupied.push(unitRect(spot.c, spot.r));
     children.push({ node, c: spot.c, r: spot.r });
   }
+  if (!flags.flowPlaceUnpositioned) {
+    for (const node of pending) children.push({ node, c: 0, r: 0 });
+    pending.length = 0;
+  }
   let flowRow = occupied.length > 0 ? Math.max(...occupied.map((o) => o.r)) + SKETCH_SEP : 0;
   let flowCol = 0;
   const wrapAt = Math.max(
@@ -169,6 +183,7 @@ function layoutSketch(parsed, options = {}) {
       )
     );
   };
+  const flags = resolveAutoFlags(options.autoLayout);
   const collapsed = collapseSketch(parsed, options.collapsedBoxes);
   const nodesById = new Map(collapsed.nodes.map((n) => [n.id, n]));
   const padHsX = SKETCH_GEOMETRY.boxPadPx / SKETCH_HALF_SLOT_X;
@@ -177,10 +192,39 @@ function layoutSketch(parsed, options = {}) {
   const boxLocal = /* @__PURE__ */ new Map();
   const inExpandedBox = /* @__PURE__ */ new Set();
   for (const box of collapsed.boxes) {
-    const local = layoutChildren(box, nodesById, overlapWarn);
+    const local = layoutChildren(box, nodesById, overlapWarn, flags);
     boxLocal.set(box.id, local);
     for (const child of local.children) inExpandedBox.add(child.node.id);
   }
+  const allNodesById = new Map(parsed.nodes.map((n) => [n.id, n]));
+  const noWarn = () => {
+  };
+  const virtualLocal = /* @__PURE__ */ new Map();
+  for (const box of collapsed.virtualBoxes) {
+    virtualLocal.set(box.id, layoutChildren(box, allNodesById, noWarn, flags));
+  }
+  const footWs = SKETCH_FOOT_W / SKETCH_HALF_SLOT_X;
+  const footHs = SKETCH_FOOT_H / SKETCH_HALF_SLOT_Y;
+  const virtualCardSpot = (boxId, spot) => {
+    const local = virtualLocal.get(boxId);
+    if (local.children.length === 0) return { c: spot.c, r: spot.r };
+    let minC = Infinity;
+    let minR = Infinity;
+    let maxC = -Infinity;
+    let maxR = -Infinity;
+    for (const ch of local.children) {
+      minC = Math.min(minC, ch.c);
+      minR = Math.min(minR, ch.r);
+      maxC = Math.max(maxC, ch.c + footWs);
+      maxR = Math.max(maxR, ch.r + footHs);
+    }
+    const cx = spot.c + (minC + maxC) / 2;
+    const cy = spot.r + (minR + maxR) / 2 + (padHsY - bandHs) / 2;
+    return {
+      c: Math.round(cx - footWs / 2),
+      r: Math.round(cy - footHs / 2)
+    };
+  };
   const rootUnits = [];
   for (const node of collapsed.nodes) {
     if (!inExpandedBox.has(node.id)) rootUnits.push({ kind: "shape", node });
@@ -191,14 +235,27 @@ function layoutSketch(parsed, options = {}) {
   for (const box of collapsed.boxes) {
     rootUnits.push({ kind: "box", box });
   }
-  rootUnits.sort((a, b) => {
-    const la = a.kind === "shape" ? a.node.lineNumber : a.box.lineNumber;
-    const lb = b.kind === "shape" ? b.node.lineNumber : b.box.lineNumber;
-    return la - lb;
-  });
+  const lineOf = (u) => u.kind === "shape" ? u.node.lineNumber : u.box.lineNumber;
+  const atOf = (u) => u.kind === "shape" ? u.node.at : u.box.at;
+  if (flags.sortRootsBySource) {
+    rootUnits.sort((a, b) => lineOf(a) - lineOf(b));
+  } else {
+    rootUnits.sort((a, b) => {
+      const aa = atOf(a);
+      const ba = atOf(b);
+      if (aa && ba) {
+        return aa.r - ba.r || aa.c - ba.c || lineOf(a) - lineOf(b);
+      }
+      if (aa) return -1;
+      if (ba) return 1;
+      return lineOf(a) - lineOf(b);
+    });
+  }
   const rectFor = (unit, c, r) => {
-    if (unit.kind === "box") {
-      const local = boxLocal.get(unit.box.id);
+    if (unit.kind !== "shape" && flags.groupCollisionAsRect) {
+      const local = (unit.kind === "box" ? boxLocal : virtualLocal).get(
+        unit.box.id
+      );
       return {
         c: c + local.extent.c - padHsX,
         r: r + local.extent.r - bandHs,
@@ -212,26 +269,31 @@ function layoutSketch(parsed, options = {}) {
   const placedAt = /* @__PURE__ */ new Map();
   const pending = [];
   for (const unit of rootUnits) {
-    const at = unit.kind === "shape" ? unit.node.at : unit.box.at;
+    const at = atOf(unit);
     if (at === null) {
       pending.push(unit);
       continue;
     }
     const base = rectFor(unit, at.c, at.r);
     let spot = { c: at.c, r: at.r };
-    if (collidesAny(base, occupied)) {
+    if (flags.resolveOverlap && unit.kind === "shape" && collidesAny(base, occupied)) {
       const freed = nearestFree(base, occupied);
       spot = {
         c: at.c + (freed.c - base.c),
         r: at.r + (freed.r - base.r)
       };
-      const line = unit.kind === "shape" ? unit.node.lineNumber : unit.box.lineNumber;
-      const label = unit.kind === "shape" ? unit.node.label : unit.box.label;
-      overlapWarn(line, label);
+      overlapWarn(unit.node.lineNumber, unit.node.label);
     }
     occupied.push(rectFor(unit, spot.c, spot.r));
     placedAt.set(unit, spot);
   }
+  if (!flags.flowPlaceUnpositioned) {
+    for (const unit of pending) {
+      occupied.push(rectFor(unit, 0, 0));
+      placedAt.set(unit, { c: 0, r: 0 });
+    }
+    pending.length = 0;
+  }
   let flowRow = occupied.length > 0 ? Math.ceil(Math.max(...occupied.map((o) => o.r + o.h))) : 0;
   let flowCol = 0;
   const wrapAt = Math.max(
@@ -258,8 +320,10 @@ function layoutSketch(parsed, options = {}) {
     const spot = placedAt.get(u);
     return rectFor(u, spot.c, spot.r);
   });
-  const cMin = allRects.length > 0 ? Math.min(...allRects.map((r) => r.c)) : 0;
-  const rMin = allRects.length > 0 ? Math.min(...allRects.map((r) => r.r)) : 0;
+  const liveCMin = allRects.length > 0 ? Math.min(...allRects.map((r) => r.c)) : 0;
+  const liveRMin = allRects.length > 0 ? Math.min(...allRects.map((r) => r.r)) : 0;
+  const cMin = flags.normalizeOrigin ? liveCMin : Math.min(options.frozenOrigin?.c ?? liveCMin, liveCMin);
+  const rMin = flags.normalizeOrigin ? liveRMin : Math.min(options.frozenOrigin?.r ?? liveRMin, liveRMin);
   const toPx = (c, r) => ({
     x: (c - cMin) * SKETCH_HALF_SLOT_X,
     y: (r - rMin) * SKETCH_HALF_SLOT_Y
@@ -284,14 +348,15 @@ function layoutSketch(parsed, options = {}) {
         h: SKETCH_FOOT_H
       });
     } else if (unit.kind === "virtual") {
-      const { x, y } = toPx(spot.c, spot.r);
+      const cardSpot = virtualCardSpot(unit.box.id, spot);
+      const { x, y } = toPx(cardSpot.c, cardSpot.r);
       nodes.push({
         id: unit.box.id,
         label: unit.box.label,
         shape: "rectangle",
         metadata: unit.box.metadata,
         lineNumber: unit.box.lineNumber,
-        slot: spot,
+        slot: cardSpot,
         x,
         y,
         w: SKETCH_FOOT_W,
@@ -348,7 +413,13 @@ function layoutSketch(parsed, options = {}) {
       });
     }
   }
-  {
+  if (flags.avoidEdges) {
+    const authored = /* @__PURE__ */ new Set();
+    for (const unit of rootUnits) {
+      if (atOf(unit) !== null) {
+        authored.add(unit.kind === "shape" ? unit.node.id : unit.box.id);
+      }
+    }
     const centerOf = (id) => {
       const n = nodes.find((nd) => nd.id === id);
       if (n) return { x: n.x + n.w / 2, y: n.y + n.h / 2 };
@@ -382,6 +453,7 @@ function layoutSketch(parsed, options = {}) {
       let moved = false;
       for (const n of nodes) {
         if (n.boxLabel) continue;
+        if (authored.has(n.id)) continue;
         for (const e of collapsed.edges) {
           if (e.sourceId === n.id || e.targetId === n.id) continue;
           const a = centerOf(e.sourceId);
@@ -432,7 +504,8 @@ function layoutSketch(parsed, options = {}) {
     edges: collapsed.edges,
     width,
     height,
-    diagnostics
+    diagnostics,
+    origin: { c: cMin, r: rMin }
   };
 }
 
@@ -449,4 +522,4 @@ export {
   collapseSketch,
   layoutSketch
 };
-//# sourceMappingURL=chunk-MEQYZZFR.js.map
+//# sourceMappingURL=chunk-6IVXRTXH.js.map

package/dist/{chunk-US3P2DQO.js → chunk-6VJCURWU.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-A4GOY3PE.js";
 import {
   LEGEND_HEIGHT
-} from "./chunk-Q5IHQ4NW.js";
+} from "./chunk-SCJ7CAJF.js";
 import {
   measureText
 } from "./chunk-4ASYQ347.js";
@@ -84,4 +84,4 @@ export {
   INLINE_HEADER_PAD,
   layoutInlineHeader
 };
-//# sourceMappingURL=chunk-US3P2DQO.js.map
+//# sourceMappingURL=chunk-6VJCURWU.js.map

package/dist/{chunk-QZAW5SFH.js → chunk-7NK42OIB.js}

@@ -4,7 +4,7 @@ import {
 import {
   makeDgmoError,
   suggest
-} from "./chunk-4W2PE66Q.js";
+} from "./chunk-OLMWTJVU.js";
 
 // src/utils/notes/resolve.ts
 function resolveNotes(notes, targets, diagnostics) {
@@ -65,4 +65,4 @@ function resolveNotes(notes, targets, diagnostics) {
 export {
   resolveNotes
 };
-//# sourceMappingURL=chunk-QZAW5SFH.js.map
+//# sourceMappingURL=chunk-7NK42OIB.js.map

package/dist/{chunk-NN5TF4OV.js → chunk-7SXTD7L6.js}

@@ -4,10 +4,10 @@ import {
 import {
   isTagBlockHeading,
   matchTagBlockHeading
-} from "./chunk-JR7Q6GHE.js";
+} from "./chunk-D5FANMSG.js";
 import {
   makeDgmoError
-} from "./chunk-4W2PE66Q.js";
+} from "./chunk-OLMWTJVU.js";
 
 // src/pert/share-normalize.ts
 var START_DATE_NOW_RE = /^(\s*start-date\s+)now(\s*)$/i;
@@ -401,4 +401,4 @@ export {
   normalizePertSourceForShare,
   resolveOrgImports
 };
-//# sourceMappingURL=chunk-NN5TF4OV.js.map
+//# sourceMappingURL=chunk-7SXTD7L6.js.map

package/dist/{chunk-VVIRAGID.js → chunk-A4DAZO3U.js}

@@ -7,12 +7,15 @@ import {
 import {
   ScaleContext
 } from "./chunk-YYVTBZZC.js";
+import {
+  serializeSvg
+} from "./chunk-NZ5QVASG.js";
 import {
   renderIntegratedLegend
-} from "./chunk-ASPS5O6F.js";
+} from "./chunk-QDOYT6UW.js";
 import {
   getMaxLegendReservedHeight
-} from "./chunk-GRXPFBYC.js";
+} from "./chunk-ES66QH6J.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT
@@ -22,11 +25,11 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   parseKanban
-} from "./chunk-RSBH2C7O.js";
+} from "./chunk-X32RDWT5.js";
 import {
   LEGEND_HEIGHT,
   measureLegendText
-} from "./chunk-Q5IHQ4NW.js";
+} from "./chunk-SCJ7CAJF.js";
 import {
   measureText
 } from "./chunk-4ASYQ347.js";
@@ -35,14 +38,14 @@ import {
   mix,
   shapeFill,
   themeBaseBg
-} from "./chunk-JYDMBWRP.js";
+} from "./chunk-42IT4BG2.js";
 import {
   tagAttrKey
-} from "./chunk-JR7Q6GHE.js";
+} from "./chunk-D5FANMSG.js";
 import {
   fillModeFromOptions,
   legendSuppressed
-} from "./chunk-A2ARDILY.js";
+} from "./chunk-3KOPPSUQ.js";
 
 // src/kanban/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -552,7 +555,7 @@ function renderKanbanForExport(content, theme, palette) {
     exportMode: true
   });
   const svgEl = container.querySelector("svg");
-  return svgEl?.outerHTML ?? "";
+  return svgEl ? serializeSvg(svgEl) : "";
 }
 var LANE_HEADER_WIDTH = 140;
 var LANE_GAP = 14;
@@ -893,4 +896,4 @@ export {
   renderKanban,
   renderKanbanForExport
 };
-//# sourceMappingURL=chunk-VVIRAGID.js.map
+//# sourceMappingURL=chunk-A4DAZO3U.js.map

package/dist/{chunk-UXXLE6AH.js → chunk-AIH6M5J6.js}

@@ -1,15 +1,15 @@
 import {
   buildSwatches
-} from "./chunk-B4XS2AF2.js";
+} from "./chunk-FWVKPEG3.js";
 import {
   layoutMap,
   mapLegendConfig,
   mapLegendGroups,
   parsePathRings
-} from "./chunk-ZGIBV36U.js";
+} from "./chunk-U7ZQTUZT.js";
 import {
   renderIntegratedLegend
-} from "./chunk-ASPS5O6F.js";
+} from "./chunk-QDOYT6UW.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -20,7 +20,7 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   parseClock
-} from "./chunk-AU75JHSR.js";
+} from "./chunk-YNAHUNMA.js";
 import {
   fixedParts,
   formatTime,
@@ -34,7 +34,7 @@ import {
 import {
   mix,
   themeBaseBg
-} from "./chunk-JYDMBWRP.js";
+} from "./chunk-42IT4BG2.js";
 
 // src/map/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -781,4 +781,4 @@ export {
   renderMap,
   renderMapForExport
 };
-//# sourceMappingURL=chunk-UXXLE6AH.js.map
+//# sourceMappingURL=chunk-AIH6M5J6.js.map

package/dist/{chunk-A4UJP4IS.js → chunk-AMC2OGXF.js}

@@ -18,14 +18,14 @@ import {
 } from "./chunk-YYVTBZZC.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 {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -37,7 +37,7 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   parseInfra
-} from "./chunk-RZWIPDZ2.js";
+} from "./chunk-FXVPSTDT.js";
 import {
   preprocessDescriptionLine
 } from "./chunk-IYULMRBE.js";
@@ -51,7 +51,7 @@ import {
   LEGEND_PILL_FONT_SIZE,
   LEGEND_PILL_PAD,
   measureLegendText
-} from "./chunk-Q5IHQ4NW.js";
+} from "./chunk-SCJ7CAJF.js";
 import {
   CHAR_WIDTH_RATIO,
   measureText,
@@ -61,17 +61,17 @@ import {
   contrastText,
   mix,
   shapeFill
-} from "./chunk-JYDMBWRP.js";
+} from "./chunk-42IT4BG2.js";
 import {
   tagAttrKey
-} from "./chunk-JR7Q6GHE.js";
+} from "./chunk-D5FANMSG.js";
 import {
   legendInlineRequested,
   legendSuppressed
-} from "./chunk-A2ARDILY.js";
+} from "./chunk-3KOPPSUQ.js";
 import {
   resolveColor
-} from "./chunk-ZKPPI6BF.js";
+} from "./chunk-EXNKNJ65.js";
 
 // src/infra/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -1608,4 +1608,4 @@ export {
   renderInfra,
   parseAndLayoutInfra
 };
-//# sourceMappingURL=chunk-A4UJP4IS.js.map
+//# sourceMappingURL=chunk-AMC2OGXF.js.map

package/dist/{chunk-SSHS42QG.js → chunk-AN465MXC.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-6EK55ART.js";
 import {
   resolveNotes
-} from "./chunk-QZAW5SFH.js";
+} from "./chunk-7NK42OIB.js";
 import {
   measureText
 } from "./chunk-4ASYQ347.js";
@@ -326,4 +326,4 @@ function layoutERDiagram(parsed, options) {
 export {
   layoutERDiagram
 };
-//# sourceMappingURL=chunk-SSHS42QG.js.map
+//# sourceMappingURL=chunk-AN465MXC.js.map

package/dist/{chunk-NPPUZ4SK.js → chunk-AOJJSGXE.js}

@@ -7,10 +7,10 @@ import {
 } from "./chunk-YYVTBZZC.js";
 import {
   renderIntegratedLegend
-} from "./chunk-ASPS5O6F.js";
+} from "./chunk-QDOYT6UW.js";
 import {
   getMaxLegendReservedHeight
-} from "./chunk-GRXPFBYC.js";
+} from "./chunk-ES66QH6J.js";
 import {
   FONT_FAMILY
 } from "./chunk-6KFWC4CO.js";
@@ -23,11 +23,11 @@ import {
   contrastText,
   mix,
   shapeFill
-} from "./chunk-JYDMBWRP.js";
+} from "./chunk-42IT4BG2.js";
 import {
   fillModeFromOptions,
   legendSuppressed
-} from "./chunk-A2ARDILY.js";
+} from "./chunk-3KOPPSUQ.js";
 
 // src/tech-radar/renderer.ts
 import * as d3Selection2 from "d3-selection";
@@ -1603,4 +1603,4 @@ export {
   renderTechRadar,
   renderTechRadarForExport
 };
-//# sourceMappingURL=chunk-NPPUZ4SK.js.map
+//# sourceMappingURL=chunk-AOJJSGXE.js.map

package/dist/{chunk-MEH4TJEX.js → chunk-APD52YJV.js}

@@ -1,12 +1,12 @@
 import {
   tryCollectNote
-} from "./chunk-4R5KIPNX.js";
+} from "./chunk-ST3ZNEUQ.js";
 import {
   resolveNotes
-} from "./chunk-QZAW5SFH.js";
+} from "./chunk-7NK42OIB.js";
 import {
   parseInArrowLabel
-} from "./chunk-WF64MW5G.js";
+} from "./chunk-RRX4Z4TH.js";
 import {
   displayName,
   normalizeName
@@ -19,7 +19,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-JR7Q6GHE.js";
+} from "./chunk-D5FANMSG.js";
 import {
   ALL_CHART_TYPES,
   FILL_FAMILY_TOKENS,
@@ -32,17 +32,17 @@ import {
   parseMetadataRegion,
   tryParseSharedOption,
   withTagAliases
-} from "./chunk-A2ARDILY.js";
+} from "./chunk-3KOPPSUQ.js";
 import {
   resolveColorWithDiagnostic
-} from "./chunk-ZKPPI6BF.js";
+} from "./chunk-EXNKNJ65.js";
 import {
   NAME_DIAGNOSTIC_CODES,
   formatDgmoError,
   makeDgmoError,
   nameMergedMessage,
   suggest
-} from "./chunk-4W2PE66Q.js";
+} from "./chunk-OLMWTJVU.js";
 
 // src/graph/state-parser.ts
 var PSEUDOSTATE_ID = "pseudostate:[*]";
@@ -543,4 +543,4 @@ export {
   parseState,
   looksLikeState
 };
-//# sourceMappingURL=chunk-MEH4TJEX.js.map
+//# sourceMappingURL=chunk-APD52YJV.js.map