@treeviz/gedcom-parser 1.0.5 → 1.0.6

package/dist/classes/gedcom.js

@@ -729,17 +729,16 @@ export const mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
                     ...targetChildIds,
                 ]).size;
                 // Match if:
-                // 1. Both have no children, OR
+                // 1. At least one spouse is present (to avoid matching empty families), OR
                 // 2. At least 50% of children overlap
-                if (totalUniqueChildren === 0 ||
-                    childOverlap / totalUniqueChildren >= 0.5) {
-                    // Additionally require at least one spouse to be present (not both empty)
-                    if (finalHusbId ||
-                        finalWifeId ||
-                        targetHusbId ||
-                        targetWifeId) {
-                        matchedTargetFam = targetFam;
-                    }
+                const hasSpouses = finalHusbId ||
+                    finalWifeId ||
+                    targetHusbId ||
+                    targetWifeId;
+                const hasMatchingChildren = totalUniqueChildren > 0 &&
+                    childOverlap / totalUniqueChildren >= 0.5;
+                if (hasSpouses || hasMatchingChildren) {
+                    matchedTargetFam = targetFam;
                 }
             }
         });
@@ -799,7 +798,7 @@ export const mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
         if (!sourceIndi)
             return;
         // Clear and rebuild FAMS references with remapped IDs
-        // clonedIndi.delete("FAMS");
+        clonedIndi.remove("FAMS");
         const sourceFAMS = sourceIndi.FAMS?.toList();
         sourceFAMS?.forEach((famRef) => {
             const oldFamId = famRef.value;
@@ -813,7 +812,7 @@ export const mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
             }
         });
         // Clear and rebuild FAMC references with remapped IDs
-        // clonedIndi.delete("FAMC");
+        clonedIndi.remove("FAMC");
         const sourceFAMC = sourceIndi.FAMC?.toList();
         sourceFAMC?.forEach((famRef) => {
             const oldFamId = famRef.value;
@@ -853,7 +852,7 @@ export const mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
             }
         }
         // Update CHIL references
-        // clonedFam.delete("CHIL");
+        clonedFam.remove("CHIL");
         const sourceChildren = sourceFam.CHIL?.toList();
         sourceChildren?.forEach((childRef) => {
             const oldChildId = childRef.value;
@@ -875,7 +874,9 @@ export const mergeGedcoms = (targetGedcom, sourceGedcom, strategy = "id") => {
             const targetIndi = mergedGedcom.indis()?.item(matchedTargetId);
             if (targetIndi) {
                 // Merge without overriding existing data
-                targetIndi.merge(clonedIndi, false);
+                // If using a strategy field (not "id"), avoid merging that field since it's already the same
+                const avoidKeys = strategy !== "id" ? [strategy] : [];
+                targetIndi.merge(clonedIndi, false, avoidKeys);
             }
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@treeviz/gedcom-parser",
-	"version": "1.0.5",
+	"version": "1.0.6",
 	"description": "Lightweight, pluggable GEDCOM parser for JavaScript/TypeScript with optional caching and place matching. Zero browser dependencies.",
 	"type": "module",
 	"main": "dist/index.js",