@treeviz/gedcom-parser 2.1.18 → 2.1.23

package/dist/constants/index.js

@@ -870,7 +870,7 @@ var Common = class _Common {
     return this.sourStartsWith("ahnenblatt");
   }
   isGeni() {
-    return this.sourStartsWith("geni");
+    return this.sourStartsWith("geni.com");
   }
   isAncestry() {
     return this.sourStartsWith("ancestry");
@@ -3167,10 +3167,12 @@ var relativesOnLevelCache = relativesCache("relativesOnLevelCache");
 var relativesOnDegreeCache = relativesCache("relativesOnDegreeCache");
 var Indi = class extends Common {
   toName() {
-    return this.get("NAME")?.toValue();
+    const name = this.get("NAME");
+    const value = name?.index(0)?.toValue() ?? name?.toValue();
+    return typeof value === "string" ? value : void 0;
   }
   toNaturalName() {
-    return this.get("NAME")?.toValue()?.replaceAll("/", "");
+    return this.toName()?.replaceAll("/", "");
   }
   toList() {
     return new Individuals().concat(
@@ -3715,17 +3717,25 @@ var Indi = class extends Common {
     }
     return list;
   }
-  myheritageLink(poolId = 0) {
+  myheritageLink(poolId = 0, treeToken) {
     let www = (this.getFromSourceHeads("SOUR.CORP.value") || this._gedcom?.HEAD?.SOUR?.CORP?.value)?.toLowerCase().replace(/^www\./gi, "");
     if (!www || /treeviz/i.test(www)) {
       www = "myheritage.com";
     }
+    if (!this.id) {
+      return;
+    }
+    const id = Number(this.id.replace(/@|I/g, "")) + poolId;
+    if (!Number.isFinite(id)) {
+      return;
+    }
+    const slug = this.toNaturalName()?.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || String(id);
+    if (treeToken) {
+      return `https://www.${www}/profile-${treeToken}-${id}/${slug}`;
+    }
     const site = this.getMyHeritageTreeId();
-    const file = (this.getFromSourceHeads("FILE.value") || this._gedcom?.HEAD?.get("FILE")?.toValue())?.match(/Exported by MyHeritage.com from .+ in (?<site>.+) on .+$/)?.groups?.site;
-    const normalizedFile = file?.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-");
-    if (normalizedFile && this.id) {
-      const id = Number(this.id.replace(/@|I/g, "")) + poolId;
-      return `https://www.${www}/site-family-tree-${site}/${normalizedFile}#!profile-${id}-info`;
+    if (site) {
+      return `https://www.${www}/person-${id}_${site}_${site}/${slug}`;
     }
   }
   myheritageMedia() {
@@ -3774,6 +3784,14 @@ var Indi = class extends Common {
     });
     return list;
   }
+  geniLink() {
+    if (!this.id) {
+      return;
+    }
+    const id = this.id.replace(/@|I/g, "");
+    const given = this.toNaturalName()?.trim().split(/\s+/)[0] || id;
+    return `https://www.geni.com/people/${given}/${id}`;
+  }
   familySearchLink() {
     const wwwTags = this.get("WWW")?.toList();
     const wwwTag = wwwTags?.find((wwwTag2) => {
@@ -4054,12 +4072,15 @@ var Indi = class extends Common {
     );
     return void 0;
   }
-  link(poolId) {
+  link(poolId, treeToken) {
     if (this?.isAncestry()) {
       return this.ancestryLink();
     }
     if (this?.isMyHeritage()) {
-      return this.myheritageLink(poolId);
+      return this.myheritageLink(poolId, treeToken);
+    }
+    if (this?.isGeni()) {
+      return this.geniLink();
     }
     if (this?.isFamilySearch()) {
       return this.familySearchLink();
@@ -5812,11 +5833,28 @@ var KinshipTranslatorBasic = class {
 // src/kinship-translator/patterns.hu.ts
 var parentRelationsHu = {
   step: "mostoha",
-  foster: "nevelt",
+  foster: { ancestor: "nevel\u0151", other: "nevelt" },
   birth: "v\xE9rszerinti",
   biological: "v\xE9rszerinti",
-  adopted: "\xF6r\xF6kbefogadott"
+  adopted: { ancestor: "\xF6r\xF6kbefogad\xF3", other: "\xF6r\xF6kbefogadott" }
+};
+var parentRelationPrefix = (relation, ancestor) => {
+  const label = parentRelationsHu[relation];
+  if (!label) {
+    return;
+  }
+  if (typeof label === "string") {
+    return label;
+  }
+  return ancestor ? label.ancestor : label.other;
 };
+var parentRelationModifiers = [
+  ...new Set(
+    Object.values(parentRelationsHu).flatMap(
+      (label) => typeof label === "string" ? [label] : [label.ancestor, label.other]
+    )
+  )
+].join("|");
 var nominativus = {
   apa: { nominativus: "apa", dativus: "apj\xE1nak", possessivus: "apja" },
   anya: { nominativus: "anya", dativus: "anyj\xE1nak", possessivus: "anyja" },
@@ -5894,15 +5932,9 @@ var casesHu = {
 var InLawsHu = {
   "gyermek feles\xE9ge": "meny",
   "gyermek f\xE9rje": "v\u0151",
-  [`(f\xE9rj|feles\xE9g) (?<mod1>(${Object.values(parentRelationsHu).join(
-    "|"
-  )}) )?anyja`]: "any\xF3s",
-  [`(f\xE9rj|feles\xE9g) (?<mod1>(${Object.values(parentRelationsHu).join(
-    "|"
-  )}) )?apja`]: "ap\xF3s",
-  [`(f\xE9rj|feles\xE9g) (?<mod1>(${Object.values(parentRelationsHu).join(
-    "|"
-  )}) )?(f\xE9l)?testv\xE9re`]: (indi) => {
+  [`(f\xE9rj|feles\xE9g) (?<mod1>(${parentRelationModifiers}) )?anyja`]: "any\xF3s",
+  [`(f\xE9rj|feles\xE9g) (?<mod1>(${parentRelationModifiers}) )?apja`]: "ap\xF3s",
+  [`(f\xE9rj|feles\xE9g) (?<mod1>(${parentRelationModifiers}) )?(f\xE9l)?testv\xE9re`]: (indi) => {
     if (indi?.isMale()) {
       return "s\xF3gor";
     }
@@ -6179,7 +6211,12 @@ var KinshipTranslatorHU = class extends KinshipTranslatorBasic {
     if (!relation || !this.pathN?.relation) {
       return relation ?? "";
     }
-    return `${parentRelationsHu[this.pathN.relation]} ${relation}`;
+    const isAncestor = (this.pathN.level ?? 0) > 0 && (this.pathN.degree ?? 0) === 0;
+    const prefix = parentRelationPrefix(this.pathN.relation, isAncestor);
+    if (!prefix) {
+      return relation;
+    }
+    return `${prefix} ${relation}`;
   }
 };
 
@@ -6379,6 +6416,10 @@ var KinshipTranslatorEn = class extends KinshipTranslatorBasic {
     if (!relation || !this.pathN?.relation) {
       return relation ?? "";
     }
+    if (this.pathN.relation === "adopted") {
+      const isAncestor = (this.pathN.level ?? 0) > 0 && (this.pathN.degree ?? 0) === 0;
+      return `${isAncestor ? "adoptive" : "adopted"} ${relation}`;
+    }
     return `${this.pathN.relation} ${relation}`;
   }
 };
@@ -7537,6 +7578,39 @@ var lineal = (level, sex, kind) => {
   }
   return `${L - 1}\u4E16\u306E\u5B6B`;
 };
+var adoptedRelation = (relation) => {
+  if (relation === "\u7236") {
+    return "\u990A\u7236";
+  }
+  if (relation === "\u6BCD") {
+    return "\u990A\u6BCD";
+  }
+  if (relation === "\u89AA") {
+    return "\u990A\u89AA";
+  }
+  if (relation === "\u606F\u5B50" || relation === "\u5B50") {
+    return "\u990A\u5B50";
+  }
+  if (relation === "\u5A18") {
+    return "\u990A\u5973";
+  }
+  return `\u990A${relation}`;
+};
+var fosterRelation = (relation) => {
+  if (relation === "\u7236") {
+    return "\u91CC\u7236";
+  }
+  if (relation === "\u6BCD") {
+    return "\u91CC\u6BCD";
+  }
+  if (relation === "\u89AA") {
+    return "\u91CC\u89AA";
+  }
+  if (relation === "\u606F\u5B50" || relation === "\u5A18" || relation === "\u5B50") {
+    return "\u91CC\u5B50";
+  }
+  return `\u91CC${relation}`;
+};
 var cousinPlain = (degree) => {
   if (degree <= 1) {
     return "\u3044\u3068\u3053";
@@ -7696,10 +7770,10 @@ var KinshipTranslatorJa = class extends KinshipTranslatorBasic {
       return `\u7D99${relation}`;
     }
     if (this.pathN.relation === "adopted") {
-      return `\u990A\u5B50\u306E${relation}`;
+      return adoptedRelation(relation);
     }
     if (this.pathN.relation === "foster") {
-      return `\u91CC\u89AA\u306E${relation}`;
+      return fosterRelation(relation);
     }
     return relation;
   }

package/dist/factories/index.js

@@ -626,7 +626,7 @@ var Common = class _Common {
     return this.sourStartsWith("ahnenblatt");
   }
   isGeni() {
-    return this.sourStartsWith("geni");
+    return this.sourStartsWith("geni.com");
   }
   isAncestry() {
     return this.sourStartsWith("ancestry");
@@ -3666,10 +3666,12 @@ var relativesOnLevelCache = relativesCache("relativesOnLevelCache");
 var relativesOnDegreeCache = relativesCache("relativesOnDegreeCache");
 var Indi = class extends Common {
   toName() {
-    return this.get("NAME")?.toValue();
+    const name = this.get("NAME");
+    const value = name?.index(0)?.toValue() ?? name?.toValue();
+    return typeof value === "string" ? value : void 0;
   }
   toNaturalName() {
-    return this.get("NAME")?.toValue()?.replaceAll("/", "");
+    return this.toName()?.replaceAll("/", "");
   }
   toList() {
     return new Individuals().concat(
@@ -4214,17 +4216,25 @@ var Indi = class extends Common {
     }
     return list;
   }
-  myheritageLink(poolId = 0) {
+  myheritageLink(poolId = 0, treeToken) {
     let www = (this.getFromSourceHeads("SOUR.CORP.value") || this._gedcom?.HEAD?.SOUR?.CORP?.value)?.toLowerCase().replace(/^www\./gi, "");
     if (!www || /treeviz/i.test(www)) {
       www = "myheritage.com";
     }
+    if (!this.id) {
+      return;
+    }
+    const id = Number(this.id.replace(/@|I/g, "")) + poolId;
+    if (!Number.isFinite(id)) {
+      return;
+    }
+    const slug = this.toNaturalName()?.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || String(id);
+    if (treeToken) {
+      return `https://www.${www}/profile-${treeToken}-${id}/${slug}`;
+    }
     const site = this.getMyHeritageTreeId();
-    const file = (this.getFromSourceHeads("FILE.value") || this._gedcom?.HEAD?.get("FILE")?.toValue())?.match(/Exported by MyHeritage.com from .+ in (?<site>.+) on .+$/)?.groups?.site;
-    const normalizedFile = file?.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-");
-    if (normalizedFile && this.id) {
-      const id = Number(this.id.replace(/@|I/g, "")) + poolId;
-      return `https://www.${www}/site-family-tree-${site}/${normalizedFile}#!profile-${id}-info`;
+    if (site) {
+      return `https://www.${www}/person-${id}_${site}_${site}/${slug}`;
     }
   }
   myheritageMedia() {
@@ -4273,6 +4283,14 @@ var Indi = class extends Common {
     });
     return list;
   }
+  geniLink() {
+    if (!this.id) {
+      return;
+    }
+    const id = this.id.replace(/@|I/g, "");
+    const given = this.toNaturalName()?.trim().split(/\s+/)[0] || id;
+    return `https://www.geni.com/people/${given}/${id}`;
+  }
   familySearchLink() {
     const wwwTags = this.get("WWW")?.toList();
     const wwwTag = wwwTags?.find((wwwTag2) => {
@@ -4553,12 +4571,15 @@ var Indi = class extends Common {
     );
     return void 0;
   }
-  link(poolId) {
+  link(poolId, treeToken) {
     if (this?.isAncestry()) {
       return this.ancestryLink();
     }
     if (this?.isMyHeritage()) {
-      return this.myheritageLink(poolId);
+      return this.myheritageLink(poolId, treeToken);
+    }
+    if (this?.isGeni()) {
+      return this.geniLink();
     }
     if (this?.isFamilySearch()) {
       return this.familySearchLink();
@@ -6311,11 +6332,28 @@ var KinshipTranslatorBasic = class {
 // src/kinship-translator/patterns.hu.ts
 var parentRelationsHu = {
   step: "mostoha",
-  foster: "nevelt",
+  foster: { ancestor: "nevel\u0151", other: "nevelt" },
   birth: "v\xE9rszerinti",
   biological: "v\xE9rszerinti",
-  adopted: "\xF6r\xF6kbefogadott"
+  adopted: { ancestor: "\xF6r\xF6kbefogad\xF3", other: "\xF6r\xF6kbefogadott" }
+};
+var parentRelationPrefix = (relation, ancestor) => {
+  const label = parentRelationsHu[relation];
+  if (!label) {
+    return;
+  }
+  if (typeof label === "string") {
+    return label;
+  }
+  return ancestor ? label.ancestor : label.other;
 };
+var parentRelationModifiers = [
+  ...new Set(
+    Object.values(parentRelationsHu).flatMap(
+      (label) => typeof label === "string" ? [label] : [label.ancestor, label.other]
+    )
+  )
+].join("|");
 var nominativus = {
   apa: { nominativus: "apa", dativus: "apj\xE1nak", possessivus: "apja" },
   anya: { nominativus: "anya", dativus: "anyj\xE1nak", possessivus: "anyja" },
@@ -6393,15 +6431,9 @@ var casesHu = {
 var InLawsHu = {
   "gyermek feles\xE9ge": "meny",
   "gyermek f\xE9rje": "v\u0151",
-  [`(f\xE9rj|feles\xE9g) (?<mod1>(${Object.values(parentRelationsHu).join(
-    "|"
-  )}) )?anyja`]: "any\xF3s",
-  [`(f\xE9rj|feles\xE9g) (?<mod1>(${Object.values(parentRelationsHu).join(
-    "|"
-  )}) )?apja`]: "ap\xF3s",
-  [`(f\xE9rj|feles\xE9g) (?<mod1>(${Object.values(parentRelationsHu).join(
-    "|"
-  )}) )?(f\xE9l)?testv\xE9re`]: (indi) => {
+  [`(f\xE9rj|feles\xE9g) (?<mod1>(${parentRelationModifiers}) )?anyja`]: "any\xF3s",
+  [`(f\xE9rj|feles\xE9g) (?<mod1>(${parentRelationModifiers}) )?apja`]: "ap\xF3s",
+  [`(f\xE9rj|feles\xE9g) (?<mod1>(${parentRelationModifiers}) )?(f\xE9l)?testv\xE9re`]: (indi) => {
     if (indi?.isMale()) {
       return "s\xF3gor";
     }
@@ -6678,7 +6710,12 @@ var KinshipTranslatorHU = class extends KinshipTranslatorBasic {
     if (!relation || !this.pathN?.relation) {
       return relation ?? "";
     }
-    return `${parentRelationsHu[this.pathN.relation]} ${relation}`;
+    const isAncestor = (this.pathN.level ?? 0) > 0 && (this.pathN.degree ?? 0) === 0;
+    const prefix = parentRelationPrefix(this.pathN.relation, isAncestor);
+    if (!prefix) {
+      return relation;
+    }
+    return `${prefix} ${relation}`;
   }
 };
 
@@ -6878,6 +6915,10 @@ var KinshipTranslatorEn = class extends KinshipTranslatorBasic {
     if (!relation || !this.pathN?.relation) {
       return relation ?? "";
     }
+    if (this.pathN.relation === "adopted") {
+      const isAncestor = (this.pathN.level ?? 0) > 0 && (this.pathN.degree ?? 0) === 0;
+      return `${isAncestor ? "adoptive" : "adopted"} ${relation}`;
+    }
     return `${this.pathN.relation} ${relation}`;
   }
 };
@@ -8036,6 +8077,39 @@ var lineal = (level, sex, kind) => {
   }
   return `${L - 1}\u4E16\u306E\u5B6B`;
 };
+var adoptedRelation = (relation) => {
+  if (relation === "\u7236") {
+    return "\u990A\u7236";
+  }
+  if (relation === "\u6BCD") {
+    return "\u990A\u6BCD";
+  }
+  if (relation === "\u89AA") {
+    return "\u990A\u89AA";
+  }
+  if (relation === "\u606F\u5B50" || relation === "\u5B50") {
+    return "\u990A\u5B50";
+  }
+  if (relation === "\u5A18") {
+    return "\u990A\u5973";
+  }
+  return `\u990A${relation}`;
+};
+var fosterRelation = (relation) => {
+  if (relation === "\u7236") {
+    return "\u91CC\u7236";
+  }
+  if (relation === "\u6BCD") {
+    return "\u91CC\u6BCD";
+  }
+  if (relation === "\u89AA") {
+    return "\u91CC\u89AA";
+  }
+  if (relation === "\u606F\u5B50" || relation === "\u5A18" || relation === "\u5B50") {
+    return "\u91CC\u5B50";
+  }
+  return `\u91CC${relation}`;
+};
 var cousinPlain = (degree) => {
   if (degree <= 1) {
     return "\u3044\u3068\u3053";
@@ -8195,10 +8269,10 @@ var KinshipTranslatorJa = class extends KinshipTranslatorBasic {
       return `\u7D99${relation}`;
     }
     if (this.pathN.relation === "adopted") {
-      return `\u990A\u5B50\u306E${relation}`;
+      return adoptedRelation(relation);
     }
     if (this.pathN.relation === "foster") {
-      return `\u91CC\u89AA\u306E${relation}`;
+      return fosterRelation(relation);
     }
     return relation;
   }