@diagrammo/dgmo 0.70.0 → 0.72.0

package/dist/{chunk-UJ4FJLBF.js → chunk-FX2USYOU.js}

@@ -24,6 +24,17 @@ var ORG_SHAPE = {
   },
   countsAsHidden: (node) => !node.isContainer
 };
+function unionCollapsedOrgNodes(parsed, interactive) {
+  const ids = new Set(interactive ?? []);
+  const walk = (nodes) => {
+    for (const node of nodes) {
+      if (node.collapsed) ids.add(node.id);
+      walk(node.children);
+    }
+  };
+  walk(parsed.roots);
+  return ids;
+}
 function collapseOrgTree(original, collapsedIds) {
   if (collapsedIds.size === 0) {
     return { parsed: original, hiddenCounts: /* @__PURE__ */ new Map() };
@@ -80,7 +91,8 @@ function focusOrgTree(original, focusNodeId) {
 }
 
 export {
+  unionCollapsedOrgNodes,
   collapseOrgTree,
   focusOrgTree
 };
-//# sourceMappingURL=chunk-UJ4FJLBF.js.map
+//# sourceMappingURL=chunk-FX2USYOU.js.map

package/dist/{chunk-IOVJT4PE.js → chunk-GCTKJDLY.js}

@@ -18,7 +18,7 @@ import {
 } from "./chunk-FJ57274M.js";
 import {
   ScaleContext
-} from "./chunk-YYVTBZZC.js";
+} from "./chunk-24YPR5EH.js";
 import {
   layoutInlineHeader
 } from "./chunk-6CLC26GU.js";
@@ -29,7 +29,7 @@ import {
 } from "./chunk-A4GOY3PE.js";
 import {
   renderIntegratedLegend
-} from "./chunk-VSZRPDIZ.js";
+} from "./chunk-6S53NO3M.js";
 import {
   getLegendExtent
 } from "./chunk-MTPKBSTR.js";
@@ -44,12 +44,12 @@ import {
 } from "./chunk-MTGGOCND.js";
 import {
   parseClassDiagram
-} from "./chunk-JR6H5MEF.js";
+} from "./chunk-UNTFANSM.js";
 import {
   fillModeFromOptions,
   legendInlineRequested,
   legendSuppressed
-} from "./chunk-M2QQQWM3.js";
+} from "./chunk-ZJJWON5O.js";
 import {
   contrastText,
   shapeFill
@@ -448,4 +448,4 @@ export {
   renderClassDiagram,
   renderClassDiagramForExport
 };
-//# sourceMappingURL=chunk-IOVJT4PE.js.map
+//# sourceMappingURL=chunk-GCTKJDLY.js.map

package/dist/{chunk-WBPWR2CX.js → chunk-GK4AU57A.js}

@@ -4,10 +4,10 @@ import {
 } from "./chunk-WGC42WJU.js";
 import {
   ScaleContext
-} from "./chunk-YYVTBZZC.js";
+} from "./chunk-24YPR5EH.js";
 import {
   renderIntegratedLegend
-} from "./chunk-VSZRPDIZ.js";
+} from "./chunk-6S53NO3M.js";
 import {
   getMaxLegendReservedHeight
 } from "./chunk-MTPKBSTR.js";
@@ -22,7 +22,7 @@ import {
 import {
   fillModeFromOptions,
   legendSuppressed
-} from "./chunk-M2QQQWM3.js";
+} from "./chunk-ZJJWON5O.js";
 import {
   contrastText,
   mix,
@@ -1603,4 +1603,4 @@ export {
   renderTechRadar,
   renderTechRadarForExport
 };
-//# sourceMappingURL=chunk-WBPWR2CX.js.map
+//# sourceMappingURL=chunk-GK4AU57A.js.map

package/dist/{chunk-5ECGBM5S.js → chunk-HKL66CKW.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-VV6HZQ5K.js";
 import {
   layoutOrg
-} from "./chunk-J3XFVPEU.js";
+} from "./chunk-FTPNAYL2.js";
 import {
   renderCollapseBar,
   renderNodeCard
@@ -28,14 +28,14 @@ import {
 } from "./chunk-FJ57274M.js";
 import {
   ScaleContext
-} from "./chunk-YYVTBZZC.js";
+} from "./chunk-24YPR5EH.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT
 } from "./chunk-A4GOY3PE.js";
 import {
   renderIntegratedLegend
-} from "./chunk-VSZRPDIZ.js";
+} from "./chunk-6S53NO3M.js";
 import {
   getMaxLegendReservedHeight
 } from "./chunk-MTPKBSTR.js";
@@ -47,7 +47,6 @@ import {
   EYE_OPEN_PATH,
   LEGEND_EYE_GAP,
   LEGEND_EYE_SIZE,
-  LEGEND_GROUP_GAP,
   LEGEND_HEIGHT
 } from "./chunk-QX53GOI7.js";
 import {
@@ -55,14 +54,14 @@ import {
 } from "./chunk-MTGGOCND.js";
 import {
   parseOrg
-} from "./chunk-YXW2ZYS3.js";
+} from "./chunk-7SEQPFBX.js";
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-PBXMUXBW.js";
+} from "./chunk-DPGI742S.js";
 import {
   fillModeFromOptions
-} from "./chunk-M2QQQWM3.js";
+} from "./chunk-ZJJWON5O.js";
 import {
   contrastText,
   mix,
@@ -79,8 +78,11 @@ var ANCESTOR_DOT_R = 4;
 var ANCESTOR_LABEL_FONT_SIZE = 11;
 var ANCESTOR_ROW_HEIGHT = 22;
 var ANCESTOR_TRAIL_BOTTOM_GAP = 16;
-function ancestorTrailReserve(count) {
-  return count > 0 ? count * ANCESTOR_ROW_HEIGHT + ANCESTOR_TRAIL_BOTTOM_GAP : 0;
+var ANCESTOR_TRAIL_TOP_INK = ANCESTOR_DOT_R + 2;
+function ancestorTrailReserve(count, headroom = 0) {
+  if (count < 1) return 0;
+  const inkAboveRoot = ANCESTOR_TRAIL_BOTTOM_GAP + (count - 1) * ANCESTOR_ROW_HEIGHT + ANCESTOR_TRAIL_TOP_INK;
+  return Math.max(0, inkAboveRoot - headroom);
 }
 var LEGEND_FIXED_GAP = 8;
 function nodeFill(palette, isDark, nodeColor, fillMode) {
@@ -131,7 +133,7 @@ function renderOrg(container, parsed, layout, palette, isDark, onClickItem, expo
   const titleOffset = showTitle ? sTitleHeight : 0;
   const legendOnly = layout.nodes.length === 0;
   const hasLegend = layout.legend.length > 0;
-  const layoutLegendShift = LEGEND_HEIGHT + LEGEND_GROUP_GAP;
+  const layoutLegendShift = layout.legendShift;
   const fixedLegend = !exportDims && hasLegend && !legendOnly;
   const legendReserve = fixedLegend ? getMaxLegendReservedHeight(
     {
@@ -146,11 +148,18 @@ function renderOrg(container, parsed, layout, palette, isDark, onClickItem, expo
   const titleReserve = fixedTitle ? sTitleHeight : 0;
   const hasAncestorTrail = ancestorPath && ancestorPath.length > 0;
   const ancestorTrailHeight = hasAncestorTrail ? ancestorPath.length * sAncestorRowHeight + sAncestorTrailBottomGap : 0;
+  const rootNodeIds = new Set(parsed.roots.map((r) => r.id));
+  const rootLayoutNode = layout.nodes.find((n) => rootNodeIds.has(n.id));
+  const rootLayoutContainer = rootLayoutNode ? null : layout.containers.find((c) => rootNodeIds.has(c.nodeId));
+  const rootCenterX = rootLayoutNode ? rootLayoutNode.x : rootLayoutContainer ? rootLayoutContainer.x + rootLayoutContainer.width / 2 : null;
+  const rootTopY = rootLayoutNode ? rootLayoutNode.y : rootLayoutContainer ? rootLayoutContainer.y : null;
+  const legendUnshift = fixedLegend ? layoutLegendShift : 0;
+  const trailShift = hasAncestorTrail && rootTopY !== null ? ancestorTrailReserve(
+    ancestorPath.length,
+    Math.max(0, rootTopY - legendUnshift)
+  ) : ancestorTrailHeight;
   const diagramW = layout.width;
-  let diagramH = layout.height + (fixedTitle ? 0 : titleOffset) + ancestorTrailHeight;
-  if (fixedLegend) {
-    diagramH -= layoutLegendShift;
-  }
+  const diagramH = layout.height + (fixedTitle ? 0 : titleOffset) - legendUnshift + trailShift;
   const availH = height - sDiagramPadding * 2 - legendReserve - titleReserve;
   const scaleX = (width - sDiagramPadding * 2) / diagramW;
   const scaleY = availH / diagramH;
@@ -182,13 +191,12 @@ function renderOrg(container, parsed, layout, palette, isDark, onClickItem, expo
       }
     }
   }
-  const contentYShift = (fixedTitle ? 0 : titleOffset) + ancestorTrailHeight;
+  const contentYShift = (fixedTitle ? 0 : titleOffset) - legendUnshift + trailShift;
   const contentG = mainG.append("g").attr("transform", `translate(0, ${contentYShift})`);
   const displayNames = /* @__PURE__ */ new Map();
   for (const group of parsed.tagGroups) {
     displayNames.set(tagAttrKey(group.name), group.name);
   }
-  const rootNodeIds = new Set(parsed.roots.map((r) => r.id));
   const colorOff = parsed.options?.["color"] === "off";
   for (const c of layout.containers) {
     const cG = contentG.append("g").attr("transform", `translate(${c.x}, ${c.y})`).attr("class", "org-container").attr("data-line-number", String(c.lineNumber));
@@ -355,10 +363,6 @@ function renderOrg(container, parsed, layout, palette, isDark, onClickItem, expo
     }
   }
   if (hasAncestorTrail) {
-    const rootNode = layout.nodes.find((n) => rootNodeIds.has(n.id));
-    const rootContainer = !rootNode ? layout.containers.find((c) => rootNodeIds.has(c.nodeId)) : null;
-    const rootCenterX = rootNode ? rootNode.x : rootContainer ? rootContainer.x + rootContainer.width / 2 : null;
-    const rootTopY = rootNode ? rootNode.y : rootContainer ? rootContainer.y : null;
     if (rootCenterX !== null && rootTopY !== null) {
       const trailBottomY = rootTopY - sAncestorTrailBottomGap;
       const trailG = contentG.append("g").attr("class", "org-ancestor-trail");
@@ -489,4 +493,4 @@ export {
   renderOrg,
   renderOrgForExport
 };
-//# sourceMappingURL=chunk-5ECGBM5S.js.map
+//# sourceMappingURL=chunk-HKL66CKW.js.map

package/dist/{chunk-Z4KRDDZC.js → chunk-HWNF22ZZ.js}

@@ -3,12 +3,13 @@ import {
 } from "./chunk-RRX4Z4TH.js";
 import {
   AUTO_TAG_COLOR_SENTINEL,
+  activeTagNoMatchMessage,
   finalizeAutoTagColors,
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey,
   validateTagGroupNames
-} from "./chunk-PBXMUXBW.js";
+} from "./chunk-DPGI742S.js";
 import {
   MAP_DIRECTIVE_KEY_SET,
   MAP_REGISTRY,
@@ -17,7 +18,7 @@ import {
   peelRampColors,
   splitNameAndMeta,
   withTagAliases
-} from "./chunk-M2QQQWM3.js";
+} from "./chunk-ZJJWON5O.js";
 import {
   NEGATIVE_VALUE_DX,
   emit,
@@ -80,8 +81,8 @@ function parseMap(content, palette) {
     pushError(line, message);
     return result;
   };
-  const pushWarning = (line, message) => {
-    diagnostics.push(makeDgmoError(line, message, "warning"));
+  const pushWarning = (line, message, code) => {
+    diagnostics.push(makeDgmoError(line, message, "warning", code));
   };
   const lines = content.split("\n");
   let firstIdx = 0;
@@ -109,6 +110,7 @@ function parseMap(content, palette) {
   const routes = result.routes;
   const edges = result.edges;
   const aliasMap = /* @__PURE__ */ new Map();
+  let activeTagOptionLine = 0;
   const open = { tag: null, route: null, poi: null };
   const registry = () => withTagAliases(MAP_REGISTRY, new Set(aliasMap.keys()));
   const tagGroupNames = () => new Set(tagGroups.map((g) => tagAttrKey(g.name)));
@@ -202,16 +204,18 @@ function parseMap(content, palette) {
     pushWarning,
     (line, m) => pushError(line, m)
   );
-  const at = result.directives.activeTag;
-  if (at && at.toLowerCase() !== "none") {
-    const names = tagGroupNames();
-    if (!names.has(at.toLowerCase())) {
-      const hint = tagGroups.length ? ` Declared groups: ${tagGroups.map((g) => g.name).join(", ")}.` : " No tag groups are declared.";
-      pushWarning(
-        0,
-        `active-tag "${at}" does not match a declared tag group.${hint}`
-      );
-    }
+  const activeTagWarning = activeTagNoMatchMessage(
+    result.directives.activeTag,
+    tagGroups,
+    regions.some((r) => r.value !== void 0) ? [result.directives.regionMetric?.trim() || "Value"] : [],
+    "the value ramp"
+  );
+  if (activeTagWarning) {
+    pushWarning(
+      activeTagOptionLine || 1,
+      activeTagWarning,
+      "W_ACTIVE_TAG_NO_MATCH"
+    );
   }
   return result;
   function rejectForeignChannels(meta, own, line) {
@@ -272,6 +276,7 @@ function parseMap(content, palette) {
       case "active-tag":
         dup(d.activeTag);
         d.activeTag = value;
+        activeTagOptionLine = line;
         break;
       case "caption":
         dup(d.caption);
@@ -652,4 +657,4 @@ export {
   looksLikeMap,
   parseMap
 };
-//# sourceMappingURL=chunk-Z4KRDDZC.js.map
+//# sourceMappingURL=chunk-HWNF22ZZ.js.map