@devaloop/devalang 0.0.1-alpha.7 → 0.0.1-alpha.8

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "devalang"
-version = "0.0.1-alpha.7"
+version = "0.0.1-alpha.8"
 authors = ["Devaloop <contact@devaloop.com>"]
 description = "Write music like code. Devalang is a domain-specific language (DSL) for sound designers and music hackers. Compose, automate, and control sound — in plain text."
 license = "MIT"

package/README.md

@@ -18,7 +18,7 @@
 
 ## 🎼 Devalang, by **Devaloop Labs**
 
-🎶 Compose music with code — simple, structured, sonic.
+🎶 Compose music with code — structured, expressive, and fast.
 
 Devalang is a tiny domain-specific language (DSL) for music makers, sound designers, and audio hackers.
 Compose loops, control samples, render and play audio — all in clean, readable text.
@@ -27,11 +27,13 @@ Compose loops, control samples, render and play audio — all in clean, readable
 
 From studio sketches to live sets, Devalang gives you rhythmic control — with the elegance of code.
 
-> 🚧 **v0.0.1-alpha.5 Notice** 🚧
+> 🚧 **v0.0.1-alpha.8 Notice** 🚧
 >
 > NEW: Devalang VSCode extension is now available !
 > [Get it here](https://marketplace.visualstudio.com/items?itemName=devaloop.devalang-vscode).
 >
+> NEW: Devalang supports conditional statements (`if`, `else`, `else if`) for more dynamic compositions !
+>
 > Currently, Devalang CLI is only available for **Windows**.  
 > Linux and macOS binaries will be added in future releases via cross-platform builds.
 
@@ -45,6 +47,15 @@ From studio sketches to live sets, Devalang gives you rhythmic control — with
 - [🎨 Prettier Plugin](https://www.npmjs.com/package/@devaloop/prettier-plugin-devalang)
 - [🌐 Project Website](https://devalang.com)
 
+## ❓ Why Devalang?
+
+- 🎹 Prototype audio ideas without opening a DAW
+- 💻 Integrate sound into code-based workflows
+- 🎛️ Control audio parameters through readable syntax
+- 🧪 Build musical logic with variables and conditions
+
+> Producer, coder, or both — Devalang gives you musical structure, instantly.
+
 ## 🚀 Features
 
 - 🎵 **Audio Engine**: Integrated audio playback and rendering
@@ -53,6 +64,8 @@ From studio sketches to live sets, Devalang gives you rhythmic control — with
 - 🔢 **Basic data types**: strings, numbers, booleans, maps, arrays
 - 👁️ **Watch mode** for `build`, `check` and `play` commands
 - 📂 **Project templates** for quick setup
+- 🎛️ **Custom samples**: easily load and trigger your own audio files
+- 🔄 **Looping and grouping**: create complex patterns with ease
 
 ## 📆 Installation
 
@@ -63,13 +76,13 @@ From studio sketches to live sets, Devalang gives you rhythmic control — with
 Install the package globally (NPM)
 
 ```bash
-npm install -g @devaloop/devalang
+npm install -g @devaloop/devalang@latest
 ```
 
 Usage without install (NPX)
 
 ```bash
-npx @devaloop/devalang <command>
+npx @devaloop/devalang@latest
 ```
 
 ### For contributors
@@ -78,10 +91,11 @@ npx @devaloop/devalang <command>
 > - ⚠️ Requires [Rust 1.70+](https://www.rust-lang.org/learn/get-started#installing-rust)
 
 ```bash
-> git clone https://github.com/devaloop-labs/devalang.git
-> cd devalang
-> npm install
-> cargo install --path .
+git clone https://github.com/devaloop-labs/devalang.git
+
+cd devalang
+
+npm install
 ```
 
 Development usage (you can customize arguments in package.json)
@@ -89,6 +103,7 @@ Development usage (you can customize arguments in package.json)
 ```bash
 # For syntax checking test
 npm run rust:dev:check
+
 # For building test
 npm run rust:dev:build
 ```
@@ -182,9 +197,12 @@ group myGroup:
 call myGroup
 
 # Will be executed in parallel (concurrently)
+# ⚠️ Note: `spawn` runs the entire group in parallel, but the group’s internal logic remains sequential unless it uses `spawn` internally.
 # spawn myGroup
 ```
 
+> 🧠 Note: `call` and `spawn` only work with `group` blocks. They do not apply to individual samples or other statements.
+
 ```deva
 # variables.deva
 
@@ -197,14 +215,15 @@ let kickDuration = 500
 
 ## 🧯 Known issues
 
-- No support yet for `if`, `else`, `else if`, `pattern`, `function`, ... statements
+- No smart modules yet, all groups, variables, and samples must be explicitly imported where used
+- No support yet for `pattern`, `function`, ... statements
 - No support yet for cross-platform builds (Linux, macOS)
 
 ## 🧪 Roadmap Highlights
 
 For more info, see [docs/ROADMAP.md](./docs/ROADMAP.md)
 
-- ⏳ Other statements (e.g `if`, `function`, ...)
+- ⏳ Other statements (e.g `function`, `pattern`, ...)
 - ⏳ Cross-platform support (Linux, macOS)
 - ⏳ More built-in instruments (e.g. snare, hi-hat, etc.)
 

package/docs/CHANGELOG.md

@@ -4,11 +4,31 @@
 
 # Changelog
 
-## Version 0.0.1-alpha.6 (2025-07-11)
+## Version 0.0.1-alpha.8 (2025-07-12)
+
+### Syntax
+
+- Implemented `if` directive to conditionally execute blocks of code.
+- Implemented `else` directive to provide an alternative block of code when the `if` condition is not met.
+- Implemented `else if` directive to provide additional conditions for the `if` directive.
+
+### Core Components
+
+- Implemented evaluator for audio statements, to execute conditional statements.
+- Fixed `group` resolution and export issues.
+- Implemented `Global Store` debugger to inspect variables by module for build command.
+- Organized `TokenKind` and `StatementKind` enums for better clarity and maintainability.
+- Refactored audio interpreter to handle the new syntax and directives.
+- Refactored lexer to handle new directives and improve tokenization.
+- Refactored parser to handle new directives and improve parsing logic.
+- Added support for `call` and `spawn` execution of imported groups.
+- Enforced scoped resolution of groups in `spawn` and `call` (must be imported in current module).
+
+## Version 0.0.1-alpha.7 (2025-07-11)
 
 ## Examples
 
-- Added example for `group` directive in `examples/group.devalang`.
+- Added examples in `examples` folder (group, loop, variables, index).
 
 ## Structure
 

package/docs/ROADMAP.md

@@ -24,8 +24,8 @@ Devalang is a work in progress. Here’s what we’re planning next:
 
 ## Upcoming
 
+- ⏳ **Smart modules**: Let Devalang detect and use groups, samples, and variables without needing to import them manually.
 - ⏳ **VSCode extension**: Create a VSCode extension for syntax highlighting and code completion.
-- ⏳ **Other statements**: Implement `if`, `else`, and other control structures.
-- ⏳ **Pattern and group statements**: Add support for `@pattern` and `@group` to organize code.
+- ⏳ **Other statements**: Implement `pattern`, `function`, and other control structures.
 - ⏳ **Functions**: Add support for defining and calling functions.
 - ⏳ **Testing**: Expand test coverage for all features.

package/docs/SYNTAX.md

@@ -58,7 +58,7 @@ let boolean = false
 Maps are key-value pairs defined using curly braces. Keys are strings, and values can be of any type (string, number, boolean, map, or array).
 
 ```deva
-let map = {myKey: 99}
+let map = { myKey: 99 }
 ```
 
 ### Array
@@ -93,13 +93,17 @@ bank 808
 
 Modules can be imported and exported to share variables between different files.
 
+> ⚠️ The import/export system is still experimental and may change in the future.
+>
+> You must explicitly declare imports and exports in each file — Devalang does not automatically detect or resolve them.
+
 Exporting variables from a module :
 
 ```deva
 # exported.deva
 
 let exportedIterator = 10
-let exportedParams = {drive: 50, decay: 30}
+let exportedParams = { drive: 50, decay: 30 }
 
 @export { exportedIterator, exportedParams }
 ```
@@ -115,7 +119,7 @@ loop exportedIterator:
     .kick auto exportedParams
 ```
 
-### Triggers
+### Loading Samples
 
 You can load your own samples and use them in your music.
 
@@ -129,7 +133,7 @@ Trigger usage : `.<name> <duration> <params>`
 .mySample auto {reverb: 50, drive: 25}
 ```
 
-### Let variables
+### Variables
 
 Variables are defined using the `let` keyword, followed by the variable name and its value. The value can be of any type (string, number, boolean, map, or array).
 
@@ -137,7 +141,7 @@ Variables are defined using the `let` keyword, followed by the variable name and
 let number = 0
 let boolean = true
 let string = "string"
-let map = {myKey: 200}
+let map = { myKey: 200 }
 let array = [0, 1, 2]
 ```
 
@@ -154,14 +158,40 @@ loop 10:
 
 Groups are defined using the `group` keyword, followed by the group name. The body of the group is indented.
 
+Groups allow you to organize your code into reusable blocks. They can be called or spawned later in the code.
+
 ```deva
 group myGroup:
     # ...
 ```
 
+### Conditions
+
+Conditions are defined using the `if` keyword, followed by a condition. The body of the condition is indented.
+
+```deva
+if myCondition:
+    # ...
+```
+
+You can also use `else` and `else if` for alternative branches:
+
+```deva
+if myCondition:
+    # ...
+else if anotherCondition:
+    # ...
+else:
+    # ...
+```
+
 ### Calling Groups (Sequential Execution)
 
-Groups can be called using the `call` keyword, which executes the group in sequence.
+Groups can be called using the `call` keyword, which executes only the group in sequence.
+
+> ⚠️ `call` only works on `group` declarations. It does not apply to other statements.
+
+This executes the entire group in the current execution thread, following a sequential order.
 
 ```deva
 call myGroup
@@ -169,7 +199,11 @@ call myGroup
 
 ### Spawning Groups (Parallel Execution)
 
-Groups can be spawned using the `spawn` keyword, which executes the group in parallel.
+Groups can be spawned using the `spawn` keyword, which executes only the group in parallel.
+
+> ⚠️ spawn also only works on group declarations. It does not make the group’s content parallel unless it explicitly uses spawn inside.
+
+This runs the entire group in a separate execution thread, allowing it to play alongside other actions.
 
 ```deva
 spawn myGroup

package/docs/TODO.md

@@ -54,9 +54,9 @@ This is a list of tasks and features to be implemented in Devalang. Note that th
 - [x] bank
 - [x] loop
 - [x] let
-- [ ] if
-- [ ] else
-- [ ] else if
+- [x] if
+- [x] else
+- [x] else if
 
 ## Triggers
 

package/examples/condition.deva

@@ -0,0 +1,24 @@
+# This file demonstrates the use of conditional blocks in Devalang.
+
+@import { myGroup } from "./examples/group.deva"
+
+@load "./examples/samples/kick-808.wav" as kickCustom
+@load "./examples/samples/hat-808.wav" as hatCustom
+
+group conditionBlock:
+    if tempo > 120:
+        # Will be executed if the condition is true
+        .kickCustom
+    else if tempo > 155:
+        # Will be executed if the condition is false
+        .hatCustom
+    else:
+        # Following lines will be executed if the condition is neither true or false
+        
+        # This will call myGroup sequentially (in the main thread)
+        call myGroup
+
+        # This will spawn a group in parallel to the main thread (kick + hat simultaneously)
+        # spawn myGroup
+
+@export { conditionBlock }

package/examples/index.deva

@@ -1,8 +1,10 @@
 # This file demonstrates the use of main features in Devalang.
 
 @import { duration, default_bank, params, loopCount, tempo } from "./examples/variables.deva"
+@import { conditionBlock } from "./examples/condition.deva"
 @import { myGroup } from "./examples/group.deva"
 
+
 @load "./examples/samples/kick-808.wav" as kickCustom
 @load "./examples/samples/hat-808.wav" as hatCustom
 
@@ -10,8 +12,5 @@ bpm tempo
 
 bank default_bank
 
-# Will be executed line by line (sequentially)
-call myGroup
-
-# Will be executed in parallel (concurrently)
-# spawn myGroup
+# This will call the group sequentially (line by line)
+call conditionBlock

package/examples/variables.deva

@@ -4,6 +4,6 @@ let duration = auto
 let default_bank = 808
 let params = {decay:10, delay:30}
 let loopCount = 5
-let tempo = 155
+let tempo = 115
 
 @export { duration, default_bank, params, loopCount, tempo }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@devaloop/devalang",
   "private": false,
-  "version": "0.0.1-alpha.7",
+  "version": "0.0.1-alpha.8",
   "description": "Write music like code. Devalang is a domain-specific language (DSL) for sound designers and music hackers. Compose, automate, and control sound — in plain text.",
   "main": "out-tsc/index.js",
   "bin": {

package/project-version.json

@@ -1,6 +1,6 @@
 {
-  "version": "0.0.1-alpha.7",
+  "version": "0.0.1-alpha.8",
   "channel": "alpha",
-  "lastCommit": "81db490b7d9cc92f0512b49cf3dbaeb74cf57de1",
-  "build": 6
+  "lastCommit": "fdb440173acc82227067864903aabc83e1d1570c",
+  "build": 7
 }

package/rust/cli/build.rs

@@ -2,7 +2,11 @@ use crate::{
     config::Config,
     core::{
         builder::Builder,
-        debugger::{ lexer::write_lexer_log_file, preprocessor::write_preprocessor_log_file },
+        debugger::{
+            lexer::write_lexer_log_file,
+            preprocessor::write_preprocessor_log_file,
+            store::write_store_log_file,
+        },
         preprocessor::loader::ModuleLoader,
         store::global::GlobalStore,
         utils::path::{ find_entry_file, normalize_path },
@@ -113,6 +117,7 @@ fn begin_build(entry: String, output: String) {
         "resolved_statements.log",
         modules_statements.clone()
     );
+    write_store_log_file(&normalized_output_dir, "global_store.log", global_store.modules.clone());
 
     // SECTION Building AST and Audio
     let builder = Builder::new();

package/rust/core/audio/evaluator.rs

@@ -0,0 +1,31 @@
+use crate::core::{ shared::value::Value, store::variable::VariableTable };
+
+pub fn evaluate_condition_string(expr: &str, vars: &VariableTable) -> bool {
+    let tokens: Vec<&str> = expr.split_whitespace().collect();
+    if tokens.len() != 3 {
+        return false;
+    }
+
+    let left = tokens[0];
+    let op = tokens[1];
+    let right = tokens[2];
+
+    let left_val = match vars.get(left) {
+        Some(Value::Number(n)) => *n,
+        _ => {
+            return false;
+        }
+    };
+
+    let right_val: f32 = right.parse().unwrap_or(0.0);
+
+    match op {
+        ">" => left_val > right_val,
+        "<" => left_val < right_val,
+        ">=" => left_val >= right_val,
+        "<=" => left_val <= right_val,
+        "==" => (left_val - right_val).abs() < f32::EPSILON,
+        "!=" => (left_val - right_val).abs() > f32::EPSILON,
+        _ => false,
+    }
+}

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

@@ -0,0 +1,42 @@
+use crate::core::{
+    audio::{ engine::AudioEngine, interpreter::{ driver::execute_audio_block } },
+    parser::statement::{ Statement, StatementKind },
+    shared::{ duration::Duration, value::Value },
+    store::variable::VariableTable,
+};
+
+pub fn interprete_call_statement(
+    stmt: &Statement,
+    audio_engine: AudioEngine,
+    variable_table: VariableTable,
+    base_bpm: f32,
+    base_duration: f32,
+    max_end_time: f32,
+    cursor_time: f32
+) -> (AudioEngine, f32, f32) {
+    if let Value::String(identifier) = &stmt.value {
+        if let Some(Value::Map(map)) = variable_table.clone().get(identifier) {
+            if let Some(Value::Block(block)) = map.get("body") {
+                let (eng, _, end_time) = execute_audio_block(
+                    audio_engine,
+                    variable_table,
+                    block.clone(),
+                    base_bpm,
+                    base_duration,
+                    max_end_time,
+                    cursor_time
+                );
+
+                return (eng, max_end_time.max(end_time), end_time);
+            } else {
+                eprintln!("❌ 'body' must be a block");
+            }
+        } else {
+            eprintln!("❌ Call target '{}' not found or invalid", identifier);
+        }
+    } else {
+        eprintln!("❌ Invalid call statement: expected string identifier");
+    }
+
+    (audio_engine, max_end_time, cursor_time)
+}

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

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