gedcom-d3 2.3.0 → 2.9.0

package/.claude/settings.local.json

@@ -2,7 +2,14 @@
   "permissions": {
     "allow": [
       "Bash(chmod:*)",
-      "Bash(./publish.sh:*)"
+      "Bash(./publish.sh:*)",
+      "Bash(while read hash msg)",
+      "Bash(do echo \"=== $msg \\($hash\\) ===\")",
+      "Bash(done)",
+      "Bash(npm run release:*)",
+      "Bash(npm whoami:*)",
+      "Bash(npm login:*)",
+      "Bash(npm publish:*)"
     ]
   }
 }

package/d3ize.js

@@ -191,6 +191,14 @@ const getFirstName = (p) => {
         return firstNameNode.data;
       }
     } else {
+      // Fallback: extract given name from NAME value (e.g. "Harry /Potter/")
+      const nameData = nameNode.data || "";
+      const slashIndex = nameData.indexOf("/");
+      const givenPart = (slashIndex !== -1 ? nameData.slice(0, slashIndex) : nameData).trim();
+      if (givenPart) {
+        const spaceIndex = givenPart.indexOf(" ");
+        return spaceIndex !== -1 ? givenPart.slice(0, spaceIndex) : givenPart;
+      }
       return "?";
     }
   } else {
@@ -245,7 +253,7 @@ const getGender = (p) => {
   if (genderNode) {
     return genderNode.data;
   } else {
-    return "Unknown";
+    return "U";
   }
 };
 
@@ -266,6 +274,12 @@ const getDOB = (p) => {
   }
 };
 
+// Extract a 4-digit year from a date string
+const extractYear = (dateStr) => {
+  const match = dateStr.match(/\b(\d{4})\b/);
+  return match ? match[1] : "?";
+};
+
 // Get year of birth
 const getYOB = (p) => {
   // Find 'BIRT' tag
@@ -274,7 +288,7 @@ const getYOB = (p) => {
     // Find 'DATE' tag
     let dateNode = (dobNode.tree.filter(hasTag("DATE")) || [])[0];
     if (dateNode) {
-      return dateNode.data.slice(-4);
+      return extractYear(dateNode.data);
     } else {
       return "?";
     }
@@ -303,7 +317,6 @@ const getPOB = (p) => {
 // Get date of death
 const getDOD = (p) => {
   // Find 'DEAT' tag
-  let dobNode = (p.tree.filter(hasTag("BIRT")) || [])[0];
   let dodNode = (p.tree.filter(hasTag("DEAT")) || [])[0];
   if (dodNode) {
     // Find 'DATE' tag
@@ -313,15 +326,8 @@ const getDOD = (p) => {
     } else {
       return "?";
     }
-  } else if (dobNode) {
-    let dateNode = (dobNode.tree.filter(hasTag("DATE")) || [])[0];
-    if (dateNode) {
-      return dateNode.data.slice(-4) + 100;
-    } else {
-      return "?";
-    }
   } else {
-    return "Present";
+    return "?";
   }
 };
 
@@ -340,7 +346,7 @@ const getYOD = (p) => {
 
     // If death date listed
     if (dateNode) {
-      return dateNode.data.slice(-4);
+      return extractYear(dateNode.data);
     } else {
       return "?";
     }
@@ -352,7 +358,8 @@ const getYOD = (p) => {
     // If DOB listed
     if (dateNode) {
       // If born > 100 yrs ago, call dead
-      if (dateNode.data.slice(-4) < thisYear - 100) {
+      let birthYear = extractYear(dateNode.data);
+      if (birthYear !== "?" && Number(birthYear) < thisYear - 100) {
         return "?";
       } else {
         return "Present";
@@ -423,35 +430,31 @@ const getFamilies = (p) => {
 const getColor = (p, surnameList) => {
   const colorList = [
     "#f6edd0", // cream
-    "#ef8a65", // coral
-    "#00b4ff", // sky blue
-    "#fac641", // mexican egg yolk
-    "#c8d84c", // olive
-    "#e1b386", // light brown
-    "#a5c2cc", // light blue grey
-    "#e87c76", // soft pink
+    "#f8a39e", // soft pink
+    "#5bceff", // sky blue
+    "#ffc32a", // mexican egg yolk
+    "#8df0c2", // grass & sage
     "#d0a8ec", // soft royal purple
-    "#8ad5b2", // grass & sage
-    "#f8a7d0", // dry wine
+    "#ffa686", // coral
+    "#adcdd8", // light blue grey
+    "#a6b890", // olive sage
+    "#e6f387", // olive
+    "#eebf90", // light brown
     "#6e90e6", // ligt purple blue
-    "#a6e9e6", // sea foam
-    "#df9ac1", // magenta
-    "#4ae9bc", // forest
+    "#f8a7d0", // dry wine
+    "#30f6d5", // sea foam
+    "#be719d", // magenta
     "#e08e79", // blush
     "#80d152", // neon green
-    "#e7c34e", // tangerine
-    "#7ff0ca", // light sea foam
+    "#9efde5", // light sea foam
     "#ff835a", // burnt orange
     "#eebd6e", // chocolate
-    "#a6b890", // olive sage
-    "#c44d58", // rouge
-    "#e8b28e", // peach
+    "#35f8a0", // forest
+    "#f95162", // rouge
     "#d4ee5e", // lime
-    "#f3f621", // light yellow
     "#e887aa", // newborn pink
-    "#c4a8f6", // royal purple
-    "#71cfde", // baby foam
-    "#ccc", // light grey
+    "#a178ea", // royal purple
+    "#00c0de", // baby foam
   ];
 
   // If color description listed in GEDCOM

package/package.json

@@ -1,11 +1,11 @@
 {
 	"name": "gedcom-d3",
-	"version": "2.3.0",
+	"version": "2.9.0",
 	"description": "A GEDCOM parser, which translates GEDCOM (.ged) files into D3 capable JSON. This package is specifically designed to prepare data for use in https://github.com/oh-kay-blanket/blood-lines",
 	"main": "index.js",
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1",
-		"publish": "./publish.sh minor"
+		"release": "./publish.sh minor"
 	},
 	"keywords": [
 		"gedcom",