@diagrammo/dgmo 0.96.0 → 0.97.0

package/dist/{chunk-M4ZUIW3J.js → chunk-H7DZYHQF.js}

@@ -4,21 +4,21 @@ import {
 import {
   resolveNotes,
   tryCollectNote
-} from "./chunk-HH3DHNQA.js";
+} from "./chunk-4TK26YHH.js";
 import {
   displayName,
   normalizeName
 } from "./chunk-NOTA6TEI.js";
 import {
   isTagBlockHeading
-} from "./chunk-LGUFJ7Y2.js";
+} from "./chunk-KW3CC7SB.js";
 import {
   AliasRegistry,
   OPTION_NOCOLON_RE,
   measureIndent,
   parseFirstLine,
   tryParseSharedOption
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   resolveColorWithDiagnostic
 } from "./chunk-3J7O3CU6.js";

package/dist/{chunk-GLCMUTO5.js → chunk-HQNZJMNS.js}

@@ -1,6 +1,6 @@
 import {
   measureText
-} from "./chunk-KAO7JL4I.js";
+} from "./chunk-PU5X3P3T.js";
 
 // src/wireframe/layout.ts
 var DESKTOP_WIDTH = 1200;

package/dist/{chunk-H7RQG4PH.js → chunk-IAM3IDL4.js}

@@ -7,7 +7,7 @@ import {
 import {
   resolveNotes,
   tryCollectNote
-} from "./chunk-HH3DHNQA.js";
+} from "./chunk-4TK26YHH.js";
 import {
   displayName,
   normalizeName
@@ -19,7 +19,7 @@ import {
   measureIndent,
   parseFirstLine,
   tryParseSharedOption
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   NAME_DIAGNOSTIC_CODES,
   emit,

package/dist/{chunk-WTPS73RM.js → chunk-II6D6NWX.js}

@@ -7,34 +7,34 @@ import {
   mutedFill,
   resolveCellColor,
   resolveColorMode
-} from "./chunk-5LG526X7.js";
+} from "./chunk-5TGZBHEJ.js";
 import {
   layoutInlineHeader
-} from "./chunk-R5L5E3TC.js";
+} from "./chunk-REKLKGR6.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
   TITLE_Y
-} from "./chunk-VLC6WNRD.js";
+} from "./chunk-GULGSH2Z.js";
 import {
   renderIntegratedLegend
-} from "./chunk-PGD6CNWO.js";
+} from "./chunk-DFEVFLEG.js";
 import {
   getLegendExtent,
   getMaxLegendReservedHeight
-} from "./chunk-JILEYZ2V.js";
+} from "./chunk-VVL2KKG4.js";
 import {
   FONT_FAMILY
 } from "./chunk-ICLB27PZ.js";
 import {
   tagAttrKey
-} from "./chunk-LGUFJ7Y2.js";
+} from "./chunk-KW3CC7SB.js";
 import {
   LEGEND_GROUP_GAP
-} from "./chunk-UOCWYLYT.js";
+} from "./chunk-OZXKW5NA.js";
 import {
   measureText
-} from "./chunk-KAO7JL4I.js";
+} from "./chunk-PU5X3P3T.js";
 import {
   contrastText,
   getSeriesColors,

package/dist/{chunk-5ARANBIE.js → chunk-IUFTAFGN.js}

@@ -9,7 +9,7 @@ import {
   stripDefaultModifier,
   tagAttrKey,
   validateTagGroupNames
-} from "./chunk-LGUFJ7Y2.js";
+} from "./chunk-KW3CC7SB.js";
 import {
   MAP_DIRECTIVE_KEY_SET,
   MAP_REGISTRY,
@@ -18,7 +18,7 @@ import {
   peelRampColors,
   splitNameAndMeta,
   withTagAliases
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   NEGATIVE_VALUE_DX,
   emit,

package/dist/{chunk-AQRSEQZV.js → chunk-IZEKHIV6.js}

@@ -1,9 +1,9 @@
 import {
   compactNumber
-} from "./chunk-5LG526X7.js";
+} from "./chunk-5TGZBHEJ.js";
 import {
   TITLE_FONT_WEIGHT
-} from "./chunk-VLC6WNRD.js";
+} from "./chunk-GULGSH2Z.js";
 import {
   parseInlineMarkdown
 } from "./chunk-QKPOIJBT.js";
@@ -12,7 +12,7 @@ import {
 } from "./chunk-ICLB27PZ.js";
 import {
   measureText
-} from "./chunk-KAO7JL4I.js";
+} from "./chunk-PU5X3P3T.js";
 import {
   getSeriesColors,
   mix,

package/dist/{chunk-WGNP5ND2.js → chunk-J3YM6RA5.js}

@@ -6,18 +6,18 @@ import {
 } from "./chunk-24YPR5EH.js";
 import {
   HEADER_HEIGHT
-} from "./chunk-XCKNFFKM.js";
+} from "./chunk-WH6E6SHC.js";
 import {
   preprocessDescriptionLine
 } from "./chunk-IYULMRBE.js";
 import {
   injectDefaultTagMetadata,
   resolveTagColor
-} from "./chunk-LGUFJ7Y2.js";
+} from "./chunk-KW3CC7SB.js";
 import {
   measureText,
   truncateText
-} from "./chunk-KAO7JL4I.js";
+} from "./chunk-PU5X3P3T.js";
 
 // src/mindmap/text-wrap.ts
 var H_PAD = 16;

package/dist/{chunk-YFIUABSF.js → chunk-J467QBZF.js}

@@ -7,11 +7,12 @@ import {
 } from "./chunk-NOTA6TEI.js";
 import {
   AUTO_TAG_COLOR_SENTINEL,
+  activeTagNoMatchMessage,
   finalizeAutoTagColors,
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey
-} from "./chunk-LGUFJ7Y2.js";
+} from "./chunk-KW3CC7SB.js";
 import {
   FAMILY_PERSON_REGISTRY,
   FAMILY_UNION_REGISTRY,
@@ -26,13 +27,14 @@ import {
   tokenizeQuoteAware,
   tryParseSharedOption,
   withTagAliases
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   nord,
   resolveColor
 } from "./chunk-3J7O3CU6.js";
 import {
-  emit
+  emit,
+  makeDgmoError
 } from "./chunk-BYU54C3S.js";
 
 // src/family/diagnostics.ts
@@ -148,6 +150,8 @@ function matchFamilyOption(line) {
   const h = line.match(/^highlight\s+(.+)$/i);
   if (h) return { key: "highlight", value: h[1].trim() };
   if (/^generations$/i.test(line)) return { key: "generations", value: "true" };
+  const at = line.match(/^active-tag\s+(.+)$/i);
+  if (at) return { key: "active-tag", value: at[1].trim() };
   if (/^no-daggers$/i.test(line)) return { key: "no-daggers", value: "true" };
   return null;
 }
@@ -157,6 +161,7 @@ function parseFamily(content, palette) {
   const unions = [];
   const tagGroups = [];
   const options = {};
+  let activeTagLine = 0;
   const rawLines = content.split("\n");
   let title;
   let titleLineNumber;
@@ -244,6 +249,7 @@ function parseFamily(content, palette) {
       const fam = matchFamilyOption(trimmed);
       if (fam) {
         options[fam.key] = fam.value;
+        if (fam.key === "active-tag") activeTagLine = lineNum;
         continue;
       }
     }
@@ -548,6 +554,20 @@ function parseFamily(content, palette) {
       delete options["highlight"];
     }
   }
+  const activeTagWarning = activeTagNoMatchMessage(
+    options["active-tag"],
+    tagGroups
+  );
+  if (activeTagWarning) {
+    diagnostics.push(
+      makeDgmoError(
+        activeTagLine || 1,
+        activeTagWarning,
+        "warning",
+        "W_ACTIVE_TAG_NO_MATCH"
+      )
+    );
+  }
   let error = null;
   const quotient = buildCoupleQuotient(frozenPersons, unions);
   if (quotient.cycle) {

package/dist/{chunk-CD7VQCDL.js → chunk-J7JF4QKA.js}

@@ -1,27 +1,27 @@
-import {
-  renderNodeCard
-} from "./chunk-R2K5L4UA.js";
 import {
   placeEdgeLabels
-} from "./chunk-IN7XI6NO.js";
+} from "./chunk-4NMRS6HW.js";
 import {
   serializeSvg
-} from "./chunk-CYRB2JTN.js";
+} from "./chunk-YLKPRT6U.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";
+import {
+  renderCollapseBar,
+  renderNodeCard
+} from "./chunk-LRTSTDJ6.js";
 import {
   layoutInlineHeader
-} from "./chunk-R5L5E3TC.js";
+} from "./chunk-REKLKGR6.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT
-} from "./chunk-VLC6WNRD.js";
+} from "./chunk-GULGSH2Z.js";
 import {
   ARROWHEAD_HEIGHT,
   ARROWHEAD_WIDTH,
   CARD_RADIUS,
-  COLLAPSE_BAR_HEIGHT,
   CONTAINER_HEADER_HEIGHT,
   CONTAINER_LABEL_FONT_SIZE,
   CONTAINER_META_FONT_SIZE,
@@ -35,14 +35,14 @@ import {
   META_LINE_HEIGHT,
   NODE_STROKE_WIDTH,
   SEPARATOR_GAP
-} from "./chunk-XCKNFFKM.js";
+} from "./chunk-WH6E6SHC.js";
 import {
   renderIntegratedLegend
-} from "./chunk-PGD6CNWO.js";
+} from "./chunk-DFEVFLEG.js";
 import {
   getLegendExtent,
   getMaxLegendReservedHeight
-} from "./chunk-JILEYZ2V.js";
+} from "./chunk-VVL2KKG4.js";
 import {
   preprocessDescriptionLine
 } from "./chunk-IYULMRBE.js";
@@ -54,12 +54,12 @@ import {
 } from "./chunk-ICLB27PZ.js";
 import {
   tagAttrKey
-} from "./chunk-LGUFJ7Y2.js";
+} from "./chunk-KW3CC7SB.js";
 import {
   fillModeFromOptions,
   legendInlineRequested,
   legendSuppressed
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   EYE_CLOSED_PATH,
   EYE_OPEN_PATH,
@@ -67,10 +67,10 @@ import {
   LEGEND_EYE_SIZE,
   LEGEND_GROUP_GAP,
   LEGEND_HEIGHT
-} from "./chunk-UOCWYLYT.js";
+} from "./chunk-OZXKW5NA.js";
 import {
   measureText
-} from "./chunk-KAO7JL4I.js";
+} from "./chunk-PU5X3P3T.js";
 import {
   contrastText,
   mix,
@@ -170,7 +170,6 @@ function renderSitemap(container, parsed, layout, palette, isDark, onClickItem,
   const sContainerHeaderHeight = ctx.structural(CONTAINER_HEADER_HEIGHT);
   const sTitleFontSize = ctx.text(TITLE_FONT_SIZE);
   const sTitleHeight = ctx.structural(TITLE_HEIGHT);
-  const sCollapseBarHeight = ctx.structural(COLLAPSE_BAR_HEIGHT);
   const sLegendFixedGap = ctx.aesthetic(LEGEND_FIXED_GAP);
   const noLegend = legendSuppressed(parsed.options);
   const hasLegend = layout.legend.length > 0 && !noLegend;
@@ -319,10 +318,17 @@ function renderSitemap(container, parsed, layout, palette, isDark, onClickItem,
         cG.append("text").attr("x", valueX).attr("y", rowY).attr("fill", valColor).attr("font-size", sContainerMetaFontSize).text(value);
       }
     }
-    if (!exportDims && c.hiddenCount && c.hiddenCount > 0) {
-      const clipId = `clip-${c.nodeId}`;
-      cG.append("clipPath").attr("id", clipId).append("rect").attr("width", c.width).attr("height", c.height).attr("rx", CONTAINER_RADIUS);
-      cG.append("rect").attr("y", c.height - sCollapseBarHeight).attr("width", c.width).attr("height", sCollapseBarHeight).attr("fill", stroke).attr("clip-path", `url(#${clipId})`).attr("class", "sitemap-collapse-bar");
+    if (c.hasChildren) {
+      renderCollapseBar(cG, {
+        expanded: !c.hiddenCount,
+        width: c.width,
+        height: c.height,
+        rx: CONTAINER_RADIUS,
+        fill: stroke,
+        clipId: `clip-${c.nodeId}`,
+        prefix: "sitemap",
+        scale: ctx
+      });
     }
   }
   const labelCentres = placeSitemapEdgeLabels(layout, sEdgeLabelFontSize);
@@ -347,7 +353,7 @@ function renderSitemap(container, parsed, layout, palette, isDark, onClickItem,
   for (const node of layout.nodes) {
     const nodeG = contentG.append("g").attr("transform", `translate(${node.x - node.width / 2}, ${node.y})`).attr("class", "sitemap-node").attr("data-line-number", String(node.lineNumber)).attr("data-node-id", node.id);
     if (node.hasChildren) {
-      nodeG.attr("data-node-toggle", node.id).attr("role", "button").attr("aria-expanded", String(!node.hiddenCount));
+      nodeG.attr("data-node-toggle", node.id).attr("role", "button").attr("aria-expanded", String(!node.hiddenCount)).attr("aria-label", node.label);
     }
     if (onClickItem) {
       nodeG.style("cursor", "pointer").on("click", () => onClickItem(node.lineNumber));
@@ -410,13 +416,17 @@ function renderSitemap(container, parsed, layout, palette, isDark, onClickItem,
         renderInlineText(textEl, processed, palette, sMetaFontSize);
       }
     }
-    if (!exportDims && node.hiddenCount && node.hiddenCount > 0) {
-      const clipId = `clip-${node.id}`;
-      nodeG.append("clipPath").attr("id", clipId).append("rect").attr("width", node.width).attr("height", node.height).attr("rx", CARD_RADIUS);
-      nodeG.append("rect").attr("y", node.height - sCollapseBarHeight).attr("width", node.width).attr("height", sCollapseBarHeight).attr(
-        "fill",
-        fillMode === "solid" ? labelColor : node.color ?? palette.primary
-      ).attr("opacity", 0.5).attr("clip-path", `url(#${clipId})`);
+    if (node.hasChildren) {
+      renderCollapseBar(nodeG, {
+        expanded: !node.hiddenCount,
+        width: node.width,
+        height: node.height,
+        rx: CARD_RADIUS,
+        fill: fillMode === "solid" ? labelColor : stroke,
+        clipId: `clip-${node.id}`,
+        prefix: "sitemap",
+        scale: ctx
+      });
     }
   }
   if (exportDims && hasLegend) {
@@ -507,8 +517,8 @@ function renderLegend(parent, legendGroups, palette, isDark, activeTagGroup, fix
   }
 }
 async function renderSitemapForExport(content, theme, palette) {
-  const { parseSitemap } = await import("./parser-UHKROC7Z.js");
-  const { layoutSitemap } = await import("./layout-IXQNVRBE.js");
+  const { parseSitemap } = await import("./parser-BA43YPIQ.js");
+  const { layoutSitemap } = await import("./layout-ZCCABSV7.js");
   const { getPalette, DEFAULT_PALETTE_ID } = await import("./palettes-4Y7CL2QL.js");
   const isDark = theme === "dark";
   const defaultCfg = getPalette(DEFAULT_PALETTE_ID);

package/dist/{chunk-MYHR3PMH.js → chunk-JULBDTNU.js}

@@ -1,35 +1,35 @@
 import {
   drawCylinderCard,
   drawQueueCard
-} from "./chunk-4B45SNZH.js";
+} from "./chunk-74XR7Z3I.js";
 import {
   CYLINDER_RY,
   FILE_WAVE,
   QUEUE_CAP
-} from "./chunk-ZBOIYC2G.js";
+} from "./chunk-V3ICBS2O.js";
 import {
   WHITEBOARD_COLORS,
   WHITEBOARD_NOTE_COLOR
 } from "./chunk-SQBCNEJB.js";
 import {
   renderChartTitle
-} from "./chunk-6XLMTAEX.js";
+} from "./chunk-YIHRLY55.js";
 import {
   TITLE_FONT_SIZE
-} from "./chunk-VLC6WNRD.js";
+} from "./chunk-GULGSH2Z.js";
 import {
   renderIntegratedLegend
-} from "./chunk-PGD6CNWO.js";
+} from "./chunk-DFEVFLEG.js";
 import {
   getMaxLegendReservedHeight
-} from "./chunk-JILEYZ2V.js";
+} from "./chunk-VVL2KKG4.js";
 import {
   FONT_FAMILY
 } from "./chunk-ICLB27PZ.js";
 import {
   measureText,
   wrapTextToWidth
-} from "./chunk-KAO7JL4I.js";
+} from "./chunk-PU5X3P3T.js";
 import {
   contrastText,
   mix,

package/dist/{chunk-EPDBWATV.js → chunk-K7RRXZHS.js}

@@ -1,16 +1,18 @@
 // src/utils/fit-canvas.ts
 var MIN_CANVAS_WIDTH = 480;
+var MIN_DRAWN_TEXT_PX = 7;
 function fitDiagramToCanvas(p) {
   const scaleX = (p.width - p.padding * 2) / p.diagramW;
   let scale;
   let canvasHeight;
   let canvasWidth;
   if (p.exportMode) {
-    scale = Math.min(p.maxScale, scaleX, 1);
+    const minScale = p.smallestTextPx ? MIN_DRAWN_TEXT_PX / p.smallestTextPx : 0;
+    scale = Math.max(Math.min(p.maxScale, scaleX, 1), minScale);
     canvasHeight = p.titleHeight + p.diagramH * scale + p.padding * 2;
     canvasWidth = Math.round(
       Math.min(
-        p.width,
+        scale > scaleX ? Infinity : p.width,
         Math.max(MIN_CANVAS_WIDTH, p.diagramW * scale + p.padding * 2)
       )
     );

package/dist/{chunk-YVIPJGFG.js → chunk-KMB754DO.js}

@@ -13,7 +13,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-LGUFJ7Y2.js";
+} from "./chunk-KW3CC7SB.js";
 import {
   ALL_CHART_TYPES,
   AliasRegistry,
@@ -23,11 +23,12 @@ import {
   measureIndent,
   parseFirstLine,
   peelQuotedName,
+  peelTrailingCollapsedFlag,
   splitNameAndMeta,
   tryParseSharedOption,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-FUYEXLAN.js";
+} from "./chunk-RFGQDIOI.js";
 import {
   formatDgmoError,
   makeDgmoError,
@@ -202,7 +203,8 @@ function parseSitemap(content, palette) {
       }
       currentTagGroup = null;
     }
-    if (!contentStarted && !currentTagGroup && measureIndent(line) === 0 && !trimmed.includes("|") && !trimmed.includes("->") && !trimmed.includes(":")) {
+    if (!contentStarted && !currentTagGroup && measureIndent(line) === 0 && !trimmed.includes("|") && !trimmed.includes("->") && !trimmed.includes(":") && // `Home collapsed` is a page carrying the bare fold flag, not an option.
+    !/[ \t]collapsed$/.test(trimmed)) {
       const dirBool = trimmed.match(/^direction-(lr|tb)$/i);
       if (dirBool) {
         result.direction = dirBool[1].toUpperCase();
@@ -260,7 +262,10 @@ function parseSitemap(content, palette) {
         /^(.*?)\s+as\s+([A-Za-z][A-Za-z0-9_]{0,11})\s*$/
       );
       const label = peelQuotedName(asMatch ? asMatch[1].trim() : rawLabel);
-      const tail = (containerMatch[2] ?? "").trim();
+      const barePeel = peelTrailingCollapsedFlag(
+        (containerMatch[2] ?? "").trim()
+      );
+      const tail = barePeel.rest.trim();
       const containerMetadata = {};
       if (tail.length > 0) {
         Object.assign(
@@ -268,6 +273,10 @@ function parseSitemap(content, palette) {
           parseSitemapMetaTail(tail, metaAliasMap)
         );
       }
+      const containerCollapsed = liftCollapsed(
+        containerMetadata,
+        barePeel.collapsed
+      );
       containerCounter++;
       const containerId = `container-${containerCounter}`;
       if (asMatch) nameAliasMap.declare(asMatch[2], containerId, lineNumber);
@@ -279,7 +288,10 @@ function parseSitemap(content, palette) {
         children: [],
         parentId: null,
         isContainer: true,
-        lineNumber
+        lineNumber,
+        ...containerCollapsed !== void 0 && {
+          collapsed: containerCollapsed
+        }
       };
       attachNode(node, indent, indentStack, result);
       const key = normalizeName(label);
@@ -294,6 +306,8 @@ function parseSitemap(content, palette) {
           lineNumber,
           "Metadata 'key: value' must be indented under a page \u2014 no page precedes it."
         );
+      } else if (key === "collapsed") {
+        parent.collapsed = value.toLowerCase() === "true";
       } else {
         parent.metadata = { ...parent.metadata, [key]: value };
       }
@@ -426,8 +440,10 @@ function parseNodeLabel(trimmed, lineNumber, _palette, counter, metaAliasMap = /
     new Set(metaAliasMap.keys())
   );
   const id = `node-${counter}`;
+  const barePeel = peelTrailingCollapsedFlag(trimmed);
+  const bareCollapsed = barePeel.collapsed && barePeel.rest.trim() !== "";
   const split = splitNameAndMeta(
-    trimmed,
+    bareCollapsed ? barePeel.rest : trimmed,
     registry,
     metaAliasMap,
     void 0,
@@ -456,10 +472,12 @@ function parseNodeLabel(trimmed, lineNumber, _palette, counter, metaAliasMap = /
     }
     delete metadata["description"];
   }
+  const collapsed = liftCollapsed(metadata, bareCollapsed);
   return {
     id,
     label,
     metadata,
+    ...collapsed !== void 0 && { collapsed },
     ...description !== void 0 && { description },
     children: [],
     parentId: null,
@@ -467,6 +485,15 @@ function parseNodeLabel(trimmed, lineNumber, _palette, counter, metaAliasMap = /
     lineNumber
   };
 }
+function liftCollapsed(metadata, bare) {
+  let collapsed = bare ? true : void 0;
+  const raw = metadata["collapsed"];
+  if (raw !== void 0) {
+    collapsed ??= raw.toLowerCase() === "true";
+    delete metadata["collapsed"];
+  }
+  return collapsed;
+}
 function parseSitemapMetaTail(tail, metaAliasMap) {
   const trimmed = tail.trim();
   if (!trimmed?.includes(":")) return {};