schematex 0.9.15 → 0.9.16

package/dist/{chunk-CYBBBBMZ.cjs → chunk-PG7TOHPZ.cjs}

@@ -21,6 +21,8 @@ var ParseError = class extends Error {
 };
 var COUPLE_OPS = [
   { token: "~/~", type: "cohabiting-ended" },
+  { token: "~x~", type: "divorced" },
+  // the form the grammar advertises; `-x-` is the ASCII alias
   { token: "-//", type: "separated" },
   // alias for -/-
   { token: "-x-", type: "divorced" },
@@ -37,6 +39,16 @@ var VALID_STATUS = /* @__PURE__ */ new Set([
   "miscarriage",
   "abortion"
 ]);
+var STATUS_ALIASES = {
+  stillbirth: "stillborn",
+  stillbirths: "stillborn",
+  miscarried: "miscarriage",
+  miscarry: "miscarriage",
+  aborted: "abortion",
+  dead: "deceased",
+  died: "deceased",
+  decd: "deceased"
+};
 var SPECIAL_CHILD_PROPS = /* @__PURE__ */ new Set([
   "adopted",
   "foster",
@@ -456,8 +468,8 @@ function buildIndividual(id, propsStr, lineNum, lineText) {
     const tokenLower = token.toLowerCase();
     if (VALID_SEX.has(tokenLower)) {
       individual.sex = tokenLower;
-    } else if (VALID_STATUS.has(tokenLower)) {
-      individual.status = tokenLower;
+    } else if (VALID_STATUS.has(tokenLower) || STATUS_ALIASES[tokenLower]) {
+      individual.status = STATUS_ALIASES[tokenLower] ?? tokenLower;
     } else if (tokenLower === "index") {
       if (!individual.markers) individual.markers = [];
       individual.markers.push("index-person");
@@ -467,6 +479,8 @@ function buildIndividual(id, propsStr, lineNum, lineText) {
       if (!individual.label || individual.label === id) individual.label = "?";
     } else if (SPECIAL_CHILD_PROPS.has(tokenLower) || tokenLower === "guardian") {
       continue;
+    } else if (/^\d{1,3}$/.test(tokenLower)) {
+      individual.age = parseInt(token, 10);
     } else if (/^\d{4}$/.test(tokenLower)) {
       if (individual.birthYear !== void 0) {
         individual.deathYear = parseInt(token, 10);
@@ -553,7 +567,7 @@ function parseConditions(raw, lineNum, lineText) {
   const parts = raw.split("+").map((s) => s.trim());
   const conditions = [];
   for (const part of parts) {
-    const match = part.match(/^([a-zA-Z0-9_-]+)\(([^)]+)\)$/);
+    const match = part.match(/^([^(]+)\(([^)]+)\)$/);
     if (!match) {
       throw new ParseError(
         `Invalid condition format '${part}'. Expected: name(fill) or name(fill, #color)`,
@@ -562,7 +576,8 @@ function parseConditions(raw, lineNum, lineText) {
         lineText
       );
     }
-    const [, label, innerRaw] = match;
+    const label = match[1].trim();
+    const innerRaw = match[2];
     const innerParts = innerRaw.split(",").map((s) => s.trim());
     const fill = innerParts[0];
     const color = innerParts[1];
@@ -2737,5 +2752,5 @@ exports.layoutGenogram = layoutGenogram;
 exports.parseGenogram = parseGenogram;
 exports.renderGenogram = renderGenogram;
 exports.renderIndividualSymbol = renderIndividualSymbol;
-//# sourceMappingURL=chunk-CYBBBBMZ.cjs.map
-//# sourceMappingURL=chunk-CYBBBBMZ.cjs.map
+//# sourceMappingURL=chunk-PG7TOHPZ.cjs.map
+//# sourceMappingURL=chunk-PG7TOHPZ.cjs.map