@devaloop/devalang 0.0.1-alpha.16-hotfix.3 → 0.0.1-alpha.18

package/rust/core/preprocessor/loader.rs

@@ -1,25 +1,23 @@
+#[cfg(feature = "cli")]
 use crate::core::preprocessor::resolver::driver::{
-    resolve_all_modules, resolve_and_flatten_all_modules,
+    resolve_all_modules,
+    resolve_and_flatten_all_modules,
 };
+#[cfg(feature = "cli")]
 use crate::core::utils::path::resolve_relative_path;
-use crate::{
-    config::loader::load_config,
-    core::{
-        error::ErrorHandler,
-        lexer::{Lexer, token::Token},
-        parser::{
-            driver::Parser,
-            statement::{Statement, StatementKind},
-        },
-        plugin::loader::load_plugin,
-        preprocessor::{module::Module, processor::process_modules},
-        shared::{bank::BankFile, value::Value},
-        store::global::GlobalStore,
-        utils::path::normalize_path,
-    },
-    utils::logger::Logger,
+#[cfg_attr(not(feature = "cli"), allow(unused_imports))]
+use crate::core::{
+    error::ErrorHandler,
+    lexer::{ token::Token, driver::Lexer },
+    parser::{ driver::Parser, statement::{ Statement, StatementKind } },
+    plugin::loader::load_plugin,
+    preprocessor::{ module::Module, processor::process_modules },
+    store::global::GlobalStore,
+    utils::path::normalize_path,
 };
-use std::{collections::HashMap, path::Path};
+use devalang_types::{ BankFile, Value };
+use devalang_utils::logger::{ LogLevel, Logger };
+use std::{ collections::HashMap, path::Path };
 
 pub struct ModuleLoader {
     pub entry: String,
@@ -38,7 +36,7 @@ impl ModuleLoader {
         Self {
             entry: entry.to_string(),
             output: output.to_string(),
-            base_dir: base_dir,
+            base_dir,
         }
     }
 
@@ -46,13 +44,16 @@ impl ModuleLoader {
         entry_path: &str,
         output_path: &str,
         content: &str,
-        global_store: &mut GlobalStore,
+        global_store: &mut GlobalStore
     ) -> Self {
         let normalized_entry_path = normalize_path(entry_path);
 
-        let mut module = Module::new(&entry_path);
+        let mut module = Module::new(entry_path);
         module.content = content.to_string();
 
+        // Insert a module stub containing the provided content into the
+        // global store. This is used by the WASM APIs and tests which
+        // operate on in-memory sources instead of files on disk.
         global_store.insert_module(normalized_entry_path.to_string(), module);
 
         Self {
@@ -64,18 +65,16 @@ impl ModuleLoader {
 
     pub fn extract_statements_map(
         &self,
-        global_store: &GlobalStore,
+        global_store: &GlobalStore
     ) -> HashMap<String, Vec<Statement>> {
-        global_store
-            .modules
+        global_store.modules
             .iter()
             .map(|(path, module)| (path.clone(), module.statements.clone()))
             .collect()
     }
 
     pub fn load_single_module(&self, global_store: &mut GlobalStore) -> Result<Module, String> {
-        let mut module = global_store
-            .modules
+        let mut module = global_store.modules
             .remove(&self.entry)
             .ok_or_else(|| format!("Module not found in store for path: {}", self.entry))?;
 
@@ -102,9 +101,7 @@ impl ModuleLoader {
             self.load_plugin_and_register(&mut module, &plugin_name, &alias, global_store);
         }
 
-        global_store
-            .modules
-            .insert(self.entry.clone(), module.clone());
+        global_store.modules.insert(self.entry.clone(), module.clone());
 
         // SECTION Error handling
         let mut error_handler = ErrorHandler::new();
@@ -116,8 +113,7 @@ impl ModuleLoader {
     pub fn load_wasm_module(&self, global_store: &mut GlobalStore) -> Result<(), String> {
         // Step one : Load the module from the global store
         let module = {
-            let module_ref = global_store
-                .modules
+            let module_ref = global_store.modules
                 .get(&self.entry)
                 .ok_or_else(|| format!("❌ Module not found for path: {}", self.entry))?;
 
@@ -145,6 +141,15 @@ impl ModuleLoader {
             return Err(format!("Failed to inject bank triggers: {}", e));
         }
 
+        // Insert the updated module into the global store before processing so
+        // process_modules can operate on it and populate variable_table, imports,
+        // and other derived structures.
+        global_store.modules.insert(self.entry.clone(), updated_module.clone());
+
+        // Process modules to populate module.variable_table, import/export tables,
+        // and other derived structures so runtime execution can resolve groups/synths.
+        process_modules(self, global_store);
+
         for (plugin_name, alias) in self.extract_plugin_uses(&updated_module.statements) {
             self.load_plugin_and_register(&mut updated_module, &plugin_name, &alias, global_store);
         }
@@ -153,10 +158,24 @@ impl ModuleLoader {
         let mut error_handler = ErrorHandler::new();
         error_handler.detect_from_statements(&mut parser, &updated_module.statements);
 
-        // Final step : insert the updated module back into the global store
-        global_store
-            .modules
-            .insert(self.entry.clone(), updated_module);
+        // Final step : also expose module-level variables and functions into the global store
+        // so runtime evaluation (render_audio) can find group/synth definitions.
+        // Use the module instance that was actually processed by `process_modules`
+        // (it lives in `global_store.modules`) because `updated_module` is a local
+        // clone and won't contain the mutations applied by `process_modules`.
+        if let Some(stored_module) = global_store.modules.get(&self.entry) {
+            global_store.variables.variables.extend(stored_module.variable_table.variables.clone());
+            global_store.functions.functions.extend(stored_module.function_table.functions.clone());
+        } else {
+            // Fallback to the local updated_module if for any reason the module
+            // wasn't inserted into the store (defensive programming).
+            global_store.variables.variables.extend(
+                updated_module.variable_table.variables.clone()
+            );
+            global_store.functions.functions.extend(
+                updated_module.function_table.functions.clone()
+            );
+        }
 
         Ok(())
     }
@@ -164,7 +183,7 @@ impl ModuleLoader {
     #[cfg(feature = "cli")]
     pub fn load_all_modules(
         &self,
-        global_store: &mut GlobalStore,
+        global_store: &mut GlobalStore
     ) -> (HashMap<String, Vec<Token>>, HashMap<String, Vec<Statement>>) {
         // SECTION Load the entry module and its dependencies
         let tokens_by_module = self.load_module_recursively(&self.entry, global_store);
@@ -183,7 +202,7 @@ impl ModuleLoader {
     fn load_module_recursively(
         &self,
         raw_path: &str,
-        global_store: &mut GlobalStore,
+        global_store: &mut GlobalStore
     ) -> HashMap<String, Vec<Token>> {
         let path = normalize_path(raw_path);
 
@@ -193,7 +212,14 @@ impl ModuleLoader {
         }
 
         let lexer = Lexer::new();
-        let tokens = lexer.lex_tokens(&path);
+        let tokens = match lexer.lex_tokens(&path) {
+            Ok(t) => t,
+            Err(e) => {
+                let logger = Logger::new();
+                logger.log_message(LogLevel::Error, &format!("Failed to lex '{}': {}", path, e));
+                return HashMap::new();
+            }
+        };
 
         let mut parser = Parser::new();
         parser.set_current_module(path.clone());
@@ -217,14 +243,8 @@ impl ModuleLoader {
         }
 
         // Inject module variables and functions into global store
-        global_store
-            .variables
-            .variables
-            .extend(module.variable_table.variables.clone());
-        global_store
-            .functions
-            .functions
-            .extend(module.function_table.functions.clone());
+        global_store.variables.variables.extend(module.variable_table.variables.clone());
+        global_store.functions.functions.extend(module.function_table.functions.clone());
 
         // Inject the module into the global store
         global_store.insert_module(path.clone(), module);
@@ -249,8 +269,7 @@ impl ModuleLoader {
         }
 
         // Return tokens per module
-        global_store
-            .modules
+        global_store.modules
             .iter()
             .map(|(p, m)| (p.clone(), m.tokens.clone()))
             .collect()
@@ -262,16 +281,12 @@ impl ModuleLoader {
             let current_module = match global_store.modules.get(path) {
                 Some(module) => module,
                 None => {
-                    eprintln!(
-                        "[warn] Cannot resolve imports: module '{}' not found in store",
-                        path
-                    );
+                    eprintln!("[warn] Cannot resolve imports: module '{}' not found in store", path);
                     return;
                 }
             };
 
-            current_module
-                .statements
+            current_module.statements
                 .iter()
                 .filter_map(|stmt| {
                     if let StatementKind::Import { source, .. } = &stmt.kind {
@@ -293,57 +308,64 @@ impl ModuleLoader {
         &self,
         module: &mut Module,
         bank_name: &str,
-        alias_override: Option<String>,
+        alias_override: Option<String>
     ) -> Result<Module, String> {
-        let default_alias = bank_name.split('.').last().unwrap_or(bank_name).to_string();
+        let default_alias = bank_name.split('.').next_back().unwrap_or(bank_name).to_string();
         let alias_ref = alias_override.as_deref().unwrap_or(&default_alias);
 
-        let bank_path = Path::new("./.deva/bank").join(bank_name);
+        let bank_path = match devalang_utils::path::get_deva_dir() {
+            Ok(dir) => dir.join("banks").join(bank_name),
+            Err(_) => Path::new("./.deva").join("banks").join(bank_name),
+        };
         let bank_toml_path = bank_path.join("bank.toml");
 
         if !bank_toml_path.exists() {
             return Ok(module.clone());
         }
 
-        let content = std::fs::read_to_string(&bank_toml_path)
+        let content = std::fs
+            ::read_to_string(&bank_toml_path)
             .map_err(|e| format!("Failed to read '{}': {}", bank_toml_path.display(), e))?;
 
-        let parsed_bankfile: BankFile = toml::from_str(&content)
+        let parsed_bankfile: BankFile = toml
+            ::from_str(&content)
             .map_err(|e| format!("Failed to parse '{}': {}", bank_toml_path.display(), e))?;
 
         let mut bank_map = HashMap::new();
 
         for bank_trigger in parsed_bankfile.triggers.unwrap_or_default() {
-            let trigger_name = bank_trigger.name.clone().replace("./", "");
-            let bank_trigger_path = format!("devalang://bank/{}/{}", bank_name, trigger_name);
+            // Use the configured path from the bank file as the entity reference so
+            // that bank entries can point to files or nested paths. Clean common
+            // local prefixes like "./" to keep the URI tidy.
+            let entity_ref = bank_trigger.path.clone().replace("\\", "/").replace("./", "");
+            let bank_trigger_path = format!("devalang://bank/{}/{}", bank_name, entity_ref);
 
-            bank_map.insert(
-                bank_trigger.name.clone(),
-                Value::String(bank_trigger_path.clone()),
-            );
+            // Keep the trigger key as declared (bank_trigger.name) but expose its
+            // value as a devalang://bank URI pointing to the configured path.
+            bank_map.insert(bank_trigger.name.clone(), Value::String(bank_trigger_path.clone()));
 
             if module.variable_table.variables.contains_key(alias_ref) {
                 eprintln!(
                     "⚠️ Trigger '{}' already defined in module '{}', skipping injection.",
-                    alias_ref, module.path
+                    alias_ref,
+                    module.path
                 );
                 continue;
             }
 
             module.variable_table.set(
                 format!("{}.{}", alias_ref, bank_trigger.name),
-                Value::String(bank_trigger_path.clone()),
+                Value::String(bank_trigger_path.clone())
             );
         }
 
         // Inject the map under the bank name
-        module
-            .variable_table
-            .set(alias_ref.to_string(), Value::Map(bank_map));
+        module.variable_table.set(alias_ref.to_string(), Value::Map(bank_map));
 
         Ok(module.clone())
     }
 
+    #[cfg_attr(not(feature = "cli"), allow(dead_code))]
     fn extract_bank_decls(&self, statements: &[Statement]) -> Vec<(String, Option<String>)> {
         let mut banks = Vec::new();
 
@@ -371,7 +393,7 @@ impl ModuleLoader {
             if let StatementKind::Use { name, alias } = &stmt.kind {
                 let alias_name = alias
                     .clone()
-                    .unwrap_or_else(|| name.split('.').last().unwrap_or(name).to_string());
+                    .unwrap_or_else(|| name.split('.').next_back().unwrap_or(name).to_string());
                 plugins.push((name.clone(), alias_name));
             }
         }
@@ -384,7 +406,7 @@ impl ModuleLoader {
         module: &mut Module,
         plugin_name: &str,
         alias: &str,
-        global_store: &mut GlobalStore,
+        global_store: &mut GlobalStore
     ) {
         // plugin_name expected format: "author.name"
         let mut parts = plugin_name.split('.');
@@ -403,10 +425,7 @@ impl ModuleLoader {
             }
         };
         if parts.next().is_some() {
-            eprintln!(
-                "Invalid plugin name '{}': expected <author>.<name>",
-                plugin_name
-            );
+            eprintln!("Invalid plugin name '{}': expected <author>.<name>", plugin_name);
             return;
         }
 
@@ -415,16 +434,19 @@ impl ModuleLoader {
         let expected_uri = format!("devalang://plugin/{}.{}", author, name);
 
         // Detect local presence (preferred and legacy layouts)
-        let root = Path::new("./.deva");
-        let plugin_dir_preferred = root.join("plugin").join(format!("{}.{}", author, name));
+        let root = match devalang_utils::path::get_deva_dir() {
+            Ok(dir) => dir,
+            Err(_) => Path::new("./.deva").to_path_buf(),
+        };
+        let plugin_dir_preferred = root.join("plugins").join(format!("{}.{}", author, name));
         let toml_path_preferred = plugin_dir_preferred.join("plugin.toml");
-        let plugin_dir_fallback = root.join("plugin").join(author).join(name);
+        let plugin_dir_fallback = root.join("plugins").join(author).join(name);
         let toml_path_fallback = plugin_dir_fallback.join("plugin.toml");
         let exists_locally = toml_path_preferred.exists() || toml_path_fallback.exists();
 
         if exists_locally {
             // Load config and verify plugin is declared
-            let cfg_opt = load_config(None);
+            let cfg_opt = crate::config::ops::load_config(None);
             let mut declared = false;
             if let Some(cfg) = cfg_opt {
                 if let Some(list) = cfg.plugins {
@@ -435,8 +457,7 @@ impl ModuleLoader {
                 // Inject a single, clear error into the module so it is reported once by the error handler
                 module.statements.push(Statement {
                     kind: StatementKind::Error {
-                        message: "plugin present in local files but missing in .devalang config"
-                            .to_string(),
+                        message: "plugin present in local files but missing in .devalang config".to_string(),
                     },
                     value: Value::Null,
                     indent: 0,
@@ -450,15 +471,16 @@ impl ModuleLoader {
         match load_plugin(author, name) {
             Ok((info, wasm)) => {
                 let uri = format!("devalang://plugin/{}.{}", author, name);
-                global_store
-                    .plugins
-                    .insert(format!("{}:{}", author, name), (info, wasm));
+                global_store.plugins.insert(format!("{}:{}", author, name), (info, wasm));
                 // Set alias to URI, and inject exported variables
-                module
-                    .variable_table
-                    .set(alias.to_string(), Value::String(uri.clone()));
-                if let Some((plugin_info, _)) =
-                    global_store.plugins.get(&format!("{}:{}", author, name))
+                module.variable_table.set(alias.to_string(), Value::String(uri.clone()));
+                // Also expose alias at global level so runtime can resolve it
+                global_store.variables.set(alias.to_string(), Value::String(uri.clone()));
+
+                if
+                    let Some((plugin_info, _)) = global_store.plugins.get(
+                        &format!("{}:{}", author, name)
+                    )
                 {
                     for exp in &plugin_info.exports {
                         match exp.kind.as_str() {
@@ -467,18 +489,18 @@ impl ModuleLoader {
                                     if let Ok(n) = s.parse::<f32>() {
                                         module.variable_table.set(
                                             format!("{}.{}", alias, exp.name),
-                                            Value::Number(n),
+                                            Value::Number(n)
                                         );
                                     }
                                 } else if let Some(toml::Value::Integer(i)) = &exp.default {
                                     module.variable_table.set(
                                         format!("{}.{}", alias, exp.name),
-                                        Value::Number(*i as f32),
+                                        Value::Number(*i as f32)
                                     );
                                 } else if let Some(toml::Value::Float(f)) = &exp.default {
                                     module.variable_table.set(
                                         format!("{}.{}", alias, exp.name),
-                                        Value::Number(*f as f32),
+                                        Value::Number(*f as f32)
                                     );
                                 }
                             }
@@ -486,25 +508,85 @@ impl ModuleLoader {
                                 if let Some(toml::Value::String(s)) = &exp.default {
                                     module.variable_table.set(
                                         format!("{}.{}", alias, exp.name),
-                                        Value::String(s.clone()),
+                                        Value::String(s.clone())
                                     );
                                 }
                             }
                             "bool" => {
                                 if let Some(toml::Value::Boolean(b)) = &exp.default {
-                                    module
-                                        .variable_table
-                                        .set(format!("{}.{}", alias, exp.name), Value::Boolean(*b));
+                                    module.variable_table.set(
+                                        format!("{}.{}", alias, exp.name),
+                                        Value::Boolean(*b)
+                                    );
                                 }
                             }
                             "synth" => {
                                 // Provide a discoverable marker: alias.<synthName> resolves to alias.synthName waveform string
                                 module.variable_table.set(
                                     format!("{}.{}", alias, exp.name),
-                                    Value::String(format!("{}.{}", alias, exp.name)),
+                                    Value::String(format!("{}.{}", alias, exp.name))
                                 );
                             }
-                            _ => {}
+                            _ => {
+                                // Fallback: if default is present, map it to a Value dynamically
+                                if let Some(def) = &exp.default {
+                                    let val = match def {
+                                        toml::Value::String(s) => Value::String(s.clone()),
+                                        toml::Value::Integer(i) => Value::Number(*i as f32),
+                                        toml::Value::Float(f) => Value::Number(*f as f32),
+                                        toml::Value::Boolean(b) => Value::Boolean(*b),
+                                        toml::Value::Array(arr) =>
+                                            Value::Array(
+                                                arr
+                                                    .iter()
+                                                    .map(|v| {
+                                                        match v {
+                                                            toml::Value::String(s) => {
+                                                                Value::String(s.clone())
+                                                            }
+                                                            toml::Value::Integer(i) => {
+                                                                Value::Number(*i as f32)
+                                                            }
+                                                            toml::Value::Float(f) => {
+                                                                Value::Number(*f as f32)
+                                                            }
+                                                            toml::Value::Boolean(b) =>
+                                                                Value::Boolean(*b),
+                                                            _ => Value::Null,
+                                                        }
+                                                    })
+                                                    .collect()
+                                            ),
+                                        toml::Value::Table(t) => {
+                                            let mut m = std::collections::HashMap::new();
+                                            for (k, v) in t.iter() {
+                                                let vv = match v {
+                                                    toml::Value::String(s) => {
+                                                        Value::String(s.clone())
+                                                    }
+                                                    toml::Value::Integer(i) => {
+                                                        Value::Number(*i as f32)
+                                                    }
+                                                    toml::Value::Float(f) => {
+                                                        Value::Number(*f as f32)
+                                                    }
+                                                    toml::Value::Boolean(b) => Value::Boolean(*b),
+                                                    _ => Value::Null,
+                                                };
+                                                m.insert(k.clone(), vv);
+                                            }
+                                            Value::Map(m)
+                                        }
+                                        _ => Value::Null,
+                                    };
+                                    if val != Value::Null {
+                                        module.variable_table.set(
+                                            format!("{}.{}", alias, exp.name),
+                                            val
+                                        );
+                                    }
+                                }
+                            }
                         }
                     }
                 }

package/rust/core/preprocessor/processor.rs

@@ -3,18 +3,21 @@ use std::{collections::HashMap, path::Path};
 use crate::core::{
     parser::statement::StatementKind,
     preprocessor::loader::ModuleLoader,
-    shared::value::Value,
     store::global::GlobalStore,
     utils::path::{normalize_path, resolve_relative_path},
 };
+use devalang_types::Value;
 
 pub fn process_modules(_module_loader: &ModuleLoader, global_store: &mut GlobalStore) {
     for module in global_store.modules.values_mut() {
+        let logger = devalang_utils::logger::Logger::new();
+        use devalang_utils::logger::LogLevel;
+
         for stmt in &module.statements {
             match &stmt.kind {
                 StatementKind::Let { name } => {
                     if let Value::Null = stmt.value {
-                        eprintln!("❌ Variable '{}' is declared but not initialized.", name);
+                        logger.log_message(LogLevel::Error, &format!("Variable '{}' is declared but not initialized.", name));
 
                         module.variable_table.variables.insert(
                             name.clone(),
@@ -25,15 +28,12 @@ pub fn process_modules(_module_loader: &ModuleLoader, global_store: &mut GlobalS
                     }
 
                     if module.variable_table.get(name).is_some() {
-                        eprintln!("❌ Variable '{}' is already defined in this scope.", name);
+                        logger.log_message(LogLevel::Error, &format!("Variable '{}' is already defined in this scope.", name));
                         continue;
                     }
 
                     if let Some(module_variable) = module.variable_table.variables.get(name) {
-                        eprintln!(
-                            "❌ Variable '{}' is already defined globally with value: {:?}",
-                            name, module_variable
-                        );
+                        logger.log_message(LogLevel::Error, &format!("Variable '{}' is already defined globally with value: {:?}", name, module_variable));
                         continue;
                     }
 
@@ -46,7 +46,7 @@ pub fn process_modules(_module_loader: &ModuleLoader, global_store: &mut GlobalS
                 StatementKind::Load { source, alias } => {
                     let module_dir = Path::new(&module.path).parent().unwrap_or(Path::new(""));
 
-                    let resolved_path = normalize_path(&module_dir.join(source));
+                    let resolved_path = normalize_path(module_dir.join(source));
 
                     module
                         .variable_table
@@ -87,7 +87,7 @@ pub fn process_modules(_module_loader: &ModuleLoader, global_store: &mut GlobalS
                                 .variable_table
                                 .set(name.to_string(), Value::Map(stored_map));
                         } else {
-                            eprintln!("❌ Invalid group definition: {:?}", stmt.value);
+                            logger.log_message(LogLevel::Error, &format!("Invalid group definition: {:?}", stmt.value));
                         }
                     }
                 }

package/rust/core/preprocessor/resolver/bank.rs

@@ -1,12 +1,10 @@
-use crate::{
-    core::{
-        parser::statement::{Statement, StatementKind},
-        preprocessor::module::Module,
-        shared::value::Value,
-        store::global::GlobalStore,
-    },
-    utils::logger::Logger,
+use crate::core::{
+    parser::statement::{Statement, StatementKind},
+    preprocessor::module::Module,
+    store::global::GlobalStore,
 };
+use devalang_types::Value;
+use devalang_utils::logger::Logger;
 
 pub fn resolve_bank(
     stmt: &Statement,