@treeviz/gedcom-parser 1.0.5 → 1.0.7

package/dist/classes/date.d.ts

@@ -1,3 +1,4 @@
+import type { Locale } from "date-fns";
 import type { IdType, MultiTag } from "../types/types";
 import type { Range } from "../utils/range";
 import { Common } from "./common";
@@ -17,7 +18,7 @@ export declare class CommonDate extends Common<string> {
     assign<T extends Common | List = Common | List>(name: MultiTag, value: T, unique?: boolean): T;
     private isValidDateFormat;
     toNote(short?: boolean): string | undefined;
-    toValue(dateFormat?: string): string | undefined;
+    toValue(dateFormat?: string, locale?: Locale): string | undefined;
     exportValue(): string;
     inRange(range: Range, trueIfNoYear?: boolean): boolean;
 }

package/dist/classes/date.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../../src/classes/date.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAGvD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAA6B,MAAM,UAAU,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAiDnC,qBAAa,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC;IAC7C,OAAO,CAAC,KAAK,CAAC,CAAO;IAErB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;gBAGb,MAAM,CAAC,EAAE,UAAU,EACnB,EAAE,CAAC,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM;IAOhB,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EA0ElC;IAED,IAAI,KAAK,IA5EQ,MAAM,GAAG,SAAS,CA+FlC;IAED,IAAI,QAAQ,SAEX;IAED,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,EAC7C,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,CAAC,EACR,MAAM,UAAQ;IAUf,OAAO,CAAC,iBAAiB;IAgBzB,MAAM,CAAC,KAAK,UAAO,GAAG,MAAM,GAAG,SAAS;IAUxC,OAAO,CAAC,UAAU,SAAgB,GAAG,MAAM,GAAG,SAAS;IAsBvD,WAAW;IAIX,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,UAAQ;CAG1C;AAED,eAAO,MAAM,gBAAgB,GAC5B,SAAS,UAAU,EACnB,KAAK,MAAM,EACX,OAAO,MAAM,EACb,SAAS,MAAM,KACb,aAAa,CAAC,UAAU,CAI1B,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,QAAQ,OAAO,KAAG,KAAK,IAAI,UAOvD,CAAC"}
+{"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../../src/classes/date.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKvC,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAGvD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAA6B,MAAM,UAAU,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAkDnC,qBAAa,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC;IAC7C,OAAO,CAAC,KAAK,CAAC,CAAO;IAErB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;gBAGb,MAAM,CAAC,EAAE,UAAU,EACnB,EAAE,CAAC,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM;IAOhB,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EA0ElC;IAED,IAAI,KAAK,IA5EQ,MAAM,GAAG,SAAS,CA+FlC;IAED,IAAI,QAAQ,SAEX;IAED,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,EAC7C,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,CAAC,EACR,MAAM,UAAQ;IAUf,OAAO,CAAC,iBAAiB;IAgBzB,MAAM,CAAC,KAAK,UAAO,GAAG,MAAM,GAAG,SAAS;IAUxC,OAAO,CAAC,UAAU,SAAgB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAuBxE,WAAW;IAIX,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,UAAQ;CAG1C;AAED,eAAO,MAAM,gBAAgB,GAC5B,SAAS,UAAU,EACnB,KAAK,MAAM,EACX,OAAO,MAAM,EACb,SAAS,MAAM,KACb,aAAa,CAAC,UAAU,CAI1B,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,QAAQ,OAAO,KAAG,KAAK,IAAI,UAOvD,CAAC"}

package/dist/classes/date.js

@@ -1,4 +1,5 @@
 import { format, isValid, parse } from "date-fns";
+import { enUS } from "date-fns/locale";
 import { getDateLocale } from "../factories/index.js";
 import { ACCEPTED_DATE_FORMATS } from "../utils/date-formatter.js";
 import { inRange } from "../utils/range.js";
@@ -12,7 +13,7 @@ const NOTE_MARKER = "####";
 /**
  * Format a date based on available components (DAY, MONTH, YEAR, NOTE)
  */
-const formatDateWithComponents = (date, hasDay, hasMonth, hasYear, noteValue, baseFormat = "dd MMM yyyy") => {
+const formatDateWithComponents = (date, hasDay, hasMonth, hasYear, noteValue, baseFormat = "dd MMM yyyy", locale) => {
     const hasNote = baseFormat.includes("NOTE");
     let validDateFormat = baseFormat.replace("NOTE", NOTE_MARKER);
     if (!hasDay) {
@@ -28,7 +29,7 @@ const formatDateWithComponents = (date, hasDay, hasMonth, hasYear, noteValue, ba
         .replace(/([.\-\s/])\1+/g, "$1")
         .replace(/^[.\-\s/]+|[.\-\s/]+$/g, "");
     const formattedDate = format(date, validDateFormat, {
-        locale: getDateLocale(),
+        locale: locale ? locale : getDateLocale(),
     });
     // Add NOTE prefix if it exists
     return noteValue && hasNote
@@ -147,7 +148,7 @@ export class CommonDate extends Common {
         }
         return note;
     }
-    toValue(dateFormat = "dd MMM yyyy") {
+    toValue(dateFormat = "dd MMM yyyy", locale) {
         const hasDay = !!this.DAY?.value;
         const hasMonth = !!this.MONTH?.value;
         const hasYear = !!this.YEAR?.value;
@@ -156,10 +157,10 @@ export class CommonDate extends Common {
             (!hasDay && !hasMonth && !hasYear)) {
             return this._value;
         }
-        return formatDateWithComponents(this._date, hasDay, hasMonth, hasYear, this.NOTE?.value, dateFormat);
+        return formatDateWithComponents(this._date, hasDay, hasMonth, hasYear, this.NOTE?.value, dateFormat, locale);
     }
     exportValue() {
-        return this.toValue("NOTE dd MMM yyyy");
+        return this.toValue("NOTE dd MMM yyyy", enUS);
     }
     inRange(range, trueIfNoYear = false) {
         return inRange(this.YEAR?.value, range, trueIfNoYear);

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.7",
 	"description": "Lightweight, pluggable GEDCOM parser for JavaScript/TypeScript with optional caching and place matching. Zero browser dependencies.",
 	"type": "module",
 	"main": "dist/index.js",