feat(config)!: Improve config module resolution

The new system is slightly less flexible, but the code and lua
definitions is now a lot simpler and easier to understand.
In fact the old lua definition was not actually correct.

It is likely that existing configs require not/minimal tweaks to work
again.

config/rooms.lua

@@ -1,4 +1,4 @@
---- @type SetupTable
+--- @type Module
 return {
 	require("config.rooms.bathroom"),
 	require("config.rooms.bedroom"),

definitions/config.lua

@@ -9,14 +9,16 @@ local FulfillmentConfig
 
 ---@class Config
 ---@field fulfillment FulfillmentConfig
----@field modules (Modules)?
+---@field modules (Module)[]
 ---@field mqtt MqttConfig
 ---@field schedule (table<string, fun() | fun()[]>)?
 local Config
 
----@alias SetupFunction fun(mqtt_client: AsyncClient): SetupTable?
+---@class Module
----@alias SetupTable (DeviceInterface | { setup: SetupFunction? } | SetupTable)[]
+---@field setup (fun(mqtt_client: AsyncClient): Module | DeviceInterface[] | nil)?
----@alias Modules SetupFunction | SetupTable
+---@field devices (DeviceInterface)[]?
+---@field [number] (Module)[]?
+local Module
 
 ---@class MqttConfig
 ---@field host string

src/bin/automation.rs

@@ -140,11 +140,10 @@ async fn app() -> anyhow::Result<()> {
 
     let mqtt_client = mqtt::start(config.mqtt, &device_manager.event_channel());
 
-    if let Some(modules) = config.modules {
+    let resolved = config.modules.resolve(&lua, &mqtt_client).await?;
-        for device in modules.setup(&lua, &mqtt_client).await? {
+    for device in resolved.devices {
         device_manager.add(device).await;
     }
-    }
 
     start_scheduler(config.schedule).await?;
 

src/bin/generate_definitions.rs

@@ -1,7 +1,7 @@
 use std::fs::{self, File};
 use std::io::Write;
 
-use automation::config::{Config, FulfillmentConfig, Modules};
+use automation::config::{Config, FulfillmentConfig, Module as ConfigModule};
 use automation_lib::Module;
 use automation_lib::mqtt::{MqttConfig, WrappedAsyncClient};
 use lua_typed::Typed;
@@ -35,7 +35,7 @@ fn config_definitions() -> String {
     output += "\n";
     output += &Config::generate_full().expect("Config should have a definition");
     output += "\n";
-    output += &Modules::generate_full().expect("Setups should have a definition");
+    output += &ConfigModule::generate_full().expect("Module should have a definition");
     output += "\n";
     output += &MqttConfig::generate_full().expect("MqttConfig should have a definition");
     output += "\n";

src/config.rs

@@ -34,85 +34,162 @@ pub struct FulfillmentConfig {
     pub port: u16,
 }
 
+#[derive(Debug)]
+pub struct SetupFunction(mlua::Function);
+
+impl Typed for SetupFunction {
+    fn type_name() -> String {
+        format!(
+            "fun(mqtt_client: {}): {} | DeviceInterface[] | nil",
+            WrappedAsyncClient::type_name(),
+            Module::type_name()
+        )
+    }
+}
+
+impl FromLua for SetupFunction {
+    fn from_lua(value: mlua::Value, lua: &mlua::Lua) -> mlua::Result<Self> {
+        Ok(Self(FromLua::from_lua(value, lua)?))
+    }
+}
+
 #[derive(Debug, Default)]
-pub struct Modules(mlua::Value);
+pub struct Module {
+    pub setup: Option<SetupFunction>,
+    pub devices: Vec<Box<dyn Device>>,
+    pub modules: Vec<Module>,
+}
 
-impl Modules {
+// TODO: Add option to typed to rename field
-    pub async fn setup(
+impl Typed for Module {
-        self,
+    fn type_name() -> String {
-        lua: &mlua::Lua,
+        "Module".into()
-        client: &WrappedAsyncClient,
+    }
-    ) -> mlua::Result<Vec<Box<dyn Device>>> {
+
-        let mut devices = Vec::new();
+    fn generate_header() -> Option<String> {
-        let initial_table = match self.0 {
+        Some(format!("---@class {}\n", Self::type_name()))
-            mlua::Value::Table(table) => table,
+    }
-            mlua::Value::Function(f) => f.call_async(client.clone()).await?,
+
-            _ => Err(mlua::Error::runtime(format!(
+    fn generate_members() -> Option<String> {
-                "Expected table or function, instead found: {}",
+        Some(format!(
-                self.0.type_name()
+            r#"---@field setup {}
-            )))?,
+---@field devices {}?
+---@field [number] {}?
+"#,
+            Option::<SetupFunction>::type_name(),
+            Vec::<Box<dyn Device>>::type_name(),
+            Vec::<Module>::type_name(),
+        ))
+    }
+
+    fn generate_footer() -> Option<String> {
+        let type_name = <Self as Typed>::type_name();
+        Some(format!("local {type_name}\n"))
+    }
+}
+
+impl FromLua for Module {
+    fn from_lua(value: mlua::Value, _lua: &mlua::Lua) -> mlua::Result<Self> {
+        // When calling require it might return a result from the searcher indicating how the
+        // module was found, we want to ignore these entries.
+        // TODO: Find a better solution for this
+        if value.is_string() {
+            return Ok(Default::default());
+        }
+
+        let mlua::Value::Table(table) = value else {
+            return Err(mlua::Error::runtime(format!(
+                "Expected module table, instead found: {}",
+                value.type_name()
+            )));
         };
 
-        let mut queue: VecDeque<mlua::Table> = [initial_table].into();
+        let setup = table.get("setup")?;
-        loop {
-            let Some(table) = queue.pop_front() else {
-                break;
-            };
 
-            for pair in table.pairs() {
+        let devices = table.get("devices").unwrap_or_else(|_| Vec::new());
-                let (name, value): (String, _) = pair?;
+        let mut modules = Vec::new();
 
-                match value {
+        for module in table.sequence_values::<Module>() {
-                    mlua::Value::Table(table) => queue.push_back(table),
+            modules.push(module?);
-                    mlua::Value::UserData(_)
-                        if let Ok(device) = Box::from_lua(value.clone(), lua) =>
-                    {
-                        devices.push(device);
-                    }
-                    mlua::Value::Function(f) if name == "setup" => {
-                        let value: mlua::Value = f.call_async(client.clone()).await?;
-                        if let Some(table) = value.as_table() {
-                            queue.push_back(table.clone());
-                        }
-                    }
-                    _ => {}
-                }
-            }
         }
 
-        Ok(devices)
+        Ok(Module {
+            setup,
+            devices,
+            modules,
+        })
+    }
+}
+
+#[derive(Debug, Default)]
+pub struct Modules(Vec<Module>);
+
+impl Typed for Modules {
+    fn type_name() -> String {
+        Vec::<Module>::type_name()
     }
 }
 
 impl FromLua for Modules {
-    fn from_lua(value: mlua::Value, _lua: &mlua::Lua) -> mlua::Result<Self> {
+    fn from_lua(value: mlua::Value, lua: &mlua::Lua) -> mlua::Result<Self> {
-        Ok(Modules(value))
+        Ok(Self(FromLua::from_lua(value, lua)?))
     }
 }
 
-impl Typed for Modules {
+impl Modules {
-    fn type_name() -> String {
+    pub async fn resolve(
-        "Modules".into()
+        self,
+        lua: &mlua::Lua,
+        client: &WrappedAsyncClient,
+    ) -> mlua::Result<Resolved> {
+        let mut modules: VecDeque<_> = self.0.into();
+
+        let mut devices = Vec::new();
+
+        loop {
+            let Some(module) = modules.pop_front() else {
+                break;
+            };
+
+            modules.extend(module.modules);
+
+            if let Some(setup) = module.setup {
+                let result: mlua::Value = setup.0.call_async(client.clone()).await?;
+
+                if result.is_nil() {
+                    // We ignore nil results
+                } else if let Ok(d) = <Vec<_> as FromLua>::from_lua(result.clone(), lua)
+                    && !d.is_empty()
+                {
+                    // This is a shortcut for the common pattern of setup functions that only
+                    // return devices
+                    devices.extend(d);
+                } else if let Ok(module) = FromLua::from_lua(result.clone(), lua) {
+                    modules.push_back(module);
+                } else {
+                    return Err(mlua::Error::runtime(
+                        "Setup function returned data in an unexpected format",
+                    ));
+                }
             }
 
-    fn generate_header() -> Option<String> {
+            devices.extend(module.devices);
-        let type_name = Self::type_name();
-        let client_type = WrappedAsyncClient::type_name();
-
-        Some(format!(
-            r#"---@alias SetupFunction fun(mqtt_client: {client_type}): SetupTable?
----@alias SetupTable (DeviceInterface | {{ setup: SetupFunction? }} | SetupTable)[]
----@alias {type_name} SetupFunction | SetupTable
-"#,
-        ))
         }
+
+        Ok(Resolved { devices })
+    }
+}
+
+#[derive(Debug, Default)]
+pub struct Resolved {
+    pub devices: Vec<Box<dyn Device>>,
 }
 
 #[derive(Debug, LuaDeviceConfig, Typed)]
 pub struct Config {
     pub fulfillment: FulfillmentConfig,
     #[device_config(from_lua, default)]
-    pub modules: Option<Modules>,
+    pub modules: Modules,
     #[device_config(from_lua)]
     pub mqtt: MqttConfig,
     #[device_config(from_lua, default)]