@treeviz/gedcom-parser 2.1.28 → 2.1.30

package/dist/cli/index.js

@@ -140,6 +140,100 @@ var objeXrefKey = (obje, fallback = 0) => {
   return `@O${fallback}@`;
 };
 var objeNoteValue = (obje) => mediaIdValue(obje, "FILE.NOTE") || mediaIdValue(obje, "NOTE") || "";
+var FS_WEB_RE = /familysearch\.org/i;
+var FS_ARK_ID_RE = /^(?:ark:\/[^/]+\/)?([123]:[12]:[A-Za-z0-9-]+)$/i;
+var listItems = (list) => {
+  if (!list) {
+    return [];
+  }
+  if (typeof list.values === "function") {
+    return list.values();
+  }
+  if (typeof list.forEach === "function") {
+    const items = [];
+    list.forEach((item) => items.push(item));
+    return items;
+  }
+  return [];
+};
+var toList = (node) => {
+  if (!node) {
+    return void 0;
+  }
+  const maybe = node;
+  if (typeof maybe.toList === "function") {
+    return maybe.toList();
+  }
+  if (typeof maybe.values === "function" || typeof maybe.forEach === "function") {
+    return maybe;
+  }
+  return void 0;
+};
+var normalizeFsWebUrl = (url) => {
+  const trimmed = url.trim();
+  if (!trimmed || !FS_WEB_RE.test(trimmed)) {
+    return void 0;
+  }
+  if (/\/dist\.jpg|\/service\/records\/storage\/|\/platform\//i.test(trimmed)) {
+    return void 0;
+  }
+  return trimmed;
+};
+var familySearchMediaOriginUrl = (obje, indi) => {
+  if (!obje) {
+    return void 0;
+  }
+  const resolved = obje.ref && typeof obje.toValue?.() === "string" ? obje.ref : obje;
+  const directWww = mediaIdValue(resolved, "WWW") || mediaIdValue(obje, "WWW");
+  const fromWww = directWww ? normalizeFsWebUrl(directWww) : void 0;
+  if (fromWww) {
+    return fromWww;
+  }
+  const objeKey = objeXrefKey(obje);
+  const sourItems = listItems(toList(indi?.get?.("SOUR")));
+  for (const sour of sourItems) {
+    if (!sour) continue;
+    const sourWww = mediaIdValue(sour, "WWW");
+    const normalized = sourWww ? normalizeFsWebUrl(sourWww) : void 0;
+    if (!normalized) continue;
+    const sourIsFs = mediaIdValue(sour, "_IS_FS") === "Y" || FS_WEB_RE.test(normalized);
+    if (!sourIsFs) continue;
+    let linksThisObje = false;
+    for (const ref of listItems(toList(sour.get?.("OBJE")))) {
+      if (ref && objeXrefKey(ref) === objeKey) {
+        linksThisObje = true;
+        break;
+      }
+    }
+    const sourFsId = mediaIdValue(sour, "_FS_ID");
+    const objeFsId = mediaIdValue(resolved, "_FS_ID") || mediaIdValue(obje, "_FS_ID");
+    if (linksThisObje || sourFsId && objeFsId && sourFsId === objeFsId) {
+      return normalized;
+    }
+  }
+  const isFs = mediaIdValue(resolved, "_IS_FS") === "Y" || mediaIdValue(obje, "_IS_FS") === "Y";
+  const fsId = mediaIdValue(resolved, "_FS_ID") || mediaIdValue(obje, "_FS_ID");
+  if (!isFs || !fsId) {
+    return void 0;
+  }
+  const arkMatch = fsId.match(FS_ARK_ID_RE);
+  if (arkMatch?.[1]) {
+    return `https://www.familysearch.org/ark:/61903/${arkMatch[1]}`;
+  }
+  if (/^\d+$/.test(fsId)) {
+    return `https://www.familysearch.org/photos/artifacts/${fsId}`;
+  }
+  for (const sour of sourItems) {
+    if (!sour) continue;
+    if (mediaIdValue(sour, "_FS_ID") !== fsId) continue;
+    const sourWww = mediaIdValue(sour, "WWW");
+    const normalized = sourWww ? normalizeFsWebUrl(sourWww) : void 0;
+    if (normalized) {
+      return normalized;
+    }
+  }
+  return void 0;
+};
 var List = class _List {
   // length = 0;
   constructor(items) {
@@ -2257,6 +2351,14 @@ var mergeMediaListsByObjeKey = (...lists) => {
     for (const [id, item] of Object.entries(list)) {
       const objeKey = item.key ? String(item.key) : "";
       if (objeKey && seen.has(objeKey)) {
+        if (item.originUrl) {
+          const existing = Object.values(merged).find(
+            (entry) => entry.key === objeKey
+          );
+          if (existing && !existing.originUrl) {
+            existing.originUrl = item.originUrl;
+          }
+        }
         continue;
       }
       merged[id] = item;
@@ -3470,6 +3572,10 @@ var Indi = class extends Common {
           }
           if (url && imgId) {
             const id = `${tree || "gedzip"}-${this.id}-${imgId}`;
+            const originUrl = familySearchMediaOriginUrl(
+              objeRef ?? obje,
+              this
+            );
             list[id] = {
               key,
               isPrimary,
@@ -3481,7 +3587,8 @@ var Indi = class extends Common {
               note,
               url,
               contentType: type,
-              downloadName: `${this.id.replaceAll("@", "")}_${this.toNaturalName()?.replaceAll(" ", "-") || ""}_${(title || key.replaceAll("@", "").toString()).replaceAll(" ", "-")}`
+              downloadName: `${this.id.replaceAll("@", "")}_${this.toNaturalName()?.replaceAll(" ", "-") || ""}_${(title || key.replaceAll("@", "").toString()).replaceAll(" ", "-")}`,
+              ...originUrl ? { originUrl } : {}
             };
           }
         })
@@ -3701,18 +3808,39 @@ var Indi = class extends Common {
     if (!this.id) {
       return list;
     }
-    const objeList = this.get("OBJE")?.toList().copy();
+    let objeList = this.get("OBJE")?.toList().copy();
+    const sourList = this.get("SOUR")?.toList();
+    sourList?.forEach((sour) => {
+      const sourObje = sour?.get("OBJE")?.toList();
+      if (!sourObje?.length) {
+        return;
+      }
+      if (!objeList) {
+        objeList = sourObje.copy();
+      } else {
+        objeList.merge(sourObje);
+      }
+    });
     if (!objeList || objeList.length === 0) {
       return list;
     }
     const rfn = this.get("RFN")?.toValue();
     const treeId = this.getUniversalTreeId() || rfn || "universal";
+    const seenFsIds = /* @__PURE__ */ new Set();
     objeList.forEach((obje, index) => {
       if (!obje) {
         return;
       }
       const key = objeXrefKey(obje, index);
       obje.standardizeMedia();
+      const fsId = obje?.get("_FS_ID")?.toValue?.();
+      if (typeof fsId === "string" && fsId.trim()) {
+        const normalized = fsId.trim();
+        if (seenFsIds.has(normalized)) {
+          return;
+        }
+        seenFsIds.add(normalized);
+      }
       const isPrimary = obje?.get("_PRIM")?.toValue() === "Y";
       const url = obje?.get("FILE")?.toValue();
       const title = obje?.get("FILE.TITL")?.toValue() ?? obje?.get("TITL")?.toValue() ?? "";
@@ -3720,6 +3848,7 @@ var Indi = class extends Common {
       if (url) {
         const imgId = `media-${index}-${url.startsWith("data:") ? getFileExtension(url) || "bin" : url.split("/").pop()?.split("?")[0]?.substring(0, 20) || Date.now().toString(36)}`;
         const id = `${treeId}-${this.id}-${imgId}`;
+        const originUrl = familySearchMediaOriginUrl(obje, this);
         list[id] = {
           isPrimary,
           key,
@@ -3731,7 +3860,8 @@ var Indi = class extends Common {
           note: objeNoteValue(obje),
           url,
           contentType: type,
-          downloadName: `${this.id.replaceAll("@", "")}_${this.toNaturalName()?.replaceAll(" ", "-") || ""}_${(title || key.replaceAll("@", "").toString()).replaceAll(" ", "-")}`
+          downloadName: `${this.id.replaceAll("@", "")}_${this.toNaturalName()?.replaceAll(" ", "-") || ""}_${(title || key.replaceAll("@", "").toString()).replaceAll(" ", "-")}`,
+          ...originUrl ? { originUrl } : {}
         };
       }
     });
@@ -3757,7 +3887,23 @@ var Indi = class extends Common {
       lists.push(this.geniMedia());
     }
     lists.push(this.universalMedia());
-    return mergeMediaListsByObjeKey(...lists);
+    const merged = mergeMediaListsByObjeKey(...lists);
+    const seenFsIds = /* @__PURE__ */ new Set();
+    const deduped = {};
+    for (const [id, media] of Object.entries(merged ?? {})) {
+      const xref = media.key ? String(media.key) : "";
+      const top = xref && this._gedcom ? this._gedcom.obje(xref) : void 0;
+      const fsId = top?.get("_FS_ID")?.toValue?.();
+      if (typeof fsId === "string" && fsId.trim()) {
+        const normalized = fsId.trim();
+        if (seenFsIds.has(normalized)) {
+          continue;
+        }
+        seenFsIds.add(normalized);
+      }
+      deduped[id] = media;
+    }
+    return deduped;
   }
   async getProfilePicture(namespace, onlyPrimary = true) {
     if (!this.id) {
@@ -9279,7 +9425,7 @@ var ensureExtensionSchema = (gedcom, extraTags) => {
 
 // package.json
 var package_default = {
-  version: "2.1.28"};
+  version: "2.1.30"};
 
 // src/utils/get-product-details.ts
 var isDevelopment = () => {
@@ -10319,26 +10465,47 @@ var mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
   const mergedGedcom = targetGedcom;
   const idMap = /* @__PURE__ */ new Map();
   const matchMap = /* @__PURE__ */ new Map();
+  const reusedTopLevelIds = /* @__PURE__ */ new Set();
   const isXref = (value) => !!value && /^@[A-Za-z0-9_]+@$/.test(value.trim());
+  const recordFsId = (item) => {
+    const node = item;
+    const value = node?.get?.("_FS_ID")?.toValue?.();
+    return typeof value === "string" ? value.trim() : "";
+  };
   const allocateTopLevelIds = (sourceList, targetList, prefix) => {
     const used = /* @__PURE__ */ new Set();
-    targetList?.forEach((_item, id) => {
+    const byFsId = /* @__PURE__ */ new Map();
+    targetList?.forEach((item, id) => {
       used.add(String(id));
+      const fsId = recordFsId(item);
+      if (fsId && !byFsId.has(fsId)) {
+        byFsId.set(fsId, String(id));
+      }
     });
     idMap.forEach((mapped) => {
       used.add(String(mapped));
     });
-    sourceList?.forEach((_item, sourceId) => {
+    sourceList?.forEach((item, sourceId) => {
       const sid = String(sourceId);
       if (!sid || idMap.has(sid)) {
         return;
       }
+      const fsId = recordFsId(item);
+      if (fsId && byFsId.has(fsId)) {
+        const existingId = byFsId.get(fsId);
+        idMap.set(sid, existingId);
+        reusedTopLevelIds.add(sid);
+        return;
+      }
       let newId = sid;
       if (used.has(sid)) {
         newId = nextRecordId([...used], prefix);
       }
       used.add(newId);
       idMap.set(sid, newId);
+      if (fsId) {
+        byFsId.set(fsId, newId);
+      }
     });
   };
   const remapIndiPointers = (clonedIndi, sourceIndi, tag) => {
@@ -10358,6 +10525,9 @@ var mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
       }
       const pointer = createCommon(mergedGedcom, void 0, clonedIndi);
       pointer.value = newVal;
+      if (tag === "OBJE" || tag === "SOUR") {
+        pointer.refType = tag;
+      }
       clonedIndi.assign(tag, pointer, true);
     });
   };
@@ -10469,10 +10639,39 @@ var mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
     clonedFam.setGedcom(mergedGedcom);
     clonedFams.set(sourceFam.id, clonedFam);
   });
+  const fillMissingTag = (target, source, tag) => {
+    const current = target.get(tag)?.toValue?.();
+    if (current !== void 0 && current !== null && String(current).trim()) {
+      return;
+    }
+    const next = source.get(tag)?.toValue?.();
+    if (typeof next === "string" && next.trim()) {
+      target.set(tag, next);
+    }
+  };
+  const isBinaryMediaUrl = (url) => /\.(jpe?g|png|gif|webp|tif{1,2}|pdf)(\?|$)/i.test(url) || /dist\.jpg/i.test(url);
   sourceGedcom.objes()?.forEach((sourceObje, sourceId) => {
     if (!sourceObje || !sourceId) return;
+    const sid = String(sourceId);
     const newId = idMap.get(sourceId);
     if (!newId) return;
+    if (reusedTopLevelIds.has(sid)) {
+      const existingObje = mergedGedcom.obje(newId);
+      if (existingObje) {
+        fillMissingTag(existingObje, sourceObje, "WWW");
+        fillMissingTag(existingObje, sourceObje, "TITL");
+        const curFile = String(
+          existingObje.get("FILE")?.toValue?.() ?? ""
+        ).trim();
+        const nextFile = String(
+          sourceObje.get("FILE")?.toValue?.() ?? ""
+        ).trim();
+        if (nextFile && (!curFile || isBinaryMediaUrl(nextFile) && !isBinaryMediaUrl(curFile))) {
+          existingObje.set("FILE", nextFile);
+        }
+      }
+      return;
+    }
     const cloned = sourceObje.clone(false);
     cloned.id = newId;
     cloned.setGedcom(mergedGedcom);
@@ -10485,11 +10684,35 @@ var mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
   });
   sourceGedcom.sours()?.forEach((sourceSour, sourceId) => {
     if (!sourceSour || !sourceId) return;
+    const sid = String(sourceId);
     const newId = idMap.get(sourceId);
     if (!newId) return;
+    if (reusedTopLevelIds.has(sid)) {
+      const existingSour = mergedGedcom.sour(newId);
+      if (existingSour) {
+        fillMissingTag(existingSour, sourceSour, "WWW");
+        fillMissingTag(existingSour, sourceSour, "TITL");
+        fillMissingTag(existingSour, sourceSour, "PAGE");
+      }
+      return;
+    }
     const cloned = sourceSour.clone(false);
     cloned.id = newId;
     cloned.setGedcom(mergedGedcom);
+    const sourObjes = cloned.get("OBJE")?.toList();
+    if (sourObjes?.length) {
+      cloned.remove("OBJE");
+      sourObjes.forEach((ref) => {
+        const oldVal = String(ref?.toValue?.() ?? "").trim();
+        if (!oldVal) return;
+        const newVal = isXref(oldVal) ? idMap.get(oldVal) : oldVal;
+        if (!newVal) return;
+        const pointer = createCommon(mergedGedcom, void 0, cloned);
+        pointer.value = newVal;
+        pointer.refType = "OBJE";
+        cloned.assign("OBJE", pointer, true);
+      });
+    }
     const existing = mergedGedcom.sours();
     const list = existing ?? new Sources();
     if (!existing) {
@@ -10513,6 +10736,7 @@ var mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
             clonedIndi
           );
           newFamRef.value = newFamId;
+          newFamRef.refType = "FAM";
           clonedIndi.assign("FAMS", newFamRef, true);
         }
       }
@@ -10530,6 +10754,7 @@ var mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
             clonedIndi
           );
           newFamRef.value = newFamId;
+          newFamRef.refType = "FAM";
           clonedIndi.assign("FAMC", newFamRef, true);
         }
       }
@@ -10550,6 +10775,7 @@ var mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
           clonedFam
         );
         newHusbRef.value = newHusbId;
+        newHusbRef.refType = "INDI";
         clonedFam.set("HUSB", newHusbRef);
       }
     }
@@ -10563,6 +10789,7 @@ var mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
           clonedFam
         );
         newWifeRef.value = newWifeId;
+        newWifeRef.refType = "INDI";
         clonedFam.set("WIFE", newWifeRef);
       }
     }
@@ -10579,6 +10806,7 @@ var mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
             clonedFam
           );
           newChildRef.value = newChildId;
+          newChildRef.refType = "INDI";
           clonedFam.assign("CHIL", newChildRef, true);
         }
       }
@@ -10840,6 +11068,9 @@ var GedcomTree = {
     }, []);
     let linesJoined = lines.join("\n");
     if (purgeOversized && typeof maxFileSizeToPurge === "number" && !linesJoined.includes("1 _IS_PURGED true") && getRawSize(linesJoined) > maxFileSizeToPurge) {
+      if (!linesJoined.endsWith("\n")) {
+        linesJoined += "\n";
+      }
       linesJoined = linesJoined.replace(
         /1\s(NOTE|OBJE|SOUR)([^\n]*\n)([23456789]\s.+\n)*/gm,
         ""

package/dist/constants/index.js

@@ -464,6 +464,100 @@ var objeXrefKey = (obje, fallback = 0) => {
   return `@O${fallback}@`;
 };
 var objeNoteValue = (obje) => mediaIdValue(obje, "FILE.NOTE") || mediaIdValue(obje, "NOTE") || "";
+var FS_WEB_RE = /familysearch\.org/i;
+var FS_ARK_ID_RE = /^(?:ark:\/[^/]+\/)?([123]:[12]:[A-Za-z0-9-]+)$/i;
+var listItems = (list) => {
+  if (!list) {
+    return [];
+  }
+  if (typeof list.values === "function") {
+    return list.values();
+  }
+  if (typeof list.forEach === "function") {
+    const items = [];
+    list.forEach((item) => items.push(item));
+    return items;
+  }
+  return [];
+};
+var toList = (node) => {
+  if (!node) {
+    return void 0;
+  }
+  const maybe = node;
+  if (typeof maybe.toList === "function") {
+    return maybe.toList();
+  }
+  if (typeof maybe.values === "function" || typeof maybe.forEach === "function") {
+    return maybe;
+  }
+  return void 0;
+};
+var normalizeFsWebUrl = (url) => {
+  const trimmed = url.trim();
+  if (!trimmed || !FS_WEB_RE.test(trimmed)) {
+    return void 0;
+  }
+  if (/\/dist\.jpg|\/service\/records\/storage\/|\/platform\//i.test(trimmed)) {
+    return void 0;
+  }
+  return trimmed;
+};
+var familySearchMediaOriginUrl = (obje, indi) => {
+  if (!obje) {
+    return void 0;
+  }
+  const resolved = obje.ref && typeof obje.toValue?.() === "string" ? obje.ref : obje;
+  const directWww = mediaIdValue(resolved, "WWW") || mediaIdValue(obje, "WWW");
+  const fromWww = directWww ? normalizeFsWebUrl(directWww) : void 0;
+  if (fromWww) {
+    return fromWww;
+  }
+  const objeKey = objeXrefKey(obje);
+  const sourItems = listItems(toList(indi?.get?.("SOUR")));
+  for (const sour of sourItems) {
+    if (!sour) continue;
+    const sourWww = mediaIdValue(sour, "WWW");
+    const normalized = sourWww ? normalizeFsWebUrl(sourWww) : void 0;
+    if (!normalized) continue;
+    const sourIsFs = mediaIdValue(sour, "_IS_FS") === "Y" || FS_WEB_RE.test(normalized);
+    if (!sourIsFs) continue;
+    let linksThisObje = false;
+    for (const ref of listItems(toList(sour.get?.("OBJE")))) {
+      if (ref && objeXrefKey(ref) === objeKey) {
+        linksThisObje = true;
+        break;
+      }
+    }
+    const sourFsId = mediaIdValue(sour, "_FS_ID");
+    const objeFsId = mediaIdValue(resolved, "_FS_ID") || mediaIdValue(obje, "_FS_ID");
+    if (linksThisObje || sourFsId && objeFsId && sourFsId === objeFsId) {
+      return normalized;
+    }
+  }
+  const isFs = mediaIdValue(resolved, "_IS_FS") === "Y" || mediaIdValue(obje, "_IS_FS") === "Y";
+  const fsId = mediaIdValue(resolved, "_FS_ID") || mediaIdValue(obje, "_FS_ID");
+  if (!isFs || !fsId) {
+    return void 0;
+  }
+  const arkMatch = fsId.match(FS_ARK_ID_RE);
+  if (arkMatch?.[1]) {
+    return `https://www.familysearch.org/ark:/61903/${arkMatch[1]}`;
+  }
+  if (/^\d+$/.test(fsId)) {
+    return `https://www.familysearch.org/photos/artifacts/${fsId}`;
+  }
+  for (const sour of sourItems) {
+    if (!sour) continue;
+    if (mediaIdValue(sour, "_FS_ID") !== fsId) continue;
+    const sourWww = mediaIdValue(sour, "WWW");
+    const normalized = sourWww ? normalizeFsWebUrl(sourWww) : void 0;
+    if (normalized) {
+      return normalized;
+    }
+  }
+  return void 0;
+};
 
 // src/classes/common.ts
 var Common = class _Common {
@@ -2392,6 +2486,14 @@ var mergeMediaListsByObjeKey = (...lists) => {
     for (const [id, item] of Object.entries(list)) {
       const objeKey = item.key ? String(item.key) : "";
       if (objeKey && seen.has(objeKey)) {
+        if (item.originUrl) {
+          const existing = Object.values(merged).find(
+            (entry) => entry.key === objeKey
+          );
+          if (existing && !existing.originUrl) {
+            existing.originUrl = item.originUrl;
+          }
+        }
         continue;
       }
       merged[id] = item;
@@ -3706,6 +3808,10 @@ var Indi = class extends Common {
           }
           if (url && imgId) {
             const id = `${tree || "gedzip"}-${this.id}-${imgId}`;
+            const originUrl = familySearchMediaOriginUrl(
+              objeRef ?? obje,
+              this
+            );
             list[id] = {
               key,
               isPrimary,
@@ -3717,7 +3823,8 @@ var Indi = class extends Common {
               note,
               url,
               contentType: type,
-              downloadName: `${this.id.replaceAll("@", "")}_${this.toNaturalName()?.replaceAll(" ", "-") || ""}_${(title || key.replaceAll("@", "").toString()).replaceAll(" ", "-")}`
+              downloadName: `${this.id.replaceAll("@", "")}_${this.toNaturalName()?.replaceAll(" ", "-") || ""}_${(title || key.replaceAll("@", "").toString()).replaceAll(" ", "-")}`,
+              ...originUrl ? { originUrl } : {}
             };
           }
         })
@@ -3937,18 +4044,39 @@ var Indi = class extends Common {
     if (!this.id) {
       return list;
     }
-    const objeList = this.get("OBJE")?.toList().copy();
+    let objeList = this.get("OBJE")?.toList().copy();
+    const sourList = this.get("SOUR")?.toList();
+    sourList?.forEach((sour) => {
+      const sourObje = sour?.get("OBJE")?.toList();
+      if (!sourObje?.length) {
+        return;
+      }
+      if (!objeList) {
+        objeList = sourObje.copy();
+      } else {
+        objeList.merge(sourObje);
+      }
+    });
     if (!objeList || objeList.length === 0) {
       return list;
     }
     const rfn = this.get("RFN")?.toValue();
     const treeId = this.getUniversalTreeId() || rfn || "universal";
+    const seenFsIds = /* @__PURE__ */ new Set();
     objeList.forEach((obje, index) => {
       if (!obje) {
         return;
       }
       const key = objeXrefKey(obje, index);
       obje.standardizeMedia();
+      const fsId = obje?.get("_FS_ID")?.toValue?.();
+      if (typeof fsId === "string" && fsId.trim()) {
+        const normalized = fsId.trim();
+        if (seenFsIds.has(normalized)) {
+          return;
+        }
+        seenFsIds.add(normalized);
+      }
       const isPrimary = obje?.get("_PRIM")?.toValue() === "Y";
       const url = obje?.get("FILE")?.toValue();
       const title = obje?.get("FILE.TITL")?.toValue() ?? obje?.get("TITL")?.toValue() ?? "";
@@ -3956,6 +4084,7 @@ var Indi = class extends Common {
       if (url) {
         const imgId = `media-${index}-${url.startsWith("data:") ? getFileExtension(url) || "bin" : url.split("/").pop()?.split("?")[0]?.substring(0, 20) || Date.now().toString(36)}`;
         const id = `${treeId}-${this.id}-${imgId}`;
+        const originUrl = familySearchMediaOriginUrl(obje, this);
         list[id] = {
           isPrimary,
           key,
@@ -3967,7 +4096,8 @@ var Indi = class extends Common {
           note: objeNoteValue(obje),
           url,
           contentType: type,
-          downloadName: `${this.id.replaceAll("@", "")}_${this.toNaturalName()?.replaceAll(" ", "-") || ""}_${(title || key.replaceAll("@", "").toString()).replaceAll(" ", "-")}`
+          downloadName: `${this.id.replaceAll("@", "")}_${this.toNaturalName()?.replaceAll(" ", "-") || ""}_${(title || key.replaceAll("@", "").toString()).replaceAll(" ", "-")}`,
+          ...originUrl ? { originUrl } : {}
         };
       }
     });
@@ -3993,7 +4123,23 @@ var Indi = class extends Common {
       lists.push(this.geniMedia());
     }
     lists.push(this.universalMedia());
-    return mergeMediaListsByObjeKey(...lists);
+    const merged = mergeMediaListsByObjeKey(...lists);
+    const seenFsIds = /* @__PURE__ */ new Set();
+    const deduped = {};
+    for (const [id, media] of Object.entries(merged ?? {})) {
+      const xref = media.key ? String(media.key) : "";
+      const top = xref && this._gedcom ? this._gedcom.obje(xref) : void 0;
+      const fsId = top?.get("_FS_ID")?.toValue?.();
+      if (typeof fsId === "string" && fsId.trim()) {
+        const normalized = fsId.trim();
+        if (seenFsIds.has(normalized)) {
+          continue;
+        }
+        seenFsIds.add(normalized);
+      }
+      deduped[id] = media;
+    }
+    return deduped;
   }
   async getProfilePicture(namespace, onlyPrimary = true) {
     if (!this.id) {