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

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "devalang"
-version = "0.0.1-alpha.5"
+version = "0.0.1-alpha.7"
 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

@@ -16,7 +16,6 @@
 
 [![VSCode Extension](https://img.shields.io/visual-studio-marketplace/v/devaloop.devalang-vscode?label=VSCode%20Extension)](https://marketplace.visualstudio.com/items?itemName=devaloop.devalang-vscode)
 
-
 ## 🎼 Devalang, by **Devaloop Labs**
 
 🎶 Compose music with code — simple, structured, sonic.
@@ -167,13 +166,27 @@ 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 kick for the duration of the kickDuration variable with reverb and drive effects
+    # 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 in parallel (concurrently)
+# spawn myGroup
 ```
 
 ```deva
-# global.deva
+# variables.deva
 
 let globalBpm = 120
 let globalBank = 808
@@ -184,15 +197,14 @@ let kickDuration = 500
 
 ## 🧯 Known issues
 
-- No support yet for `if`, `else`, `else if` statements
-- No support yet for `@group`, `@pattern`, `@function` statements
+- No support yet for `if`, `else`, `else if`, `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`, `@group`, ...)
+- ⏳ Other statements (e.g `if`, `function`, ...)
 - ⏳ Cross-platform support (Linux, macOS)
 - ⏳ More built-in instruments (e.g. snare, hi-hat, etc.)
 

package/docs/CHANGELOG.md

@@ -4,6 +4,25 @@
 
 # Changelog
 
+## Version 0.0.1-alpha.6 (2025-07-11)
+
+## Examples
+
+- Added example for `group` directive in `examples/group.devalang`.
+
+## Structure
+
+- Moved `rust/audio` folder to `rust/core/audio` to better organize the project structure.
+
+### Core Components
+
+- Implemented `group` directive to define groups of sounds.
+- Implemented `call` directive to call a group of sounds.
+- Implemented `spawn` directive to spawn a group of sounds in parallel.
+- Implemented `sleep` directive to pause execution for a specified duration.
+- Patched line and column tracking in the lexer to ensure correct indentation handling.
+- Patched string lexing advancing to handle first character correctly.
+
 ## Version 0.0.1-alpha.5 (2025-07-05)
 
 ### Syntax

package/docs/SYNTAX.md

@@ -17,6 +17,18 @@ The engine uses indentation to define blocks, similar to Python. Each block must
 <details>
 <summary>Show available types</summary>
 
+### Duration
+
+Duration is defined using a number. It represents the length of a sound in milliseconds.
+
+```deva
+let duration = 1000
+```
+
+Will play a sound for 1000 milliseconds (1 second).
+
+NOTE: Other time units like seconds or beats are not supported yet, but will be in the future.
+
 ### String
 
 Strings are defined using double quotes.
@@ -103,22 +115,13 @@ loop exportedIterator:
     .kick auto exportedParams
 ```
 
-### Built-in triggers
+### Triggers
 
-Usage : `.<trigger-name> <duration> <effects-map>`
+You can load your own samples and use them in your music.
 
-Other triggers will be added in future releases (e.g. `.snare`, `.hihat`, `.tom`, `.clap`, `.crash`, `.ride`, `.synth`, `.bass`, `.pad`).
-You can also create custom triggers using the `@load` directive.
+Load usage : `@load <path> as <name>`
 
-```deva
-.kick
-.kick 1/4
-.kick auto {reverb: 50, decay: 30}
-```
-
-### Custom triggers
-
-Same usage as built-in triggers, but with custom audio files or effects.
+Trigger usage : `.<name> <duration> <params>`
 
 ```deva
 @load "./path/to/instrument.mp3" as mySample
@@ -138,7 +141,7 @@ let map = {myKey: 200}
 let array = [0, 1, 2]
 ```
 
-### Basic loops
+### Loops
 
 Loops are defined using the `loop` keyword, followed by the number of iterations. The body of the loop is indented.
 
@@ -146,3 +149,28 @@ Loops are defined using the `loop` keyword, followed by the number of iterations
 loop 10:
     # ...
 ```
+
+### Groups
+
+Groups are defined using the `group` keyword, followed by the group name. The body of the group is indented.
+
+```deva
+group myGroup:
+    # ...
+```
+
+### Calling Groups (Sequential Execution)
+
+Groups can be called using the `call` keyword, which executes the group in sequence.
+
+```deva
+call myGroup
+```
+
+### Spawning Groups (Parallel Execution)
+
+Groups can be spawned using the `spawn` keyword, which executes the group in parallel.
+
+```deva
+spawn myGroup
+```

package/docs/TODO.md

@@ -42,11 +42,14 @@ This is a list of tasks and features to be implemented in Devalang. Note that th
 - [x] #
 - [x] @import
 - [x] @export
-- [ ] @group
-- [ ] @pattern
-- [ ] @function
 - [x] @load
 - [ ] @include
+- [ ] function
+- [ ] pattern
+- [x] group
+- [x] call
+- [x] spawn
+- [x] sleep
 - [x] bpm
 - [x] bank
 - [x] loop
@@ -62,8 +65,6 @@ This is a list of tasks and features to be implemented in Devalang. Note that th
 
 ## Other TODOs
 
-- [x] Implement a more robust error handling system
-- [x] Replace eprintln & println with `log_message` function
-- [x] Implement a more comprehensive logging system
-- [ ] Add unit tests for all core components
-- [ ] Comment all core components
+- [ ] Patch path handling to support relative paths
+- [ ] Comment all core components
+- [ ] Add unit tests for all core components

package/examples/group.deva

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

package/examples/index.deva

@@ -1,4 +1,7 @@
-@import { duration, default_bank, params, loopCount, tempo } from "./examples/exported.deva"
+# 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"
 
 @load "./examples/samples/kick-808.wav" as kickCustom
 @load "./examples/samples/hat-808.wav" as hatCustom
@@ -7,11 +10,8 @@ bpm tempo
 
 bank default_bank
 
-loop loopCount:
-    .kickCustom duration params
-
-    # Uncomment the next line (.hat) while executing "play" command 
-    # with `--repeat` option to see magic happen !
+# Will be executed line by line (sequentially)
+call myGroup
 
-    # .hatCustom duration params
-    
+# Will be executed in parallel (concurrently)
+# spawn myGroup

package/examples/loop.deva

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

package/examples/variables.deva

@@ -0,0 +1,9 @@
+# This file only exports variables for use in other files.
+
+let duration = auto
+let default_bank = 808
+let params = {decay:10, delay:30}
+let loopCount = 5
+let tempo = 155
+
+@export { duration, default_bank, params, loopCount, tempo }

package/package.json

@@ -1,44 +1,44 @@
-{
-  "name": "@devaloop/devalang",
-  "private": false,
-  "version": "0.0.1-alpha.5",
-  "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": {
-    "devalang": "./out-tsc/bin/index.js"
-  },
-  "scripts": {
-    "prepublish": "cargo build --release && npm run script:postbuild",
-    "rust:dev:build": "cargo run build --entry examples --output output",
-    "rust:dev:check": "cargo run check --entry examples --output output",
-    "rust:wasm:web": "wasm-pack build --target=web --no-default-features",
-    "rust:wasm:node": "wasm-pack build --target=nodejs --no-default-features",
-    "script:postbuild": "tsc && node out-tsc/scripts/postbuild.js",
-    "script:version:bump": "tsc && node out-tsc/scripts/version/index.js"
-  },
-  "homepage": "https://devalang.com",
-  "keywords": [
-    "devalang",
-    "music",
-    "sound",
-    "domain-specific language",
-    "dsl",
-    "programming language",
-    "sound design",
-    "music hacking",
-    "audio",
-    "synthesis",
-    "scripting",
-    "sound synthesis",
-    "music programming"
-  ],
-  "author": "Devaloop",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/devaloop-labs/devalang.git"
-  },
-  "dependencies": {
-    "@types/node": "^24.0.3"
-  }
-}
+{
+  "name": "@devaloop/devalang",
+  "private": false,
+  "version": "0.0.1-alpha.7",
+  "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": {
+    "devalang": "./out-tsc/bin/index.js"
+  },
+  "scripts": {
+    "prepublish": "cargo build --release && npm run script:postbuild",
+    "rust:dev:build": "cargo run build --entry examples --output output",
+    "rust:dev:check": "cargo run check --entry examples --output output",
+    "rust:wasm:web": "wasm-pack build --target=web --no-default-features",
+    "rust:wasm:node": "wasm-pack build --target=nodejs --no-default-features",
+    "script:postbuild": "tsc && node out-tsc/scripts/postbuild.js",
+    "script:version:bump": "tsc && node out-tsc/scripts/version/index.js"
+  },
+  "homepage": "https://devalang.com",
+  "keywords": [
+    "devalang",
+    "music",
+    "sound",
+    "domain-specific language",
+    "dsl",
+    "programming language",
+    "sound design",
+    "music hacking",
+    "audio",
+    "synthesis",
+    "scripting",
+    "sound synthesis",
+    "music programming"
+  ],
+  "author": "Devaloop",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/devaloop-labs/devalang.git"
+  },
+  "dependencies": {
+    "@types/node": "^24.0.3"
+  }
+}

package/project-version.json

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

package/rust/cli/build.rs

@@ -1,5 +1,4 @@
 use crate::{
-    audio::render::render_audio_with_modules,
     config::Config,
     core::{
         builder::Builder,

package/rust/cli/play.rs

@@ -1,5 +1,4 @@
 use crate::{
-    audio::player::AudioPlayer,
     config::Config,
     core::{
         builder::Builder,
@@ -23,6 +22,8 @@ pub fn handle_play_command(
     watch: bool,
     repeat: bool
 ) {
+    use crate::core::audio::player::AudioPlayer;
+
     let logger = Logger::new();
 
     let entry_path = entry