@diagrammo/dgmo 0.90.0 → 0.91.0

package/dist/{chunk-W7QN5BC5.js → chunk-Q3N7PI3B.js}

@@ -1,15 +1,15 @@
+import {
+  noteBoxSize
+} from "./chunk-RJNZHFNG.js";
+import {
+  NOTE_GAP
+} from "./chunk-5DH3KYFH.js";
 import {
   LABEL_REACH_WIDE,
   NODE_HEIGHT,
   NODE_WIDTH,
   placeEdgeLabels
 } from "./chunk-QT3KDDXK.js";
-import {
-  buildPlacedNotes
-} from "./chunk-HTNLLT34.js";
-import {
-  noteCanvasShift
-} from "./chunk-6EK55ART.js";
 import {
   resolveNotes
 } from "./chunk-O753JUEZ.js";
@@ -18,6 +18,176 @@ import {
   wrapTextToWidth
 } from "./chunk-KAO7JL4I.js";
 
+// src/utils/notes/place.ts
+var NOTE_CLEAR = 14;
+var intersects = (a, b, pad) => !(a.right + pad <= b.left || b.right + pad <= a.left || a.bottom + pad <= b.top || b.bottom + pad <= a.top);
+function placeNotes(obstacles, requests, direction) {
+  const placements = /* @__PURE__ */ new Map();
+  const occupied = obstacles.map((p) => ({
+    left: p.x - p.width / 2,
+    top: p.y - p.height / 2,
+    right: p.x + p.width / 2,
+    bottom: p.y + p.height / 2
+  }));
+  for (const req of requests) {
+    if (req.collapsed) {
+      placements.set(req.key, {
+        collapsed: true,
+        side: "right",
+        x: 0,
+        y: 0
+      });
+      continue;
+    }
+    const p = req.node;
+    const cx = p.x;
+    const cy = p.y;
+    const nodeLeft = cx - p.width / 2;
+    const nodeRight = cx + p.width / 2;
+    const nodeTop = cy - p.height / 2;
+    const nodeBottom = cy + p.height / 2;
+    const { noteW, noteH } = req;
+    const rectFor = (side) => {
+      switch (side) {
+        case "right": {
+          const left = nodeRight + NOTE_GAP;
+          const top = cy - noteH / 2;
+          return { left, top, right: left + noteW, bottom: top + noteH };
+        }
+        case "left": {
+          const right = nodeLeft - NOTE_GAP;
+          const top = cy - noteH / 2;
+          return { left: right - noteW, top, right, bottom: top + noteH };
+        }
+        case "below": {
+          const left = cx - noteW / 2;
+          const top = nodeBottom + NOTE_GAP;
+          return { left, top, right: left + noteW, bottom: top + noteH };
+        }
+        case "above":
+        default: {
+          const left = cx - noteW / 2;
+          const bottom = nodeTop - NOTE_GAP;
+          return { left, top: bottom - noteH, right: left + noteW, bottom };
+        }
+      }
+    };
+    const order = direction === "LR" ? ["below", "above"] : ["right", "left"];
+    let chosen = null;
+    for (const side of order) {
+      const rect = rectFor(side);
+      if (!occupied.some((o) => intersects(rect, o, NOTE_CLEAR))) {
+        chosen = { rect, side };
+        break;
+      }
+    }
+    if (!chosen) {
+      const side = order[0];
+      let rect = rectFor(side);
+      const axisIsY = side === "above" || side === "below";
+      const outward = side === "below" || side === "right" ? 1 : -1;
+      for (let guard = 0; guard < 50; guard++) {
+        const blockers = occupied.filter(
+          (o) => intersects(rect, o, NOTE_CLEAR)
+        );
+        if (blockers.length === 0) break;
+        if (axisIsY && outward > 0) {
+          const top = Math.max(...blockers.map((b) => b.bottom)) + NOTE_CLEAR;
+          rect = { ...rect, top, bottom: top + noteH };
+        } else if (axisIsY) {
+          const bottom = Math.min(...blockers.map((b) => b.top)) - NOTE_CLEAR;
+          rect = { ...rect, bottom, top: bottom - noteH };
+        } else if (outward > 0) {
+          const left = Math.max(...blockers.map((b) => b.right)) + NOTE_CLEAR;
+          rect = { ...rect, left, right: left + noteW };
+        } else {
+          const right = Math.min(...blockers.map((b) => b.left)) - NOTE_CLEAR;
+          rect = { ...rect, right, left: right - noteW };
+        }
+      }
+      chosen = { rect, side };
+    }
+    occupied.push(chosen.rect);
+    placements.set(req.key, {
+      collapsed: false,
+      side: chosen.side,
+      x: chosen.rect.left - p.x,
+      y: chosen.rect.top - p.y
+    });
+  }
+  return placements;
+}
+
+// src/utils/notes/build.ts
+function buildPlacedNotes(anchors, noteByNode, direction, collapsedNotes) {
+  const placed = /* @__PURE__ */ new Map();
+  if (noteByNode.size === 0) return placed;
+  const geoms = /* @__PURE__ */ new Map();
+  const requests = [];
+  for (const a of anchors) {
+    const note = noteByNode.get(a.id);
+    if (!note) continue;
+    const size = noteBoxSize(note.body);
+    geoms.set(a.id, {
+      noteW: size.width,
+      noteH: size.height,
+      ...note.color && { color: note.color },
+      lines: size.lines,
+      lineNumber: note.lineNumber,
+      endLineNumber: note.endLineNumber
+    });
+    requests.push({
+      key: a.id,
+      node: { x: a.x, y: a.y, width: a.width, height: a.height },
+      noteW: size.width,
+      noteH: size.height,
+      collapsed: collapsedNotes?.has(note.lineNumber) ?? false
+    });
+  }
+  const placements = placeNotes(
+    anchors.map((a) => ({ x: a.x, y: a.y, width: a.width, height: a.height })),
+    requests,
+    direction
+  );
+  for (const [id, g] of geoms) {
+    const p = placements.get(id);
+    placed.set(
+      id,
+      p.collapsed ? {
+        x: 0,
+        y: 0,
+        width: 0,
+        height: 0,
+        side: "right",
+        ...g.color && { color: g.color },
+        lines: [],
+        lineNumber: g.lineNumber,
+        endLineNumber: g.endLineNumber,
+        collapsed: true
+      } : {
+        x: p.x,
+        y: p.y,
+        width: g.noteW,
+        height: g.noteH,
+        side: p.side,
+        ...g.color && { color: g.color },
+        lines: g.lines,
+        lineNumber: g.lineNumber,
+        endLineNumber: g.endLineNumber
+      }
+    );
+  }
+  return placed;
+}
+
+// src/utils/notes/bounds.ts
+function noteCanvasShift(minX, minY, margin = 20) {
+  return {
+    shiftX: minX < 0 ? margin - minX : 0,
+    shiftY: minY < 0 ? margin - minY : 0
+  };
+}
+
 // src/boxes-and-lines/layout.ts
 var MARGIN = 40;
 var MAX_PARALLEL_EDGES = 5;
@@ -107,7 +277,7 @@ function computeNodeSize(node, reserveValueRow) {
   return { width: w, height: Math.max(NODE_HEIGHT, totalHeight) };
 }
 async function layoutBoxesAndLines(parsed, collapseInfo, layoutOptions) {
-  const { layoutBoxesAndLinesSearch } = await import("./layout-search-YKUL4VBV.js");
+  const { layoutBoxesAndLinesSearch } = await import("./layout-search-L75YOBME.js");
   const searchOpts = {
     ...layoutOptions?.hideDescriptions !== void 0 && {
       hideDescriptions: layoutOptions.hideDescriptions
@@ -423,6 +593,9 @@ function applyParallelEdgeOffsets(layout) {
 }
 
 export {
+  placeNotes,
+  buildPlacedNotes,
+  noteCanvasShift,
   computeNodeSize,
   layoutBoxesAndLines
 };

package/dist/{chunk-HX2KJEPD.js → chunk-QKJ6MQXW.js}

@@ -44,9 +44,7 @@ function assignAutoTagColors(group, palette) {
     let chosen = cycle.find(
       (c) => !explicitHexes.has(c.hex.toLowerCase()) && !autoHexes.has(c.hex.toLowerCase())
     );
-    if (!chosen) {
-      chosen = cycle[autoHexes.size % cycle.length];
-    }
+    chosen ??= cycle[autoHexes.size % cycle.length];
     autoHexes.add(chosen.hex.toLowerCase());
     entries[i] = { ...e, color: chosen.hex };
   }

package/dist/{chunk-NJYA4QSN.js → chunk-QVKTAU7P.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-ICLB27PZ.js";
 import {
   tagAttrKey
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   CONTROLS_ICON_PATH,
   LEGEND_DOT_R,

package/dist/{chunk-EK7JYFCL.js → chunk-R7BSF7Z7.js}

@@ -4,7 +4,7 @@ import {
 import {
   isTagBlockHeading,
   matchTagBlockHeading
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   makeDgmoError
 } from "./chunk-BYU54C3S.js";

package/dist/{chunk-PIHAUVA4.js → chunk-RHXIUUWB.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-24YPR5EH.js";
 import {
   renderIntegratedLegend
-} from "./chunk-NJYA4QSN.js";
+} from "./chunk-QVKTAU7P.js";
 import {
   getMaxLegendReservedHeight
 } from "./chunk-NS7L7YKH.js";

package/dist/{chunk-GXP344YZ.js → chunk-RMTOZALT.js}

@@ -20,7 +20,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   AliasRegistry,
   BOXES_AND_LINES_REGISTRY,
@@ -585,7 +585,7 @@ function parseBoxesAndLines(content, palette) {
     validateTagGroupNames(result.tagGroups, pushWarning, (line, msg) => {
       const diag = makeDgmoError(line, msg);
       result.diagnostics.push(diag);
-      if (!result.error) result.error = diag.message;
+      result.error ??= diag.message;
     });
   }
   const activeTagWarning = activeTagNoMatchMessage(
@@ -594,7 +594,10 @@ function parseBoxesAndLines(content, palette) {
     // The value metric is a legitimate `active-tag` target here (§13.9), named
     // by `box-metric` and defaulting to `Value` — but only when some box
     // actually carries a value, which is what the renderer gates on.
-    result.nodes.some((n) => n.value !== void 0) ? [result.boxMetric?.trim() || "Value"] : [],
+    result.nodes.some((n) => n.value !== void 0) ? (
+      // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- an empty metric name also falls back to 'Value'
+      [result.boxMetric?.trim() || "Value"]
+    ) : [],
     "the value metric"
   );
   if (activeTagWarning) {

package/dist/{chunk-CYF2X3CG.js → chunk-ROCBGUJN.js}

@@ -1,6 +1,6 @@
 import {
   isTagBlockHeading
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   OPTION_NOCOLON_RE,
   measureIndent,
@@ -254,7 +254,7 @@ function parseSegment(segment, lineNumber, indent, diagnostics) {
   const dropdownMatch = trimmed.match(DROPDOWN_RE);
   if (dropdownMatch) {
     const options = dropdownMatch[1].split("|").map((s) => s.trim()).filter(Boolean);
-    const el = makeElement("dropdown", options[0] || "", lineNumber, indent);
+    const el = makeElement("dropdown", options[0] ?? "", lineNumber, indent);
     el.options = options;
     applyTrailingMeta(el, dropdownMatch[2]);
     return el;
@@ -270,7 +270,7 @@ function parseSegment(segment, lineNumber, indent, diagnostics) {
       )
     );
     const options = parenPipeMatch[1].split("|").map((s) => s.trim()).filter(Boolean);
-    const el = makeElement("dropdown", options[0] || "", lineNumber, indent);
+    const el = makeElement("dropdown", options[0] ?? "", lineNumber, indent);
     el.options = options;
     return el;
   }
@@ -309,7 +309,7 @@ function parseSegment(segment, lineNumber, indent, diagnostics) {
   if (kwMatch) {
     const el = makeElement(
       kwMatch.type,
-      kwMatch.param || "",
+      kwMatch.param ?? "",
       lineNumber,
       indent
     );
@@ -321,7 +321,7 @@ function parseSegment(segment, lineNumber, indent, diagnostics) {
     } else if (kwMatch.type === "chart") {
       el.chartHint = kwMatch.param || "line";
     } else if (kwMatch.type === "table") {
-      const skelMatch = `table ${kwMatch.param || ""}`.match(TABLE_SKELETON_RE);
+      const skelMatch = `table ${kwMatch.param ?? ""}`.match(TABLE_SKELETON_RE);
       if (skelMatch) {
         el.tableRows = parseInt(skelMatch[1], 10);
         el.tableCols = parseInt(skelMatch[2], 10);
@@ -364,7 +364,7 @@ function parseSegment(segment, lineNumber, indent, diagnostics) {
     );
     const rawContent = trimmed.substring(1).trim();
     const options = rawContent.split("|").map((s) => s.trim()).filter(Boolean);
-    const el = makeElement("dropdown", options[0] || "", lineNumber, indent);
+    const el = makeElement("dropdown", options[0] ?? "", lineNumber, indent);
     el.options = options;
     return el;
   }
@@ -556,7 +556,7 @@ function parseWireframe(content) {
             topNode.tableHeaders = cells;
           }
         } else {
-          if (!topNode.tableData) topNode.tableData = [];
+          topNode.tableData ??= [];
           topNode.tableData.push(cells);
         }
         continue;

package/dist/{chunk-RY5RRKYN.js → chunk-RVTYIGWZ.js}

@@ -11,7 +11,7 @@ import {
 } from "./chunk-ABP5BUD6.js";
 import {
   renderIntegratedLegend
-} from "./chunk-NJYA4QSN.js";
+} from "./chunk-QVKTAU7P.js";
 import {
   layoutInlineHeader
 } from "./chunk-CNUN5GO6.js";
@@ -30,7 +30,7 @@ import {
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   LEGEND_GROUP_GAP
 } from "./chunk-I6GGMCTV.js";
@@ -86,7 +86,7 @@ function paintForAccent(palette, isDark, accent, fillMode) {
   };
 }
 function paintFor(palette, isDark, sideColor, fillMode) {
-  const accent = sideColor && resolveColor(sideColor, palette) || sideColor || getSeriesColors(palette)[0];
+  const accent = (sideColor && resolveColor(sideColor, palette)) ?? sideColor ?? getSeriesColors(palette)[0];
   return paintForAccent(palette, isDark, accent, fillMode);
 }
 function resolveBracketLegend(parsed, palette) {

package/dist/{chunk-NMKLX57Y.js → chunk-SKF7XLCM.js}

@@ -16,7 +16,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-HX2KJEPD.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   SKETCH_REGISTRY,
   extractColor,

package/dist/{chunk-NP2SE6MQ.js → chunk-SMTWQ66K.js}

@@ -334,8 +334,8 @@ function renderTabs(g, node, ctx) {
 function renderTable(g, node, ctx) {
   const { palette, isTransparent } = ctx;
   const el = node.element;
-  const headers = el.tableHeaders || [];
-  const data = el.tableData || [];
+  const headers = el.tableHeaders ?? [];
+  const data = el.tableData ?? [];
   const isSkeleton = el.tableRows !== void 0 && el.tableCols !== void 0;
   const cols = headers.length || el.tableCols || 3;
   const colW = node.width / cols;
@@ -361,7 +361,7 @@ function renderTable(g, node, ctx) {
       if (isSkeleton) {
         g.append("rect").attr("x", c * colW + 10).attr("y", ry + 8).attr("width", colW * 0.6).attr("height", 12).attr("fill", palette.textMuted).attr("opacity", 0.25).attr("rx", 2);
       } else if (data[r]) {
-        const cellText = data[r][c] || "";
+        const cellText = data[r][c] ?? "";
         renderTableCell(g, cellText, c * colW + 10, ry, colW - 20, rowH, ctx);
       }
     }
@@ -445,7 +445,7 @@ function renderSkeletonPlaceholder(g, node, ctx) {
 function renderAlert(g, node, ctx) {
   const { palette, isDark, isTransparent } = ctx;
   const el = node.element;
-  const color = getElementSemanticColor(el, palette) || palette.accent;
+  const color = getElementSemanticColor(el, palette) ?? palette.accent;
   const fill = isTransparent ? null : shapeFill(palette, color, isDark, { mode: ctx.fillMode });
   if (fill) {
     g.append("rect").attr("width", node.width).attr("height", node.height).attr("fill", fill).attr("rx", 4);
@@ -473,7 +473,7 @@ function renderProgress(g, node, ctx) {
 function renderChart(g, node, ctx) {
   const { palette, isTransparent } = ctx;
   const el = node.element;
-  const hint = el.chartHint || "line";
+  const hint = el.chartHint ?? "line";
   g.append("rect").attr("width", node.width).attr("height", node.height).attr(
     "fill",
     isTransparent ? "none" : mix(palette.textMuted, palette.bg, 8)

package/dist/{chunk-3AX6MCI6.js → chunk-SPQVER4T.js}

@@ -185,9 +185,9 @@ function resolveMap(parsed, data) {
     const f = fold(r.name);
     return usStateIndex.has(f) && !countryIndex.has(f);
   }) || parsed.regions.some(
-    (r) => r.scope === "US" || r.scope?.startsWith("US-") || usStateFromBareScope(r.scope) !== null
+    (r) => r.scope === "US" || !!r.scope?.startsWith("US-") || usStateFromBareScope(r.scope) !== null
   ) || parsed.pois.some(
-    (p) => p.pos.kind === "name" && (p.pos.scope?.startsWith("US-") || usStateFromBareScope(p.pos.scope) !== null)
+    (p) => p.pos.kind === "name" && (!!p.pos.scope?.startsWith("US-") || usStateFromBareScope(p.pos.scope) !== null)
   );
   const regions = [];
   const seenRegion = /* @__PURE__ */ new Map();

package/dist/{chunk-A5PUOHIS.js → chunk-SWBHH2UW.js}

@@ -838,7 +838,7 @@ function renderCountdown(container, parsed, palette, isDark, exportDims) {
   }
   const seriesAccent = getSeriesColors(palette)[0];
   const defaultAccent = resolveColor("red", palette) ?? seriesAccent;
-  const manualColor = parsed.color && resolveColor(parsed.color, palette) || parsed.color || null;
+  const manualColor = (parsed.color && resolveColor(parsed.color, palette)) ?? parsed.color ?? null;
   const accent = manualColor ?? defaultAccent;
   const muted = mix(palette.text, themeBaseBg(palette, isDark), 55);
   const banked = resolveColor("green", palette) ?? muted;

package/dist/{chunk-7TF3QOOD.js → chunk-TIVMAITN.js}

@@ -71,6 +71,20 @@ B
     hint: "Remove the trailing tag/metadata suffix \u2014 flowchart node colors come from shape.",
     example: `flowchart
 (Start) -> (Denied) s: Denied
+`
+  },
+  FLOWCHART_STRUCTURE: {
+    // src/validate-diagram.ts — validateFlowchartStructure(), the agent-facing
+    // gate both MCP servers run; the editor itself never emits it.
+    code: "E_FLOWCHART_STRUCTURE",
+    severity: "error",
+    chartType: "flowchart",
+    title: "Flowchart is not one connected flow",
+    message: "A decision has fewer than two outgoing branches, the flow has no start or no end, or a node is not on a path from a start to an end.",
+    hint: "Give every decision two or more branches, and wire every node into a path from the start to an end.",
+    example: `flowchart
+(Start) -> (End)
+[Floating]
 `
   }
 };