@treeviz/gedcom-parser 2.1.12 → 2.1.16

package/dist/factories/kinship-factory.d.ts

@@ -1,10 +1,10 @@
 import type { IndiType } from "../classes/indi";
 import type { Language } from "../kinship-translator/types";
-import type { IndiKey } from "../types/types";
+import type { IndiKey, NameOrder } from "../types/types";
 /**
  * Kinship translator class constructor type
  */
-export type KinshipTranslatorConstructor = new (person1: IndiType, person2?: IndiType | IndiKey, lang?: Language, entirePath?: boolean, displayName?: "none" | "givenname" | "surname" | "all") => {
+export type KinshipTranslatorConstructor = new (person1: IndiType, person2?: IndiType | IndiKey, lang?: Language, entirePath?: boolean, displayName?: "none" | "givenname" | "surname" | "all", nameOrder?: NameOrder) => {
     translate: <T extends boolean | undefined>(showMainPerson: boolean) => (T extends false | undefined ? string : Array<{
         id?: IndiKey;
         gen: number;

package/dist/factories/kinship-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kinship-factory.d.ts","sourceRoot":"","sources":["../../src/factories/kinship-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE9C;;GAEG;AACH,MAAM,MAAM,4BAA4B,GAAG,KAC1C,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,EAC5B,IAAI,CAAC,EAAE,QAAQ,EACf,UAAU,CAAC,EAAE,OAAO,EACpB,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,GAAG,KAAK,KAClD;IACJ,SAAS,EAAE,CAAC,CAAC,SAAS,OAAO,GAAG,SAAS,EACxC,cAAc,EAAE,OAAO,KAErB,CAAC,CAAC,SAAS,KAAK,GAAG,SAAS,GAC1B,MAAM,GACN,KAAK,CAAC;QACN,EAAE,CAAC,EAAE,OAAO,CAAC;QACb,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC,CAAC,GACJ,SAAS,CAAC;CACb,CAAC;AAQF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,yBAAyB,GACrC,iBAAiB,4BAA4B,SAG7C,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,QAAO,4BAE5C,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,YAGvC,CAAC"}
+{"version":3,"file":"kinship-factory.d.ts","sourceRoot":"","sources":["../../src/factories/kinship-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEzD;;GAEG;AACH,MAAM,MAAM,4BAA4B,GAAG,KAC1C,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,EAC5B,IAAI,CAAC,EAAE,QAAQ,EACf,UAAU,CAAC,EAAE,OAAO,EACpB,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,GAAG,KAAK,EACtD,SAAS,CAAC,EAAE,SAAS,KACjB;IACJ,SAAS,EAAE,CAAC,CAAC,SAAS,OAAO,GAAG,SAAS,EACxC,cAAc,EAAE,OAAO,KAErB,CAAC,CAAC,SAAS,KAAK,GAAG,SAAS,GAC1B,MAAM,GACN,KAAK,CAAC;QACN,EAAE,CAAC,EAAE,OAAO,CAAC;QACb,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC,CAAC,GACJ,SAAS,CAAC;CACb,CAAC;AAQF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,yBAAyB,GACrC,iBAAiB,4BAA4B,SAG7C,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,QAAO,4BAE5C,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,YAGvC,CAAC"}

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(
@@ -5098,14 +5126,15 @@ var Indi = class extends Common {
     }
     return foundPath;
   }
-  kinship(other, showMainPerson, lang = "en", entirePath, displayName = "givenname") {
+  kinship(other, showMainPerson, lang = "en", entirePath, displayName = "givenname", nameOrder) {
     const KinshipTranslatorClass2 = getKinshipTranslatorClass();
     const translator = new KinshipTranslatorClass2(
       this,
       other,
       lang,
       entirePath,
-      showMainPerson ? displayName : void 0
+      showMainPerson ? displayName : void 0,
+      nameOrder
     );
     return translator.translate(!!showMainPerson);
   }
@@ -6036,11 +6065,12 @@ var hungarianOrdinalize = (n) => {
 
 // src/kinship-translator/kinship-translator.basic.ts
 var KinshipTranslatorBasic = class {
-  constructor(path, displayName = "givenname") {
+  constructor(path, displayName = "givenname", nameOrder = "first-last") {
     this.isOfSpouse = false;
     this.isSpouseOf = false;
     this._path = path;
     this.displayName = displayName;
+    this.nameOrder = nameOrder;
   }
   get path() {
     return this._path;
@@ -6463,7 +6493,7 @@ var KinshipTranslatorHU = class extends KinshipTranslatorBasic {
   }
   of(relation) {
     const formattedName = nameFormatter(this.path?.[0]?.indi, {
-      nameOrder: "last-first"
+      nameOrder: this.nameOrder
     });
     let name = formattedName.inOrder.filter(Boolean).join(" ");
     if (this.displayName === "none") {
@@ -6677,7 +6707,7 @@ var KinshipTranslatorEn = class extends KinshipTranslatorBasic {
   }
   of(relation) {
     const formattedName = nameFormatter(this.path?.[0]?.indi, {
-      nameOrder: "first-last"
+      nameOrder: this.nameOrder
     });
     let name = formattedName.inOrder.filter(Boolean).join(" ");
     if (this.displayName === "none") {
@@ -6893,7 +6923,7 @@ var KinshipTranslatorDe = class extends KinshipTranslatorBasic {
   }
   of(relation) {
     const formattedName = nameFormatter(this.path?.[0]?.indi, {
-      nameOrder: "first-last"
+      nameOrder: this.nameOrder
     });
     let name = formattedName.inOrder.filter(Boolean).join(" ");
     if (this.displayName === "none") {
@@ -7110,7 +7140,7 @@ var KinshipTranslatorFr = class extends KinshipTranslatorBasic {
   }
   of(relation) {
     const formattedName = nameFormatter(this.path?.[0]?.indi, {
-      nameOrder: "first-last"
+      nameOrder: this.nameOrder
     });
     let name = formattedName.inOrder.filter(Boolean).join(" ");
     if (this.displayName === "none") {
@@ -7448,7 +7478,7 @@ var KinshipTranslatorEs = class extends KinshipTranslatorBasic {
   }
   of(relation) {
     const formattedName = nameFormatter(this.path?.[0]?.indi, {
-      nameOrder: "first-last"
+      nameOrder: this.nameOrder
     });
     let name = formattedName.inOrder.filter(Boolean).join(" ");
     if (this.displayName === "none") {
@@ -7755,7 +7785,7 @@ var KinshipTranslatorRu = class extends KinshipTranslatorBasic {
   }
   of(relation) {
     const formattedName = nameFormatter(this.path?.[0]?.indi, {
-      nameOrder: "first-last"
+      nameOrder: this.nameOrder
     });
     let name = formattedName.inOrder.filter(Boolean).join(" ");
     if (this.displayName === "none") {
@@ -7991,7 +8021,7 @@ var KinshipTranslatorJa = class extends KinshipTranslatorBasic {
   }
   of(relation) {
     const formattedName = nameFormatter(this.path?.[0]?.indi, {
-      nameOrder: "last-first"
+      nameOrder: this.nameOrder
     });
     let name = formattedName.inOrder.filter(Boolean).join(" ");
     if (this.displayName === "none") {
@@ -8240,7 +8270,7 @@ var KinshipTranslatorZh = class extends KinshipTranslatorBasic {
   }
   of(relation) {
     const formattedName = nameFormatter(this.path?.[0]?.indi, {
-      nameOrder: "last-first"
+      nameOrder: this.nameOrder
     });
     let name = formattedName.inOrder.filter(Boolean).join(" ");
     if (this.displayName === "none") {
@@ -8309,22 +8339,30 @@ var KinshipTranslatorZh = class extends KinshipTranslatorBasic {
 };
 
 // src/kinship-translator/kinship-translator.ts
+var nameOrderForLang = (lang) => lang === "hu" || lang === "ja" || lang === "zh" ? "last-first" : "first-last";
 var KinshipTranslator = class {
-  constructor(person1, person2, lang = "en", entirePath, displayName = "givenname") {
+  constructor(person1, person2, lang = "en", entirePath, displayName = "givenname", nameOrder) {
     this.displayName = displayName;
     this.lang = lang;
     this.entirePath = entirePath;
     this.person1 = person1;
     this.person2 = typeof person2 === "string" ? this.person1.getGedcom()?.indi(person2) : person2;
     this.path = this.person1.path(this.person2);
+    const order = nameOrder ?? nameOrderForLang(lang);
+    this.nameOrder = order;
     if (translators_exports[lang]) {
       this.translator = new translators_exports[lang](
         this.path ?? [],
-        displayName
+        displayName,
+        order
       );
     }
     if (!this.translator) {
-      this.translator = new KinshipTranslatorEn(this.path ?? [], displayName);
+      this.translator = new KinshipTranslatorEn(
+        this.path ?? [],
+        displayName,
+        order
+      );
     }
   }
   get path0() {
@@ -8369,14 +8407,16 @@ var KinshipTranslator = class {
           showMainPerson,
           this.lang,
           false,
-          this.displayName
+          this.displayName,
+          this.nameOrder
         ),
         relative: this.path?.[index - 1]?.indi.kinship(
           path2.indi.id,
           showMainPerson,
           this.lang,
           false,
-          this.displayName
+          this.displayName,
+          this.nameOrder
         )
       }));
       return path;
@@ -8716,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() {
@@ -9762,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();
@@ -9896,7 +9939,7 @@ var collectExtensionTagsFrom = (node, into = /* @__PURE__ */ new Set()) => {
 // package.json
 var package_default = {
   name: "@treeviz/gedcom-parser",
-  version: "2.1.12"};
+  version: "2.1.16"};
 
 // src/utils/get-product-details.ts
 var isDevelopment = () => {
@@ -11300,7 +11343,7 @@ var create = (gedcom, type, id, nodes) => {
       prevNode = createObje(gedcom, void 0, mainNode, curNode);
     } else if (type === "DATE") {
       prevNode = createCommonDate(gedcom, void 0, mainNode, curNode);
-    } else if (type === "NOTE" || type === "SNOTE") {
+    } else if (type === "NOTE" || type === "SNOTE" || type === "_TREEVIZ_LIFE_STORY" || type === "_TREEVIZ_FAMILY_STORY") {
       prevNode = createCommonNote(gedcom, void 0, mainNode, curNode);
     } else if (type === "NAME" && mainNode instanceof Indi) {
       prevNode = createCommonName(gedcom, void 0, mainNode, curNode);