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

package/rust/core/preprocessor/module.rs

@@ -1,70 +1,56 @@
 use crate::core::{
-    lexer::lex,
-    parser::{ parse_without_resolving },
-    preprocessor::{
-        collect_dependencies_recursively,
-        resolver::{ resolve_exports, resolve_imports },
-    },
-    types::{ module::Module, parser::Parser, store::{ ExportTable, GlobalStore, ImportTable } },
+    lexer::token::Token,
+    parser::statement::Statement,
+    store::{ export::ExportTable, import::ImportTable, variable::VariableTable },
 };
 
-pub fn load_all_modules(entry_file: &str) -> GlobalStore {
-    let mut global_store = GlobalStore::default();
-    let files = collect_dependencies_recursively(entry_file);
+#[derive(Debug, Clone)]
+pub struct Module {
+    pub path: String,
+    pub resolved: bool,
+    pub tokens: Vec<Token>,
+    pub statements: Vec<Statement>,
+    pub variable_table: VariableTable,
+    pub export_table: ExportTable,
+    pub import_table: ImportTable,
+    pub content: String,
+    pub current_dir: String,
+}
 
-    for file in &files {
-        if let Err(e) = load_module_into_global_store(file, &mut global_store) {
-            eprintln!("❌ Error loading {}: {}", file, e);
+impl Module {
+    pub fn new(path: &str) -> Self {
+        Module {
+            path: path.to_string(),
+            tokens: Vec::new(),
+            statements: Vec::new(),
+            variable_table: VariableTable::new(),
+            export_table: ExportTable::new(),
+            import_table: ImportTable::new(),
+            resolved: false,
+            content: String::new(),
+            current_dir: String::new(),
         }
     }
 
-    for file in &files {
-        if let Some(module) = global_store.modules.clone().get_mut(file) {
-            let imports = resolve_imports(module, &mut global_store);
-            module.import_table = imports.clone();
-
-            let global_store_module = global_store.modules.get(&file.clone().to_string());
-            if let Some(global_store_module_found) = global_store_module {
-                global_store.insert_module(file.to_string(), module.clone());
-            } else {
-                eprintln!("❌ Module {} not found in global store after import resolution", file);
-            }
-        }
+    pub fn is_resolved(&self) -> bool {
+        self.resolved
     }
 
-    global_store
-}
-
-pub fn load_module_into_global_store(
-    path: &str,
-    global_store: &mut GlobalStore
-) -> Result<(), String> {
-    if global_store.modules.contains_key(path) {
-        return Ok(());
+    pub fn set_resolved(&mut self, resolved: bool) {
+        self.resolved = resolved;
     }
 
-    let content = std::fs::read_to_string(path).map_err(|_| format!("Cannot read file: {}", path))?;
-
-    let tokens = lex(content);
-
-    let mut parser = Parser::new(tokens.clone());
-
-    parser.current_module = path.to_string();
-
-    let raw_statements = parse_without_resolving(tokens.clone(), &mut parser, global_store);
-
-    let export_table = resolve_exports(&raw_statements, &mut parser);
-
-    let mut module = Module {
-        path: path.to_string(),
-        tokens: tokens.clone(),
-        statements: raw_statements,
-        variable_table: parser.variable_table.clone(),
-        export_table: export_table.clone(),
-        import_table: parser.import_table.clone(),
-    };
+    pub fn add_token(&mut self, token: Token) {
+        self.tokens.push(token);
+    }
 
-    global_store.insert_module(path.to_string(), module.clone());
+    pub fn add_statement(&mut self, statement: Statement) {
+        self.statements.push(statement);
+    }
 
-    Ok(())
+    pub fn from_existing(path: &str, content: String) -> Self {
+        let mut module = Module::new(path);
+        module.content = content;
+        module
+    }
 }

package/rust/core/preprocessor/processor.rs

@@ -0,0 +1,76 @@
+use std::{ collections::HashMap, path::Path };
+
+use crate::core::{
+    parser::{ driver::Parser, statement::StatementKind },
+    preprocessor::{ loader::ModuleLoader, resolver::group },
+    shared::value::Value,
+    store::global::GlobalStore,
+    utils::path::{normalize_path, resolve_relative_path},
+};
+
+pub fn process_modules(module_loader: &ModuleLoader, global_store: &mut GlobalStore) {
+    for module in global_store.modules.values_mut() {
+        for stmt in &module.statements {
+            match &stmt.kind {
+                StatementKind::Let { name } => {
+                    module.variable_table.variables.insert(name.clone(), stmt.value.clone());
+                }
+
+                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));
+
+                    module.variable_table.variables.insert(
+                        alias.clone(),
+                        Value::Sample(resolved_path)
+                    );
+                }
+
+                StatementKind::Export { names, source } => {
+                    for name in names {
+                        if let Some(val) = module.variable_table.get(name) {
+                            module.export_table.add_export(name.clone(), val.clone());
+                        }
+                    }
+                }
+
+                StatementKind::Import { names, source } => {
+                    let resolved = resolve_relative_path(&module.path, source);
+                    for name in names {
+                        module.import_table.add_import(
+                            name.clone(),
+                            Value::String(resolved.clone())
+                        );
+                    }
+                }
+
+                StatementKind::Group => {
+                    if let Value::Map(map) = &stmt.value {
+                        if
+                            let (Some(Value::String(name)), Some(Value::Block(body))) = (
+                                map.get("identifier"),
+                                map.get("body"),
+                            )
+                        {
+                            let mut stored_map = HashMap::new();
+
+                            stored_map.insert(
+                                "identifier".to_string(),
+                                Value::String(name.clone())
+                            );
+
+                            stored_map.insert("body".to_string(), Value::Block(body.clone()));
+
+                            module.variable_table.set(name.to_string(), Value::Map(stored_map));
+                        } else {
+                            eprintln!("❌ Invalid group definition: {:?}", stmt.value);
+                        }
+                    }
+                }
+
+                _ => {}
+            }
+        }
+    }
+}

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

@@ -1,59 +1,49 @@
-use crate::core::{parser::parse_with_resolving_with_module, types::{
-    module::Module,
-    statement::{ Statement, StatementKind, StatementResolved, StatementResolvedValue },
-    variable::VariableValue,
-}};
+use crate::{
+    core::{
+        parser::statement::{ Statement, StatementKind },
+        preprocessor::module::Module,
+        shared::value::Value,
+        store::global::GlobalStore,
+    },
+    utils::logger::Logger,
+};
 
-pub fn resolve_bank_statement(stmt: &Statement, module: &Module) -> StatementResolved {
-    match &stmt.value {
-        VariableValue::Text(name) => {
-            if
-                let Some(value) = module.import_table.imports
-                    .get(name)
-                    .or_else(|| module.variable_table.variables.get(name))
-            {
-                let statement_value: StatementResolvedValue = match value {
-                    VariableValue::Array(arr) => {
-                        StatementResolvedValue::Array(
-                            parse_with_resolving_with_module(arr.clone(), module)
-                        )
-                    }
-                    VariableValue::Text(text) => StatementResolvedValue::String(text.clone()),
-                    VariableValue::Number(num) => StatementResolvedValue::Number(*num),
-                    VariableValue::Boolean(b) => StatementResolvedValue::Boolean(*b),
-                    _ => {
-                        eprintln!("⚠️ Unsupported variable type for Bank: {:?}", value);
-                        StatementResolvedValue::Unknown
-                    }
-                };
+pub fn resolve_bank(
+    stmt: &Statement,
+    module: &Module,
+    path: &str,
+    _global_store: &GlobalStore
+) -> Statement {
+    let mut new_stmt = stmt.clone();
+    let logger = Logger::new();
 
-                StatementResolved {
-                    kind: StatementKind::Bank,
-                    value: statement_value,
-                    indent: stmt.indent,
-                    line: stmt.line,
-                    column: stmt.column,
-                }
+    match &stmt.value {
+        Value::Identifier(ident) => {
+            if let Some(val) = module.variable_table.get(ident) {
+                new_stmt.value = val.clone();
             } else {
-                eprintln!("⚠️ Bank variable '{}' not found", name);
-                StatementResolved {
-                    kind: StatementKind::Bank,
-                    value: StatementResolvedValue::Unknown,
-                    indent: stmt.indent,
-                    line: stmt.line,
-                    column: stmt.column,
-                }
+                let message = format!("Bank identifier '{ident}' not found in variable table");
+                logger.log_error_with_stacktrace(&message, &module.path);
+                new_stmt.kind = StatementKind::Error {
+                    message: message.clone(),
+                };
+                new_stmt.value = Value::Null;
             }
         }
-        _ => {
-            eprintln!("⚠️ Invalid value type for Bank statement: {:?}", stmt.value);
-            StatementResolved {
-                kind: StatementKind::Bank,
-                value: StatementResolvedValue::Unknown,
-                indent: stmt.indent,
-                line: stmt.line,
-                column: stmt.column,
-            }
+
+        Value::String(_) => {}
+
+        Value::Number(_) => {}
+
+        other => {
+            let message = format!("Expected a string or identifier for bank, found {:?}", other);
+            logger.log_error_with_stacktrace(&message, &module.path);
+            new_stmt.kind = StatementKind::Error {
+                message: "Expected a string or identifier for bank".to_string(),
+            };
+            new_stmt.value = Value::Null;
         }
     }
+
+    new_stmt
 }

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

@@ -0,0 +1,123 @@
+use crate::{
+    core::{
+        parser::statement::{ Statement, StatementKind },
+        preprocessor::{ module::Module, resolver::driver::resolve_statement },
+        shared::value::Value,
+        store::global::GlobalStore,
+    },
+    utils::logger::{ Logger, LogLevel },
+};
+
+pub fn resolve_call(
+    stmt: &Statement,
+    module: &Module,
+    path: &str,
+    global_store: &mut GlobalStore
+) -> Statement {
+    let logger = Logger::new();
+
+    match &stmt.value {
+        Value::Identifier(ident) => {
+            match module.variable_table.get(ident) {
+                Some(Value::String(group_name)) =>
+                    resolve_group_by_name(group_name, stmt, module, path, global_store, &logger),
+                Some(Value::Map(group_map)) =>
+                    resolved_call(stmt, group_map, module, path, global_store),
+                Some(other) =>
+                    error_stmt(
+                        &logger,
+                        module,
+                        stmt,
+                        &format!(
+                            "Identifier '{ident}' must resolve to a group name or map, found {:?}",
+                            other
+                        )
+                    ),
+                None =>
+                    error_stmt(
+                        &logger,
+                        module,
+                        stmt,
+                        &format!("Identifier '{ident}' not found in variable table")
+                    ),
+            }
+        }
+
+        Value::String(name) =>
+            resolve_group_by_name(name, stmt, module, path, global_store, &logger),
+
+        Value::Map(group_map) => resolved_call(stmt, group_map, module, path, global_store),
+
+        other =>
+            error_stmt(
+                &logger,
+                module,
+                stmt,
+                &format!("Call expects a group name as string or identifier, found {:?}", other)
+            ),
+    }
+}
+
+fn resolve_group_by_name(
+    name: &str,
+    stmt: &Statement,
+    module: &Module,
+    path: &str,
+    global_store: &mut GlobalStore,
+    logger: &Logger
+) -> Statement {
+    match module.variable_table.get(name) {
+        Some(Value::Map(group_map)) => resolved_call(stmt, group_map, module, path, global_store),
+        Some(other) =>
+            error_stmt(
+                logger,
+                module,
+                stmt,
+                &format!("Expected a group for '{}', but found {:?}", name, other)
+            ),
+        None =>
+            error_stmt(
+                logger,
+                module,
+                stmt,
+                &format!("Group '{}' not found in module '{}'", name, module.path)
+            ),
+    }
+}
+
+fn resolved_call(
+    stmt: &Statement,
+    group_map: &std::collections::HashMap<String, Value>,
+    module: &Module,
+    path: &str,
+    global_store: &mut GlobalStore
+) -> Statement {
+    let mut cloned_map = group_map.clone();
+
+    if let Some(Value::Block(stmts)) = group_map.get("body") {
+        let resolved = stmts
+            .iter()
+            .map(|s| resolve_statement(s, module, path, global_store))
+            .collect();
+        cloned_map.insert("body".to_string(), Value::Block(resolved));
+    }
+
+    Statement {
+        kind: StatementKind::Call,
+        value: Value::Map(cloned_map),
+        ..stmt.clone()
+    }
+}
+
+fn error_stmt(logger: &Logger, module: &Module, stmt: &Statement, message: &str) -> Statement {
+    let stacktrace = format!("{}:{}:{}", module.path, stmt.line, stmt.column);
+    logger.log_message(LogLevel::Error, &format!("{message}\n  → at {stacktrace}"));
+
+    Statement {
+        kind: StatementKind::Error {
+            message: message.to_string(),
+        },
+        value: Value::Null,
+        ..stmt.clone()
+    }
+}

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

@@ -0,0 +1,92 @@
+use crate::{
+    core::{
+        parser::statement::{Statement, StatementKind},
+        preprocessor::{module::Module, resolver::driver::resolve_statement},
+        shared::value::Value,
+        store::global::GlobalStore,
+    },
+    utils::logger::Logger,
+};
+
+pub fn resolve_condition(
+    stmt: &Statement,
+    module: &Module,
+    path: &str,
+    global_store: &mut GlobalStore,
+) -> Statement {
+    let logger = Logger::new();
+
+    let Value::Map(condition_map) = &stmt.value else {
+        return type_error(&logger, module, stmt, "Expected a map in condition statement".to_string());
+    };
+
+    let mut resolved_map = condition_map.clone();
+
+    // Main body resolution
+    if let Some(Value::Block(body)) = condition_map.get("body") {
+        let resolved_body = resolve_block_statements(body, module, path, global_store);
+        resolved_map.insert("body".to_string(), Value::Block(resolved_body));
+    }
+
+    // Recursive resolution of next condition
+    if let Some(Value::Map(next_map)) = condition_map.get("next") {
+        let next_stmt = Statement {
+            kind: StatementKind::If,
+            value: Value::Map(next_map.clone()),
+            ..stmt.clone()
+        };
+
+        let resolved_next = resolve_condition(&next_stmt, module, path, global_store);
+
+        if let Value::Map(mut resolved_next_map) = resolved_next.value {
+            // Body next resolution
+            if let Some(Value::Block(body)) = resolved_next_map.get("body") {
+                let resolved_body = resolve_block_statements(body, module, path, global_store);
+                resolved_next_map.insert("body".to_string(), Value::Block(resolved_body));
+            }
+
+            resolved_map.insert("next".to_string(), Value::Map(resolved_next_map));
+        }
+    }
+
+    Statement {
+        kind: StatementKind::If,
+        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()
+        .flat_map(|stmt| {
+            let resolved = resolve_statement(stmt, module, path, global_store);
+
+            if let StatementKind::Call = resolved.kind {
+                if let Value::Block(inner) = &resolved.value {
+                    return inner
+                        .iter()
+                        .map(|s| resolve_statement(s, module, path, global_store))
+                        .collect();
+                }
+            }
+
+            vec![resolved]
+        })
+        .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()
+    }
+}