@diagrammo/dgmo 0.48.2 → 0.50.0

package/dist/{chunk-Y3J7VR52.js → chunk-OTAL43EH.js}

@@ -103,6 +103,11 @@ var BOXES_AND_LINES_REGISTRY = staticRegistry([
   "description",
   "heat"
 ]);
+var SKETCH_REGISTRY = staticRegistry([
+  "shape",
+  "at",
+  "collapsed"
+]);
 var TIMELINE_REGISTRY = staticRegistry([
   "color",
   "description",
@@ -148,6 +153,19 @@ var RACI_REGISTRY = staticRegistry([
   "color",
   "description"
 ]);
+var FAMILY_PERSON_REGISTRY = staticRegistry([
+  "sex",
+  "b",
+  "d",
+  "bp",
+  "dp",
+  "occupation",
+  "military",
+  "education",
+  "religion",
+  "burial"
+]);
+var FAMILY_UNION_REGISTRY = staticRegistry(["m"]);
 
 // src/utils/parsing.ts
 var RECOGNIZED_COLOR_SET = new Set(
@@ -174,6 +192,7 @@ var ALL_CHART_TYPES = /* @__PURE__ */ new Set([
   "venn",
   "quadrant",
   // diagrams
+  "body",
   "sequence",
   "flowchart",
   "class",
@@ -198,8 +217,14 @@ var ALL_CHART_TYPES = /* @__PURE__ */ new Set([
   "ring",
   "treemap",
   "block",
+  "goal",
+  "countdown",
+  "clock",
+  "sketch",
   "raci",
-  "map"
+  "map",
+  "family",
+  "bracket"
 ]);
 function measureIndent(line) {
   let indent = 0;
@@ -548,6 +573,9 @@ function parseMetadataRegion(region, aliasMap, diagnostics, line) {
   }
   return meta;
 }
+function cutUnionMetadata(line, registry) {
+  return findMetadataCutOffset(line, scanTokens(line), registry);
+}
 function splitNameAndMeta(line, registry, aliasMap = /* @__PURE__ */ new Map(), palette, diagnostics, lineNumber, options = {}) {
   const tokens = scanTokens(line);
   const cutOffset = findMetadataCutOffset(line, tokens, registry);
@@ -618,6 +646,7 @@ export {
   GANTT_REGISTRY,
   PERT_REGISTRY,
   BOXES_AND_LINES_REGISTRY,
+  SKETCH_REGISTRY,
   TIMELINE_REGISTRY,
   MINDMAP_REGISTRY,
   TECH_RADAR_REGISTRY,
@@ -627,6 +656,8 @@ export {
   RING_REGISTRY,
   TREEMAP_REGISTRY,
   RACI_REGISTRY,
+  FAMILY_PERSON_REGISTRY,
+  FAMILY_UNION_REGISTRY,
   ALL_CHART_TYPES,
   measureIndent,
   extractColor,
@@ -640,7 +671,8 @@ export {
   parseSeriesNames,
   peelTrailingColorName,
   peelRampColors,
+  cutUnionMetadata,
   splitNameAndMeta,
   warnUnknownMetaKeys
 };
-//# sourceMappingURL=chunk-Y3J7VR52.js.map
+//# sourceMappingURL=chunk-OTAL43EH.js.map

package/dist/{chunk-WCSOJFU3.js → chunk-OTP5KVLO.js}

@@ -7,7 +7,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-QLCCJEJI.js";
+} from "./chunk-WCUHAQKB.js";
 import {
   TREEMAP_REGISTRY,
   extractColor,
@@ -18,7 +18,7 @@ import {
   stripQuotes,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-Y3J7VR52.js";
+} from "./chunk-OTAL43EH.js";
 import {
   emit,
   formatDgmoError,
@@ -377,4 +377,4 @@ export {
   TREEMAP_DIAGNOSTICS,
   parseTreemap
 };
-//# sourceMappingURL=chunk-WCSOJFU3.js.map
+//# sourceMappingURL=chunk-OTP5KVLO.js.map

package/dist/{chunk-RYEGFMUO.js → chunk-PGEGPSCZ.js}

@@ -10,7 +10,7 @@ import {
   splitNameAndMeta,
   tryParseSharedOption,
   warnUnknownMetaKeys
-} from "./chunk-Y3J7VR52.js";
+} from "./chunk-OTAL43EH.js";
 import {
   resolveColorWithDiagnostic
 } from "./chunk-TLVIHFRO.js";
@@ -952,4 +952,4 @@ export {
   parseRaci,
   allTasks
 };
-//# sourceMappingURL=chunk-RYEGFMUO.js.map
+//# sourceMappingURL=chunk-PGEGPSCZ.js.map

package/dist/{chunk-ZO27FGJS.js → chunk-PH5X4GIP.js}

@@ -10,7 +10,7 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   measureText
-} from "./chunk-WCT3NYCV.js";
+} from "./chunk-5LWQH6QV.js";
 import {
   contrastText,
   mix,
@@ -551,4 +551,4 @@ function renderModal(parent, node, ctx) {
 export {
   renderWireframe
 };
-//# sourceMappingURL=chunk-ZO27FGJS.js.map
+//# sourceMappingURL=chunk-PH5X4GIP.js.map

package/dist/{chunk-ZJEL4H2R.js → chunk-PJUGRJHJ.js}

@@ -3,10 +3,10 @@ import {
   layoutJourneyMap,
   scoreToColor,
   scoreToCurveY
-} from "./chunk-3JLKYGBQ.js";
+} from "./chunk-F7BFXWNQ.js";
 import {
   wrapNoteBody
-} from "./chunk-TYS6CSS5.js";
+} from "./chunk-BCYVE3N5.js";
 import {
   NOTE_BULLET_INDENT
 } from "./chunk-5DH3KYFH.js";
@@ -16,12 +16,12 @@ import {
 import {
   CARD_RADIUS
 } from "./chunk-3CIOJ5YJ.js";
-import {
-  renderIntegratedLegend
-} from "./chunk-PWIHZ6NJ.js";
 import {
   ScaleContext
 } from "./chunk-YYVTBZZC.js";
+import {
+  renderIntegratedLegend
+} from "./chunk-QUJGFNFN.js";
 import {
   FONT_FAMILY
 } from "./chunk-6KFWC4CO.js";
@@ -29,10 +29,10 @@ import {
   measureText,
   truncateText,
   wrapTextToWidth
-} from "./chunk-WCT3NYCV.js";
+} from "./chunk-5LWQH6QV.js";
 import {
   parseJourneyMap
-} from "./chunk-44CM72SQ.js";
+} from "./chunk-YZLMKW4T.js";
 import {
   contrastText,
   mix,
@@ -41,7 +41,7 @@ import {
 import {
   resolveActiveTagGroup,
   tagAttrKey
-} from "./chunk-QLCCJEJI.js";
+} from "./chunk-WCUHAQKB.js";
 
 // src/journey-map/renderer.ts
 import * as d3 from "d3-selection";
@@ -848,4 +848,4 @@ export {
   renderJourneyMap,
   renderJourneyMapForExport
 };
-//# sourceMappingURL=chunk-ZJEL4H2R.js.map
+//# sourceMappingURL=chunk-PJUGRJHJ.js.map

package/dist/{chunk-ZGR7ULFJ.js → chunk-PLZI6KPM.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-BMR4CIEO.js";
 import {
   renderNodeCard
-} from "./chunk-VOKGH627.js";
+} from "./chunk-AHGF2YYA.js";
 import {
   CARD_RADIUS,
   HEADER_HEIGHT,
@@ -16,10 +16,10 @@ import {
 } from "./chunk-3CIOJ5YJ.js";
 import {
   formatDateLabel
-} from "./chunk-UWN33VNX.js";
+} from "./chunk-XCLHOZAM.js";
 import {
   renderIntegratedLegend
-} from "./chunk-PWIHZ6NJ.js";
+} from "./chunk-QUJGFNFN.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -30,7 +30,7 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   CHAR_WIDTH_RATIO
-} from "./chunk-WCT3NYCV.js";
+} from "./chunk-5LWQH6QV.js";
 import {
   contrastText,
   getSeriesColors,
@@ -41,7 +41,7 @@ import {
 import {
   resolveActiveTagGroup,
   resolveTagColor
-} from "./chunk-QLCCJEJI.js";
+} from "./chunk-WCUHAQKB.js";
 import {
   resolveColor
 } from "./chunk-TLVIHFRO.js";
@@ -152,7 +152,9 @@ function renderEventLine(container, parsed, palette, isDark, onClickItem, export
     if (slot.kind === "event") {
       const event = slot.event;
       const solid2 = eventColor(event);
-      const cardFill2 = shapeFill(palette, solid2, isDark, { solid: false });
+      const cardFill2 = shapeFill(palette, solid2, isDark, {
+        solid: parsed.options.solidFill
+      });
       const titleColor2 = contrastText(
         cardFill2,
         palette.textOnFillLight,
@@ -415,9 +417,9 @@ function renderEventLine(container, parsed, palette, isDark, onClickItem, export
     const BOT_PAD = 14;
     const spineY2 = topUsed + TOP_PAD + aboveExt;
     const eraBaseY2 = eraSide === "above" ? spineY2 - (contentAbove + 14) : spineY2 + (contentBelow + 14);
-    const contentH = spineY2 + belowExt + BOT_PAD;
-    const totalH2 = exportMode ? contentH : Math.max(heightHint, contentH);
-    return { contentW: contentW2, contentH, totalH: totalH2, spineY: spineY2, eraBaseY: eraBaseY2, laneNear: laneNear2 };
+    const contentH2 = spineY2 + belowExt + BOT_PAD;
+    const totalH2 = exportMode ? contentH2 : Math.max(heightHint, contentH2);
+    return { contentW: contentW2, contentH: contentH2, totalH: totalH2, spineY: spineY2, eraBaseY: eraBaseY2, laneNear: laneNear2 };
   };
   const envStretch = Number(
     globalThis.process?.env?.["DGMO_EVT_STRETCH"]
@@ -450,8 +452,11 @@ function renderEventLine(container, parsed, palette, isDark, onClickItem, export
       }
     }
   }
-  const { contentW, totalH, spineY, eraBaseY, laneNear } = layout;
+  const { contentW, contentH, totalH, spineY, eraBaseY, laneNear } = layout;
   const svg = d3Selection.select(container).append("svg").attr("width", contentW).attr("height", totalH).attr("viewBox", `0 0 ${contentW} ${totalH}`).attr("preserveAspectRatio", "xMidYMin meet").attr("xmlns", "http://www.w3.org/2000/svg").style("font-family", FONT_FAMILY);
+  if (!exportMode && totalH > contentH) {
+    svg.attr("data-content-height", Math.ceil(contentH));
+  }
   if (!exportMode) svg.append("style").text(HOVER_CSS);
   if (showTitle) {
     const t = svg.append("text").attr("class", "chart-title").attr("x", contentW / 2).attr("y", TITLE_Y).attr("text-anchor", "middle").attr("fill", palette.text).attr("font-family", FONT_FAMILY).attr("font-size", TITLE_FONT_SIZE).attr("font-weight", TITLE_FONT_WEIGHT).attr("data-line-number", parsed.titleLineNumber ?? 1).text(parsed.title);
@@ -536,15 +541,22 @@ function renderEventLine(container, parsed, palette, isDark, onClickItem, export
       const shelfH = HEADER_HEIGHT + dateH;
       const clipId = `dgmo-evt-shelf-${shelfClipSeq++}`;
       cardG.append("clipPath").attr("id", clipId).append("rect").attr("x", 0).attr("y", shelfTop).attr("width", CARD_W).attr("height", shelfH).attr("rx", SHELF_EDGE);
-      cardG.append("rect").attr("x", 0).attr("y", shelfTop).attr("width", CARD_W).attr("height", shelfH).attr("clip-path", `url(#${clipId})`).attr("fill", mix(p.color, themeBaseBg(palette, isDark), SHELF_TINT));
+      cardG.append("rect").attr("x", 0).attr("y", shelfTop).attr("width", CARD_W).attr("height", shelfH).attr("clip-path", `url(#${clipId})`).attr(
+        "fill",
+        parsed.options.solidFill ? p.color : mix(p.color, themeBaseBg(palette, isDark), SHELF_TINT)
+      );
       const edgeY = titleNearTop ? shelfTop : shelfTop + shelfH - SHELF_EDGE;
       cardG.append("rect").attr("x", 0).attr("y", edgeY).attr("width", CARD_W).attr("height", SHELF_EDGE).attr("clip-path", `url(#${clipId})`).attr("fill", p.color).attr("fill-opacity", p.future ? 0.4 : 1);
-      cardG.append("text").attr("x", CARD_PAD).attr("y", headBandTop + HEADER_HEIGHT / 2 + LABEL_FONT_SIZE / 2 - 2).attr("fill", p.color).attr("font-family", FONT_FAMILY).attr("font-size", LABEL_FONT_SIZE).attr("font-weight", 700).text(p.label);
+      const shelfText = parsed.options.solidFill ? contrastText(p.color, palette.textOnFillLight, palette.textOnFillDark) : p.color;
+      cardG.append("text").attr("x", CARD_PAD).attr("y", headBandTop + HEADER_HEIGHT / 2 + LABEL_FONT_SIZE / 2 - 2).attr("fill", shelfText).attr("font-family", FONT_FAMILY).attr("font-size", LABEL_FONT_SIZE).attr("font-weight", 700).text(p.label);
       if (dateStr) {
         cardG.append("text").attr("x", CARD_PAD).attr(
           "y",
           (titleNearTop ? HEADER_HEIGHT : headBandTop - dateH) + DATE_SUBTITLE_FONT + 2
-        ).attr("fill", mix(palette.text, palette.bg, 55)).attr("font-family", FONT_FAMILY).attr("font-size", DATE_SUBTITLE_FONT).attr("font-weight", 600).text(dateStr);
+        ).attr(
+          "fill",
+          parsed.options.solidFill ? mix(shelfText, p.color, 25) : mix(palette.text, palette.bg, 55)
+        ).attr("font-family", FONT_FAMILY).attr("font-size", DATE_SUBTITLE_FONT).attr("font-weight", 600).text(dateStr);
       }
       if (p.lines.length > 0) {
         const startBaseline = titleNearTop ? CARD_BODY_TOP + dateH + DESC_FONT : CARD_PAD + DESC_FONT;
@@ -975,4 +987,4 @@ export {
   focusEventLine,
   renderEventLineForExport
 };
-//# sourceMappingURL=chunk-ZGR7ULFJ.js.map
+//# sourceMappingURL=chunk-PLZI6KPM.js.map

package/dist/{chunk-3R5POCTZ.js → chunk-PMN3Q7RJ.js}

@@ -4,12 +4,12 @@ import {
 import {
   wrapDescriptionLines
 } from "./chunk-BMR4CIEO.js";
-import {
-  renderIntegratedLegend
-} from "./chunk-PWIHZ6NJ.js";
 import {
   ScaleContext
 } from "./chunk-YYVTBZZC.js";
+import {
+  renderIntegratedLegend
+} from "./chunk-QUJGFNFN.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -20,11 +20,11 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   LEGEND_HEIGHT
-} from "./chunk-QOOUC2J5.js";
+} from "./chunk-HQCHYB5F.js";
 import {
   measureText,
   wrapTextToWidth
-} from "./chunk-WCT3NYCV.js";
+} from "./chunk-5LWQH6QV.js";
 import {
   contrastText,
   shapeFill
@@ -964,4 +964,4 @@ export {
   renderCycle,
   renderCycleForExport
 };
-//# sourceMappingURL=chunk-3R5POCTZ.js.map
+//# sourceMappingURL=chunk-PMN3Q7RJ.js.map

package/dist/{chunk-YGJZWZTY.js → chunk-PZFVK3IH.js}

@@ -18,7 +18,7 @@ import {
 import {
   CHAR_WIDTH_RATIO,
   measureText
-} from "./chunk-WCT3NYCV.js";
+} from "./chunk-5LWQH6QV.js";
 import {
   contrastText,
   getSeriesColors,
@@ -293,4 +293,4 @@ export {
   renderRing,
   renderRingForExport
 };
-//# sourceMappingURL=chunk-YGJZWZTY.js.map
+//# sourceMappingURL=chunk-PZFVK3IH.js.map

package/dist/chunk-Q4V4XQWV.js

@@ -0,0 +1,158 @@
+import {
+  extractColor,
+  measureIndent,
+  parseFirstLine,
+  tryParseSharedOption
+} from "./chunk-OTAL43EH.js";
+import {
+  makeDgmoError,
+  makeFail
+} from "./chunk-CXK4DZH3.js";
+
+// src/goal/parser.ts
+function parseGoalNumber(token) {
+  if (token.includes(",")) return null;
+  const n = parseFloat(token.replace(/_/g, ""));
+  return Number.isFinite(n) ? n : null;
+}
+function parseGoal(content, palette) {
+  const options = {
+    noPercent: false,
+    noValue: false,
+    solidFill: false,
+    noTitle: false,
+    noAutoColor: false,
+    noNote: false
+  };
+  const result = {
+    type: "goal",
+    title: null,
+    titleLineNumber: null,
+    description: null,
+    mode: "bar",
+    now: 0,
+    target: 0,
+    hasTarget: false,
+    options,
+    diagnostics: [],
+    error: null
+  };
+  const fail = makeFail(result);
+  const warn = (line, message) => {
+    result.diagnostics.push(makeDgmoError(line, message, "warning"));
+  };
+  const softError = (line, message) => {
+    result.diagnostics.push(makeDgmoError(line, message, "error"));
+  };
+  if (!content?.trim()) return fail(0, "No content provided");
+  const lines = content.split("\n");
+  let headerParsed = false;
+  let sawNow = false;
+  const sharedOpts = {};
+  for (let i = 0; i < lines.length; i++) {
+    const lineNum = i + 1;
+    const raw = lines[i];
+    const trimmed = raw.trim();
+    if (!trimmed || trimmed.startsWith("//")) continue;
+    if (!headerParsed) {
+      const first = parseFirstLine(trimmed);
+      if (first?.chartType !== "goal") {
+        return fail(lineNum, 'Expected "goal [Title]" as the first line.');
+      }
+      if (first.title) {
+        const { label, color } = extractColor(
+          first.title,
+          palette,
+          result.diagnostics,
+          lineNum
+        );
+        result.title = label || null;
+        if (color !== void 0) result.color = color;
+      }
+      result.titleLineNumber = lineNum;
+      headerParsed = true;
+      continue;
+    }
+    const noteHeader = trimmed.match(/^note(?:\s+(.+))?$/i);
+    if (noteHeader && measureIndent(raw) === 0) {
+      const body = [];
+      if (noteHeader[1]) body.push(noteHeader[1].trim());
+      while (i + 1 < lines.length && measureIndent(lines[i + 1]) > 0) {
+        body.push(lines[i + 1].trim());
+        i++;
+      }
+      result.description = body.length ? body.join("\n") : null;
+      continue;
+    }
+    if (measureIndent(raw) > 0) {
+      warn(
+        lineNum,
+        `Indented content "${trimmed}" ignored \u2014 goal is a single value.`
+      );
+      continue;
+    }
+    const lower = trimmed.toLowerCase();
+    if (lower === "thermometer" || lower === "gauge") {
+      result.mode = lower;
+      continue;
+    }
+    if (lower === "no-percent") {
+      options.noPercent = true;
+      continue;
+    }
+    if (lower === "no-value") {
+      options.noValue = true;
+      continue;
+    }
+    if (lower === "no-auto-color") {
+      options.noAutoColor = true;
+      continue;
+    }
+    if (lower === "no-note") {
+      options.noNote = true;
+      continue;
+    }
+    if (tryParseSharedOption(trimmed, sharedOpts)) {
+      if (sharedOpts["solid-fill"] === "on") options.solidFill = true;
+      if (sharedOpts["no-title"] === "on") options.noTitle = true;
+      continue;
+    }
+    const kv = trimmed.match(/^(now|target)\s+(.+)$/i);
+    if (kv) {
+      const key = kv[1].toLowerCase();
+      const value = parseGoalNumber(kv[2].trim());
+      if (value === null) {
+        softError(lineNum, `"${key}" needs a number (got "${kv[2].trim()}").`);
+        continue;
+      }
+      if (key === "now") {
+        result.now = value;
+        sawNow = true;
+      } else {
+        if (value <= 0) {
+          softError(lineNum, '"target" must be greater than 0.');
+        } else {
+          result.target = value;
+          result.hasTarget = true;
+        }
+      }
+      continue;
+    }
+    warn(lineNum, `Unrecognized line "${trimmed}".`);
+  }
+  if (!sawNow) {
+    warn(result.titleLineNumber ?? 1, 'Missing "now" value \u2014 treating as 0.');
+  }
+  if (!result.hasTarget) {
+    softError(
+      result.titleLineNumber ?? 1,
+      'Missing or invalid "target" \u2014 a goal needs a target > 0.'
+    );
+  }
+  return result;
+}
+
+export {
+  parseGoal
+};
+//# sourceMappingURL=chunk-Q4V4XQWV.js.map