Cast value to the appropriate type

Author: DavidMStraub

gedcom7/cast.py

@@ -2,17 +2,21 @@
 
 from __future__ import annotations
 
+import logging
 import re
 from collections.abc import Callable
 
 from . import const, grammar, types
 
+logger = logging.getLogger(__name__)
+
 
 def cast_value(text: str, type_id: str) -> types.DataType | None:
     if not text:
         return None
     payload = const.payloads.get(type_id)
     if not payload:
+        logger.warning("Encountered unknown data type %s", type_id)
         return None
     cast_fuction = CAST_FUNCTIONS.get(payload)
     if not cast_fuction:
@@ -146,7 +150,11 @@ def _cast_date_period(value: str) -> types.DatePeriod:
         if to_date_match:
             res["to"] = types.Date(
                 calendar=to_date_match.group("calendar"),
-                day=int(to_date_match.group("day")) if to_date_match.group("day") else None,
+                day=(
+                    int(to_date_match.group("day"))
+                    if to_date_match.group("day")
+                    else None
+                ),
                 month=to_date_match.group("month"),
                 year=int(to_date_match.group("year")),
                 epoch=to_date_match.group("epoch"),
@@ -156,7 +164,11 @@ def _cast_date_period(value: str) -> types.DatePeriod:
         if from_date_match:
             res["from_"] = types.Date(
                 calendar=from_date_match.group("calendar"),
-                day=int(from_date_match.group("day")) if from_date_match.group("day") else None,
+                day=(
+                    int(from_date_match.group("day"))
+                    if from_date_match.group("day")
+                    else None
+                ),
                 month=from_date_match.group("month"),
                 year=int(from_date_match.group("year")),
                 epoch=from_date_match.group("epoch"),

gedcom7/parser.py

@@ -1,10 +1,9 @@
 """GEDCOM 7 parser."""
 
-
 import re
 from typing import Dict, List
 
-from . import const, grammar
+from . import cast, const, grammar
 from .types import GedcomStructure
 
 
@@ -39,6 +38,10 @@ def loads(string: str) -> List[GedcomStructure]:
         if level > 0:
             parent = context[level - 1]
             structure.parent = parent
+        structure.value = cast.cast_value(
+            text=structure.text, type_id=structure.type_id
+        )
+        if level > 0:
             parent.children.append(structure)
         else:
             records.append(structure)

gedcom7/types.py

@@ -18,6 +18,7 @@ class GedcomStructure:
     xref: str
     children: list["GedcomStructure"] = field(default_factory=list)
     parent: "GedcomStructure | None" = None
+    value: "DataType" | None = None
 
     @property
     def type_id(self) -> str: