@diagrammo/dgmo 0.51.0 → 0.53.0

package/dist/{chunk-LV4BETUU.js → chunk-YJVA3QUU.js}

@@ -3,13 +3,13 @@ import {
   invalidColorDiagnostic,
   resolveColor,
   resolveColorWithDiagnostic
-} from "./chunk-TLVIHFRO.js";
+} from "./chunk-ZKPPI6BF.js";
 import {
   METADATA_DIAGNOSTIC_CODES,
   emptyMetadataValueMessage,
   makeDgmoError,
   suggest
-} from "./chunk-CXK4DZH3.js";
+} from "./chunk-4W2PE66Q.js";
 
 // src/utils/reserved-key-registry.ts
 function staticRegistry(keys) {
@@ -109,6 +109,7 @@ var BOXES_AND_LINES_REGISTRY = staticRegistry([
   "description",
   "heat"
 ]);
+var STATE_REGISTRY = staticRegistry([]);
 var SKETCH_REGISTRY = staticRegistry([
   "shape",
   "at",
@@ -268,10 +269,38 @@ function extractColor(label, palette, diagnostics, line) {
 }
 var OPTION_NOCOLON_RE = /^([a-z][a-z0-9-]*)\s+(.+)$/i;
 var GLOBAL_BOOLEANS = /* @__PURE__ */ new Set([
-  "solid-fill",
+  "fill-tint",
+  "fill-solid",
+  "fill-outline",
   "no-title",
-  "no-notes"
+  "no-notes",
+  "no-legend"
 ]);
+function legendSuppressed(options) {
+  return options["no-legend"] === "on";
+}
+var FILL_FAMILY_TOKENS = /* @__PURE__ */ new Set([
+  "fill-tint",
+  "fill-solid",
+  "fill-outline"
+]);
+function fillModeFromToken(token) {
+  switch (token.trim().toLowerCase()) {
+    case "fill-solid":
+      return "solid";
+    case "fill-outline":
+      return "outline";
+    case "fill-tint":
+      return "tint";
+    default:
+      return null;
+  }
+}
+function fillModeFromOptions(options) {
+  if (options["fill-solid"] === "on") return "solid";
+  if (options["fill-outline"] === "on") return "outline";
+  return void 0;
+}
 function recognizeGlobalBoolean(token) {
   const t = token.trim().toLowerCase();
   return GLOBAL_BOOLEANS.has(t) ? t : null;
@@ -279,6 +308,9 @@ function recognizeGlobalBoolean(token) {
 function tryParseSharedOption(line, options) {
   const key = recognizeGlobalBoolean(line);
   if (key) {
+    if (FILL_FAMILY_TOKENS.has(key)) {
+      for (const t of FILL_FAMILY_TOKENS) delete options[t];
+    }
     options[key] = "on";
     return true;
   }
@@ -460,6 +492,17 @@ function peelTrailingColorName(label) {
     colorName: trailing
   };
 }
+function peelTrailingCollapsedFlag(text) {
+  const t = text.trimEnd();
+  if (t === "collapsed") return { rest: "", collapsed: true };
+  if (/[ \t]collapsed$/.test(t)) {
+    return {
+      rest: t.slice(0, t.length - "collapsed".length).trimEnd().replace(/,\s*$/, ""),
+      collapsed: true
+    };
+  }
+  return { rest: text, collapsed: false };
+}
 function peelRampColors(label) {
   const peelOne = (s) => {
     const idx = Math.max(s.lastIndexOf(" "), s.lastIndexOf("	"));
@@ -652,6 +695,7 @@ export {
   GANTT_REGISTRY,
   PERT_REGISTRY,
   BOXES_AND_LINES_REGISTRY,
+  STATE_REGISTRY,
   SKETCH_REGISTRY,
   TIMELINE_REGISTRY,
   MINDMAP_REGISTRY,
@@ -668,6 +712,10 @@ export {
   measureIndent,
   extractColor,
   OPTION_NOCOLON_RE,
+  legendSuppressed,
+  FILL_FAMILY_TOKENS,
+  fillModeFromToken,
+  fillModeFromOptions,
   tryParseSharedOption,
   parseFirstLine,
   normalizeNumericToken,
@@ -676,9 +724,11 @@ export {
   collectIndentedValues,
   parseSeriesNames,
   peelTrailingColorName,
+  peelTrailingCollapsedFlag,
   peelRampColors,
+  parseMetadataRegion,
   cutUnionMetadata,
   splitNameAndMeta,
   warnUnknownMetaKeys
 };
-//# sourceMappingURL=chunk-LV4BETUU.js.map
+//# sourceMappingURL=chunk-YJVA3QUU.js.map

package/dist/{chunk-5SVOCD5W.js → chunk-YR43LJT5.js}

@@ -14,10 +14,10 @@ import {
 } from "./chunk-3CIOJ5YJ.js";
 import {
   renderIntegratedLegend
-} from "./chunk-OU7HLO7I.js";
+} from "./chunk-W5KMNC5U.js";
 import {
   getMaxLegendReservedHeight
-} from "./chunk-YAA6IID3.js";
+} from "./chunk-774C2FF3.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -26,25 +26,29 @@ import {
 import {
   FONT_FAMILY
 } from "./chunk-6KFWC4CO.js";
-import {
-  LEGEND_GROUP_GAP
-} from "./chunk-QOOUC2J5.js";
-import {
-  measureText
-} from "./chunk-WCT3NYCV.js";
 import {
   contrastText,
   mix,
   shapeFill,
   themeBaseBg
-} from "./chunk-P6T66CCZ.js";
+} from "./chunk-JYDMBWRP.js";
+import {
+  LEGEND_GROUP_GAP
+} from "./chunk-4RGZFA7H.js";
+import {
+  measureText
+} from "./chunk-4ASYQ347.js";
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-467TVMQL.js";
+} from "./chunk-CMVZWP32.js";
+import {
+  fillModeFromOptions,
+  legendSuppressed
+} from "./chunk-YJVA3QUU.js";
 import {
   resolveColor
-} from "./chunk-TLVIHFRO.js";
+} from "./chunk-ZKPPI6BF.js";
 
 // src/family/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -88,7 +92,7 @@ function baseColor(node, parsed, palette, activeTagGroup) {
 function renderFamilyForExport(container, parsed, layout, palette, isDark, opts = {}) {
   d3Selection.select(container).selectAll(":not([data-d3-tooltip])").remove();
   const activeTagGroup = opts.activeTagGroup ?? null;
-  const solid = parsed.options["solid-fill"] === "on";
+  const fillMode = fillModeFromOptions(parsed.options);
   const noDaggers = parsed.options["no-daggers"] === "true";
   const baseBg = themeBaseBg(palette, isDark);
   const PAD = 20;
@@ -98,7 +102,7 @@ function renderFamilyForExport(container, parsed, layout, palette, isDark, opts
     name: g.name,
     entries: g.entries.map((e) => ({ value: e.value, color: e.color }))
   }));
-  const hasLegend = legendGroups.length > 0;
+  const hasLegend = legendGroups.length > 0 && !legendSuppressed(parsed.options);
   const legendConfig = {
     groups: legendGroups,
     position: { placement: "top-center", titleRelation: "below-title" },
@@ -202,7 +206,7 @@ function renderFamilyForExport(container, parsed, layout, palette, isDark, opts
   for (const node of layout.nodes) {
     const isPh = !!node.placeholder;
     const base = baseColor(node, parsed, palette, activeTagGroup);
-    const fill = isPh ? mix(palette.textMuted, baseBg, 6) : shapeFill(palette, base, isDark, { solid });
+    const fill = isPh ? mix(palette.textMuted, baseBg, 6) : shapeFill(palette, base, isDark, { mode: fillMode });
     const stroke = isPh ? palette.textMuted : base;
     const labelColor = isPh ? palette.textMuted : contrastText(fill, palette.textOnFillLight, palette.textOnFillDark);
     const g = cardsG.append("g").attr("class", "family-card").attr("transform", `translate(${node.x}, ${node.y})`).attr("data-line-number", String(node.lineNumber)).attr("data-person-id", node.id);
@@ -223,7 +227,7 @@ function renderFamilyForExport(container, parsed, layout, palette, isDark, opts
     focusG.append("circle").attr("cx", fx).attr("cy", fy).attr("r", 1.6).attr("fill", labelColor);
     const rows = familyCardRows(node);
     if (rows.length === 0) continue;
-    g.append("line").attr("x1", 0).attr("y1", HEADER_HEIGHT).attr("x2", node.width).attr("y2", HEADER_HEIGHT).attr("stroke", solid ? labelColor : stroke).attr("stroke-opacity", 0.3).attr("stroke-width", 1);
+    g.append("line").attr("x1", 0).attr("y1", HEADER_HEIGHT).attr("x2", node.width).attr("y2", HEADER_HEIGHT).attr("stroke", fillMode === "solid" ? labelColor : stroke).attr("stroke-opacity", 0.3).attr("stroke-width", 1);
     const maxKeyWidth = Math.max(
       0,
       ...rows.filter((r) => !r.year).map((r) => measureText(`${r.key}: `, META_FONT_SIZE))
@@ -270,4 +274,4 @@ export {
   renderFamilyForExport,
   renderFamily
 };
-//# sourceMappingURL=chunk-5SVOCD5W.js.map
+//# sourceMappingURL=chunk-YR43LJT5.js.map

package/dist/{chunk-TLVIHFRO.js → chunk-ZKPPI6BF.js}

@@ -1,7 +1,7 @@
 import {
   makeDgmoError,
   suggest
-} from "./chunk-CXK4DZH3.js";
+} from "./chunk-4W2PE66Q.js";
 
 // src/colors.ts
 var nord = {
@@ -293,4 +293,4 @@ export {
   resolveColorWithDiagnostic,
   seriesColors
 };
-//# sourceMappingURL=chunk-TLVIHFRO.js.map
+//# sourceMappingURL=chunk-ZKPPI6BF.js.map

package/dist/{chunk-WQLMU7VG.js → chunk-ZXUAPTCK.js}

@@ -1,10 +1,10 @@
 import {
   extractColor,
   measureIndent
-} from "./chunk-LV4BETUU.js";
+} from "./chunk-YJVA3QUU.js";
 import {
   makeDgmoError
-} from "./chunk-CXK4DZH3.js";
+} from "./chunk-4W2PE66Q.js";
 
 // src/utils/notes/parse.ts
 function parseNoteHeader(rest) {
@@ -73,4 +73,4 @@ function tryCollectNote(lines, index, indent, palette, diagnostics) {
 export {
   tryCollectNote
 };
-//# sourceMappingURL=chunk-WQLMU7VG.js.map
+//# sourceMappingURL=chunk-ZXUAPTCK.js.map