@treeviz/gedcom-parser 2.1.3 → 2.1.5

package/dist/cli/index.js

@@ -1121,7 +1121,299 @@ var idGetter = (id) => {
   return newId;
 };
 
+// src/factories/cache-factory.ts
+var defaultCacheFactory = () => {
+  let cache = null;
+  return {
+    getItem: async () => cache,
+    setItem: async (value) => {
+      cache = value;
+    }
+  };
+};
+var cacheFactory = defaultCacheFactory;
+var getCacheManagerFactory = () => {
+  return cacheFactory;
+};
+
+// src/utils/cache.ts
+var getGedcomId = (gedcom) => {
+  if (!gedcom) {
+    return "unknown";
+  }
+  const treeId = gedcom.getTreeId?.() || "";
+  const treeName = gedcom.getTreeName?.() || "";
+  const sanitizedName = treeName.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
+  if (treeId && sanitizedName) {
+    return `${treeId}_${sanitizedName}`;
+  } else if (treeId) {
+    return treeId;
+  } else if (sanitizedName) {
+    return sanitizedName;
+  }
+  return `gedcom_${gedcom.refcount}`;
+};
+var caches = {
+  pathCache: {},
+  relativesOnDegreeCache: {},
+  relativesOnLevelCache: {},
+  profilePictureCache: {}
+};
+var cacheDbs;
+var getCacheDbs = () => {
+  if (!cacheDbs) {
+    const getInstance = getCacheManagerFactory();
+    cacheDbs = {
+      pathCache: getInstance(
+        "ftv",
+        "Main",
+        "path",
+        true
+      ),
+      relativesOnDegreeCache: getInstance("ftv", "Main", "path", true),
+      relativesOnLevelCache: getInstance(
+        "ftv",
+        "Main",
+        "path",
+        true
+      ),
+      profilePictureCache: getInstance(
+        "ftv",
+        "Main",
+        "images",
+        false
+      )
+    };
+  }
+  return cacheDbs;
+};
+var storeCache = {
+  // NOTE: pathCache, relativesOnLevelCache, and relativesOnDegreeCache are intentionally
+  // kept in memory only. These debounced functions exist to satisfy the type system
+  // but are never called.
+  pathCache: debounce((value) => {
+    if (value) {
+      getCacheDbs().pathCache.setItem(value);
+    }
+  }, 50),
+  relativesOnLevelCache: debounce((value) => {
+    if (value) {
+      getCacheDbs().relativesOnLevelCache.setItem(value);
+    }
+  }, 50),
+  relativesOnDegreeCache: debounce((value) => {
+    if (value) {
+      getCacheDbs().relativesOnDegreeCache.setItem(value);
+    }
+  }, 50),
+  // profilePictureCache IS persisted to IndexedDB
+  profilePictureCache: debounce((value) => {
+    if (value) {
+      getCacheDbs().profilePictureCache.setItem(value);
+    }
+  }, 100)
+};
+var resetRelativesCache = () => {
+  caches.relativesOnDegreeCache = {};
+  caches.relativesOnLevelCache = {};
+};
+var relativesCache = (cacheKey) => (gedcom, key, subKey, value) => {
+  const gedcomId = getGedcomId(gedcom);
+  const fullKey = `${gedcomId}:${key}`;
+  const cache = caches[cacheKey];
+  if (!cache) {
+    caches[cacheKey] = {};
+  }
+  if (value) {
+    const typedCache2 = caches[cacheKey];
+    if (!typedCache2[fullKey]) {
+      typedCache2[fullKey] = {};
+    }
+    typedCache2[fullKey][subKey] = value;
+    return typedCache2[fullKey][subKey];
+  }
+  const typedCache = caches[cacheKey];
+  return typedCache?.[fullKey]?.[subKey];
+};
+var pathCache = (gedcom, key, value) => {
+  const gedcomId = getGedcomId(gedcom);
+  const fullKey = `${gedcomId}:${key}`;
+  if (!caches.pathCache) {
+    caches.pathCache = {};
+  }
+  if (value && caches.pathCache) {
+    caches.pathCache[fullKey] = value;
+    return caches.pathCache[fullKey];
+  }
+  return caches.pathCache?.[fullKey];
+};
+var profilePictureCache = (gedcom, key, value) => {
+  const gedcomId = getGedcomId(gedcom);
+  const fullKey = `${gedcomId}:${key}`;
+  if (!caches.profilePictureCache) {
+    caches.profilePictureCache = {};
+  }
+  if (value && caches.profilePictureCache) {
+    caches.profilePictureCache[fullKey] = value;
+    storeCache.profilePictureCache(caches.profilePictureCache);
+    return caches.profilePictureCache[fullKey];
+  }
+  const cached = caches.profilePictureCache?.[fullKey];
+  return cached;
+};
+var isNonBiologicalPath = (path) => path.some(
+  (item) => item.relation && item.relation !== "biological" /* BIOLOGICAL */
+);
+var invertHop = (kinship) => {
+  if (kinship === "parent") {
+    return "child";
+  }
+  if (kinship === "child") {
+    return "parent";
+  }
+  return kinship;
+};
+var hopRelation = (from, toIndi, kinship, inherited) => {
+  if (kinship === "parent" || kinship === "child") {
+    const parent = kinship === "parent" ? toIndi : from.indi;
+    const child = kinship === "parent" ? from.indi : toIndi;
+    const currentRelation = child.getParentType(parent);
+    if (currentRelation && currentRelation !== "biological" /* BIOLOGICAL */) {
+      return currentRelation;
+    }
+  }
+  if (inherited && inherited !== "biological" /* BIOLOGICAL */) {
+    return inherited;
+  }
+  return void 0;
+};
+var rebuildPathFromHops = (hops, skipRelation = false) => {
+  if (hops.length === 0) {
+    return [];
+  }
+  const path = [
+    {
+      indi: hops[0].indi,
+      kinship: "self",
+      level: 0,
+      levelUp: 0,
+      levelDown: 0,
+      degree: 0
+    }
+  ];
+  for (let i = 1; i < hops.length; i++) {
+    const prev = path[i - 1];
+    const { indi, kinship } = hops[i];
+    const relation = skipRelation ? void 0 : hopRelation(prev, indi, kinship, prev.relation);
+    if (kinship === "parent") {
+      path.push({
+        indi,
+        kinship,
+        relation,
+        level: prev.level + 1,
+        levelUp: prev.levelUp + 1,
+        levelDown: prev.levelDown,
+        degree: prev.degree
+      });
+      continue;
+    }
+    if (kinship === "child") {
+      path.push({
+        indi,
+        kinship,
+        relation,
+        level: prev.level - 1,
+        levelUp: prev.levelUp,
+        levelDown: prev.levelDown + 1,
+        degree: prev.levelUp ? prev.level > 0 ? prev.levelUp - prev.level + 1 : prev.levelDown - Math.abs(prev.level) : 0
+      });
+      continue;
+    }
+    path.push({
+      indi,
+      kinship,
+      relation,
+      level: prev.level,
+      levelUp: prev.levelUp,
+      levelDown: prev.levelDown,
+      degree: prev.degree
+    });
+  }
+  return path;
+};
+var storePathIfBetter = (gedcom, fromId, toId, path) => {
+  const key = `${fromId}|${toId}`;
+  const existing = pathCache(gedcom, key);
+  if (existing && (!isNonBiologicalPath(existing) || isNonBiologicalPath(path))) {
+    return;
+  }
+  pathCache(gedcom, key, path);
+};
+var cacheDiscoveredPath = (gedcom, path) => {
+  const n = path.length;
+  if (n < 2) {
+    return;
+  }
+  for (let i = 0; i < n; i++) {
+    const fromId = path[i].indi.id;
+    if (!fromId) {
+      continue;
+    }
+    for (let j = i + 1; j < n; j++) {
+      const toId = path[j].indi.id;
+      if (!toId) {
+        continue;
+      }
+      const isOriginalPair = i === 0 && j === n - 1;
+      const isDirectHop = j === i + 1;
+      const slice = path.slice(i, j + 1);
+      const sliceMixed = isNonBiologicalPath(slice);
+      if (!isOriginalPair && !isDirectHop && sliceMixed) {
+        continue;
+      }
+      const forward = i === 0 ? slice : rebuildPathFromHops(slice, !sliceMixed);
+      const reverseHops = [
+        {
+          indi: slice[slice.length - 1].indi,
+          kinship: "self"
+        }
+      ];
+      for (let k = slice.length - 2; k >= 0; k--) {
+        reverseHops.push({
+          indi: slice[k].indi,
+          kinship: invertHop(slice[k + 1].kinship)
+        });
+      }
+      const reverse = rebuildPathFromHops(reverseHops, !sliceMixed);
+      storePathIfBetter(gedcom, fromId, toId, forward);
+      storePathIfBetter(gedcom, toId, fromId, reverse);
+    }
+  }
+};
+
 // src/utils/family-edit.ts
+var refTypeForTag = (tag) => {
+  if (tag === "FAMS" || tag === "FAMC") return "FAM";
+  return "INDI";
+};
+var normalizeSinglePointer = (owner, tag) => {
+  const node = owner.get(tag);
+  if (!node) return;
+  if (node instanceof List && node.length === 1) {
+    const only = node.index(0);
+    if (only) {
+      owner.set(tag, only);
+      return;
+    }
+    const raw = node.values()[0];
+    if (typeof raw === "string") {
+      const gedcom = owner.getGedcom?.();
+      if (gedcom) {
+        owner.set(tag, makePointer(gedcom, owner, raw, refTypeForTag(tag)));
+      }
+    }
+  }
+};
 var PEDIGREE_VALUES = [
   "birth" /* BIRTH */,
   "adopted" /* ADOPTED */,
@@ -1240,6 +1532,9 @@ var attachSpouseToFamily = (fam, indi) => {
     fam.set(tag, makePointer(gedcom, fam, indi.id, "INDI"));
   }
   indi.assign("FAMS", makePointer(gedcom, indi, fam.id, "FAM"), true);
+  normalizeSinglePointer(indi, "FAMS");
+  normalizeSinglePointer(fam, spouseTagFor(indi, fam));
+  resetRelativesCache();
   return true;
 };
 var attachChildToFamily = (fam, child, pedigree, parent) => {
@@ -1255,14 +1550,122 @@ var attachChildToFamily = (fam, child, pedigree, parent) => {
     child.assign("FAMC", makePointer(gedcom, child, fam.id, "FAM"), true);
   }
   setChildPedigree(fam, child, pedigree, parent);
+  normalizeSinglePointer(child, "FAMC");
+  normalizeSinglePointer(fam, "CHIL");
+  resetRelativesCache();
   return true;
 };
-var findReusableParentChildFamily = (parent, child) => {
+var removePointerByValue = (owner, tag, targetId) => {
+  const node = owner.get(tag);
+  if (!node) {
+    return false;
+  }
+  if (node instanceof List) {
+    const keysToRemove = [];
+    node.entries().forEach(([key, item]) => {
+      if (item?.toValue?.() === targetId || item?.id === targetId || String(key) === targetId) {
+        keysToRemove.push(key);
+      }
+    });
+    keysToRemove.forEach((key) => {
+      node.removeItem(key);
+    });
+    if (node.length === 0) {
+      owner.remove(tag);
+    }
+    return keysToRemove.length > 0;
+  }
+  if (node.toValue?.() === targetId) {
+    owner.remove(tag);
+    return true;
+  }
+  const asList = node.toList?.();
+  if (asList && asList.length > 0) {
+    const keysToRemove = [];
+    asList.entries().forEach(([key, item]) => {
+      if (item?.toValue?.() === targetId || item?.id === targetId) {
+        keysToRemove.push(key);
+      }
+    });
+    if (keysToRemove.length === asList.length) {
+      owner.remove(tag);
+      return true;
+    }
+    if (keysToRemove.length > 0) {
+      const remaining = asList.values().filter((item) => item?.toValue?.() !== targetId);
+      if (remaining.length === 1 && remaining[0]) {
+        owner.set(tag, remaining[0]);
+      } else {
+        owner.set(tag, new List(remaining));
+      }
+      return true;
+    }
+  }
+  return false;
+};
+var familyMemberCount = (fam) => {
+  let count = 0;
+  if (firstPointerId(fam.get("HUSB"))) {
+    count += 1;
+  }
+  if (firstPointerId(fam.get("WIFE"))) {
+    count += 1;
+  }
+  count += pointerIds(fam.get("CHIL")).length;
+  return count;
+};
+var isDegenerateFamily = (fam) => familyMemberCount(fam) <= 1;
+var pruneEmptyFamilies = (gedcom) => {
+  const emptyIds = [];
+  gedcom.fams()?.forEach((fam, id) => {
+    if (fam && isDegenerateFamily(fam) && id) {
+      emptyIds.push(id);
+    }
+  });
+  if (emptyIds.length === 0) {
+    return [];
+  }
+  gedcom.indis()?.forEach((indi) => {
+    if (!indi) {
+      return;
+    }
+    emptyIds.forEach((famId) => {
+      removePointerByValue(indi, "FAMS", famId);
+      removePointerByValue(indi, "FAMC", famId);
+    });
+  });
+  emptyIds.forEach((famId) => {
+    gedcom.fams()?.removeItem(famId);
+  });
+  return emptyIds;
+};
+var findSharedSpouseFamily = (parent, coParentId) => {
+  let found;
+  parent.getFamilies("FAMS")?.forEach((fam) => {
+    if (!found && fam && familyHasParent(fam, coParentId)) {
+      found = fam;
+    }
+  });
+  return found;
+};
+var findReusableParentChildFamily = (parent, child, options) => {
   if (!parent.id || !child.id) {
     return void 0;
   }
+  const reuseParentFamilies = options?.reuseParentFamilies !== false;
+  const gedcom = parent.getGedcom() ?? child.getGedcom();
   let reusableFamc;
+  let coupleFam;
   let already = false;
+  const noteCoupleWith = (coParentId) => {
+    if (!coParentId || coParentId === parent.id || coupleFam || !parent.id) {
+      return;
+    }
+    const shared = findSharedSpouseFamily(parent, coParentId);
+    if (shared) {
+      coupleFam = shared;
+    }
+  };
   child.getFamilies("FAMC")?.forEach((fam) => {
     if (!fam) {
       return;
@@ -1271,6 +1674,8 @@ var findReusableParentChildFamily = (parent, child) => {
       already = true;
       return;
     }
+    pointerIds(fam.get("HUSB")).forEach(noteCoupleWith);
+    pointerIds(fam.get("WIFE")).forEach(noteCoupleWith);
     if (!reusableFamc && canAttachAsSpouse(fam, parent)) {
       reusableFamc = fam;
     }
@@ -1278,9 +1683,21 @@ var findReusableParentChildFamily = (parent, child) => {
   if (already) {
     return "already";
   }
+  if (coupleFam) {
+    return coupleFam;
+  }
   if (reusableFamc) {
     return reusableFamc;
   }
+  if (options?.targetFamilyId && gedcom) {
+    const target = gedcom.fam(options.targetFamilyId);
+    if (target && (familyHasParent(target, parent.id) || canAttachAsSpouse(target, parent))) {
+      return target;
+    }
+  }
+  if (!reuseParentFamilies) {
+    return void 0;
+  }
   const parentFams = [];
   parent.getFamilies("FAMS")?.forEach((fam) => {
     if (fam) {
@@ -1292,20 +1709,40 @@ var findReusableParentChildFamily = (parent, child) => {
   }
   return void 0;
 };
-
-// src/factories/cache-factory.ts
-var defaultCacheFactory = () => {
-  let cache = null;
-  return {
-    getItem: async () => cache,
-    setItem: async (value) => {
-      cache = value;
+var consolidateChildIntoFamily = (child, keep) => {
+  if (!child.id || !keep.id) {
+    return [];
+  }
+  const keepParentIds = /* @__PURE__ */ new Set([
+    ...pointerIds(keep.get("HUSB")),
+    ...pointerIds(keep.get("WIFE"))
+  ]);
+  const removed = [];
+  child.getFamilies("FAMC")?.forEach((fam) => {
+    if (!fam?.id || fam.id === keep.id) {
+      return;
     }
-  };
-};
-var cacheFactory = defaultCacheFactory;
-var getCacheManagerFactory = () => {
-  return cacheFactory;
+    const famParentIds = [
+      ...pointerIds(fam.get("HUSB")),
+      ...pointerIds(fam.get("WIFE"))
+    ];
+    if (famParentIds.length === 0 || !famParentIds.every((id) => keepParentIds.has(id))) {
+      return;
+    }
+    removePointerByValue(fam, "CHIL", child.id);
+    normalizeSinglePointer(fam, "CHIL");
+    removePointerByValue(child, "FAMC", fam.id);
+    normalizeSinglePointer(child, "FAMC");
+    removed.push(fam.id);
+  });
+  const gedcom = child.getGedcom() ?? keep.getGedcom();
+  if (gedcom && removed.length > 0) {
+    pruneEmptyFamilies(gedcom);
+  }
+  if (removed.length > 0) {
+    resetRelativesCache();
+  }
+  return removed;
 };
 
 // src/factories/date-locale-factory.ts
@@ -1557,255 +1994,6 @@ var getMarriageAscAndChildBirth = (person) => (itemA, keyA, itemB, keyB) => {
   const childB = familyB?.getChildren().orderBy(BIRTH_ASC).index(0);
   return getBirthAsc(childA, keyA, childB);
 };
-var getGedcomId = (gedcom) => {
-  if (!gedcom) {
-    return "unknown";
-  }
-  const treeId = gedcom.getTreeId?.() || "";
-  const treeName = gedcom.getTreeName?.() || "";
-  const sanitizedName = treeName.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
-  if (treeId && sanitizedName) {
-    return `${treeId}_${sanitizedName}`;
-  } else if (treeId) {
-    return treeId;
-  } else if (sanitizedName) {
-    return sanitizedName;
-  }
-  return `gedcom_${gedcom.refcount}`;
-};
-var caches = {
-  pathCache: {},
-  relativesOnDegreeCache: {},
-  relativesOnLevelCache: {},
-  profilePictureCache: {}
-};
-var cacheDbs;
-var getCacheDbs = () => {
-  if (!cacheDbs) {
-    const getInstance = getCacheManagerFactory();
-    cacheDbs = {
-      pathCache: getInstance(
-        "ftv",
-        "Main",
-        "path",
-        true
-      ),
-      relativesOnDegreeCache: getInstance("ftv", "Main", "path", true),
-      relativesOnLevelCache: getInstance(
-        "ftv",
-        "Main",
-        "path",
-        true
-      ),
-      profilePictureCache: getInstance(
-        "ftv",
-        "Main",
-        "images",
-        false
-      )
-    };
-  }
-  return cacheDbs;
-};
-var storeCache = {
-  // NOTE: pathCache, relativesOnLevelCache, and relativesOnDegreeCache are intentionally
-  // kept in memory only. These debounced functions exist to satisfy the type system
-  // but are never called.
-  pathCache: debounce((value) => {
-    if (value) {
-      getCacheDbs().pathCache.setItem(value);
-    }
-  }, 50),
-  relativesOnLevelCache: debounce((value) => {
-    if (value) {
-      getCacheDbs().relativesOnLevelCache.setItem(value);
-    }
-  }, 50),
-  relativesOnDegreeCache: debounce((value) => {
-    if (value) {
-      getCacheDbs().relativesOnDegreeCache.setItem(value);
-    }
-  }, 50),
-  // profilePictureCache IS persisted to IndexedDB
-  profilePictureCache: debounce((value) => {
-    if (value) {
-      getCacheDbs().profilePictureCache.setItem(value);
-    }
-  }, 100)
-};
-var relativesCache = (cacheKey) => (gedcom, key, subKey, value) => {
-  const gedcomId = getGedcomId(gedcom);
-  const fullKey = `${gedcomId}:${key}`;
-  const cache = caches[cacheKey];
-  if (!cache) {
-    caches[cacheKey] = {};
-  }
-  if (value) {
-    const typedCache2 = caches[cacheKey];
-    if (!typedCache2[fullKey]) {
-      typedCache2[fullKey] = {};
-    }
-    typedCache2[fullKey][subKey] = value;
-    return typedCache2[fullKey][subKey];
-  }
-  const typedCache = caches[cacheKey];
-  return typedCache?.[fullKey]?.[subKey];
-};
-var pathCache = (gedcom, key, value) => {
-  const gedcomId = getGedcomId(gedcom);
-  const fullKey = `${gedcomId}:${key}`;
-  if (!caches.pathCache) {
-    caches.pathCache = {};
-  }
-  if (value && caches.pathCache) {
-    caches.pathCache[fullKey] = value;
-    return caches.pathCache[fullKey];
-  }
-  return caches.pathCache?.[fullKey];
-};
-var profilePictureCache = (gedcom, key, value) => {
-  const gedcomId = getGedcomId(gedcom);
-  const fullKey = `${gedcomId}:${key}`;
-  if (!caches.profilePictureCache) {
-    caches.profilePictureCache = {};
-  }
-  if (value && caches.profilePictureCache) {
-    caches.profilePictureCache[fullKey] = value;
-    storeCache.profilePictureCache(caches.profilePictureCache);
-    return caches.profilePictureCache[fullKey];
-  }
-  const cached = caches.profilePictureCache?.[fullKey];
-  return cached;
-};
-var isNonBiologicalPath = (path) => path.some(
-  (item) => item.relation && item.relation !== "biological" /* BIOLOGICAL */
-);
-var invertHop = (kinship) => {
-  if (kinship === "parent") {
-    return "child";
-  }
-  if (kinship === "child") {
-    return "parent";
-  }
-  return kinship;
-};
-var hopRelation = (from, toIndi, kinship, inherited) => {
-  if (kinship === "parent" || kinship === "child") {
-    const parent = kinship === "parent" ? toIndi : from.indi;
-    const child = kinship === "parent" ? from.indi : toIndi;
-    const currentRelation = child.getParentType(parent);
-    if (currentRelation && currentRelation !== "biological" /* BIOLOGICAL */) {
-      return currentRelation;
-    }
-  }
-  if (inherited && inherited !== "biological" /* BIOLOGICAL */) {
-    return inherited;
-  }
-  return void 0;
-};
-var rebuildPathFromHops = (hops, skipRelation = false) => {
-  if (hops.length === 0) {
-    return [];
-  }
-  const path = [
-    {
-      indi: hops[0].indi,
-      kinship: "self",
-      level: 0,
-      levelUp: 0,
-      levelDown: 0,
-      degree: 0
-    }
-  ];
-  for (let i = 1; i < hops.length; i++) {
-    const prev = path[i - 1];
-    const { indi, kinship } = hops[i];
-    const relation = skipRelation ? void 0 : hopRelation(prev, indi, kinship, prev.relation);
-    if (kinship === "parent") {
-      path.push({
-        indi,
-        kinship,
-        relation,
-        level: prev.level + 1,
-        levelUp: prev.levelUp + 1,
-        levelDown: prev.levelDown,
-        degree: prev.degree
-      });
-      continue;
-    }
-    if (kinship === "child") {
-      path.push({
-        indi,
-        kinship,
-        relation,
-        level: prev.level - 1,
-        levelUp: prev.levelUp,
-        levelDown: prev.levelDown + 1,
-        degree: prev.levelUp ? prev.level > 0 ? prev.levelUp - prev.level + 1 : prev.levelDown - Math.abs(prev.level) : 0
-      });
-      continue;
-    }
-    path.push({
-      indi,
-      kinship,
-      relation,
-      level: prev.level,
-      levelUp: prev.levelUp,
-      levelDown: prev.levelDown,
-      degree: prev.degree
-    });
-  }
-  return path;
-};
-var storePathIfBetter = (gedcom, fromId, toId, path) => {
-  const key = `${fromId}|${toId}`;
-  const existing = pathCache(gedcom, key);
-  if (existing && (!isNonBiologicalPath(existing) || isNonBiologicalPath(path))) {
-    return;
-  }
-  pathCache(gedcom, key, path);
-};
-var cacheDiscoveredPath = (gedcom, path) => {
-  const n = path.length;
-  if (n < 2) {
-    return;
-  }
-  for (let i = 0; i < n; i++) {
-    const fromId = path[i].indi.id;
-    if (!fromId) {
-      continue;
-    }
-    for (let j = i + 1; j < n; j++) {
-      const toId = path[j].indi.id;
-      if (!toId) {
-        continue;
-      }
-      const isOriginalPair = i === 0 && j === n - 1;
-      const isDirectHop = j === i + 1;
-      const slice = path.slice(i, j + 1);
-      const sliceMixed = isNonBiologicalPath(slice);
-      if (!isOriginalPair && !isDirectHop && sliceMixed) {
-        continue;
-      }
-      const forward = i === 0 ? slice : rebuildPathFromHops(slice, !sliceMixed);
-      const reverseHops = [
-        {
-          indi: slice[slice.length - 1].indi,
-          kinship: "self"
-        }
-      ];
-      for (let k = slice.length - 2; k >= 0; k--) {
-        reverseHops.push({
-          indi: slice[k].indi,
-          kinship: invertHop(slice[k + 1].kinship)
-        });
-      }
-      const reverse = rebuildPathFromHops(reverseHops, !sliceMixed);
-      storePathIfBetter(gedcom, fromId, toId, forward);
-      storePathIfBetter(gedcom, toId, fromId, reverse);
-    }
-  }
-};
 
 // src/utils/get-all-prop.ts
 var getAllProp = (indi, prop) => {
@@ -3924,13 +4112,17 @@ var Indi = class extends Common {
     }
     return fam;
   }
-  addChild(child, pedigree) {
+  addChild(child, pedigree, options) {
     if (!this.id || !child?.id || this.id === child.id || !this._gedcom) {
       return void 0;
     }
     const existing = findReusableParentChildFamily(
       this,
-      child
+      child,
+      {
+        reuseParentFamilies: options?.reuseParentFamilies,
+        targetFamilyId: options?.targetFamilyId
+      }
     );
     if (existing === "already") {
       const fam2 = child.getFamilies("FAMC")?.find(
@@ -3953,10 +4145,16 @@ var Indi = class extends Common {
     if (!fam.addChild(child, pedigree, this)) {
       return void 0;
     }
+    if (existing) {
+      consolidateChildIntoFamily(child, fam);
+    }
     return fam;
   }
-  addParent(parent, pedigree) {
-    return parent.addChild(this, pedigree);
+  addParent(parent, pedigree, options) {
+    return parent.addChild(this, pedigree, {
+      reuseParentFamilies: false,
+      targetFamilyId: options?.targetFamilyId
+    });
   }
   /**
    * Link an existing top-level OBJE record to this individual (`1 OBJE @On@`).
@@ -7951,7 +8149,7 @@ var ensureExtensionSchema = (gedcom, extraTags) => {
 
 // package.json
 var package_default = {
-  version: "2.1.3"};
+  version: "2.1.5"};
 
 // src/utils/get-product-details.ts
 var isDevelopment = () => {