@diagrammo/dgmo 0.70.0 → 0.72.0

package/dist/{chunk-7LMDJ3U7.js → chunk-VE7PPEU3.js}

@@ -42,7 +42,7 @@ import {
   getSimpleChartLegendGroups,
   parseChart,
   parseExtendedChart
-} from "./chunk-MGAWLZQE.js";
+} from "./chunk-UY77QQWU.js";
 import {
   EMPHASIS_DIM_OPACITY,
   EMPHASIS_DIM_TEXT_OPACITY,
@@ -50,7 +50,7 @@ import {
 } from "./chunk-2CW5ZTNH.js";
 import {
   tagAttrKey
-} from "./chunk-PBXMUXBW.js";
+} from "./chunk-DPGI742S.js";
 import {
   contrastText,
   getSegmentColors,
@@ -282,6 +282,70 @@ function tagDatum(sel, o) {
 function drawValueLabel(svg, text, x, y, color, anchor = "middle") {
   svg.append("text").attr("x", x).attr("y", y).attr("text-anchor", anchor).attr("fill", color).attr("font-size", VALUE_FONT).attr("font-family", FONT_FAMILY).text(text);
 }
+var LABEL_ROTATE_DEG = 40;
+var LABEL_GAP = 8;
+var LABEL_LINE_HEIGHT = 1.25;
+function spreadIndices(total, count) {
+  if (total <= 0) return /* @__PURE__ */ new Set();
+  if (total === 1 || count <= 1) return /* @__PURE__ */ new Set([0]);
+  const n = Math.min(count, total);
+  const keep = /* @__PURE__ */ new Set();
+  for (let k = 0; k < n; k++) {
+    keep.add(Math.round(k * (total - 1) / (n - 1)));
+  }
+  return keep;
+}
+function planCategoryLabels(labels, slot, font = TICK_FONT) {
+  const n = labels.length;
+  if (n === 0) {
+    return { rotate: false, stride: 1, height: 18, keep: /* @__PURE__ */ new Set() };
+  }
+  const widest = Math.max(...labels.map((t) => measureText(t, font)));
+  const flatNeeds = widest + LABEL_GAP;
+  const flatHeight = Math.round(font * LABEL_LINE_HEIGHT) + 6;
+  const all = (stride2) => (
+    // How many labels fit at this spacing, both ends included.
+    spreadIndices(n, Math.floor((n - 1) / stride2) + 1)
+  );
+  if (slot <= 0 || flatNeeds <= slot) {
+    return {
+      rotate: false,
+      stride: 1,
+      height: flatHeight,
+      keep: spreadIndices(n, n)
+    };
+  }
+  const flatStride = Math.ceil(flatNeeds / slot);
+  if (flatStride <= 2) {
+    return { rotate: false, stride: 2, height: flatHeight, keep: all(2) };
+  }
+  const rad = LABEL_ROTATE_DEG * Math.PI / 180;
+  const rotNeeds = font * LABEL_LINE_HEIGHT / Math.sin(rad);
+  const stride = Math.max(1, Math.ceil(rotNeeds / slot));
+  return {
+    rotate: true,
+    stride,
+    height: Math.round(widest * Math.sin(rad)) + 12,
+    keep: all(stride)
+  };
+}
+function labelSurvives(plan, i) {
+  return plan.keep.has(i);
+}
+function drawCategoryLabels(svg, labels, plan, xFor, baseline, textColor, font = TICK_FONT) {
+  labels.forEach((label, i) => {
+    if (!labelSurvives(plan, i)) return;
+    const t = svg.append("text").attr("class", "dgmo-tick").attr("fill", textColor).attr("font-size", font).attr("font-family", FONT_FAMILY).text(label);
+    if (plan.rotate) {
+      t.attr(
+        "transform",
+        `translate(${xFor(i)},${baseline + font}) rotate(-${LABEL_ROTATE_DEG})`
+      ).attr("text-anchor", "end");
+    } else {
+      t.attr("x", xFor(i)).attr("y", baseline + font + 6).attr("text-anchor", "middle");
+    }
+  });
+}
 
 // src/charts-d3/bar.ts
 import { scaleBand, scaleLinear } from "d3-scale";
@@ -332,13 +396,18 @@ function renderBar(svg, chart, width, height, colors, palette, isDark, textColor
   const loVal = Math.min(0, minVal);
   const niceMax = hiVal === 0 && loVal === 0 ? 1 : hiVal;
   const leftLabels = horizontal ? data.map((d) => d.label) : [fmtNum(niceMax), fmtNum(niceMax / 2), fmtNum(loVal), fmtNum(loVal / 2)];
+  const mLeft = computeLeftMargin(chart.ylabel, leftLabels);
+  const plotW = width - mLeft - 32;
+  const labelPlan = planCategoryLabels(
+    data.map((d) => d.label),
+    horizontal || data.length === 0 ? Infinity : plotW / data.length
+  );
   const m = {
     top: top + 8,
     right: 32,
-    bottom: 64,
-    left: computeLeftMargin(chart.ylabel, leftLabels)
+    bottom: horizontal ? 64 : Math.max(64, labelPlan.height + (chart.xlabel ? 40 : 18)),
+    left: mLeft
   };
-  const plotW = width - m.left - m.right;
   const plotH = height - m.top - m.bottom;
   const horiz = horizontal;
   const catRange = horiz ? [m.top, m.top + plotH] : [m.left, m.left + plotW];
@@ -356,13 +425,20 @@ function renderBar(svg, chart, width, height, colors, palette, isDark, textColor
       svg.append("text").attr("x", m.left - 10).attr("y", y + 4).attr("text-anchor", "end").attr("fill", textColor).attr("font-size", TICK_FONT).attr("font-family", FONT_FAMILY).text(fmtNum(t));
     }
   }
-  for (const d of data) {
-    const c = (cat(d.label) ?? 0) + cat.bandwidth() / 2;
-    if (horiz) {
+  if (horiz) {
+    for (const d of data) {
+      const c = (cat(d.label) ?? 0) + cat.bandwidth() / 2;
       svg.append("text").attr("x", m.left - 10).attr("y", c + 4).attr("text-anchor", "end").attr("fill", textColor).attr("font-size", TICK_FONT).attr("font-family", FONT_FAMILY).text(d.label);
-    } else {
-      svg.append("text").attr("x", c).attr("y", m.top + plotH + 18).attr("text-anchor", "middle").attr("fill", textColor).attr("font-size", TICK_FONT).attr("font-family", FONT_FAMILY).text(d.label);
     }
+  } else {
+    drawCategoryLabels(
+      svg,
+      data.map((d) => d.label),
+      labelPlan,
+      (i) => (cat(data[i].label) ?? 0) + cat.bandwidth() / 2,
+      m.top + plotH,
+      textColor
+    );
   }
   const zero = val(0);
   const inner = stacked ? null : scaleBand().domain(seriesNames.map((_, i) => i)).range([0, cat.bandwidth()]).padding(0.12);
@@ -554,13 +630,19 @@ function renderLine(svg, chart, width, height, colors, palette, isDark, textColo
   };
   const [loL, hiL] = extentFor("left");
   const [loR, hiR] = dual ? extentFor("right") : [0, 1];
+  const mLeft = computeLeftMargin(chart.ylabel, [fmtNum(hiL), fmtNum(loL)]);
+  const mRight = dual ? computeLeftMargin(chart.yrlabel, [fmtNum(hiR), fmtNum(loR)]) : 32;
+  const plotW = width - mLeft - mRight;
+  const labelPlan = planCategoryLabels(
+    data.map((d) => d.label),
+    data.length > 0 ? plotW / data.length : plotW
+  );
   const m = {
     top: top + 8,
-    right: dual ? computeLeftMargin(chart.yrlabel, [fmtNum(hiR), fmtNum(loR)]) : 32,
-    bottom: 64,
-    left: computeLeftMargin(chart.ylabel, [fmtNum(hiL), fmtNum(loL)])
+    right: mRight,
+    bottom: Math.max(64, labelPlan.height + (chart.xlabel ? 40 : 18)),
+    left: mLeft
   };
-  const plotW = width - m.left - m.right;
   const plotH = height - m.top - m.bottom;
   const x = scalePoint().domain(data.map((d) => d.label)).range([m.left, m.left + plotW]).padding(0.5);
   const yL = scaleLinear2().domain([loL, hiL]).nice().range([m.top + plotH, m.top]);
@@ -588,9 +670,14 @@ function renderLine(svg, chart, width, height, colors, palette, isDark, textColo
       svg.append("text").attr("class", "dgmo-tick").attr("x", m.left + plotW + 10).attr("y", yR(t) + 4).attr("text-anchor", "start").attr("fill", rightTint ?? textColor).attr("font-size", TICK_FONT).attr("font-family", FONT_FAMILY).text(fmtNum(t));
     }
   }
-  for (const d of data) {
-    svg.append("text").attr("class", "dgmo-tick").attr("x", x(d.label) ?? 0).attr("y", m.top + plotH + 18).attr("text-anchor", "middle").attr("fill", textColor).attr("font-size", TICK_FONT).attr("font-family", FONT_FAMILY).text(d.label);
-  }
+  drawCategoryLabels(
+    svg,
+    data.map((d) => d.label),
+    labelPlan,
+    (i) => x(data[i].label) ?? 0,
+    m.top + plotH,
+    textColor
+  );
   svg.append("rect").attr("class", "dgmo-plot-rect").attr("x", m.left).attr("y", m.top).attr("width", plotW).attr("height", plotH).attr("fill", "transparent");
   for (let s = 0; s < seriesCount; s++) {
     const color = seriesColor(s);
@@ -2064,4 +2151,4 @@ export {
   supportsD3DataChart,
   renderDataChartD3
 };
-//# sourceMappingURL=chunk-7LMDJ3U7.js.map
+//# sourceMappingURL=chunk-VE7PPEU3.js.map

package/dist/{chunk-MZBEPHFY.js → chunk-VGLSKDDI.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-NOTA6TEI.js";
 import {
   peelQuotedName
-} from "./chunk-M2QQQWM3.js";
+} from "./chunk-ZJJWON5O.js";
 import {
   makeDgmoError
 } from "./chunk-OLMWTJVU.js";
@@ -787,4 +787,4 @@ export {
   resolveTaskName,
   calculateSchedule
 };
-//# sourceMappingURL=chunk-MZBEPHFY.js.map
+//# sourceMappingURL=chunk-VGLSKDDI.js.map

package/dist/{chunk-WN6V4ILM.js → chunk-VLXYWPPE.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-YRYKTYMQ.js";
 import {
   ScaleContext
-} from "./chunk-YYVTBZZC.js";
+} from "./chunk-24YPR5EH.js";
 import {
   createTooltip,
   hideTooltip,
@@ -13,7 +13,7 @@ import {
 } from "./chunk-SPA7DCB3.js";
 import {
   renderIntegratedLegend
-} from "./chunk-VSZRPDIZ.js";
+} from "./chunk-6S53NO3M.js";
 import {
   FONT_FAMILY
 } from "./chunk-UTCPNJND.js";
@@ -32,11 +32,11 @@ import {
 } from "./chunk-QX53GOI7.js";
 import {
   parseTimelineDate
-} from "./chunk-D62K46CW.js";
+} from "./chunk-NNMNHE3J.js";
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-PBXMUXBW.js";
+} from "./chunk-DPGI742S.js";
 import {
   getSeriesColors,
   mix,
@@ -1672,4 +1672,4 @@ export {
   formatDateLabel,
   renderTimeline
 };
-//# sourceMappingURL=chunk-WN6V4ILM.js.map
+//# sourceMappingURL=chunk-VLXYWPPE.js.map

package/dist/{chunk-5FBSYKPQ.js → chunk-VMXV2CL5.js}

@@ -1,7 +1,7 @@
 import {
   extractDatePrefix,
   parseTimelineDate
-} from "./chunk-D62K46CW.js";
+} from "./chunk-NNMNHE3J.js";
 import {
   makeYearContext,
   parseDateToken,
@@ -16,7 +16,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-PBXMUXBW.js";
+} from "./chunk-DPGI742S.js";
 import {
   EVENT_LINE_REGISTRY,
   extractColor,
@@ -27,7 +27,7 @@ import {
   tryParseSharedOption,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-M2QQQWM3.js";
+} from "./chunk-ZJJWON5O.js";
 import {
   emit,
   formatDgmoError,
@@ -686,4 +686,4 @@ export {
   EVENT_LINE_DIAGNOSTICS,
   parseEventLine
 };
-//# sourceMappingURL=chunk-5FBSYKPQ.js.map
+//# sourceMappingURL=chunk-VMXV2CL5.js.map

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

@@ -22,7 +22,7 @@ import {
 } from "./chunk-A4GOY3PE.js";
 import {
   renderIntegratedLegend
-} from "./chunk-VSZRPDIZ.js";
+} from "./chunk-6S53NO3M.js";
 import {
   getLegendExtent,
   getMaxLegendReservedHeight
@@ -42,12 +42,12 @@ import {
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-PBXMUXBW.js";
+} from "./chunk-DPGI742S.js";
 import {
   fillModeFromOptions,
   legendInlineRequested,
   legendSuppressed
-} from "./chunk-M2QQQWM3.js";
+} from "./chunk-ZJJWON5O.js";
 import {
   contrastText,
   mix,
@@ -317,4 +317,4 @@ export {
   renderFamilyForExport,
   renderFamily
 };
-//# sourceMappingURL=chunk-FFI25S5O.js.map
+//# sourceMappingURL=chunk-W27BULCB.js.map

package/dist/{chunk-NTXNVS47.js → chunk-W7SZKJR6.js}

@@ -15,10 +15,10 @@ import {
 } from "./chunk-MTGGOCND.js";
 import {
   tagAttrKey
-} from "./chunk-PBXMUXBW.js";
+} from "./chunk-DPGI742S.js";
 import {
   legendSuppressed
-} from "./chunk-M2QQQWM3.js";
+} from "./chunk-ZJJWON5O.js";
 
 // src/c4/layout.ts
 import dagre from "@dagrejs/dagre";
@@ -1718,4 +1718,4 @@ export {
   layoutC4Components,
   layoutC4Deployment
 };
-//# sourceMappingURL=chunk-NTXNVS47.js.map
+//# sourceMappingURL=chunk-W7SZKJR6.js.map

package/dist/{chunk-MACY4WJ4.js → chunk-WEC3JPTN.js}

@@ -6,7 +6,7 @@ import {
   formatPct,
   resolveCellColor,
   resolveColorMode
-} from "./chunk-PMDE3I53.js";
+} from "./chunk-3HN32MEK.js";
 import {
   layoutInlineHeader
 } from "./chunk-6CLC26GU.js";
@@ -17,7 +17,7 @@ import {
 } from "./chunk-A4GOY3PE.js";
 import {
   renderIntegratedLegend
-} from "./chunk-VSZRPDIZ.js";
+} from "./chunk-6S53NO3M.js";
 import {
   getLegendExtent,
   getMaxLegendReservedHeight
@@ -33,7 +33,7 @@ import {
 } from "./chunk-MTGGOCND.js";
 import {
   tagAttrKey
-} from "./chunk-PBXMUXBW.js";
+} from "./chunk-DPGI742S.js";
 import {
   contrastText,
   getSeriesColors,
@@ -439,4 +439,4 @@ export {
   renderTreemapForExport,
   renderTreemap
 };
-//# sourceMappingURL=chunk-MACY4WJ4.js.map
+//# sourceMappingURL=chunk-WEC3JPTN.js.map

package/dist/{chunk-LQB3NKEA.js → chunk-WPXHTYET.js}

@@ -1,5 +1,6 @@
 import {
   AUTO_TAG_COLOR_SENTINEL,
+  activeTagNoMatchMessage,
   cascadeTagMetadata,
   finalizeAutoTagColors,
   matchTagBlockHeading,
@@ -7,7 +8,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-PBXMUXBW.js";
+} from "./chunk-DPGI742S.js";
 import {
   TREEMAP_REGISTRY,
   extractColor,
@@ -20,7 +21,7 @@ import {
   stripQuotes,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-M2QQQWM3.js";
+} from "./chunk-ZJJWON5O.js";
 import {
   emit,
   formatDgmoError,
@@ -343,15 +344,19 @@ function resolveDefaultColorMode(result, pushWarning) {
     const heatHit = heatName !== void 0 ? lv === heatName.toLowerCase() : lv === "value" || lv === "heat";
     if (result.hasHeat && heatHit) return "heat";
     if (result.tagGroups.some((g) => g.name.toLowerCase() === lv)) return "tag";
-    const dims = [
-      ...result.tagGroups.map((g) => g.name),
-      ...result.hasHeat ? [heatName ?? "Value"] : []
-    ];
-    const hint = dims.length ? ` Available: ${dims.join(", ")}, none.` : " No tag groups or heat are declared.";
-    pushWarning(
-      result.activeTagLineNumber ?? 0,
-      `active-tag "${at}" does not match a declared tag group or the heat label.${hint}`
+    const warning = activeTagNoMatchMessage(
+      at,
+      result.tagGroups,
+      result.hasHeat ? [heatName ?? "Value"] : [],
+      "the heat label"
     );
+    if (warning) {
+      pushWarning(
+        result.activeTagLineNumber ?? 1,
+        warning,
+        "W_ACTIVE_TAG_NO_MATCH"
+      );
+    }
   }
   if (result.hasHeat) return "heat";
   if (result.tagGroups.length > 0) return "tag";
@@ -440,4 +445,4 @@ export {
   TREEMAP_DIAGNOSTICS,
   parseTreemap
 };
-//# sourceMappingURL=chunk-LQB3NKEA.js.map
+//# sourceMappingURL=chunk-WPXHTYET.js.map

package/dist/{chunk-QQI4JTJB.js → chunk-WRWUZ2C4.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-WGC42WJU.js";
 import {
   ScaleContext
-} from "./chunk-YYVTBZZC.js";
+} from "./chunk-24YPR5EH.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -21,7 +21,7 @@ import {
 } from "./chunk-MTGGOCND.js";
 import {
   fillModeFromOptions
-} from "./chunk-M2QQQWM3.js";
+} from "./chunk-ZJJWON5O.js";
 import {
   contrastText,
   getSeriesColors,
@@ -428,4 +428,4 @@ export {
   renderPyramid,
   renderPyramidForExport
 };
-//# sourceMappingURL=chunk-QQI4JTJB.js.map
+//# sourceMappingURL=chunk-WRWUZ2C4.js.map

package/dist/{chunk-QQFO63AA.js → chunk-XIZCHGP7.js}

@@ -11,7 +11,7 @@ import {
 } from "./chunk-A4GOY3PE.js";
 import {
   renderIntegratedLegend
-} from "./chunk-VSZRPDIZ.js";
+} from "./chunk-6S53NO3M.js";
 import {
   getLegendExtent,
   getMaxLegendReservedHeight
@@ -28,7 +28,7 @@ import {
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-PBXMUXBW.js";
+} from "./chunk-DPGI742S.js";
 import {
   contrastText,
   getSeriesColors,
@@ -1001,4 +1001,4 @@ export {
   renderBracket,
   renderBracketForExport
 };
-//# sourceMappingURL=chunk-QQFO63AA.js.map
+//# sourceMappingURL=chunk-XIZCHGP7.js.map

package/dist/{chunk-PYL2K5CE.js → chunk-YG35ZCNW.js}

@@ -12,12 +12,13 @@ import {
 } from "./chunk-NOTA6TEI.js";
 import {
   AUTO_TAG_COLOR_SENTINEL,
+  activeTagNoMatchMessage,
   finalizeAutoTagColors,
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey,
   validateTagGroupNames
-} from "./chunk-PBXMUXBW.js";
+} from "./chunk-DPGI742S.js";
 import {
   C4_REGISTRY,
   OPTION_NOCOLON_RE,
@@ -28,7 +29,7 @@ import {
   splitNameAndMeta,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-M2QQQWM3.js";
+} from "./chunk-ZJJWON5O.js";
 import {
   formatDgmoError,
   makeDgmoError,
@@ -164,8 +165,8 @@ function parseC4(content, palette) {
     diagnostics: [],
     error: null
   };
-  const pushError = (line, message, severity = "error") => {
-    const diag = makeDgmoError(line, message, severity);
+  const pushError = (line, message, severity = "error", code) => {
+    const diag = makeDgmoError(line, message, severity, code);
     result.diagnostics.push(diag);
     if (!result.error && severity === "error")
       result.error = formatDgmoError(diag);
@@ -176,6 +177,7 @@ function parseC4(content, palette) {
   }
   const lines = content.split("\n");
   let contentStarted = false;
+  let activeTagOptionLine = 0;
   let sawChartType = false;
   let inDeployment = false;
   let currentTagGroup = null;
@@ -265,6 +267,7 @@ function parseC4(content, palette) {
         }
         if (KNOWN_C4_OPTIONS.has(key)) {
           options[key] = optMatch[2].trim();
+          if (key === "active-tag") activeTagOptionLine = lineNumber;
           continue;
         }
       }
@@ -735,6 +738,18 @@ function parseC4(content, palette) {
     (line, msg) => pushError(line, msg, "warning")
   );
   result.direction = options["direction-lr"] ? "LR" : "TB";
+  const activeTagWarning = activeTagNoMatchMessage(
+    options["active-tag"],
+    result.tagGroups
+  );
+  if (activeTagWarning) {
+    pushError(
+      activeTagOptionLine || 1,
+      activeTagWarning,
+      "warning",
+      "W_ACTIVE_TAG_NO_MATCH"
+    );
+  }
   return result;
 }
 function findParentElement(indent, stack) {
@@ -830,4 +845,4 @@ function validateDeploymentRefs(result, knownNames, pushWarning) {
 export {
   parseC4
 };
-//# sourceMappingURL=chunk-PYL2K5CE.js.map
+//# sourceMappingURL=chunk-YG35ZCNW.js.map

package/dist/{chunk-6NEFSIL3.js → chunk-YH5KJIO5.js}

@@ -1,6 +1,6 @@
 import {
   tryCollectNote
-} from "./chunk-HK3JTWG3.js";
+} from "./chunk-MX3BYU7V.js";
 import {
   resolveNotes
 } from "./chunk-7NK42OIB.js";
@@ -19,7 +19,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-PBXMUXBW.js";
+} from "./chunk-DPGI742S.js";
 import {
   ALL_CHART_TYPES,
   FILL_FAMILY_TOKENS,
@@ -32,7 +32,7 @@ import {
   parseMetadataRegion,
   tryParseSharedOption,
   withTagAliases
-} from "./chunk-M2QQQWM3.js";
+} from "./chunk-ZJJWON5O.js";
 import {
   resolveColorWithDiagnostic
 } from "./chunk-EXNKNJ65.js";
@@ -543,4 +543,4 @@ export {
   parseState,
   looksLikeState
 };
-//# sourceMappingURL=chunk-6NEFSIL3.js.map
+//# sourceMappingURL=chunk-YH5KJIO5.js.map

package/dist/{chunk-N5XT3OWL.js → chunk-YTFA4VTW.js}

@@ -5,7 +5,7 @@ import {
   parseFirstLine,
   splitNameAndMeta,
   warnUnknownMetaKeys
-} from "./chunk-M2QQQWM3.js";
+} from "./chunk-ZJJWON5O.js";
 import {
   makeDgmoError,
   makeFail,
@@ -338,4 +338,4 @@ function assignGlobalNumbers(result) {
 export {
   parseTechRadar
 };
-//# sourceMappingURL=chunk-N5XT3OWL.js.map
+//# sourceMappingURL=chunk-YTFA4VTW.js.map