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

package/Cargo.toml

@@ -1,46 +1,46 @@
-[package]
-name = "devalang"
-version = "0.0.1-alpha.2"
-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"
-repository = "https://github.com/devaloop-labs/devalang"
-keywords = ["music", "dsl", "audio", "cli"]
-categories = ["command-line-utilities", "audio", "development-tools"]
-readme = "README.md"
-homepage = "https://devaloop.com"
-documentation = "https://docs.rs/devalang"
-edition = "2024"
-
-[[bin]]
-name = "devalang"
-path = "rust/main.rs"
-
-[lib]
-path = "rust/lib.rs"
-crate-type = ["cdylib"]
-
-[profile.release]
-opt-level = "s"
-
-[features]
-default = ["cli"]
-cli = ["crossterm"]
-
-[dependencies]
-clap = { version = "4.5", features = ["derive"] }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-rodio = "0.17"
-hound = "3.4.0"
-toml = "0.8"
-notify = "6.1"
-fs_extra = "1.3"
-include_dir = "0.7"
-wasm-bindgen = "0.2"
-serde-wasm-bindgen = "0.4"
-nom_locate = "4.0.0"
-chrono = "0.4"
-crossterm =  { version = "0.27", optional = true }
-indicatif = "0.17"
-inquire = "0.7.5"
+[package]
+name = "devalang"
+version = "0.0.1-alpha.3"
+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"
+repository = "https://github.com/devaloop-labs/devalang"
+keywords = ["music", "dsl", "audio", "cli"]
+categories = ["command-line-utilities", "audio", "development-tools"]
+readme = "README.md"
+homepage = "https://devaloop.com"
+documentation = "https://docs.rs/devalang"
+edition = "2024"
+
+[[bin]]
+name = "devalang"
+path = "rust/main.rs"
+
+[lib]
+path = "rust/lib.rs"
+crate-type = ["cdylib"]
+
+[profile.release]
+opt-level = "s"
+
+[features]
+default = ["cli"]
+cli = ["crossterm"]
+
+[dependencies]
+clap = { version = "4.5", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+rodio = "0.17"
+hound = "3.4.0"
+toml = "0.8"
+notify = "6.1"
+fs_extra = "1.3"
+include_dir = "0.7"
+wasm-bindgen = "0.2"
+serde-wasm-bindgen = "0.4"
+nom_locate = "4.0.0"
+chrono = "0.4"
+crossterm =  { version = "0.27", optional = true }
+indicatif = "0.17"
+inquire = "0.7.5"

package/README.md

@@ -30,7 +30,6 @@ From studio sketches to live sets, Devalang gives you rhythmic control — with
 >
 > You can parse code, generate the AST, and validate syntax — all essential building blocks for the upcoming audio engine.
 >
-> Currently, only `.kick` is included as a built-in trigger.
 > Custom instruments can be defined with `@load`, allowing any sound sample to be triggered with the same syntax.
 >
 > Currently, Devalang CLI is only available for **Windows**.  
@@ -84,7 +83,9 @@ Usage for development (feel free to change arguments in package.json)
 
 ```bash
 # For syntax checking test
-npm run rust:dev <command>
+npm run rust:dev:check
+# For building test
+npm run rust:dev:build
 ```
 
 ## ❔ Usage
@@ -105,13 +106,13 @@ Or use optional arguments to specify a directory name and a template
 devalang init --name <project-name> --template <template-name>
 ```
 
-### Checking syntax only and output debug files
+### Checking syntax only
 
 ```bash
 devalang check --entry <entry-directory> --output <output-directory> --watch
 ```
 
-### Building output file(s) (AST generation for the moment)
+### Building output files
 
 ```bash
 devalang build --entry <entry-directory> --output <output-directory> --watch
@@ -160,13 +161,13 @@ let kickDuration = 500
 - No support yet for Audio Engine
 - No support yet for `if`, `else`, `else if` statements
 - No support yet for `@group`, `@pattern`, `@function` statements
-- Nested loops and conditions may not be fully tested
+- No support yet for cross-platform builds (Linux, macOS)
 
 ## 🧪 Roadmap Highlights
 
 For more info, see [docs/ROADMAP.md](./docs/ROADMAP.md)
 
-- ⏳ Audio engine integration
+- ⏳ Audio engine integration (priority for alpha.4)
 - ⏳ Other statements (e.g `if`, `@group`, ...)
 - ⏳ Cross-platform support (Linux, macOS)
 - ⏳ More built-in instruments (e.g. snare, hi-hat, etc.)

package/docs/CHANGELOG.md

@@ -4,7 +4,15 @@
 
 # Changelog
 
-## Version 0.0.1-alpha.2 (2024-06-26)
+## Version 0.0.1-alpha.3 (2025-07-01)
+
+- /!\ Major refactor of the project structure and module system /!\
+- Refactored module system to support multiple modules and submodules.
+- Patched all directives to be compatible with the new project structure.
+- Prepared for the upcoming audio engine integration and sound rendering capabilities.
+- Updated documentation to reflect the new project structure and features.
+
+## Version 0.0.1-alpha.2 (2025-06-26)
 
 ### Commands
 
@@ -18,17 +26,14 @@
 
 - Implemented Config manager to handle configuration files.
   - Added support for `.devalang` configuration file as a TOML file.
-  - Added support for `--no-config` flag to disable configuration file usage.
 - Implemented File System watcher to monitor file changes.
 - Implemented Template manager to handle templates and their metadata.
-- Refactored Lexer to support new syntax elements and directives.
 
 ### Syntax
 
-- Added support for built-in triggers for `.snare`, `.hihat`, `.clap`, `.tom`, `.crash`, `.ride`.
-- Added support for custom triggers with `@load` using the syntax `.trigger-name`.
+- Added support for built-in triggers for `.snare`, `.hihat`, `.clap`, `.tom`, `.crash`, `.ride`, `.synth`, `.bass`, and `.pad`.
 
-## Version 0.0.1-alpha.1 (2024-06-25)
+## Version 0.0.1-alpha.1 (2025-06-25)
 
 ### Syntax
 

package/docs/ROADMAP.md

@@ -6,6 +6,8 @@
 
 Devalang is a work in progress. Here’s what we’re planning next:
 
+### Stable
+
 - ✅ **Basic syntax**: Implement the core syntax for Devalang, including data types and basic statements.
 - ✅ **Watch mode**: Add a watch mode to automatically rebuild on file changes.
 - ✅ **Module system**: Add support for importing and exporting variables between files using `@import` and `@export`.
@@ -18,10 +20,12 @@ Devalang is a work in progress. Here’s what we’re planning next:
 - ✅ **Let assignments**: Implement `let` assignments for storing reusable values.
 - ✅ **Sample loading**: Add `@load` assignment to load samples (.mp3, .wav) for use as values.
 
+### Upcoming
+
+- ⏳ **Audio engine**: Integrate the audio engine for sound playback. 
 - ⏳ **VSCode extension**: Create a VSCode extension for syntax highlighting and code completion.
 - ⏳ **WASM support**: Compile Devalang to WebAssembly for use in web applications.
 - ⏳ **Other statements**: Implement `if`, `else`, and other control structures.
 - ⏳ **Pattern and group statements**: Add support for `@pattern` and `@group` to organize code.
 - ⏳ **Functions**: Add support for defining and calling functions.
-- ⏳ **Audio engine**: Integrate the audio engine for sound playback.
 - ⏳ **Testing**: Expand test coverage for all features.

package/docs/TODO.md

@@ -31,7 +31,6 @@ This is a list of tasks and features to be implemented in Devalang. Note that th
 ## Core components
 
 - [ ] Audio Engine
-- [x] Configuration
 - [x] Lexer
 - [x] Parser
 - [x] Preprocessor
@@ -58,37 +57,13 @@ This is a list of tasks and features to be implemented in Devalang. Note that th
 
 ## Triggers
 
-### One-shot triggers
-
-- [x] .kick
-- [x] .snare
-- [x] .hihat
-- [x] .tom
-- [x] .clap
-- [x] .crash
-- [x] .ride
-
-### Instrument triggers
-
-- [ ] .guitar
-- [ ] .piano
-- [ ] .flute
-- [ ] .violin
-
-### Synth & effects triggers
-
-- [ ] .lead
-- [ ] .bass
-- [ ] .pad
-- [ ] .arp
-- [ ] .fx
-- [ ] .vocal
+- [x] Built-in triggers
+- [x] Custom triggers
 
 ## Other TODOs
 
-- [ ] Possibility to overload built-in triggers
-- [ ] Implement a more robust error handling system
-- [ ] Replace eprintln & println with `log_message` function
-- [ ] Implement a more comprehensive logging system
+- [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
+- [ ] Comment all core components

package/examples/exported.deva

@@ -1,7 +1,7 @@
 let duration = auto
 let default_bank = 808
 let params = {decay:10, delay:30}
-let loopCount = 15
+let loopCount = 5
 let tempo = 155
 
 @export { duration, default_bank, params, loopCount, tempo }

package/examples/index.deva

@@ -1,4 +1,5 @@
 @import { duration, default_bank, params, loopCount, tempo } from "./examples/exported.deva"
+
 @load "./examples/samples/kick-808.wav" as sample
 
 bpm tempo

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@devaloop/devalang",
   "private": false,
-  "version": "0.0.1-alpha.2",
+  "version": "0.0.1-alpha.3",
   "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": {
@@ -9,7 +9,6 @@
   },
   "scripts": {
     "prepublish": "cargo build --release && npm run script:postbuild",
-    "rust:dev": "cargo run",
     "rust:dev:build": "cargo run build --entry examples --output output",
     "rust:dev:check": "cargo run check --entry examples --output output",
     "script:postbuild": "tsc && node out-tsc/scripts/postbuild.js",

package/project-version.json

@@ -1,6 +1,6 @@
 {
-  "version": "0.0.1-alpha.2",
+  "version": "0.0.1-alpha.3",
   "channel": "alpha",
-  "lastCommit": "6f92a4421db96f45c6accd6607e09876c0735531",
+  "lastCommit": "850fd73787ae41844d6669017ee3d01699b2df3c",
   "build": 2
-}
+}

package/rust/cli/build.rs

@@ -1,23 +1,17 @@
-use std::{ thread, time::Duration };
-
 use crate::{
+    config::Config,
     core::{
-        builder::{ build_ast, write_ast_to_file },
-        debugger::Debugger,
-        preprocessor::module::load_all_modules,
-        types::config::DevalangConfig,
-    },
-    runner::executer::execute_statements,
-    utils::{
-        loader::with_spinner,
-        logger::log_message,
-        path::{ find_entry_file, normalize_path },
-        watcher::watch_directory,
+        builder::Builder,
+        preprocessor::loader::ModuleLoader,
+        store::global::GlobalStore,
+        utils::path::{ find_entry_file, normalize_path },
     },
+    utils::{ logger::{ LogLevel, Logger }, spinner::with_spinner, watcher::watch_directory },
 };
+use std::{ thread, time::Duration };
 
 pub fn handle_build_command(
-    config: Option<DevalangConfig>,
+    config: Option<Config>,
     entry: Option<String>,
     output: Option<String>,
     watch: bool
@@ -49,26 +43,51 @@ pub fn handle_build_command(
             .unwrap_or(false)
     };
 
+    let logger = Logger::new();
+
+    if fetched_entry.is_empty() {
+        logger.log_message(
+            LogLevel::Error,
+            "Entry path is not specified. Please provide a valid entry path."
+        );
+        std::process::exit(1);
+    }
+    if fetched_output.is_empty() {
+        logger.log_message(
+            LogLevel::Error,
+            "Output directory is not specified. Please provide a valid output directory."
+        );
+        std::process::exit(1);
+    }
+
     let entry_file = find_entry_file(&fetched_entry).unwrap_or_else(|| {
-        eprintln!("❌ index.deva not found in directory: {}", fetched_entry);
+        logger.log_message(
+            LogLevel::Error,
+            &format!("❌ index.deva not found in directory: {}", fetched_entry)
+        );
         std::process::exit(1);
     });
 
-    if watch == true {
-        log_message("Watch mode enabled, waiting for file changes...", "INFO");
+    // SECTION Begin build
+    if fetched_watch {
+        begin_build(entry_file.clone(), fetched_output.clone());
 
-        begin_build(entry_file.clone(), fetched_output.clone(), watch);
+        logger.log_message(
+            LogLevel::Watcher,
+            &format!("Watching for changes in '{}'...", fetched_entry)
+        );
 
         watch_directory(entry_file.clone(), move || {
-            log_message("File change detected, rebuilding...", "INFO");
-            begin_build(entry_file.clone(), fetched_output.clone(), watch);
+            logger.log_message(LogLevel::Watcher, "Detected changes, re-building...");
+
+            begin_build(entry_file.clone(), fetched_output.clone());
         }).unwrap();
     } else {
-        begin_build(entry_file.clone(), fetched_output.clone(), watch);
+        begin_build(entry_file.clone(), fetched_output.clone());
     }
 }
 
-fn begin_build(entry: String, output: String, watch: bool) {
+fn begin_build(entry: String, output: String) {
     let spinner = with_spinner("Building...", || {
         thread::sleep(Duration::from_millis(800));
     });
@@ -78,27 +97,25 @@ fn begin_build(entry: String, output: String, watch: bool) {
     let normalized_entry_file = normalize_path(&entry);
     let normalized_output_dir = normalize_path(&output);
 
-    let global_store = load_all_modules(&normalized_entry_file);
-
-    if let Some(module) = global_store.modules.get(&normalized_entry_file) {
-        let mut module_clone = module.clone();
+    let mut global_store = GlobalStore::new();
+    let module_loader = ModuleLoader::new(&normalized_entry_file, &normalized_output_dir);
 
-        let resolved_statements = execute_statements(&mut module_clone);
+    // SECTION Load
+    // NOTE: We use modules in the build command, so we need to load them
+    let modules = module_loader.load_all(&mut global_store);
 
-        let ast = build_ast(&resolved_statements);
+    // SECTION Build
+    let builder = Builder::new();
+    builder.build_ast(&modules);
 
-        let ast_dir = format!("{}/json", normalized_output_dir.clone());
-        write_ast_to_file(&ast, &ast_dir);
+    // TODO: Implement debugging
 
-        let debugger = Debugger::new(&module_clone);
-        let debug_dir = format!("{}/debug/", normalized_output_dir.clone());
-        debugger.write_files(debug_dir.as_str(), resolved_statements);
+    let success_message = format!(
+        "Build completed successfully in {:.2?}. Output files written to: '{}'",
+        duration.elapsed(),
+        normalized_output_dir
+    );
 
-        let success_message = format!(
-            "Build completed successfully in {:.2?}. Output files written to: '{}'",
-            duration.elapsed(),
-            normalized_output_dir
-        );
-        log_message(&success_message, "SUCCESS");
-    }
+    let logger = Logger::new();
+    logger.log_message(LogLevel::Success, &success_message);
 }

package/rust/cli/check.rs

@@ -1,29 +1,20 @@
-use std::{ thread, time::Duration };
-
 use crate::{
+    config::Config,
     core::{
-        debugger::Debugger,
-        preprocessor::module::load_all_modules,
-        types::{
-            config::{ DevalangConfig },
-            statement::{ StatementKind, StatementResolved, StatementResolvedValue },
-        },
-    },
-    runner::executer::execute_statements,
-    utils::{
-        loader::with_spinner,
-        logger::log_message,
-        path::{ find_entry_file, normalize_path },
-        watcher::watch_directory,
+        preprocessor::loader::ModuleLoader,
+        store::global::GlobalStore,
+        utils::path::{ find_entry_file, normalize_path },
     },
+    utils::{ logger::{ LogLevel, Logger }, spinner::with_spinner, watcher::watch_directory },
 };
+use std::{ thread, time::Duration };
 
 pub fn handle_check_command(
-    config: Option<DevalangConfig>,
+    config: Option<Config>,
     entry: Option<String>,
     output: Option<String>,
     watch: bool
-) -> () {
+) {
     let fetched_entry = if entry.is_none() {
         config
             .as_ref()
@@ -51,36 +42,51 @@ pub fn handle_check_command(
             .unwrap_or(false)
     };
 
+    let logger = Logger::new();
+
     if fetched_entry.is_empty() {
-        eprintln!("❌ Entry path is not specified. Please provide a valid entry path.");
+        logger.log_message(
+            LogLevel::Error,
+            "Entry path is not specified. Please provide a valid entry path."
+        );
         std::process::exit(1);
     }
-
     if fetched_output.is_empty() {
-        eprintln!("❌ Output directory is not specified. Please provide a valid output directory.");
+        logger.log_message(
+            LogLevel::Error,
+            "Output directory is not specified. Please provide a valid output directory."
+        );
         std::process::exit(1);
     }
 
     let entry_file = find_entry_file(&fetched_entry).unwrap_or_else(|| {
-        eprintln!("❌ index.deva not found in directory: {}", fetched_entry);
+        logger.log_message(
+            LogLevel::Error,
+            &format!("❌ index.deva not found in directory: {}", fetched_entry)
+        );
         std::process::exit(1);
     });
 
-    if fetched_watch.clone() == true {
-        log_message("Watch mode enabled, waiting for file changes...", "INFO");
+    // SECTION Begin check
+    if fetched_watch {
+        begin_check(entry_file.clone(), fetched_output.clone());
 
-        begin_check(entry_file.clone(), fetched_output.clone(), fetched_watch.clone());
+        logger.log_message(
+            LogLevel::Watcher,
+            &format!("Watching for changes in '{}'...", fetched_entry)
+        );
 
         watch_directory(entry_file.clone(), move || {
-            log_message("File change detected, rebuilding...", "INFO");
-            begin_check(entry_file.clone(), fetched_output.clone(), fetched_watch.clone());
+            logger.log_message(LogLevel::Watcher, "Detected changes, re-checking...");
+
+            begin_check(entry_file.clone(), fetched_output.clone());
         }).unwrap();
     } else {
-        begin_check(entry_file.clone(), fetched_output.clone(), fetched_watch.clone());
+        begin_check(entry_file.clone(), fetched_output.clone());
     }
 }
 
-fn begin_check(entry: String, output: String, watch: bool) {
+fn begin_check(entry: String, output: String) {
     let spinner = with_spinner("Checking...", || {
         thread::sleep(Duration::from_millis(800));
     });
@@ -90,91 +96,21 @@ fn begin_check(entry: String, output: String, watch: bool) {
     let normalized_entry_file = normalize_path(&entry);
     let normalized_output_dir = normalize_path(&output);
 
-    let global_store = load_all_modules(&normalized_entry_file);
-
-    if let Some(module) = global_store.modules.get(&normalized_entry_file) {
-        let mut module_clone = module.clone();
-
-        let resolved_statements = execute_statements(&mut module_clone);
-
-        let debugger = Debugger::new(&module_clone);
-        let debug_dir = format!("{}/debug/", normalized_output_dir.clone());
-        debugger.write_files(debug_dir.as_str(), resolved_statements.clone());
+    let mut global_store = GlobalStore::new();
+    let module_loader = ModuleLoader::new(&normalized_entry_file, &normalized_output_dir);
 
-        let has_errors = resolved_statements
-            .iter()
-            .any(|stmt| { match_error_recursively_resolved(&stmt.clone()) });
+    // SECTION Load
+    // NOTE: We don't use modules in the check command, but we still need to load them
+    let modules = module_loader.load_all(&mut global_store);
 
-        if has_errors {
-            let warning_message = format!(
-                "Check completed with errors in {:.2?}. Output files written to: '{}'",
-                duration.elapsed(),
-                normalized_output_dir
-            );
+    // TODO: Implement debugging
 
-            log_message(&warning_message, "WARNING");
-        } else {
-            let success_message = format!(
-                "Check completed successfully in {:.2?}. Output files written to: '{}'",
-                duration.elapsed(),
-                normalized_output_dir
-            );
-
-            log_message(&success_message, "SUCCESS");
-        }
-    }
-}
-
-fn match_error_recursively_resolved(stmt: &StatementResolved) -> bool {
-    match stmt.value.clone() {
-        // TODO Other statement value types here
-
-        StatementResolvedValue::Map(map) => {
-            for (key, value) in map {
-                if match_error_recursively_resolved_value(&value) {
-                    return true;
-                }
-            }
-        }
-
-        StatementResolvedValue::Array(array) => {
-            for item in array {
-                if match_error_recursively_resolved(&item) {
-                    return true;
-                }
-            }
-        }
-
-        _ => {
-            if let StatementKind::Error = stmt.kind {
-                eprintln!("❌ Error found in statement: {:?}", stmt);
-                return true;
-            }
-        }
-    }
-
-    false
-}
-
-fn match_error_recursively_resolved_value(value: &StatementResolvedValue) -> bool {
-    match value {
-        StatementResolvedValue::Map(map) => {
-            for (_, v) in map {
-                if match_error_recursively_resolved_value(v) {
-                    return true;
-                }
-            }
-        }
-
-        StatementResolvedValue::Array(array) => {
-            for item in array {
-                if match_error_recursively_resolved(item) {
-                    return true;
-                }
-            }
-        }
-        _ => {}
-    }
+    let success_message = format!(
+        "Check completed successfully in {:.2?}. Output files written to: '{}'",
+        duration.elapsed(),
+        normalized_output_dir
+    );
 
-    false
+    let logger = Logger::new();
+    logger.log_message(LogLevel::Success, &success_message);
 }

package/rust/cli/init.rs

@@ -2,7 +2,7 @@ use std::{ fs, path::Path };
 use include_dir::{ include_dir, Dir };
 use inquire::{ Select, Confirm };
 
-use crate::{ cli::template::{ get_available_templates }, utils::file::copy_dir_recursive };
+use crate::{ cli::template::get_available_templates, utils::file::copy_dir_recursive };
 
 static TEMPLATES_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/templates");