Add given and suffix to PersonalName

Author: DavidMStraub

gedcom7/cast.py

@@ -60,7 +60,9 @@ def _cast_personal_name(value: str) -> types.PersonalName:
     match = _match(value, grammar.personalname, "PersonalName")
     return types.PersonalName(
         fullname=value.replace("/", ""),
-        surname=match.group("surname"),
+        surname=match.group("surname").strip() if match.group("surname") else None,
+        given=match.group("given").strip() if match.group("given") else None,
+        suffix=match.group("suffix").strip() if match.group("suffix") else None,
     )
 
 

gedcom7/grammar.py

@@ -110,7 +110,7 @@
 minute = '[012345][0-9]'
 namechar = '[ -.0-\\U0010ffff]'
 namestr = f'({namechar})+'
-personalname = f'({namestr}|({namestr})?/(?P<surname>{namestr})?/({namestr})?)'
+personalname = f'({namestr}|(?P<given>{namestr})?/(?P<surname>{namestr})?/(?P<suffix>{namestr})?)'
 second = '[012345][0-9]'
 text = f'({anychar})*'
 special = f'{text}'

gedcom7/types.py

@@ -39,7 +39,9 @@ class PersonalName:
     """Personal name type."""
 
     fullname: str
+    given: str | None = None
     surname: str | None = None
+    suffix: str | None = None
 
 
 @dataclass

test/test_cast.py

@@ -37,10 +37,13 @@ def test_cast_personal_name():
     assert cast._cast_personal_name("John /Doe/") == types.PersonalName(
         fullname="John Doe",
         surname="Doe",
+        given="John",
     )
     assert cast._cast_personal_name("John /Doe/ Smith") == types.PersonalName(
         fullname="John Doe Smith",
         surname="Doe",
+        given="John",
+        suffix="Smith",
     )
     with pytest.raises(ValueError):
         cast._cast_personal_name("John /Doe/ Smith /Smith/")
@@ -51,14 +54,17 @@ def test_cast_personal_name():
     assert cast._cast_personal_name("José /O'Malley/") == types.PersonalName(
         fullname="José O'Malley",
         surname="O'Malley",
+        given="José",
     )
     assert cast._cast_personal_name("María-José /García-López/") == types.PersonalName(
         fullname="María-José García-López",
         surname="García-López",
+        given="María-José",
     )
     assert cast._cast_personal_name("Søren /Ødegård/") == types.PersonalName(
         fullname="Søren Ødegård",
         surname="Ødegård",
+        given="Søren",
     )