@treeviz/gedcom-parser 2.1.17 → 2.1.22

package/dist/utils/index.js

@@ -361,6 +361,30 @@ var mediaIdValue = (obje, path) => {
   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_TREE_MEDIA_NAMESPACE = 1093;
+var ANCESTRY_NAMESPACE_IN_URL = /\/namespaces\/(\d+)\/media\//i;
+var parseAncestryNamespaceFromUrl = (url) => {
+  if (!url) {
+    return void 0;
+  }
+  const match = url.match(ANCESTRY_NAMESPACE_IN_URL);
+  const namespace = match?.[1] ? Number(match[1]) : NaN;
+  return Number.isFinite(namespace) ? namespace : void 0;
+};
+var isAncestryOriginObje = (obje) => {
+  if (!obje) {
+    return false;
+  }
+  const orig = mediaIdValue(obje, "_ORIG");
+  if (orig?.toLowerCase() === "acom") {
+    return true;
+  }
+  const file = mediaIdValue(obje, "FILE") ?? "";
+  if (parseAncestryNamespaceFromUrl(file)) {
+    return true;
+  }
+  return Boolean(resolveObjeMediaId(obje) && !file.trim());
+};
 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}`;
@@ -1154,8 +1178,25 @@ var Common = class _Common {
   getHeadRecord() {
     return get(this, "HEAD") || get(this.getGedcom(), "HEAD");
   }
+  unwrapHeadRecord(node) {
+    if (!node) {
+      return void 0;
+    }
+    const common = node instanceof List ? node.index(0) : node;
+    if (!common || typeof common.get !== "function") {
+      return void 0;
+    }
+    const nested = common.get("HEAD");
+    if (nested instanceof List) {
+      return nested.index(0) ?? common;
+    }
+    if (nested instanceof _Common) {
+      return nested;
+    }
+    return common;
+  }
   getOriginalHeadRecord() {
-    return get(this, ORIG_HEAD_TAG) || get(this.getGedcom(), ORIG_HEAD_TAG) || get(this.getHeadRecord(), ORIG_HEAD_TAG);
+    return this.unwrapHeadRecord(get(this, ORIG_HEAD_TAG)) || this.unwrapHeadRecord(get(this.getGedcom(), ORIG_HEAD_TAG)) || this.unwrapHeadRecord(get(this.getHeadRecord(), ORIG_HEAD_TAG));
   }
   getSourceHeads() {
     const heads = [this.getOriginalHeadRecord(), this.getHeadRecord()];
@@ -1163,9 +1204,23 @@ var Common = class _Common {
       return Boolean(head && heads.indexOf(head) === index);
     });
   }
+  sourceHeadField(head, path) {
+    const normalized = path.endsWith(".value") ? path.slice(0, -".value".length) : path;
+    const node = head.get(normalized);
+    if (!node) {
+      return void 0;
+    }
+    if (node instanceof List) {
+      return node.index(0)?.toValue();
+    }
+    if (typeof node.toValue === "function") {
+      return node.toValue();
+    }
+    return void 0;
+  }
   getFromSourceHeads(path) {
     for (const head of this.getSourceHeads()) {
-      const value = get(head, path);
+      const value = this.sourceHeadField(head, path);
       if (value !== void 0 && value !== null && value !== "") {
         return value;
       }
@@ -1174,8 +1229,8 @@ var Common = class _Common {
   }
   sourStartsWith(prefix) {
     return this.getSourceHeads().some((head) => {
-      const sour = get(head, "SOUR.value");
-      return !!sour?.toLowerCase()?.startsWith(prefix);
+      const sour = this.sourceHeadField(head, "SOUR");
+      return typeof sour === "string" && sour.toLowerCase().startsWith(prefix);
     });
   }
   isGenoPro() {
@@ -1185,7 +1240,7 @@ var Common = class _Common {
     return this.sourStartsWith("ahnenblatt");
   }
   isGeni() {
-    return this.sourStartsWith("geni");
+    return this.sourStartsWith("geni.com");
   }
   isAncestry() {
     return this.sourStartsWith("ancestry");
@@ -1193,6 +1248,51 @@ var Common = class _Common {
   isMyHeritage() {
     return this.sourStartsWith("myheritage");
   }
+  /**
+   * GEDCOM root for Ancestry media helpers.
+   * `this._gedcom` when called on a child record; `this` when called on the file root.
+   *
+   * Cannot use `instanceof GedCom`: `GedComType` is a type alias (erased at runtime),
+   * and importing the `GedCom` class here would cycle (`GedCom extends Common`).
+   * The root is the only Common with an `objes()` method.
+   */
+  hostGedcom() {
+    const linked = this.getGedcom();
+    if (linked) {
+      return linked;
+    }
+    if ("objes" in this && typeof this.objes === "function") {
+      return this;
+    }
+    return void 0;
+  }
+  /** True when the file still has Ancestry tree media (`_ORIG acom`, `_OID`, retrieval URL). */
+  hasAncestryOriginMedia() {
+    const objes = this.hostGedcom()?.objes?.();
+    return objes?.values().some((obje) => isAncestryOriginObje(obje)) ?? false;
+  }
+  /**
+   * Namespace for Ancestry tree photos. Prefer a `namespaces/{id}` FILE URL
+   * (TreeViz GEDCOM 7 / GEDZIP export), otherwise 1093 for member-tree media.
+   */
+  getAncestryMediaNamespace() {
+    const objes = this.hostGedcom()?.objes?.();
+    if (objes) {
+      for (const obje of objes.values()) {
+        const file = obje?.get("FILE")?.toValue();
+        const fromUrl = parseAncestryNamespaceFromUrl(
+          typeof file === "string" ? file : void 0
+        );
+        if (fromUrl) {
+          return fromUrl;
+        }
+      }
+    }
+    if (this.isAncestry() || this.hasAncestryOriginMedia()) {
+      return ANCESTRY_TREE_MEDIA_NAMESPACE;
+    }
+    return void 0;
+  }
   /**
    * Get the source type as a string (for prefixing tree IDs and names)
    * Returns the detected source type or undefined if unknown
@@ -1209,13 +1309,13 @@ var Common = class _Common {
   }
   isFamilySearch() {
     return this.getSourceHeads().some((head) => {
-      const sourName = get(head, "SOUR.NAME.value");
+      const sourName = this.sourceHeadField(head, "SOUR.NAME");
       return sourName === "FamilySearch API";
     });
   }
   isGNO2GED() {
     return this.getSourceHeads().some((head) => {
-      const sour = get(head, "SOUR.value");
+      const sour = this.sourceHeadField(head, "SOUR");
       return sour === "GNO2GED";
     });
   }
@@ -1260,8 +1360,7 @@ var Common = class _Common {
     return this.getFromSourceHeads("SOUR._TREE.value") || (get(this, "HEAD.SOUR._TREE.value") || get(this.getGedcom(), "HEAD.SOUR._TREE.value"));
   }
   getMyHeritageTreeName() {
-    const path = "HEAD.FILE.value";
-    const treeDetails = get(this, path) || get(this.getGedcom(), path);
+    const treeDetails = this.getFromSourceHeads("FILE.value") || (get(this, "HEAD.FILE.value") || get(this.getGedcom(), "HEAD.FILE.value"));
     return treeDetails?.match(
       /Exported by MyHeritage.com from (?<tree>.+) in.+$/
     )?.groups?.tree;
@@ -1278,7 +1377,7 @@ var Common = class _Common {
     if (treeName) {
       return treeName;
     }
-    const fileName = get(this, "HEAD.FILE.value") || get(this.getGedcom(), "HEAD.FILE.value");
+    const fileName = this.getFromSourceHeads("FILE.value") || get(this, "HEAD.FILE.value") || get(this.getGedcom(), "HEAD.FILE.value");
     return fileName || "FamilySearch Import";
   }
   getAhnenblattTreeId() {
@@ -2873,6 +2972,45 @@ var implemented = (type, ...args) => {
 var notImplemented = (type, ...args) => {
   console.error(`[Not Implemented] ${type}`, ...args);
 };
+
+// src/utils/multimedia.ts
+var inferMediaForm = (file, fallback = "bin") => {
+  const withoutQuery = file.split("?")[0] || file;
+  const ext = getFileExtension(withoutQuery);
+  if (ext) {
+    return ext.toLowerCase() === "jpeg" ? "jpg" : ext.toLowerCase();
+  }
+  return fallback;
+};
+var mergeMediaLists = (...lists) => {
+  const merged = {};
+  for (const list of lists) {
+    if (!list) continue;
+    Object.assign(merged, list);
+  }
+  return merged;
+};
+var mergeMediaListsByObjeKey = (...lists) => {
+  const merged = {};
+  const seen = /* @__PURE__ */ new Set();
+  for (const list of lists) {
+    if (!list) {
+      continue;
+    }
+    for (const [id, item] of Object.entries(list)) {
+      const objeKey = item.key ? String(item.key) : "";
+      if (objeKey && seen.has(objeKey)) {
+        continue;
+      }
+      merged[id] = item;
+      if (objeKey) {
+        seen.add(objeKey);
+      }
+    }
+  }
+  return merged;
+};
+var isObjePointer = (value) => typeof value === "string" && /^@O\d+@$/.test(value);
 var uniqueItemsCache = /* @__PURE__ */ new WeakMap();
 var setNestedGroup = (obj, key, value, uniqueCounting = true) => {
   const parts = Array.isArray(key) ? key : key.split(/,\s*/);
@@ -3651,10 +3789,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(
@@ -4137,7 +4277,10 @@ var Indi = class extends Common {
     return result;
   }
   ancestryLink() {
-    const www = this.getFromSourceHeads("SOUR.CORP.WWW.value") || this._gedcom?.HEAD?.SOUR?.CORP?.WWW?.value;
+    let www = this.getFromSourceHeads("SOUR.CORP.WWW.value") || this._gedcom?.HEAD?.SOUR?.CORP?.WWW?.value;
+    if (!www || /treeviz/i.test(String(www))) {
+      www = "www.ancestry.com";
+    }
     const tree = this.getAncestryTreeId();
     if (this.id) {
       return `https://${www}/family-tree/person/tree/${tree}/person/${this.id.replace(
@@ -4149,14 +4292,15 @@ var Indi = class extends Common {
   async ancestryMedia(namespace) {
     const list = {};
     const objeList = this.get("OBJE")?.toList().copy();
-    const www = this.getFromSourceHeads("SOUR.CORP.WWW.value") || this._gedcom?.HEAD?.SOUR?.CORP?.WWW?.value;
+    this.getFromSourceHeads("SOUR.CORP.WWW.value") || this._gedcom?.HEAD?.SOUR?.CORP?.WWW?.value;
     const tree = this.getAncestryTreeId();
+    const usedNamespace = namespace || this.getAncestryMediaNamespace() || ANCESTRY_TREE_MEDIA_NAMESPACE;
     if (objeList) {
       await Promise.all(
         objeList.map(async (objeRef) => {
           const key = objeXrefKey(objeRef, 0);
           const obje = objeRef?.standardizeMedia(
-            namespace,
+            usedNamespace,
             true,
             ancestryMediaFileUrl
           );
@@ -4168,27 +4312,9 @@ var Indi = class extends Common {
           const type = resolveObjeForm(obje) ?? (url ? getFileExtension(url) : void 0) ?? "raw";
           let imgId = media;
           const hasEmbeddedOrLocalFile = !!url && (url.startsWith("data:") || url.startsWith("blob:") || !/^https?:\/\//i.test(url));
-          if (!hasEmbeddedOrLocalFile && (!www || !tree || !this.id)) {
-            return;
-          }
           if (!this.id) {
             return;
           }
-          if (!namespace && !url) {
-            try {
-              if (media) {
-                const mediaDetailsResponse = await fetch(
-                  `https://www.ancestry.com/api/media/viewer/v2/trees/${tree}/media?id=${media}`
-                );
-                const mediaDetails = await mediaDetailsResponse.json();
-                if (mediaDetails.url) {
-                  url = `${mediaDetails.url}&imageQuality=hq`;
-                }
-              }
-            } catch (_e) {
-            }
-            url = url || `https://${www}/mediaui-viewer/tree/${tree}/media/${media}`;
-          }
           if (!imgId && hasEmbeddedOrLocalFile && url) {
             imgId = typeof media === "string" && media || `local-${String(key).replace(/[@]/g, "")}-${getFileExtension(url) || "bin"}`;
           }
@@ -4213,14 +4339,25 @@ var Indi = class extends Common {
     }
     return list;
   }
-  myheritageLink(poolId = 0) {
-    const www = (this.getFromSourceHeads("SOUR.CORP.value") || this._gedcom?.HEAD?.SOUR?.CORP?.value)?.toLowerCase().replace(/^www\./gi, "");
+  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._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() {
@@ -4269,6 +4406,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) => {
@@ -4437,16 +4582,26 @@ var Indi = class extends Common {
     return list;
   }
   async multimedia(namespace) {
-    if (this?.isAncestry()) {
-      return await this.ancestryMedia(namespace);
+    const lists = [];
+    const ownObjes = this.get("OBJE")?.toList()?.values() ?? [];
+    const ownAncestryMedia = ownObjes.some(
+      (obje) => !!obje && (isAncestryOriginObje(obje) || isAncestryOriginObje(obje.ref))
+    );
+    if (this.isAncestry() || ownAncestryMedia) {
+      lists.push(
+        await this.ancestryMedia(
+          namespace || this.getAncestryMediaNamespace()
+        )
+      );
     }
     if (this?.isMyHeritage()) {
-      return this.myheritageMedia();
+      lists.push(this.myheritageMedia());
     }
     if (this?.isGeni()) {
-      return this.geniMedia();
+      lists.push(this.geniMedia());
     }
-    return this.universalMedia();
+    lists.push(this.universalMedia());
+    return mergeMediaListsByObjeKey(...lists);
   }
   async getProfilePicture(namespace, onlyPrimary = true) {
     if (!this.id) {
@@ -4539,12 +4694,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();
@@ -6304,11 +6462,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" },
@@ -6386,15 +6561,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";
     }
@@ -6671,7 +6840,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}`;
   }
 };
 
@@ -6871,6 +7045,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}`;
   }
 };
@@ -8029,6 +8207,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";
@@ -8188,10 +8399,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;
   }
@@ -9199,7 +9410,8 @@ var extractGedzip = async (data) => {
   if (!preferred) {
     throw new Error("No .ged file found in the archive.");
   }
-  const gedcomText = await preferred.async("string");
+  const gedcomBytes = await preferred.async("uint8array");
+  const gedcomText = new TextDecoder("utf-8").decode(gedcomBytes);
   const mediaEntries = [];
   for (const entry of entries) {
     const path = normalizeZipPath(entry.name);
@@ -9773,7 +9985,7 @@ var collectExtensionTagsFrom = (node, into = /* @__PURE__ */ new Set()) => {
 // package.json
 var package_default = {
   name: "@treeviz/gedcom-parser",
-  version: "2.1.17"};
+  version: "2.1.22"};
 
 // src/utils/get-product-details.ts
 var isDevelopment = () => {
@@ -9782,25 +9994,6 @@ var isDevelopment = () => {
 var getVersion = () => package_default.version;
 var getName = () => package_default.name;
 
-// src/utils/multimedia.ts
-var inferMediaForm = (file, fallback = "bin") => {
-  const withoutQuery = file.split("?")[0] || file;
-  const ext = getFileExtension(withoutQuery);
-  if (ext) {
-    return ext.toLowerCase() === "jpeg" ? "jpg" : ext.toLowerCase();
-  }
-  return fallback;
-};
-var mergeMediaLists = (...lists) => {
-  const merged = {};
-  for (const list of lists) {
-    if (!list) continue;
-    Object.assign(merged, list);
-  }
-  return merged;
-};
-var isObjePointer = (value) => typeof value === "string" && /^@O\d+@$/.test(value);
-
 // src/classes/note.ts
 var CommonNote = class extends Common {
   constructor(gedcom, id, main, parent) {
@@ -9951,6 +10144,10 @@ var Obje = class extends Common {
     if (lkidNode && !newObject.get("_LKID")) {
       newObject.set("_LKID", lkidNode);
     }
+    const origNode = this.get("_ORIG");
+    if (origNode && !newObject.get("_ORIG")) {
+      newObject.set("_ORIG", origNode);
+    }
     if (override) {
       this.remove("FILE");
       this.remove("FORM");
@@ -10938,6 +11135,7 @@ var GedcomTree = {
     return this.parseHierarchy(content, options);
   },
   parseHierarchy: function(content, options) {
+    content = content.replace(/^\uFEFF+/, "");
     const { settings, filename = "" } = options ?? {};
     const { linkedPersons = "skip", linkingKey } = settings ?? {};
     const gedcom = createGedCom();
@@ -11451,4 +11649,4 @@ var hydrateFromContentAsync = async (content, options) => {
   return hydrateFromContent(content, options);
 };
 
-export { ACCEPTED_DATE_FORMATS, ACCEPTED_DATE_FORMATS_REGEX, ANCESTRY_MEDIA_RETRIEVAL_PREFIX, DEFAULT_GEDCOM_EXPORT_VERSION, GEDCOM7_CALENDARS, GEDCOM7_PEDI_VALUES, GEDCOM7_RESN_VALUES, GEDCOM7_ROLE_VALUES, GEDCOM7_SEX_VALUES, GEDCOM_EXPORT_VERSIONS, GEDCOM_TRAILER_TAG, GEDZIP_EXTENSION, GEDZIP_GEDCOM_ENTRY, GEDZIP_MIME, parser_default as GedcomTree, PEDIGREE_VALUES, PlaceType, STRUCTURAL_FORMAT, STRUCTURAL_VERSION, TREEVIZ_EXTENSION_BASE_URI, TREEVIZ_EXTENSION_URIS, addFamilyFact, addIndividualFact, addNonEvent, ancestryMediaFileUrl, appendGedcomTrailer, applyGedcom7DatePhrases, applyGedcom7Enumerations, applyGedcom7RecordMetadata, attachChildToFamily, attachSpouseToFamily, buildGedzip, buildGedzipBlob, bytesToDataUrl, cacheDiscoveredPath, canAttachAsSpouse, collectExtensionTagsFrom, commonDateFormatter, consolidateChildIntoFamily, coupleKeyForFam, create, createEmptyGedcom, createGedcomUid, dateFormatter, deleteIndividual, downloadGedzipMedia, ensureExtensionSchema, extractGedzip, extractGedzipGedcom, extractSeparationYears, extractSplitPoints, familyHasChild, familyHasParent, findDegenerateFamiliesForIndi, findDuplicateCoupleFamiliesForIndi, findMatchingRangeForSplitRange, findReusableParentChildFamily, firstPointerId, formatGedcom7Timestamp, fromObject, fromObjectAsync, fromTuple, generateSplitRanges, getAllProp, getExtensionSchema, getFamilyWith, getFileExtension, getName, getPlaceParts, getPlaces, getRawSize, getVersion, hungarianOrdinalize, hydrateFromContent, hydrateFromContentAsync, implemented, inRange, inferMediaForm, initializeCache, isDegenerateFamily, isDevelopment, isGedcom7, isGedcomTrailerLine, isGedcomTrailerTag, isGedzipContainer, isImageFormat, isIntersectedRange, isObjePointer, isRangeContained, isRemoteOrEmbeddedMediaUrl, isStructuralEnvelope, makePointer, marriageDateFormatter, mergeDuplicateCoupleFamilies, mergeMediaLists, nameFormatter, nextRecordId, normalizeGedcomVersion, notImplemented, noteDateFormatter, objeNoteValue, objeXrefKey, ordinalize, parseGedcom7CalendarPrefix, parseRangeBounds, parseStructuralEnvelope, pathCache, placeTranslator, pointerIds, profilePictureCache, pruneEmptyFamilies, pruneFamiliesByIds, registerExtensionTag, relativesCache, remountGedzipMediaAsDataUrls, removePointerByValue, resetRelativesCache, resolveLocalMediaUrl, resolveMediaContent, resolveObjeForm, resolveObjeMediaId, rewriteGedcomFilePaths, serializeStructural, setCauseOfDeath, setChildPedigree, setDeceased, setFamilyMarriage, setLocalMediaResolver, setMediaContentResolver, setNestedGroup, splitOverlappingRanges, splitRange, spouseTagFor, toGedcomPedigree, unlinkRelative, updateFactRecord, withGedcom7Calendar };
+export { ACCEPTED_DATE_FORMATS, ACCEPTED_DATE_FORMATS_REGEX, ANCESTRY_MEDIA_RETRIEVAL_PREFIX, ANCESTRY_TREE_MEDIA_NAMESPACE, DEFAULT_GEDCOM_EXPORT_VERSION, GEDCOM7_CALENDARS, GEDCOM7_PEDI_VALUES, GEDCOM7_RESN_VALUES, GEDCOM7_ROLE_VALUES, GEDCOM7_SEX_VALUES, GEDCOM_EXPORT_VERSIONS, GEDCOM_TRAILER_TAG, GEDZIP_EXTENSION, GEDZIP_GEDCOM_ENTRY, GEDZIP_MIME, parser_default as GedcomTree, PEDIGREE_VALUES, PlaceType, STRUCTURAL_FORMAT, STRUCTURAL_VERSION, TREEVIZ_EXTENSION_BASE_URI, TREEVIZ_EXTENSION_URIS, addFamilyFact, addIndividualFact, addNonEvent, ancestryMediaFileUrl, appendGedcomTrailer, applyGedcom7DatePhrases, applyGedcom7Enumerations, applyGedcom7RecordMetadata, attachChildToFamily, attachSpouseToFamily, buildGedzip, buildGedzipBlob, bytesToDataUrl, cacheDiscoveredPath, canAttachAsSpouse, collectExtensionTagsFrom, commonDateFormatter, consolidateChildIntoFamily, coupleKeyForFam, create, createEmptyGedcom, createGedcomUid, dateFormatter, deleteIndividual, downloadGedzipMedia, ensureExtensionSchema, extractGedzip, extractGedzipGedcom, extractSeparationYears, extractSplitPoints, familyHasChild, familyHasParent, findDegenerateFamiliesForIndi, findDuplicateCoupleFamiliesForIndi, findMatchingRangeForSplitRange, findReusableParentChildFamily, firstPointerId, formatGedcom7Timestamp, fromObject, fromObjectAsync, fromTuple, generateSplitRanges, getAllProp, getExtensionSchema, getFamilyWith, getFileExtension, getName, getPlaceParts, getPlaces, getRawSize, getVersion, hungarianOrdinalize, hydrateFromContent, hydrateFromContentAsync, implemented, inRange, inferMediaForm, initializeCache, isAncestryOriginObje, isDegenerateFamily, isDevelopment, isGedcom7, isGedcomTrailerLine, isGedcomTrailerTag, isGedzipContainer, isImageFormat, isIntersectedRange, isObjePointer, isRangeContained, isRemoteOrEmbeddedMediaUrl, isStructuralEnvelope, makePointer, marriageDateFormatter, mergeDuplicateCoupleFamilies, mergeMediaLists, mergeMediaListsByObjeKey, nameFormatter, nextRecordId, normalizeGedcomVersion, notImplemented, noteDateFormatter, objeNoteValue, objeXrefKey, ordinalize, parseAncestryNamespaceFromUrl, parseGedcom7CalendarPrefix, parseRangeBounds, parseStructuralEnvelope, pathCache, placeTranslator, pointerIds, profilePictureCache, pruneEmptyFamilies, pruneFamiliesByIds, registerExtensionTag, relativesCache, remountGedzipMediaAsDataUrls, removePointerByValue, resetRelativesCache, resolveLocalMediaUrl, resolveMediaContent, resolveObjeForm, resolveObjeMediaId, rewriteGedcomFilePaths, serializeStructural, setCauseOfDeath, setChildPedigree, setDeceased, setFamilyMarriage, setLocalMediaResolver, setMediaContentResolver, setNestedGroup, splitOverlappingRanges, splitRange, spouseTagFor, toGedcomPedigree, unlinkRelative, updateFactRecord, withGedcom7Calendar };

package/dist/utils/media-utils.d.ts

@@ -24,6 +24,16 @@ type ObjeGetter = {
  * have `_OID` without `_MSER._LKID`; both are the UUID used in media URLs.
  */
 export declare const resolveObjeMediaId: (obje?: ObjeGetter) => string | undefined;
+/**
+ * Ancestry member-tree photos (user uploads) always live in media
+ * namespace 1093. Ancestry GEDCOM exports do not store this id — only
+ * `_OID` / `_MSER._LKID` UUIDs and `_ORIG acom`. Other namespaces
+ * (e.g. 7163) are historical record databases, not tree media.
+ */
+export declare const ANCESTRY_TREE_MEDIA_NAMESPACE = 1093;
+export declare const parseAncestryNamespaceFromUrl: (url?: string) => number | undefined;
+/** Tree-media object from Ancestry: `_ORIG acom`, empty FILE + UUID, or a retrieval URL. */
+export declare const isAncestryOriginObje: (obje?: ObjeGetter) => boolean;
 /** Ancestry tree media host used by their viewer. */
 export declare const ANCESTRY_MEDIA_RETRIEVAL_PREFIX = "https://www.ancestry.com/api/media/retrieval/v2/image";
 export declare const ancestryMediaFileUrl: (namespace?: string | number, imgId?: string) => string | undefined;

package/dist/utils/media-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media-utils.d.ts","sourceRoot":"","sources":["../../src/utils/media-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,eAAO,MAAM,gBAAgB,GAAI,UAAU,MAAM,KAAG,MAenD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,KAAG,OAyB9C,CAAC;AAEF,6EAA6E;AAC7E,eAAO,MAAM,eAAe,GAAI,OAAO;IACtC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK;QAAE,OAAO,CAAC,EAAE,MAAM,OAAO,CAAA;KAAE,GAAG,SAAS,CAAC;CAClE,KAAG,MAAM,GAAG,SAKZ,CAAC;AAEF,KAAK,UAAU,GAAG;IACjB,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK;QAAE,OAAO,CAAC,EAAE,MAAM,OAAO,CAAA;KAAE,GAAG,SAAS,CAAC;CAClE,CAAC;AAOF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,OAAO,UAAU,KAAG,MAAM,GAAG,SAKpC,CAAC;AAE7B,qDAAqD;AACrD,eAAO,MAAM,+BAA+B,0DACY,CAAC;AAMzD,eAAO,MAAM,oBAAoB,GAChC,YAAY,MAAM,GAAG,MAAM,EAC3B,QAAQ,MAAM,KACZ,MAAM,GAAG,SAKX,CAAC;AAEF,0FAA0F;AAC1F,eAAO,MAAM,WAAW,GACvB,OAAO;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,OAAO,CAAA;CAAE,EAC/C,WAAU,MAAM,GAAG,MAAU,KAC3B,MAYF,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,OAAO,UAAU,KAAG,MACkB,CAAC"}
+{"version":3,"file":"media-utils.d.ts","sourceRoot":"","sources":["../../src/utils/media-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,eAAO,MAAM,gBAAgB,GAAI,UAAU,MAAM,KAAG,MAenD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,KAAG,OAyB9C,CAAC;AAEF,6EAA6E;AAC7E,eAAO,MAAM,eAAe,GAAI,OAAO;IACtC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK;QAAE,OAAO,CAAC,EAAE,MAAM,OAAO,CAAA;KAAE,GAAG,SAAS,CAAC;CAClE,KAAG,MAAM,GAAG,SAKZ,CAAC;AAEF,KAAK,UAAU,GAAG;IACjB,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK;QAAE,OAAO,CAAC,EAAE,MAAM,OAAO,CAAA;KAAE,GAAG,SAAS,CAAC;CAClE,CAAC;AAOF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,OAAO,UAAU,KAAG,MAAM,GAAG,SAKpC,CAAC;AAE7B;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,OAAO,CAAC;AAIlD,eAAO,MAAM,6BAA6B,GACzC,MAAM,MAAM,KACV,MAAM,GAAG,SAOX,CAAC;AAEF,4FAA4F;AAC5F,eAAO,MAAM,oBAAoB,GAAI,OAAO,UAAU,KAAG,OAaxD,CAAC;AAEF,qDAAqD;AACrD,eAAO,MAAM,+BAA+B,0DACY,CAAC;AAMzD,eAAO,MAAM,oBAAoB,GAChC,YAAY,MAAM,GAAG,MAAM,EAC3B,QAAQ,MAAM,KACZ,MAAM,GAAG,SAKX,CAAC;AAEF,0FAA0F;AAC1F,eAAO,MAAM,WAAW,GACvB,OAAO;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,OAAO,CAAA;CAAE,EAC/C,WAAU,MAAM,GAAG,MAAU,KAC3B,MAYF,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,OAAO,UAAU,KAAG,MACkB,CAAC"}

package/dist/utils/multimedia.d.ts

@@ -34,5 +34,10 @@ export declare const inferMediaForm: (file: string, fallback?: string) => string
  * Merge MediaList maps (later entries overwrite same keys).
  */
 export declare const mergeMediaLists: (...lists: Array<MediaList | undefined>) => MediaList;
+/**
+ * Merge media from vendor resolvers and local/GEDZIP FILE payloads.
+ * First list wins when the same OBJE xref appears twice.
+ */
+export declare const mergeMediaListsByObjeKey: (...lists: Array<MediaList | undefined>) => MediaList;
 export declare const isObjePointer: (value: unknown) => value is ObjeKey;
 //# sourceMappingURL=multimedia.d.ts.map

package/dist/utils/multimedia.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multimedia.d.ts","sourceRoot":"","sources":["../../src/utils/multimedia.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG5D,MAAM,MAAM,qBAAqB,GAAG;IACnC,iDAAiD;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,aAAa,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACtC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,iBAAgB,WAO5D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,GAAI,GAAG,OAAO,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC,cAOrE,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,OACJ,CAAC"}
+{"version":3,"file":"multimedia.d.ts","sourceRoot":"","sources":["../../src/utils/multimedia.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG5D,MAAM,MAAM,qBAAqB,GAAG;IACnC,iDAAiD;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,aAAa,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACtC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,iBAAgB,WAO5D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,GAAI,GAAG,OAAO,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC,cAOrE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,GACpC,GAAG,OAAO,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC,cAoBtC,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,OACJ,CAAC"}

package/dist/utils/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/utils/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAoB,MAAM,mBAAmB,CAAC;AAgB7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAuB,QAAQ,EAAW,MAAM,gBAAgB,CAAC;AA4D7E,QAAA,MAAM,UAAU;qBAEL,MAAM,YACL;QAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE;;;;8BAK3C,MAAM,YACL;QAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE;;;;oBA6ThD,MAAM,QACJ,QAAQ,UACN,MAAM,QACR,MAAM;CAuBb,CAAC;AAOF,eAAe,UAAU,CAAC;AAE1B,eAAO,MAAM,iBAAiB,GAAI,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,4BAchE,CAAC"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/utils/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAoB,MAAM,mBAAmB,CAAC;AAgB7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAuB,QAAQ,EAAW,MAAM,gBAAgB,CAAC;AA4D7E,QAAA,MAAM,UAAU;qBAEL,MAAM,YACL;QAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE;;;;8BAK3C,MAAM,YACL;QAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE;;;;oBAgUhD,MAAM,QACJ,QAAQ,UACN,MAAM,QACR,MAAM;CAuBb,CAAC;AAOF,eAAe,UAAU,CAAC;AAE1B,eAAO,MAAM,iBAAiB,GAAI,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,4BAchE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@treeviz/gedcom-parser",
-	"version": "2.1.17",
+	"version": "2.1.22",
 	"description": "Lightweight, pluggable GEDCOM parser for JavaScript/TypeScript with optional caching and place matching. Zero browser dependencies.",
 	"type": "module",
 	"main": "dist/index.js",