Fix subpackages for templates, add tests

robotpy_build/hooks.py

@@ -238,9 +238,10 @@ def header_hook(self, header, data):
             qualname = tmpl_data.qualname
             if "::" not in qualname:
                 qualname = f"::{qualname}"
-            tmpl_data = tmpl_data.dict()
-            tmpl_data["x_qualname_"] = qualname.translate(self._qualname_trans)
-            templates[k] = tmpl_data
+            tmpl_data_d = tmpl_data.dict()
+            tmpl_data_d["x_qualname_"] = qualname.translate(self._qualname_trans)
+            self._add_subpackage(tmpl_data_d, tmpl_data)
+            templates[k] = tmpl_data_d
 
         data["templates"] = templates
 
@@ -605,6 +606,11 @@ def class_hook(self, cls, data):
         template_parameter_list = ""
 
         if class_data.template_params:
+            if class_data.subpackage:
+                raise ValueError(
+                    f"{cls_name}: classes with subpackages must define subpackage on template instantiation"
+                )
+
             template_args = []
             template_params = []
 

robotpy_build/hooks_datacfg.py

@@ -297,7 +297,9 @@ class ClassData(Model):
     shared_ptr: bool = True
 
     #: If specified, put the class in a sub.pack.age. Ignored
-    #: for functions attached to a class.
+    #: for functions attached to a class. When template parameters
+    #: are used, must define subpackage on template instances
+    #: instead
     subpackage: Optional[str] = None
 
     #: Extra 'using' directives to insert into the trampoline and the
@@ -375,6 +377,9 @@ class MyClass {};
     #: Template parameters to use
     params: List[str]
 
+    #: If specified, put the template instantiation in a sub.pack.age
+    subpackage: Optional[str] = None
+
 
 class HooksDataYaml(Model):
     """

robotpy_build/templates/cls.cpp.j2

@@ -66,7 +66,7 @@ void init_{{ mod_fn }}(py::module &m) {
 
 {# templates #}
 {% for name, tmpl_data in templates.items() %}
-  rpygen::bind_{{ tmpl_data.x_qualname_ }}<{{ tmpl_data.params | join(', ') }}>(m, "{{ name }}");
+  rpygen::bind_{{ tmpl_data.x_qualname_ }}<{{ tmpl_data.params | join(', ') }}>({{ tmpl_data.x_module_var }}, "{{ name }}");
 {% endfor %}
 
 {# class declarations #}

robotpy_build/templates/pybind11.cpp.j2

@@ -257,6 +257,8 @@ py::enum_<{{ enum.x_namespace }}{{ enum.name }}>({{ scope }}, "{{ enum.x_name }}
 
     {%- if cls.parent -%}
       {{ cls.parent.x_varname }}
+    {%- elif cls.data.template_params -%}
+      m
     {%- else -%}
       {{ cls.x_module_var }}
     {%- endif -%}

tests/cpp/gen/ft/subpkg.yml

@@ -0,0 +1,20 @@
+---
+functions:
+  sp_func:
+    subpackage: subpkg
+classes:
+  SPClass:
+    shared_ptr: true
+    subpackage: subpkg
+
+  SPTemplate:
+    shared_ptr: true
+    template_params:
+    - T
+
+templates:
+  SPTemplate:
+    subpackage: subpkg
+    qualname: SPTemplate
+    params:
+    - int

tests/cpp/pyproject.toml.tmpl

@@ -41,6 +41,7 @@ generate = [
     { ignore = "ignore.h" },
     { overloads = "overloads.h" },
     { rename = "rename.h" },
+    { subpkg = "subpkg.h" },
     { static_only = "static_only.h" },
     { type_caster = "type_caster.h" },
     { type_caster_nested = "type_caster_nested.h" },

tests/cpp/rpytest/ft/include/subpkg.h

@@ -0,0 +1,13 @@
+
+#pragma once
+
+struct SPClass
+{
+};
+
+template <typename T>
+struct SPTemplate
+{
+};
+
+inline int sp_func() { return 3; }

tests/cpp/rpytest/ft/subpkg.py

@@ -0,0 +1,4 @@
+# autogenerated by 'robotpy-build create-imports rpytest.ft rpytest.ft._rpytest_ft.subpkg'
+from ._rpytest_ft.subpkg import SPClass, sp_func
+
+__all__ = ["SPClass", "sp_func"]

tests/test_ft_misc.py

@@ -117,3 +117,7 @@ def __init__(self):
     with pytest.raises(TypeError):
         PyGoodAbstract()
     assert called == [True]
+
+
+def test_subpkg():
+    from rpytest.ft.subpkg import SPClass