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

package/.devalang

@@ -0,0 +1,4 @@
+[defaults]
+entry = "./examples"
+output = "./output"
+watch = true

package/Cargo.toml

@@ -1,45 +1,46 @@
-[package]
-name = "devalang"
-version = "0.0.1-alpha.1"
-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"
+[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**.  
@@ -41,6 +40,7 @@ From studio sketches to live sets, Devalang gives you rhythmic control — with
 - 🧩 Module system for importing and exporting variables between files (`@import`, `@export`)
 - 📜 Structured AST generation for debugging and future compilation
 - 🔢 Basic data types: strings, numbers, booleans, maps, arrays
+- 👁️ Watch mode for `build` and `check` commands
 - ⏱️ `bpm` assignment for setting tempo
 - 🧱 `bank` declaration to define the instrument set
 - 🔁 Looping system with fixed repetitions (`loop 4:`)
@@ -83,25 +83,49 @@ 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
 
 For more examples, see [docs/COMMANDS.md](./docs/COMMANDS.md)
 
-Checking syntax only and output debug files
+### Initialize a new project
+
+In the current directory
 
 ```bash
-devalang check --entry <entry-directory> --output <output-directory>
+devalang init
 ```
 
-Building output file(s) (AST generation for the moment)
+Or use optional arguments to specify a directory name and a template
 
 ```bash
-devalang build --entry <entry-directory> --output <output-directory>
+devalang init --name <project-name> --template <template-name>
 ```
 
+### Checking syntax only
+
+```bash
+devalang check --entry <entry-directory> --output <output-directory> --watch
+```
+
+### Building output files
+
+```bash
+devalang build --entry <entry-directory> --output <output-directory> --watch
+```
+
+## ⚙️ Configuration
+
+You can use a configuration file to set default values for various settings, making it easier to manage your Devalang project.
+
+To do this, create a `.devalang` file in the root of your project directory.
+
+See [docs/CONFIG.md](./docs/CONFIG.md) for more information.
+
 ## 📄 Syntax example
 
 For more examples, see [docs/SYNTAX.md](./docs/SYNTAX.md)
@@ -127,7 +151,7 @@ loop 5:
 
 let globalBpm = 120
 let globalBank = 808
-let kickDuration = 500 
+let kickDuration = 500
 
 @export { globalBpm, globalBank, kickDuration }
 ```
@@ -137,15 +161,16 @@ 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`, ...)
-- ⏳ Watch mode for automatic rebuilds
+- ⏳ Cross-platform support (Linux, macOS)
+- ⏳ More built-in instruments (e.g. snare, hi-hat, etc.)
 
 ## 🛡️ License
 

package/docs/CHANGELOG.md

@@ -0,0 +1,58 @@
+<div align="center">
+    <img src="https://firebasestorage.googleapis.com/v0/b/devaloop-labs.firebasestorage.app/o/devalang-teal-logo.svg?alt=media&token=d2a5705a-1eba-4b49-88e6-895a761fb7f7" alt="Devalang Logo">
+</div>
+
+# Changelog
+
+## 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
+
+- Implemented `init` command to initialize a new Devalang project.
+- Implemented `template` command to manage templates.
+  - Added `list` subcommand to list available templates.
+  - Added `info` subcommand to show information about a specific template.
+- Implemented `watch` subcommand for the `build` and `check` command to watch for changes in files and automatically rebuild or check them.
+
+### Core Components
+
+- Implemented Config manager to handle configuration files.
+  - Added support for `.devalang` configuration file as a TOML file.
+- Implemented File System watcher to monitor file changes.
+- Implemented Template manager to handle templates and their metadata.
+
+### Syntax
+
+- Added support for built-in triggers for `.snare`, `.hihat`, `.clap`, `.tom`, `.crash`, `.ride`, `.synth`, `.bass`, and `.pad`.
+
+## Version 0.0.1-alpha.1 (2025-06-25)
+
+### Syntax
+
+- Added support for `@import` directive to import other Devalang files.
+- Added support for `@export` directive to export variables and functions.
+- Added support for `@load` directive to load external resources.
+- Added support for `bpm` directive to set the beats per minute.
+- Added support for `bank` directive to define a bank of sounds.
+- Added support for `loop` directive to define loops in the code.
+
+### Commands
+
+- Implemented `check` command to check the syntax of Devalang files.
+- Implemented `build` command to build the Abstract Syntax Tree (AST) of Devalang files.
+
+### Core Components
+
+- Implemented Lexer to tokenize Devalang source code.
+- Implemented Parser to parse the tokens and build the AST.
+- Implemented Preprocessor to handle directives and preprocess the source code.
+- Implemented Debugger to debug Devalang code.
+- Implemented Builder to build the final output from the AST.

package/docs/COMMANDS.md

@@ -4,28 +4,51 @@
 
 # Devalang Commands Guide
 
+## Initialization
+
+Initialize a new Devalang project (current folder)
+
+```bash
+devalang init
+```
+
+Initialize a new Devalang project (new folder)
+
+```bash
+devalang init --name <project-name> --template <template-name>
+```
+
+Available arguments:
+
+- `--name`: The name of the project (cannot be empty)
+- `--template`: The template to use for the project (default to `welcome`)
+
 ## Checking
 
 Checking syntax of .deva file(s)
 
 ```bash
-devalang check --entry ./examples --output ./output
+devalang check --entry ./examples --output ./output --watch
 ```
 
 Available arguments :
 
-- `entry`: The input folder (default to `./src`)
-- `output`: The output folder (default to `./output`)
+- `--no-config`: Whether to ignore the configuration file (default to `false`)
+- `--entry`: The input folder (default to `./src`)
+- `--output`: The output folder (default to `./output`)
+- `--watch`: Whether to watch for changes and re-analyze (default to `false`)
 
 ## Building
 
 Building AST of .deva file(s)
 
 ```bash
-devalang build --entry ./examples --output ./output
+devalang build --entry ./examples --output ./output --watch
 ```
 
 Available arguments :
 
-- `entry`: The input folder (default to `./src`)
-- `output`: The output folder (default to `./output`)
+- `--no-config`: Whether to ignore the configuration file (default to `false`)
+- `--entry`: The input folder (default to `./src`)
+- `--output`: The output folder (default to `./output`)
+- `--watch`: Whether to watch for changes and rebuild (default to `false`)

package/docs/CONFIG.md

@@ -0,0 +1,28 @@
+<div align="center">
+    <img src="https://firebasestorage.googleapis.com/v0/b/devaloop-labs.firebasestorage.app/o/devalang-teal-logo.svg?alt=media&token=d2a5705a-1eba-4b49-88e6-895a761fb7f7" alt="Devalang Logo">
+</div>
+
+# Devalang Configuration File
+
+Use a configuration file if you don't want to pass command-line arguments every time you run a command. The configuration file allows you to set default values for various settings, making it easier to manage your Devalang project.
+
+## Ignoring the Configuration File
+
+If you prefer not to use a configuration file, you can ignore it by passing the `--no-config` flag when running Devalang commands. This will bypass any settings defined in the configuration file and use only the command-line arguments you provide.
+
+## Structure of the Configuration File
+
+The configuration file is a TOML (Tom's Obvious, Minimal Language) file that contains key-value pairs to define various settings for your Devalang project. Below is a sample configuration file:
+
+```toml
+[defaults]
+entry = "./src"
+output = "./output"
+watch = true
+```
+
+### Available Settings
+
+- `entry`: (String) The entry point for your Devalang project
+- `output`: (String) The output directory for generated files
+- `watch`: (Boolean) Whether to watch for changes in files and automatically rebuild or check them

package/docs/ROADMAP.md

@@ -6,7 +6,10 @@
 
 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`.
 - ✅ **AST generation**: Implement the Abstract Syntax Tree (AST) generation for debugging and future compilation.
 - ✅ **Basic data types**: Support strings, numbers, booleans, maps, and arrays.
@@ -17,11 +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.
-- ⏳ **Watch mode**: Add a watch mode to automatically rebuild on file changes.
 - ⏳ **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

@@ -8,16 +8,19 @@ This is a list of tasks and features to be implemented in Devalang. Note that th
 
 ## Commands
 
-- [ ] New project
-- [ ] Template
-  - [ ] Implement template list
-  - [ ] Implement template info
+- [x] Init project
+  - [x] Implement init command
+  - [x] Implement template selector
+  - [ ] Implement project name validation
+- [x] Template
+  - [x] Implement template list
+  - [x] Implement template info
 - [x] Checking
-  - [ ] Implement watch mode
+  - [x] Implement watch mode
   - [ ] Implement debug mode
   - [ ] Implement compilation mode
 - [x] Building
-  - [ ] Implement watch mode
+  - [x] Implement watch mode
   - [ ] Implement debug mode
   - [ ] Implement compilation mode
   - [ ] Implement compression mode
@@ -36,7 +39,7 @@ This is a list of tasks and features to be implemented in Devalang. Note that th
 
 ## Syntax elements
 
-- [ ] #
+- [x] #
 - [x] @import
 - [x] @export
 - [ ] @group
@@ -52,15 +55,15 @@ This is a list of tasks and features to be implemented in Devalang. Note that th
 - [ ] else
 - [ ] else if
 
-## Built-in triggers
+## Triggers
 
-- [x] .kick
-- [ ] .snare
-- [ ] .hihat
-- [ ] .tom
-- [ ] .clap
-- [ ] .crash
-- [ ] .ride
-- [ ] .synth
-- [ ] .bass
-- [ ] .pad
+- [x] Built-in triggers
+- [x] Custom triggers
+
+## 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

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
@@ -6,4 +7,4 @@ bpm tempo
 bank default_bank
 
 loop loopCount:
-    .sample duration params
+    .sample duration params

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@devaloop/devalang",
   "private": false,
-  "version": "0.0.1-alpha.1",
+  "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",
@@ -40,4 +39,4 @@
   "dependencies": {
     "@types/node": "^24.0.3"
   }
-}
+}

package/project-version.json

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

package/rust/cli/build.rs

@@ -1,51 +1,121 @@
-use std::{ thread, time::Duration };
-
 use crate::{
+    config::Config,
     core::{
-        builder::{ build_ast, write_ast_to_file },
-        debugger::Debugger,
-        preprocessor::module::load_all_modules,
+        builder::Builder,
+        preprocessor::loader::ModuleLoader,
+        store::global::GlobalStore,
+        utils::path::{ find_entry_file, normalize_path },
     },
-    runner::executer::execute_statements,
-    utils::{ loader::with_spinner, logger::log_message, 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<Config>,
+    entry: Option<String>,
+    output: Option<String>,
+    watch: bool
+) {
+    let fetched_entry = if entry.is_none() {
+        config
+            .as_ref()
+            .and_then(|c| c.defaults.entry.clone())
+            .unwrap_or_else(|| "".to_string())
+    } else {
+        entry.clone().unwrap_or_else(|| "".to_string())
+    };
+
+    let fetched_output = if output.is_none() {
+        config
+            .as_ref()
+            .and_then(|c| c.defaults.output.clone())
+            .unwrap_or_else(|| "".to_string())
+    } else {
+        output.clone().unwrap_or_else(|| "".to_string())
+    };
+
+    let fetched_watch = if watch {
+        watch
+    } else {
+        config
+            .as_ref()
+            .and_then(|c| c.defaults.watch)
+            .unwrap_or(false)
+    };
+
+    let logger = Logger::new();
 
-pub fn handle_build_command(entry: String, output: String) {
-    let entry_file = find_entry_file(&entry).unwrap_or_else(|| {
-        eprintln!("❌ index.deva not found in directory: {}", entry);
+    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(|| {
+        logger.log_message(
+            LogLevel::Error,
+            &format!("❌ index.deva not found in directory: {}", fetched_entry)
+        );
         std::process::exit(1);
     });
 
+    // SECTION Begin build
+    if fetched_watch {
+        begin_build(entry_file.clone(), fetched_output.clone());
+
+        logger.log_message(
+            LogLevel::Watcher,
+            &format!("Watching for changes in '{}'...", fetched_entry)
+        );
+
+        watch_directory(entry_file.clone(), move || {
+            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());
+    }
+}
+
+fn begin_build(entry: String, output: String) {
     let spinner = with_spinner("Building...", || {
         thread::sleep(Duration::from_millis(800));
     });
 
     let duration = std::time::Instant::now();
 
-    let normalized_entry_file = normalize_path(&entry_file);
+    let normalized_entry_file = normalize_path(&entry);
     let normalized_output_dir = normalize_path(&output);
 
-    let global_store = load_all_modules(&normalized_entry_file);
+    let mut global_store = GlobalStore::new();
+    let module_loader = ModuleLoader::new(&normalized_entry_file, &normalized_output_dir);
 
-    if let Some(module) = global_store.modules.get(&normalized_entry_file) {
-        let mut module_clone = 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 resolved_statements = execute_statements(&mut module_clone);
+    // SECTION Build
+    let builder = Builder::new();
+    builder.build_ast(&modules);
 
-        let ast = build_ast(&resolved_statements);
+    // TODO: Implement debugging
 
-        let ast_dir = format!("{}/json", normalized_output_dir.clone());
-        write_ast_to_file(&ast, &ast_dir);
+    let success_message = format!(
+        "Build completed successfully in {:.2?}. Output files written to: '{}'",
+        duration.elapsed(),
+        normalized_output_dir
+    );
 
-        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
-        );
-        log_message(&success_message, "SUCCESS");
-    }
+    let logger = Logger::new();
+    logger.log_message(LogLevel::Success, &success_message);
 }