Tests pass

Author: virtuald

src/semiwrap/autowrap/cxxparser.py

@@ -58,6 +58,7 @@
     Variable,
 )
 
+from ..casters import CastersData
 from ..config.autowrap_yml import (
     AutowrapConfigYaml,
     BufferData,
@@ -329,7 +330,7 @@ def __init__(
         self,
         hctx: HeaderContext,
         gendata: GeneratorData,
-        casters: typing.Dict[str, typing.Dict[str, typing.Any]],
+        casters: CastersData,
         report_only: bool,
     ) -> None:
         self.hctx = hctx
@@ -1898,8 +1899,8 @@ def _add_default_arg_cast(
             typename = _fmt_nameonly(ntype.typename)
             if typename:
                 ccfg = self.casters.get(typename)
-                if ccfg and ccfg.get("darg"):
-                    found_typename = ccfg["typename"]
+                if ccfg and ccfg.default_arg_cast:
+                    found_typename = ccfg.typename
                     name = f"({found_typename}){name}"
 
         return name
@@ -1975,7 +1976,7 @@ def _set_type_caster_includes(self):
         for typename in self.types:
             ccfg = casters.get(typename)
             if ccfg:
-                includes.add(ccfg["hdr"])
+                includes.add(ccfg.header)
 
         self.hctx.type_caster_includes = sorted(includes)
 
@@ -1986,7 +1987,7 @@ def parse_header(
     header_root: pathlib.Path,
     gendata: GeneratorData,
     parser_options: ParserOptions,
-    casters: typing.Dict[str, typing.Dict[str, typing.Any]],
+    casters: CastersData,
     report_only: bool,
 ) -> HeaderContext:
     user_cfg = gendata.data

src/semiwrap/casters.py

@@ -7,29 +7,49 @@
 
 PKGCONF_CASTER_EXT = ".pybind11.json"
 
+#
+# JSON caster data
+#
+
 
 @dataclasses.dataclass
-class TypeCasterHeader:
+class TypeCasterJsonHeader:
     header: str
     types: T.List[str]
     default_arg_cast: bool = False
 
 
 #: content of .pybind11.json
 @dataclasses.dataclass
-class TypeCasterData:
-    headers: T.List[TypeCasterHeader] = dataclasses.field(default_factory=list)
+class TypeCasterJsonData:
+    """
+    Stored in *.pybind11.json
+    """
+
+    headers: T.List[TypeCasterJsonHeader] = dataclasses.field(default_factory=list)
 
 
-def load_typecaster_data(fname) -> TypeCasterData:
+def load_typecaster_json_data(fname) -> TypeCasterJsonData:
     with open(fname) as fp:
-        return parse_input(json.load(fp), TypeCasterData, fname)
+        return parse_input(json.load(fp), TypeCasterJsonData, fname)
 
 
-def save_typecaster_data(fname: pathlib.Path, data: TypeCasterData):
+def save_typecaster_json_data(fname: pathlib.Path, data: TypeCasterJsonData):
     with open(fname, "w") as fp:
         json.dump(dataclasses.asdict(data), fp)
 
 
-#: content of pickle file
-CastersData = T.Dict[str, T.Dict[str, T.Any]]
+#
+# Pickled caster lookup as stored by resolve_casters
+#
+
+
+@dataclasses.dataclass
+class TypeData:
+    header: pathlib.Path
+    typename: str
+    default_arg_cast: bool
+
+
+#: content of pickle file used internally
+CastersData = T.Dict[str, TypeData]

src/semiwrap/cmd_dat2cpp.py

@@ -20,6 +20,7 @@ def _write_wrapper_cpp(input_dat: pathlib.Path, output_cpp: pathlib.Path):
     content = render_wrapped_cpp(hctx)
     output_cpp.write_text(content)
 
+
 def main():
     try:
         _, input_dat, output_cpp = sys.argv

src/semiwrap/cmd_dat2tmplcpp.py

@@ -11,9 +11,7 @@
 from .autowrap.render_tmpl_inst import render_template_inst_cpp
 
 
-def _write_wrapper_cpp(
-    input_dat: pathlib.Path, py_name: str, output_cpp: pathlib.Path
-):
+def _write_wrapper_cpp(input_dat: pathlib.Path, py_name: str, output_cpp: pathlib.Path):
     with open(input_dat, "rb") as fp:
         hctx = pickle.load(fp)
 

src/semiwrap/cmd_dat2trampoline.py

@@ -22,9 +22,7 @@ def _get_child_classes(c: ClassContext):
         yield from _get_child_classes(cls)
 
 
-def _write_wrapper_cpp(
-    input_dat: pathlib.Path, yml_id: str, output_hpp: pathlib.Path
-):
+def _write_wrapper_cpp(input_dat: pathlib.Path, yml_id: str, output_hpp: pathlib.Path):
     with open(input_dat, "rb") as fp:
         hctx = pickle.load(fp)
 

src/semiwrap/cmd_make_pyi.py

@@ -1,5 +1,8 @@
 """
-Creates an output .pyi file from a given python module
+Creates an output .pyi file from a given python module.
+
+Arguments are:
+    package outpath [subpackage outpath...] -- package mapped_file
 """
 
 import importlib.util
@@ -29,8 +32,11 @@ def find_spec(cls, fullname, path, target=None):
             return importlib.util.spec_from_file_location(fullname, m)
 
 
-def _write_pyi(package_name: str, output_pyi: str):
+def _write_pyi(package_name, generated_pyi: T.Dict[pathlib.PurePath, pathlib.Path]):
 
+    # We can't control where stubgen writes files, so tell it to output
+    # to a temporary directory and then we copy the files from there to
+    # our desired location
     with tempfile.TemporaryDirectory() as tmpdir:
         # Call pybind11-stubgen
         sys.argv = [
@@ -45,28 +51,40 @@ def _write_pyi(package_name: str, output_pyi: str):
 
         pybind11_stubgen.main()
 
-        import os
-        os.system(f"find {tmpdir}")
-
         # stubgen doesn't take a direct output filename, so move the file
         # to our desired location
-        elems = package_name.split(".")
-        elems[-1] = f"{elems[-1]}.pyi"
-        pathlib.Path(tmpdir, *elems).rename(output_pyi)
+        tmpdir_pth = pathlib.Path(tmpdir)
+        for infile, output in generated_pyi.items():
+            (tmpdir_pth / infile).rename(output)
 
 
 def main():
-    try:
-        _, package_name, output_pyi = sys.argv[:3]
-    except ValueError:
+
+    generated_pyi: T.Dict[pathlib.PurePath, pathlib.Path] = {}
+    argv = sys.argv
+
+    if len(argv) < 3:
         print(inspect.cleandoc(__doc__ or ""), file=sys.stderr)
         sys.exit(1)
 
+    # Package name first
+    package_name = argv[1]
+
+    # Output file map: input output
+    idx = 2
+    while idx < len(argv):
+        if argv[idx] == "--":
+            idx += 1
+            break
+
+        generated_pyi[pathlib.PurePath(argv[idx])] = pathlib.Path(argv[idx + 1])
+        idx += 2
+
     # Arguments are used to set up the package map
     package_map = _PackageFinder.mapping
-    for i in range(3, len(sys.argv), 2):
-        package_map[sys.argv[i]] = sys.argv[i + 1]
-    
+    for i in range(idx, len(argv), 2):
+        package_map[argv[i]] = argv[i + 1]
+
     # Add parent packages too
     # .. assuming there are __init__.py in each package
     for pkg in list(package_map.keys()):
@@ -76,15 +94,14 @@ def main():
                 break
             ppkg = pkg[:idx]
             if ppkg not in package_map:
-                package_map[ppkg] = join(dirname(dirname(package_map[pkg])), "__init__.py")
+                package_map[ppkg] = join(
+                    dirname(dirname(package_map[pkg])), "__init__.py"
+                )
             pkg = ppkg
 
-    import pprint
-    pprint.pprint(package_map)
-
     sys.meta_path.insert(0, _PackageFinder)
 
-    _write_pyi(package_name, output_pyi)
+    _write_pyi(package_name, generated_pyi)
 
 
 if __name__ == "__main__":

src/semiwrap/cmd_publish_casters.py

@@ -5,18 +5,13 @@
 Generates a FOO.pc file and a FOO.pybind11.json file
 """
 
-import json
 import pathlib
 import sys
-import typing as T
 
-from .casters import TypeCasterData, TypeCasterHeader, save_typecaster_data
+from .casters import TypeCasterJsonData, TypeCasterJsonHeader, save_typecaster_json_data
 from .pyproject import PyProject
 
 
-from .config.pyproject_toml import ExtensionModuleConfig
-
-
 def main():
     try:
         _, pyproject_toml, caster_name, output_json, output_pc = sys.argv
@@ -53,7 +48,7 @@ def main():
         "",
         f"Name: {caster_name}",
         "Description: pybind11 type casters",
-        "Version:", # TODO put in correct version
+        "Version:",  # TODO put in correct version
         "Cflags: -I${includedir}",
     ]
 
@@ -68,7 +63,7 @@ def main():
     # Gather the data and write it next to the pc file
     #
 
-    data = TypeCasterData()
+    data = TypeCasterJsonData()
     for hdr in cfg.headers:
 
         # Ensure the published header actually exists
@@ -82,14 +77,14 @@ def main():
             sys.exit(1)
 
         data.headers.append(
-            TypeCasterHeader(
+            TypeCasterJsonHeader(
                 header=hdr.header,
                 types=hdr.types,
                 default_arg_cast=hdr.default_arg_cast,
             )
         )
 
-    save_typecaster_data(pathlib.Path(output_json), data)
+    save_typecaster_json_data(pathlib.Path(output_json), data)
 
 
 if __name__ == "__main__":

src/semiwrap/cmd_resolve_casters.py

@@ -3,45 +3,17 @@
 pybind11 type caster implementations.
 """
 
-import dataclasses
 import inspect
 import pathlib
 import pickle
 import sys
-import typing as T
 
-from .casters import CastersData, load_typecaster_data
+from .casters import CastersData, load_typecaster_json_data, TypeData
 from .depfile import Depfile
 
-# @dataclasses.dataclass
-# class TypeCasterJson:
-#     pass
-
-
-# def _all_casters():
-#     casters = {}
-#     for dep in wrapper.all_deps():
-#         dep.get_type_casters_cfg(casters)
-#     self.pkgcfg.get_pkg("robotpy-build").get_type_casters_cfg(casters)
-#     self.get_type_casters_cfg(casters)
-
-#     # make each configuration unique
-#     for k, v in list(casters.items()):
-#         v = v.copy()
-#         v["typename"] = k
-#         casters[k] = v
-
-#     # add non-namespaced versions of all casters
-#     # -> in theory this could lead to a conflict, but
-#     #    let's see how it works in practice?
-#     for k, v in list(casters.items()):
-#         k = k.split("::")[-1]
-#         casters[k] = v
-#     return casters
-
 
 def _update_all_casters(type_caster_cfg: pathlib.Path, all_casters: CastersData):
-    data = load_typecaster_data(type_caster_cfg)
+    data = load_typecaster_json_data(type_caster_cfg)
 
     # flatten it
     for item in data.headers:
@@ -53,10 +25,9 @@ def _update_all_casters(type_caster_cfg: pathlib.Path, all_casters: CastersData)
 
         for typ in item.types:
             if typ not in all_casters:
-                all_casters[typ] = {
-                    "hdr": str(header),
-                    "dcast": item.default_arg_cast,
-                }
+                all_casters[typ] = TypeData(
+                    header=header, typename=typ, default_arg_cast=item.default_arg_cast
+                )
 
 
 def main():