@treeviz/gedcom-parser 2.1.9 → 2.1.11

package/dist/cli/index.js

@@ -41,6 +41,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) {
@@ -690,7 +766,7 @@ var Common = class _Common {
         this,
         options.obje.namespace,
         options.obje.override,
-        void 0,
+        this.isAncestry() ? ancestryMediaFileUrl : void 0,
         options.gedcomVersion
       );
     }
@@ -1209,11 +1285,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 resetRelativesCache = () => {
@@ -2269,65 +2342,23 @@ 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);
-  return resolved;
-};
-var 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 resolved = await localMediaResolver?.(path, context);
+  if (resolved) {
+    return resolved;
   }
-  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";
-    }
+  if (/^https?:\/\//i.test(path)) {
+    return path;
   }
-  const imageFormats = [
-    "jpg",
-    "jpeg",
-    "png",
-    "gif",
-    "bmp",
-    "webp",
-    "svg",
-    "tiff",
-    "tif"
-  ];
-  return imageFormats.includes(normalized);
+  return void 0;
 };
-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 implemented = (type, ...args) => {
 };
 var uniqueItemsCache = /* @__PURE__ */ new WeakMap();
 var setNestedGroup = (obj, key, value, uniqueCounting = true) => {
@@ -3504,22 +3535,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;
@@ -3555,6 +3583,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(" ", "-")}`
@@ -3593,7 +3622,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();
@@ -3612,6 +3641,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(" ", "-")}`
@@ -3720,7 +3750,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() ?? "";
@@ -3737,6 +3767,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(" ", "-")}`
@@ -3760,7 +3791,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();
@@ -3777,6 +3808,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(" ", "-")}`
@@ -3808,7 +3840,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(
@@ -3833,7 +3870,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;
       }
@@ -8611,7 +8657,7 @@ var ensureExtensionSchema = (gedcom, extraTags) => {
 
 // package.json
 var package_default = {
-  version: "2.1.9"};
+  version: "2.1.11"};
 
 // src/utils/get-product-details.ts
 var isDevelopment = () => {
@@ -8694,16 +8740,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;
     }
@@ -9216,6 +9272,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);
   }

package/dist/constants/index.js

@@ -171,11 +171,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 resetRelativesCache = () => {
@@ -555,6 +552,82 @@ var dateFormatter = (indi, showMarriages = false, showDays = false, showPlaces =
 // src/utils/gedcom-trailer.ts
 var GEDCOM_TRAILER_TAG = "TRLR";
 var isGedcomTrailerTag = (tag) => tag === GEDCOM_TRAILER_TAG;
+
+// 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) {
@@ -1204,7 +1277,7 @@ var Common = class _Common {
         this,
         options.obje.namespace,
         options.obje.override,
-        void 0,
+        this.isAncestry() ? ancestryMediaFileUrl : void 0,
         options.gedcomVersion
       );
     }
@@ -2152,65 +2225,23 @@ 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);
-  return resolved;
-};
-var 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;
+  const resolved = await localMediaResolver?.(path, context);
+  if (resolved) {
+    return resolved;
   }
-  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";
-    }
+  if (/^https?:\/\//i.test(path)) {
+    return path;
   }
-  const imageFormats = [
-    "jpg",
-    "jpeg",
-    "png",
-    "gif",
-    "bmp",
-    "webp",
-    "svg",
-    "tiff",
-    "tif"
-  ];
-  return imageFormats.includes(normalized);
+  return void 0;
 };
-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 implemented = (type, ...args) => {
 };
 var uniqueItemsCache = /* @__PURE__ */ new WeakMap();
 var setNestedGroup = (obj, key, value, uniqueCounting = true) => {
@@ -3488,22 +3519,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;
@@ -3539,6 +3567,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(" ", "-")}`
@@ -3577,7 +3606,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();
@@ -3596,6 +3625,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(" ", "-")}`
@@ -3704,7 +3734,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() ?? "";
@@ -3721,6 +3751,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(" ", "-")}`
@@ -3744,7 +3775,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();
@@ -3761,6 +3792,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(" ", "-")}`
@@ -3792,7 +3824,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(
@@ -3817,7 +3854,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;
       }