@devaloop/devalang 0.0.1-alpha.8 → 0.0.1-beta.1

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

@@ -1,182 +1,324 @@
-use std::collections::HashMap;
-use crate::{
-    core::{
-        parser::statement::{ self, Statement, StatementKind },
-        preprocessor::{
-            loader::ModuleLoader,
-            module::Module,
-            resolver::{
-                bank::resolve_bank, call::resolve_call, condition::resolve_condition, group::resolve_group, loop_::resolve_loop, spawn::resolve_spawn, tempo::resolve_tempo, trigger::resolve_trigger
-            },
-        },
-        shared::{ duration::Duration, value::Value },
-        store::global::GlobalStore,
-        utils::validation::{ is_valid_entity, is_valid_identifier },
-    },
-    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: &GlobalStore
-) -> Statement {
-    match &stmt.kind {
-        StatementKind::Trigger { entity, duration } => {
-            resolve_trigger(
-                &mut stmt.clone(),
-                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) }
-
-        // TODO: Handle other statement kinds if necessary
-        // ...
-
-        _ => stmt.clone(),
-    }
-}
-
-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();
-    let store_snapshot = global_store.clone();
-
-    for (path, module) in &store_snapshot.modules {
-        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,
-                        &store_snapshot
-                    );
-                    resolved.push(resolved_stmt);
-                }
-
-                StatementKind::Loop => {
-                    let resolved_stmt = resolve_loop(&stmt, &module, &path, &store_snapshot);
-                    resolved.push(resolved_stmt);
-                }
-
-                StatementKind::Bank => {
-                    let resolved_stmt = resolve_bank(&stmt, &module, &path, &store_snapshot);
-                    resolved.push(resolved_stmt);
-                }
-
-                StatementKind::Tempo => {
-                    let resolved_stmt = resolve_tempo(&stmt, &module, &path, &store_snapshot);
-                    resolved.push(resolved_stmt);
-                }
-
-                StatementKind::Import { .. } | StatementKind::Export { .. } => {
-                    resolved.push(stmt.clone());
-                }
-
-                StatementKind::Group => {
-                    let resolved_stmt = resolve_group(&stmt, &module, &path, &store_snapshot);
-                    resolved.push(resolved_stmt);
-                }
-
-                _ => {
-                    resolved.push(stmt);
-                }
-            }
-        }
-
-        resolved_map.insert(path.clone(), resolved);
-    }
-
-    resolved_map
-}
+use crate::core::{
+    parser::statement::{Statement, StatementKind},
+    preprocessor::{
+        loader::ModuleLoader,
+        module::Module,
+        resolver::{
+            bank::resolve_bank, call::resolve_call, condition::resolve_condition,
+            function::resolve_function, group::resolve_group, let_::resolve_let,
+            loop_::resolve_loop, pattern::resolve_pattern, spawn::resolve_spawn,
+            tempo::resolve_tempo, trigger::resolve_trigger,
+        },
+    },
+    store::global::GlobalStore,
+};
+use devalang_types::Value;
+use devalang_utils::logger::LogLevel;
+use devalang_utils::logger::Logger;
+use std::collections::HashMap;
+
+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::On { event, args, body } => {
+            let resolved_body: Vec<Statement> = body
+                .iter()
+                .map(|s| resolve_statement(s, module, path, global_store))
+                .collect();
+            Statement {
+                kind: StatementKind::On {
+                    event: event.clone(),
+                    args: args.clone(),
+                    body: resolved_body,
+                },
+                value: resolve_value(&stmt.value, module, global_store),
+                ..stmt.clone()
+            }
+        }
+        StatementKind::Emit { event, payload: _ } => Statement {
+            kind: StatementKind::Emit {
+                event: event.clone(),
+                payload: Some(resolve_value(&stmt.value, module, global_store)),
+            },
+            value: resolve_value(&stmt.value, module, global_store),
+            ..stmt.clone()
+        },
+        StatementKind::Trigger {
+            entity,
+            duration,
+            effects,
+        } => resolve_trigger(
+            stmt,
+            entity,
+            &mut duration.clone(),
+            effects.clone(),
+            module,
+            path,
+            global_store,
+        ),
+        StatementKind::If => resolve_condition(stmt, module, path, global_store),
+        StatementKind::Group => resolve_group(stmt, module, path, global_store),
+        StatementKind::Pattern { .. } => resolve_pattern(stmt, module, path, global_store),
+        StatementKind::Call { name, args } => {
+            resolve_call(stmt, name.clone(), args.clone(), module, path, global_store)
+        }
+        StatementKind::Spawn { name, args } => {
+            resolve_spawn(stmt, name.clone(), args.clone(), 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 {
+    let logger = Logger::new();
+    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);
+            }
+
+            // Leave unresolved identifiers as-is; they might be runtime-bound (e.g., foreach vars)
+            Value::Identifier(name.clone())
+        }
+
+        Value::String(s) => Value::String(s.clone()),
+
+        Value::Beat(beat_str) => {
+            logger.log_message(
+                LogLevel::Warning,
+                &format!("[warn] '{:?}': unresolved beat '{}'", module.path, beat_str),
+            );
+            Value::Beat(beat_str.clone())
+        }
+
+        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 module in global_store.modules.values() {
+        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) {
+    let logger = Logger::new();
+    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 {
+                            logger.log_message(LogLevel::Warning, &format!("[warn] '{module_path}': '{name}' not found in exports of '{source_path}'"));
+                        }
+                    } else {
+                        logger.log_message(
+                            LogLevel::Warning,
+                            &format!(
+                                "[warn] '{module_path}': cannot find source module '{source_path}'"
+                            ),
+                        );
+                    }
+                }
+                _ => {
+                    logger.log_message(
+                        LogLevel::Warning,
+                        &format!(
+                            "[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 stmt = stmt.clone();
+
+            match &stmt.kind {
+                StatementKind::Let { name } => {
+                    let resolved_stmt = resolve_let(&stmt, name, &module, &path, global_store);
+                    resolved.push(resolved_stmt);
+                }
+
+                StatementKind::Trigger {
+                    entity,
+                    duration,
+                    effects,
+                } => {
+                    let resolved_stmt = resolve_trigger(
+                        &stmt,
+                        entity.as_str(),
+                        &mut duration.clone(),
+                        effects.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::Call { name, args } => {
+                    let resolved_stmt = resolve_call(
+                        &stmt,
+                        name.clone(),
+                        args.clone(),
+                        &module,
+                        &path,
+                        global_store,
+                    );
+                    resolved.push(resolved_stmt);
+                }
+
+                StatementKind::Spawn { name, args } => {
+                    let resolved_stmt = resolve_spawn(
+                        &stmt,
+                        name.clone(),
+                        args.clone(),
+                        &module,
+                        &path,
+                        global_store,
+                    );
+                    resolved.push(resolved_stmt);
+                }
+
+                StatementKind::Group => {
+                    let resolved_stmt = resolve_group(&stmt, &module, &path, global_store);
+                    resolved.push(resolved_stmt);
+                }
+
+                StatementKind::Pattern { .. } => {
+                    let resolved_stmt = resolve_pattern(&stmt, &module, &path, global_store);
+                    resolved.push(resolved_stmt);
+                }
+
+                StatementKind::Function {
+                    name: _,
+                    parameters: _,
+                    body: _,
+                } => {
+                    let resolved_function = resolve_function(&stmt, &module, &path, global_store);
+                    resolved.push(resolved_function);
+                }
+
+                _ => {
+                    resolved.push(stmt);
+                }
+            }
+        }
+
+        resolved_map.insert(path.clone(), resolved);
+    }
+
+    resolved_map
+}

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

@@ -0,0 +1,69 @@
+use crate::core::{
+    parser::statement::{Statement, StatementKind},
+    preprocessor::{module::Module, resolver::driver::resolve_statement},
+    store::{function::FunctionDef, global::GlobalStore},
+};
+use devalang_types::Value;
+
+pub fn resolve_function(
+    stmt: &Statement,
+    module: &Module,
+    path: &str,
+    global_store: &mut GlobalStore,
+) -> Statement {
+    if let StatementKind::Function {
+        name,
+        parameters,
+        body,
+    } = &stmt.kind
+    {
+        let resolved_body = resolve_block_statements(body, module, path, global_store);
+
+        global_store.functions.add_function(FunctionDef {
+            name: name.clone(),
+            parameters: parameters.clone(),
+            body: resolved_body.clone(),
+        });
+
+        if let Some(current_mod) = global_store.modules.get_mut(path) {
+            current_mod.function_table.add_function(FunctionDef {
+                name: name.clone(),
+                parameters: parameters.clone(),
+                body: resolved_body.clone(),
+            });
+        } else {
+            eprintln!("[resolve_statement] ❌ Module path not found: {path}");
+        }
+
+        Statement {
+            kind: StatementKind::Function {
+                name: name.clone(),
+                parameters: parameters.clone(),
+                body: resolved_body,
+            },
+            value: Value::Null,
+            ..stmt.clone()
+        }
+    } else {
+        Statement {
+            kind: StatementKind::Error {
+                message: "Expected a function statement".to_string(),
+            },
+            value: Value::Null,
+            ..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()
+}
+
+// (removed unused helper type_error)