@devaloop/devalang 0.0.1-beta.2 → 0.0.1-beta.3

package/rust/core/audio/interpreter/statements/call.rs

@@ -109,6 +109,18 @@ pub fn interprete_call_statement(
                 let total_bar = 4.0 * base_duration;
                 let step_duration = total_bar / step_count; // seconds per step
 
+                // extract optional swing/humanize from pattern_stmt.value
+                let mut swing: f32 = 0.0;
+                let mut humanize: f32 = 0.0;
+                if let Value::Map(m) = &pattern_stmt.value {
+                    if let Some(Value::Number(s)) = m.get("swing") {
+                        swing = *s;
+                    }
+                    if let Some(Value::Number(h)) = m.get("humanize") {
+                        humanize = *h;
+                    }
+                }
+
                 let mut updated_max = max_end_time;
 
                 for (i, ch) in pattern_str.chars().enumerate() {
@@ -117,7 +129,25 @@ pub fn interprete_call_statement(
                     }
 
                     // Schedule a trigger at cursor_time + offset
-                    let event_time = cursor_time + (i as f32) * step_duration;
+                    let mut event_time = cursor_time + (i as f32) * step_duration;
+                    if swing.abs() > 0.0001 {
+                        if i % 2 == 1 {
+                            event_time += swing * step_duration;
+                        } else {
+                            event_time -= swing * step_duration;
+                        }
+                    }
+
+                    if humanize.abs() > 0.0001 {
+                        let jitter_range = humanize * step_duration;
+                        let seed = (audio_engine.module_name.len() + i) as u64
+                            + (event_time.to_bits() as u64);
+                        let mut x = seed.wrapping_mul(0x9E3779B97F4A7C15).rotate_left(13);
+                        x ^= x >> 7;
+                        let r = (x as i64 % 1000) as f32 / 1000.0;
+                        let jitter = (r * 2.0 - 1.0) * jitter_range / 2.0;
+                        event_time += jitter;
+                    }
 
                     // Resolve trigger value similarly to interprete_trigger_statement
                     let mut trigger_val = Value::String(target_entity.clone());

package/rust/core/audio/interpreter/statements/condition.rs

@@ -1,72 +1,72 @@
-use devalang_types::Value;
-
-use crate::core::{
-    audio::{
-        engine::AudioEngine, evaluator::evaluate_condition_string,
-        interpreter::driver::execute_audio_block,
-    },
-    parser::statement::Statement,
-    store::global::GlobalStore,
-};
-use devalang_types::store::{FunctionTable, VariableTable};
-
-pub fn interprete_condition_statement(
-    stmt: &Statement,
-    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,
-) -> (f32, f32) {
-    let cur_time = cursor_time;
-    let max_time = max_end_time;
-
-    let mut current = stmt.value.clone();
-
-    loop {
-        let Value::Map(map) = current else {
-            break;
-        };
-
-        let should_execute = match map.get("condition") {
-            Some(Value::Boolean(b)) => *b,
-            Some(Value::String(expr)) => evaluate_condition_string(expr, &variable_table.clone()),
-            Some(_) => false,
-            None => true,
-        };
-
-        if should_execute {
-            if let Some(Value::Block(block)) = map.get("body") {
-                let (new_max, cursor_time) = execute_audio_block(
-                    audio_engine,
-                    global_store,
-                    variable_table.clone(),
-                    functions_table.clone(),
-                    block,
-                    base_bpm,
-                    base_duration,
-                    max_time,
-                    cur_time,
-                );
-                return (new_max, cursor_time);
-            } else {
-                break;
-            }
-        }
-
-        // Advance to the next condition
-        match map.get("next") {
-            Some(Value::Map(next_map)) => {
-                current = Value::Map(next_map.clone());
-            }
-            _ => {
-                break;
-            }
-        }
-    }
-
-    (max_end_time, cursor_time)
-}
+use devalang_types::Value;
+
+use crate::core::{
+    audio::{
+        engine::AudioEngine, evaluator::evaluate_condition_string,
+        interpreter::driver::execute_audio_block,
+    },
+    parser::statement::Statement,
+    store::global::GlobalStore,
+};
+use devalang_types::store::{FunctionTable, VariableTable};
+
+pub fn interprete_condition_statement(
+    stmt: &Statement,
+    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,
+) -> (f32, f32) {
+    let cur_time = cursor_time;
+    let max_time = max_end_time;
+
+    let mut current = stmt.value.clone();
+
+    loop {
+        let Value::Map(map) = current else {
+            break;
+        };
+
+        let should_execute = match map.get("condition") {
+            Some(Value::Boolean(b)) => *b,
+            Some(Value::String(expr)) => evaluate_condition_string(expr, &variable_table.clone()),
+            Some(_) => false,
+            None => true,
+        };
+
+        if should_execute {
+            if let Some(Value::Block(block)) = map.get("body") {
+                let (new_max, cursor_time) = execute_audio_block(
+                    audio_engine,
+                    global_store,
+                    variable_table.clone(),
+                    functions_table.clone(),
+                    block,
+                    base_bpm,
+                    base_duration,
+                    max_time,
+                    cur_time,
+                );
+                return (new_max, cursor_time);
+            } else {
+                break;
+            }
+        }
+
+        // Advance to the next condition
+        match map.get("next") {
+            Some(Value::Map(next_map)) => {
+                current = Value::Map(next_map.clone());
+            }
+            _ => {
+                break;
+            }
+        }
+    }
+
+    (max_end_time, cursor_time)
+}

package/rust/core/audio/interpreter/statements/function.rs

@@ -1,24 +1,24 @@
-use crate::core::parser::statement::{Statement, StatementKind};
-use devalang_types::store::{FunctionDef, FunctionTable};
-
-pub fn interprete_function_statement(
-    stmt: &Statement,
-    functions_table: &mut FunctionTable,
-) -> Option<FunctionTable> {
-    if let StatementKind::Function {
-        name,
-        parameters,
-        body,
-    } = &stmt.kind
-    {
-        functions_table.add_function(FunctionDef {
-            name: name.clone(),
-            parameters: parameters.clone(),
-            body: body.clone(),
-        });
-
-        return Some(functions_table.clone());
-    }
-
-    None
-}
+use crate::core::parser::statement::{Statement, StatementKind};
+use devalang_types::store::{FunctionDef, FunctionTable};
+
+pub fn interprete_function_statement(
+    stmt: &Statement,
+    functions_table: &mut FunctionTable,
+) -> Option<FunctionTable> {
+    if let StatementKind::Function {
+        name,
+        parameters,
+        body,
+    } = &stmt.kind
+    {
+        functions_table.add_function(FunctionDef {
+            name: name.clone(),
+            parameters: parameters.clone(),
+            body: body.clone(),
+        });
+
+        return Some(functions_table.clone());
+    }
+
+    None
+}

package/rust/core/audio/interpreter/statements/let_.rs

@@ -1,36 +1,36 @@
-use crate::core::parser::statement::{Statement, StatementKind};
-use devalang_types::Value;
-use devalang_types::store::VariableTable;
-
-pub fn interprete_let_statement(
-    stmt: &Statement,
-    variable_table: &mut VariableTable,
-) -> Option<VariableTable> {
-    if let StatementKind::Let { name } = &stmt.kind {
-        // If RHS is a string and looks like an expression, evaluate it
-        let evaluated = match &stmt.value {
-            Value::String(s) if s.contains("$env") || s.contains("$math") => {
-                // We don't have direct env here; use defaults or infer from table
-                let bpm = if let Some(Value::Number(n)) = variable_table.get("bpm") {
-                    *n
-                } else {
-                    120.0
-                };
-                // Try to infer beat from time-based variables if any, else 0.0
-                let beat = if let Some(Value::Number(n)) = variable_table.get("beat") {
-                    *n
-                } else {
-                    0.0
-                };
-                crate::core::audio::evaluator::evaluate_rhs_into_value(s, variable_table, bpm, beat)
-            }
-            other => other.clone(),
-        };
-
-        variable_table.set(name.to_string(), evaluated);
-
-        return Some(variable_table.clone());
-    }
-
-    None
-}
+use crate::core::parser::statement::{Statement, StatementKind};
+use devalang_types::Value;
+use devalang_types::store::VariableTable;
+
+pub fn interprete_let_statement(
+    stmt: &Statement,
+    variable_table: &mut VariableTable,
+) -> Option<VariableTable> {
+    if let StatementKind::Let { name } = &stmt.kind {
+        // If RHS is a string and looks like an expression, evaluate it
+        let evaluated = match &stmt.value {
+            Value::String(s) if s.contains("$env") || s.contains("$math") => {
+                // We don't have direct env here; use defaults or infer from table
+                let bpm = if let Some(Value::Number(n)) = variable_table.get("bpm") {
+                    *n
+                } else {
+                    120.0
+                };
+                // Try to infer beat from time-based variables if any, else 0.0
+                let beat = if let Some(Value::Number(n)) = variable_table.get("beat") {
+                    *n
+                } else {
+                    0.0
+                };
+                crate::core::audio::evaluator::evaluate_rhs_into_value(s, variable_table, bpm, beat)
+            }
+            other => other.clone(),
+        };
+
+        variable_table.set(name.to_string(), evaluated);
+
+        return Some(variable_table.clone());
+    }
+
+    None
+}

package/rust/core/audio/interpreter/statements/load.rs

@@ -1,17 +1,17 @@
-use devalang_types::Value;
-
-use crate::core::parser::statement::{Statement, StatementKind};
-use devalang_types::store::VariableTable;
-
-pub fn interprete_load_statement(
-    stmt: &Statement,
-    variable_table: &mut VariableTable,
-) -> Option<VariableTable> {
-    if let StatementKind::Load { source, alias } = &stmt.kind {
-        variable_table.set(alias.to_string(), Value::Sample(source.clone()));
-
-        return Some(variable_table.clone());
-    }
-
-    None
-}
+use devalang_types::Value;
+
+use crate::core::parser::statement::{Statement, StatementKind};
+use devalang_types::store::VariableTable;
+
+pub fn interprete_load_statement(
+    stmt: &Statement,
+    variable_table: &mut VariableTable,
+) -> Option<VariableTable> {
+    if let StatementKind::Load { source, alias } = &stmt.kind {
+        variable_table.set(alias.to_string(), Value::Sample(source.clone()));
+
+        return Some(variable_table.clone());
+    }
+
+    None
+}

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

@@ -1,115 +1,115 @@
-use devalang_types::Value;
-
-use crate::core::{
-    audio::{engine::AudioEngine, interpreter::driver::execute_audio_block},
-    parser::statement::Statement,
-    store::global::GlobalStore,
-};
-use devalang_types::store::{FunctionTable, VariableTable};
-
-pub fn interprete_loop_statement(
-    stmt: &Statement,
-    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,
-) -> (f32, f32) {
-    if let Value::Map(loop_value) = &stmt.value {
-        // Foreach form: { foreach: Identifier(name), array: Array([...]), body: Block }
-        if let (
-            Some(Value::Identifier(var_name)),
-            Some(Value::Array(items)),
-            Some(Value::Block(loop_body)),
-        ) = (
-            loop_value.get("foreach"),
-            loop_value.get("array"),
-            loop_value.get("body"),
-        ) {
-            let engine = audio_engine;
-            let mut cur_time = cursor_time;
-            let mut max_time = max_end_time;
-
-            for item in items {
-                let mut scoped_vars = variable_table.clone();
-                scoped_vars.set(var_name.clone(), item.clone());
-
-                let (block_end_time, new_cursor) = execute_audio_block(
-                    engine,
-                    global_store,
-                    scoped_vars,
-                    functions_table.clone(),
-                    loop_body,
-                    base_bpm,
-                    base_duration,
-                    max_time,
-                    cur_time,
-                );
-
-                cur_time = new_cursor.max(block_end_time);
-                max_time = max_time.max(cur_time);
-            }
-
-            return (max_time, cur_time);
-        }
-
-        let loop_count = match loop_value.get("iterator") {
-            Some(Value::Number(n)) => *n as usize,
-            Some(Value::Identifier(ident)) => {
-                if let Some(Value::Number(n)) = variable_table.get(ident) {
-                    *n as usize
-                } else {
-                    eprintln!("❌ Loop iterator must be a number, found: {:?}", ident);
-                    return (max_end_time, cursor_time);
-                }
-            }
-            _ => {
-                eprintln!(
-                    "❌ Loop iterator must be a number, found: {:?}",
-                    loop_value.get("iterator")
-                );
-                return (max_end_time, cursor_time);
-            }
-        };
-
-        let loop_body = match loop_value.get("body") {
-            Some(Value::Block(body)) => body.clone(),
-            _ => {
-                eprintln!(
-                    "❌ Loop body must be a block, found: {:?}",
-                    loop_value.get("body")
-                );
-                return (max_end_time, cursor_time);
-            }
-        };
-
-        let engine = audio_engine;
-        let mut cur_time = cursor_time;
-        let mut max_time = max_end_time;
-
-        for _ in 0..loop_count {
-            let (block_end_time, new_cursor) = execute_audio_block(
-                engine,
-                global_store,
-                variable_table.clone(),
-                functions_table.clone(),
-                &loop_body,
-                base_bpm,
-                base_duration,
-                max_time,
-                cur_time,
-            );
-
-            cur_time = new_cursor.max(block_end_time);
-            max_time = max_time.max(cur_time);
-        }
-
-        return (max_time, cur_time);
-    }
-
-    eprintln!("❌ Loop statement value is not a map");
-    (max_end_time, cursor_time)
-}
+use devalang_types::Value;
+
+use crate::core::{
+    audio::{engine::AudioEngine, interpreter::driver::execute_audio_block},
+    parser::statement::Statement,
+    store::global::GlobalStore,
+};
+use devalang_types::store::{FunctionTable, VariableTable};
+
+pub fn interprete_loop_statement(
+    stmt: &Statement,
+    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,
+) -> (f32, f32) {
+    if let Value::Map(loop_value) = &stmt.value {
+        // Foreach form: { foreach: Identifier(name), array: Array([...]), body: Block }
+        if let (
+            Some(Value::Identifier(var_name)),
+            Some(Value::Array(items)),
+            Some(Value::Block(loop_body)),
+        ) = (
+            loop_value.get("foreach"),
+            loop_value.get("array"),
+            loop_value.get("body"),
+        ) {
+            let engine = audio_engine;
+            let mut cur_time = cursor_time;
+            let mut max_time = max_end_time;
+
+            for item in items {
+                let mut scoped_vars = variable_table.clone();
+                scoped_vars.set(var_name.clone(), item.clone());
+
+                let (block_end_time, new_cursor) = execute_audio_block(
+                    engine,
+                    global_store,
+                    scoped_vars,
+                    functions_table.clone(),
+                    loop_body,
+                    base_bpm,
+                    base_duration,
+                    max_time,
+                    cur_time,
+                );
+
+                cur_time = new_cursor.max(block_end_time);
+                max_time = max_time.max(cur_time);
+            }
+
+            return (max_time, cur_time);
+        }
+
+        let loop_count = match loop_value.get("iterator") {
+            Some(Value::Number(n)) => *n as usize,
+            Some(Value::Identifier(ident)) => {
+                if let Some(Value::Number(n)) = variable_table.get(ident) {
+                    *n as usize
+                } else {
+                    eprintln!("❌ Loop iterator must be a number, found: {:?}", ident);
+                    return (max_end_time, cursor_time);
+                }
+            }
+            _ => {
+                eprintln!(
+                    "❌ Loop iterator must be a number, found: {:?}",
+                    loop_value.get("iterator")
+                );
+                return (max_end_time, cursor_time);
+            }
+        };
+
+        let loop_body = match loop_value.get("body") {
+            Some(Value::Block(body)) => body.clone(),
+            _ => {
+                eprintln!(
+                    "❌ Loop body must be a block, found: {:?}",
+                    loop_value.get("body")
+                );
+                return (max_end_time, cursor_time);
+            }
+        };
+
+        let engine = audio_engine;
+        let mut cur_time = cursor_time;
+        let mut max_time = max_end_time;
+
+        for _ in 0..loop_count {
+            let (block_end_time, new_cursor) = execute_audio_block(
+                engine,
+                global_store,
+                variable_table.clone(),
+                functions_table.clone(),
+                &loop_body,
+                base_bpm,
+                base_duration,
+                max_time,
+                cur_time,
+            );
+
+            cur_time = new_cursor.max(block_end_time);
+            max_time = max_time.max(cur_time);
+        }
+
+        return (max_time, cur_time);
+    }
+
+    eprintln!("❌ Loop statement value is not a map");
+    (max_end_time, cursor_time)
+}

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

@@ -71,7 +71,22 @@ pub fn interprete_spawn_statement(
 
         // 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 {
+            // Support Value::String(pattern) or Value::Map({ pattern: "..", swing: .., humanize: .. })
+            let mut pat_opt: Option<String> = None;
+            let mut opts_map: Option<std::collections::HashMap<String, Value>> = None;
+
+            match &pattern_stmt.value {
+                Value::String(s) => pat_opt = Some(s.clone()),
+                Value::Map(m) => {
+                    if let Some(Value::String(s)) = m.get("pattern") {
+                        pat_opt = Some(s.clone());
+                    }
+                    opts_map = Some(m.clone());
+                }
+                _ => {}
+            }
+
+            if let Some(pat) = pat_opt {
                 let mut target_entity = name.clone();
                 if let StatementKind::Pattern { name: _n, target } = &pattern_stmt.kind {
                     if let Some(t) = target {
@@ -97,6 +112,18 @@ pub fn interprete_spawn_statement(
                 let total_bar = 4.0 * base_duration;
                 let step_duration = total_bar / step_count;
 
+                // extract optional swing/humanize from pattern_stmt.value
+                let mut swing: f32 = 0.0;
+                let mut humanize: f32 = 0.0;
+                if let Value::Map(m) = &pattern_stmt.value {
+                    if let Some(Value::Number(s)) = m.get("swing") {
+                        swing = *s;
+                    }
+                    if let Some(Value::Number(h)) = m.get("humanize") {
+                        humanize = *h;
+                    }
+                }
+
                 let mut updated_max = max_end_time;
 
                 for (i, ch) in pattern_str.chars().enumerate() {
@@ -104,7 +131,29 @@ pub fn interprete_spawn_statement(
                         continue;
                     }
 
-                    let event_time = cursor_time + (i as f32) * step_duration;
+                    // Apply swing: shift every other step by +/- swing*step_duration
+                    let mut event_time = cursor_time + (i as f32) * step_duration;
+                    if swing.abs() > 0.0001 {
+                        // swing applies to off-beats: shift odd steps forward, even steps back
+                        if i % 2 == 1 {
+                            event_time += swing * step_duration;
+                        } else {
+                            event_time -= swing * step_duration;
+                        }
+                    }
+
+                    // Apply humanize: small random jitter in [-humanize*step_duration/2, +...]
+                    if humanize.abs() > 0.0001 {
+                        let jitter_range = humanize * step_duration;
+                        // lightweight RNG using a simple hash to avoid adding rand dependency
+                        let seed = (audio_engine.module_name.len() + i) as u64
+                            + (event_time.to_bits() as u64);
+                        let mut x = seed.wrapping_mul(0x9E3779B97F4A7C15).rotate_left(13);
+                        x ^= x >> 7;
+                        let r = (x as i64 % 1000) as f32 / 1000.0; // [0,1)
+                        let jitter = (r * 2.0 - 1.0) * jitter_range / 2.0;
+                        event_time += jitter;
+                    }
 
                     let mut trigger_val = Value::String(target_entity.clone());
                     if let Some(val) = variable_table.variables.get(&target_entity) {