@bobfrankston/gcards 0.1.31 → 0.1.32

package/gcards.ts

@@ -129,7 +129,7 @@ async function refreshAccessToken(): Promise<string> {
     return currentAccessToken;
 }
 
-/** Get sort key from contact: fileAs (First Last) > displayNameLastFirst (Last, First) > displayName */
+/** Get sort key from contact: fileAs (Last, First) > displayNameLastFirst (Last, First) > displayName */
 function getSortKey(person: GooglePerson): string {
     const fileAs = person.fileAses?.[0]?.value;
     if (fileAs) return fileAs;
@@ -139,7 +139,7 @@ function getSortKey(person: GooglePerson): string {
 }
 
 function saveIndex(paths: UserPaths, index: ContactIndex): void {
-    // Sort contacts by sortKey (fileAs='First Last' > displayNameLastFirst='Last, First' > displayName)
+    // Sort contacts by sortKey (fileAs='Last, First' > displayNameLastFirst='Last, First' > displayName)
     const sortedContacts: Record<string, IndexEntry> = {};
     const entries = Object.entries(index.contacts);
     entries.sort((a, b) => {

package/gfix.ts

@@ -395,7 +395,7 @@ async function runBirthdayExtract(user: string, mode: 'inspect' | 'apply'): Prom
     }
 }
 
-/** Fix fileAs fields: normalize "Last, First" to "First Last"
+/** Fix fileAs fields: normalize to "Last, First" format and clean spurious characters
  *  Also fix displayNameLastFirst to proper "Last, First" format */
 async function runFileAsFix(user: string, mode: 'inspect' | 'apply'): Promise<void> {
     const paths = getUserPaths(user);
@@ -438,42 +438,63 @@ async function runFileAsFix(user: string, mode: 'inspect' | 'apply'): Promise<vo
             }
         }
 
-        // Fix fileAs: "Last, First" -> "First Last"
+        // Fix fileAs: should be "Last, First" format
         if (contact.fileAses?.length) {
             const fileAs = contact.fileAses[0].value || '';
+            const expectedFileAs = givenName && familyName ? `${familyName}, ${givenName}` : '';
 
-            // Check if fileAs is "Last, First" format
-            const commaMatch = fileAs.match(/^(.+),\s*(.+)$/);
-            if (commaMatch) {
-                const [, lastPart, firstPart] = commaMatch;
-
-                // If we have givenName and familyName, we can auto-fix
-                if (givenName && familyName) {
-                    // Verify the parts match (case-insensitive)
-                    const firstMatches = firstPart.toLowerCase().startsWith(givenName.toLowerCase()) ||
-                                         givenName.toLowerCase().startsWith(firstPart.toLowerCase());
-                    const lastMatches = lastPart.toLowerCase() === familyName.toLowerCase();
-
-                    if (firstMatches && lastMatches) {
-                        const newFileAs = `${givenName} ${familyName}`;
-                        console.log(`  ${displayName}: fileAs "${fileAs}" -> "${newFileAs}"`);
-
-                        if (mode === 'apply') {
-                            contact.fileAses[0].value = newFileAs;
-                            modified = true;
-                        }
-                        fileAsFixedCount++;
-                    } else {
-                        // Mismatch - add to review
+            // Check for malformed fileAs (e.g., "-, Eric Giler", "- Eric", etc.)
+            const malformedMatch = fileAs.match(/^[-,\s]+(.+)$/);
+            if (malformedMatch && givenName && familyName) {
+                // Spurious dash/comma prefix
+                console.log(`  ${displayName}: fileAs "${fileAs}" -> "${expectedFileAs}" (cleaned malformed)`);
+                if (mode === 'apply') {
+                    contact.fileAses[0].value = expectedFileAs;
+                    modified = true;
+                }
+                fileAsFixedCount++;
+            } else if (expectedFileAs && fileAs !== expectedFileAs) {
+                // Check if fileAs is "First Last" format (wrong) or just doesn't match
+                const isFirstLast = fileAs === `${givenName} ${familyName}`;
+                const commaMatch = fileAs.match(/^(.+),\s*(.+)$/);
+                
+                if (isFirstLast) {
+                    // Wrong format: "First Last" instead of "Last, First"
+                    console.log(`  ${displayName}: fileAs "${fileAs}" -> "${expectedFileAs}" (wrong format)`);
+                    if (mode === 'apply') {
+                        contact.fileAses[0].value = expectedFileAs;
+                        modified = true;
+                    }
+                    fileAsFixedCount++;
+                } else if (commaMatch) {
+                    const [, lastPart, firstPart] = commaMatch;
+                    // Verify the parts match
+                    const firstMatches = firstPart.trim().toLowerCase() === givenName.toLowerCase();
+                    const lastMatches = lastPart.trim().toLowerCase() === familyName.toLowerCase();
+                    
+                    if (!firstMatches || !lastMatches) {
+                        // Parts don't match - needs review
                         needsReview.push({ givenName, familyName, fileAs, jsonFile: file });
                         skippedCount++;
                     }
-                } else {
-                    // No familyName - need manual review
-                    needsReview.push({ givenName: givenName || displayName, familyName, fileAs, jsonFile: file });
+                } else if (fileAs && !commaMatch) {
+                    // Not in "Last, First" format at all
+                    needsReview.push({ givenName, familyName, fileAs, jsonFile: file });
                     skippedCount++;
                 }
             }
+        } else if (givenName && familyName) {
+            // Missing fileAs - add it
+            const expectedFileAs = `${familyName}, ${givenName}`;
+            console.log(`  ${displayName}: Adding fileAs "${expectedFileAs}"`);
+            if (mode === 'apply') {
+                contact.fileAses = [{
+                    metadata: { primary: true },
+                    value: expectedFileAs
+                }];
+                modified = true;
+            }
+            fileAsFixedCount++;
         }
 
         if (modified) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/gcards",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "description": "Google Contacts cleanup and management tool",
   "type": "module",
   "main": "gcards.ts",
@@ -29,7 +29,7 @@
   "author": "Bob Frankston",
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^22.10.1",
+    "@types/node": "^25.0.3",
     "tsx": "^4.21.0"
   },
   "dependencies": {