@devaloop/devalang 0.0.1-alpha.1 → 0.0.1-alpha.10

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

@@ -0,0 +1,227 @@
+use std::collections::HashMap;
+use crate::{
+    core::{
+        parser::statement::{ Statement, StatementKind },
+        preprocessor::{
+            loader::ModuleLoader,
+            module::Module,
+            resolver::{
+                bank::resolve_bank,
+                call::resolve_call,
+                condition::resolve_condition,
+                group::resolve_group,
+                let_::resolve_let,
+                loop_::resolve_loop,
+                spawn::resolve_spawn,
+                tempo::resolve_tempo,
+                trigger::resolve_trigger,
+            },
+        },
+        shared::value::Value,
+        store::global::GlobalStore,
+    },
+    utils::logger::Logger,
+};
+
+pub fn resolve_all_modules(module_loader: &ModuleLoader, global_store: &mut GlobalStore) {
+    for module in global_store.clone().modules.values_mut() {
+        resolve_imports(module_loader, global_store);
+    }
+}
+
+pub fn resolve_statement(
+    stmt: &Statement,
+    module: &Module,
+    path: &str,
+    global_store: &mut GlobalStore
+) -> Statement {
+    match &stmt.kind {
+        StatementKind::Trigger { entity, duration } =>
+            resolve_trigger(stmt, entity, &mut duration.clone(), module, path, global_store),
+        StatementKind::If => resolve_condition(stmt, module, path, global_store),
+        StatementKind::Group => resolve_group(stmt, module, path, global_store),
+        StatementKind::Call => resolve_call(stmt, module, path, global_store),
+        StatementKind::Spawn => resolve_spawn(stmt, module, path, global_store),
+        StatementKind::Bank => resolve_bank(stmt, module, path, global_store),
+        StatementKind::Tempo => resolve_tempo(stmt, module, path, global_store),
+        StatementKind::Loop => resolve_loop(stmt, module, path, global_store),
+        StatementKind::Let { name, .. } => resolve_let(stmt, name, module, path, global_store),
+
+        _ => {
+            let resolved_value = resolve_value(&stmt.value, module, global_store);
+
+            Statement {
+                value: resolved_value,
+                ..stmt.clone()
+            }
+        }
+    }
+}
+
+fn resolve_value(value: &Value, module: &Module, global_store: &mut GlobalStore) -> Value {
+    match value {
+        Value::Identifier(name) => {
+            if let Some(original_val) = module.variable_table.get(name) {
+                return resolve_value(original_val, module, global_store);
+            }
+
+            if let Some(export_val) = find_export_value(name, global_store) {
+                return resolve_value(&export_val, module, global_store);
+            }
+
+            eprintln!("⚠️ Unresolved identifier '{}'", name);
+            Value::Null
+        }
+
+        Value::Map(map) => {
+            let mut resolved = HashMap::new();
+            for (k, v) in map {
+                resolved.insert(k.clone(), resolve_value(v, module, global_store));
+            }
+            Value::Map(resolved)
+        }
+
+        Value::Block(stmts) => {
+            let resolved_stmts = stmts
+                .iter()
+                .map(|stmt| resolve_statement(stmt, module, &module.path, global_store))
+                .collect();
+            Value::Block(resolved_stmts)
+        }
+
+        other => other.clone(),
+    }
+}
+
+fn find_export_value(name: &str, global_store: &GlobalStore) -> Option<Value> {
+    for (_path, module) in &global_store.modules {
+        if let Some(val) = module.export_table.get_export(name) {
+            return Some(val.clone());
+        }
+    }
+    None
+}
+
+pub fn resolve_imports(module_loader: &ModuleLoader, global_store: &mut GlobalStore) {
+    for (module_path, module) in global_store.clone().modules.iter_mut() {
+        for (name, source_path) in &module.import_table.imports {
+            match source_path {
+                Value::String(source_path) => {
+                    if let Some(source_module) = global_store.modules.get(source_path) {
+                        if let Some(value) = source_module.export_table.get_export(name) {
+                            module.variable_table.set(name.clone(), value.clone());
+                        } else {
+                            println!(
+                                "[warn] '{module_path}': '{name}' not found in exports of '{source_path}'"
+                            );
+                        }
+                    } else {
+                        println!(
+                            "[warn] '{module_path}': cannot find source module '{source_path}'"
+                        );
+                    }
+                }
+                _ => {
+                    println!(
+                        "[warn] '{module_path}': expected string for import source, found {:?}",
+                        source_path
+                    );
+                }
+            }
+        }
+    }
+}
+
+pub fn resolve_and_flatten_all_modules(
+    global_store: &mut GlobalStore
+) -> HashMap<String, Vec<Statement>> {
+    let logger = Logger::new();
+    let snapshot = global_store.clone();
+
+    // 1. Imports resolution
+    for (module_path, module) in global_store.modules.iter_mut() {
+        for (name, source_path) in &module.import_table.imports {
+            if let Value::String(source_path_str) = source_path {
+                match snapshot.modules.get(source_path_str) {
+                    Some(source_module) => {
+                        if let Some(value) = source_module.export_table.get_export(name) {
+                            module.variable_table.set(name.clone(), value.clone());
+                        } else {
+                            logger.log_error_with_stacktrace(
+                                &format!("'{name}' not found in exports of '{source_path_str}'"),
+                                module_path
+                            );
+                        }
+                    }
+                    None => {
+                        logger.log_error_with_stacktrace(
+                            &format!("Cannot find source module '{source_path_str}'"),
+                            module_path
+                        );
+                    }
+                }
+            } else {
+                logger.log_error_with_stacktrace(
+                    &format!("Expected string for import source, found {:?}", source_path),
+                    module_path
+                );
+            }
+        }
+    }
+
+    // 2. Statements resolution
+    let mut resolved_map: HashMap<String, Vec<Statement>> = HashMap::new();
+    for (path, module) in global_store.modules.clone() {
+        let mut resolved = Vec::new();
+
+        for stmt in &module.statements {
+            let mut stmt = stmt.clone();
+
+            match &stmt.kind {
+                StatementKind::Trigger { entity, duration } => {
+                    let resolved_stmt = resolve_trigger(
+                        &stmt,
+                        entity.as_str(),
+                        &mut duration.clone(),
+                        &module,
+                        &path,
+                        global_store
+                    );
+                    resolved.push(resolved_stmt);
+                }
+
+                StatementKind::Loop => {
+                    let resolved_stmt = resolve_loop(&stmt, &module, &path, global_store);
+                    resolved.push(resolved_stmt);
+                }
+
+                StatementKind::Bank => {
+                    let resolved_stmt = resolve_bank(&stmt, &module, &path, global_store);
+                    resolved.push(resolved_stmt);
+                }
+
+                StatementKind::Tempo => {
+                    let resolved_stmt = resolve_tempo(&stmt, &module, &path, global_store);
+                    resolved.push(resolved_stmt);
+                }
+
+                StatementKind::Import { .. } | StatementKind::Export { .. } => {
+                    resolved.push(stmt.clone());
+                }
+
+                StatementKind::Group => {
+                    let resolved_stmt = resolve_group(&stmt, &module, &path, global_store);
+                    resolved.push(resolved_stmt);
+                }
+
+                _ => {
+                    resolved.push(stmt);
+                }
+            }
+        }
+
+        resolved_map.insert(path.clone(), resolved);
+    }
+
+    resolved_map
+}

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

@@ -0,0 +1,61 @@
+use std::collections::HashMap;
+
+use crate::{
+    core::{
+        parser::statement::{ Statement, StatementKind },
+        preprocessor::{ module::Module, resolver::driver::resolve_statement },
+        shared::value::Value,
+        store::{ global::GlobalStore, variable::VariableTable },
+    },
+    utils::logger::{ LogLevel, Logger },
+};
+
+pub fn resolve_group(
+    stmt: &Statement,
+    module: &Module,
+    path: &str,
+    global_store: &mut GlobalStore
+) -> Statement {
+    let logger = Logger::new();
+
+    let Value::Map(group_map) = &stmt.value else {
+        return type_error(&logger, module, stmt, "Expected a map in group statement".to_string());
+    };
+
+    let mut resolved_map = group_map.clone();
+
+    if let Some(Value::Block(body)) = group_map.get("body") {
+        let resolved_body = resolve_block_statements(body, module, path, global_store);
+        resolved_map.insert("body".to_string(), Value::Block(resolved_body));
+    } else {
+        logger.log_message(LogLevel::Warning, "group without a body");
+    }
+
+    Statement {
+        kind: StatementKind::Group,
+        value: Value::Map(resolved_map),
+        ..stmt.clone()
+    }
+}
+
+fn resolve_block_statements(
+    body: &[Statement],
+    module: &Module,
+    path: &str,
+    global_store: &mut GlobalStore
+) -> Vec<Statement> {
+    body.iter()
+        .map(|stmt| resolve_statement(stmt, module, path, global_store))
+        .collect()
+}
+
+fn type_error(logger: &Logger, module: &Module, stmt: &Statement, message: String) -> Statement {
+    let stacktrace = format!("{}:{}:{}", module.path, stmt.line, stmt.column);
+    logger.log_error_with_stacktrace(&message, &stacktrace);
+
+    Statement {
+        kind: StatementKind::Error { message },
+        value: Value::Null,
+        ..stmt.clone()
+    }
+}

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

@@ -0,0 +1,31 @@
+use crate::
+    core::{
+        parser::statement:: Statement ,
+        preprocessor::{
+            module::Module,
+            resolver:: value::resolve_value ,
+        },
+        store:: global::GlobalStore ,
+    }
+;
+
+pub fn resolve_let(
+    stmt: &Statement,
+    name: &str,
+    module: &Module,
+    path: &str,
+    global_store: &mut GlobalStore
+) -> Statement {
+    let resolved_value = resolve_value(&stmt.value, module, global_store);
+
+    if let Some(current_mod) = global_store.modules.get_mut(path) {
+        current_mod.variable_table.set(name.to_string(), resolved_value.clone());
+    } else {
+        eprintln!("[resolve_statement] ❌ Module path not found: {path}");
+    }
+
+    Statement {
+        value: resolved_value,
+        ..stmt.clone()
+    }
+}

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

@@ -1,82 +1,91 @@
-use crate::core::{
-    parser::parse_without_resolving_with_module,
-    preprocessor::resolver::resolve_statement,
-    types::{
-        module::Module,
-        statement::{
-            Statement,
-            StatementIterator,
-            StatementKind,
-            StatementResolved,
-            StatementResolvedValue,
+use std::collections::HashMap;
+
+use crate::{
+    core::{
+        parser::statement::{ Statement, StatementKind },
+        preprocessor::{
+            module::Module,
+            resolver::{ driver::resolve_statement, value::resolve_value },
         },
-        variable::VariableValue,
+        shared::value::Value,
+        store::global::GlobalStore,
     },
+    utils::logger::Logger,
 };
 
-pub fn resolve_loop_statement(
-    loop_statement: &Statement,
-    iterator: StatementIterator,
-    module: &Module
-) -> StatementResolved {
-    let mut resolved_iterator = StatementIterator::Unknown;
+pub fn resolve_loop(
+    stmt: &Statement,
+    module: &Module,
+    path: &str,
+    global_store: &mut GlobalStore
+) -> Statement {
+    let logger = Logger::new();
 
-    match iterator.clone() {
-        StatementIterator::Identifier(id) => {
-            if let Some(value) = module.variable_table.variables.get(&id) {
-                match value {
-                    VariableValue::Array(arr) => {
-                        resolved_iterator = StatementIterator::Array(
-                            parse_without_resolving_with_module(arr.clone(), module)
-                        );
-                    }
-                    VariableValue::Number(num) => {
-                        resolved_iterator = StatementIterator::Number(*num);
-                    }
-                    _ => {
-                        eprintln!("⚠️ Unsupported variable type for loop iterator: {:?}", value);
-                        resolved_iterator = StatementIterator::Unknown;
-                    }
-                }
-            } else {
-                eprintln!("⚠️ Loop iterator variable '{}' not found", id);
-                resolved_iterator = StatementIterator::Unknown;
-            }
-        }
-        StatementIterator::Number(num) => {
-            resolved_iterator = StatementIterator::Number(num);
-        }
-        _ => {
-            resolved_iterator = iterator.clone();
-        }
-    }
+    let resolved_value = resolve_value(&stmt.value, module, global_store);
 
-    let mut resolved_body: StatementResolvedValue = StatementResolvedValue::Unknown;
-
-    match &loop_statement.value {
-        VariableValue::Array(arr) => {
-            let raw_statements = parse_without_resolving_with_module(arr.clone(), &module.clone());
+    let Value::Map(value_map) = &resolved_value else {
+        return error_stmt(&logger, module, stmt, "Expected a map for loop value");
+    };
 
-            let mut resolved_statements = Vec::new();
+    let mut resolved_map: HashMap<String, Value> = HashMap::new();
+    for (key, val) in value_map {
+        resolved_map.insert(key.clone(), resolve_value(val, module, global_store));
+    }
 
-            for raw_stmt in raw_statements {
-                let resolved_stmt = resolve_statement(&raw_stmt, &mut module.clone());
-                resolved_statements.push(resolved_stmt);
-            }
+    let iterator_value = match resolved_map.get("iterator") {
+        Some(Value::Number(n)) => Value::Number(*n),
+        Some(other) => {
+            error_value(
+                &logger,
+                module,
+                stmt,
+                &format!("Loop iterator must be a number, found: {:?}", other)
+            );
+            Value::Number(1.0)
+        }
+        None => {
+            error_value(&logger, module, stmt, "Missing 'iterator' in loop");
+            Value::Number(1.0)
+        }
+    };
 
-            resolved_body = StatementResolvedValue::Array(resolved_statements);
+    let body_value = match resolved_map.remove("body") {
+        Some(Value::Block(stmts)) => {
+            let resolved = stmts
+                .iter()
+                .map(|s| resolve_statement(s, module, path, global_store))
+                .collect();
+            Value::Block(resolved)
         }
         _ => {
-            resolved_body = StatementResolvedValue::Unknown;
-            eprintln!("⚠️ Unsupported value type for loop body: {:?}", loop_statement.value);
+            error_value(&logger, module, stmt, "Invalid or missing loop body");
+            Value::Block(vec![])
         }
+    };
+
+    let mut final_map = HashMap::new();
+    final_map.insert("iterator".to_string(), iterator_value);
+    final_map.insert("body".to_string(), body_value);
+
+    Statement {
+        kind: StatementKind::Loop,
+        value: Value::Map(final_map),
+        ..stmt.clone()
     }
+}
 
-    return StatementResolved {
-        kind: StatementKind::Loop { iterator: resolved_iterator },
-        value: resolved_body,
-        indent: loop_statement.indent,
-        line: loop_statement.line,
-        column: loop_statement.column,
-    };
+fn error_value(logger: &Logger, module: &Module, stmt: &Statement, msg: &str) {
+    let stacktrace = format!("{}:{}:{}", module.path, stmt.line, stmt.column);
+    logger.log_error_with_stacktrace(msg, &stacktrace);
+}
+
+fn error_stmt(logger: &Logger, module: &Module, stmt: &Statement, msg: &str) -> Statement {
+    error_value(logger, module, stmt, msg);
+    Statement {
+        kind: StatementKind::Error {
+            message: msg.to_string(),
+        },
+        value: Value::Null,
+        ..stmt.clone()
+    }
 }

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

@@ -1,113 +1,14 @@
-pub mod bank;
-pub mod loop_;
-pub mod tempo;
-pub mod trigger;
-pub mod at;
-
-use crate::core::{
-    preprocessor::resolver::{
-        bank::resolve_bank_statement,
-        loop_::resolve_loop_statement,
-        tempo::resolve_tempo_statement,
-        trigger::resolve_trigger_statement,
-        at::{ resolve_load_statement },
-    },
-    types::{
-        module::Module,
-        parser::Parser,
-        statement::{ Statement, StatementKind, StatementResolved, StatementResolvedValue },
-        store::{ ExportTable, GlobalStore, ImportTable },
-        variable::VariableValue,
-    },
-};
-
-pub fn resolve_exports(statements: &[Statement], parser: &Parser) -> ExportTable {
-    let mut export_table = parser.export_table.clone();
-
-    for stmt in statements {
-        if let StatementKind::Export = &stmt.kind {
-            if let VariableValue::Array(tokens) = &stmt.value {
-                for token in tokens {
-                    let var_name = &token.lexeme;
-                    if let Some(value) = parser.variable_table.variables.get(var_name) {
-                        export_table.add_export(var_name.clone(), value.clone());
-                    } else {
-                        eprintln!("⚠️ Variable '{}' not found in scope, export skipped", var_name);
-                    }
-                }
-            } else {
-                eprintln!("⚠️ Unexpected value type in export: {:?}", stmt.value);
-            }
-        }
-    }
-
-    export_table
-}
-
-pub fn resolve_imports(module: &mut Module, global_store: &GlobalStore) -> ImportTable {
-    let mut import_table = ImportTable::default();
-
-    for stmt in &module.statements {
-        if let StatementKind::Import { names, source } = &stmt.kind {
-            if let Some(from_module) = global_store.modules.get(source) {
-                for name in names {
-                    if let Some(value) = from_module.export_table.exports.get(name) {
-                        module.variable_table.variables.insert(name.clone(), value.clone());
-                        import_table.add_import(name.clone(), value.clone());
-                    } else {
-                        eprintln!("⚠️ '{}' not found in exports of '{}'", name, source);
-                    }
-                }
-            } else {
-                eprintln!("⚠️ Module '{}' not found", source);
-            }
-        }
-    }
-
-    import_table
-}
+pub mod driver;
 
-pub fn resolve_statement(stmt: &Statement, module: &mut Module) -> StatementResolved {
-    match &stmt.kind {
-        StatementKind::Loop { iterator } => {
-            resolve_loop_statement(stmt, iterator.clone(), module)
-        }
+pub mod value;
 
-        StatementKind::Trigger { entity, duration } => {
-            resolve_trigger_statement(stmt, entity.clone(), duration.clone(), module)
-        }
-
-        StatementKind::Bank { .. } => { resolve_bank_statement(stmt, module) }
-
-        StatementKind::Tempo { .. } => { resolve_tempo_statement(stmt, module) }
-
-        StatementKind::Load { source, alias } => {
-            resolve_load_statement(stmt, source, alias, module)
-        }
-
-        // TODO Handle other statement kinds
-
-        StatementKind::Error => {
-            StatementResolved {
-                kind: StatementKind::Error,
-                value: match stmt.value {
-                    VariableValue::Text(ref msg) => StatementResolvedValue::String(msg.clone()),
-                    _ => StatementResolvedValue::Unknown,
-                },
-                indent: stmt.indent,
-                line: stmt.line,
-                column: stmt.column,
-            }
-        }
-
-        _ => {
-            StatementResolved {
-                kind: StatementKind::Unknown,
-                value: StatementResolvedValue::Unknown,
-                indent: stmt.indent,
-                line: stmt.line,
-                column: stmt.column,
-            }
-        }
-    }
-}
+pub mod trigger;
+pub mod loop_;
+pub mod bank;
+pub mod tempo;
+pub mod group;
+pub mod condition;
+pub mod spawn;
+pub mod call;
+pub mod synth;
+pub mod let_;

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

@@ -0,0 +1,58 @@
+use crate::{
+    core::{
+        parser::statement::{ Statement, StatementKind },
+        preprocessor::{
+            module::Module,
+            resolver::driver::resolve_statement,
+            resolver::value::resolve_value,
+        },
+        shared::value::Value,
+        store::global::GlobalStore,
+    },
+    utils::logger::{ Logger, LogLevel },
+};
+
+pub fn resolve_spawn(
+    stmt: &Statement,
+    module: &Module,
+    path: &str,
+    global_store: &mut GlobalStore
+) -> Statement {
+    let logger = Logger::new();
+
+    let resolved_value = resolve_value(&stmt.value, module, global_store);
+
+    match resolved_value {
+        Value::Map(mut map) => {
+            if let Some(Value::Block(stmts)) = map.get("body") {
+                let resolved_block = stmts
+                    .iter()
+                    .map(|s| resolve_statement(s, module, path, global_store))
+                    .collect();
+                map.insert("body".to_string(), Value::Block(resolved_block));
+            }
+
+            Statement {
+                kind: StatementKind::Spawn,
+                value: Value::Map(map),
+                ..stmt.clone()
+            }
+        }
+
+        _ => {
+            let stacktrace = format!("{}:{}:{}", module.path, stmt.line, stmt.column);
+            logger.log_message(
+                LogLevel::Error,
+                &format!("Expected a map in spawn statement\n  → at {stacktrace}")
+            );
+
+            Statement {
+                kind: StatementKind::Error {
+                    message: "Invalid spawn value".to_string(),
+                },
+                value: Value::Null,
+                ..stmt.clone()
+            }
+        }
+    }
+}