@diagrammo/dgmo 0.90.0 → 0.91.0

package/dist/{chunk-YE7D2S75.js → chunk-HYV6GSXM.js}

@@ -9,7 +9,7 @@ import {
   stripDefaultModifier,
   tagAttrKey,
   validateTagGroupNames
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   MAP_DIRECTIVE_KEY_SET,
   MAP_REGISTRY,
@@ -207,7 +207,10 @@ function parseMap(content, palette) {
   const activeTagWarning = activeTagNoMatchMessage(
     result.directives.activeTag,
     tagGroups,
-    regions.some((r) => r.value !== void 0) ? [result.directives.regionMetric?.trim() || "Value"] : [],
+    regions.some((r) => r.value !== void 0) ? (
+      // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- an empty metric name also falls back to 'Value'
+      [result.directives.regionMetric?.trim() || "Value"]
+    ) : [],
     "the value ramp"
   );
   if (activeTagWarning) {

package/dist/{chunk-AHWA36O7.js → chunk-II4XJETG.js}

@@ -1,6 +1,6 @@
 import {
   buildMapProjection
-} from "./chunk-QRIW46LR.js";
+} from "./chunk-57L2JPP2.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_Y

package/dist/{chunk-EB7AEM2H.js → chunk-IMKPFW67.js}

@@ -8,7 +8,7 @@ import {
   keepSwimlaneToggleFocus,
   renderIntegratedLegend,
   wireSwimlaneToggle
-} from "./chunk-NJYA4QSN.js";
+} from "./chunk-QVKTAU7P.js";
 import {
   CARD_RADIUS
 } from "./chunk-XCKNFFKM.js";
@@ -27,10 +27,10 @@ import {
 } from "./chunk-ICLB27PZ.js";
 import {
   parseKanban
-} from "./chunk-IRVQT4GR.js";
+} from "./chunk-JJQWCI35.js";
 import {
   tagAttrKey
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   fillModeFromOptions,
   legendSuppressed

package/dist/{chunk-C4W62JZO.js → chunk-IS6WFBX7.js}

@@ -11,7 +11,7 @@ import {
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   FAMILY_PERSON_REGISTRY,
   FAMILY_UNION_REGISTRY,
@@ -334,7 +334,7 @@ function parseFamily(content, palette) {
         const re = peelTrailingColorName(cleanName);
         if (re.colorName !== void 0) {
           cleanName = re.label;
-          if (color === void 0) color = re.colorName;
+          color ??= re.colorName;
         }
       }
     }

package/dist/{chunk-SMEVBJJJ.js → chunk-IUBCDNT2.js}

@@ -9,7 +9,7 @@ import {
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   extractColor,
   fillModeFromToken,

package/dist/{chunk-TQ644YGV.js → chunk-IWTUXGHN.js}

@@ -9,10 +9,10 @@ import {
 } from "./chunk-R2K5L4UA.js";
 import {
   formatDateLabel
-} from "./chunk-3BQCSQQJ.js";
+} from "./chunk-FJCYK4K3.js";
 import {
   renderIntegratedLegend
-} from "./chunk-NJYA4QSN.js";
+} from "./chunk-QVKTAU7P.js";
 import {
   CARD_RADIUS,
   HAIRLINE_DASH,
@@ -42,7 +42,7 @@ import {
   UNTAGGED_TAG_COLOR,
   resolveActiveTagGroup,
   resolveTagColor
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   CHAR_WIDTH_RATIO,
   wrapTextToWidth

package/dist/{chunk-PNCKZFPE.js → chunk-J2SQNZ6D.js}

@@ -4,7 +4,7 @@ import {
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   FILL_FAMILY_TOKENS,
   extractColor,

package/dist/{chunk-YKGUSW6D.js → chunk-JA2S7PHR.js}

@@ -4,7 +4,10 @@ import {
 } from "./chunk-26EVL454.js";
 import {
   layoutGraph
-} from "./chunk-ZNNVI5SR.js";
+} from "./chunk-CU2PZLZP.js";
+import {
+  appendArrowheadMarkers
+} from "./chunk-XBJJP2HN.js";
 import {
   NOTE_BADGE_RADIUS,
   noteConnectorPoints,
@@ -12,9 +15,6 @@ import {
   renderNoteBox,
   renderNoteConnector
 } from "./chunk-KATED53P.js";
-import {
-  appendArrowheadMarkers
-} from "./chunk-XBJJP2HN.js";
 import {
   fitDiagramToCanvas
 } from "./chunk-EPDBWATV.js";
@@ -23,7 +23,7 @@ import {
 } from "./chunk-24YPR5EH.js";
 import {
   renderIntegratedLegend
-} from "./chunk-NJYA4QSN.js";
+} from "./chunk-QVKTAU7P.js";
 import {
   ARROWHEAD_HEIGHT,
   ARROWHEAD_WIDTH,
@@ -51,13 +51,13 @@ import {
 } from "./chunk-ICLB27PZ.js";
 import {
   parseState
-} from "./chunk-NY56FM55.js";
+} from "./chunk-XLPJJ35N.js";
 import {
   resolveActiveTagGroup,
   resolveGroupTagColor,
   resolveTagColor,
   tagAttrKey
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   fillModeFromOptions,
   legendInlineRequested,

package/dist/{chunk-IRVQT4GR.js → chunk-JJQWCI35.js}

@@ -9,7 +9,7 @@ import {
   stripDefaultModifier,
   tagAttrKey,
   validateTagGroupNames
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   AliasRegistry,
   KANBAN_REGISTRY,
@@ -353,7 +353,7 @@ function parseKanban(content, palette) {
   validateTagGroupNames(result.tagGroups, warn, (line, msg) => {
     const diag = makeDgmoError(line, msg);
     result.diagnostics.push(diag);
-    if (!result.error) result.error = formatDgmoError(diag);
+    result.error ??= formatDgmoError(diag);
   });
   const activeTagWarning = activeTagNoMatchMessage(
     options["active-tag"],

package/dist/chunk-JJUDOR4I.js

@@ -0,0 +1,110 @@
+import {
+  countEdgeNodePierces,
+  countEdgeOverlaps,
+  countSplineCrossings,
+  deroutePierces,
+  searchBudget
+} from "./chunk-NWPMLX2V.js";
+
+// src/utils/placement-search.ts
+var SEARCH_RANKERS = ["tight-tree", "longest-path"];
+var SEARCH_SEEDS = 6;
+function seeded(s) {
+  return () => {
+    s = s + 1831565813 | 0;
+    let t = Math.imul(s ^ s >>> 15, 1 | s);
+    t = t + Math.imul(t ^ t >>> 7, 61 | t) ^ t;
+    return ((t ^ t >>> 14) >>> 0) / 4294967296;
+  };
+}
+function shuffler(seed) {
+  const r = seeded(seed + 1);
+  return (a) => {
+    const out = a.slice();
+    for (let i = out.length - 1; i > 0; i--) {
+      const j = Math.floor(r() * (i + 1));
+      [out[i], out[j]] = [out[j], out[i]];
+    }
+    return out;
+  };
+}
+function searchPlacement(direction, place, score) {
+  const asScored = (g) => {
+    const s = score(g);
+    return {
+      nodes: s.nodes.map((n) => ({ ...n, label: n.id })),
+      edges: s.edges,
+      groups: [],
+      width: 0,
+      height: 0
+    };
+  };
+  const rest = (lay) => countEdgeOverlaps(lay) + countEdgeNodePierces(lay);
+  const along = direction === "LR" ? "x" : "y";
+  const backward = (lay) => {
+    const at = new Map(lay.nodes.map((n) => [n.label, n[along]]));
+    const out = /* @__PURE__ */ new Set();
+    lay.edges.forEach((e, i) => {
+      if (e.source === e.target) return;
+      if (at.get(e.target) < at.get(e.source) - 1) out.add(i);
+    });
+    return out;
+  };
+  let best = place("network-simplex");
+  let bestLay = asScored(best);
+  const plainX = countSplineCrossings(bestLay);
+  let bestBad = plainX + rest(bestLay);
+  if (bestBad === 0) return { g: best };
+  const plainBack = backward(bestLay);
+  const budget = searchBudget(bestLay.nodes.length, bestLay.edges.length);
+  const configs = [
+    ...SEARCH_RANKERS.map((ranker) => ({ ranker })),
+    ...Array.from(
+      { length: Math.min(budget.seeds, SEARCH_SEEDS) },
+      (_, seed) => ({
+        ranker: "network-simplex",
+        seed
+      })
+    )
+  ];
+  let attempts = 1;
+  for (const cfg of configs) {
+    if (bestBad === 0 || attempts >= budget.maxCandidates) break;
+    attempts++;
+    let g;
+    try {
+      g = place(
+        cfg.ranker,
+        cfg.seed === void 0 ? void 0 : shuffler(cfg.seed)
+      );
+    } catch {
+      continue;
+    }
+    const lay = asScored(g);
+    if ([...backward(lay)].some((i) => !plainBack.has(i))) continue;
+    const floor = Math.min(plainX, bestBad - 1);
+    const x = countSplineCrossings(lay, floor);
+    if (x > floor) continue;
+    const bad = x + rest(lay);
+    if (bad < bestBad) {
+      best = g;
+      bestLay = lay;
+      bestBad = bad;
+    }
+  }
+  const bent = deroutePierces(bestLay);
+  if (bent !== bestLay) {
+    const floor = Math.min(plainX, bestBad - 1);
+    const x = countSplineCrossings(bent, floor);
+    if (x <= floor && x + rest(bent) < bestBad)
+      return {
+        g: best,
+        edgePoints: bent.edges.map((e) => e.points)
+      };
+  }
+  return { g: best };
+}
+
+export {
+  searchPlacement
+};

package/dist/{chunk-VCHYS3RD.js → chunk-K3BYD3WU.js}

@@ -5,7 +5,7 @@ import {
 import {
   UNTAGGED_TAG_COLOR,
   tagAttrKey
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   legendSuppressed
 } from "./chunk-MPJQMMBZ.js";

package/dist/{chunk-EEYQFJVK.js → chunk-KFXY5IW2.js}

@@ -11,7 +11,7 @@ import {
   getSimpleChartLegendGroups,
   parseChart,
   parseExtendedChart
-} from "./chunk-WHRIN7N3.js";
+} from "./chunk-HFG7KQOY.js";
 import {
   EMPHASIS_DIM_OPACITY,
   EMPHASIS_DIM_TEXT_OPACITY,
@@ -43,7 +43,7 @@ import {
 } from "./chunk-ICLB27PZ.js";
 import {
   tagAttrKey
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   LEGEND_DOT_R,
   LEGEND_ENTRY_FONT_SIZE,

package/dist/{chunk-Y6GQQ4Y2.js → chunk-LKR4FACF.js}

@@ -213,9 +213,7 @@ function calculateSchedule(parsed) {
       breakCycle(nextCycle, taskMap, depOffsetMap);
       sortedIds = topologicalSort(taskMap);
     }
-    if (!sortedIds) {
-      sortedIds = [...taskMap.keys()];
-    }
+    sortedIds ??= [...taskMap.keys()];
   }
   for (const taskId of sortedIds) {
     const node = taskMap.get(taskId);

package/dist/{chunk-IJ27L3R4.js → chunk-MA42PIGJ.js}

@@ -196,7 +196,7 @@ function layoutFamily(parsed, focusId) {
   const persons = focused ? focused.persons : parsed.persons;
   const unions = (focused ? focused.unions : parsed.unions).map((u) => ({ ...u, children: sortChildrenByBirth(u.children, persons) }));
   const focusParents = focused ? focused.parents : [];
-  const highlightId = parsed.options["highlight"] || null;
+  const highlightId = parsed.options["highlight"] ?? null;
   const litSet = highlightId ? computeBloodline(unions, highlightId) : null;
   const showGen = parsed.options["generations"] === "true";
   const ANCESTOR_STAGGER = 20;

package/dist/{chunk-GQVXYRPC.js → chunk-MI6SJJQU.js}

@@ -9,7 +9,7 @@ import {
   injectDefaultTagMetadata,
   resolveTagColor,
   tagAttrKey
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   legendSuppressed
 } from "./chunk-MPJQMMBZ.js";

package/dist/{chunk-DXPT2HPH.js → chunk-MJKQ5ZYY.js}

@@ -11,7 +11,7 @@ import {
 } from "./chunk-24YPR5EH.js";
 import {
   renderIntegratedLegend
-} from "./chunk-NJYA4QSN.js";
+} from "./chunk-QVKTAU7P.js";
 import {
   ARROWHEAD_HEIGHT,
   ARROWHEAD_WIDTH,
@@ -48,7 +48,7 @@ import {
   resolveGroupTagColor,
   resolveTagColor,
   tagAttrKey
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   fitWrapped,
   measureText

package/dist/{chunk-J3ODKAWN.js → chunk-MNL547RV.js}

@@ -3,7 +3,10 @@ import {
 } from "./chunk-26EVL454.js";
 import {
   layoutGraph
-} from "./chunk-ZNNVI5SR.js";
+} from "./chunk-CU2PZLZP.js";
+import {
+  appendArrowheadMarkers
+} from "./chunk-XBJJP2HN.js";
 import {
   NOTE_BADGE_RADIUS,
   noteConnectorPoints,
@@ -11,9 +14,6 @@ import {
   renderNoteBox,
   renderNoteConnector
 } from "./chunk-KATED53P.js";
-import {
-  appendArrowheadMarkers
-} from "./chunk-XBJJP2HN.js";
 import {
   fitDiagramToCanvas
 } from "./chunk-EPDBWATV.js";
@@ -40,7 +40,7 @@ import {
 } from "./chunk-ICLB27PZ.js";
 import {
   parseFlowchart
-} from "./chunk-SLO22FPS.js";
+} from "./chunk-634LDSN6.js";
 import {
   fillModeFromOptions
 } from "./chunk-MPJQMMBZ.js";

package/dist/{chunk-2EDJPHXQ.js → chunk-N254IJM2.js}

@@ -1,3 +1,7 @@
+import {
+  appendArrowheadMarkers,
+  appendReverseArrowheadMarkers
+} from "./chunk-XBJJP2HN.js";
 import {
   NOTE_BADGE_RADIUS,
   noteConnectorPoints,
@@ -5,10 +9,6 @@ import {
   renderNoteBox,
   renderNoteConnector
 } from "./chunk-KATED53P.js";
-import {
-  appendArrowheadMarkers,
-  appendReverseArrowheadMarkers
-} from "./chunk-XBJJP2HN.js";
 import {
   wrapDescriptionLines
 } from "./chunk-NPWVOFB3.js";
@@ -21,7 +21,7 @@ import {
 } from "./chunk-24YPR5EH.js";
 import {
   renderIntegratedLegend
-} from "./chunk-NJYA4QSN.js";
+} from "./chunk-QVKTAU7P.js";
 import {
   ARROWHEAD_HEIGHT,
   ARROWHEAD_WIDTH,
@@ -50,7 +50,7 @@ import {
 import {
   resolveGroupTagColor,
   resolveTagColor
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   fillModeFromOptions,
   legendInlineRequested,

package/dist/{layout-search-YKUL4VBV.js → chunk-NWPMLX2V.js}

@@ -1,29 +1,16 @@
-import {
-  computeNodeSize
-} from "./chunk-W7QN5BC5.js";
 import {
   clipEndpointsToNodes,
   groupedTierCandidates
 } from "./chunk-EJS3K44P.js";
+import {
+  computeNodeSize
+} from "./chunk-Q3N7PI3B.js";
 import {
   EDGE_LABEL_FONT_SIZE,
   NODE_HEIGHT,
   NODE_WIDTH,
   measureEdgeLabel
 } from "./chunk-QT3KDDXK.js";
-import "./chunk-HTNLLT34.js";
-import "./chunk-6EK55ART.js";
-import "./chunk-RJNZHFNG.js";
-import "./chunk-5DH3KYFH.js";
-import "./chunk-NPWVOFB3.js";
-import "./chunk-S7W75MIM.js";
-import "./chunk-Z6DXWULM.js";
-import "./chunk-ICLB27PZ.js";
-import "./chunk-O753JUEZ.js";
-import "./chunk-NOTA6TEI.js";
-import "./chunk-KAO7JL4I.js";
-import "./chunk-BYU54C3S.js";
-import "./chunk-5WRI5ZAA.js";
 
 // src/boxes-and-lines/layout-search.ts
 import dagre from "@dagrejs/dagre";
@@ -816,6 +803,17 @@ var ESCALATE_SEEDS = 18;
 var ESCALATE_REFINE = 10;
 var SEARCH_WORK_CAP = 36e3;
 var MIN_SEARCH_CANDIDATES = 6;
+function searchBudget(nodes, edges) {
+  const seeds = nodes <= 12 ? 20 : nodes <= 22 ? 40 : nodes <= 35 ? 22 : 10;
+  const size = Math.max(1, nodes + edges);
+  return {
+    seeds,
+    maxCandidates: Math.max(
+      MIN_SEARCH_CANDIDATES,
+      Math.floor(SEARCH_WORK_CAP / Math.pow(size, 1.5))
+    )
+  };
+}
 function rng2(s) {
   return () => {
     s |= 0;
@@ -1751,15 +1749,12 @@ async function layoutBoxesAndLinesSearch(parsed, collapseInfo, opts) {
     };
   }
   const n = parsed.nodes.length;
-  const seedCount = opts?.seeds ?? (n <= 12 ? 20 : n <= 22 ? 40 : n <= 35 ? 22 : 10);
+  const budget = searchBudget(n, parsed.edges.length);
+  const seedCount = opts?.seeds ?? budget.seeds;
   const REFINE_K = opts?.refineK ?? 6;
   const lambda = opts?.lambda ?? DEFAULT_LAMBDA;
   const prev = opts?.previousPositions;
-  const searchSize = Math.max(1, n + parsed.edges.length);
-  const maxCandidates = Math.max(
-    MIN_SEARCH_CANDIDATES,
-    Math.floor(SEARCH_WORK_CAP / Math.pow(searchSize, 1.5))
-  );
+  const maxCandidates = budget.maxCandidates;
   let attempts = 0;
   const configs = [];
   if (opts?.configs) {
@@ -1994,16 +1989,18 @@ async function layoutBoxesAndLinesSearch(parsed, collapseInfo, opts) {
   opts?.onTopConfigs?.(topConfigs);
   return clipLayoutEdgesToNodes(best);
 }
+
 export {
-  countEdgeNearMiss,
-  countEdgeNodePierces,
-  countEdgeOverlaps,
-  countGroupOverlaps,
+  searchBudget,
   countSplineCrossings,
-  deroutePierces,
-  detectEdgeNodePierces,
   detectEdgeOverlaps,
+  countEdgeOverlaps,
+  detectEdgeNodePierces,
+  countEdgeNodePierces,
+  deroutePierces,
+  countEdgeNearMiss,
   detectGroupOverlaps,
-  layoutBoxesAndLinesSearch,
-  separateGroupBands
+  countGroupOverlaps,
+  separateGroupBands,
+  layoutBoxesAndLinesSearch
 };

package/dist/{chunk-COPSI54O.js → chunk-PSGSFRRE.js}

@@ -9,7 +9,7 @@ import {
   stripDefaultModifier,
   tagAttrKey,
   validateTagGroupNames
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   JOURNEY_MAP_REGISTRY,
   OPTION_NOCOLON_RE,
@@ -340,7 +340,7 @@ function parseJourneyMap(content, palette) {
   validateTagGroupNames(result.tagGroups, warn, (line, msg) => {
     const diag = makeDgmoError(line, msg);
     result.diagnostics.push(diag);
-    if (!result.error) result.error = formatDgmoError(diag);
+    result.error ??= formatDgmoError(diag);
   });
   const activeTagWarning = activeTagNoMatchMessage(
     options["active-tag"],

package/dist/{chunk-FDRHBQUG.js → chunk-PUZ63XZM.js}

@@ -1,7 +1,3 @@
-import {
-  appendArrowheadMarkers,
-  appendReverseArrowheadMarkers
-} from "./chunk-XBJJP2HN.js";
 import {
   CYLINDER_RY,
   QUEUE_CAP,
@@ -10,13 +6,17 @@ import {
   layoutC4Containers,
   layoutC4Context,
   layoutC4Deployment
-} from "./chunk-VCHYS3RD.js";
+} from "./chunk-K3BYD3WU.js";
+import {
+  appendArrowheadMarkers,
+  appendReverseArrowheadMarkers
+} from "./chunk-XBJJP2HN.js";
 import {
   renderInlineText
 } from "./chunk-S7W75MIM.js";
 import {
   renderIntegratedLegend
-} from "./chunk-NJYA4QSN.js";
+} from "./chunk-QVKTAU7P.js";
 import {
   ARROWHEAD_HEIGHT,
   ARROWHEAD_WIDTH,
@@ -43,14 +43,14 @@ import {
 } from "./chunk-ICLB27PZ.js";
 import {
   parseC4
-} from "./chunk-LC5LY5V2.js";
+} from "./chunk-EP7BT3HU.js";
 import {
   preprocessDescriptionLine
 } from "./chunk-IYULMRBE.js";
 import {
   resolveGroupTagColor,
   tagAttrKey
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   fillModeFromOptions
 } from "./chunk-MPJQMMBZ.js";

package/dist/{chunk-MIVSVEK4.js → chunk-PZVTFQI2.js}

@@ -1,6 +1,6 @@
 import {
   renderIntegratedLegend
-} from "./chunk-NJYA4QSN.js";
+} from "./chunk-QVKTAU7P.js";
 import {
   EDGE_DASH
 } from "./chunk-XCKNFFKM.js";
@@ -25,7 +25,7 @@ import {
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   LEGEND_GROUP_GAP
 } from "./chunk-I6GGMCTV.js";