@treeviz/gedcom-parser 2.1.9 → 2.1.12

package/dist/index.js

@@ -35,6 +35,82 @@ var appendGedcomTrailer = (serialized) => {
   }
   return `${trimmed}${newline}0 TRLR`;
 };
+
+// src/utils/media-utils.ts
+var getFileExtension = (filename) => {
+  if (!filename) {
+    return "";
+  }
+  if (filename.startsWith("data:")) {
+    const mime = filename.slice(5).split(";")[0] || "";
+    const subtype = (mime.split("/")[1] || "").toLowerCase();
+    if (subtype === "jpeg") {
+      return "jpg";
+    }
+    return subtype.split("+")[0] || "";
+  }
+  const withoutQuery = filename.split(/[?#]/)[0] || filename;
+  const match = withoutQuery.match(/\.([^.]+)$/);
+  return match ? match[1].toLowerCase() : "";
+};
+var isImageFormat = (format2) => {
+  if (!format2) {
+    return false;
+  }
+  let normalized = format2.toLowerCase().trim();
+  if (normalized.startsWith("data:")) {
+    normalized = getFileExtension(normalized);
+  } else if (normalized.includes("/")) {
+    normalized = normalized.split("/")[1]?.split("+")[0] || "";
+    if (normalized === "jpeg") {
+      normalized = "jpg";
+    }
+  }
+  const imageFormats = [
+    "jpg",
+    "jpeg",
+    "png",
+    "gif",
+    "bmp",
+    "webp",
+    "svg",
+    "tiff",
+    "tif"
+  ];
+  return imageFormats.includes(normalized);
+};
+var resolveObjeForm = (obje) => {
+  const value = obje?.get?.("FILE.FORM")?.toValue?.() ?? obje?.get?.("FORM")?.toValue?.();
+  return typeof value === "string" && value.trim() ? value.trim() : void 0;
+};
+var mediaIdValue = (obje, path) => {
+  const value = obje?.get?.(path)?.toValue?.();
+  return typeof value === "string" && value.trim() ? value.trim() : void 0;
+};
+var resolveObjeMediaId = (obje) => mediaIdValue(obje, "RIN") || mediaIdValue(obje, "_CLON._OID") || mediaIdValue(obje, "_MSER._LKID") || mediaIdValue(obje, "_OID") || mediaIdValue(obje, "_LKID");
+var ANCESTRY_MEDIA_RETRIEVAL_PREFIX = "https://www.ancestry.com/api/media/retrieval/v2/image";
+var ANCESTRY_MEDIA_QUERY = "client=trees-mediaservice&imageQuality=hq";
+var ancestryMediaPath = (namespace, imgId) => `/namespaces/${namespace}/media/${imgId}?${ANCESTRY_MEDIA_QUERY}`;
+var ancestryMediaFileUrl = (namespace, imgId) => {
+  if (!namespace || !imgId) {
+    return void 0;
+  }
+  return `${ANCESTRY_MEDIA_RETRIEVAL_PREFIX}${ancestryMediaPath(namespace, imgId)}`;
+};
+var objeXrefKey = (obje, fallback = 0) => {
+  if (typeof obje?.id === "string" && obje.id) {
+    return obje.id;
+  }
+  const value = obje?.toValue?.();
+  if (typeof value === "string" && value.trim()) {
+    return value.trim();
+  }
+  if (typeof fallback === "string" && fallback.trim()) {
+    return fallback.trim();
+  }
+  return `@O${fallback}@`;
+};
+var objeNoteValue = (obje) => mediaIdValue(obje, "FILE.NOTE") || mediaIdValue(obje, "NOTE") || "";
 var List = class _List {
   // length = 0;
   constructor(items) {
@@ -684,7 +760,7 @@ var Common = class _Common {
         this,
         options.obje.namespace,
         options.obje.override,
-        void 0,
+        this.isAncestry() ? ancestryMediaFileUrl : void 0,
         options.gedcomVersion
       );
     }
@@ -1240,11 +1316,8 @@ var storeCache = {
       getCacheDbs().relativesOnDegreeCache.setItem(value);
     }
   }, 50),
-  // profilePictureCache IS persisted to IndexedDB
+  // Image bytes are stored as one IndexedDB record per photo.
   profilePictureCache: debounce((value) => {
-    if (value) {
-      getCacheDbs().profilePictureCache.setItem(value);
-    }
   }, 100)
 };
 var cacheInitialized = false;
@@ -1253,13 +1326,6 @@ var initializeCache = async () => {
     return;
   }
   cacheInitialized = true;
-  try {
-    const profilePictureData = await getCacheDbs().profilePictureCache.getItem();
-    if (profilePictureData) {
-      caches.profilePictureCache = profilePictureData;
-    }
-  } catch (_error) {
-  }
 };
 var resetRelativesCache = () => {
   caches.relativesOnDegreeCache = {};
@@ -2654,15 +2720,21 @@ var isRemoteOrEmbeddedMediaUrl = (path) => {
   }
   return path.startsWith("data:") || path.startsWith("blob:") || /^https?:\/\//i.test(path);
 };
-var resolveLocalMediaUrl = async (path) => {
+var resolveLocalMediaUrl = async (path, context) => {
   if (!path) {
     return void 0;
   }
-  if (isRemoteOrEmbeddedMediaUrl(path)) {
+  if (path.startsWith("data:") || path.startsWith("blob:")) {
+    return path;
+  }
+  const resolved = await localMediaResolver?.(path, context);
+  if (resolved) {
+    return resolved;
+  }
+  if (/^https?:\/\//i.test(path)) {
     return path;
   }
-  const resolved = await localMediaResolver?.(path);
-  return resolved;
+  return void 0;
 };
 var blobToDataUrl = async (blob) => {
   const buffer = await blob.arrayBuffer();
@@ -2719,54 +2791,6 @@ var notImplemented = (type, ...args) => {
   console.error(`[Not Implemented] ${type}`, ...args);
 };
 
-// src/utils/media-utils.ts
-var getFileExtension = (filename) => {
-  if (!filename) {
-    return "";
-  }
-  if (filename.startsWith("data:")) {
-    const mime = filename.slice(5).split(";")[0] || "";
-    const subtype = (mime.split("/")[1] || "").toLowerCase();
-    if (subtype === "jpeg") {
-      return "jpg";
-    }
-    return subtype.split("+")[0] || "";
-  }
-  const withoutQuery = filename.split(/[?#]/)[0] || filename;
-  const match = withoutQuery.match(/\.([^.]+)$/);
-  return match ? match[1].toLowerCase() : "";
-};
-var isImageFormat = (format2) => {
-  if (!format2) {
-    return false;
-  }
-  let normalized = format2.toLowerCase().trim();
-  if (normalized.startsWith("data:")) {
-    normalized = getFileExtension(normalized);
-  } else if (normalized.includes("/")) {
-    normalized = normalized.split("/")[1]?.split("+")[0] || "";
-    if (normalized === "jpeg") {
-      normalized = "jpg";
-    }
-  }
-  const imageFormats = [
-    "jpg",
-    "jpeg",
-    "png",
-    "gif",
-    "bmp",
-    "webp",
-    "svg",
-    "tiff",
-    "tif"
-  ];
-  return imageFormats.includes(normalized);
-};
-var resolveObjeForm = (obje) => {
-  const value = obje?.get?.("FILE.FORM")?.toValue?.() ?? obje?.get?.("FORM")?.toValue?.();
-  return typeof value === "string" && value.trim() ? value.trim() : void 0;
-};
-
 // src/factories/place-parser-provider.ts
 var placeParserProvider;
 var setPlaceParserProvider = (parser) => {
@@ -3982,22 +4006,19 @@ var Indi = class extends Common {
     if (objeList) {
       await Promise.all(
         objeList.map(async (objeRef) => {
-          const key = objeRef?.id;
+          const key = objeXrefKey(objeRef, 0);
           const obje = objeRef?.standardizeMedia(
             namespace,
             true,
-            (ns, iId) => {
-              return ns && iId ? `https://mediasvc.ancestry.com/v2/image/namespaces/${ns}/media/${iId}?client=trees-mediaservice&imageQuality=hq` : void 0;
-            }
+            ancestryMediaFileUrl
           );
           const isPrimary = obje?.get("_PRIM")?.toValue() === "Y";
-          const media = obje?.RIN?.toValue() || obje?.get("_OID")?.toValue();
-          const clone = obje?.get("_CLON._OID")?.toValue();
-          const mser = obje?.get("_MSER._LKID")?.toValue();
+          const media = resolveObjeMediaId(obje);
           let url = obje?.get("FILE")?.toValue();
           const title = obje?.get("FILE.TITL")?.toValue() ?? obje?.get("TITL")?.toValue() ?? "";
+          const note = objeNoteValue(obje);
           const type = resolveObjeForm(obje) ?? (url ? getFileExtension(url) : void 0) ?? "raw";
-          let imgId = clone || mser;
+          let imgId = media;
           const hasEmbeddedOrLocalFile = !!url && (url.startsWith("data:") || url.startsWith("blob:") || !/^https?:\/\//i.test(url));
           if (!hasEmbeddedOrLocalFile && (!www || !tree || !this.id)) {
             return;
@@ -4033,6 +4054,7 @@ var Indi = class extends Common {
               imgId,
               person: this.id,
               title,
+              note,
               url,
               contentType: type,
               downloadName: `${this.id.replaceAll("@", "")}_${this.toNaturalName()?.replaceAll(" ", "-") || ""}_${(title || key.replaceAll("@", "").toString()).replaceAll(" ", "-")}`
@@ -4071,7 +4093,7 @@ var Indi = class extends Common {
         return;
       }
       const obje = o;
-      const key = `@O${index}@`;
+      const key = objeXrefKey(obje, index);
       obje.standardizeMedia();
       const isPrimary = obje?.get("_PRIM")?.toValue() === "Y";
       const url = obje?.get("FILE")?.toValue();
@@ -4090,6 +4112,7 @@ var Indi = class extends Common {
           imgId,
           person: this.id,
           title,
+          note: objeNoteValue(obje),
           url,
           contentType: type,
           downloadName: `${this.id.replaceAll("@", "")}_${this.toNaturalName()?.replaceAll(" ", "-") || ""}_${(title || key.replaceAll("@", "").toString()).replaceAll(" ", "-")}`
@@ -4198,7 +4221,7 @@ var Indi = class extends Common {
       if (!obje) {
         return;
       }
-      const key = `@O${index}@`;
+      const key = objeXrefKey(obje, index);
       const isPrimary = obje?.get("_PRIM")?.toValue() === "Y";
       const url = obje?.get("FILE")?.toValue();
       const title = obje?.get("TITL")?.toValue() ?? "";
@@ -4215,6 +4238,7 @@ var Indi = class extends Common {
           imgId,
           person: this.id,
           title,
+          note: objeNoteValue(obje),
           url,
           contentType: type,
           downloadName: `${this.id.replaceAll("@", "")}_${this.toNaturalName()?.replaceAll(" ", "-") || ""}_${(title || key.replaceAll("@", "").toString()).replaceAll(" ", "-")}`
@@ -4238,7 +4262,7 @@ var Indi = class extends Common {
       if (!obje) {
         return;
       }
-      const key = `@O${index}@`;
+      const key = objeXrefKey(obje, index);
       obje.standardizeMedia();
       const isPrimary = obje?.get("_PRIM")?.toValue() === "Y";
       const url = obje?.get("FILE")?.toValue();
@@ -4255,6 +4279,7 @@ var Indi = class extends Common {
           imgId,
           person: this.id,
           title,
+          note: objeNoteValue(obje),
           url,
           contentType: type,
           downloadName: `${this.id.replaceAll("@", "")}_${this.toNaturalName()?.replaceAll(" ", "-") || ""}_${(title || key.replaceAll("@", "").toString()).replaceAll(" ", "-")}`
@@ -4286,7 +4311,12 @@ var Indi = class extends Common {
     );
     if (cached !== void 0) {
       if (cached?.file && !isRemoteOrEmbeddedMediaUrl(cached.file)) {
-        const resolvedCached = await resolveLocalMediaUrl(cached.file);
+        const resolvedCached = await resolveLocalMediaUrl(cached.file, {
+          url: cached.file,
+          person: this.id,
+          tree: this.getTreeId?.(),
+          treeName: this.getTreeName?.()
+        });
         if (resolvedCached && isRemoteOrEmbeddedMediaUrl(resolvedCached)) {
           const refreshed = { ...cached, file: resolvedCached };
           profilePictureCache(
@@ -4311,7 +4341,16 @@ var Indi = class extends Common {
     }
     const mediaArray = Object.values(mediaList);
     const toDisplayableProfile = async (media, isPrimary) => {
-      const resolvedFile = await resolveLocalMediaUrl(media.url);
+      const resolvedFile = await resolveLocalMediaUrl(media.url, {
+        url: media.url,
+        id: media.id,
+        imgId: media.imgId,
+        key: media.key,
+        contentType: media.contentType,
+        person: media.person || this.id,
+        tree: media.tree || this.getTreeId?.(),
+        treeName: this.getTreeName?.()
+      });
       if (!resolvedFile || !isRemoteOrEmbeddedMediaUrl(resolvedFile)) {
         return void 0;
       }
@@ -6280,7 +6319,7 @@ var KinshipTranslatorHU = class extends KinshipTranslatorBasic {
     }
     return `${hungarianOrdinalize(
       degree
-    )}unokatestv\xE9r ${level}x elt\xE1vol\xEDtva`;
+    )}unokatestv\xE9r ${Math.abs(level)}x elt\xE1vol\xEDtva`;
   }
   auncle() {
     const level = this.pathN?.level ?? 0;
@@ -6324,14 +6363,25 @@ var KinshipTranslatorHU = class extends KinshipTranslatorBasic {
     return `${ordinalized ? `${ordinalized}unoka` : ""}testv\xE9r ${origPrefix.replace(/nagy$/, "")}unok\xE1ja`;
   }
   parent() {
+    const level = Math.abs(this.pathN?.level ?? 0);
+    if (level <= 1) {
+      if (this.personN?.isMale()) {
+        return "apa";
+      }
+      if (this.personN?.isFemale()) {
+        return "anya";
+      }
+      return "sz\xFCl\u0151";
+    }
     const prefix = this.directPrefix();
+    const gen = prefix === "nagy" ? "" : prefix;
     if (this.personN?.isMale()) {
-      return `${prefix}apa`;
+      return `${gen}nagyapa`;
     }
     if (this.personN?.isFemale()) {
-      return `${prefix}anya`;
+      return `${gen}nagyanya`;
     }
-    return `${prefix}sz\xFCl\u0151`;
+    return `${gen}nagysz\xFCl\u0151`;
   }
   child() {
     const level = Math.abs(this.pathN?.level ?? 0);
@@ -6525,27 +6575,30 @@ var KinshipTranslatorEn = class extends KinshipTranslatorBasic {
     if (!degree) {
       return level < 0 ? this.nibling() : this.auncle();
     }
-    return `${ordinalize(degree)} cousin ${level}x removed`;
+    return `${ordinalize(degree)} cousin ${Math.abs(level)}x removed`;
   }
   auncle() {
-    const prefix = this.directPrefix();
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const greats = level <= 1 ? "" : "great-".repeat(level - 1);
     if (this.personN?.isMale()) {
-      return `${prefix}uncle`;
+      return `${greats}uncle`;
     }
     if (this.personN?.isFemale()) {
-      return `${prefix}aunt`;
+      return `${greats}aunt`;
     }
-    return `${prefix}auncle`;
+    return greats ? `${greats}uncle/${greats}aunt` : "uncle/aunt";
   }
   nibling() {
-    const prefix = this.directPrefix();
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const greats = level <= 2 ? "" : "great-".repeat(level - 2);
+    const grand = level <= 1 ? "" : "grand";
     if (this.personN?.isMale()) {
-      return `${prefix}nephew`;
+      return `${greats}${grand}nephew`;
     }
     if (this.personN?.isFemale()) {
-      return `${prefix}niece`;
+      return `${greats}${grand}niece`;
     }
-    return `${prefix}nibling`;
+    return greats || grand ? `${greats}${grand}nephew/${greats}${grand}niece` : "nephew/niece";
   }
   parent() {
     const prefix = this.directPrefix();
@@ -6673,45 +6726,64 @@ var KinshipTranslatorEn = class extends KinshipTranslatorBasic {
 };
 
 // src/kinship-translator/patterns.de.ts
+var parentRelationsDe = {
+  step: "Stief",
+  foster: "Pflege",
+  adopted: "Adoptiv"
+};
 var InLawsDe = {
-  "Ehepartner von (kind|tochter|sohn)": "Schwiegerkind",
-  "Ehefrau von (kind|tochter|sohn)": "Schwiegertochter",
-  "Ehemann von (kind|tochter|sohn)": "Schwiegersohn",
-  "mutter des (Ehepartner|Ehefrau|Ehemann)s": "Schwiegermutter",
-  "vater des (Ehepartner|Ehefrau|Ehemann)s": "Schwiegervater",
-  "elternteil des (Ehepartner|Ehefrau|Ehemann)s": "Schwiegerelternteil",
-  "Ehefrau von (Halb)?(geschwister|schwester|bruder)": "Schw\xE4gerin",
-  "Ehemann von (Halb)?(geschwister|schwester|bruder)": "Schwager",
-  "Ehepartner von (Halb)?(geschwister|schwester|bruder)": "Schwager/Schw\xE4gerin",
-  "(Halb)?schwester des (Ehepartner|Ehefrau|Ehemann)s": "Schw\xE4gerin",
-  "(Halb)?bruder des (Ehepartner|Ehefrau|Ehemann)s": "Schwager",
-  "(Halb)?geschwister des (Ehepartner|Ehefrau|Ehemann)s": "Schwager/Schw\xE4gerin"
+  "Ehepartner von (Kind|Tochter|Sohn)": "Schwiegerkind",
+  "Ehefrau von (Kind|Tochter|Sohn)": "Schwiegertochter",
+  "Ehemann von (Kind|Tochter|Sohn)": "Schwiegersohn",
+  "Mutter (des Ehepartners|des Ehemanns|der Ehefrau)": "Schwiegermutter",
+  "Vater (des Ehepartners|des Ehemanns|der Ehefrau)": "Schwiegervater",
+  "Elternteil (des Ehepartners|des Ehemanns|der Ehefrau)": "Schwiegerelternteil",
+  "Ehefrau von (Halb)?-?(Geschwister|Schwester|Bruder)": "Schw\xE4gerin",
+  "Ehemann von (Halb)?-?(Geschwister|Schwester|Bruder)": "Schwager",
+  "Ehepartner von (Halb)?-?(Geschwister|Schwester|Bruder)": "Schwager/Schw\xE4gerin",
+  "(Halb)?-?(Schwester|schwester) (des Ehepartners|des Ehemanns|der Ehefrau)": "Schw\xE4gerin",
+  "(Halb)?-?(Bruder|bruder) (des Ehepartners|des Ehemanns|der Ehefrau)": "Schwager",
+  "(Halb)?-?(Geschwister|geschwister) (des Ehepartners|des Ehemanns|der Ehefrau)": "Schwager/Schw\xE4gerin"
 };
 
 // src/kinship-translator/kinship-translator.de.ts
-var KinshipTranslatorDe = class extends KinshipTranslatorBasic {
-  directPrefix() {
-    const level = Math.abs(this.pathN?.level ?? 0);
-    if (level <= 1) {
-      return "";
-    }
-    if (level === 2) {
-      return "Gro\xDF";
-    }
-    if (level === 3) {
-      return "Urgro\xDF";
-    }
-    return `Ur${level - 2}-gro\xDF`;
+var sexOf = (person) => {
+  if (person?.isMale?.()) {
+    return "m";
+  }
+  if (person?.isFemale?.()) {
+    return "f";
+  }
+  return "n";
+};
+var pick = (sex, male, female, neutral) => {
+  if (sex === "m") {
+    return male;
+  }
+  if (sex === "f") {
+    return female;
+  }
+  return neutral;
+};
+var ur = (count) => count > 0 ? "Ur".repeat(count) : "";
+var genitiveArticle = (spouseType) => {
+  if (spouseType === "Ehefrau") {
+    return `der ${spouseType}`;
   }
+  return `des ${spouseType}s`;
+};
+var KinshipTranslatorDe = class extends KinshipTranslatorBasic {
   indirect() {
     let degree = Math.abs(this.pathN?.degree ?? 0);
     if (degree > 0) {
       degree = degree - 1;
     }
-    if (degree === 1) {
-      return `Cousin`;
+    const sex = sexOf(this.personN);
+    const cousin = pick(sex, "Cousin", "Cousine", "Cousin/Cousine");
+    if (degree <= 1) {
+      return cousin;
     }
-    return `Cousin ${degree}. Grades`;
+    return `${cousin} ${degree}. Grades`;
   }
   removal() {
     const level = this.pathN?.level ?? 0;
@@ -6722,101 +6794,101 @@ var KinshipTranslatorDe = class extends KinshipTranslatorBasic {
     if (!degree) {
       return level < 0 ? this.nibling() : this.auncle();
     }
-    return `Cousin ${degree}. Grades ${Math.abs(level)}\xD7 entfernt`;
+    return `${this.indirect()} ${Math.abs(level)}\xD7 entfernt`;
   }
   auncle() {
-    const prefix = this.directPrefix();
-    if (this.personN?.isMale()) {
-      return `${prefix}onkel`;
-    }
-    if (this.personN?.isFemale()) {
-      return `${prefix}tante`;
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const sex = sexOf(this.personN);
+    if (level <= 1) {
+      return pick(sex, "Onkel", "Tante", "Onkel/Tante");
     }
-    return `${prefix}onkel/tante`;
+    const prefix = `${ur(level - 2)}Gro\xDF`;
+    return pick(
+      sex,
+      `${prefix}onkel`,
+      `${prefix}tante`,
+      `${prefix}onkel/tante`
+    );
   }
   nibling() {
-    const prefix = this.directPrefix();
-    if (this.personN?.isMale()) {
-      return `${prefix}neffe`;
-    }
-    if (this.personN?.isFemale()) {
-      return `${prefix}nichte`;
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const sex = sexOf(this.personN);
+    if (level <= 1) {
+      return pick(sex, "Neffe", "Nichte", "Neffe/Nichte");
     }
-    return `${prefix}neffe/nichte`;
+    const prefix = `${ur(level - 2)}Gro\xDF`;
+    return pick(
+      sex,
+      `${prefix}neffe`,
+      `${prefix}nichte`,
+      `${prefix}neffe/nichte`
+    );
   }
   parent() {
-    const prefix = this.directPrefix();
-    if (this.personN?.isMale()) {
-      return `${prefix}vater`;
-    }
-    if (this.personN?.isFemale()) {
-      return `${prefix}mutter`;
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const sex = sexOf(this.personN);
+    if (level <= 1) {
+      return pick(sex, "Vater", "Mutter", "Elternteil");
     }
-    return `${prefix}elternteil`;
+    const prefix = `${ur(level - 2)}Gro\xDF`;
+    return pick(
+      sex,
+      `${prefix}vater`,
+      `${prefix}mutter`,
+      `${prefix}elternteil`
+    );
   }
   child() {
-    const prefix = this.directPrefix();
-    if (this.personN?.isMale()) {
-      return `${prefix}sohn`;
-    }
-    if (this.personN?.isFemale()) {
-      return `${prefix}tochter`;
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const sex = sexOf(this.personN);
+    if (level <= 1) {
+      return pick(sex, "Sohn", "Tochter", "Kind");
     }
-    return `${prefix}kind`;
+    const prefix = ur(level - 2);
+    return pick(
+      sex,
+      `${prefix}Enkel`,
+      `${prefix}Enkelin`,
+      `${prefix}Enkelkind`
+    );
   }
   sibling() {
-    if (this.personN?.isMale()) {
-      return "bruder";
-    }
-    if (this.personN?.isFemale()) {
-      return "schwester";
-    }
-    return "geschwister";
+    return pick(sexOf(this.personN), "Bruder", "Schwester", "Geschwister");
   }
   halfBlood(relation) {
     if (!relation || !this.isHalfBlood) {
       return relation ?? "";
     }
-    if (/^[A-ZÄÖÜ]/.test(relation) || /[-\s]/.test(relation)) {
+    if (/[\s-]/.test(relation) || /^(Groß|Ur)/.test(relation)) {
       return `Halb-${relation}`;
     }
-    return `Halb${relation}`;
+    return `Halb${relation.charAt(0).toLowerCase()}${relation.slice(1)}`;
   }
   spouse() {
-    if (this.personN?.isMale()) {
-      return "Ehemann";
-    }
-    if (this.personN?.isFemale()) {
-      return "Ehefrau";
-    }
-    return "Ehepartner";
+    return pick(sexOf(this.personN), "Ehemann", "Ehefrau", "Ehepartner");
   }
   ofSpouse(relation) {
     if (!relation) {
       return "";
     }
-    const spouse = this.path?.[1].indi;
-    let spouseType = "Ehepartner";
-    if (spouse?.isMale()) {
-      spouseType = "Ehemann";
-    }
-    if (spouse?.isFemale()) {
-      spouseType = "Ehefrau";
-    }
-    return `${relation} des ${spouseType}s`;
+    const spouseType = pick(
+      sexOf(this.path?.[1].indi),
+      "Ehemann",
+      "Ehefrau",
+      "Ehepartner"
+    );
+    return `${relation} ${genitiveArticle(spouseType)}`;
   }
   spouseOf(relation) {
     if (!relation) {
       return "";
     }
-    const spouse = this.path?.[this.path.length - 1].indi;
-    let spouseType = "Ehepartner";
-    if (spouse?.isMale()) {
-      spouseType = "Ehemann";
-    }
-    if (spouse?.isFemale()) {
-      spouseType = "Ehefrau";
-    }
+    const spouseType = pick(
+      sexOf(this.path?.[this.path.length - 1].indi),
+      "Ehemann",
+      "Ehefrau",
+      "Ehepartner"
+    );
     return `${spouseType} von ${relation}`;
   }
   of(relation) {
@@ -6834,8 +6906,8 @@ var KinshipTranslatorDe = class extends KinshipTranslatorBasic {
     if (!name || !relation) {
       return relation ?? "";
     }
-    if (relation.includes(" des ") || relation.includes(" von ")) {
-      return relation.replace(/ (des|von) /, ` $1 ${name}s `);
+    if (relation.includes(" des ") || relation.includes(" der ") || relation.includes(" von ")) {
+      return relation.replace(/ (des|der|von) /, ` $1 ${name}s `);
     }
     return `${name}s ${relation}`;
   }
@@ -6865,110 +6937,143 @@ var KinshipTranslatorDe = class extends KinshipTranslatorBasic {
     if (!relation || !this.pathN?.relation) {
       return relation ?? "";
     }
-    return `${this.pathN.relation} ${relation}`;
+    const prefix = parentRelationsDe[this.pathN.relation];
+    if (!prefix) {
+      return relation;
+    }
+    if (prefix.endsWith("-") || prefix.endsWith(" ")) {
+      return `${prefix}${relation}`;
+    }
+    return `${prefix}${relation.charAt(0).toLowerCase()}${relation.slice(1)}`;
   }
 };
 
 // src/kinship-translator/patterns.fr.ts
+var parentRelationsFr = {
+  step: "step",
+  foster: "foster",
+  adopted: "adopted"
+};
 var InLawsFr = {
   "conjoint de (enfant|fille|fils)": "beau-fils/belle-fille",
   "\xE9pouse de (enfant|fille|fils)": "belle-fille",
   "mari de (enfant|fille|fils)": "gendre",
-  "m\xE8re du (conjoint|\xE9pouse|mari)": "belle-m\xE8re",
-  "p\xE8re du (conjoint|\xE9pouse|mari)": "beau-p\xE8re",
-  "parent du (conjoint|\xE9pouse|mari)": "beau-parent",
+  "m\xE8re (du mari|du conjoint|de l'\xE9pouse)": "belle-m\xE8re",
+  "p\xE8re (du mari|du conjoint|de l'\xE9pouse)": "beau-p\xE8re",
+  "parent (du mari|du conjoint|de l'\xE9pouse)": "beau-parent",
   "\xE9pouse de (demi-)?(fr\xE8re/s\u0153ur|s\u0153ur|fr\xE8re)": "belle-s\u0153ur",
   "mari de (demi-)?(fr\xE8re/s\u0153ur|s\u0153ur|fr\xE8re)": "beau-fr\xE8re",
   "conjoint de (demi-)?(fr\xE8re/s\u0153ur|s\u0153ur|fr\xE8re)": "beau-fr\xE8re/belle-s\u0153ur",
-  "(demi-)?s\u0153ur du (conjoint|\xE9pouse|mari)": "belle-s\u0153ur",
-  "(demi-)?fr\xE8re du (conjoint|\xE9pouse|mari)": "beau-fr\xE8re",
-  "(demi-)?fr\xE8re/s\u0153ur du (conjoint|\xE9pouse|mari)": "beau-fr\xE8re/belle-s\u0153ur"
+  "(demi-)?s\u0153ur (du mari|du conjoint|de l'\xE9pouse)": "belle-s\u0153ur",
+  "(demi-)?fr\xE8re (du mari|du conjoint|de l'\xE9pouse)": "beau-fr\xE8re",
+  "(demi-)?fr\xE8re/s\u0153ur (du mari|du conjoint|de l'\xE9pouse)": "beau-fr\xE8re/belle-s\u0153ur"
 };
 
 // src/kinship-translator/kinship-translator.fr.ts
-var KinshipTranslatorFr = class extends KinshipTranslatorBasic {
-  directPrefix() {
-    const level = Math.abs(this.pathN?.level ?? 0);
-    if (level <= 1) {
-      return "";
-    }
-    if (level === 2) {
-      return "grand-";
-    }
-    if (level === 3) {
-      return "arri\xE8re-grand-";
-    }
-    return `arri\xE8re${level - 2}-grand-`;
+var sexOf2 = (person) => {
+  if (person?.isMale?.()) {
+    return "m";
   }
-  indirect() {
-    let degree = Math.abs(this.pathN?.degree ?? 0);
-    if (degree > 0) {
-      degree = degree - 1;
-    }
-    if (degree === 1) {
-      return `cousin`;
-    }
-    return `cousin au ${ordinalize(degree)} degr\xE9`;
+  if (person?.isFemale?.()) {
+    return "f";
   }
-  removal() {
-    const level = this.pathN?.level ?? 0;
-    let degree = Math.abs(this.pathN?.degree ?? 0);
-    if (degree > 0) {
-      degree = degree - 1;
+  return "n";
+};
+var pick2 = (sex, male, female, neutral) => {
+  if (sex === "m") {
+    return male;
+  }
+  if (sex === "f") {
+    return female;
+  }
+  return neutral;
+};
+var arriere = (count) => count > 0 ? "arri\xE8re-".repeat(count) : "";
+var frenchOrdinal = (n) => n === 1 ? "1er" : `${n}e`;
+var isFeminineRelation = (relation) => /mère|fille|sœur|tante|nièce|cousine|épouse/.test(relation);
+var ofSpousePrep = (spouseType) => {
+  if (spouseType === "\xE9pouse") {
+    return "de l'";
+  }
+  return "du ";
+};
+var KinshipTranslatorFr = class extends KinshipTranslatorBasic {
+  indirect() {
+    let degree = Math.abs(this.pathN?.degree ?? 0);
+    if (degree > 0) {
+      degree = degree - 1;
+    }
+    const cousin = pick2(
+      sexOf2(this.personN),
+      "cousin",
+      "cousine",
+      "cousin/cousine"
+    );
+    if (degree <= 1) {
+      return cousin;
+    }
+    return `${cousin} au ${frenchOrdinal(degree)} degr\xE9`;
+  }
+  removal() {
+    const level = this.pathN?.level ?? 0;
+    let degree = Math.abs(this.pathN?.degree ?? 0);
+    if (degree > 0) {
+      degree = degree - 1;
     }
     if (!degree) {
       return level < 0 ? this.nibling() : this.auncle();
     }
-    return `cousin au ${ordinalize(degree)} degr\xE9 ${Math.abs(level)}\xD7 \xE9loign\xE9`;
+    return `${this.indirect()} ${Math.abs(level)}\xD7 \xE9loign\xE9`;
   }
   auncle() {
-    const prefix = this.directPrefix();
-    if (this.personN?.isMale()) {
-      return `${prefix}oncle`;
-    }
-    if (this.personN?.isFemale()) {
-      return `${prefix}tante`;
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const sex = sexOf2(this.personN);
+    const base = pick2(sex, "oncle", "tante", "oncle/tante");
+    if (level <= 1) {
+      return base;
     }
-    return `${prefix}oncle/tante`;
+    const grands = pick2(
+      sex,
+      "grand-oncle",
+      "grand-tante",
+      "grand-oncle/tante"
+    );
+    return `${arriere(level - 2)}${grands}`;
   }
   nibling() {
-    const prefix = this.directPrefix();
-    if (this.personN?.isMale()) {
-      return `${prefix}neveu`;
-    }
-    if (this.personN?.isFemale()) {
-      return `${prefix}ni\xE8ce`;
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const sex = sexOf2(this.personN);
+    if (level <= 1) {
+      return pick2(sex, "neveu", "ni\xE8ce", "neveu/ni\xE8ce");
     }
-    return `${prefix}neveu/ni\xE8ce`;
+    const grands = pick2(
+      sex,
+      "grand-neveu",
+      "grande-ni\xE8ce",
+      "grand-neveu/grande-ni\xE8ce"
+    );
+    return `${arriere(level - 2)}${grands}`;
   }
   parent() {
-    const prefix = this.directPrefix();
-    if (this.personN?.isMale()) {
-      return `${prefix}p\xE8re`;
-    }
-    if (this.personN?.isFemale()) {
-      return `${prefix}m\xE8re`;
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const sex = sexOf2(this.personN);
+    if (level <= 1) {
+      return pick2(sex, "p\xE8re", "m\xE8re", "parent");
     }
-    return `${prefix}parent`;
+    const grands = pick2(sex, "grand-p\xE8re", "grand-m\xE8re", "grand-parent");
+    return `${arriere(level - 2)}${grands}`;
   }
   child() {
-    const prefix = this.directPrefix();
-    if (this.personN?.isMale()) {
-      return `${prefix}fils`;
-    }
-    if (this.personN?.isFemale()) {
-      return `${prefix}fille`;
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const sex = sexOf2(this.personN);
+    if (level <= 1) {
+      return pick2(sex, "fils", "fille", "enfant");
     }
-    return `${prefix}enfant`;
+    const petits = pick2(sex, "petit-fils", "petite-fille", "petit-enfant");
+    return `${arriere(level - 2)}${petits}`;
   }
   sibling() {
-    if (this.personN?.isMale()) {
-      return "fr\xE8re";
-    }
-    if (this.personN?.isFemale()) {
-      return "s\u0153ur";
-    }
-    return "fr\xE8re/s\u0153ur";
+    return pick2(sexOf2(this.personN), "fr\xE8re", "s\u0153ur", "fr\xE8re/s\u0153ur");
   }
   halfBlood(relation) {
     if (!relation || !this.isHalfBlood) {
@@ -6977,40 +7082,30 @@ var KinshipTranslatorFr = class extends KinshipTranslatorBasic {
     return `demi-${relation}`;
   }
   spouse() {
-    if (this.personN?.isMale()) {
-      return "mari";
-    }
-    if (this.personN?.isFemale()) {
-      return "\xE9pouse";
-    }
-    return "conjoint";
+    return pick2(sexOf2(this.personN), "mari", "\xE9pouse", "conjoint");
   }
   ofSpouse(relation) {
     if (!relation) {
       return "";
     }
-    const spouse = this.path?.[1].indi;
-    let spouseType = "conjoint";
-    if (spouse?.isMale()) {
-      spouseType = "mari";
-    }
-    if (spouse?.isFemale()) {
-      spouseType = "\xE9pouse";
-    }
-    return `${relation} du ${spouseType}`;
+    const spouseType = pick2(
+      sexOf2(this.path?.[1].indi),
+      "mari",
+      "\xE9pouse",
+      "conjoint"
+    );
+    return `${relation} ${ofSpousePrep(spouseType)}${spouseType}`;
   }
   spouseOf(relation) {
     if (!relation) {
       return "";
     }
-    const spouse = this.path?.[this.path.length - 1].indi;
-    let spouseType = "conjoint";
-    if (spouse?.isMale()) {
-      spouseType = "mari";
-    }
-    if (spouse?.isFemale()) {
-      spouseType = "\xE9pouse";
-    }
+    const spouseType = pick2(
+      sexOf2(this.path?.[this.path.length - 1].indi),
+      "mari",
+      "\xE9pouse",
+      "conjoint"
+    );
     return `${spouseType} de ${relation}`;
   }
   of(relation) {
@@ -7031,6 +7126,9 @@ var KinshipTranslatorFr = class extends KinshipTranslatorBasic {
     if (relation.includes(" du ") || relation.includes(" de ")) {
       return relation.replace(/ (du|de) /, ` $1 ${name} `);
     }
+    if (relation.includes(" de l'")) {
+      return relation.replace(" de l'", ` de ${name} l'`);
+    }
     return `${relation} de ${name}`;
   }
   inLaw(relation) {
@@ -7059,50 +7157,118 @@ var KinshipTranslatorFr = class extends KinshipTranslatorBasic {
     if (!relation || !this.pathN?.relation) {
       return relation ?? "";
     }
-    return `${this.pathN.relation} ${relation}`;
+    const kind = parentRelationsFr[this.pathN.relation];
+    if (!kind) {
+      return relation;
+    }
+    if (kind === "step") {
+      return `${isFeminineRelation(relation) ? "belle-" : "beau-"}${relation}`;
+    }
+    if (kind === "adopted") {
+      return `${relation} ${isFeminineRelation(relation) ? "adoptive" : "adoptif"}`;
+    }
+    if (kind === "foster") {
+      return `${relation} d'accueil`;
+    }
+    return relation;
   }
 };
 
 // src/kinship-translator/patterns.es.ts
+var parentRelationsEs = {
+  step: {
+    padre: "padrastro",
+    madre: "madrastra",
+    hijo: "hijastro",
+    hija: "hijastra",
+    hermano: "hermanastro",
+    hermana: "hermanastra",
+    abuelo: "abuelastro",
+    abuela: "abuelastra"
+  }
+};
 var InLawsEs = {
   "c\xF3nyuge de (hijo/hija|hija|hijo)": "yerno/nuera",
   "esposa de (hijo/hija|hija|hijo)": "nuera",
   "esposo de (hijo/hija|hija|hijo)": "yerno",
-  "madre del (c\xF3nyuge|esposa|esposo)": "suegra",
-  "padre del (c\xF3nyuge|esposa|esposo)": "suegro",
-  "padre/madre del (c\xF3nyuge|esposa|esposo)": "suegro/suegra",
+  "madre (del c\xF3nyuge|del esposo|de la esposa)": "suegra",
+  "padre (del c\xF3nyuge|del esposo|de la esposa)": "suegro",
+  "padre/madre (del c\xF3nyuge|del esposo|de la esposa)": "suegro/suegra",
   "esposa de (medio |media |medio/a )?(hermano/hermana|hermana|hermano)": "cu\xF1ada",
   "esposo de (medio |media |medio/a )?(hermano/hermana|hermana|hermano)": "cu\xF1ado",
   "c\xF3nyuge de (medio |media |medio/a )?(hermano/hermana|hermana|hermano)": "cu\xF1ado/cu\xF1ada",
-  "(medio |media |medio/a )?hermana del (c\xF3nyuge|esposa|esposo)": "cu\xF1ada",
-  "(medio |media |medio/a )?hermano del (c\xF3nyuge|esposa|esposo)": "cu\xF1ado",
-  "(medio |media |medio/a )?hermano/hermana del (c\xF3nyuge|esposa|esposo)": "cu\xF1ado/cu\xF1ada"
+  "(medio |media |medio/a )?hermana (del c\xF3nyuge|del esposo|de la esposa)": "cu\xF1ada",
+  "(medio |media |medio/a )?hermano (del c\xF3nyuge|del esposo|de la esposa)": "cu\xF1ado",
+  "(medio |media |medio/a )?hermano/hermana (del c\xF3nyuge|del esposo|de la esposa)": "cu\xF1ado/cu\xF1ada"
 };
 
 // src/kinship-translator/kinship-translator.es.ts
-var KinshipTranslatorEs = class extends KinshipTranslatorBasic {
-  directPrefix() {
-    const level = Math.abs(this.pathN?.level ?? 0);
-    if (level <= 1) {
-      return "";
-    }
-    if (level === 2) {
-      return "bisabuel";
-    }
-    if (level === 3) {
-      return "tatarabuel";
-    }
-    return `t\xE1tara${level - 2}-abuel`;
+var sexOf3 = (person) => {
+  if (person?.isMale?.()) {
+    return "m";
+  }
+  if (person?.isFemale?.()) {
+    return "f";
+  }
+  return "n";
+};
+var pick3 = (sex, male, female, neutral) => {
+  if (sex === "m") {
+    return male;
+  }
+  if (sex === "f") {
+    return female;
   }
+  return neutral;
+};
+var SPANISH_ORDINALS_M = [
+  "",
+  "",
+  "segundo",
+  "tercero",
+  "cuarto",
+  "quinto",
+  "sexto",
+  "s\xE9ptimo",
+  "octavo",
+  "noveno",
+  "d\xE9cimo"
+];
+var SPANISH_ORDINALS_F = [
+  "",
+  "",
+  "segunda",
+  "tercera",
+  "cuarta",
+  "quinta",
+  "sexta",
+  "s\xE9ptima",
+  "octava",
+  "novena",
+  "d\xE9cima"
+];
+var spanishOrdinal = (n, sex) => {
+  const list = sex === "f" ? SPANISH_ORDINALS_F : SPANISH_ORDINALS_M;
+  return list[n] ?? `${n}.\xBA`;
+};
+var ofSpousePrep2 = (spouseType) => {
+  if (spouseType === "esposa") {
+    return "de la ";
+  }
+  return "del ";
+};
+var KinshipTranslatorEs = class extends KinshipTranslatorBasic {
   indirect() {
     let degree = Math.abs(this.pathN?.degree ?? 0);
     if (degree > 0) {
       degree = degree - 1;
     }
-    if (degree === 1) {
-      return `primo`;
+    const sex = sexOf3(this.personN);
+    const cousin = pick3(sex, "primo", "prima", "primo/prima");
+    if (degree <= 1) {
+      return cousin;
     }
-    return `primo ${ordinalize(degree)}`;
+    return `${cousin} ${spanishOrdinal(degree, sex)}`;
   }
   removal() {
     const level = this.pathN?.level ?? 0;
@@ -7113,56 +7279,133 @@ var KinshipTranslatorEs = class extends KinshipTranslatorBasic {
     if (!degree) {
       return level < 0 ? this.nibling() : this.auncle();
     }
-    return `primo ${ordinalize(degree)} ${Math.abs(level)}\xD7 separado`;
+    return `${this.indirect()} ${Math.abs(level)}\xD7 separado`;
   }
   auncle() {
-    const prefix = this.directPrefix();
-    if (this.personN?.isMale()) {
-      return `${prefix}t\xEDo`;
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const sex = sexOf3(this.personN);
+    if (level <= 1) {
+      return pick3(sex, "t\xEDo", "t\xEDa", "t\xEDo/t\xEDa");
     }
-    if (this.personN?.isFemale()) {
-      return `${prefix}t\xEDa`;
+    if (level === 2) {
+      return pick3(sex, "t\xEDo abuelo", "t\xEDa abuela", "t\xEDo/t\xEDa abuelo");
     }
-    return `${prefix}t\xEDo/t\xEDa`;
+    if (level === 3) {
+      return pick3(
+        sex,
+        "t\xEDo bisabuelo",
+        "t\xEDa bisabuela",
+        "t\xEDo/t\xEDa bisabuelo"
+      );
+    }
+    return pick3(
+      sex,
+      `t\xEDo abuelo (${level - 1}.\xBA)`,
+      `t\xEDa abuela (${level - 1}.\xAA)`,
+      `t\xEDo/t\xEDa abuelo (${level - 1}.\xBA)`
+    );
   }
   nibling() {
-    const prefix = this.directPrefix();
-    if (this.personN?.isMale()) {
-      return `${prefix}sobrino`;
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const sex = sexOf3(this.personN);
+    if (level <= 1) {
+      return pick3(sex, "sobrino", "sobrina", "sobrino/sobrina");
     }
-    if (this.personN?.isFemale()) {
-      return `${prefix}sobrina`;
+    if (level === 2) {
+      return pick3(
+        sex,
+        "sobrino nieto",
+        "sobrina nieta",
+        "sobrino/sobrina nieto"
+      );
     }
-    return `${prefix}sobrino/sobrina`;
+    if (level === 3) {
+      return pick3(
+        sex,
+        "sobrino bisnieto",
+        "sobrina bisnieta",
+        "sobrino/sobrina bisnieto"
+      );
+    }
+    return pick3(
+      sex,
+      `sobrino nieto (${level - 1}.\xBA)`,
+      `sobrina nieta (${level - 1}.\xAA)`,
+      `sobrino/sobrina nieto (${level - 1}.\xBA)`
+    );
   }
   parent() {
-    const prefix = this.directPrefix();
-    if (this.personN?.isMale()) {
-      return `${prefix}padre`;
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const sex = sexOf3(this.personN);
+    if (level <= 1) {
+      return pick3(sex, "padre", "madre", "padre/madre");
     }
-    if (this.personN?.isFemale()) {
-      return `${prefix}madre`;
+    if (level === 2) {
+      return pick3(sex, "abuelo", "abuela", "abuelo/abuela");
     }
-    return `${prefix}padre/madre`;
+    if (level === 3) {
+      return pick3(sex, "bisabuelo", "bisabuela", "bisabuelo/bisabuela");
+    }
+    if (level === 4) {
+      return pick3(
+        sex,
+        "tatarabuelo",
+        "tatarabuela",
+        "tatarabuelo/tatarabuela"
+      );
+    }
+    if (level === 5) {
+      return pick3(
+        sex,
+        "trastatarabuelo",
+        "trastatarabuela",
+        "trastatarabuelo/trastatarabuela"
+      );
+    }
+    return pick3(
+      sex,
+      `abuelo (${level}.\xBA)`,
+      `abuela (${level}.\xAA)`,
+      `abuelo/abuela (${level}.\xBA)`
+    );
   }
   child() {
-    const prefix = this.directPrefix();
-    if (this.personN?.isMale()) {
-      return `${prefix}hijo`;
+    const level = Math.abs(this.pathN?.level ?? 0);
+    const sex = sexOf3(this.personN);
+    if (level <= 1) {
+      return pick3(sex, "hijo", "hija", "hijo/hija");
     }
-    if (this.personN?.isFemale()) {
-      return `${prefix}hija`;
+    if (level === 2) {
+      return pick3(sex, "nieto", "nieta", "nieto/nieta");
     }
-    return `${prefix}hijo/hija`;
-  }
-  sibling() {
-    if (this.personN?.isMale()) {
-      return "hermano";
+    if (level === 3) {
+      return pick3(sex, "bisnieto", "bisnieta", "bisnieto/bisnieta");
     }
-    if (this.personN?.isFemale()) {
-      return "hermana";
+    if (level === 4) {
+      return pick3(
+        sex,
+        "tataranieto",
+        "tataranieta",
+        "tataranieto/tataranieta"
+      );
+    }
+    if (level === 5) {
+      return pick3(
+        sex,
+        "trastataranieto",
+        "trastataranieta",
+        "trastataranieto/trastataranieta"
+      );
     }
-    return "hermano/hermana";
+    return pick3(
+      sex,
+      `nieto (${level}.\xBA)`,
+      `nieta (${level}.\xAA)`,
+      `nieto/nieta (${level}.\xBA)`
+    );
+  }
+  sibling() {
+    return pick3(sexOf3(this.personN), "hermano", "hermana", "hermano/hermana");
   }
   halfBlood(relation) {
     if (!relation || !this.isHalfBlood) {
@@ -7177,40 +7420,30 @@ var KinshipTranslatorEs = class extends KinshipTranslatorBasic {
     return `medio/a ${relation}`;
   }
   spouse() {
-    if (this.personN?.isMale()) {
-      return "esposo";
-    }
-    if (this.personN?.isFemale()) {
-      return "esposa";
-    }
-    return "c\xF3nyuge";
+    return pick3(sexOf3(this.personN), "esposo", "esposa", "c\xF3nyuge");
   }
   ofSpouse(relation) {
     if (!relation) {
       return "";
     }
-    const spouse = this.path?.[1].indi;
-    let spouseType = "c\xF3nyuge";
-    if (spouse?.isMale()) {
-      spouseType = "esposo";
-    }
-    if (spouse?.isFemale()) {
-      spouseType = "esposa";
-    }
-    return `${relation} del ${spouseType}`;
+    const spouseType = pick3(
+      sexOf3(this.path?.[1].indi),
+      "esposo",
+      "esposa",
+      "c\xF3nyuge"
+    );
+    return `${relation} ${ofSpousePrep2(spouseType)}${spouseType}`;
   }
   spouseOf(relation) {
     if (!relation) {
       return "";
     }
-    const spouse = this.path?.[this.path.length - 1].indi;
-    let spouseType = "c\xF3nyuge";
-    if (spouse?.isMale()) {
-      spouseType = "esposo";
-    }
-    if (spouse?.isFemale()) {
-      spouseType = "esposa";
-    }
+    const spouseType = pick3(
+      sexOf3(this.path?.[this.path.length - 1].indi),
+      "esposo",
+      "esposa",
+      "c\xF3nyuge"
+    );
     return `${spouseType} de ${relation}`;
   }
   of(relation) {
@@ -7228,8 +7461,8 @@ var KinshipTranslatorEs = class extends KinshipTranslatorBasic {
     if (!name || !relation) {
       return relation ?? "";
     }
-    if (relation.includes(" del ") || relation.includes(" de ")) {
-      return relation.replace(/ (del|de) /, ` $1 ${name} `);
+    if (relation.includes(" del ") || relation.includes(" de la ") || relation.includes(" de ")) {
+      return relation.replace(/ (del|de la|de) /, ` $1 ${name} `);
     }
     return `${relation} de ${name}`;
   }
@@ -7259,7 +7492,20 @@ var KinshipTranslatorEs = class extends KinshipTranslatorBasic {
     if (!relation || !this.pathN?.relation) {
       return relation ?? "";
     }
-    return `${this.pathN.relation} ${relation}`;
+    const mapped = parentRelationsEs[this.pathN.relation]?.[relation];
+    if (mapped) {
+      return mapped;
+    }
+    if (this.pathN.relation === "step") {
+      return `${relation} pol\xEDtico`;
+    }
+    if (this.pathN.relation === "adopted") {
+      return `${relation} adoptivo`;
+    }
+    if (this.pathN.relation === "foster") {
+      return `${relation} de acogida`;
+    }
+    return relation;
   }
 };
 
@@ -7268,15 +7514,35 @@ var InLawsRu = {
   "\u0441\u0443\u043F\u0440\u0443\u0433(?:\u0430)? (\u0440\u0435\u0431\u0451\u043D\u043A\u0430|\u0434\u043E\u0447\u0435\u0440\u0438|\u0441\u044B\u043D\u0430)": "\u0437\u044F\u0442\u044C/\u043D\u0435\u0432\u0435\u0441\u0442\u043A\u0430",
   "\u0436\u0435\u043D\u0430 (\u0440\u0435\u0431\u0451\u043D\u043A\u0430|\u0434\u043E\u0447\u0435\u0440\u0438|\u0441\u044B\u043D\u0430)": "\u043D\u0435\u0432\u0435\u0441\u0442\u043A\u0430",
   "\u043C\u0443\u0436 (\u0440\u0435\u0431\u0451\u043D\u043A\u0430|\u0434\u043E\u0447\u0435\u0440\u0438|\u0441\u044B\u043D\u0430)": "\u0437\u044F\u0442\u044C",
-  "\u043C\u0430\u0442\u044C (\u0441\u0443\u043F\u0440\u0443\u0433\u0430|\u0436\u0435\u043D\u044B|\u043C\u0443\u0436\u0430)": "\u0442\u0451\u0449\u0430",
-  "\u043E\u0442\u0435\u0446 (\u0441\u0443\u043F\u0440\u0443\u0433\u0430|\u0436\u0435\u043D\u044B|\u043C\u0443\u0436\u0430)": "\u0442\u0435\u0441\u0442\u044C",
-  "\u0440\u043E\u0434\u0438\u0442\u0435\u043B\u044C (\u0441\u0443\u043F\u0440\u0443\u0433\u0430|\u0436\u0435\u043D\u044B|\u043C\u0443\u0436\u0430)": "\u0442\u0435\u0441\u0442\u044C/\u0442\u0451\u0449\u0430",
+  "\u043C\u0430\u0442\u044C \u0436\u0435\u043D\u044B": "\u0442\u0451\u0449\u0430",
+  "\u043C\u0430\u0442\u044C \u043C\u0443\u0436\u0430": "\u0441\u0432\u0435\u043A\u0440\u043E\u0432\u044C",
+  "\u043C\u0430\u0442\u044C \u0441\u0443\u043F\u0440\u0443\u0433\u0430": "\u0442\u0451\u0449\u0430/\u0441\u0432\u0435\u043A\u0440\u043E\u0432\u044C",
+  "\u043E\u0442\u0435\u0446 \u0436\u0435\u043D\u044B": "\u0442\u0435\u0441\u0442\u044C",
+  "\u043E\u0442\u0435\u0446 \u043C\u0443\u0436\u0430": "\u0441\u0432\u0451\u043A\u043E\u0440",
+  "\u043E\u0442\u0435\u0446 \u0441\u0443\u043F\u0440\u0443\u0433\u0430": "\u0442\u0435\u0441\u0442\u044C/\u0441\u0432\u0451\u043A\u043E\u0440",
+  "\u0440\u043E\u0434\u0438\u0442\u0435\u043B\u044C \u0436\u0435\u043D\u044B": "\u0442\u0435\u0441\u0442\u044C/\u0442\u0451\u0449\u0430",
+  "\u0440\u043E\u0434\u0438\u0442\u0435\u043B\u044C \u043C\u0443\u0436\u0430": "\u0441\u0432\u0451\u043A\u043E\u0440/\u0441\u0432\u0435\u043A\u0440\u043E\u0432\u044C",
+  "\u0440\u043E\u0434\u0438\u0442\u0435\u043B\u044C \u0441\u0443\u043F\u0440\u0443\u0433\u0430": "\u0442\u0435\u0441\u0442\u044C/\u0442\u0451\u0449\u0430",
   "\u0436\u0435\u043D\u0430 (\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?(\u0431\u0440\u0430\u0442\u0430|\u0441\u0435\u0441\u0442\u0440\u044B|\u0441\u0438\u0431\u043B\u0438\u043D\u0433\u0430)": "\u043D\u0435\u0432\u0435\u0441\u0442\u043A\u0430",
   "\u043C\u0443\u0436 (\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?(\u0431\u0440\u0430\u0442\u0430|\u0441\u0435\u0441\u0442\u0440\u044B|\u0441\u0438\u0431\u043B\u0438\u043D\u0433\u0430)": "\u0437\u044F\u0442\u044C",
   "\u0441\u0443\u043F\u0440\u0443\u0433(?:\u0430)? (\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?(\u0431\u0440\u0430\u0442\u0430|\u0441\u0435\u0441\u0442\u0440\u044B|\u0441\u0438\u0431\u043B\u0438\u043D\u0433\u0430)": "\u0437\u044F\u0442\u044C/\u043D\u0435\u0432\u0435\u0441\u0442\u043A\u0430",
-  "(\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?\u0441\u0435\u0441\u0442\u0440\u0430 (\u0441\u0443\u043F\u0440\u0443\u0433\u0430|\u0436\u0435\u043D\u044B|\u043C\u0443\u0436\u0430)": "\u0437\u043E\u043B\u043E\u0432\u043A\u0430",
-  "(\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?\u0431\u0440\u0430\u0442 (\u0441\u0443\u043F\u0440\u0443\u0433\u0430|\u0436\u0435\u043D\u044B|\u043C\u0443\u0436\u0430)": "\u0448\u0443\u0440\u0438\u043D",
-  "(\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?\u0441\u0438\u0431\u043B\u0438\u043D\u0433 (\u0441\u0443\u043F\u0440\u0443\u0433\u0430|\u0436\u0435\u043D\u044B|\u043C\u0443\u0436\u0430)": "\u0448\u0443\u0440\u0438\u043D/\u0437\u043E\u043B\u043E\u0432\u043A\u0430"
+  "(\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?\u0441\u0435\u0441\u0442\u0440\u0430 \u0436\u0435\u043D\u044B": "\u0441\u0432\u043E\u044F\u0447\u0435\u043D\u0438\u0446\u0430",
+  "(\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?\u0441\u0435\u0441\u0442\u0440\u0430 \u043C\u0443\u0436\u0430": "\u0437\u043E\u043B\u043E\u0432\u043A\u0430",
+  "(\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?\u0441\u0435\u0441\u0442\u0440\u0430 \u0441\u0443\u043F\u0440\u0443\u0433\u0430": "\u0441\u0432\u043E\u044F\u0447\u0435\u043D\u0438\u0446\u0430/\u0437\u043E\u043B\u043E\u0432\u043A\u0430",
+  "(\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?\u0431\u0440\u0430\u0442 \u0436\u0435\u043D\u044B": "\u0448\u0443\u0440\u0438\u043D",
+  "(\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?\u0431\u0440\u0430\u0442 \u043C\u0443\u0436\u0430": "\u0434\u0435\u0432\u0435\u0440\u044C",
+  "(\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?\u0431\u0440\u0430\u0442 \u0441\u0443\u043F\u0440\u0443\u0433\u0430": "\u0448\u0443\u0440\u0438\u043D/\u0434\u0435\u0432\u0435\u0440\u044C",
+  "(\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?\u0441\u0438\u0431\u043B\u0438\u043D\u0433 \u0436\u0435\u043D\u044B": "\u0448\u0443\u0440\u0438\u043D/\u0441\u0432\u043E\u044F\u0447\u0435\u043D\u0438\u0446\u0430",
+  "(\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?\u0441\u0438\u0431\u043B\u0438\u043D\u0433 \u043C\u0443\u0436\u0430": "\u0434\u0435\u0432\u0435\u0440\u044C/\u0437\u043E\u043B\u043E\u0432\u043A\u0430",
+  "(\u0441\u0432\u043E\u0434\u043D(?:\u044B\u0439|\u0430\u044F) )?\u0441\u0438\u0431\u043B\u0438\u043D\u0433 \u0441\u0443\u043F\u0440\u0443\u0433\u0430": "\u0448\u0443\u0440\u0438\u043D/\u0437\u043E\u043B\u043E\u0432\u043A\u0430"
+};
+var parentRelationsRu = {
+  step: {
+    \u043E\u0442\u0435\u0446: "\u043E\u0442\u0447\u0438\u043C",
+    \u043C\u0430\u0442\u044C: "\u043C\u0430\u0447\u0435\u0445\u0430",
+    \u0441\u044B\u043D: "\u043F\u0430\u0441\u044B\u043D\u043E\u043A",
+    \u0434\u043E\u0447\u044C: "\u043F\u0430\u0434\u0447\u0435\u0440\u0438\u0446\u0430"
+  }
 };
 
 // src/kinship-translator/kinship-translator.ru.ts
@@ -7307,7 +7573,7 @@ var cousinWord = (degree, sex) => {
   return `${stem}\u044B\u0439 \u0431\u0440\u0430\u0442/\u0441\u0435\u0441\u0442\u0440\u0430`;
 };
 var praRepeat = (count) => count > 0 ? "\u043F\u0440\u0430".repeat(count) : "";
-var sexOf = (person) => {
+var sexOf4 = (person) => {
   if (person?.isMale?.()) {
     return "m";
   }
@@ -7322,7 +7588,7 @@ var KinshipTranslatorRu = class extends KinshipTranslatorBasic {
     if (degree > 0) {
       degree = degree - 1;
     }
-    return cousinWord(degree, sexOf(this.personN));
+    return cousinWord(degree, sexOf4(this.personN));
   }
   removal() {
     const level = this.pathN?.level ?? 0;
@@ -7334,35 +7600,53 @@ var KinshipTranslatorRu = class extends KinshipTranslatorBasic {
       return level < 0 ? this.nibling() : this.auncle();
     }
     const removed = Math.abs(level);
-    return `${cousinWord(degree, sexOf(this.personN))} (${removed}\xD7 \u0447\u0435\u0440\u0435\u0437 \u043F\u043E\u043A\u043E\u043B\u0435\u043D\u0438\u0435)`;
+    return `${cousinWord(degree, sexOf4(this.personN))} (${removed}\xD7 \u0447\u0435\u0440\u0435\u0437 \u043F\u043E\u043A\u043E\u043B\u0435\u043D\u0438\u0435)`;
   }
   auncle() {
     const level = Math.abs(this.pathN?.level ?? 0);
-    const pra = praRepeat(Math.max(0, level - 2));
-    const sex = sexOf(this.personN);
+    const sex = sexOf4(this.personN);
+    if (level <= 1) {
+      if (sex === "m") {
+        return "\u0434\u044F\u0434\u044F";
+      }
+      if (sex === "f") {
+        return "\u0442\u0451\u0442\u044F";
+      }
+      return "\u0434\u044F\u0434\u044F/\u0442\u0451\u0442\u044F";
+    }
+    const pra = praRepeat(level - 2);
     if (sex === "m") {
-      return `${pra}\u0434\u044F\u0434\u044F`;
+      return `\u0434\u0432\u043E\u044E\u0440\u043E\u0434\u043D\u044B\u0439 ${pra}\u0434\u0435\u0434`;
     }
     if (sex === "f") {
-      return `${pra}\u0442\u0451\u0442\u044F`;
+      return `\u0434\u0432\u043E\u044E\u0440\u043E\u0434\u043D\u0430\u044F ${pra}\u0431\u0430\u0431\u0443\u0448\u043A\u0430`;
     }
-    return `${pra}\u0434\u044F\u0434\u044F/\u0442\u0451\u0442\u044F`;
+    return `\u0434\u0432\u043E\u044E\u0440\u043E\u0434\u043D\u044B\u0439 ${pra}\u0434\u0435\u0434/\u0431\u0430\u0431\u0443\u0448\u043A\u0430`;
   }
   nibling() {
     const level = Math.abs(this.pathN?.level ?? 0);
-    const pra = praRepeat(Math.max(0, level - 2));
-    const sex = sexOf(this.personN);
+    const sex = sexOf4(this.personN);
+    if (level <= 1) {
+      if (sex === "m") {
+        return "\u043F\u043B\u0435\u043C\u044F\u043D\u043D\u0438\u043A";
+      }
+      if (sex === "f") {
+        return "\u043F\u043B\u0435\u043C\u044F\u043D\u043D\u0438\u0446\u0430";
+      }
+      return "\u043F\u043B\u0435\u043C\u044F\u043D\u043D\u0438\u043A/\u043F\u043B\u0435\u043C\u044F\u043D\u043D\u0438\u0446\u0430";
+    }
+    const pra = praRepeat(level - 2);
     if (sex === "m") {
-      return `${pra}\u043F\u043B\u0435\u043C\u044F\u043D\u043D\u0438\u043A`;
+      return `${pra}\u0432\u043D\u0443\u0447\u0430\u0442\u044B\u0439 \u043F\u043B\u0435\u043C\u044F\u043D\u043D\u0438\u043A`;
     }
     if (sex === "f") {
-      return `${pra}\u043F\u043B\u0435\u043C\u044F\u043D\u043D\u0438\u0446\u0430`;
+      return `${pra}\u0432\u043D\u0443\u0447\u0430\u0442\u0430\u044F \u043F\u043B\u0435\u043C\u044F\u043D\u043D\u0438\u0446\u0430`;
     }
-    return `${pra}\u043F\u043B\u0435\u043C\u044F\u043D\u043D\u0438\u043A/\u043F\u043B\u0435\u043C\u044F\u043D\u043D\u0438\u0446\u0430`;
+    return `${pra}\u0432\u043D\u0443\u0447\u0430\u0442\u044B\u0439 \u043F\u043B\u0435\u043C\u044F\u043D\u043D\u0438\u043A/\u043F\u043B\u0435\u043C\u044F\u043D\u043D\u0438\u0446\u0430`;
   }
   parent() {
     const level = Math.abs(this.pathN?.level ?? 0);
-    const sex = sexOf(this.personN);
+    const sex = sexOf4(this.personN);
     if (level <= 1) {
       if (sex === "m") {
         return "\u043E\u0442\u0435\u0446";
@@ -7392,7 +7676,7 @@ var KinshipTranslatorRu = class extends KinshipTranslatorBasic {
   }
   child() {
     const level = Math.abs(this.pathN?.level ?? 0);
-    const sex = sexOf(this.personN);
+    const sex = sexOf4(this.personN);
     if (level <= 1) {
       if (sex === "m") {
         return "\u0441\u044B\u043D";
@@ -7421,14 +7705,14 @@ var KinshipTranslatorRu = class extends KinshipTranslatorBasic {
     return `${pra}\u0432\u043D\u0443\u043A/\u0432\u043D\u0443\u0447\u043A\u0430`;
   }
   sibling() {
-    const sex = sexOf(this.personN);
+    const sex = sexOf4(this.personN);
     if (sex === "m") {
       return "\u0431\u0440\u0430\u0442";
     }
     if (sex === "f") {
       return "\u0441\u0435\u0441\u0442\u0440\u0430";
     }
-    return "\u0441\u0438\u0431\u043B\u0438\u043D\u0433";
+    return "\u0431\u0440\u0430\u0442/\u0441\u0435\u0441\u0442\u0440\u0430";
   }
   halfBlood(relation) {
     if (!relation || !this.isHalfBlood) {
@@ -7442,7 +7726,7 @@ var KinshipTranslatorRu = class extends KinshipTranslatorBasic {
     return `\u0441\u0432\u043E\u0434\u043D\u044B\u0439 ${relation}`;
   }
   spouse() {
-    const sex = sexOf(this.personN);
+    const sex = sexOf4(this.personN);
     if (sex === "m") {
       return "\u043C\u0443\u0436";
     }
@@ -7456,7 +7740,7 @@ var KinshipTranslatorRu = class extends KinshipTranslatorBasic {
       return "";
     }
     const spouse = this.path?.[1].indi;
-    const sex = sexOf(spouse);
+    const sex = sexOf4(spouse);
     const spouseType = sex === "m" ? "\u043C\u0443\u0436" : sex === "f" ? "\u0436\u0435\u043D\u0430" : "\u0441\u0443\u043F\u0440\u0443\u0433";
     return `${relation} ${toGenitive(spouseType)}`;
   }
@@ -7465,7 +7749,7 @@ var KinshipTranslatorRu = class extends KinshipTranslatorBasic {
       return "";
     }
     const spouse = this.path?.[this.path.length - 1].indi;
-    const sex = sexOf(spouse);
+    const sex = sexOf4(spouse);
     const spouseType = sex === "m" ? "\u043C\u0443\u0436" : sex === "f" ? "\u0436\u0435\u043D\u0430" : "\u0441\u0443\u043F\u0440\u0443\u0433";
     return `${spouseType} ${toGenitive(relation)}`;
   }
@@ -7502,7 +7786,22 @@ var KinshipTranslatorRu = class extends KinshipTranslatorBasic {
     if (!relation || !this.pathN?.relation) {
       return relation ?? "";
     }
-    return `${this.pathN.relation} ${relation}`;
+    const mapped = parentRelationsRu[this.pathN.relation]?.[relation];
+    if (mapped) {
+      return mapped;
+    }
+    if (this.pathN.relation === "step") {
+      return `\u043D\u0435\u0440\u043E\u0434\u043D\u043E\u0439 ${relation}`;
+    }
+    if (this.pathN.relation === "adopted") {
+      return /сестра|дочь|мать|тётя|бабушка|жена|племянница|внучка/.test(
+        relation
+      ) ? `\u043F\u0440\u0438\u0451\u043C\u043D\u0430\u044F ${relation}` : `\u043F\u0440\u0438\u0451\u043C\u043D\u044B\u0439 ${relation}`;
+    }
+    if (this.pathN.relation === "foster") {
+      return `\u043F\u0440\u0438\u0451\u043C\u043D\u044B\u0439 ${relation}`;
+    }
+    return relation;
   }
 };
 
@@ -7526,7 +7825,7 @@ var InLawsJa = {
 };
 
 // src/kinship-translator/kinship-translator.ja.ts
-var sexOf2 = (person) => {
+var sexOf5 = (person) => {
   if (person?.isMale?.()) {
     return "m";
   }
@@ -7535,7 +7834,7 @@ var sexOf2 = (person) => {
   }
   return "n";
 };
-var pick = (sex, male, female, neutral) => {
+var pick4 = (sex, male, female, neutral) => {
   if (sex === "m") {
     return male;
   }
@@ -7548,18 +7847,18 @@ var lineal = (level, sex, kind) => {
   const L = Math.max(1, level);
   if (kind === "asc") {
     if (L <= 1) {
-      return pick(sex, "\u7236", "\u6BCD", "\u89AA");
+      return pick4(sex, "\u7236", "\u6BCD", "\u89AA");
     }
     if (L === 2) {
-      return pick(sex, "\u7956\u7236", "\u7956\u6BCD", "\u7956\u7236\u6BCD");
+      return pick4(sex, "\u7956\u7236", "\u7956\u6BCD", "\u7956\u7236\u6BCD");
     }
     if (L === 3) {
-      return pick(sex, "\u66FE\u7956\u7236", "\u66FE\u7956\u6BCD", "\u66FE\u7956\u7236\u6BCD");
+      return pick4(sex, "\u66FE\u7956\u7236", "\u66FE\u7956\u6BCD", "\u66FE\u7956\u7236\u6BCD");
     }
     if (L === 4) {
-      return pick(sex, "\u9AD8\u7956\u7236", "\u9AD8\u7956\u6BCD", "\u9AD8\u7956\u7236\u6BCD");
+      return pick4(sex, "\u9AD8\u7956\u7236", "\u9AD8\u7956\u6BCD", "\u9AD8\u7956\u7236\u6BCD");
     }
-    return pick(
+    return pick4(
       sex,
       `${L - 1}\u4E16\u306E\u7956\u7236`,
       `${L - 1}\u4E16\u306E\u7956\u6BCD`,
@@ -7567,7 +7866,7 @@ var lineal = (level, sex, kind) => {
     );
   }
   if (L <= 1) {
-    return pick(sex, "\u606F\u5B50", "\u5A18", "\u5B50");
+    return pick4(sex, "\u606F\u5B50", "\u5A18", "\u5B50");
   }
   if (L === 2) {
     return "\u5B6B";
@@ -7614,52 +7913,52 @@ var KinshipTranslatorJa = class extends KinshipTranslatorBasic {
   }
   auncle() {
     const level = Math.abs(this.pathN?.level ?? 0);
-    const sex = sexOf2(this.personN);
-    if (level <= 2) {
-      return pick(sex, "\u304A\u3058", "\u304A\u3070", "\u304A\u3058/\u304A\u3070");
+    const sex = sexOf5(this.personN);
+    if (level <= 1) {
+      return pick4(sex, "\u304A\u3058", "\u304A\u3070", "\u304A\u3058/\u304A\u3070");
     }
-    if (level === 3) {
-      return pick(sex, "\u5927\u304A\u3058", "\u5927\u304A\u3070", "\u5927\u304A\u3058/\u5927\u304A\u3070");
+    if (level === 2) {
+      return pick4(sex, "\u5927\u304A\u3058", "\u5927\u304A\u3070", "\u5927\u304A\u3058/\u5927\u304A\u3070");
     }
-    return pick(
+    return pick4(
       sex,
-      `${level - 2}\u4EE3\u524D\u306E\u304A\u3058`,
-      `${level - 2}\u4EE3\u524D\u306E\u304A\u3070`,
-      `${level - 2}\u4EE3\u524D\u306E\u304A\u3058/\u304A\u3070`
+      `${level - 1}\u4EE3\u524D\u306E\u304A\u3058`,
+      `${level - 1}\u4EE3\u524D\u306E\u304A\u3070`,
+      `${level - 1}\u4EE3\u524D\u306E\u304A\u3058/\u304A\u3070`
     );
   }
   nibling() {
     const level = Math.abs(this.pathN?.level ?? 0);
-    const sex = sexOf2(this.personN);
-    if (level <= 2) {
-      return pick(sex, "\u7525", "\u59EA", "\u7525/\u59EA");
+    const sex = sexOf5(this.personN);
+    if (level <= 1) {
+      return pick4(sex, "\u7525", "\u59EA", "\u7525/\u59EA");
     }
-    if (level === 3) {
-      return pick(sex, "\u5927\u7525", "\u5927\u59EA", "\u5927\u7525/\u5927\u59EA");
+    if (level === 2) {
+      return pick4(sex, "\u5927\u7525", "\u5927\u59EA", "\u5927\u7525/\u5927\u59EA");
     }
-    return pick(
+    return pick4(
       sex,
-      `${level - 2}\u4EE3\u4E0B\u306E\u7525`,
-      `${level - 2}\u4EE3\u4E0B\u306E\u59EA`,
-      `${level - 2}\u4EE3\u4E0B\u306E\u7525/\u59EA`
+      `${level - 1}\u4EE3\u4E0B\u306E\u7525`,
+      `${level - 1}\u4EE3\u4E0B\u306E\u59EA`,
+      `${level - 1}\u4EE3\u4E0B\u306E\u7525/\u59EA`
     );
   }
   parent() {
     return lineal(
       Math.abs(this.pathN?.level ?? 0),
-      sexOf2(this.personN),
+      sexOf5(this.personN),
       "asc"
     );
   }
   child() {
     return lineal(
       Math.abs(this.pathN?.level ?? 0),
-      sexOf2(this.personN),
+      sexOf5(this.personN),
       "desc"
     );
   }
   sibling() {
-    return pick(sexOf2(this.personN), "\u5144\u5F1F", "\u59C9\u59B9", "\u5144\u5F1F\u59C9\u59B9");
+    return pick4(sexOf5(this.personN), "\u5144\u5F1F", "\u59C9\u59B9", "\u5144\u5F1F\u59C9\u59B9");
   }
   halfBlood(relation) {
     if (!relation || !this.isHalfBlood) {
@@ -7668,14 +7967,14 @@ var KinshipTranslatorJa = class extends KinshipTranslatorBasic {
     return `\u7570\u7236\u6BCD\u306E${relation}`;
   }
   spouse() {
-    return pick(sexOf2(this.personN), "\u592B", "\u59BB", "\u914D\u5076\u8005");
+    return pick4(sexOf5(this.personN), "\u592B", "\u59BB", "\u914D\u5076\u8005");
   }
   ofSpouse(relation) {
     if (!relation) {
       return "";
     }
-    const spouseType = pick(
-      sexOf2(this.path?.[1].indi),
+    const spouseType = pick4(
+      sexOf5(this.path?.[1].indi),
       "\u592B",
       "\u59BB",
       "\u914D\u5076\u8005"
@@ -7687,7 +7986,7 @@ var KinshipTranslatorJa = class extends KinshipTranslatorBasic {
       return "";
     }
     const spouse = this.path?.[this.path.length - 1].indi;
-    const spouseType = pick(sexOf2(spouse), "\u592B", "\u59BB", "\u914D\u5076\u8005");
+    const spouseType = pick4(sexOf5(spouse), "\u592B", "\u59BB", "\u914D\u5076\u8005");
     return `${relation}\u306E${spouseType}`;
   }
   of(relation) {
@@ -7723,7 +8022,28 @@ var KinshipTranslatorJa = class extends KinshipTranslatorBasic {
     if (!relation || !this.pathN?.relation) {
       return relation ?? "";
     }
-    return `${this.pathN.relation}\u306E${relation}`;
+    if (this.pathN.relation === "step") {
+      if (relation === "\u7236") {
+        return "\u7EE7\u7236";
+      }
+      if (relation === "\u6BCD") {
+        return "\u7D99\u6BCD";
+      }
+      if (relation === "\u606F\u5B50") {
+        return "\u7D99\u5B50";
+      }
+      if (relation === "\u5A18") {
+        return "\u7D99\u5A18";
+      }
+      return `\u7D99${relation}`;
+    }
+    if (this.pathN.relation === "adopted") {
+      return `\u990A\u5B50\u306E${relation}`;
+    }
+    if (this.pathN.relation === "foster") {
+      return `\u91CC\u89AA\u306E${relation}`;
+    }
+    return relation;
   }
 };
 
@@ -7732,22 +8052,32 @@ var InLawsZh = {
   "(\u5B50\u5973|\u5973\u513F|\u513F\u5B50)\u7684\u914D\u5076": "\u513F\u5AB3/\u5973\u5A7F",
   "(\u5B50\u5973|\u5973\u513F|\u513F\u5B50)\u7684\u59BB\u5B50": "\u513F\u5AB3",
   "(\u5B50\u5973|\u5973\u513F|\u513F\u5B50)\u7684\u4E08\u592B": "\u5973\u5A7F",
-  "(\u914D\u5076|\u59BB\u5B50|\u4E08\u592B)\u7684\u6BCD\u4EB2": "\u5CB3\u6BCD/\u5A46\u5A46",
-  "(\u914D\u5076|\u59BB\u5B50|\u4E08\u592B)\u7684\u7236\u4EB2": "\u5CB3\u7236/\u516C\u516C",
-  "(\u914D\u5076|\u59BB\u5B50|\u4E08\u592B)\u7684\u7236\u6BCD": "\u5CB3\u7236\u5CB3\u6BCD/\u516C\u516C\u5A46\u5A46",
+  "\u59BB\u5B50\u7684\u6BCD\u4EB2": "\u5CB3\u6BCD",
+  "\u4E08\u592B\u7684\u6BCD\u4EB2": "\u5A46\u5A46",
+  "(\u914D\u5076)\u7684\u6BCD\u4EB2": "\u5CB3\u6BCD/\u5A46\u5A46",
+  "\u59BB\u5B50\u7684\u7236\u4EB2": "\u5CB3\u7236",
+  "\u4E08\u592B\u7684\u7236\u4EB2": "\u516C\u516C",
+  "(\u914D\u5076)\u7684\u7236\u4EB2": "\u5CB3\u7236/\u516C\u516C",
+  "\u59BB\u5B50\u7684\u7236\u6BCD": "\u5CB3\u7236\u5CB3\u6BCD",
+  "\u4E08\u592B\u7684\u7236\u6BCD": "\u516C\u516C\u5A46\u5A46",
+  "(\u914D\u5076)\u7684\u7236\u6BCD": "\u5CB3\u7236\u5CB3\u6BCD/\u516C\u516C\u5A46\u5A46",
   "(\u5F02\u7236\u6BCD\u7684)?(\u5144\u5F1F\u59D0\u59B9|\u59D0\u59B9|\u5144\u5F1F)\u7684\u59BB\u5B50": "\u5AC2\u5B50/\u5F1F\u59B9",
   "(\u5F02\u7236\u6BCD\u7684)?(\u5144\u5F1F\u59D0\u59B9|\u59D0\u59B9|\u5144\u5F1F)\u7684\u4E08\u592B": "\u59D0\u592B/\u59B9\u592B",
   "(\u5F02\u7236\u6BCD\u7684)?(\u5144\u5F1F\u59D0\u59B9|\u59D0\u59B9|\u5144\u5F1F)\u7684\u914D\u5076": "\u59FB\u4EB2\u5144\u5F1F\u59D0\u59B9",
   "(\u5F02\u7236\u6BCD\u7684)?\u59D0\u59B9\u7684(\u914D\u5076|\u59BB\u5B50|\u4E08\u592B)": "\u59D0\u592B/\u59B9\u592B",
   "(\u5F02\u7236\u6BCD\u7684)?\u5144\u5F1F\u7684(\u914D\u5076|\u59BB\u5B50|\u4E08\u592B)": "\u5AC2\u5B50/\u5F1F\u59B9",
   "(\u5F02\u7236\u6BCD\u7684)?\u5144\u5F1F\u59D0\u59B9\u7684(\u914D\u5076|\u59BB\u5B50|\u4E08\u592B)": "\u59FB\u4EB2\u5144\u5F1F\u59D0\u59B9",
-  "(\u5F02\u7236\u6BCD\u7684)?(\u914D\u5076|\u59BB\u5B50|\u4E08\u592B)\u7684\u59D0\u59B9": "\u59D1\u5B50/\u59E8\u5B50",
-  "(\u5F02\u7236\u6BCD\u7684)?(\u914D\u5076|\u59BB\u5B50|\u4E08\u592B)\u7684\u5144\u5F1F": "\u5927\u4F2F/\u5C0F\u53D4/\u5185\u5144/\u5185\u5F1F",
+  "(\u5F02\u7236\u6BCD\u7684)?\u59BB\u5B50\u7684\u59D0\u59B9": "\u59E8\u5B50",
+  "(\u5F02\u7236\u6BCD\u7684)?\u4E08\u592B\u7684\u59D0\u59B9": "\u59D1\u5B50",
+  "(\u5F02\u7236\u6BCD\u7684)?(\u914D\u5076)\u7684\u59D0\u59B9": "\u59D1\u5B50/\u59E8\u5B50",
+  "(\u5F02\u7236\u6BCD\u7684)?\u59BB\u5B50\u7684\u5144\u5F1F": "\u5185\u5144/\u5185\u5F1F",
+  "(\u5F02\u7236\u6BCD\u7684)?\u4E08\u592B\u7684\u5144\u5F1F": "\u5927\u4F2F/\u5C0F\u53D4",
+  "(\u5F02\u7236\u6BCD\u7684)?(\u914D\u5076)\u7684\u5144\u5F1F": "\u5927\u4F2F/\u5C0F\u53D4/\u5185\u5144/\u5185\u5F1F",
   "(\u5F02\u7236\u6BCD\u7684)?(\u914D\u5076|\u59BB\u5B50|\u4E08\u592B)\u7684\u5144\u5F1F\u59D0\u59B9": "\u59FB\u4EB2\u5144\u5F1F\u59D0\u59B9"
 };
 
 // src/kinship-translator/kinship-translator.zh.ts
-var sexOf3 = (person) => {
+var sexOf6 = (person) => {
   if (person?.isMale?.()) {
     return "m";
   }
@@ -7756,7 +8086,7 @@ var sexOf3 = (person) => {
   }
   return "n";
 };
-var pick2 = (sex, male, female, neutral) => {
+var pick5 = (sex, male, female, neutral) => {
   if (sex === "m") {
     return male;
   }
@@ -7769,41 +8099,41 @@ var lineal2 = (level, sex, kind) => {
   const L = Math.max(1, level);
   if (kind === "asc") {
     if (L <= 1) {
-      return pick2(sex, "\u7236\u4EB2", "\u6BCD\u4EB2", "\u7236\u6BCD");
+      return pick5(sex, "\u7236\u4EB2", "\u6BCD\u4EB2", "\u7236\u6BCD");
     }
     if (L === 2) {
-      return pick2(sex, "\u7956\u7236", "\u7956\u6BCD", "\u7956\u7236\u6BCD");
+      return pick5(sex, "\u7956\u7236", "\u7956\u6BCD", "\u7956\u7236\u6BCD");
     }
     if (L === 3) {
-      return pick2(sex, "\u66FE\u7956\u7236", "\u66FE\u7956\u6BCD", "\u66FE\u7956\u7236\u6BCD");
+      return pick5(sex, "\u66FE\u7956\u7236", "\u66FE\u7956\u6BCD", "\u66FE\u7956\u7236\u6BCD");
     }
     if (L === 4) {
-      return pick2(sex, "\u9AD8\u7956\u7236", "\u9AD8\u7956\u6BCD", "\u9AD8\u7956\u7236\u6BCD");
+      return pick5(sex, "\u9AD8\u7956\u7236", "\u9AD8\u7956\u6BCD", "\u9AD8\u7956\u7236\u6BCD");
     }
-    return pick2(sex, `${L}\u4E16\u7956`, `${L}\u4E16\u7956\u6BCD`, `${L}\u4E16\u7956\u7236\u6BCD`);
+    return pick5(sex, `${L}\u4E16\u7956`, `${L}\u4E16\u7956\u6BCD`, `${L}\u4E16\u7956\u7236\u6BCD`);
   }
   if (L <= 1) {
-    return pick2(sex, "\u513F\u5B50", "\u5973\u513F", "\u5B50\u5973");
+    return pick5(sex, "\u513F\u5B50", "\u5973\u513F", "\u5B50\u5973");
   }
   if (L === 2) {
-    return pick2(sex, "\u5B59\u5B50", "\u5B59\u5973", "\u5B59\u5B50\u5973");
+    return pick5(sex, "\u5B59\u5B50", "\u5B59\u5973", "\u5B59\u5B50\u5973");
   }
   if (L === 3) {
-    return pick2(sex, "\u66FE\u5B59", "\u66FE\u5B59\u5973", "\u66FE\u5B59\u5B50\u5973");
+    return pick5(sex, "\u66FE\u5B59", "\u66FE\u5B59\u5973", "\u66FE\u5B59\u5B50\u5973");
   }
   if (L === 4) {
-    return pick2(sex, "\u7384\u5B59", "\u7384\u5B59\u5973", "\u7384\u5B59\u5B50\u5973");
+    return pick5(sex, "\u7384\u5B59", "\u7384\u5B59\u5973", "\u7384\u5B59\u5B50\u5973");
   }
-  return pick2(sex, `${L}\u4E16\u5B59`, `${L}\u4E16\u5B59\u5973`, `${L}\u4E16\u5B59\u5B50\u5973`);
+  return pick5(sex, `${L}\u4E16\u5B59`, `${L}\u4E16\u5B59\u5973`, `${L}\u4E16\u5B59\u5B50\u5973`);
 };
 var cousinPlain2 = (degree, sex) => {
   if (degree <= 1) {
-    return pick2(sex, "\u5802\u8868\u5144\u5F1F", "\u5802\u8868\u59D0\u59B9", "\u5802\u8868\u4EB2");
+    return pick5(sex, "\u5802\u8868\u5144\u5F1F", "\u5802\u8868\u59D0\u59B9", "\u5802\u8868\u4EB2");
   }
   if (degree === 2) {
-    return pick2(sex, "\u4ECE\u5802\u8868\u5144\u5F1F", "\u4ECE\u5802\u8868\u59D0\u59B9", "\u4ECE\u5802\u8868\u4EB2");
+    return pick5(sex, "\u4ECE\u5802\u8868\u5144\u5F1F", "\u4ECE\u5802\u8868\u59D0\u59B9", "\u4ECE\u5802\u8868\u4EB2");
   }
-  return pick2(
+  return pick5(
     sex,
     `${degree}\u4EE3\u5802\u8868\u5144\u5F1F`,
     `${degree}\u4EE3\u5802\u8868\u59D0\u59B9`,
@@ -7816,7 +8146,7 @@ var KinshipTranslatorZh = class extends KinshipTranslatorBasic {
     if (degree > 0) {
       degree = degree - 1;
     }
-    return cousinPlain2(degree, sexOf3(this.personN));
+    return cousinPlain2(degree, sexOf6(this.personN));
   }
   removal() {
     const level = this.pathN?.level ?? 0;
@@ -7828,56 +8158,56 @@ var KinshipTranslatorZh = class extends KinshipTranslatorBasic {
       return level < 0 ? this.nibling() : this.auncle();
     }
     const removed = Math.abs(level);
-    return `${cousinPlain2(degree, sexOf3(this.personN))}\uFF08\u9694${removed}\u4EE3\uFF09`;
+    return `${cousinPlain2(degree, sexOf6(this.personN))}\uFF08\u9694${removed}\u4EE3\uFF09`;
   }
   auncle() {
     const level = Math.abs(this.pathN?.level ?? 0);
-    const sex = sexOf3(this.personN);
-    if (level <= 2) {
-      return pick2(sex, "\u53D4\u53D4", "\u963F\u59E8", "\u53D4\u4F2F/\u59D1\u59E8");
+    const sex = sexOf6(this.personN);
+    if (level <= 1) {
+      return pick5(sex, "\u53D4\u53D4", "\u963F\u59E8", "\u53D4\u4F2F/\u59D1\u59E8");
     }
-    if (level === 3) {
-      return pick2(sex, "\u4F2F\u53D4\u7956\u7236", "\u59D1\u7956\u6BCD", "\u4F2F\u53D4\u7956\u7236\u6BCD");
+    if (level === 2) {
+      return pick5(sex, "\u4F2F\u53D4\u7956\u7236", "\u59D1\u7956\u6BCD", "\u4F2F\u53D4\u7956\u7236\u6BCD");
     }
-    return pick2(
+    return pick5(
       sex,
-      `${level - 2}\u4EE3\u524D\u7684\u53D4\u53D4`,
-      `${level - 2}\u4EE3\u524D\u7684\u963F\u59E8`,
-      `${level - 2}\u4EE3\u524D\u7684\u53D4\u4F2F/\u59D1\u59E8`
+      `${level - 1}\u4EE3\u524D\u7684\u53D4\u53D4`,
+      `${level - 1}\u4EE3\u524D\u7684\u963F\u59E8`,
+      `${level - 1}\u4EE3\u524D\u7684\u53D4\u4F2F/\u59D1\u59E8`
     );
   }
   nibling() {
     const level = Math.abs(this.pathN?.level ?? 0);
-    const sex = sexOf3(this.personN);
-    if (level <= 2) {
-      return pick2(sex, "\u4F84\u5B50", "\u4F84\u5973", "\u4F84\u5B50\u5973");
+    const sex = sexOf6(this.personN);
+    if (level <= 1) {
+      return pick5(sex, "\u4F84\u5B50", "\u4F84\u5973", "\u4F84\u5B50\u5973");
     }
-    if (level === 3) {
-      return pick2(sex, "\u4F84\u5B59", "\u4F84\u5B59\u5973", "\u4F84\u5B59\u5B50\u5973");
+    if (level === 2) {
+      return pick5(sex, "\u4F84\u5B59", "\u4F84\u5B59\u5973", "\u4F84\u5B59\u5B50\u5973");
     }
-    return pick2(
+    return pick5(
       sex,
-      `${level - 2}\u4EE3\u4E0B\u7684\u4F84\u5B50`,
-      `${level - 2}\u4EE3\u4E0B\u7684\u4F84\u5973`,
-      `${level - 2}\u4EE3\u4E0B\u7684\u4F84\u5B50\u5973`
+      `${level - 1}\u4EE3\u4E0B\u7684\u4F84\u5B50`,
+      `${level - 1}\u4EE3\u4E0B\u7684\u4F84\u5973`,
+      `${level - 1}\u4EE3\u4E0B\u7684\u4F84\u5B50\u5973`
     );
   }
   parent() {
     return lineal2(
       Math.abs(this.pathN?.level ?? 0),
-      sexOf3(this.personN),
+      sexOf6(this.personN),
       "asc"
     );
   }
   child() {
     return lineal2(
       Math.abs(this.pathN?.level ?? 0),
-      sexOf3(this.personN),
+      sexOf6(this.personN),
       "desc"
     );
   }
   sibling() {
-    return pick2(sexOf3(this.personN), "\u5144\u5F1F", "\u59D0\u59B9", "\u5144\u5F1F\u59D0\u59B9");
+    return pick5(sexOf6(this.personN), "\u5144\u5F1F", "\u59D0\u59B9", "\u5144\u5F1F\u59D0\u59B9");
   }
   halfBlood(relation) {
     if (!relation || !this.isHalfBlood) {
@@ -7886,14 +8216,14 @@ var KinshipTranslatorZh = class extends KinshipTranslatorBasic {
     return `\u5F02\u7236\u6BCD\u7684${relation}`;
   }
   spouse() {
-    return pick2(sexOf3(this.personN), "\u4E08\u592B", "\u59BB\u5B50", "\u914D\u5076");
+    return pick5(sexOf6(this.personN), "\u4E08\u592B", "\u59BB\u5B50", "\u914D\u5076");
   }
   ofSpouse(relation) {
     if (!relation) {
       return "";
     }
-    const spouseType = pick2(
-      sexOf3(this.path?.[1].indi),
+    const spouseType = pick5(
+      sexOf6(this.path?.[1].indi),
       "\u4E08\u592B",
       "\u59BB\u5B50",
       "\u914D\u5076"
@@ -7905,7 +8235,7 @@ var KinshipTranslatorZh = class extends KinshipTranslatorBasic {
       return "";
     }
     const spouse = this.path?.[this.path.length - 1].indi;
-    const spouseType = pick2(sexOf3(spouse), "\u4E08\u592B", "\u59BB\u5B50", "\u914D\u5076");
+    const spouseType = pick5(sexOf6(spouse), "\u4E08\u592B", "\u59BB\u5B50", "\u914D\u5076");
     return `${relation}\u7684${spouseType}`;
   }
   of(relation) {
@@ -7941,7 +8271,40 @@ var KinshipTranslatorZh = class extends KinshipTranslatorBasic {
     if (!relation || !this.pathN?.relation) {
       return relation ?? "";
     }
-    return `${this.pathN.relation}${relation}`;
+    if (this.pathN.relation === "step") {
+      if (relation === "\u7236\u4EB2") {
+        return "\u7EE7\u7236";
+      }
+      if (relation === "\u6BCD\u4EB2") {
+        return "\u7EE7\u6BCD";
+      }
+      if (relation === "\u513F\u5B50") {
+        return "\u7EE7\u5B50";
+      }
+      if (relation === "\u5973\u513F") {
+        return "\u7EE7\u5973";
+      }
+      return `\u7EE7${relation}`;
+    }
+    if (this.pathN.relation === "adopted") {
+      if (relation === "\u7236\u4EB2") {
+        return "\u517B\u7236";
+      }
+      if (relation === "\u6BCD\u4EB2") {
+        return "\u517B\u6BCD";
+      }
+      if (relation === "\u513F\u5B50") {
+        return "\u517B\u5B50";
+      }
+      if (relation === "\u5973\u513F") {
+        return "\u517B\u5973";
+      }
+      return `\u517B${relation}`;
+    }
+    if (this.pathN.relation === "foster") {
+      return `\u5BC4\u517B${relation}`;
+    }
+    return relation;
   }
 };
 
@@ -9006,7 +9369,9 @@ var downloadGedzipMedia = async (media, onProgress) => {
           id: item.id,
           imgId: item.imgId,
           key: "key" in item ? item.key : void 0,
-          contentType: item.contentType
+          contentType: item.contentType,
+          person: "person" in item ? item.person : void 0,
+          tree: "tree" in item ? item.tree : void 0
         });
         if (!resolved?.content) {
           return;
@@ -9531,7 +9896,7 @@ var collectExtensionTagsFrom = (node, into = /* @__PURE__ */ new Set()) => {
 // package.json
 var package_default = {
   name: "@treeviz/gedcom-parser",
-  version: "2.1.9"};
+  version: "2.1.12"};
 
 // src/utils/get-product-details.ts
 var isDevelopment = () => {
@@ -9616,16 +9981,26 @@ var Obje = class extends Common {
     if (!this._gedcom) {
       return this;
     }
+    if (typeof this.value === "string" && isId(this.value) && this.refType === "OBJE") {
+      const resolved = this.ref;
+      if (resolved && resolved !== this && typeof resolved.standardizeMedia === "function") {
+        resolved.standardizeMedia(
+          namespace,
+          override,
+          urlGetter,
+          gedcomVersion
+        );
+        return this;
+      }
+    }
     const rin = this?.get("RIN")?.toValue();
-    const clone = this?.get("_CLON._OID")?.toValue();
-    const mser = this?.get("_MSER._LKID")?.toValue();
     const title = this?.get("FILE.TITL")?.toValue() ?? this?.get("TITL")?.toValue() ?? "";
     const note = this?.get("FILE.NOTE")?.toValue() ?? this?.get("NOTE")?.toValue() ?? "";
     const formRaw = this?.get("FILE.FORM")?.toValue() ?? this?.get("FORM")?.toValue();
     const mediType = this?.get("FILE.FORM.TYPE")?.toValue() ?? this?.get("FORM.TYPE")?.toValue() ?? this?.get("MEDI")?.toValue();
     const file = this?.get("FILE")?.toValue();
-    const imgId = rin || clone || mser;
-    const url = file || namespace && urlGetter?.(namespace, imgId);
+    const imgId = resolveObjeMediaId(this);
+    const url = file || this.isAncestry() && namespace && urlGetter?.(namespace, imgId);
     if (!url) {
       return this;
     }
@@ -10138,6 +10513,22 @@ var GedCom = class extends Common {
   obje(index) {
     return this.getMain(this.objes(), index);
   }
+  /**
+   * People who link a shared multimedia record (`1 OBJE @On@`), i.e. Ancestry
+   * face tags / everyone the photo is attached to.
+   */
+  indisLinkingObje(objeKey) {
+    const people = [];
+    this.indis()?.forEach((indi) => {
+      const linked = indi?.get("OBJE")?.toList()?.values()?.some(
+        (item) => item?.toValue?.() === objeKey || item?.id === objeKey
+      );
+      if (linked && indi) {
+        people.push(indi);
+      }
+    });
+    return people;
+  }
   sour(index) {
     return this.getMain(this.sours(), index);
   }
@@ -11197,4 +11588,4 @@ var createEmptyGedcom = (options) => {
   return gedcom;
 };
 
-export { ACCEPTED_DATE_FORMATS, ACCEPTED_DATE_FORMATS_REGEX, ADOPTED, APP_BRANDING, BIOLOGICAL, BIRTH, BIRTH_ASC, BIRTH_DESC, Common, CommonDate, CommonName, CommonNote, CustomTags, DATE_ASC, DATE_DESC, DEATH_ASC, DEATH_DESC, DEFAULT, DEFAULT_GEDCOM_EXPORT_VERSION, EVERY, Existed, FEMALE, FOSTER, FRIEND, Fam, Families, GEDCOM7_CALENDARS, GEDCOM7_PEDI_VALUES, GEDCOM7_RESN_VALUES, GEDCOM7_ROLE_VALUES, GEDCOM7_SEX_VALUES, GEDCOM_EXPORT_VERSIONS, GEDZIP_EXTENSION, GEDZIP_GEDCOM_ENTRY, GEDZIP_MIME, GedCom, parser_default as GedcomTree, ID_GETTER_REG, ID_REG, ID_SPLIT_REG, Indi, Individuals, KinshipTranslator, KinshipTranslatorBasic, KinshipTranslatorDe as KinshipTranslatorDE, KinshipTranslatorEn as KinshipTranslatorEN, KinshipTranslatorEs as KinshipTranslatorES, KinshipTranslatorFr as KinshipTranslatorFR, KinshipTranslatorHU, KinshipTranslatorJa as KinshipTranslatorJA, KinshipTranslatorRu as KinshipTranslatorRU, KinshipTranslatorZh as KinshipTranslatorZH, LINE_REG, List, MALE, MAX_FILE_SIZE_TO_SYNC, ORIG_HEAD_TAG, OTHER, Obje, Objects, PARTNER, PEDIGREE_VALUES, PartnerType, PlaceType, REF_LINE_REG, Range, RelationType, Repo, Repositories, SEALING, SINGLE, SPOUSE, STEP, Sour, Sources, Subm, Submitters, TREEVIZ_EXTENSION_BASE_URI, TREEVIZ_EXTENSION_URIS, UNKOWN, addFamilyFact, addIndividualFact, addNonEvent, applyGedcom7DatePhrases, applyGedcom7Enumerations, applyGedcom7RecordMetadata, attachChildToFamily, attachSpouseToFamily, buildGedzip, buildGedzipBlob, bytesToDataUrl, cacheDiscoveredPath, canAttachAsSpouse, collectExtensionTagsFrom, commonDateFormatter, consolidateChildIntoFamily, coupleKeyForFam, create, createCommon, createCommonDate, createCommonName, createCommonNote, createEmptyGedcom, createFam, createGedCom, createGedcomUid, createIndi, createObje, createProxy, createRepo, createSour, createSubm, dateFormatter, parser_default as default, deleteIndividual, downloadGedzipMedia, ensureExtensionSchema, extractGedzip, extractGedzipGedcom, extractSeparationYears, extractSplitPoints, familyHasChild, familyHasParent, findDegenerateFamiliesForIndi, findDuplicateCoupleFamiliesForIndi, findMatchingRangeForSplitRange, findReusableParentChildFamily, firstPointerId, formatGedcom7Timestamp, fromTuple, generateSplitRanges, getAllProp, getBirthAsc, getCacheManagerFactory, getDateLocale, getExtensionSchema, getFamilyWith, getFileExtension, getI18n, getKinshipTranslatorClass, getListTag, getMarriageAsc, getMarriageAscAndBirth, getMarriageAscAndChildBirth, getName, getNameAsc, getNameAscAndBirth, getNameDesc, getPlaceParserProvider, getPlaceParts, getPlaceTranslatorProvider, getPlaces, getRawSize, getValidKey, getValidKeys, getValidTag, getVersion, hungarianOrdinalize, i18n, idGetter, implemented, inRange, inferMediaForm, initializeCache, isCommonDate, isDegenerateFamily, isDevelopment, isGedcom7, isGedcomString, isGedzipContainer, isId, isImageFormat, isIntersectedRange, isObjePointer, isOnlyMainProp, isRangeContained, isRemoteOrEmbeddedMediaUrl, isValidKey, makePointer, marriageDateFormatter, mergeDuplicateCoupleFamilies, mergeGedcoms, mergeMediaLists, nameFormatter, nextRecordId, normalizeGedcomVersion, notImplemented, noteDateFormatter, ordinalize, parseGedcom7CalendarPrefix, parseRangeBounds, pathCache, placeTranslator, pointerIds, profilePictureCache, pruneEmptyFamilies, pruneFamiliesByIds, registerExtensionTag, relativesCache, remountGedzipMediaAsDataUrls, removePointerByValue, resetCacheManagerFactory, resetDateLocaleProvider, resetI18nProvider, resetKinshipTranslatorClass, resetPlaceParserProvider, resetPlaceTranslatorProvider, resetRelativesCache, resolveLocalMediaUrl, resolveMediaContent, resolveObjeForm, rewriteGedcomFilePaths, setCacheManagerFactory, setCauseOfDeath, setChildPedigree, setDateLocaleProvider, setDeceased, setFamilyMarriage, setI18nProvider, setKinshipTranslatorClass, setLocalMediaResolver, setMediaContentResolver, setNestedGroup, setPlaceParserProvider, setPlaceTranslatorProvider, splitOverlappingRanges, splitRange, spouseTagFor, toGedcomPedigree, translators_exports as translators, unlinkRelative, updateFactRecord, validateGedcomContent, withGedcom7Calendar };
+export { ACCEPTED_DATE_FORMATS, ACCEPTED_DATE_FORMATS_REGEX, ADOPTED, ANCESTRY_MEDIA_RETRIEVAL_PREFIX, APP_BRANDING, BIOLOGICAL, BIRTH, BIRTH_ASC, BIRTH_DESC, Common, CommonDate, CommonName, CommonNote, CustomTags, DATE_ASC, DATE_DESC, DEATH_ASC, DEATH_DESC, DEFAULT, DEFAULT_GEDCOM_EXPORT_VERSION, EVERY, Existed, FEMALE, FOSTER, FRIEND, Fam, Families, GEDCOM7_CALENDARS, GEDCOM7_PEDI_VALUES, GEDCOM7_RESN_VALUES, GEDCOM7_ROLE_VALUES, GEDCOM7_SEX_VALUES, GEDCOM_EXPORT_VERSIONS, GEDZIP_EXTENSION, GEDZIP_GEDCOM_ENTRY, GEDZIP_MIME, GedCom, parser_default as GedcomTree, ID_GETTER_REG, ID_REG, ID_SPLIT_REG, Indi, Individuals, KinshipTranslator, KinshipTranslatorBasic, KinshipTranslatorDe as KinshipTranslatorDE, KinshipTranslatorEn as KinshipTranslatorEN, KinshipTranslatorEs as KinshipTranslatorES, KinshipTranslatorFr as KinshipTranslatorFR, KinshipTranslatorHU, KinshipTranslatorJa as KinshipTranslatorJA, KinshipTranslatorRu as KinshipTranslatorRU, KinshipTranslatorZh as KinshipTranslatorZH, LINE_REG, List, MALE, MAX_FILE_SIZE_TO_SYNC, ORIG_HEAD_TAG, OTHER, Obje, Objects, PARTNER, PEDIGREE_VALUES, PartnerType, PlaceType, REF_LINE_REG, Range, RelationType, Repo, Repositories, SEALING, SINGLE, SPOUSE, STEP, Sour, Sources, Subm, Submitters, TREEVIZ_EXTENSION_BASE_URI, TREEVIZ_EXTENSION_URIS, UNKOWN, addFamilyFact, addIndividualFact, addNonEvent, ancestryMediaFileUrl, applyGedcom7DatePhrases, applyGedcom7Enumerations, applyGedcom7RecordMetadata, attachChildToFamily, attachSpouseToFamily, buildGedzip, buildGedzipBlob, bytesToDataUrl, cacheDiscoveredPath, canAttachAsSpouse, collectExtensionTagsFrom, commonDateFormatter, consolidateChildIntoFamily, coupleKeyForFam, create, createCommon, createCommonDate, createCommonName, createCommonNote, createEmptyGedcom, createFam, createGedCom, createGedcomUid, createIndi, createObje, createProxy, createRepo, createSour, createSubm, dateFormatter, parser_default as default, deleteIndividual, downloadGedzipMedia, ensureExtensionSchema, extractGedzip, extractGedzipGedcom, extractSeparationYears, extractSplitPoints, familyHasChild, familyHasParent, findDegenerateFamiliesForIndi, findDuplicateCoupleFamiliesForIndi, findMatchingRangeForSplitRange, findReusableParentChildFamily, firstPointerId, formatGedcom7Timestamp, fromTuple, generateSplitRanges, getAllProp, getBirthAsc, getCacheManagerFactory, getDateLocale, getExtensionSchema, getFamilyWith, getFileExtension, getI18n, getKinshipTranslatorClass, getListTag, getMarriageAsc, getMarriageAscAndBirth, getMarriageAscAndChildBirth, getName, getNameAsc, getNameAscAndBirth, getNameDesc, getPlaceParserProvider, getPlaceParts, getPlaceTranslatorProvider, getPlaces, getRawSize, getValidKey, getValidKeys, getValidTag, getVersion, hungarianOrdinalize, i18n, idGetter, implemented, inRange, inferMediaForm, initializeCache, isCommonDate, isDegenerateFamily, isDevelopment, isGedcom7, isGedcomString, isGedzipContainer, isId, isImageFormat, isIntersectedRange, isObjePointer, isOnlyMainProp, isRangeContained, isRemoteOrEmbeddedMediaUrl, isValidKey, makePointer, marriageDateFormatter, mergeDuplicateCoupleFamilies, mergeGedcoms, mergeMediaLists, nameFormatter, nextRecordId, normalizeGedcomVersion, notImplemented, noteDateFormatter, objeNoteValue, objeXrefKey, ordinalize, parseGedcom7CalendarPrefix, parseRangeBounds, pathCache, placeTranslator, pointerIds, profilePictureCache, pruneEmptyFamilies, pruneFamiliesByIds, registerExtensionTag, relativesCache, remountGedzipMediaAsDataUrls, removePointerByValue, resetCacheManagerFactory, resetDateLocaleProvider, resetI18nProvider, resetKinshipTranslatorClass, resetPlaceParserProvider, resetPlaceTranslatorProvider, resetRelativesCache, resolveLocalMediaUrl, resolveMediaContent, resolveObjeForm, resolveObjeMediaId, rewriteGedcomFilePaths, setCacheManagerFactory, setCauseOfDeath, setChildPedigree, setDateLocaleProvider, setDeceased, setFamilyMarriage, setI18nProvider, setKinshipTranslatorClass, setLocalMediaResolver, setMediaContentResolver, setNestedGroup, setPlaceParserProvider, setPlaceTranslatorProvider, splitOverlappingRanges, splitRange, spouseTagFor, toGedcomPedigree, translators_exports as translators, unlinkRelative, updateFactRecord, validateGedcomContent, withGedcom7Calendar };