schematex 0.5.2 → 0.6.0

package/dist/{chunk-VJGMEGMR.js → chunk-DOK7LKLO.js}

@@ -1,6 +1,6 @@
 import { firstContentLine } from './chunk-2KTQ75LN.js';
 import { parseLegendDirective, applyLegendOverrides, renderLegend } from './chunk-FO7BLCEW.js';
-import { resolveGenogramTheme, STROKE_WIDTH, cssCustomProperties } from './chunk-2VNMKOUO.js';
+import { resolveGenogramTheme, STROKE_WIDTH, cssCustomProperties } from './chunk-LRI4RH2N.js';
 import { title, text, group, pattern, path, circle, el, defs, polygon, rect, line, desc, svgRoot } from './chunk-SYYBKDL7.js';
 
 // src/diagrams/genogram/parser.ts
@@ -416,6 +416,13 @@ function splitIdAndProps(trimmed) {
 function propsTokens(propsStr) {
   return splitProps(propsStr).map((t) => t.trim().toLowerCase());
 }
+function unquote(value) {
+  return value.replace(/^["'“「『]|["'”」』]$/g, "").trim();
+}
+function yearOf(value) {
+  const m = value.match(/(\d{4})/);
+  return m ? parseInt(m[1], 10) : void 0;
+}
 function splitProps(propsStr) {
   const result = [];
   let current = "";
@@ -480,6 +487,35 @@ function buildIndividual(id, propsStr, lineNum, lineText) {
       } else if (key === "death") {
         const deathNum = parseInt(value, 10);
         if (!isNaN(deathNum)) individual.deathYear = deathNum;
+      } else if (key === "dob") {
+        const v = unquote(value);
+        individual.dob = v;
+        const yr = yearOf(v);
+        if (yr !== void 0 && individual.birthYear === void 0) {
+          individual.birthYear = yr;
+        }
+      } else if (key === "dod") {
+        const v = unquote(value);
+        individual.dod = v;
+        const yr = yearOf(v);
+        if (yr !== void 0 && individual.deathYear === void 0) {
+          individual.deathYear = yr;
+        }
+        if (individual.status === "alive") individual.status = "deceased";
+      } else if (key === "note") {
+        individual.note = unquote(value);
+      } else if (key === "birth") {
+        const v = value.trim().toLowerCase();
+        if (v === "out-of-wedlock" || v === "adopted" || v === "legitimate") {
+          individual.birthStatus = v;
+        } else {
+          throw new ParseError(
+            `Invalid birth status '${value}'. Valid: legitimate, out-of-wedlock, adopted`,
+            lineNum,
+            1,
+            lineText
+          );
+        }
       } else if (key === "label") {
         individual.label = value.replace(/^"|"$/g, "");
       } else if (key === "sibling-of") {
@@ -502,7 +538,7 @@ function buildIndividual(id, propsStr, lineNum, lineText) {
       }
     } else {
       throw new ParseError(
-        `Unknown property '${token}'. Valid: male, female, unknown, deceased, stillborn, miscarriage, abortion, adopted, foster, guardian, twin-identical, twin-fraternal, index, unknown-siblings, a 4-digit year, conditions:..., age:N, death:YYYY, label:"...", sibling-of:ID, or key:value`,
+        `Unknown property '${token}'. Valid: male, female, unknown, deceased, stillborn, miscarriage, abortion, adopted, foster, guardian, twin-identical, twin-fraternal, index, unknown-siblings, a 4-digit year, conditions:..., age:N, death:YYYY, dob:"YYYY-MM-DD", dod:"YYYY-MM-DD", note:"...", birth:out-of-wedlock|adopted, label:"...", sibling-of:ID, or key:value`,
         lineNum,
         1,
         lineText
@@ -594,6 +630,10 @@ function mergeIndividual(existing, incoming, lineNum, lineText) {
     label: mergedLabel,
     birthYear: incoming.birthYear ?? existing.birthYear,
     deathYear: incoming.deathYear ?? existing.deathYear,
+    dob: incoming.dob ?? existing.dob,
+    dod: incoming.dod ?? existing.dod,
+    note: incoming.note ?? existing.note,
+    birthStatus: incoming.birthStatus ?? existing.birthStatus,
     age: incoming.age ?? existing.age,
     conditions: incoming.conditions ?? existing.conditions,
     heritage: incoming.heritage ?? existing.heritage,
@@ -866,13 +906,24 @@ function orderGeneration(nodeIds, _genIdx, graph, familyUnits) {
 }
 var LABEL_HEIGHT = 20;
 var LABEL_GAP = 6;
+var CAPTION_LINE = 13;
+function captionExtra(graph) {
+  let maxLines = 0;
+  for (const ind of graph.individuals.values()) {
+    let lines = 0;
+    if (ind.dob || ind.dod || ind.birthStatus) lines++;
+    if (ind.note) lines++;
+    if (lines > maxLines) maxLines = lines;
+  }
+  return maxLines * CAPTION_LINE;
+}
 function assignPositions(orderedGens, graph, config) {
   const positions = /* @__PURE__ */ new Map();
   const { nodeWidth, nodeSpacingX } = config;
   const half = nodeWidth / 2;
   const coupleGap = nodeWidth + nodeSpacingX * 0.6;
   const familyGap = nodeWidth + nodeSpacingX * 1.5;
-  const genStepY = config.nodeHeight + LABEL_HEIGHT + LABEL_GAP + config.nodeSpacingY;
+  const genStepY = config.nodeHeight + LABEL_HEIGHT + LABEL_GAP + config.nodeSpacingY + captionExtra(graph);
   for (const gen of orderedGens) {
     const y = gen.index * genStepY + half;
     const segments = buildSegments(gen.nodeIds, gen.index, graph);
@@ -1135,7 +1186,7 @@ function resolveOverlaps(positions, orderedGens, config, graph) {
 function computeEdges(graph, positions, config) {
   const edges = [];
   const half = config.nodeWidth / 2;
-  const dropY_offset = config.nodeHeight / 2 + LABEL_HEIGHT + LABEL_GAP + config.nodeSpacingY * 0.35;
+  const dropY_offset = config.nodeHeight / 2 + LABEL_HEIGHT + LABEL_GAP + config.nodeSpacingY * 0.35 + captionExtra(graph);
   for (const fu of graph.familyUnits) {
     const posA = positions.get(fu.partners[0]);
     const posB = positions.get(fu.partners[1]);
@@ -1272,13 +1323,24 @@ function packageResult(positions, edges, graph, config) {
   }
   return {
     width: maxX + padding,
-    height: maxY + padding + LABEL_GAP + LABEL_HEIGHT + 10,
+    height: maxY + padding + LABEL_GAP + LABEL_HEIGHT + 10 + captionExtra(graph),
     nodes,
     edges: shiftedEdges
   };
 }
 function estimateLabelText(ind) {
   const name = ind.label || ind.id;
+  if (ind.dob || ind.dod || ind.birthStatus || ind.note) {
+    const candidates = [name];
+    const born = ind.dob ?? (ind.birthYear ? String(ind.birthYear) : void 0);
+    const died = ind.dod ?? (ind.deathYear ? String(ind.deathYear) : void 0);
+    const dateParts = [];
+    if (born) dateParts.push(`[*] ${born}`);
+    if (died || ind.status === "deceased") dateParts.push(`\u2020 ${died ?? ""}`);
+    if (dateParts.length) candidates.push(dateParts.join("  "));
+    if (ind.note) candidates.push(ind.note);
+    return candidates.reduce((a, b) => b.length > a.length ? b : a, name);
+  }
   if (ind.birthYear && ind.deathYear) return `${name} (${ind.birthYear}\u2013${ind.deathYear})`;
   if (ind.birthYear) return `${name} (b. ${ind.birthYear})`;
   return name;
@@ -2257,6 +2319,8 @@ function buildStyles(config) {
 .schematex-genogram-female .schematex-genogram-shape { fill: ${t.femaleFill}; }
 .schematex-genogram-unknown .schematex-genogram-shape { fill: ${t.unknownFill}; }
 .schematex-genogram-label { font-family: ${config.fontFamily}; font-size: ${config.fontSize}px; text-anchor: middle; fill: ${t.text}; }
+.schematex-genogram-vitals { font-family: ${config.fontFamily}; font-size: ${Math.max(9, config.fontSize - 1)}px; text-anchor: middle; fill: ${t.textMuted}; }
+.schematex-genogram-note { font-family: ${config.fontFamily}; font-size: ${Math.max(9, config.fontSize - 1)}px; font-style: italic; text-anchor: middle; fill: ${t.textMuted}; }
 .schematex-genogram-edge { stroke: ${t.neutral}; stroke-width: ${STROKE_WIDTH.normal}; fill: none; stroke-linecap: round; stroke-linejoin: round; }
 .schematex-genogram-edge-cohabiting path { stroke-dasharray: 6,4; }
 .schematex-genogram-edge-cohabiting-ended path { stroke-dasharray: 6,4; }
@@ -2563,16 +2627,22 @@ function renderSiblingOfBrackets(layout, ast) {
 }
 function renderLabels(nodes, config) {
   const labels = [];
+  const captionStep = config.fontSize + 1;
   for (const node of nodes) {
     const ind = node.individual;
     const label = ind.label || ind.id;
     const cx = node.x + node.width / 2;
     const labelY = node.y + node.height + 6 + config.fontSize;
-    let labelText = label.charAt(0).toUpperCase() + label.slice(1);
-    if (ind.birthYear && ind.deathYear) {
-      labelText += ` (${ind.birthYear}\u2013${ind.deathYear})`;
-    } else if (ind.birthYear) {
-      labelText += ` (b. ${ind.birthYear})`;
+    const nameText = label.charAt(0).toUpperCase() + label.slice(1);
+    const datesLine = vitalDatesLine(ind);
+    const usesGenealogy = datesLine !== null || !!ind.note;
+    let nameLabel = nameText;
+    if (!usesGenealogy) {
+      if (ind.birthYear && ind.deathYear) {
+        nameLabel += ` (${ind.birthYear}\u2013${ind.deathYear})`;
+      } else if (ind.birthYear) {
+        nameLabel += ` (b. ${ind.birthYear})`;
+      }
     }
     labels.push(
       text(
@@ -2582,12 +2652,54 @@ function renderLabels(nodes, config) {
           class: "schematex-genogram-label",
           "data-individual-id": ind.id
         },
-        labelText
+        nameLabel
       )
     );
+    let lineY = labelY;
+    if (datesLine !== null) {
+      lineY += captionStep;
+      labels.push(
+        text(
+          {
+            x: cx,
+            y: lineY,
+            class: "schematex-genogram-vitals",
+            "data-individual-id": ind.id
+          },
+          datesLine
+        )
+      );
+    }
+    if (ind.note) {
+      lineY += captionStep;
+      labels.push(
+        text(
+          {
+            x: cx,
+            y: lineY,
+            class: "schematex-genogram-note",
+            "data-individual-id": ind.id
+          },
+          ind.note
+        )
+      );
+    }
   }
   return group({ class: "schematex-genogram-labels" }, labels);
 }
+function vitalDatesLine(ind) {
+  const bornText = ind.dob ?? (ind.birthYear ? String(ind.birthYear) : void 0);
+  const diedText = ind.dod ?? (ind.deathYear ? String(ind.deathYear) : void 0);
+  const isDeceased = ind.status === "deceased" || diedText !== void 0;
+  const hasFullDate = !!ind.dob || !!ind.dod;
+  if (!hasFullDate && !ind.birthStatus) return null;
+  const bornGlyph = ind.birthStatus === "adopted" ? "[*]" : ind.birthStatus === "out-of-wedlock" ? "(*)" : "*";
+  const parts = [];
+  if (bornText) parts.push(`${bornGlyph} ${bornText}`);
+  else if (ind.birthStatus) parts.push(bornGlyph);
+  if (isDeceased) parts.push(diedText ? `\u2020 ${diedText}` : "\u2020");
+  return parts.length > 0 ? parts.join("  ") : null;
+}
 
 // src/diagrams/genogram/index.ts
 var genogram = {
@@ -2617,5 +2729,5 @@ var genogram = {
 };
 
 export { ParseError, genogram, getRequiredDefs, layoutGenogram, parseGenogram, renderGenogram, renderIndividualSymbol };
-//# sourceMappingURL=chunk-VJGMEGMR.js.map
-//# sourceMappingURL=chunk-VJGMEGMR.js.map
+//# sourceMappingURL=chunk-DOK7LKLO.js.map
+//# sourceMappingURL=chunk-DOK7LKLO.js.map