@diagrammo/dgmo 0.71.0 → 0.73.0

package/dist/{chunk-PBV2C3BW.js → chunk-OMQ5V5NH.js}

@@ -1,12 +1,12 @@
 import {
   tryCollectNote
-} from "./chunk-MX3BYU7V.js";
+} from "./chunk-JLSGQMRA.js";
 import {
   resolveNotes
-} from "./chunk-7NK42OIB.js";
+} from "./chunk-E6PNTYRK.js";
 import {
   parseInArrowLabel
-} from "./chunk-RRX4Z4TH.js";
+} from "./chunk-IHOFUR74.js";
 import {
   normalizeName
 } from "./chunk-NOTA6TEI.js";
@@ -20,8 +20,9 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-DPGI742S.js";
+} from "./chunk-4FKEI4MF.js";
 import {
+  AliasRegistry,
   BOXES_AND_LINES_REGISTRY,
   OPTION_NOCOLON_RE,
   extractColor,
@@ -32,11 +33,11 @@ import {
   tryParseSharedOption,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-ZJJWON5O.js";
+} from "./chunk-MK55PZVB.js";
 import {
   makeDgmoError,
   suggest
-} from "./chunk-OLMWTJVU.js";
+} from "./chunk-5SI6T5A5.js";
 
 // src/boxes-and-lines/parser.ts
 var MAX_GROUP_DEPTH = 2;
@@ -120,7 +121,7 @@ function parseBoxesAndLines(content, palette) {
   let activeTagOptionLine = 0;
   let currentTagGroup = null;
   const metaAliasMap = /* @__PURE__ */ new Map();
-  const nameAliasMap = /* @__PURE__ */ new Map();
+  const nameAliasMap = new AliasRegistry();
   function peelAlias(label) {
     const trimmed = label.trim();
     const m = trimmed.match(/^(.*?)\s+as\s+([A-Za-z][A-Za-z0-9_]{0,11})\s*$/);
@@ -414,7 +415,8 @@ function parseBoxesAndLines(content, palette) {
       const groupPeeled = peelAlias(groupMatch[1]);
       const label = groupPeeled.label;
       if (groupPeeled.alias)
-        nameAliasMap.set(groupPeeled.alias, groupId(label));
+        nameAliasMap.declare(groupPeeled.alias, groupId(label), lineNum);
+      nameAliasMap.noteCanonical(groupId(label), lineNum);
       const currentDepth = groupStack.length + 1;
       if (currentDepth > MAX_GROUP_DEPTH) {
         result.diagnostics.push(
@@ -602,6 +604,7 @@ function parseBoxesAndLines(content, palette) {
       "W_ACTIVE_TAG_NO_MATCH"
     );
   }
+  result.diagnostics.push(...nameAliasMap.finish());
   return result;
 }
 function parseNodeLine(trimmed, lineNum, metaAliasMap, diagnostics, nameAliasMap) {
@@ -647,8 +650,9 @@ function parseNodeLine(trimmed, lineNum, metaAliasMap, diagnostics, nameAliasMap
     delete metadata["heat"];
   }
   if (split.alias) {
-    nameAliasMap?.set(normalizeName(split.alias), label);
+    nameAliasMap?.declare(normalizeName(split.alias), label, lineNum);
   }
+  nameAliasMap?.noteCanonical(label, lineNum);
   if (!label) return null;
   return {
     label,
@@ -670,11 +674,11 @@ function splitTargetAndMeta(rest, metaAliasMap) {
   }
   return { target, metadata: split.meta };
 }
-function resolveEndpoint(name, nameAliasMap) {
+function resolveEndpoint(name, lineNum, nameAliasMap) {
   const m = name.match(/^\[(.+)\]$/);
   if (m) return groupId(m[1].trim());
   if (nameAliasMap) {
-    const aliased = nameAliasMap.get(name.trim());
+    const aliased = nameAliasMap.resolve(name, lineNum);
     if (aliased !== void 0) return aliased;
   }
   return peelQuotedName(name);
@@ -687,7 +691,7 @@ function parseEdgeLine(trimmed, lineNum, metaAliasMap, diagnostics, nameAliasMap
   const biLabeledMatch = trimmed.match(/^(.+?)\s*<-(.+)->\s*(.+)$/);
   if (biLabeledMatch) {
     const rawSource2 = biLabeledMatch[1].trim();
-    const source2 = resolveEndpoint(rawSource2, nameAliasMap);
+    const source2 = resolveEndpoint(rawSource2, lineNum, nameAliasMap);
     const labelResult = parseInArrowLabel(biLabeledMatch[2], lineNum);
     diagnostics.push(...labelResult.diagnostics);
     const label = labelResult.label;
@@ -719,7 +723,7 @@ function parseEdgeLine(trimmed, lineNum, metaAliasMap, diagnostics, nameAliasMap
     }
     return {
       source: source2,
-      target: resolveEndpoint(rest2, nameAliasMap),
+      target: resolveEndpoint(rest2, lineNum, nameAliasMap),
       ...label !== void 0 && { label },
       bidirectional: true,
       lineNumber: lineNum,
@@ -729,7 +733,7 @@ function parseEdgeLine(trimmed, lineNum, metaAliasMap, diagnostics, nameAliasMap
   const biIdx = trimmed.indexOf("<->");
   if (biIdx >= 0) {
     const rawSource2 = trimmed.slice(0, biIdx).trim();
-    const source2 = resolveEndpoint(rawSource2, nameAliasMap);
+    const source2 = resolveEndpoint(rawSource2, lineNum, nameAliasMap);
     let rest2 = trimmed.slice(biIdx + 3).trim();
     const { target: plainTarget2, metadata: metadata2 } = splitTargetAndMeta(
       rest2,
@@ -758,7 +762,7 @@ function parseEdgeLine(trimmed, lineNum, metaAliasMap, diagnostics, nameAliasMap
     }
     return {
       source: source2,
-      target: resolveEndpoint(rest2, nameAliasMap),
+      target: resolveEndpoint(rest2, lineNum, nameAliasMap),
       bidirectional: true,
       lineNumber: lineNum,
       metadata: metadata2
@@ -767,7 +771,7 @@ function parseEdgeLine(trimmed, lineNum, metaAliasMap, diagnostics, nameAliasMap
   const labeledMatch = trimmed.match(/^(.+?)\s+-(.+?)->\s*(.+)$/);
   if (labeledMatch) {
     const rawSource2 = labeledMatch[1].trim();
-    const source2 = resolveEndpoint(rawSource2, nameAliasMap);
+    const source2 = resolveEndpoint(rawSource2, lineNum, nameAliasMap);
     const labelResult = parseInArrowLabel(labeledMatch[2], lineNum);
     diagnostics.push(...labelResult.diagnostics);
     const label = labelResult.label;
@@ -800,7 +804,7 @@ function parseEdgeLine(trimmed, lineNum, metaAliasMap, diagnostics, nameAliasMap
       }
       return {
         source: source2,
-        target: resolveEndpoint(rest2, nameAliasMap),
+        target: resolveEndpoint(rest2, lineNum, nameAliasMap),
         label,
         bidirectional: false,
         lineNumber: lineNum,
@@ -811,7 +815,7 @@ function parseEdgeLine(trimmed, lineNum, metaAliasMap, diagnostics, nameAliasMap
   const arrowIdx = trimmed.indexOf("->");
   if (arrowIdx < 0) return null;
   const rawSource = trimmed.slice(0, arrowIdx).trim();
-  const source = resolveEndpoint(rawSource, nameAliasMap);
+  const source = resolveEndpoint(rawSource, lineNum, nameAliasMap);
   let rest = trimmed.slice(arrowIdx + 2).trim();
   if (!source || !rest) {
     diagnostics.push(
@@ -844,7 +848,7 @@ function parseEdgeLine(trimmed, lineNum, metaAliasMap, diagnostics, nameAliasMap
   }
   return {
     source,
-    target: resolveEndpoint(rest, nameAliasMap),
+    target: resolveEndpoint(rest, lineNum, nameAliasMap),
     bidirectional: false,
     lineNumber: lineNum,
     metadata
@@ -855,4 +859,4 @@ export {
   looksLikeBoxesAndLines,
   parseBoxesAndLines
 };
-//# sourceMappingURL=chunk-PBV2C3BW.js.map
+//# sourceMappingURL=chunk-OMQ5V5NH.js.map

package/dist/{chunk-W27BULCB.js → chunk-OR3OX32W.js}

@@ -14,7 +14,7 @@ import {
 } from "./chunk-FJ57274M.js";
 import {
   layoutInlineHeader
-} from "./chunk-6CLC26GU.js";
+} from "./chunk-YJMWEZOB.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -22,17 +22,17 @@ import {
 } from "./chunk-A4GOY3PE.js";
 import {
   renderIntegratedLegend
-} from "./chunk-6S53NO3M.js";
+} from "./chunk-O7ZKDUDX.js";
 import {
   getLegendExtent,
   getMaxLegendReservedHeight
-} from "./chunk-MTPKBSTR.js";
+} from "./chunk-4SXHMFFP.js";
 import {
   FONT_FAMILY
 } from "./chunk-UTCPNJND.js";
 import {
   LEGEND_GROUP_GAP
-} from "./chunk-QX53GOI7.js";
+} from "./chunk-YT5ICQ4R.js";
 import {
   measureText
 } from "./chunk-MTGGOCND.js";
@@ -42,21 +42,21 @@ import {
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-DPGI742S.js";
+} from "./chunk-4FKEI4MF.js";
 import {
   fillModeFromOptions,
   legendInlineRequested,
   legendSuppressed
-} from "./chunk-ZJJWON5O.js";
+} from "./chunk-MK55PZVB.js";
 import {
   contrastText,
   mix,
   shapeFill,
   themeBaseBg
-} from "./chunk-KWRW6BLG.js";
+} from "./chunk-GLREDNBA.js";
 import {
   resolveColor
-} from "./chunk-EXNKNJ65.js";
+} from "./chunk-XOGQY4EC.js";
 
 // src/family/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -317,4 +317,4 @@ export {
   renderFamilyForExport,
   renderFamily
 };
-//# sourceMappingURL=chunk-W27BULCB.js.map
+//# sourceMappingURL=chunk-OR3OX32W.js.map

package/dist/{chunk-MFSTE3YG.js → chunk-OYK45NY5.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-7TF3QOOD.js";
 import {
   parseInArrowLabel
-} from "./chunk-RRX4Z4TH.js";
+} from "./chunk-IHOFUR74.js";
 import {
   tryStripDescriptionKeyword
 } from "./chunk-IYULMRBE.js";
@@ -17,8 +17,9 @@ import {
   stripDefaultModifier,
   tagAttrKey,
   validateTagGroupNames
-} from "./chunk-DPGI742S.js";
+} from "./chunk-4FKEI4MF.js";
 import {
+  AliasRegistry,
   INFRA_BEHAVIOR_KEY_SET,
   INFRA_EDGE_ONLY_KEY_SET,
   INFRA_REGISTRY,
@@ -30,10 +31,10 @@ import {
   tryParseSharedOption,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-ZJJWON5O.js";
+} from "./chunk-MK55PZVB.js";
 import {
   isRecognizedColorName
-} from "./chunk-EXNKNJ65.js";
+} from "./chunk-XOGQY4EC.js";
 import {
   NAME_DIAGNOSTIC_CODES,
   emit,
@@ -41,7 +42,7 @@ import {
   makeDgmoError,
   nameMergedMessage,
   suggest
-} from "./chunk-OLMWTJVU.js";
+} from "./chunk-5SI6T5A5.js";
 
 // src/infra/types.ts
 var INFRA_BEHAVIOR_KEYS = INFRA_BEHAVIOR_KEY_SET;
@@ -162,7 +163,7 @@ function parseInfra(content) {
     keys: /* @__PURE__ */ new Set(["split", "fanout"]),
     tagAliases: /* @__PURE__ */ new Set()
   };
-  const nameAliasMap = /* @__PURE__ */ new Map();
+  const nameAliasMap = new AliasRegistry();
   function peelAlias(label) {
     const trimmed = label.trim();
     const m = trimmed.match(/^(.*?)\s+as\s+([A-Za-z][A-Za-z0-9_]{0,11})\s*$/);
@@ -194,7 +195,7 @@ function parseInfra(content) {
     }
   }
   function resolveTargetId(rawName) {
-    const aliasResolved = nameAliasMap.get(rawName.trim());
+    const aliasResolved = nameAliasMap.resolve(rawName.trim());
     if (aliasResolved !== void 0) return aliasResolved;
     return nodeId(rawName);
   }
@@ -222,7 +223,7 @@ function parseInfra(content) {
     if (existing) {
       const incomingDisplay = displayName(currentNode.label);
       const existingDisplay = displayName(existing.label);
-      const isAliasRef = nameAliasMap.get(currentNode.label) === key;
+      const isAliasRef = nameAliasMap.lookup(currentNode.label) === key;
       if (incomingDisplay !== existingDisplay && !isAliasRef) {
         result.diagnostics.push(
           makeDgmoError(
@@ -271,6 +272,7 @@ function parseInfra(content) {
   for (let i = 0; i < lines.length; i++) {
     const raw = lines[i];
     const lineNumber = i + 1;
+    nameAliasMap.at(lineNumber);
     const trimmed = raw.trim();
     const indent = measureIndent(raw);
     if (!trimmed || trimmed.startsWith("//")) continue;
@@ -336,7 +338,8 @@ function parseInfra(content) {
         const gLabel = groupMatch[1].trim();
         const groupAlias = groupMatch[2];
         const gId = groupId(gLabel);
-        if (groupAlias) nameAliasMap.set(groupAlias, gId);
+        if (groupAlias) nameAliasMap.declare(groupAlias, gId, lineNumber);
+        nameAliasMap.noteCanonical(gId, lineNumber);
         let groupCollapsed = groupMatch[3] !== void 0;
         const groupMeta = groupMatch[4] ? extractPipeMetadata(groupMatch[4]).tags : void 0;
         if (groupMeta) {
@@ -381,8 +384,9 @@ function parseInfra(content) {
           withTagAliases(INFRA_REGISTRY, tagAliasSet),
           (msg) => warn(lineNumber, msg)
         );
-        const id = nameAliasMap.get(name) ?? nodeId(name);
-        if (alias) nameAliasMap.set(alias, id);
+        const id = nameAliasMap.resolve(name) ?? nodeId(name);
+        if (alias) nameAliasMap.declare(alias, id, lineNumber);
+        nameAliasMap.noteCanonical(id, lineNumber);
         const isEdge = EDGE_NODE_NAMES.has(id.toLowerCase());
         currentNode = {
           id,
@@ -488,8 +492,9 @@ function parseInfra(content) {
           withTagAliases(INFRA_REGISTRY, tagAliasSet),
           (msg) => warn(lineNumber, msg)
         );
-        const id = nameAliasMap.get(name) ?? nodeId(name);
-        if (alias) nameAliasMap.set(alias, id);
+        const id = nameAliasMap.resolve(name) ?? nodeId(name);
+        if (alias) nameAliasMap.declare(alias, id, lineNumber);
+        nameAliasMap.noteCanonical(id, lineNumber);
         const tags = currentGroup.metadata ? { ...currentGroup.metadata, ...nodeTags } : nodeTags;
         currentNode = {
           id,
@@ -742,8 +747,9 @@ function parseInfra(content) {
           withTagAliases(INFRA_REGISTRY, tagAliasSet),
           (msg) => warn(lineNumber, msg)
         );
-        const id = nameAliasMap.get(name) ?? nodeId(name);
-        if (alias) nameAliasMap.set(alias, id);
+        const id = nameAliasMap.resolve(name) ?? nodeId(name);
+        if (alias) nameAliasMap.declare(alias, id, lineNumber);
+        nameAliasMap.noteCanonical(id, lineNumber);
         const tags = currentGroup.metadata ? { ...currentGroup.metadata, ...nodeTags } : nodeTags;
         currentNode = {
           id,
@@ -778,8 +784,9 @@ function parseInfra(content) {
           withTagAliases(INFRA_REGISTRY, tagAliasSet),
           (msg) => warn(lineNumber, msg)
         );
-        const id = nameAliasMap.get(name) ?? nodeId(name);
-        if (alias) nameAliasMap.set(alias, id);
+        const id = nameAliasMap.resolve(name) ?? nodeId(name);
+        if (alias) nameAliasMap.declare(alias, id, lineNumber);
+        nameAliasMap.noteCanonical(id, lineNumber);
         currentNode = {
           id,
           label: name,
@@ -851,6 +858,7 @@ function parseInfra(content) {
   validateTagGroupNames(result.tagGroups, warn, setError);
   checkReachability(result);
   checkSplitSums(result);
+  result.diagnostics.push(...nameAliasMap.finish());
   return result;
 }
 function checkSplitSums(result) {
@@ -996,4 +1004,4 @@ export {
   parseInfra,
   extractSymbols
 };
-//# sourceMappingURL=chunk-MFSTE3YG.js.map
+//# sourceMappingURL=chunk-OYK45NY5.js.map

package/dist/{chunk-ISKO4MQ5.js → chunk-PFZDLHHG.js}

@@ -1,6 +1,6 @@
 import {
   analyzePert
-} from "./chunk-CGLBK5Q4.js";
+} from "./chunk-2PU5XWLA.js";
 import {
   computeNodeSizing,
   layoutPert
@@ -15,11 +15,11 @@ import {
 } from "./chunk-FJ57274M.js";
 import {
   ScaleContext
-} from "./chunk-YYVTBZZC.js";
+} from "./chunk-24YPR5EH.js";
 import {
   INLINE_HEADER_PAD,
   layoutInlineHeader
-} from "./chunk-6CLC26GU.js";
+} from "./chunk-YJMWEZOB.js";
 import {
   serializeSvg
 } from "./chunk-RU2HHHYA.js";
@@ -36,16 +36,16 @@ import {
 } from "./chunk-A4GOY3PE.js";
 import {
   renderIntegratedLegend
-} from "./chunk-6S53NO3M.js";
+} from "./chunk-O7ZKDUDX.js";
 import {
   getLegendExtent
-} from "./chunk-MTPKBSTR.js";
+} from "./chunk-4SXHMFFP.js";
 import {
   FONT_FAMILY
 } from "./chunk-UTCPNJND.js";
 import {
   LEGEND_HEIGHT
-} from "./chunk-QX53GOI7.js";
+} from "./chunk-YT5ICQ4R.js";
 import {
   measureText,
   truncateText,
@@ -53,7 +53,7 @@ import {
 } from "./chunk-MTGGOCND.js";
 import {
   parsePert
-} from "./chunk-NTBHGUXY.js";
+} from "./chunk-NE7JHZCQ.js";
 import {
   addCalendarDays,
   formatDuration,
@@ -64,13 +64,13 @@ import {
 import {
   resolveActiveTagGroup,
   resolveTagColor
-} from "./chunk-DPGI742S.js";
+} from "./chunk-4FKEI4MF.js";
 import {
   contrastText,
   mix,
   shapeFill,
   themeBaseBg
-} from "./chunk-KWRW6BLG.js";
+} from "./chunk-GLREDNBA.js";
 
 // src/pert/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -1871,4 +1871,4 @@ export {
   measurePertAnalysisBlock,
   renderPertAnalysisBlock
 };
-//# sourceMappingURL=chunk-ISKO4MQ5.js.map
+//# sourceMappingURL=chunk-PFZDLHHG.js.map

package/dist/{chunk-ENJWB5LU.js → chunk-PJHYUVD3.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-VV6HZQ5K.js";
 import {
   layoutOrg
-} from "./chunk-CH4WODSG.js";
+} from "./chunk-TJS3J5B3.js";
 import {
   renderCollapseBar,
   renderNodeCard
@@ -28,17 +28,17 @@ 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-6S53NO3M.js";
+} from "./chunk-O7ZKDUDX.js";
 import {
   getMaxLegendReservedHeight
-} from "./chunk-MTPKBSTR.js";
+} from "./chunk-4SXHMFFP.js";
 import {
   FONT_FAMILY
 } from "./chunk-UTCPNJND.js";
@@ -47,28 +47,27 @@ import {
   EYE_OPEN_PATH,
   LEGEND_EYE_GAP,
   LEGEND_EYE_SIZE,
-  LEGEND_GROUP_GAP,
   LEGEND_HEIGHT
-} from "./chunk-QX53GOI7.js";
+} from "./chunk-YT5ICQ4R.js";
 import {
   measureText
 } from "./chunk-MTGGOCND.js";
 import {
   parseOrg
-} from "./chunk-7SEQPFBX.js";
+} from "./chunk-2AC2KTVM.js";
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-DPGI742S.js";
+} from "./chunk-4FKEI4MF.js";
 import {
   fillModeFromOptions
-} from "./chunk-ZJJWON5O.js";
+} from "./chunk-MK55PZVB.js";
 import {
   contrastText,
   mix,
   shapeFill,
   themeBaseBg
-} from "./chunk-KWRW6BLG.js";
+} from "./chunk-GLREDNBA.js";
 
 // src/org/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -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-ENJWB5LU.js.map
+//# sourceMappingURL=chunk-PJHYUVD3.js.map

package/dist/{chunk-K6MQJ5IV.js → chunk-Q446PFCV.js}

@@ -1,6 +1,6 @@
 import {
   parseFirstLine
-} from "./chunk-ZJJWON5O.js";
+} from "./chunk-MK55PZVB.js";
 import {
   parseCloudReferenceFence,
   parseCloudReferenceUrl
@@ -8,7 +8,7 @@ import {
 import {
   formatDgmoError,
   makeDgmoError
-} from "./chunk-OLMWTJVU.js";
+} from "./chunk-5SI6T5A5.js";
 
 // src/live-link/parser.ts
 var GLOBAL_DIRECTIVES = /* @__PURE__ */ new Set([
@@ -219,4 +219,4 @@ export {
   isLiveLinkLine,
   parseLiveLink
 };
-//# sourceMappingURL=chunk-K6MQJ5IV.js.map
+//# sourceMappingURL=chunk-Q446PFCV.js.map

package/dist/{chunk-IW6N2JJL.js → chunk-Q74GP3GK.js}

@@ -11,7 +11,7 @@ import {
 } from "./chunk-WGC42WJU.js";
 import {
   mix
-} from "./chunk-KWRW6BLG.js";
+} from "./chunk-GLREDNBA.js";
 
 // src/utils/note-box/svg.ts
 var NOTE_STROKE_WIDTH = 0.6;
@@ -133,4 +133,4 @@ export {
   NOTE_BADGE_RADIUS,
   renderNoteBadge
 };
-//# sourceMappingURL=chunk-IW6N2JJL.js.map
+//# sourceMappingURL=chunk-Q74GP3GK.js.map

package/dist/{chunk-7REARI5N.js → chunk-QFHPGDR5.js}

@@ -1,6 +1,6 @@
 import {
   MONO_FAMILY
-} from "./chunk-HTGYAMOK.js";
+} from "./chunk-ITAFWUSB.js";
 import {
   FONT_FAMILY
 } from "./chunk-UTCPNJND.js";
@@ -62,4 +62,4 @@ function escapeXml(s) {
 export {
   renderLiveLinkCard
 };
-//# sourceMappingURL=chunk-7REARI5N.js.map
+//# sourceMappingURL=chunk-QFHPGDR5.js.map

package/dist/{chunk-QPG55HGH.js → chunk-RJUMXXKR.js}

@@ -11,7 +11,7 @@ import {
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey
-} from "./chunk-DPGI742S.js";
+} from "./chunk-4FKEI4MF.js";
 import {
   FAMILY_PERSON_REGISTRY,
   FAMILY_UNION_REGISTRY,
@@ -26,14 +26,14 @@ import {
   tokenizeQuoteAware,
   tryParseSharedOption,
   withTagAliases
-} from "./chunk-ZJJWON5O.js";
+} from "./chunk-MK55PZVB.js";
 import {
   nord,
   resolveColor
-} from "./chunk-EXNKNJ65.js";
+} from "./chunk-XOGQY4EC.js";
 import {
   emit
-} from "./chunk-OLMWTJVU.js";
+} from "./chunk-5SI6T5A5.js";
 
 // src/family/diagnostics.ts
 var FAMILY_DX = {
@@ -571,4 +571,4 @@ export {
   FAMILY_DIAGNOSTICS,
   parseFamily
 };
-//# sourceMappingURL=chunk-QPG55HGH.js.map
+//# sourceMappingURL=chunk-RJUMXXKR.js.map