feat: Separate interfaces from classes in module

Author: Norbytus

src/builders/module.rs

@@ -49,6 +49,7 @@ pub struct ModuleBuilder<'a> {
     pub(crate) functions: Vec<FunctionBuilder<'a>>,
     pub(crate) constants: Vec<(String, Box<dyn IntoConst + Send>, DocComments)>,
     pub(crate) classes: Vec<fn() -> ClassBuilder>,
+    pub(crate) interfaces: Vec<fn() -> ClassBuilder>,
     #[cfg(feature = "enum")]
     pub(crate) enums: Vec<fn() -> EnumBuilder>,
     startup_func: Option<StartupShutdownFunc>,
@@ -179,7 +180,7 @@ impl ModuleBuilder<'_> {
     ///
     /// * Panics if a constant could not be registered.
     pub fn interface<T: RegisteredClass>(mut self) -> Self {
-        self.classes.push(|| {
+        self.interfaces.push(|| {
             let mut builder = InterfaceBuilder::new(T::CLASS_NAME);
             for (method, flags) in T::method_builders() {
                 builder = builder.method(method, flags);
@@ -279,6 +280,7 @@ impl ModuleBuilder<'_> {
 pub struct ModuleStartup {
     constants: Vec<(String, Box<dyn IntoConst + Send>)>,
     classes: Vec<fn() -> ClassBuilder>,
+    interfaces: Vec<fn() -> ClassBuilder>,
     #[cfg(feature = "enum")]
     enums: Vec<fn() -> EnumBuilder>,
 }
@@ -303,6 +305,10 @@ impl ModuleStartup {
             c.register().expect("Failed to build class");
         });
 
+        self.interfaces.into_iter().map(|c| c()).for_each(|c| {
+            c.register().expect("Failed to build interface");
+        });
+
         #[cfg(feature = "enum")]
         self.enums
             .into_iter()
@@ -345,6 +351,7 @@ impl TryFrom<ModuleBuilder<'_>> for (ModuleEntry, ModuleStartup) {
                 .map(|(n, v, _)| (n, v))
                 .collect(),
             classes: builder.classes,
+            interfaces: builder.interfaces,
             #[cfg(feature = "enum")]
             enums: builder.enums,
         };
@@ -400,6 +407,7 @@ mod tests {
         assert!(builder.functions.is_empty());
         assert!(builder.constants.is_empty());
         assert!(builder.classes.is_empty());
+        assert!(builder.interfaces.is_empty());
         assert!(builder.startup_func.is_none());
         assert!(builder.shutdown_func.is_none());
         assert!(builder.request_startup_func.is_none());