Load directory file-api objects

Signed-off-by: Cristian Le <[email protected]>

Author: LecrisUT

src/scikit_build_core/file_api/_cattrs_converter.py

@@ -11,6 +11,8 @@
 from .model.cache import Cache
 from .model.cmakefiles import CMakeFiles
 from .model.codemodel import CodeModel, Target
+from .model.codemodel import Directory as CodeModelDirectory
+from .model.directory import Directory
 from .model.index import Index, Reply
 
 T = TypeVar("T")
@@ -37,16 +39,21 @@ def make_converter(base_dir: Path) -> cattr.preconf.json.JsonConverter:
     converter.register_structure_hook(Reply, st_hook)
 
     def from_json_file(with_path: Dict[str, Any], t: Type[T]) -> T:
+        if "jsonFile" not in with_path and t is CodeModelDirectory:
+            return converter.structure_attrs_fromdict(with_path, t)
         if with_path["jsonFile"] is None:
             return converter.structure_attrs_fromdict({}, t)
         path = base_dir / Path(with_path["jsonFile"])
         raw = json.loads(path.read_text(encoding="utf-8"))
+        if t is CodeModelDirectory:
+            t = Directory  # type: ignore[assignment]
         return converter.structure_attrs_fromdict(raw, t)
 
     converter.register_structure_hook(CodeModel, from_json_file)
     converter.register_structure_hook(Target, from_json_file)
     converter.register_structure_hook(Cache, from_json_file)
     converter.register_structure_hook(CMakeFiles, from_json_file)
+    converter.register_structure_hook(CodeModelDirectory, from_json_file)
     return converter
 
 

src/scikit_build_core/file_api/reply.py

@@ -11,6 +11,7 @@
 from .model.cache import Cache
 from .model.cmakefiles import CMakeFiles
 from .model.codemodel import CodeModel, Target
+from .model.codemodel import Directory as CodeModelDirectory
 from .model.directory import Directory
 from .model.index import Index
 
@@ -51,10 +52,14 @@ def make_class(self, data: InputDict, target: Type[T]) -> T:
         Convert a dict to a dataclass. Automatically load a few nested jsonFile classes.
         """
         if (
-            target in {CodeModel, Target, Cache, CMakeFiles, Directory}
+            target in {CodeModel, Target, Cache, CMakeFiles, CodeModelDirectory}
             and "jsonFile" in data
             and data["jsonFile"] is not None
         ):
+            # Transform CodeModelDirectory to Directory object
+            # TODO: inherit the fields from CodeModel counterparts
+            if target is CodeModelDirectory:
+                target = Directory  # type: ignore[assignment]
             return self._load_from_json(Path(data["jsonFile"]), target)
 
         input_dict: Dict[str, Type[Any]] = {}