@treeviz/gedcom-parser 2.1.15 → 2.1.17

package/dist/index.js

@@ -814,7 +814,11 @@ var Common = class _Common {
       const current = this.get(validKey);
       const mergeValue = other.get(validKey);
       if (mergeValue) {
-        if (current instanceof _Common || current instanceof List) {
+        if (current instanceof _Common && !current.isListable) {
+          if (override) {
+            this.set(validKey, mergeValue);
+          }
+        } else if (current instanceof _Common || current instanceof List) {
           this.assign(validKey, mergeValue, true);
         } else if (!current || override && validKey !== "id" && validKey !== "_id") {
           this.set(validKey, mergeValue);
@@ -2438,19 +2442,41 @@ var ACCEPTED_DATE_FORMATS_REGEX = new RegExp(
   ).join("|")})`,
   "gi"
 );
+var firstDate = (date) => {
+  if (!date) return void 0;
+  if (isCommonDate(date)) return date;
+  if (date instanceof List) {
+    return firstDate(
+      date.index(0)
+    );
+  }
+  const node = date;
+  if (typeof node.toValue === "function") {
+    return node;
+  }
+  return void 0;
+};
+var dateNote = (date, shortNote = true) => {
+  if (date && typeof date.toNote === "function") {
+    return date.toNote(shortNote) ?? "";
+  }
+  return "";
+};
 var commonDateFormatter = (date, format2 = "yyyy", prefix = "") => {
-  const formattedDate = date?.toValue(format2);
+  const used = firstDate(date);
+  const formattedDate = used?.toValue(format2);
   if (!formattedDate) {
     return void 0;
   }
   return `${prefix}${formattedDate}`.trim();
 };
 var noteDateFormatter = (date, format2 = "yyyy", prefix = "", shortNote = true, showNote = true) => {
-  const rawDate = commonDateFormatter(date, format2, "");
+  const used = firstDate(date);
+  const rawDate = commonDateFormatter(used, format2, "");
   if (!rawDate) {
     return void 0;
   }
-  const note = date?.toNote(shortNote) ?? "";
+  const note = dateNote(used, shortNote);
   return `${prefix}${note && showNote ? i18n.t(`${note} {{date}}`, { date: rawDate }) : rawDate}`;
 };
 var marriageDateFormatter = (fam, showDays = false, showPlaces = false, shortNote = true, showNote = true, showDisplayTextIfNoDate = true, showAllEvents = false, dateFormatPattern) => {
@@ -2568,11 +2594,12 @@ var dateFormatter = (indi, showMarriages = false, showDays = false, showPlaces =
   const birthPlaces = [];
   const eventsToProcess = showAllEvents ? birthEvents : birthEvents.slice(0, 1);
   eventsToProcess.forEach((birthEvent) => {
+    const birthDateNode = firstDate(birthEvent?.DATE);
     const birthDate = commonDateFormatter(
-      birthEvent?.DATE,
+      birthDateNode,
       showDays ? fullDateFormat : "yyyy"
     );
-    const birthEventNote = birthEvent?.DATE?.toNote(shortNote) ?? "";
+    const birthEventNote = dateNote(birthDateNode, shortNote);
     const birthEventPlace = showPlaces ? birthEvent?.PLAC?.value : void 0;
     if (birthDate) {
       birthStrings.push(
@@ -2587,11 +2614,12 @@ var dateFormatter = (indi, showMarriages = false, showDays = false, showPlaces =
   const deathPlaces = [];
   const deathEventsToProcess = showAllEvents ? deathEvents : deathEvents.slice(0, 1);
   deathEventsToProcess.forEach((deathEvent) => {
+    const deathDateNode = firstDate(deathEvent?.DATE);
     const deathDate = commonDateFormatter(
-      deathEvent?.DATE,
+      deathDateNode,
       showDays ? fullDateFormat : "yyyy"
     );
-    const deathEventNote = deathEvent?.DATE?.toNote(shortNote) ?? "";
+    const deathEventNote = dateNote(deathDateNode, shortNote);
     const deathEventPlace = showPlaces ? deathEvent?.PLAC?.value : void 0;
     if (deathDate) {
       deathStrings.push(
@@ -8728,6 +8756,8 @@ var formatDateWithComponents = (date, hasDay, hasMonth, hasYear, noteValue, base
 var CommonDate = class extends Common {
   constructor(gedcom, id, main, parent) {
     super(gedcom, id, main, parent);
+    /** One DATE per event — merge must not turn this into a List. */
+    this.isListable = false;
     delete this.id;
   }
   get calendar() {
@@ -9774,7 +9804,8 @@ var TREEVIZ_EXTENSION_URIS = {
   _TREEVIZ_SETTINGS: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_SETTINGS`,
   _TREEVIZ_VIEW: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_VIEW`,
   _TREEVIZ_DETECTIVE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_DETECTIVE`,
-  _TREEVIZ_DETECTIVE_STATE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_DETECTIVE_STATE`
+  _TREEVIZ_DETECTIVE_STATE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_DETECTIVE_STATE`,
+  _TREEVIZ_FS_IGNORE: `${TREEVIZ_EXTENSION_BASE_URI}#_TREEVIZ_FS_IGNORE`
 };
 var parseTagDefinition = (payload) => {
   const trimmed = payload.trim();
@@ -9908,7 +9939,7 @@ var collectExtensionTagsFrom = (node, into = /* @__PURE__ */ new Set()) => {
 // package.json
 var package_default = {
   name: "@treeviz/gedcom-parser",
-  version: "2.1.15"};
+  version: "2.1.17"};
 
 // src/utils/get-product-details.ts
 var isDevelopment = () => {