@treeviz/gedcom-parser 2.1.16 → 2.1.18

package/dist/kinship-translator/index.js

@@ -2416,6 +2416,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}`;
@@ -2791,8 +2815,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()];
@@ -2800,9 +2841,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;
       }
@@ -2811,8 +2866,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() {
@@ -2830,6 +2885,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
@@ -2846,13 +2946,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";
     });
   }
@@ -2897,8 +2997,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;
@@ -2915,7 +3014,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() {
@@ -4995,6 +5094,28 @@ var resolveLocalMediaUrl = async (path, context) => {
 };
 var implemented = (type, ...args) => {
 };
+
+// src/utils/multimedia.ts
+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 uniqueItemsCache = /* @__PURE__ */ new WeakMap();
 var setNestedGroup = (obj, key, value, uniqueCounting = true) => {
   const parts = Array.isArray(key) ? key : key.split(/,\s*/);
@@ -6254,7 +6375,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(
@@ -6266,14 +6390,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
           );
@@ -6285,27 +6410,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"}`;
           }
@@ -6331,9 +6438,12 @@ 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, "");
+    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";
+    }
     const site = this.getMyHeritageTreeId();
-    const file = this._gedcom?.HEAD?.get("FILE")?.toValue()?.match(/Exported by MyHeritage.com from .+ in (?<site>.+) on .+$/)?.groups?.site;
+    const file = (this.getFromSourceHeads("FILE.value") || this._gedcom?.HEAD?.get("FILE")?.toValue())?.match(/Exported by MyHeritage.com from .+ in (?<site>.+) on .+$/)?.groups?.site;
     const normalizedFile = file?.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-");
     if (normalizedFile && this.id) {
       const id = Number(this.id.replace(/@|I/g, "")) + poolId;
@@ -6554,16 +6664,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) {