@treeviz/gedcom-parser 2.1.3 → 2.1.4

package/dist/constants/index.js

@@ -176,6 +176,10 @@ var storeCache = {
     }
   }, 100)
 };
+var resetRelativesCache = () => {
+  caches.relativesOnDegreeCache = {};
+  caches.relativesOnLevelCache = {};
+};
 var relativesCache = (cacheKey) => (gedcom, key, subKey, value) => {
   const gedcomId = getGedcomId(gedcom);
   const fullKey = `${gedcomId}:${key}`;
@@ -1720,6 +1724,28 @@ var addNonEvent = (owner, input) => {
 };
 
 // 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 */,
@@ -1827,6 +1853,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) => {
@@ -1842,14 +1871,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;
@@ -1858,6 +1995,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;
     }
@@ -1865,9 +2004,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) {
@@ -1879,6 +2030,41 @@ var findReusableParentChildFamily = (parent, child) => {
   }
   return void 0;
 };
+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;
+    }
+    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/utils/get-family-with.ts
 var getFamilyWith = (person1, person2, famType = "FAMS") => {
@@ -3910,13 +4096,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(
@@ -3939,10 +4129,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@`).

package/dist/factories/index.js

@@ -1932,6 +1932,10 @@ var storeCache = {
     }
   }, 100)
 };
+var resetRelativesCache = () => {
+  caches.relativesOnDegreeCache = {};
+  caches.relativesOnLevelCache = {};
+};
 var relativesCache = (cacheKey) => (gedcom, key, subKey, value) => {
   const gedcomId = getGedcomId(gedcom);
   const fullKey = `${gedcomId}:${key}`;
@@ -2197,6 +2201,28 @@ var addNonEvent = (owner, input) => {
 };
 
 // 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 */,
@@ -2304,6 +2330,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) => {
@@ -2319,14 +2348,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;
@@ -2335,6 +2472,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;
     }
@@ -2342,9 +2481,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) {
@@ -2356,6 +2507,41 @@ var findReusableParentChildFamily = (parent, child) => {
   }
   return void 0;
 };
+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;
+    }
+    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/utils/get-places.ts
 var getPlaces = (common, type = ["ALL" /* All */], maxLevel = 1, level = 0, mainKey) => {
@@ -4407,13 +4593,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(
@@ -4436,10 +4626,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@`).