@devaloop/devalang 0.0.1-alpha.12 → 0.0.1-alpha.14

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

@@ -2,18 +2,20 @@ use crate::core::{
     audio::{ engine::AudioEngine, interpreter::driver::execute_audio_block },
     parser::statement::{ Statement, StatementKind },
     shared::{ duration::Duration, value::Value },
-    store::variable::VariableTable,
+    store::{function::FunctionTable, global::GlobalStore, variable::VariableTable},
 };
 
 pub fn interprete_loop_statement(
     stmt: &Statement,
-    audio_engine: AudioEngine,
-    variable_table: VariableTable,
+    audio_engine: &mut AudioEngine,
+    global_store: &GlobalStore,
+    variable_table: &VariableTable,
+    functions_table: &FunctionTable,
     base_bpm: f32,
     base_duration: f32,
     max_end_time: f32,
     cursor_time: f32
-) -> (AudioEngine, f32, f32) {
+) -> (f32, f32) {
     if let Value::Map(loop_value) = &stmt.value {
         let loop_count = match loop_value.get("iterator") {
             Some(Value::Number(n)) => *n as usize,
@@ -22,12 +24,15 @@ pub fn interprete_loop_statement(
                     *n as usize
                 } else {
                     eprintln!("❌ Loop iterator must be a number, found: {:?}", ident);
-                    return (audio_engine, max_end_time, cursor_time);
+                    return (max_end_time, cursor_time);
                 }
             }
             _ => {
-                eprintln!("❌ Loop iterator must be a number, found: {:?}", loop_value.get("iterator"));
-                return (audio_engine, max_end_time, cursor_time);
+                eprintln!(
+                    "❌ Loop iterator must be a number, found: {:?}",
+                    loop_value.get("iterator")
+                );
+                return (max_end_time, cursor_time);
             }
         };
 
@@ -35,7 +40,7 @@ pub fn interprete_loop_statement(
             Some(Value::Block(body)) => body.clone(),
             _ => {
                 eprintln!("❌ Loop body must be a block, found: {:?}", loop_value.get("body"));
-                return (audio_engine, max_end_time, cursor_time);
+                return (max_end_time, cursor_time);
             }
         };
 
@@ -43,10 +48,12 @@ pub fn interprete_loop_statement(
         let mut cur_time = cursor_time;
         let mut max_time = max_end_time;
 
-        for _ in 0..loop_count {
-            let (eng, _, end_time) = execute_audio_block(
-                engine,
+        for i in 0..loop_count {
+            let (block_end_time, cursor_time) = execute_audio_block(
+                &mut engine,
+                global_store,
                 variable_table.clone(),
+                functions_table.clone(),
                 loop_body.clone(),
                 base_bpm,
                 base_duration,
@@ -54,14 +61,13 @@ pub fn interprete_loop_statement(
                 cur_time
             );
 
-            engine = eng;
-            cur_time = end_time;
-            max_time = max_time.max(end_time);
+            cur_time = block_end_time;
+            max_time = max_time.max(cur_time);
         }
 
-        (engine, max_time, cur_time)
-    } else {
-        eprintln!("❌ Loop statement value is not a map");
-        (audio_engine, max_end_time, cursor_time)
+        return (max_time, cur_time);
     }
+
+    eprintln!("❌ Loop statement value is not a map");
+    (max_end_time, cursor_time)
 }

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

@@ -9,4 +9,5 @@ pub mod sleep;
 pub mod loop_;
 pub mod call;
 pub mod condition;
-pub mod arrow_call;
+pub mod arrow_call;
+pub mod function;

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

@@ -18,12 +18,6 @@ pub fn interprete_sleep_statement(
                 0.0
             })
         }
-        Value::String(s) if s.ends_with("s") => {
-            s.trim_end_matches("s").parse::<f32>().unwrap_or_else(|_| {
-                eprintln!("❌ Invalid sleep value (s): {}", s);
-                0.0
-            })
-        }
         other => {
             eprintln!("❌ Invalid sleep value: {:?}", other);
             0.0

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

@@ -1,84 +1,102 @@
 use crate::core::{
-    audio::{ engine::AudioEngine, interpreter::driver::execute_audio_block },
-    parser::statement::Statement,
+    audio::{engine::AudioEngine, interpreter::driver::execute_audio_block},
+    parser::statement::{Statement, StatementKind},
     shared::value::Value,
-    store::variable::VariableTable,
+    store::{function::FunctionTable, global::GlobalStore, variable::VariableTable},
 };
 
 pub fn interprete_spawn_statement(
     stmt: &Statement,
-    audio_engine: AudioEngine,
+    audio_engine: &mut AudioEngine,
     variable_table: &VariableTable,
+    functions: &FunctionTable,
+    global_store: &GlobalStore,
     base_bpm: f32,
     base_duration: f32,
+    max_end_time: f32,
     cursor_time: f32,
-    max_end_time: f32
-) -> Option<(f32, f32, AudioEngine)> {
-    match &stmt.value {
-        Value::String(identifier) | Value::Identifier(identifier) => {
-            handle_spawn_identifier(
-                identifier,
-                audio_engine,
-                variable_table,
-                base_bpm,
-                base_duration,
-                cursor_time,
-                max_end_time
-            )
-        }
+) -> (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()
+                    );
+                    return (max_end_time, cursor_time);
+                }
 
-        Value::Map(map) => {
-            if let Some(Value::Block(block)) = map.get("body") {
-                let (eng, _, end_time) = execute_audio_block(
-                    audio_engine.clone(),
-                    variable_table.clone(),
-                    block.clone(),
+                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.clone(),
                     base_bpm,
                     base_duration,
-                    max_end_time,
-                    cursor_time
+                    0.0,
+                    0.0,
                 );
-                return Some((max_end_time.max(end_time), end_time, eng));
-            } else {
-                eprintln!("❌ Spawn map has no 'body' block");
+
+                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.clone(),
+                            base_bpm,
+                            base_duration,
+                            0.0,
+                            0.0,
+                        );
+                        audio_engine.merge_with(local_engine);
+                        return (spawn_max.max(max_end_time), cursor_time);
+                    }
+                }
             }
-            None
-        }
 
-        _ => {
-            eprintln!("❌ Invalid spawn statement: expected identifier, found {:?}", stmt.value);
-            None
+            eprintln!("❌ Function or group '{}' not found", name);
         }
+
+        _ => eprintln!("❌ interprete_spawn_statement expected Spawn, got {:?}", stmt.kind),
     }
+
+    (max_end_time, cursor_time)
 }
 
-fn handle_spawn_identifier(
-    identifier: &str,
-    audio_engine: AudioEngine,
-    variable_table: &VariableTable,
-    base_bpm: f32,
-    base_duration: f32,
-    cursor_time: f32,
-    max_end_time: f32
-) -> Option<(f32, f32, AudioEngine)> {
-    if let Some(Value::Map(map)) = variable_table.get(identifier) {
-        if let Some(Value::Block(block)) = map.get("body") {
-            let (eng, _, end_time) = execute_audio_block(
-                audio_engine.clone(),
-                variable_table.clone(),
-                block.clone(),
-                base_bpm,
-                base_duration,
-                max_end_time,
-                cursor_time
-            );
-            return Some((max_end_time.max(end_time), end_time, eng));
-        } else {
-            eprintln!("❌ Spawn group '{}' has no 'body' block", identifier);
+fn find_group<'a>(
+    name: &str,
+    variable_table: &'a VariableTable,
+    global_store: &'a GlobalStore,
+) -> Option<&'a Statement> {
+    if let Some(Value::Statement(stmt_box)) = variable_table.get(name) {
+        if let StatementKind::Group = stmt_box.kind {
+            return Some(stmt_box);
+        }
+    }
+    if let Some(Value::Statement(stmt_box)) = global_store.variables.variables.get(name) {
+        if let StatementKind::Group = stmt_box.kind {
+            return Some(stmt_box);
         }
-    } else {
-        eprintln!("❌ Spawn group '{}' not found or not a map", identifier);
     }
-
     None
 }

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

@@ -15,105 +15,192 @@ pub fn interprete_trigger_statement(
     cursor_time: f32,
     max_end_time: f32
 ) -> Option<(f32, f32, AudioEngine)> {
-    if let StatementKind::Trigger { entity, duration } = &stmt.kind {
-        if let Some(trigger_val) = resolve_namespaced_variable(entity, variable_table) {
-            let duration_secs = match duration {
-                Duration::Number(n) => *n,
-
-                Duration::Identifier(id) => {
-                    if id == "auto" {
-                        1.0
+    if let StatementKind::Trigger { entity, duration, effects } = &stmt.kind {
+        let mut trigger_val = Value::String(entity.clone());
+        let mut trigger_src = String::new();
+
+        match variable_table.variables.get(entity) {
+            Some(Value::Identifier(id)) => {
+                // Get real value from global variable table
+                if let Some(global_table) = &variable_table.parent {
+                    if let Some(val) = global_table.get(id) {
+                        trigger_val = val.clone();
                     } else {
-                        match variable_table.get(id) {
-                            Some(Value::Number(n)) => *n,
-                            Some(Value::Identifier(other)) if other == "auto" => 1.0,
-                            Some(other) => {
-                                eprintln!(
-                                    "❌ Invalid duration reference '{}': expected number, got {:?}",
-                                    id,
-                                    other
-                                );
-                                return None;
-                            }
-                            None => {
-                                eprintln!("❌ Duration identifier '{}' not found", id);
-                                return None;
-                            }
-                        }
+                        eprintln!("❌ Trigger entity '{}' not found in global variable table", id);
+                        return None;
                     }
+                } else if let Some(val) = variable_table.get(id) {
+                    trigger_val = val.clone();
+                } else {
+                    eprintln!("❌ Trigger entity '{}' not found in variable table", id);
+                    return None;
                 }
+            }
+            Some(Value::Sample(sample_src)) => {
+                // If the entity is a sample, we use its path directly
+                trigger_src = sample_src.clone();
+            }
+            Some(Value::Map(map)) => {
+                // If the entity is a map, we assume it contains an "entity" key
+                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());
+                } else {
+                    eprintln!(
+                        "❌ Trigger map must contain an 'entity' key with a string or identifier value."
+                    );
+                    return None;
+                }
+            }
+            _ => {
+                trigger_val = Value::String(entity.clone());
+            }
+        }
 
-                Duration::Beat(beat_str) => {
-                    // Assuming beat_str is in the format "numerator/denominator"
-                    let parts: Vec<&str> = beat_str.split('/').collect();
-
-                    if parts.len() != 2 {
-                        eprintln!("❌ Invalid beat duration format: {}", beat_str);
-                        return None;
+        let duration_secs = match duration {
+            Duration::Number(n) => *n,
+
+            Duration::Identifier(id) => {
+                if id == "auto" {
+                    1.0
+                } else {
+                    match variable_table.get(id) {
+                        Some(Value::Number(n)) => *n,
+                        Some(Value::Identifier(other)) if other == "auto" => 1.0,
+                        Some(other) => {
+                            eprintln!(
+                                "❌ Invalid duration reference '{}': expected number, got {:?}",
+                                id,
+                                other
+                            );
+                            return None;
+                        }
+                        None => {
+                            eprintln!("❌ Duration identifier '{}' not found", id);
+                            return None;
+                        }
                     }
-
-                    let numerator: f32 = parts[0].parse().unwrap_or(1.0);
-                    let denominator: f32 = parts[1].parse().unwrap_or(1.0);
-                    numerator / denominator
                 }
+            }
 
-                Duration::Auto => 1.0,
-            };
+            Duration::Beat(beat_str) => {
+                let parts: Vec<&str> = beat_str.split('/').collect();
+                if parts.len() != 2 {
+                    eprintln!("❌ Invalid beat duration format: {}", beat_str);
+                    return None;
+                }
 
-            let duration_final = duration_secs * base_duration;
+                let numerator: f32 = parts[0].parse().unwrap_or(1.0);
+                let denominator: f32 = parts[1].parse().unwrap_or(4.0);
 
-            let (src, _) = load_trigger(
-                trigger_val,
-                duration,
-                base_duration,
-                variable_table.clone()
-            );
+                let beats = (numerator / denominator) * 4.0;
 
-            if let Some(effects) = extract_effects(stmt.value.clone()) {
-                audio_engine.insert_sample(&src, cursor_time, duration_final, Some(effects));
-            } else {
-                audio_engine.insert_sample(&src, cursor_time, duration_final, None);
+                beats * base_duration
             }
 
-            let mut updated_engine = audio_engine.clone();
+            Duration::Auto => base_duration,
+        };
 
-            let new_cursor_time = cursor_time + duration_final;
-            let new_max_end_time = new_cursor_time.max(max_end_time);
-
-            return Some((new_cursor_time, new_max_end_time, updated_engine));
+        let final_variable_table = if let Some(parent) = &variable_table.parent {
+            VariableTable {
+                variables: parent.variables.clone(),
+                parent: None,
+            }
         } else {
-            eprintln!("❌ Unknown trigger entity: {}", entity);
+            variable_table.clone()
+        };
+
+        let (src, sample_length) = load_trigger(
+            &trigger_val,
+            duration,
+            effects,
+            base_duration,
+            final_variable_table.clone()
+        );
+
+        if trigger_src.is_empty() {
+            trigger_src = src;
         }
-    }
-
-    None
-}
 
-fn resolve_namespaced_variable<'a>(path: &str, variables: &'a VariableTable) -> Option<&'a Value> {
-    let mut current: Option<&Value> = None;
+        let effects = extract_effects(stmt.value.clone());
+        let one_shot = effects
+            .as_ref()
+            .and_then(|map| map.get("one_shot"))
+            .and_then(|v| {
+                match v {
+                    Value::Identifier(id) if id == "true" => Some(true),
+                    Value::String(s) if s == "true" => Some(true),
+                    _ => None,
+                }
+            })
+            .unwrap_or(false);
 
-    for (i, part) in path.split('.').enumerate() {
-        if i == 0 {
-            current = variables.get(part);
+        let play_length = if one_shot {
+            sample_length // play entire sample
         } else {
-            current = match current {
-                Some(Value::Map(map)) => map.get(part),
-                _ => {
+            duration_secs.min(sample_length)
+        };
+
+        let trigger_src = match trigger_val.get("entity") {
+            Some(Value::String(src)) => src.clone(),
+            Some(Value::Identifier(id)) => id.clone(),
+            Some(Value::Statement(stmt)) => {
+                if let StatementKind::Trigger { entity, .. } = &stmt.kind {
+                    entity.clone()
+                } else {
+                    eprintln!("❌ Invalid trigger statement in map: expected 'Trigger' kind");
                     return None;
                 }
-            };
+            }
+            _ => trigger_src,
+        };
+
+        if let Some(effects_map) = effects {
+            audio_engine.insert_sample(
+                &trigger_src,
+                cursor_time,
+                play_length,
+                Some(effects_map),
+                &final_variable_table
+            );
+        } else {
+            audio_engine.insert_sample(
+                &trigger_src,
+                cursor_time,
+                play_length,
+                None,
+                &final_variable_table
+            );
         }
+
+        let new_cursor_time = cursor_time + duration_secs; // advance by beat duration
+        let new_max_end_time = (cursor_time + play_length).max(max_end_time);
+
+        let updated_engine = audio_engine.clone();
+
+        return Some((new_cursor_time, new_max_end_time, updated_engine));
     }
 
-    current
+    None
 }
 
 fn extract_effects(value: Value) -> Option<HashMap<String, Value>> {
-    if let Value::Map(map) = value.clone() {
+    if let Value::Map(map) = value {
         let mut effects = HashMap::new();
 
         for (key, val) in map {
-            effects.insert(key.clone(), val);
+            if key == "effects" {
+                if let Value::Map(effect_map) = val {
+                    for (effect_key, effect_val) in effect_map {
+                        effects.insert(effect_key, effect_val);
+                    }
+                } else {
+                    return None; // effects must be a map
+                }
+            } else {
+                return Some(effects);
+            }
         }
 
         Some(effects)

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

@@ -1,8 +1,13 @@
-use crate::core::{ shared::{ duration::Duration, value::Value }, store::variable::VariableTable };
+use crate::core::{
+    parser::statement::StatementKind,
+    shared::{ duration::Duration, value::Value },
+    store::variable::VariableTable,
+};
 
 pub fn load_trigger(
     trigger: &Value,
     duration: &Duration,
+    effects: &Option<Value>,
     base_duration: f32,
     variable_table: VariableTable
 ) -> (String, f32) {
@@ -13,8 +18,36 @@ pub fn load_trigger(
         Value::String(src) => {
             trigger_path = src.to_string();
         }
+        Value::Identifier(src) => {
+            trigger_path = src.to_string();
+        }
+
+        Value::Map(map) => {
+            if let Some(Value::String(src)) = map.get("entity") {
+                trigger_path = format!("devalang://bank/{}", src.to_string());
+            } else if let Some(Value::Identifier(src)) = map.get("entity") {
+                trigger_path = format!("devalang://bank/{}", src.to_string());
+            } else {
+                eprintln!(
+                    "❌ Trigger map must contain an 'entity' key with a string or identifier value."
+                );
+            }
+        }
+        Value::Sample(src) => {
+            trigger_path = src.to_string();
+        }
+        Value::Statement(stmt) => {
+            if let StatementKind::Trigger { entity, duration, effects } = &stmt.kind {
+                trigger_path = entity.clone();
+            } else {
+                eprintln!("❌ Trigger statement must be of type 'Trigger', found: {:?}", stmt.kind);
+            }
+        }
         _ => {
-            eprintln!("❌ Invalid trigger type. Expected a text variable.");
+            eprintln!(
+                "❌ Invalid trigger type. Expected a string or identifier variable, found: {:?}",
+                trigger
+            );
         }
     }
 
@@ -45,11 +78,11 @@ pub fn load_trigger(
 
         Duration::Beat(beat_str) => {
             let parts: Vec<&str> = beat_str.split('/').collect();
-            
+
             if parts.len() == 2 {
                 let numerator: f32 = parts[0].parse().unwrap_or(1.0);
                 let denominator: f32 = parts[1].parse().unwrap_or(1.0);
-                duration_as_secs = numerator / denominator * base_duration;
+                duration_as_secs = (numerator / denominator) * base_duration;
             } else {
                 eprintln!("❌ Invalid beat duration format: {}", beat_str);
             }

package/rust/core/audio/player.rs

@@ -21,23 +21,33 @@ impl AudioPlayer {
         }
     }
 
-    fn load_source(&self, path: &str) -> impl Source<Item = f32> + Send + 'static {
-        let file = File::open(path).unwrap();
-        let reader = BufReader::new(file);
-
-        Decoder::new(reader).unwrap().convert_samples()
+    fn load_source(&self, path: &str) -> Option<impl Source<Item = f32> + Send + 'static> {
+        if let Ok(file) = File::open(path) {
+            let reader = BufReader::new(file);
+            match Decoder::new(reader) {
+                Ok(decoder) => Some(decoder.convert_samples()),
+                Err(e) => {
+                    eprintln!("❌ Failed to decode audio file '{}': {}", path, e);
+                    None
+                }
+            }
+        } else {
+            eprintln!("❌ Could not open audio file: {}", path);
+            None
+        }
     }
 
     pub fn play_file_once(&mut self, path: &str) {
         self.sink.stop();
         self.sink = Sink::try_new(&self.handle).unwrap();
-
         self.sink.set_volume(1.0);
 
-        let source = self.load_source(path);
-
-        self.sink.append(source);
-        self.last_path = Some(path.to_string());
+        if let Some(source) = self.load_source(path) {
+            self.sink.append(source);
+            self.last_path = Some(path.to_string());
+        } else {
+            eprintln!("⚠️ Skipping playback: failed to load '{}'", path);
+        }
     }
 
     pub fn replay_last(&mut self) {