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

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "devalang"
-version = "0.0.1-alpha.7"
+version = "0.0.1-alpha.9"
 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.9 Notice** 🚧
 >
 > NEW: Devalang VSCode extension is now available !
 > [Get it here](https://marketplace.visualstudio.com/items?itemName=devaloop.devalang-vscode).
 >
+> Includes synthesis, playback, and rendering features, but is still in early development.
+>
 > 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
 ```
@@ -166,25 +181,24 @@ bpm globalBpm
 bank globalBank
 # Will declare a custom instrument bank using the globalBank variable
 
-# Loops
-
 loop 5:
     .customKick kickDuration {reverb=50, drive=25}
     # Will play 5 times a custom sample for 500ms with reverb and overdrive effects
 
-# Groups
-
 group myGroup:
     .customKick kickDuration {reverb=50, drive=25}
     # Will play the same sample in a group, allowing for more complex patterns
 
-# Will be executed line by line (sequentially)
 call myGroup
+# Will be executed line by line (sequentially)
 
-# Will be executed in parallel (concurrently)
 # spawn 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.
 ```
 
+> 🧠 Note: `call` and `spawn` only work with `group` blocks. They do not apply to individual samples or other statements.
+
 ```deva
 # variables.deva
 
@@ -197,14 +211,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,58 @@
 
 # Changelog
 
-## Version 0.0.1-alpha.6 (2025-07-11)
+## Version 0.0.1-alpha.9 (2025-07-14)
+
+### ✨ Syntax
+
+- Added support for `synth` directives to define synthesizer sounds directly in code  
+  → Example:
+
+  ```deva
+  let mySynth = synth sine
+  ```
+
+### 🧠 Core Engine
+
+- ✅ **Major refactor** of the resolution layer:
+
+  - `condition`, `loop`, `group`, `trigger`, `call`, `spawn`, and `driver` were fully rewritten
+  - Ensures **correct variable scoping**, **cross-module references**, and **imported symbol resolution**
+
+- ✅ Audio interpreter updated:
+  - `call` and `spawn` now execute correctly in parallel, preserving **temporal alignment** across groups
+
+### 🧩 Language Features
+
+- Improved `@import` behavior:
+  - Modules can now be imported using **relative paths only**
+  - No need for absolute or root-based imports
+
+## 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,20 @@
+# This file demonstrates the use of conditional blocks in Devalang.
+
+@import { duration, default_bank, params, loopCount, tempo } from "./variables.deva"
+@import { myGroup } from "./group.deva"
+
+@load "./samples/kick-808.wav" as kickCustom
+@load "./samples/hat-808.wav" as hatCustom
+
+group conditionBlock:
+    if tempo > 120:
+        # Will be executed if the condition is true
+        .kickCustom auto
+    else if tempo > 155:
+        # Will be executed if the condition is false
+        .hatCustom auto
+    else:
+        .kickCustom auto
+        .hatCustom auto
+
+@export { conditionBlock }

package/examples/group.deva

@@ -1,9 +1,9 @@
 # This file demonstrates the use of grouping in Devalang.
 
-@import { duration, default_bank, params, loopCount, tempo } from "./examples/variables.deva"
+@import { duration, default_bank, params, loopCount, tempo } from "./variables.deva"
 
-@load "./examples/samples/kick-808.wav" as kickCustom
-@load "./examples/samples/hat-808.wav" as hatCustom
+@load "./samples/kick-808.wav" as kickCustom
+@load "./samples/hat-808.wav" as hatCustom
 
 group myGroup:
     .kickCustom duration params

package/examples/index.deva

@@ -1,17 +1,18 @@
 # This file demonstrates the use of main features in Devalang.
 
-@import { duration, default_bank, params, loopCount, tempo } from "./examples/variables.deva"
-@import { myGroup } from "./examples/group.deva"
+@import { duration, default_bank, params, loopCount, tempo } from "./variables.deva"
+@import { myLead } from "./synth.deva"
+@import { myLoop } from "./loop.deva"
 
-@load "./examples/samples/kick-808.wav" as kickCustom
-@load "./examples/samples/hat-808.wav" as hatCustom
+@load "./samples/kick-808.wav" as kickCustom
+@load "./samples/hat-808.wav" as hatCustom
 
 bpm tempo
 
 bank default_bank
 
-# Will be executed line by line (sequentially)
-call myGroup
+group myTrack:
+    spawn myLoop
+    spawn myLead
 
-# Will be executed in parallel (concurrently)
-# spawn myGroup
+call myTrack

package/examples/loop.deva

@@ -1,15 +1,17 @@
 # This file demonstrates the use of a loop in Devalang.
 
-@import { duration, default_bank, params, loopCount, tempo } from "./examples/variables.deva"
+@import { duration, default_bank, params, loopCount, tempo } from "./variables.deva"
 
-@load "./examples/samples/kick-808.wav" as kickCustom
-@load "./examples/samples/hat-808.wav" as hatCustom
+@load "./samples/kick-808.wav" as kickCustom
+@load "./samples/hat-808.wav" as hatCustom
 
-loop loopCount:
-    .kickCustom duration params
+group myLoop:
+    loop loopCount:
+        .kickCustom duration params
 
-    # Uncomment the next line (.hat) while executing "play" command
-    # with `--repeat` option to see magic happen !
+        # Uncomment the next line (.hat) while executing "play" command
+        # with `--repeat` option to see magic happen !
 
-    .hatCustom duration params
+        .hatCustom duration params
 
+@export { myLoop }

package/examples/synth.deva

@@ -0,0 +1,14 @@
+# This file defines a simple synth lead using Devalang's syntax.
+
+group myLead:
+    let mySynth = synth sine
+    
+    mySynth -> note(C4, { duration: 400 })
+    mySynth -> note(G4, { duration: 400 })
+    mySynth -> note(E4, { duration: 600 })
+    mySynth -> note(A4, { duration: 400 })
+    mySynth -> note(F4, { duration: 800 })
+    mySynth -> note(D4, { duration: 400 })
+    mySynth -> note(B3, { duration: 600 })
+
+@export { myLead }

package/examples/variables.deva

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

package/out-tsc/scripts/version/fetch.js

@@ -16,19 +16,15 @@ exports.fetchVersion = void 0;
 const fs_1 = __importDefault(require("fs"));
 const child_process_1 = require("child_process");
 const fetchVersion = (projectVersionPath) => __awaiter(void 0, void 0, void 0, function* () {
-    // Lire le fichier
     const data = JSON.parse(fs_1.default.readFileSync(projectVersionPath, "utf-8"));
-    // Incrémenter le numéro de build
     data.build = (data.build || 0) + 1;
-    // Récupérer le dernier hash git
     try {
         const commit = (0, child_process_1.execSync)("git rev-parse HEAD").toString().trim();
         data.lastCommit = commit;
     }
     catch (err) {
-        console.warn("⚠️ Impossible de récupérer le hash git.");
+        console.warn("⚠️ Unable to fetch git commit hash. Ensure you are in a git repository.");
     }
-    // Écrire la mise à jour
     fs_1.default.writeFileSync(projectVersionPath, JSON.stringify(data, null, 2));
 });
 exports.fetchVersion = fetchVersion;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@devaloop/devalang",
   "private": false,
-  "version": "0.0.1-alpha.7",
+  "version": "0.0.1-alpha.9",
   "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.9",
   "channel": "alpha",
-  "lastCommit": "81db490b7d9cc92f0512b49cf3dbaeb74cf57de1",
-  "build": 6
+  "lastCommit": "61ab816a54275f2617ffd4327eb388ed822c36eb",
+  "build": 8
 }

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/engine.rs

@@ -2,7 +2,10 @@ use std::{ collections::HashMap, fs::File, io::BufReader };
 use hound::{ SampleFormat, WavSpec, WavWriter };
 use rodio::{ Decoder, Source };
 
-use crate::core::{ store::variable::VariableTable, utils::path::normalize_path };
+use crate::core::{
+    store::variable::VariableTable,
+    utils::path::{ normalize_path, resolve_relative_path },
+};
 
 const SAMPLE_RATE: u32 = 44100;
 const CHANNELS: u16 = 2;
@@ -12,14 +15,16 @@ pub struct AudioEngine {
     pub volume: f32,
     pub variables: VariableTable,
     pub buffer: Vec<i16>,
+    pub module_name: String,
 }
 
 impl AudioEngine {
-    pub fn new() -> Self {
+    pub fn new(module_name: String) -> Self {
         AudioEngine {
             volume: 1.0,
             buffer: vec![],
             variables: VariableTable::new(),
+            module_name,
         }
     }
 
@@ -32,14 +37,28 @@ impl AudioEngine {
         }
     }
 
-    pub fn set_duration(&mut self, duration_secs: f32) {
-        let mut total_samples = (duration_secs * (SAMPLE_RATE as f32) * (CHANNELS as f32)) as usize;
+    pub fn merge_with(&mut self, other: AudioEngine) {
+        if other.buffer.iter().all(|&s| s == 0) {
+            eprintln!("⚠️ Skipping merge: other buffer is silent");
+            return;
+        }
 
-        if total_samples % (CHANNELS as usize) != 0 {
-            total_samples += 1;
+        if self.buffer.iter().all(|&s| s == 0) {
+            self.buffer = other.buffer;
+            self.variables.variables.extend(other.variables.variables);
+            return;
         }
 
-        self.buffer.resize(total_samples, 0);
+        self.mix(&other);
+        self.variables.variables.extend(other.variables.variables);
+    }
+
+    pub fn set_duration(&mut self, duration_secs: f32) {
+        let total_samples = (duration_secs * (SAMPLE_RATE as f32) * (CHANNELS as f32)) as usize;
+
+        if self.buffer.len() < total_samples {
+            self.buffer.resize(total_samples, 0);
+        }
     }
 
     pub fn set_variables(&mut self, variables: VariableTable) {
@@ -72,18 +91,76 @@ impl AudioEngine {
         Ok(())
     }
 
-    pub fn insert(
+    pub fn insert_note(
+        &mut self,
+        waveform: String,
+        freq: f32,
+        amp: f32,
+        start_time_ms: f32,
+        duration_ms: f32
+    ) {
+        let sample_rate = SAMPLE_RATE as f32;
+        let channels = CHANNELS as usize;
+
+        let total_samples = ((duration_ms / 1000.0) * sample_rate) as usize;
+        let start_sample = ((start_time_ms / 1000.0) * sample_rate) as usize;
+        let amplitude = (i16::MAX as f32) * amp.clamp(0.0, 1.0);
+
+        let mut samples = Vec::with_capacity(total_samples);
+        let fade_len = (sample_rate * 0.01) as usize; // 10 ms fade
+
+        for i in 0..total_samples {
+            let t = ((start_sample + i) as f32) / sample_rate;
+            let phase = 2.0 * std::f32::consts::PI * freq * t;
+
+            let mut value = match waveform.as_str() {
+                "sine" => phase.sin(),
+                "square" => if phase.sin() >= 0.0 { 1.0 } else { -1.0 }
+                "saw" => 2.0 * (freq * t - (freq * t + 0.5).floor()),
+                "triangle" => (2.0 * (2.0 * (freq * t).fract() - 1.0)).abs() * 2.0 - 1.0,
+                _ => 0.0,
+            };
+
+            // Fade in/out
+            if i < fade_len {
+                value *= (i as f32) / (fade_len as f32);
+            } else if i >= total_samples - fade_len {
+                value *= ((total_samples - i) as f32) / (fade_len as f32);
+            }
+
+            samples.push((value * amplitude) as i16);
+        }
+
+        // Convert to stereo
+        let stereo_samples: Vec<i16> = samples
+            .iter()
+            .flat_map(|s| vec![*s, *s])
+            .collect();
+
+        let offset = start_sample * channels;
+        let required_len = offset + stereo_samples.len();
+
+        if self.buffer.len() < required_len {
+            self.buffer.resize(required_len, 0);
+        }
+
+        for (i, sample) in stereo_samples.iter().enumerate() {
+            if *sample != 0 {
+            }
+            self.buffer[offset + i] = self.buffer[offset + i].saturating_add(*sample);
+        }
+    }
+
+    pub fn insert_sample(
         &mut self,
         filepath: &str,
         time_secs: f32,
         dur_sec: f32,
         effects: Option<HashMap<String, f32>>
     ) {
-        let normalized_filepath = normalize_path(filepath);
+        let resolved = resolve_relative_path(&self.module_name.clone(), filepath);
 
-        let file = BufReader::new(
-            File::open(normalized_filepath).expect("Failed to open audio file")
-        );
+        let file = BufReader::new(File::open(resolved).expect("Failed to open audio file"));
         let decoder = Decoder::new(file).expect("Failed to decode audio file");
 
         // Mono or stereo reading possible here, we will duplicate in L/R