@devaloop/devalang 0.0.1-beta.1 → 0.0.1-beta.3

package/rust/core/plugin/runner/wasm32.rs

@@ -0,0 +1,44 @@
+use std::collections::HashMap;
+
+pub struct WasmPluginRunner;
+
+impl WasmPluginRunner {
+    pub fn new() -> Self {
+        WasmPluginRunner
+    }
+
+    pub fn process_in_place(&self, _wasm_bytes: &[u8], _buffer: &mut [f32]) -> Result<(), String> {
+        Err("Wasm plugin execution is not available in wasm builds".to_string())
+    }
+
+    pub fn render_note_in_place(
+        &self,
+        _wasm_bytes: &[u8],
+        _buffer: &mut [f32],
+        _synth_name: Option<&str>,
+        _freq: f32,
+        _amp: f32,
+        _duration_ms: i32,
+        _sample_rate: i32,
+        _channels: i32,
+    ) -> Result<(), String> {
+        Err("Wasm plugin rendering is not available in wasm builds".to_string())
+    }
+
+    pub fn render_note_with_params_in_place(
+        &self,
+        _wasm_bytes: &[u8],
+        _buffer: &mut [f32],
+        _synth_name: Option<&str>,
+        _freq: f32,
+        _amp: f32,
+        _duration_ms: i32,
+        _sample_rate: i32,
+        _channels: i32,
+        _params_num: &HashMap<String, f32>,
+        _params_str: Option<&HashMap<String, String>>,
+        _exported_names: Option<&[String]>,
+    ) -> Result<(), String> {
+        Err("Wasm plugin rendering is not available in wasm builds".to_string())
+    }
+}

package/rust/core/preprocessor/loader/inject.rs

@@ -0,0 +1,313 @@
+use crate::core::parser::statement::Statement;
+use crate::core::plugin::loader::load_plugin;
+use crate::core::preprocessor::module::Module;
+use crate::core::store::global::GlobalStore;
+use devalang_types::Value;
+use std::{collections::HashMap, path::Path};
+
+pub fn inject_bank_triggers(
+    module: &mut Module,
+    bank_name: &str,
+    alias_override: Option<String>,
+) -> Result<(), 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 root = match devalang_utils::path::get_deva_dir() {
+        Ok(dir) => dir,
+        Err(_) => Path::new("./.deva").to_path_buf(),
+    };
+
+    // Try both plural and singular folder names and both layouts (flat and nested)
+    let mut parsed_bankfile_opt: Option<devalang_types::BankFile> = None;
+    let sds = ["banks", "bank"];
+    for sd in &sds {
+        // candidate: .deva/<sd>/<bank_name>/bank.toml (flat dir name)
+        let candidate1 = root.join(sd).join(bank_name).join("bank.toml");
+        if candidate1.exists() {
+            let content = std::fs::read_to_string(&candidate1)
+                .map_err(|e| format!("Failed to read '{}': {}", candidate1.display(), e))?;
+            if let Ok(parsed) = toml::from_str::<devalang_types::BankFile>(&content) {
+                parsed_bankfile_opt = Some(parsed);
+                break;
+            }
+        }
+
+        // If bank_name uses dot notation, also try nested layout: .deva/<sd>/<publisher>/<name>/bank.toml
+        if bank_name.contains('.') {
+            let mut it = bank_name.splitn(2, '.');
+            let pubr = it.next().unwrap_or("");
+            let nm = it.next().unwrap_or("");
+            let candidate2 = root.join(sd).join(pubr).join(nm).join("bank.toml");
+            if candidate2.exists() {
+                let content = std::fs::read_to_string(&candidate2)
+                    .map_err(|e| format!("Failed to read '{}': {}", candidate2.display(), e))?;
+                if let Ok(parsed) = toml::from_str::<devalang_types::BankFile>(&content) {
+                    parsed_bankfile_opt = Some(parsed);
+                    break;
+                }
+            }
+        }
+    }
+
+    let parsed_bankfile = match parsed_bankfile_opt {
+        Some(p) => p,
+        None => return Ok(()),
+    };
+
+    let mut bank_map = HashMap::new();
+
+    for bank_trigger in parsed_bankfile.triggers.unwrap_or_default() {
+        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()),
+        );
+
+        if module.variable_table.variables.contains_key(alias_ref) {
+            eprintln!(
+                "⚠️ Trigger '{}' already defined in module '{}', skipping injection.",
+                alias_ref, module.path
+            );
+            continue;
+        }
+
+        module.variable_table.set(
+            format!("{}.{}", alias_ref, bank_trigger.name),
+            Value::String(bank_trigger_path.clone()),
+        );
+    }
+
+    module
+        .variable_table
+        .set(alias_ref.to_string(), Value::Map(bank_map));
+
+    Ok(())
+}
+
+pub fn extract_bank_decls(statements: &[Statement]) -> Vec<(String, Option<String>)> {
+    let mut banks = Vec::new();
+
+    for stmt in statements {
+        if let crate::core::parser::statement::StatementKind::Bank { alias } = &stmt.kind {
+            let name_opt = match &stmt.value {
+                Value::String(s) => Some(s.clone()),
+                Value::Identifier(s) => Some(s.clone()),
+                Value::Number(n) => Some(n.to_string()),
+                _ => None,
+            };
+            if let Some(name) = name_opt {
+                banks.push((name, alias.clone()));
+            }
+        }
+    }
+
+    banks
+}
+
+pub fn extract_plugin_uses(statements: &[Statement]) -> Vec<(String, String)> {
+    let mut plugins = Vec::new();
+
+    for stmt in statements {
+        if let crate::core::parser::statement::StatementKind::Use { name, alias } = &stmt.kind {
+            let alias_name = alias
+                .clone()
+                .unwrap_or_else(|| name.split('.').next_back().unwrap_or(name).to_string());
+            plugins.push((name.clone(), alias_name));
+        }
+    }
+
+    plugins
+}
+
+pub fn load_plugin_and_register(
+    module: &mut Module,
+    plugin_name: &str,
+    alias: &str,
+    global_store: &mut GlobalStore,
+) {
+    let mut parts = plugin_name.split('.');
+    let author = match parts.next() {
+        Some(a) if !a.is_empty() => a,
+        _ => {
+            eprintln!("Invalid plugin name '{}': missing author", plugin_name);
+            return;
+        }
+    };
+    let name = match parts.next() {
+        Some(n) if !n.is_empty() => n,
+        _ => {
+            eprintln!("Invalid plugin name '{}': missing name", plugin_name);
+            return;
+        }
+    };
+    if parts.next().is_some() {
+        eprintln!(
+            "Invalid plugin name '{}': expected <author>.<name>",
+            plugin_name
+        );
+        return;
+    }
+
+    let expected_uri = format!("devalang://plugin/{}/{}", author, name);
+
+    let root = match devalang_utils::path::get_deva_dir() {
+        Ok(dir) => dir,
+        Err(_) => Path::new("./.deva").to_path_buf(),
+    };
+    // Test both 'plugins' and 'plugin' folders
+    let mut exists_locally = false;
+    for sd in &["plugins", "plugin"] {
+        let plugin_dir_preferred = root.join(sd).join(format!("{}/{}", author, name));
+        let toml_path_preferred = plugin_dir_preferred.join("plugin.toml");
+        let plugin_dir_fallback = root.join(sd).join(author).join(name);
+        let toml_path_fallback = plugin_dir_fallback.join("plugin.toml");
+        if toml_path_preferred.exists() || toml_path_fallback.exists() {
+            exists_locally = true;
+            break;
+        }
+    }
+
+    if exists_locally {
+        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 {
+                declared = list.iter().any(|p| p.path == expected_uri);
+            }
+        }
+        if !declared {
+            module
+                .statements
+                .push(crate::core::parser::statement::Statement {
+                    kind: crate::core::parser::statement::StatementKind::Error {
+                        message: "plugin present in local files but missing in .devalang config"
+                            .to_string(),
+                    },
+                    value: Value::Null,
+                    indent: 0,
+                    line: 0,
+                    column: 0,
+                });
+            return;
+        }
+    }
+
+    match load_plugin(author, name) {
+        Ok((info, wasm)) => {
+            // keep dotted form for config/expected URIs, but inject a slash form into variables
+            let _uri_dot = format!("devalang://plugin/{}.{}", author, name);
+            let uri_inject = format!("devalang://plugin/{}/{}", author, name);
+            global_store
+                .plugins
+                .insert(format!("{}:{}", author, name), (info, wasm));
+            module
+                .variable_table
+                .set(alias.to_string(), Value::String(uri_inject.clone()));
+            global_store
+                .variables
+                .set(alias.to_string(), Value::String(uri_inject.clone()));
+
+            if let Some((plugin_info, _)) =
+                global_store.plugins.get(&format!("{}:{}", author, name))
+            {
+                for exp in &plugin_info.exports {
+                    match exp.kind.as_str() {
+                        "number" => {
+                            if let Some(toml::Value::String(s)) = &exp.default {
+                                if let Ok(n) = s.parse::<f32>() {
+                                    module
+                                        .variable_table
+                                        .set(format!("{}.{}", alias, exp.name), 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),
+                                );
+                            } else if let Some(toml::Value::Float(f)) = &exp.default {
+                                module.variable_table.set(
+                                    format!("{}.{}", alias, exp.name),
+                                    Value::Number(*f as f32),
+                                );
+                            }
+                        }
+                        "string" => {
+                            if let Some(toml::Value::String(s)) = &exp.default {
+                                module.variable_table.set(
+                                    format!("{}.{}", alias, exp.name),
+                                    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));
+                            }
+                        }
+                        "synth" => {
+                            module.variable_table.set(
+                                format!("{}.{}", alias, exp.name),
+                                Value::String(format!("{}.{}", alias, exp.name)),
+                            );
+                        }
+                        _ => {
+                            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);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        Err(e) => eprintln!("Failed to load plugin {}: {}", plugin_name, e),
+    }
+}

package/rust/core/preprocessor/loader/loader_helpers.rs

@@ -0,0 +1,110 @@
+use crate::core::preprocessor::loader::inject;
+use crate::core::{
+    lexer::{driver::Lexer, token::Token},
+    parser::driver::parser::Parser,
+    preprocessor::module::Module,
+    store::global::GlobalStore,
+};
+use devalang_utils::logger::{LogLevel, Logger};
+use devalang_utils::path::{normalize_path, resolve_relative_path};
+use std::collections::HashMap;
+
+pub fn load_module_recursively(
+    raw_path: &str,
+    global_store: &mut GlobalStore,
+) -> HashMap<String, Vec<Token>> {
+    let path = normalize_path(raw_path);
+
+    // Check if already loaded
+    if global_store.modules.contains_key(&path) {
+        return HashMap::new();
+    }
+
+    let lexer = Lexer::new();
+    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());
+
+    let statements = parser.parse_tokens(tokens.clone(), global_store);
+
+    // Insert module into store
+    let mut module = Module::new(&path);
+    module.tokens = tokens.clone();
+    module.statements = statements.clone();
+
+    // Inject triggers for each bank used in module, respecting aliases
+    for (bank_name, alias_opt) in inject::extract_bank_decls(&statements) {
+        if let Err(e) = inject::inject_bank_triggers(&mut module, &bank_name, alias_opt) {
+            eprintln!("Failed to inject bank triggers for '{}': {}", bank_name, e);
+        }
+    }
+
+    for (plugin_name, alias) in inject::extract_plugin_uses(&statements) {
+        inject::load_plugin_and_register(&mut module, &plugin_name, &alias, global_store);
+    }
+
+    // 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());
+
+    // Inject the module into the global store
+    global_store.insert_module(path.clone(), module);
+
+    // Load dependencies
+    load_module_imports(&path, global_store);
+
+    // Return tokens per module
+    global_store
+        .modules
+        .iter()
+        .map(|(p, m)| (p.clone(), m.tokens.clone()))
+        .collect()
+}
+
+pub fn load_module_imports(path: &String, global_store: &mut GlobalStore) {
+    let import_paths: Vec<String> = {
+        let current_module = match global_store.modules.get(path) {
+            Some(module) => module,
+            None => {
+                eprintln!(
+                    "[warn] Cannot resolve imports: module '{}' not found in store",
+                    path
+                );
+                return;
+            }
+        };
+
+        current_module
+            .statements
+            .iter()
+            .filter_map(|stmt| {
+                if let crate::core::parser::statement::StatementKind::Import { source, .. } =
+                    &stmt.kind
+                {
+                    Some(source.clone())
+                } else {
+                    None
+                }
+            })
+            .collect()
+    };
+
+    for import_path in import_paths {
+        let resolved = resolve_relative_path(path, &import_path);
+        load_module_recursively(&resolved, global_store);
+    }
+}