@treeviz/familysearch-sdk 2.0.6 → 2.0.7

package/dist/utils/index.js

@@ -42,6 +42,64 @@ function transformSourceUrl(url) {
   }
   return `${baseUrl}/${arkId}`;
 }
+function sanitizeGedcomValue(value) {
+  return value.replace(/[\r\n\t]+/g, " ").trim();
+}
+var GEDCOM_MONTHS = [
+  "JAN",
+  "FEB",
+  "MAR",
+  "APR",
+  "MAY",
+  "JUN",
+  "JUL",
+  "AUG",
+  "SEP",
+  "OCT",
+  "NOV",
+  "DEC"
+];
+function formatSimpleFormalDate(value) {
+  const match = value.match(/^([+-])(\d{1,6})(?:-(\d{2}))?(?:-(\d{2}))?/);
+  if (!match) return void 0;
+  const [, sign, yearPart, monthPart, dayPart] = match;
+  if (sign === "-") return void 0;
+  const year = String(parseInt(yearPart, 10));
+  if (!monthPart) return year;
+  const month = GEDCOM_MONTHS[parseInt(monthPart, 10) - 1];
+  if (!month) return void 0;
+  if (!dayPart) return `${month} ${year}`;
+  return `${parseInt(dayPart, 10)} ${month} ${year}`;
+}
+function convertFormalDateToGedcom(formal) {
+  if (!formal) return void 0;
+  let value = formal.trim();
+  let approximate = false;
+  if (value.startsWith("A")) {
+    approximate = true;
+    value = value.slice(1);
+  }
+  if (value.includes("/")) {
+    const slashIndex = value.indexOf("/");
+    const start = value.slice(0, slashIndex);
+    const end = value.slice(slashIndex + 1);
+    const startDate = start ? formatSimpleFormalDate(start) : void 0;
+    const endDate = end ? formatSimpleFormalDate(end) : void 0;
+    if (start && !startDate) return void 0;
+    if (end && !endDate) return void 0;
+    if (startDate && endDate) return `BET ${startDate} AND ${endDate}`;
+    if (startDate) return `FROM ${startDate}`;
+    if (endDate) return `TO ${endDate}`;
+    return void 0;
+  }
+  const simple = formatSimpleFormalDate(value);
+  if (!simple) return void 0;
+  return approximate ? `ABT ${simple}` : simple;
+}
+function resolveFactDate(date) {
+  if (!date) return void 0;
+  return convertFormalDateToGedcom(date.formal) || date.original;
+}
 function extractName(person) {
   if (!person) return null;
   if (person.names?.[0]?.nameForms?.[0]) {
@@ -49,8 +107,14 @@ function extractName(person) {
     const parts = nameForm.parts || [];
     const given = parts.find((p) => p.type?.includes("Given"))?.value || "";
     const surname = parts.find((p) => p.type?.includes("Surname"))?.value || "";
-    if (given || surname) {
-      return `${given} /${surname}/`.trim();
+    if (given && surname) {
+      return `${given} /${surname}/`;
+    }
+    if (surname) {
+      return `/${surname}/`;
+    }
+    if (given) {
+      return given;
     }
     if (nameForm.fullText) {
       return nameForm.fullText;
@@ -80,11 +144,9 @@ function extractFact(person, factType) {
   const factTypeUrl = `http://gedcomx.org/${factType === "BIRTH" ? "Birth" : "Death"}`;
   const fact = person.facts?.find((f) => f.type === factTypeUrl);
   if (fact) {
-    if (fact.date?.formal || fact.date?.original) {
-      result.date = (fact.date?.formal || fact.date?.original)?.replace(
-        /^(-|\+)/,
-        ""
-      );
+    const resolvedDate = resolveFactDate(fact.date);
+    if (resolvedDate) {
+      result.date = resolvedDate;
     }
     if (fact.place?.original) {
       result.place = fact.place.original;
@@ -137,25 +199,30 @@ function convertFactToGedcom(fact) {
   };
   const gedcomTag = typeMap[fact.type] || "EVEN";
   if (gedcomTag === "OCCU" && fact.value) {
-    lines.push(`1 OCCU ${fact.value}`);
+    lines.push(`1 OCCU ${sanitizeGedcomValue(fact.value)}`);
   } else {
     lines.push(`1 ${gedcomTag}`);
   }
+  if (gedcomTag === "EVEN") {
+    const typeName = fact.type.split("/").pop();
+    if (typeName) {
+      lines.push(`2 TYPE ${sanitizeGedcomValue(typeName)}`);
+    }
+  }
   if (fact.links?.conclusion?.href) {
     const webUrl = transformFamilySearchUrl(fact.links.conclusion.href);
     lines.push(`2 WWW ${webUrl}`);
     lines.push(`3 _IS_FS Y`);
   }
-  if (fact.date?.formal || fact.date?.original) {
-    lines.push(
-      `2 DATE ${(fact.date?.formal || fact.date?.original)?.replace(/^(-|\+)/, "")}`
-    );
+  const resolvedDate = resolveFactDate(fact.date);
+  if (resolvedDate) {
+    lines.push(`2 DATE ${sanitizeGedcomValue(resolvedDate)}`);
   }
   if (fact.place?.original) {
-    lines.push(`2 PLAC ${fact.place.original}`);
+    lines.push(`2 PLAC ${sanitizeGedcomValue(fact.place.original)}`);
   }
   if (fact.value && gedcomTag !== "OCCU") {
-    lines.push(`2 NOTE ${fact.value}`);
+    lines.push(`2 NOTE ${sanitizeGedcomValue(fact.value)}`);
   }
   return lines;
 }
@@ -175,14 +242,14 @@ function convertToGedcom(pedigreeData, options = {}) {
   lines.push("2 VERS 1.0");
   lines.push("2 NAME FamilySearch API");
   if (treeName) {
-    lines.push(`2 _TREE ${treeName}`);
+    lines.push(`2 _TREE ${sanitizeGedcomValue(treeName)}`);
     const randomRIN = Math.floor(Math.random() * 1e8);
     lines.push(`3 RIN ${randomRIN}`);
   }
   lines.push("1 DEST ANY");
   lines.push("1 DATE " + formatDateForGedcom(/* @__PURE__ */ new Date()));
   lines.push("1 SUBM @SUBM1@");
-  lines.push("1 FILE " + treeName);
+  lines.push("1 FILE " + sanitizeGedcomValue(treeName));
   lines.push("1 GEDC");
   lines.push("2 VERS 5.5");
   lines.push("2 FORM LINEAGE-LINKED");
@@ -204,20 +271,22 @@ function convertToGedcom(pedigreeData, options = {}) {
     const sourceId = `@S${sourceCounter++}@`;
     lines.push(`0 ${sourceId} SOUR`);
     const title = source.titles?.[0]?.value || "FamilySearch Source";
-    lines.push(`1 TITL ${title}`);
+    lines.push(`1 TITL ${sanitizeGedcomValue(title)}`);
     if (source.citations?.[0]?.value) {
-      lines.push(`1 TEXT ${source.citations[0].value}`);
+      lines.push(`1 TEXT ${sanitizeGedcomValue(source.citations[0].value)}`);
     }
     if (source.about) {
       const webUrl = transformSourceUrl(source.about);
       lines.push(`1 WWW ${webUrl}`);
     }
     if (source.resourceType) {
-      lines.push(`1 NOTE Resource Type: ${source.resourceType}`);
+      lines.push(
+        `1 NOTE Resource Type: ${sanitizeGedcomValue(source.resourceType)}`
+      );
     }
   });
   const fsSourMap = /* @__PURE__ */ new Map();
-  let fsSourCounter = 1;
+  let fsSourCounter = sourceCounter;
   pedigreeData.persons.forEach((person) => {
     if (person.sources?.persons?.[0]?.sources) {
       const sourceDescMap = /* @__PURE__ */ new Map();
@@ -267,20 +336,22 @@ function convertToGedcom(pedigreeData, options = {}) {
     lines.push(`1 _IS_FS Y`);
     lines.push(`1 _FS_ID ${id}`);
     if (source.titles?.[0]?.value) {
-      lines.push(`1 TITL ${source.titles[0].value}`);
+      lines.push(`1 TITL ${sanitizeGedcomValue(source.titles[0].value)}`);
     }
     if (source.citations?.[0]?.value) {
-      lines.push(`1 TEXT ${source.citations[0].value}`);
+      lines.push(`1 TEXT ${sanitizeGedcomValue(source.citations[0].value)}`);
     }
     if (source.about) {
       const webUrl = transformSourceUrl(source.about);
       lines.push(`1 WWW ${webUrl}`);
     }
     if (source.resourceType) {
-      lines.push(`1 NOTE Resource Type: ${source.resourceType}`);
+      lines.push(
+        `1 NOTE Resource Type: ${sanitizeGedcomValue(source.resourceType)}`
+      );
     }
     notes.forEach((note) => {
-      lines.push(`1 NOTE ${note}`);
+      lines.push(`1 NOTE ${sanitizeGedcomValue(note)}`);
     });
   });
   const fsMatchMap = /* @__PURE__ */ new Map();
@@ -300,7 +371,7 @@ function convertToGedcom(pedigreeData, options = {}) {
     lines.push(`1 _IS_FS Y`);
     lines.push(`1 _FS_ID ${id}`);
     if (entry.title) {
-      lines.push(`1 TITL ${entry.title}`);
+      lines.push(`1 TITL ${sanitizeGedcomValue(entry.title)}`);
     }
     if (entry.content?.score !== void 0) {
       lines.push(`1 SCORE ${entry.content.score}`);
@@ -321,7 +392,7 @@ function convertToGedcom(pedigreeData, options = {}) {
       }
       if (matchInfo.status) {
         const statusName = matchInfo.status.includes("/") ? matchInfo.status.split("/").pop() : matchInfo.status;
-        lines.push(`1 NOTE Status: ${statusName}`);
+        lines.push(`1 NOTE Status: ${sanitizeGedcomValue(statusName || "")}`);
       }
     }
     lines.push(`1 TYPE ${collectionType}`);
@@ -333,42 +404,52 @@ function convertToGedcom(pedigreeData, options = {}) {
     if (entry.content?.gedcomx?.persons && entry.content.gedcomx.persons.length > 0) {
       const matchedPerson = entry.content.gedcomx.persons[0];
       if (matchedPerson.display?.name) {
-        lines.push(`1 TEXT ${matchedPerson.display.name}`);
+        lines.push(`1 TEXT ${sanitizeGedcomValue(matchedPerson.display.name)}`);
       }
       if (matchedPerson.display?.lifespan) {
         lines.push(
-          `1 NOTE Lifespan: ${matchedPerson.display.lifespan}`
+          `1 NOTE Lifespan: ${sanitizeGedcomValue(matchedPerson.display.lifespan)}`
         );
       }
       if (matchedPerson.display?.birthDate || matchedPerson.display?.birthPlace) {
-        const birthInfo = [
-          matchedPerson.display.birthDate,
-          matchedPerson.display.birthPlace
-        ].filter(Boolean).join(", ");
+        const birthInfo = sanitizeGedcomValue(
+          [
+            matchedPerson.display.birthDate,
+            matchedPerson.display.birthPlace
+          ].filter(Boolean).join(", ")
+        );
         if (birthInfo) {
           lines.push(`1 NOTE Birth: ${birthInfo}`);
         }
       }
       if (matchedPerson.display?.deathDate || matchedPerson.display?.deathPlace) {
-        const deathInfo = [
-          matchedPerson.display.deathDate,
-          matchedPerson.display.deathPlace
-        ].filter(Boolean).join(", ");
+        const deathInfo = sanitizeGedcomValue(
+          [
+            matchedPerson.display.deathDate,
+            matchedPerson.display.deathPlace
+          ].filter(Boolean).join(", ")
+        );
         if (deathInfo) {
           lines.push(`1 NOTE Death: ${deathInfo}`);
         }
       }
       if (matchedPerson.display?.gender) {
-        lines.push(`1 NOTE Gender: ${matchedPerson.display.gender}`);
+        lines.push(
+          `1 NOTE Gender: ${sanitizeGedcomValue(matchedPerson.display.gender)}`
+        );
       }
     }
     if (entry.content?.sourceDescription) {
       const sourceDesc = entry.content.sourceDescription;
       if (sourceDesc.citations?.[0]?.value) {
-        lines.push(`1 NOTE Citation: ${sourceDesc.citations[0].value}`);
+        lines.push(
+          `1 NOTE Citation: ${sanitizeGedcomValue(sourceDesc.citations[0].value)}`
+        );
       }
       if (sourceDesc.resourceType) {
-        lines.push(`1 NOTE Resource Type: ${sourceDesc.resourceType}`);
+        lines.push(
+          `1 NOTE Resource Type: ${sanitizeGedcomValue(sourceDesc.resourceType)}`
+        );
       }
       if (sourceDesc.about) {
         const webUrl = transformSourceUrl(sourceDesc.about);
@@ -611,7 +692,7 @@ function convertToGedcom(pedigreeData, options = {}) {
     const personData = person.fullDetails?.persons?.[0] || person;
     const name = extractName(personData);
     if (name) {
-      lines.push(`1 NAME ${name}`);
+      lines.push(`1 NAME ${sanitizeGedcomValue(name)}`);
     }
     const gender = extractGender(personData);
     if (gender) {
@@ -621,20 +702,20 @@ function convertToGedcom(pedigreeData, options = {}) {
     if (birth) {
       lines.push("1 BIRT");
       if (birth.date) {
-        lines.push(`2 DATE ${birth.date}`);
+        lines.push(`2 DATE ${sanitizeGedcomValue(birth.date)}`);
       }
       if (birth.place) {
-        lines.push(`2 PLAC ${birth.place}`);
+        lines.push(`2 PLAC ${sanitizeGedcomValue(birth.place)}`);
       }
     }
     const death = extractFact(personData, "DEATH");
     if (death) {
       lines.push("1 DEAT");
       if (death.date) {
-        lines.push(`2 DATE ${death.date}`);
+        lines.push(`2 DATE ${sanitizeGedcomValue(death.date)}`);
       }
       if (death.place) {
-        lines.push(`2 PLAC ${death.place}`);
+        lines.push(`2 PLAC ${sanitizeGedcomValue(death.place)}`);
       }
     }
     personData.facts?.forEach((fact) => {
@@ -646,8 +727,7 @@ function convertToGedcom(pedigreeData, options = {}) {
     if (includeNotes && person.notes?.persons?.[0]?.notes) {
       person.notes.persons[0].notes.forEach((note) => {
         if (note.text) {
-          const noteText = note.text.replace(/\n/g, " ");
-          lines.push(`1 NOTE ${noteText}`);
+          lines.push(`1 NOTE ${sanitizeGedcomValue(note.text)}`);
         }
       });
     }
@@ -665,7 +745,7 @@ function convertToGedcom(pedigreeData, options = {}) {
           sourceRef.qualifiers.forEach((qualifier) => {
             if (qualifier.name && qualifier.value) {
               lines.push(
-                `2 NOTE ${qualifier.name}: ${qualifier.value}`
+                `2 NOTE ${sanitizeGedcomValue(`${qualifier.name}: ${qualifier.value}`)}`
               );
             }
           });
@@ -819,31 +899,36 @@ function addMarriageFacts(lines, relationships, person1, person2) {
     return [a, b].sort().join("-") === relKey;
   });
   if (!rel) return;
+  const isMarriageEvent = (type) => !!type && (type.includes("Marriage") || type.includes("Divorce"));
   const marriageFacts = [];
   if (rel.facts && Array.isArray(rel.facts)) {
     rel.facts.forEach((f) => {
-      if (f.type?.includes("Marriage")) {
+      if (isMarriageEvent(f.type)) {
         marriageFacts.push(f);
       }
     });
   }
   if (rel.details?.facts && Array.isArray(rel.details.facts)) {
     marriageFacts.push(
-      ...rel.details.facts.filter((f) => f.type?.includes("Marriage"))
+      ...rel.details.facts.filter((f) => isMarriageEvent(f.type))
     );
   }
   if (rel.details?.persons && Array.isArray(rel.details.persons)) {
     rel.details.persons.forEach((p) => {
       if (p.facts && Array.isArray(p.facts)) {
         p.facts.forEach((f) => {
-          if (f.type?.includes("Marriage")) {
+          if (isMarriageEvent(f.type)) {
             marriageFacts.push(f);
           }
         });
       }
     });
   }
+  const seenFacts = /* @__PURE__ */ new Set();
   marriageFacts.forEach((mf) => {
+    const key = `${mf.type}|${resolveFactDate(mf.date) || ""}|${mf.place?.original || ""}`;
+    if (seenFacts.has(key)) return;
+    seenFacts.add(key);
     const factLines = convertFactToGedcom(mf);
     factLines.forEach((line) => lines.push(line));
   });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@treeviz/familysearch-sdk",
-	"version": "2.0.6",
+	"version": "2.0.7",
 	"description": "Modern TypeScript SDK for FamilySearch API v3 - OAuth, Places API, Tree API, and GEDCOM utilities",
 	"type": "module",
 	"main": "./dist/index.js",