@devaloop/devalang 0.0.1-alpha.9 → 0.0.1-beta.2

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

@@ -1,23 +1,21 @@
 use std::collections::HashMap;
 
-use crate::{
-    core::{
-        parser::statement::{ Statement, StatementKind },
-        preprocessor::{
-            module::Module,
-            resolver::{ driver::resolve_statement, value::resolve_value },
-        },
-        shared::value::Value,
-        store::global::GlobalStore,
+use crate::core::{
+    parser::statement::{Statement, StatementKind},
+    preprocessor::{
+        module::Module,
+        resolver::{driver::resolve_statement, value::resolve_value},
     },
-    utils::logger::Logger,
+    store::global::GlobalStore,
 };
+use devalang_types::Value;
+use devalang_utils::logger::Logger;
 
 pub fn resolve_loop(
     stmt: &Statement,
     module: &Module,
     path: &str,
-    global_store: &mut GlobalStore
+    global_store: &mut GlobalStore,
 ) -> Statement {
     let logger = Logger::new();
 
@@ -32,14 +30,243 @@ pub fn resolve_loop(
         resolved_map.insert(key.clone(), resolve_value(val, module, global_store));
     }
 
+    // Foreach form takes precedence if present
+    if let (Some(Value::Identifier(var_name)), Some(array_val)) =
+        (resolved_map.get("foreach"), resolved_map.get("array"))
+    {
+        // Normalize array_val into an iterable Array
+        let resolved_array = match array_val {
+            Value::Array(items) => Value::Array(
+                items
+                    .iter()
+                    .map(|v| resolve_value(v, module, global_store))
+                    .collect(),
+            ),
+            Value::Number(n) => {
+                // Iterate 0..n-1
+                let count = (*n).max(0.0) as usize;
+                let mut items = Vec::with_capacity(count);
+                for i in 0..count {
+                    items.push(Value::Number(i as f32));
+                }
+                Value::Array(items)
+            }
+            Value::String(s) => {
+                // Try to parse a simple comma-separated list: "a,b,c" -> ["a","b","c"]
+                // If numeric string: iterate 0..n-1
+                if let Ok(n) = s.parse::<f32>() {
+                    let count = n.max(0.0) as usize;
+                    let mut items = Vec::with_capacity(count);
+                    for i in 0..count {
+                        items.push(Value::Number(i as f32));
+                    }
+                    Value::Array(items)
+                } else if s.contains(',') {
+                    let parts: Vec<Value> = s
+                        .split(',')
+                        .map(|p| Value::String(p.trim().to_string()))
+                        .collect();
+                    Value::Array(parts)
+                } else {
+                    // Fallback: iterate characters
+                    let parts: Vec<Value> =
+                        s.chars().map(|c| Value::String(c.to_string())).collect();
+                    Value::Array(parts)
+                }
+            }
+            Value::Identifier(name) => {
+                // Resolve identifier from module variables (already resolved map above)
+                let v = if let Some(v) = module.variable_table.get(name) {
+                    v.clone()
+                } else {
+                    Value::Null
+                };
+                match v {
+                    Value::Array(items) => Value::Array(
+                        items
+                            .iter()
+                            .map(|v| resolve_value(v, module, global_store))
+                            .collect(),
+                    ),
+                    Value::Number(n) => {
+                        let count = n.max(0.0) as usize;
+                        let mut items = Vec::with_capacity(count);
+                        for i in 0..count {
+                            items.push(Value::Number(i as f32));
+                        }
+                        Value::Array(items)
+                    }
+                    Value::String(s) => {
+                        if let Ok(n) = s.parse::<f32>() {
+                            let count = n.max(0.0) as usize;
+                            let mut items = Vec::with_capacity(count);
+                            for i in 0..count {
+                                items.push(Value::Number(i as f32));
+                            }
+                            Value::Array(items)
+                        } else if s.contains(',') {
+                            let parts: Vec<Value> = s
+                                .split(',')
+                                .map(|p| Value::String(p.trim().to_string()))
+                                .collect();
+                            Value::Array(parts)
+                        } else {
+                            let parts: Vec<Value> =
+                                s.chars().map(|c| Value::String(c.to_string())).collect();
+                            Value::Array(parts)
+                        }
+                    }
+                    other => {
+                        error_value(
+                            &logger,
+                            module,
+                            stmt,
+                            &format!(
+                                "Foreach identifier '{}' resolves to unsupported value: {:?}",
+                                name, other
+                            ),
+                        );
+                        Value::Array(vec![])
+                    }
+                }
+            }
+            other => {
+                // Resolve and normalize if possible
+                let v = resolve_value(other, module, global_store);
+                match v {
+                    Value::Array(items) => Value::Array(items),
+                    Value::Number(n) => {
+                        let count = n.max(0.0) as usize;
+                        let mut items = Vec::with_capacity(count);
+                        for i in 0..count {
+                            items.push(Value::Number(i as f32));
+                        }
+                        Value::Array(items)
+                    }
+                    Value::String(s) => {
+                        if let Ok(n) = s.parse::<f32>() {
+                            let count = n.max(0.0) as usize;
+                            let mut items = Vec::with_capacity(count);
+                            for i in 0..count {
+                                items.push(Value::Number(i as f32));
+                            }
+                            Value::Array(items)
+                        } else if s.contains(',') {
+                            let parts: Vec<Value> = s
+                                .split(',')
+                                .map(|p| Value::String(p.trim().to_string()))
+                                .collect();
+                            Value::Array(parts)
+                        } else {
+                            let parts: Vec<Value> =
+                                s.chars().map(|c| Value::String(c.to_string())).collect();
+                            Value::Array(parts)
+                        }
+                    }
+                    other => {
+                        error_value(
+                            &logger,
+                            module,
+                            stmt,
+                            &format!("Unsupported foreach array value: {:?}", other),
+                        );
+                        Value::Array(vec![])
+                    }
+                }
+            }
+        };
+
+        let body_value = match resolved_map.get("body") {
+            Some(Value::Block(stmts)) => {
+                let resolved = stmts
+                    .iter()
+                    .map(|s| resolve_statement(s, module, path, global_store))
+                    .collect();
+                Value::Block(resolved)
+            }
+            _ => {
+                error_value(&logger, module, stmt, "Invalid or missing loop body");
+                Value::Block(vec![])
+            }
+        };
+
+        let mut final_map = HashMap::new();
+        final_map.insert("foreach".to_string(), Value::Identifier(var_name.clone()));
+        final_map.insert("array".to_string(), resolved_array);
+        final_map.insert("body".to_string(), body_value);
+
+        return Statement {
+            kind: StatementKind::Loop,
+            value: Value::Map(final_map),
+            ..stmt.clone()
+        };
+    }
+
     let iterator_value = match resolved_map.get("iterator") {
         Some(Value::Number(n)) => Value::Number(*n),
+        Some(Value::String(s)) => {
+            if let Ok(n) = s.parse::<f32>() {
+                Value::Number(n)
+            } else {
+                error_value(
+                    &logger,
+                    module,
+                    stmt,
+                    &format!("Loop iterator string not numeric: '{}'", s),
+                );
+                Value::Number(1.0)
+            }
+        }
+        Some(Value::Identifier(name)) => {
+            // Try resolving from module vars (may be number or numeric string)
+            if let Some(v) = module.variable_table.get(name) {
+                match v {
+                    Value::Number(n) => Value::Number(*n),
+                    Value::String(s) => {
+                        if let Ok(n) = s.parse::<f32>() {
+                            Value::Number(n)
+                        } else {
+                            error_value(
+                                &logger,
+                                module,
+                                stmt,
+                                &format!(
+                                    "Loop iterator '{}' resolves to non-numeric string: '{}'",
+                                    name, s
+                                ),
+                            );
+                            Value::Number(1.0)
+                        }
+                    }
+                    other => {
+                        error_value(
+                            &logger,
+                            module,
+                            stmt,
+                            &format!(
+                                "Loop iterator '{}' resolves to non-number: {:?}",
+                                name, other
+                            ),
+                        );
+                        Value::Number(1.0)
+                    }
+                }
+            } else {
+                error_value(
+                    &logger,
+                    module,
+                    stmt,
+                    &format!("Loop iterator identifier '{}' not found", name),
+                );
+                Value::Number(1.0)
+            }
+        }
         Some(other) => {
             error_value(
                 &logger,
                 module,
                 stmt,
-                &format!("Loop iterator must be a number, found: {:?}", other)
+                &format!("Loop iterator must be a number, found: {:?}", other),
             );
             Value::Number(1.0)
         }
@@ -49,7 +276,7 @@ pub fn resolve_loop(
         }
     };
 
-    let body_value = match resolved_map.remove("body") {
+    let body_value = match resolved_map.get("body") {
         Some(Value::Block(stmts)) => {
             let resolved = stmts
                 .iter()

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

@@ -2,13 +2,15 @@ pub mod driver;
 
 pub mod value;
 
-pub mod trigger;
-pub mod loop_;
 pub mod bank;
-pub mod tempo;
-pub mod group;
+pub mod call;
 pub mod condition;
+pub mod function;
+pub mod group;
+pub mod let_;
+pub mod loop_;
+pub mod pattern;
 pub mod spawn;
-pub mod call;
 pub mod synth;
-pub mod let_;
+pub mod tempo;
+pub mod trigger;

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

@@ -0,0 +1,83 @@
+use crate::core::{
+    parser::statement::{Statement, StatementKind},
+    preprocessor::module::Module,
+    store::global::GlobalStore,
+};
+use devalang_types::Value;
+use devalang_utils::logger::{LogLevel, Logger};
+
+pub fn resolve_pattern(
+    stmt: &Statement,
+    module: &Module,
+    path: &str,
+    global_store: &mut GlobalStore,
+) -> Statement {
+    let logger = Logger::new();
+
+    // Expecting pattern name stored on the Statement.kind; value may contain the string
+    if let StatementKind::Pattern { name, target } = &stmt.kind {
+        // Ensure name doesn't already exist
+        if global_store.variables.variables.contains_key(name) {
+            logger.log_error_with_stacktrace(
+                &format!("Pattern identifier '{}' already exists", name),
+                path,
+            );
+            return Statement {
+                kind: StatementKind::Error {
+                    message: format!("Pattern '{}' already exists", name),
+                },
+                ..stmt.clone()
+            };
+        }
+
+        // Resolve potential target and pattern string value
+        let resolved_value = resolve_value(&stmt.value, module, global_store);
+
+        // Build a map to store the pattern definition
+        let mut map = std::collections::HashMap::new();
+        map.insert("identifier".to_string(), Value::String(name.clone()));
+        if let Some(t) = target {
+            map.insert("target".to_string(), Value::String(t.clone()));
+        }
+        // Keep raw pattern in 'pattern' key
+        map.insert("pattern".to_string(), resolved_value.clone());
+
+        let resolved_stmt = Statement {
+            kind: StatementKind::Pattern {
+                name: name.clone(),
+                target: target.clone(),
+            },
+            value: resolved_value,
+            ..stmt.clone()
+        };
+
+        // Store into global variables as a Statement
+        global_store.variables.variables.insert(
+            name.clone(),
+            Value::Statement(Box::new(resolved_stmt.clone())),
+        );
+
+        return resolved_stmt;
+    }
+
+    logger.log_message(
+        LogLevel::Warning,
+        "resolve_pattern called on non-pattern statement",
+    );
+    stmt.clone()
+}
+
+fn resolve_value(value: &Value, module: &Module, global_store: &mut GlobalStore) -> Value {
+    // reuse driver::resolve_value logic; simple local resolution for pattern value
+    match value {
+        Value::String(s) => Value::String(s.clone()),
+        Value::Map(m) => {
+            let mut resolved = std::collections::HashMap::new();
+            for (k, v) in m {
+                resolved.insert(k.clone(), resolve_value(v, module, global_store));
+            }
+            Value::Map(resolved)
+        }
+        other => other.clone(),
+    }
+}

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

@@ -1,58 +1,99 @@
-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 },
+use crate::core::{
+    parser::statement::{Statement, StatementKind},
+    preprocessor::module::Module,
+    store::global::GlobalStore,
 };
+use devalang_types::Value;
+use devalang_utils::logger::{LogLevel, Logger};
 
 pub fn resolve_spawn(
     stmt: &Statement,
+    name: String,
+    args: Vec<Value>,
     module: &Module,
-    path: &str,
-    global_store: &mut GlobalStore
+    _path: &str,
+    global_store: &mut GlobalStore,
 ) -> Statement {
     let logger = Logger::new();
 
-    let resolved_value = resolve_value(&stmt.value, module, global_store);
+    // If it's a function
+    if let Some(func) = global_store.functions.functions.get(&name) {
+        let mut resolved_map = std::collections::HashMap::new();
+        resolved_map.insert("name".to_string(), Value::String(name.clone()));
+        resolved_map.insert("args".to_string(), Value::Array(args.clone()));
+        resolved_map.insert("body".to_string(), Value::Block(func.body.clone()));
 
-    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));
-            }
+        return Statement {
+            kind: StatementKind::Spawn { name, args },
+            value: Value::Map(resolved_map),
+            ..stmt.clone()
+        };
+    }
 
-            Statement {
-                kind: StatementKind::Spawn,
-                value: Value::Map(map),
-                ..stmt.clone()
+    // If it's a group stored in variables
+    if let Some(Value::Statement(stmt_box)) = global_store.variables.variables.get(&name) {
+        if let StatementKind::Group = stmt_box.kind {
+            if let Value::Map(map) = &stmt_box.value {
+                if let Some(Value::Block(body)) = map.get("body") {
+                    let mut resolved_map = std::collections::HashMap::new();
+                    resolved_map.insert("identifier".to_string(), Value::String(name.clone()));
+                    resolved_map.insert("args".to_string(), Value::Array(args.clone()));
+                    resolved_map.insert("body".to_string(), Value::Block(body.clone()));
+
+                    return Statement {
+                        kind: StatementKind::Spawn { name, args },
+                        value: Value::Map(resolved_map),
+                        ..stmt.clone()
+                    };
+                }
             }
         }
+        // Pattern case (make spawn accept patterns stored as variables)
+        if let StatementKind::Pattern { .. } = stmt_box.kind {
+            let mut resolved_map = std::collections::HashMap::new();
+            resolved_map.insert("identifier".to_string(), Value::String(name.clone()));
+            // pattern value may be a string or a map stored on the statement
+            match &stmt_box.value {
+                Value::String(s) => {
+                    resolved_map.insert("pattern".to_string(), Value::String(s.clone()));
+                }
+                Value::Map(m) => {
+                    if let Some(val) = m.get("pattern") {
+                        resolved_map.insert("pattern".to_string(), val.clone());
+                    }
+                    if let Some(val) = m.get("target") {
+                        resolved_map.insert("target".to_string(), val.clone());
+                    }
+                }
+                _ => {}
+            }
+            resolved_map.insert("args".to_string(), Value::Array(args.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,
+            return Statement {
+                kind: StatementKind::Spawn { name, args },
+                value: Value::Map(resolved_map),
                 ..stmt.clone()
-            }
+            };
         }
     }
-}
+
+    // Otherwise, log an error
+    let stacktrace = format!("{}:{}:{}", module.path, stmt.line, stmt.column);
+    logger.log_message(
+        LogLevel::Error,
+        &format!(
+            "Function or group '{}' not found for spawn\n  → at {stacktrace}",
+            name
+        ),
+    );
+
+    Statement {
+        kind: StatementKind::Error {
+            message: format!("Function or group '{}' not found for spawn", name),
+        },
+        value: Value::Null,
+        ..stmt.clone()
+    }
+}
+
+// (removed unused helpers get_group_body, error_stmt)

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

@@ -1,29 +1,33 @@
-use crate::{
-    core::{
-        parser::statement::{ Statement, StatementKind },
-        preprocessor::{ module::Module, resolver::driver::resolve_statement },
-        shared::value::Value,
-        store::global::GlobalStore,
-    },
-    utils::logger::{ LogLevel, Logger },
+use crate::core::{
+    parser::statement::{Statement, StatementKind},
+    preprocessor::{module::Module, resolver::driver::resolve_statement},
+    store::global::GlobalStore,
 };
+use devalang_types::Value;
+use devalang_utils::logger::{LogLevel, Logger};
 
 pub fn resolve_synth(
     stmt: &Statement,
     module: &Module,
     path: &str,
-    global_store: &mut GlobalStore
+    global_store: &mut GlobalStore,
 ) -> Statement {
     let logger = Logger::new();
 
     let Value::Map(synth_map) = &stmt.value else {
-        return type_error(&logger, module, stmt, "Expected a map in synth statement".to_string());
+        return type_error(
+            &logger,
+            module,
+            stmt,
+            "Expected a map in synth statement".to_string(),
+        );
     };
 
     let mut resolved_map = synth_map.clone();
 
     if let Some(Value::Block(body)) = synth_map.get("body") {
-        let resolved_body = body.iter()
+        let resolved_body = body
+            .iter()
             .map(|s| resolve_statement(s, module, path, global_store))
             .collect::<Vec<_>>();
         resolved_map.insert("body".to_string(), Value::Block(resolved_body));

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

@@ -1,18 +1,16 @@
-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_tempo(
     stmt: &Statement,
     module: &Module,
-    path: &str,
-    _global_store: &GlobalStore
+    _path: &str,
+    _global_store: &GlobalStore,
 ) -> Statement {
     let mut new_stmt = stmt.clone();
     let logger = Logger::new();
@@ -24,9 +22,7 @@ pub fn resolve_tempo(
             } else {
                 let message = format!("Tempo identifier '{ident}' not found in variable table");
                 logger.log_error_with_stacktrace(&message, &module.path);
-                new_stmt.kind = StatementKind::Error {
-                    message,
-                };
+                new_stmt.kind = StatementKind::Error { message };
                 new_stmt.value = Value::Null;
             }
         }
@@ -36,7 +32,10 @@ pub fn resolve_tempo(
         }
 
         other => {
-            let message = format!("Expected a number or identifier for tempo, found {:?}", other);
+            let message = format!(
+                "Expected a number or identifier for tempo, found {:?}",
+                other
+            );
             logger.log_error_with_stacktrace(&message, &module.path);
             new_stmt.kind = StatementKind::Error {
                 message: "Expected a number or identifier for tempo".to_string(),