@devaloop/devalang 0.0.1-alpha.16-hotfix.3 → 0.0.1-alpha.18

package/rust/core/audio/interpreter/spawn.rs

@@ -1,7 +1,8 @@
+use devalang_types::{Duration, Value};
+
 use crate::core::{
     audio::{engine::AudioEngine, interpreter::driver::execute_audio_block},
     parser::statement::{Statement, StatementKind},
-    shared::value::Value,
     store::{function::FunctionTable, global::GlobalStore, variable::VariableTable},
 };
 
@@ -16,71 +17,152 @@ pub fn interprete_spawn_statement(
     max_end_time: f32,
     cursor_time: f32,
 ) -> (f32, f32) {
-    match &stmt.kind {
-        StatementKind::Spawn { name, args } => {
-            let mut local_engine = AudioEngine::new(audio_engine.module_name.clone());
-
-            // Function case
-            if let Some(func) = functions.functions.get(name) {
-                if func.parameters.len() != args.len() {
-                    eprintln!(
-                        "❌ Function '{}' expects {} args, got {}",
-                        name,
-                        func.parameters.len(),
-                        args.len()
+    if let StatementKind::Spawn { name, args } = &stmt.kind {
+        let mut local_engine = AudioEngine::new(audio_engine.module_name.clone());
+
+        // Function case
+        if let Some(func) = functions.functions.get(name) {
+            if func.parameters.len() != args.len() {
+                return (max_end_time, cursor_time);
+            }
+
+            let mut local_vars = VariableTable::with_parent(variable_table.clone());
+            for (param, arg) in func.parameters.iter().zip(args) {
+                local_vars.set(param.clone(), arg.clone());
+            }
+
+            let (spawn_max, _) = execute_audio_block(
+                &mut local_engine,
+                global_store,
+                local_vars,
+                functions.clone(),
+                &func.body,
+                base_bpm,
+                base_duration,
+                0.0,
+                0.0,
+            );
+
+            audio_engine.merge_with(local_engine);
+            return (spawn_max.max(max_end_time), cursor_time);
+        }
+
+        // Group case
+        if let Some(group_stmt) = find_group(name, variable_table, global_store) {
+            if let Value::Map(map) = &group_stmt.value {
+                if let Some(Value::Block(body)) = map.get("body") {
+                    let (spawn_max, _) = execute_audio_block(
+                        &mut local_engine,
+                        global_store,
+                        variable_table.clone(),
+                        functions.clone(),
+                        body,
+                        base_bpm,
+                        base_duration,
+                        0.0,
+                        0.0,
                     );
-                    return (max_end_time, cursor_time);
+                    audio_engine.merge_with(local_engine);
+                    return (spawn_max.max(max_end_time), cursor_time);
                 }
+            }
+        }
 
-                let mut local_vars = VariableTable::with_parent(variable_table.clone());
-                for (param, arg) in func.parameters.iter().zip(args) {
-                    local_vars.set(param.clone(), arg.clone());
+        // Pattern case: allow spawning a pattern similar to call
+        if let Some(pattern_stmt) = find_pattern(name, variable_table, global_store) {
+            if let Value::String(pat) = &pattern_stmt.value {
+                let mut target_entity = name.clone();
+                if let StatementKind::Pattern { name: _n, target } = &pattern_stmt.kind {
+                    if let Some(t) = target {
+                        target_entity = t.clone();
+                    }
                 }
 
-                let (spawn_max, _) = execute_audio_block(
-                    &mut local_engine,
-                    global_store,
-                    local_vars,
-                    functions.clone(),
-                    &func.body,
-                    base_bpm,
-                    base_duration,
-                    0.0,
-                    0.0,
-                );
+                let final_variable_table = if let Some(parent) = &variable_table.parent {
+                    crate::core::store::variable::VariableTable {
+                        variables: parent.variables.clone(),
+                        parent: None,
+                    }
+                } else {
+                    variable_table.clone()
+                };
 
-                audio_engine.merge_with(local_engine);
-                return (spawn_max.max(max_end_time), cursor_time);
-            }
+                let pattern_str: String = pat.chars().filter(|c| !c.is_whitespace()).collect();
+                if pattern_str.is_empty() {
+                    return (max_end_time, cursor_time);
+                }
+
+                let step_count = pattern_str.len() as f32;
+                let total_bar = 4.0 * base_duration;
+                let step_duration = total_bar / step_count;
+
+                let mut updated_max = max_end_time;
+
+                for (i, ch) in pattern_str.chars().enumerate() {
+                    if ch == '-' {
+                        continue;
+                    }
+
+                    let event_time = cursor_time + (i as f32) * step_duration;
+
+                    let mut trigger_val = Value::String(target_entity.clone());
+                    if let Some(val) = variable_table.variables.get(&target_entity) {
+                        match val {
+                            Value::Identifier(id) => {
+                                if let Some(parent) = &variable_table.parent {
+                                    if let Some(v) = parent.get(id) {
+                                        trigger_val = v.clone();
+                                    }
+                                } else if let Some(v) = variable_table.get(id) {
+                                    trigger_val = v.clone();
+                                }
+                            }
+                            Value::Map(map) => {
+                                if let Some(Value::String(src)) = map.get("entity") {
+                                    trigger_val = Value::String(src.clone());
+                                } else if let Some(Value::Identifier(src)) = map.get("entity") {
+                                    trigger_val = Value::Identifier(src.clone());
+                                }
+                            }
+                            Value::Sample(sample_src) => {
+                                trigger_val = Value::Sample(sample_src.clone());
+                            }
+                            _ => {}
+                        }
+                    }
 
-            // Group case
-            if let Some(group_stmt) = find_group(name, variable_table, global_store) {
-                if let Value::Map(map) = &group_stmt.value {
-                    if let Some(Value::Block(body)) = map.get("body") {
-                        let (spawn_max, _) = execute_audio_block(
-                            &mut local_engine,
-                            global_store,
-                            variable_table.clone(),
-                            functions.clone(),
-                            &body,
-                            base_bpm,
-                            base_duration,
-                            0.0,
-                            0.0,
-                        );
-                        audio_engine.merge_with(local_engine);
-                        return (spawn_max.max(max_end_time), cursor_time);
+                    let (src, sample_length) =
+                        crate::core::audio::loader::trigger::load_trigger(&trigger_val, &Duration::Number(step_duration), &None, base_duration, final_variable_table.clone());
+
+                    let play_length = step_duration.min(sample_length);
+
+                    let trigger_src = match trigger_val.get("entity") {
+                        Some(Value::String(s)) => s.clone(),
+                        Some(Value::Identifier(id)) => id.clone(),
+                        Some(Value::Statement(stmt)) => {
+                            if let StatementKind::Trigger { entity, .. } = &stmt.kind {
+                                entity.clone()
+                            } else {
+                                src.clone()
+                            }
+                        }
+                        _ => src.clone(),
+                    };
+
+                    audio_engine.insert_sample(&trigger_src, event_time, play_length, None, &final_variable_table);
+
+                    let end_time = event_time + play_length;
+                    if end_time > updated_max {
+                        updated_max = end_time;
                     }
                 }
-            }
 
-            eprintln!("❌ Function or group '{}' not found", name);
+                audio_engine.merge_with(local_engine);
+                return (updated_max.max(max_end_time), cursor_time);
+            }
         }
 
-        _ => eprintln!(
-            "❌ interprete_spawn_statement expected Spawn, got {:?}",
-            stmt.kind
-        ),
+        // Function or group not found
     }
 
     (max_end_time, cursor_time)
@@ -103,3 +185,53 @@ fn find_group<'a>(
     }
     None
 }
+
+fn find_pattern(
+    name: &str,
+    variable_table: &VariableTable,
+    global_store: &GlobalStore,
+) -> Option<Statement> {
+    use crate::core::parser::statement::Statement;
+    use crate::core::parser::statement::StatementKind;
+
+    if let Some(Value::Statement(stmt_box)) = variable_table.get(name) {
+        if let StatementKind::Pattern { .. } = stmt_box.kind {
+            return Some(*stmt_box.clone());
+        }
+    }
+
+    if let Some(val) = global_store.variables.variables.get(name) {
+        match val {
+            Value::Statement(stmt_box) => {
+                if let StatementKind::Pattern { .. } = stmt_box.kind {
+                    return Some(*stmt_box.clone());
+                }
+            }
+            Value::Map(map) => {
+                if let Some(Value::String(_pat)) = map.get("pattern") {
+                    // Rebuild a Pattern statement from stored map if possible
+                    let stmt = Statement {
+                        kind: StatementKind::Pattern {
+                            name: name.to_string(),
+                            target: map.get("target").and_then(|v| match v {
+                                Value::String(s) => Some(s.clone()),
+                                _ => None,
+                            }),
+                        },
+                        value: Value::String(map.get("pattern").and_then(|v| match v {
+                            Value::String(s) => Some(s.clone()),
+                            _ => None,
+                        }).unwrap_or_default()),
+                        indent: 0,
+                        line: 0,
+                        column: 0,
+                    };
+                    return Some(stmt);
+                }
+            }
+            _ => {}
+        }
+    }
+
+    None
+}

package/rust/core/audio/interpreter/tempo.rs

@@ -1,17 +1,38 @@
-use crate::core::{
-    parser::statement::{Statement, StatementKind},
-    shared::value::Value,
-};
+use crate::core::parser::statement::{Statement, StatementKind};
+use devalang_types::Value;
+use devalang_utils::logger::{LogLevel, Logger};
 
 pub fn interprete_tempo_statement(stmt: &Statement) -> Option<(f32, f32)> {
     if let StatementKind::Tempo = &stmt.kind {
-        if let Value::Number(bpm) = &stmt.value {
-            let bpm = *bpm as f32;
-            let duration = 60.0 / bpm;
+        match &stmt.value {
+            Value::Number(bpm) => {
+                let bpm = { *bpm };
+                let duration = 60.0 / bpm;
 
-            return Some((bpm, duration));
-        } else {
-            eprintln!("❌ Invalid tempo value: {:?}", stmt.value);
+                return Some((bpm, duration));
+            }
+
+            Value::String(bpm_str) => {
+                if let Ok(bpm) = bpm_str.parse::<f32>() {
+                    let duration = 60.0 / bpm;
+                    return Some((bpm, duration));
+                }
+            }
+
+            Value::Identifier(bpm_ident) => {
+                if let Ok(bpm) = bpm_ident.parse::<f32>() {
+                    let duration = 60.0 / bpm;
+                    return Some((bpm, duration));
+                }
+            }
+
+            _ => {
+                let logger = Logger::new();
+                logger.log_message(
+                    LogLevel::Warning,
+                    format!("Invalid tempo value: {:?}", stmt.value).as_str(),
+                );
+            }
         }
     }
 

package/rust/core/audio/interpreter/trigger.rs

@@ -3,10 +3,10 @@ use std::collections::HashMap;
 use crate::core::{
     audio::{engine::AudioEngine, loader::trigger::load_trigger},
     parser::statement::{Statement, StatementKind},
-    shared::{duration::Duration, value::Value},
     store::variable::VariableTable,
 };
-use crate::utils::logger::Logger;
+use devalang_types::{Duration, Value};
+use devalang_utils::logger::Logger;
 
 pub fn interprete_trigger_statement(
     stmt: &Statement,

package/rust/core/audio/loader/trigger.rs

@@ -1,8 +1,5 @@
-use crate::core::{
-    parser::statement::StatementKind,
-    shared::{duration::Duration, value::Value},
-    store::variable::VariableTable,
-};
+use crate::core::{parser::statement::StatementKind, store::variable::VariableTable};
+use devalang_types::{Duration, Value};
 
 pub fn load_trigger(
     trigger: &Value,
@@ -24,9 +21,9 @@ pub fn load_trigger(
 
         Value::Map(map) => {
             if let Some(Value::String(src)) = map.get("entity") {
-                trigger_path = format!("devalang://bank/{}", src.to_string());
+                trigger_path = format!("devalang://bank/{}", src);
             } else if let Some(Value::Identifier(src)) = map.get("entity") {
-                trigger_path = format!("devalang://bank/{}", src.to_string());
+                trigger_path = format!("devalang://bank/{}", src);
             } else {
                 eprintln!(
                     "❌ Trigger map must contain an 'entity' key with a string or identifier value."

package/rust/core/audio/player.rs

@@ -8,6 +8,12 @@ pub struct AudioPlayer {
     last_path: Option<String>,
 }
 
+impl Default for AudioPlayer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl AudioPlayer {
     pub fn new() -> Self {
         let (stream, handle) = OutputStream::try_default().unwrap();

package/rust/core/audio/renderer.rs

@@ -1,11 +1,9 @@
-use crate::{
-    core::{
-        audio::{engine::AudioEngine, interpreter::driver::run_audio_program},
-        parser::statement::Statement,
-        store::global::GlobalStore,
-    },
-    utils::logger::{LogLevel, Logger},
+use crate::core::{
+    audio::{engine::AudioEngine, interpreter::driver::run_audio_program},
+    parser::statement::Statement,
+    store::global::GlobalStore,
 };
+use devalang_utils::logger::{LogLevel, Logger};
 use std::collections::HashMap;
 
 pub fn render_audio_with_modules(

package/rust/core/audio/special/env.rs

@@ -1,3 +1,5 @@
+use devalang_types::Value;
+
 use crate::core::store::variable::VariableTable;
 use std::sync::OnceLock;
 use std::time::{SystemTime, UNIX_EPOCH};
@@ -36,7 +38,7 @@ pub fn resolve_atom_or_var(atom: &str, vars: &VariableTable, bpm: f32, beat: f32
     if let Ok(n) = atom.parse::<f32>() {
         return Some(n);
     }
-    if let Some(crate::core::shared::value::Value::Number(n)) = vars.get(atom) {
+    if let Some(Value::Number(n)) = vars.get(atom) {
         return Some(*n);
     }
     None

package/rust/core/audio/special/math.rs

@@ -1,4 +1,5 @@
 use crate::core::store::variable::VariableTable;
+use devalang_utils::logger::{Logger, LogLevel};
 
 // Parse comma-separated arguments at top level (no nested parentheses split)
 fn parse_top_level_args(s: &str) -> Vec<&str> {
@@ -25,12 +26,12 @@ fn parse_top_level_args(s: &str) -> Vec<&str> {
 
 fn eval_math_func(func: &str, args: &[f32], fallback_seed: f32) -> Option<f32> {
     match func {
-        "sin" => args.get(0).copied().map(f32::sin),
-        "cos" => args.get(0).copied().map(f32::cos),
+        "sin" => args.first().copied().map(f32::sin),
+        "cos" => args.first().copied().map(f32::cos),
         "random" => {
             // deterministic pseudo-random based on provided seed or a fallback session seed
-            let seed = args.get(0).copied().unwrap_or(fallback_seed);
-            let x = (seed * 12.9898).sin() * 43758.5453;
+            let seed = args.first().copied().unwrap_or(fallback_seed);
+            let x = (seed * 12.9898).sin() * 43_758.547;
             Some((x.fract() * 2.0 - 1.0).clamp(-1.0, 1.0))
         }
         "lerp" => {
@@ -56,9 +57,21 @@ pub fn find_and_eval_first_math_call<EvalFn>(
 where
     EvalFn: Fn(&str, &VariableTable, f32, f32) -> Option<f32>,
 {
+    let logger = Logger::new();
+
     let start = s.find("$math.")?;
-    let open_rel = s[start..].find('(')?;
+    let open_rel = match s[start..].find('(') {
+        Some(i) => i,
+        None => {
+            logger.log_message(LogLevel::Error, &format!("Malformed $math call: missing '(' in '{}'", s));
+            return None;
+        }
+    };
     let open = start + open_rel;
+    if open <= start + 6 {
+        logger.log_message(LogLevel::Error, &format!("Malformed $math call: missing function name in '{}'", s));
+        return None;
+    }
     let func = &s[start + 6..open];
 
     // Find matching close parenthesis, handling nesting
@@ -77,7 +90,13 @@ where
             _ => {}
         }
     }
-    let close = close_abs?;
+    let close = match close_abs {
+        Some(c) => c,
+        None => {
+            logger.log_message(LogLevel::Error, &format!("Malformed $math call: missing closing ')' in '{}'", s));
+            return None;
+        }
+    };
 
     let inner = &s[open + 1..close];
     let raw_args = parse_top_level_args(inner);
@@ -86,6 +105,7 @@ where
         if let Some(v) = eval(a, vars, bpm, beat) {
             args.push(v);
         } else {
+            logger.log_message(LogLevel::Error, &format!("Failed to evaluate argument '{}' for $math.{}", a, func));
             return None;
         }
     }

package/rust/core/audio/special/modulator.rs

@@ -44,11 +44,11 @@ fn adsr_envelope_value_t(attack: f32, decay: f32, sustain: f32, release: f32, t:
 fn eval_mod_func(func: &str, args: &[f32], beat: f32) -> Option<f32> {
     match func {
         "lfo.sine" => {
-            let rate = args.get(0).copied().unwrap_or(1.0);
+            let rate = args.first().copied().unwrap_or(1.0);
             Some(lfo_sine(rate, beat))
         }
         "lfo.tri" | "lfo.triangle" => {
-            let rate = args.get(0).copied().unwrap_or(1.0);
+            let rate = args.first().copied().unwrap_or(1.0);
             Some(lfo_triangle(rate, beat))
         }
         // ADSR envelope normalized over t in [0,1]

package/rust/core/builder/mod.rs

@@ -1,12 +1,18 @@
 use crate::core::audio::renderer::render_audio_with_modules;
 use crate::core::parser::statement::Statement;
 use crate::core::store::global::GlobalStore;
-use crate::utils::logger::Logger;
+use devalang_utils::logger::Logger;
 use std::io::Write;
 use std::{collections::HashMap, fs::create_dir_all};
 
 pub struct Builder {}
 
+impl Default for Builder {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Builder {
     pub fn new() -> Self {
         Builder {}
@@ -46,7 +52,7 @@ impl Builder {
         let logger = Logger::new();
 
         let audio_engines =
-            render_audio_with_modules(modules.clone(), &normalized_output_dir, global_store);
+            render_audio_with_modules(modules.clone(), normalized_output_dir, global_store);
 
         create_dir_all(format!("{}/audio", normalized_output_dir))
             .expect("Failed to create audio directory");
@@ -54,7 +60,7 @@ impl Builder {
         for (module_name, mut audio_engine) in audio_engines {
             let formatted_module_name = module_name
                 .split('/')
-                .last()
+                .next_back()
                 .unwrap_or(&module_name)
                 .replace(".deva", "");
 

package/rust/core/debugger/lexer.rs

@@ -20,7 +20,7 @@ pub fn write_lexer_log_file(
             content.push_str(&format!("{:?}\n", token));
         }
 
-        content.push_str("\n");
+        content.push('\n');
     }
 
     debugger.write_log_file(&log_directory, file_name, &content);

package/rust/core/debugger/mod.rs

@@ -7,6 +7,12 @@ use std::io::Write;
 
 pub struct Debugger {}
 
+impl Default for Debugger {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Debugger {
     pub fn new() -> Self {
         Debugger {}

package/rust/core/debugger/module.rs

@@ -13,7 +13,7 @@ pub fn write_module_variable_log_file(
     let mut content = String::new();
     let module_name = module_path
         .split('/')
-        .last()
+        .next_back()
         .unwrap_or("index")
         .replace(".deva", "");
 
@@ -24,7 +24,7 @@ pub fn write_module_variable_log_file(
         content.push_str(&format!("{:?} = {:?}\n", var_name, var_data));
     }
 
-    content.push_str("\n");
+    content.push('\n');
 
     debugger.write_log_file(&log_directory, "variables.log", &content);
 }
@@ -38,7 +38,7 @@ pub fn write_module_function_log_file(
     let mut content = String::new();
     let module_name = module_path
         .split('/')
-        .last()
+        .next_back()
         .unwrap_or("index")
         .replace(".deva", "");
 
@@ -49,7 +49,7 @@ pub fn write_module_function_log_file(
         content.push_str(&format!("{:?} = {:?}\n", func_name, func_data));
     }
 
-    content.push_str("\n");
+    content.push('\n');
 
     debugger.write_log_file(&log_directory, "functions.log", &content);
 }

package/rust/core/debugger/preprocessor.rs

@@ -20,7 +20,7 @@ pub fn write_preprocessor_log_file(
             content.push_str(&format!("{:?}\n", stmt));
         }
 
-        content.push_str("\n");
+        content.push('\n');
     }
 
     debugger.write_log_file(&log_directory, file_name, &content);

package/rust/core/debugger/store.rs

@@ -15,7 +15,7 @@ pub fn write_variables_log_file(output_dir: &str, file_name: &str, variables: Va
         content.push_str(&format!("{:?} = {:?}\n", var_name, var_data));
     }
 
-    content.push_str("\n");
+    content.push('\n');
 
     debugger.write_log_file(&log_directory, file_name, &content);
 }
@@ -34,7 +34,7 @@ pub fn write_function_log_file(output_dir: &str, file_name: &str, functions: Fun
         ));
     }
 
-    content.push_str("\n");
+    content.push('\n');
 
     debugger.write_log_file(&log_directory, file_name, &content);
 }