npm - @devaloop/devalang - Versions diffs - 0.0.1-beta.1 → 0.0.1-beta.2 - Mend

@devaloop/devalang 0.0.1-beta.1 → 0.0.1-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (220) hide show

package/.devalang +9 -10
package/Cargo.toml +5 -4
package/README.md +7 -5
package/docs/CHANGELOG.md +42 -0
package/docs/ROADMAP.md +5 -1
package/docs/TODO.md +3 -14
package/examples/bus.deva +10 -0
package/examples/effect.deva +2 -0
package/examples/filter.deva +11 -0
package/examples/lfo.deva +9 -0
package/examples/synth.deva +11 -1
package/examples/synth_types.deva +17 -0
package/out-tsc/core/functions/index.d.ts +5 -0
package/out-tsc/core/functions/index.js +11 -0
package/out-tsc/pkg/devalang_core.d.ts +2 -0
package/out-tsc/pkg/devalang_core.js +17 -2
package/out-tsc/pkg/devalang_core_bg.wasm.d.ts +8 -7
package/package.json +1 -1
package/project-version.json +3 -3
package/rust/cli/bank/api.rs +122 -122
package/rust/cli/bank/commands.rs +33 -2
package/rust/cli/bank/mod.rs +29 -29
package/rust/cli/build/commands.rs +53 -3
package/rust/cli/build/mod.rs +2 -2
package/rust/cli/build/process.rs +26 -7
package/rust/cli/check/mod.rs +2 -2
package/rust/cli/discover/commands.rs +253 -253
package/rust/cli/discover/config.rs +111 -111
package/rust/cli/discover/fs.rs +19 -19
package/rust/cli/discover/install.rs +103 -103
package/rust/cli/discover/metadata.rs +48 -48
package/rust/cli/discover/mod.rs +5 -5
package/rust/cli/install/addon.rs +118 -118
package/rust/cli/install/bank.rs +22 -3
package/rust/cli/install/commands.rs +35 -35
package/rust/cli/install/mod.rs +4 -4
package/rust/cli/install/plugin.rs +80 -61
package/rust/cli/login/commands.rs +124 -124
package/rust/cli/mod.rs +12 -12
package/rust/cli/parser.rs +46 -1
package/rust/cli/play/commands.rs +71 -20
package/rust/cli/play/mod.rs +5 -5
package/rust/cli/play/process.rs +14 -5
package/rust/cli/play/realtime.rs +91 -91
package/rust/cli/telemetry/commands.rs +22 -22
package/rust/cli/telemetry/event_creator.rs +80 -80
package/rust/cli/telemetry/mod.rs +3 -3
package/rust/cli/telemetry/send.rs +51 -51
package/rust/cli/template/commands.rs +69 -69
package/rust/config/driver.rs +112 -103
package/rust/config/mod.rs +3 -3
package/rust/config/ops.rs +26 -26
package/rust/config/settings.rs +101 -101
package/rust/core/audio/engine/driver.rs +220 -0
package/rust/core/audio/engine/export.rs +169 -0
package/rust/core/audio/engine/helpers.rs +178 -170
package/rust/core/audio/engine/mod.rs +51 -2
package/rust/core/audio/engine/notes/dsp.rs +85 -0
package/rust/core/audio/engine/notes/mod.rs +44 -0
package/rust/core/audio/engine/notes/params.rs +294 -0
package/rust/core/audio/engine/sample/insert.rs +199 -0
package/rust/core/audio/engine/sample/mod.rs +40 -0
package/rust/core/audio/engine/sample/padding.rs +170 -0
package/rust/core/audio/evaluator/condition.rs +61 -0
package/rust/core/audio/evaluator/mod.rs +9 -0
package/rust/core/audio/{evaluator.rs → evaluator/numeric.rs} +1 -159
package/rust/core/audio/evaluator/rhs.rs +16 -0
package/rust/core/audio/evaluator/string_expr.rs +94 -0
package/rust/core/audio/interpreter/driver.rs +55 -23
package/rust/core/audio/interpreter/mod.rs +1 -13
package/rust/core/audio/interpreter/statements/arrow_call/interprete.rs +175 -0
package/rust/core/audio/interpreter/statements/arrow_call/methods/chord.rs +384 -0
package/rust/core/audio/interpreter/statements/arrow_call/methods/mod.rs +2 -0
package/rust/core/audio/interpreter/statements/arrow_call/methods/note.rs +316 -0
package/rust/core/audio/interpreter/statements/arrow_call/mod.rs +3 -0
package/rust/core/audio/interpreter/statements/arrow_call/types/arp.rs +192 -0
package/rust/core/audio/interpreter/statements/arrow_call/types/mod.rs +24 -0
package/rust/core/audio/interpreter/statements/arrow_call/types/pad.rs +116 -0
package/rust/core/audio/interpreter/statements/arrow_call/types/pluck.rs +97 -0
package/rust/core/audio/interpreter/statements/arrow_call/types/sub.rs +100 -0
package/rust/core/audio/interpreter/{automate.rs → statements/automate.rs} +16 -18
package/rust/core/audio/interpreter/{call.rs → statements/call.rs} +5 -4
package/rust/core/audio/interpreter/{condition.rs → statements/condition.rs} +2 -1
package/rust/core/audio/interpreter/{function.rs → statements/function.rs} +2 -4
package/rust/core/audio/interpreter/{let_.rs → statements/let_.rs} +2 -4
package/rust/core/audio/interpreter/{load.rs → statements/load.rs} +2 -4
package/rust/core/audio/interpreter/{loop_.rs → statements/loop_.rs} +2 -1
package/rust/core/audio/interpreter/statements/mod.rs +12 -0
package/rust/core/audio/interpreter/{sleep.rs → statements/sleep.rs} +28 -28
package/rust/core/audio/interpreter/{spawn.rs → statements/spawn.rs} +3 -2
package/rust/core/audio/interpreter/{tempo.rs → statements/tempo.rs} +40 -40
package/rust/core/audio/interpreter/{trigger.rs → statements/trigger.rs} +1 -1
package/rust/core/audio/loader/trigger.rs +2 -1
package/rust/core/audio/mod.rs +6 -7
package/rust/core/audio/player.rs +70 -70
package/rust/core/audio/special/easing.rs +189 -189
package/rust/core/audio/special/env.rs +45 -45
package/rust/core/audio/special/math.rs +134 -134
package/rust/core/audio/special/mod.rs +9 -9
package/rust/core/audio/special/modulator.rs +143 -143
package/rust/core/builder/mod.rs +45 -2
package/rust/core/debugger/lexer.rs +27 -27
package/rust/core/debugger/{module.rs → logs.rs} +3 -6
package/rust/core/debugger/mod.rs +30 -30
package/rust/core/debugger/preprocessor.rs +27 -27
package/rust/core/debugger/store.rs +2 -4
package/rust/core/error/mod.rs +269 -269
package/rust/core/lexer/driver.rs +59 -61
package/rust/core/lexer/handler/arrow.rs +82 -82
package/rust/core/lexer/handler/at.rs +21 -21
package/rust/core/lexer/handler/brace.rs +41 -41
package/rust/core/lexer/handler/colon.rs +21 -21
package/rust/core/lexer/handler/comment.rs +30 -30
package/rust/core/lexer/handler/dot.rs +21 -21
package/rust/core/lexer/handler/driver.rs +337 -337
package/rust/core/lexer/handler/identifier.rs +47 -47
package/rust/core/lexer/handler/indent.rs +66 -66
package/rust/core/lexer/handler/mod.rs +15 -15
package/rust/core/lexer/handler/newline.rs +23 -23
package/rust/core/lexer/handler/number.rs +31 -31
package/rust/core/lexer/handler/operator.rs +46 -46
package/rust/core/lexer/handler/parenthesis.rs +41 -41
package/rust/core/lexer/handler/slash.rs +21 -21
package/rust/core/lexer/handler/string.rs +63 -63
package/rust/core/lexer/mod.rs +3 -3
package/rust/core/mod.rs +0 -1
package/rust/core/parser/driver/block.rs +111 -0
package/rust/core/parser/driver/cursor.rs +82 -0
package/rust/core/parser/driver/driver_impl.rs +139 -0
package/rust/core/parser/driver/mod.rs +6 -0
package/rust/core/parser/driver/parse_array.rs +120 -0
package/rust/core/parser/driver/parse_map.rs +223 -0
package/rust/core/parser/driver/parser.rs +160 -0
package/rust/core/parser/handler/arrow_call.rs +28 -4
package/rust/core/parser/handler/at.rs +279 -279
package/rust/core/parser/handler/bank.rs +104 -104
package/rust/core/parser/handler/condition.rs +83 -83
package/rust/core/parser/handler/dot.rs +148 -148
package/rust/core/parser/handler/identifier/automate.rs +254 -254
package/rust/core/parser/handler/identifier/call.rs +91 -91
package/rust/core/parser/handler/identifier/emit.rs +70 -70
package/rust/core/parser/handler/identifier/function.rs +113 -113
package/rust/core/parser/handler/identifier/group.rs +89 -89
package/rust/core/parser/handler/identifier/let_.rs +173 -173
package/rust/core/parser/handler/identifier/mod.rs +55 -55
package/rust/core/parser/handler/identifier/on.rs +107 -107
package/rust/core/parser/handler/identifier/print.rs +49 -49
package/rust/core/parser/handler/identifier/sleep.rs +96 -43
package/rust/core/parser/handler/identifier/spawn.rs +91 -91
package/rust/core/parser/handler/identifier/synth.rs +135 -135
package/rust/core/parser/handler/loop_.rs +194 -194
package/rust/core/parser/handler/mod.rs +9 -9
package/rust/core/parser/handler/pattern.rs +1 -1
package/rust/core/parser/handler/tempo.rs +105 -57
package/rust/core/parser/statement.rs +10 -11
package/rust/core/plugin/loader.rs +1 -1
package/rust/core/plugin/mod.rs +2 -2
package/rust/core/plugin/runner/mod.rs +11 -0
package/rust/core/plugin/{runner.rs → runner/non_wasm.rs} +297 -347
package/rust/core/plugin/runner/wasm32.rs +43 -0
package/rust/core/preprocessor/loader/inject.rs +278 -0
package/rust/core/preprocessor/loader/loader_helpers.rs +110 -0
package/rust/core/preprocessor/loader/mod.rs +235 -0
package/rust/core/preprocessor/module.rs +2 -7
package/rust/core/preprocessor/{processor.rs → processor/handlers.rs} +6 -13
package/rust/core/preprocessor/processor/mod.rs +1 -0
package/rust/core/preprocessor/resolver/bank.rs +49 -49
package/rust/core/preprocessor/resolver/call.rs +124 -124
package/rust/core/preprocessor/resolver/condition.rs +95 -95
package/rust/core/preprocessor/resolver/driver.rs +324 -324
package/rust/core/preprocessor/resolver/function.rs +2 -2
package/rust/core/preprocessor/resolver/group.rs +46 -18
package/rust/core/preprocessor/resolver/let_.rs +32 -32
package/rust/core/preprocessor/resolver/loop_.rs +318 -318
package/rust/core/preprocessor/resolver/mod.rs +16 -16
package/rust/core/preprocessor/resolver/pattern.rs +83 -83
package/rust/core/preprocessor/resolver/spawn.rs +99 -99
package/rust/core/preprocessor/resolver/synth.rs +54 -54
package/rust/core/preprocessor/resolver/tempo.rs +48 -48
package/rust/core/preprocessor/resolver/trigger.rs +116 -116
package/rust/core/preprocessor/resolver/value.rs +176 -176
package/rust/core/store/global.rs +2 -6
package/rust/core/store/mod.rs +1 -5
package/rust/lib.rs +18 -3
package/rust/main.rs +27 -3
package/rust/types/Cargo.toml +1 -1
package/rust/types/src/addons.rs +55 -55
package/rust/types/src/config.rs +84 -74
package/rust/types/src/lib.rs +15 -12
package/rust/types/src/plugin.rs +20 -0
package/rust/types/src/store.rs +139 -0
package/rust/types/src/telemetry.rs +85 -85
package/rust/utils/Cargo.toml +2 -2
package/rust/utils/src/file.rs +94 -94
package/rust/utils/src/first_usage.rs +97 -97
package/rust/utils/src/lib.rs +9 -9
package/rust/utils/src/logger.rs +200 -200
package/rust/utils/src/path.rs +129 -88
package/rust/utils/src/signature.rs +41 -41
package/rust/utils/src/spinner.rs +20 -20
package/rust/utils/src/version.rs +27 -27
package/rust/utils/src/watcher.rs +46 -46
package/rust/web/api.rs +5 -5
package/rust/web/cdn.rs +34 -34
package/rust/web/mod.rs +3 -3
package/tests/integration.rs +21 -21
package/typescript/core/functions/index.ts +11 -0
package/typescript/pkg/devalang_core.ts +20 -4
package/rust/core/audio/engine/sample.rs +0 -366
package/rust/core/audio/engine/synth.rs +0 -325
package/rust/core/audio/interpreter/arrow_call.rs +0 -311
package/rust/core/audio/renderer.rs +0 -54
package/rust/core/parser/driver.rs +0 -584
package/rust/core/preprocessor/loader.rs +0 -637
package/rust/core/store/export.rs +0 -28
package/rust/core/store/function.rs +0 -40
package/rust/core/store/import.rs +0 -28
package/rust/core/store/variable.rs +0 -51
package/rust/core/utils/mod.rs +0 -1
package/rust/core/utils/path.rs +0 -37

package/rust/cli/login/commands.rs CHANGED Viewed

@@ -1,124 +1,124 @@
-use crate::config::settings::set_user_config_value;
-use crate::web::sso::get_sso_url;
-use std::str::FromStr;
-use tiny_http::Header;
-use tiny_http::{Response, Server};
-use webbrowser;
-/// Handle the login command
-/// This function initiates the login process by opening the browser and waiting for the callback.
-#[cfg(feature = "cli")]
-pub async fn handle_login_command() -> Result<(), String> {
-    use devalang_utils::logger::LogLevel;
-    use devalang_utils::logger::Logger;
-    use devalang_utils::spinner::start_spinner;
-    let logger = Logger::new();
-    let mut listener_port = 7878;
-    let test_port_already_in_use = format!("127.0.0.1:{}", listener_port);
-    while std::net::TcpListener::bind(&test_port_already_in_use).is_err() {
-        listener_port += 1;
-    }
-    let redirect_uri = format!("http://127.0.0.1:{}/callback", listener_port);
-    let login_url = format!(
-        "{}/?response_type=code&referer=cli&redirect_uri={}",
-        get_sso_url(),
-        redirect_uri
-    );
-    if webbrowser::open(&login_url).is_ok() {
-        logger.log_message(LogLevel::Info, "Opening browser for login...");
-        logger.log_message(
-            LogLevel::Info,
-            &format!(
-                "If the browser does not open, please visit the following URL: {}",
-                login_url
-            ),
-        );
-    } else {
-        logger.log_message(
-            LogLevel::Info,
-            "Please open the following URL in your browser to login:",
-        );
-        logger.log_message(LogLevel::Info, &login_url);
-    }
-    let server = Server::http(format!("127.0.0.1:{}", listener_port)).unwrap();
-    let spinner = start_spinner("Waiting for authentication...");
-    for request in server.incoming_requests() {
-        let query = request.url().to_string();
-        if request.url().starts_with("/callback") {
-            if query.contains("session=") || query.contains("error=") {
-                let token = query.split("session=").nth(1).unwrap_or("").to_string();
-                if !token.is_empty() {
-                    let response_html = r#"
-                        <html>
-                            <body>
-                                <h1>Authentication Successful</h1>
-                                <h2>You can now close this window.</h2>
-                            </body>
-                        </html>
-                    "#;
-                    let response = Response::from_string(response_html)
-                        .with_status_code(200)
-                        .with_header(Header::from_str("Content-Type: text/html").unwrap());
-                    request.respond(response).unwrap();
-                    save_token(&token);
-                    spinner.finish_and_clear();
-                    logger.log_message(
-                        LogLevel::Success,
-                        "Authentication successful. Token saved to ~/.devalang/config.json",
-                    );
-                    break;
-                } else {
-                    spinner.finish_and_clear();
-                    logger.log_message(LogLevel::Error, "Invalid session token.");
-                    request
-                        .respond(Response::from_string("Invalid session token."))
-                        .unwrap();
-                    break;
-                }
-            } else {
-                println!("Invalid callback: {}", request.url());
-                spinner.finish_and_clear();
-                logger.log_message(LogLevel::Error, "Invalid callback.");
-                request
-                    .respond(Response::from_string("Invalid callback."))
-                    .unwrap();
-                break;
-            }
-        } else if request.url().starts_with("/favicon.ico") {
-            // Ignore favicon requests
-        } else {
-            spinner.finish_and_clear();
-            logger.log_message(LogLevel::Error, "Invalid request.");
-            request
-                .respond(Response::from_string("Invalid request."))
-                .unwrap();
-            break;
-        }
-    }
-    Ok(())
-}
-/// Save the session token to a file in the user's home directory
-fn save_token(token: &str) {
-    set_user_config_value("session", serde_json::Value::String(token.to_string()));
-}
+use crate::config::settings::set_user_config_value;
+use crate::web::sso::get_sso_url;
+use std::str::FromStr;
+use tiny_http::Header;
+use tiny_http::{Response, Server};
+use webbrowser;
+/// Handle the login command
+/// This function initiates the login process by opening the browser and waiting for the callback.
+#[cfg(feature = "cli")]
+pub async fn handle_login_command() -> Result<(), String> {
+    use devalang_utils::logger::LogLevel;
+    use devalang_utils::logger::Logger;
+    use devalang_utils::spinner::start_spinner;
+    let logger = Logger::new();
+    let mut listener_port = 7878;
+    let test_port_already_in_use = format!("127.0.0.1:{}", listener_port);
+    while std::net::TcpListener::bind(&test_port_already_in_use).is_err() {
+        listener_port += 1;
+    }
+    let redirect_uri = format!("http://127.0.0.1:{}/callback", listener_port);
+    let login_url = format!(
+        "{}/?response_type=code&referer=cli&redirect_uri={}",
+        get_sso_url(),
+        redirect_uri
+    );
+    if webbrowser::open(&login_url).is_ok() {
+        logger.log_message(LogLevel::Info, "Opening browser for login...");
+        logger.log_message(
+            LogLevel::Info,
+            &format!(
+                "If the browser does not open, please visit the following URL: {}",
+                login_url
+            ),
+        );
+    } else {
+        logger.log_message(
+            LogLevel::Info,
+            "Please open the following URL in your browser to login:",
+        );
+        logger.log_message(LogLevel::Info, &login_url);
+    }
+    let server = Server::http(format!("127.0.0.1:{}", listener_port)).unwrap();
+    let spinner = start_spinner("Waiting for authentication...");
+    for request in server.incoming_requests() {
+        let query = request.url().to_string();
+        if request.url().starts_with("/callback") {
+            if query.contains("session=") || query.contains("error=") {
+                let token = query.split("session=").nth(1).unwrap_or("").to_string();
+                if !token.is_empty() {
+                    let response_html = r#"
+                        <html>
+                            <body>
+                                <h1>Authentication Successful</h1>
+                                <h2>You can now close this window.</h2>
+                            </body>
+                        </html>
+                    "#;
+                    let response = Response::from_string(response_html)
+                        .with_status_code(200)
+                        .with_header(Header::from_str("Content-Type: text/html").unwrap());
+                    request.respond(response).unwrap();
+                    save_token(&token);
+                    spinner.finish_and_clear();
+                    logger.log_message(
+                        LogLevel::Success,
+                        "Authentication successful. Token saved to ~/.devalang/config.json",
+                    );
+                    break;
+                } else {
+                    spinner.finish_and_clear();
+                    logger.log_message(LogLevel::Error, "Invalid session token.");
+                    request
+                        .respond(Response::from_string("Invalid session token."))
+                        .unwrap();
+                    break;
+                }
+            } else {
+                println!("Invalid callback: {}", request.url());
+                spinner.finish_and_clear();
+                logger.log_message(LogLevel::Error, "Invalid callback.");
+                request
+                    .respond(Response::from_string("Invalid callback."))
+                    .unwrap();
+                break;
+            }
+        } else if request.url().starts_with("/favicon.ico") {
+            // Ignore favicon requests
+        } else {
+            spinner.finish_and_clear();
+            logger.log_message(LogLevel::Error, "Invalid request.");
+            request
+                .respond(Response::from_string("Invalid request."))
+                .unwrap();
+            break;
+        }
+    }
+    Ok(())
+}
+/// Save the session token to a file in the user's home directory
+fn save_token(token: &str) {
+    set_user_config_value("session", serde_json::Value::String(token.to_string()));
+}

package/rust/cli/mod.rs CHANGED Viewed

@@ -1,12 +1,12 @@
-pub mod bank;
-pub mod build;
-pub mod check;
-pub mod discover;
-pub mod init;
-pub mod install;
-pub mod login;
-pub mod parser;
-pub mod play;
-pub mod telemetry;
-pub mod template;
-pub mod update;
+pub mod bank;
+pub mod build;
+pub mod check;
+pub mod discover;
+pub mod init;
+pub mod install;
+pub mod login;
+pub mod parser;
+pub mod play;
+pub mod telemetry;
+pub mod template;
+pub mod update;

package/rust/cli/parser.rs CHANGED Viewed

@@ -1,4 +1,17 @@
-use clap::{Parser, Subcommand};
+use clap::{Parser, Subcommand, ValueEnum};
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum, Debug)]
+pub enum OutputFormat {
+    Wav,
+    Mid,
+}
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum, Debug)]
+pub enum AudioFormat {
+    Wav16,
+    Wav24,
+    Wav32,
+}
 #[derive(Parser)]
 #[command(name = "devalang")]
@@ -124,6 +137,26 @@ pub enum Commands {
         ///
         output: Option<String>,
+        #[arg(long, value_enum, value_delimiter = ',', default_value = "wav,mid")]
+        /// Which output formats to generate. Comma-separated list is accepted.
+        ///
+        /// ### Default value
+        /// - `wav,mid`
+        ///
+        output_format: Vec<OutputFormat>,
+        #[arg(long, default_value = "wav16")]
+        /// Audio format to use for file outputs (affects WAV export).
+        ///
+        /// ### Default value
+        /// - `wav16`
+        ///
+        audio_format: AudioFormat,
+        #[arg(long, default_value_t = 44100u32)]
+        /// Sample rate to use for audio export and playback (e.g. 44100, 48000)
+        sample_rate: u32,
         #[arg(long, default_value_t = false)]
         /// Whether to watch for changes and rebuild.
         ///
@@ -213,6 +246,18 @@ pub enum Commands {
         /// The directory where the output files will be generated.
         output: Option<String>,
+        #[arg(long, default_value_t = 44100u32)]
+        /// Sample rate to use for playback (e.g. 44100, 48000)
+        sample_rate: u32,
+        #[arg(long, default_value = "wav16")]
+        /// Audio format to use for file outputs (affects WAV export).
+        ///
+        /// ### Default value
+        /// - `wav16`
+        ///
+        audio_format: AudioFormat,
         #[arg(long, default_value_t = false)]
         /// Whether to watch for changes and re-play.
         ///

package/rust/cli/play/commands.rs CHANGED Viewed

@@ -1,5 +1,6 @@
 use crate::config::driver::ProjectConfig;
 use devalang_utils::logger::{LogLevel, Logger};
+use devalang_utils::path::{find_entry_file, normalize_path};
 use std::{sync::mpsc::channel, thread};
 pub use crate::cli::play::io::wav_duration_seconds;
@@ -17,12 +18,34 @@ pub fn handle_play_command(
     config: Option<ProjectConfig>,
     entry: Option<String>,
     output: Option<String>,
+    audio_format: crate::cli::parser::AudioFormat,
+    sample_rate: u32,
     watch: bool,
     repeat: bool,
     debug: bool,
 ) -> Result<(), String> {
     let logger = Logger::new();
+    // Determine final audio_format and sample_rate, preferring CLI values but falling back to config defaults
+    let mut final_audio_format = audio_format;
+    let mut final_sample_rate = sample_rate;
+    if let Some(cfg) = config.as_ref() {
+        if let Some(af) = cfg.defaults.audio_format.as_ref() {
+            let af_low = af.to_lowercase();
+            final_audio_format = match af_low.as_str() {
+                "wav24" => crate::cli::parser::AudioFormat::Wav24,
+                "wav32" => crate::cli::parser::AudioFormat::Wav32,
+                _ => crate::cli::parser::AudioFormat::Wav16,
+            };
+        }
+        if let Some(sr) = cfg.defaults.sample_rate {
+            // Only override if CLI provided a 0 or unrealistic value (we assume CLI provides a valid value)
+            if final_sample_rate == 0 {
+                final_sample_rate = sr;
+            }
+        }
+    }
     let entry_path = entry
         .or_else(|| config.as_ref().and_then(|c| c.defaults.entry.clone()))
         .unwrap_or_default();
@@ -45,7 +68,7 @@ pub fn handle_play_command(
         return Err("missing entry or output".to_string());
     }
-    let entry_file = match crate::core::utils::path::find_entry_file(&entry_path) {
+    let entry_file = match find_entry_file(&entry_path) {
         Some(p) => p,
         None => {
             logger.log_message(LogLevel::Error, "index.deva not found");
@@ -53,10 +76,7 @@ pub fn handle_play_command(
         }
     };
-    let audio_file = format!(
-        "{}/audio/index.wav",
-        crate::core::utils::path::normalize_path(&output_path)
-    );
+    let audio_file = format!("{}/audio/index.wav", normalize_path(&output_path));
     let mut audio_player = AudioPlayer::new();
     if watch && fetched_repeat {
@@ -79,8 +99,14 @@ pub fn handle_play_command(
         });
         // Main thread: build + play in a loop
-        let (bpm, entry_stmts, variables, functions, global_store) =
-            process_play(&config, &entry_file, &output_path, debug)?;
+        let (bpm, entry_stmts, variables, functions, global_store) = process_play(
+            &config,
+            &entry_file,
+            &output_path,
+            final_audio_format,
+            final_sample_rate,
+            debug,
+        )?;
         audio_player.play_file_once(&audio_file);
         // Estimate duration: base on statement count plus extra for loop iterations (1 beat per iter)
         let loop_iters: usize = entry_stmts
@@ -130,14 +156,20 @@ pub fn handle_play_command(
             // Stop previous real-time runner before restarting playback
             stop_realtime_runner(&mut rt_runner);
-            let (bpm, entry_stmts, variables, functions, global_store) =
-                match process_play(&config, &entry_file, &output_path, debug) {
-                    Ok(v) => v,
-                    Err(e) => {
-                        logger.log_message(LogLevel::Error, &format!("Rebuild failed: {}", e));
-                        continue;
-                    }
-                };
+            let (bpm, entry_stmts, variables, functions, global_store) = match process_play(
+                &config,
+                &entry_file,
+                &output_path,
+                final_audio_format,
+                final_sample_rate,
+                debug,
+            ) {
+                Ok(v) => v,
+                Err(e) => {
+                    logger.log_message(LogLevel::Error, &format!("Rebuild failed: {}", e));
+                    continue;
+                }
+            };
             logger.log_message(LogLevel::Info, "🎵 Playback started (once mode)...");
@@ -180,8 +212,14 @@ pub fn handle_play_command(
         }
     } else if fetched_repeat {
         // Initial build to start from a clean slate
-        let (bpm, entry_stmts, variables, functions, global_store) =
-            process_play(&config, &entry_file, &output_path, debug)?;
+        let (bpm, entry_stmts, variables, functions, global_store) = process_play(
+            &config,
+            &entry_file,
+            &output_path,
+            final_audio_format,
+            final_sample_rate,
+            debug,
+        )?;
         logger.log_message(LogLevel::Info, "🎵 Playback started (repeat mode)...");
@@ -241,7 +279,14 @@ pub fn handle_play_command(
                 // Rebuild in a separate thread
                 std::thread::spawn(move || {
-                    if let Err(e) = process_play(&config_clone, &entry_file, &output_path, debug) {
+                    if let Err(e) = process_play(
+                        &config_clone,
+                        &entry_file,
+                        &output_path,
+                        final_audio_format,
+                        final_sample_rate,
+                        debug,
+                    ) {
                         eprintln!("Rebuild failed in background: {}", e);
                     }
                 });
@@ -294,8 +339,14 @@ pub fn handle_play_command(
         }
     } else {
         // Single execution
-        let (bpm, entry_stmts, variables, functions, global_store) =
-            process_play(&config, &entry_file, &output_path, debug)?;
+        let (bpm, entry_stmts, variables, functions, global_store) = process_play(
+            &config,
+            &entry_file,
+            &output_path,
+            final_audio_format,
+            final_sample_rate,
+            debug,
+        )?;
         logger.log_message(LogLevel::Info, "🎵 Playback started (once mode)...");

package/rust/cli/play/mod.rs CHANGED Viewed

@@ -1,5 +1,5 @@
-pub mod commands;
-pub mod io;
-pub mod process;
-pub mod realtime;
-pub mod utils;
+pub mod commands;
+pub mod io;
+pub mod process;
+pub mod realtime;
+pub mod utils;

package/rust/cli/play/process.rs CHANGED Viewed

@@ -4,15 +4,15 @@ use crate::{
         builder::Builder,
         debugger::{
             lexer::write_lexer_log_file,
-            module::{write_module_function_log_file, write_module_variable_log_file},
+            logs::{write_module_function_log_file, write_module_variable_log_file},
             preprocessor::write_preprocessor_log_file,
             store::{write_function_log_file, write_variables_log_file},
         },
         preprocessor::loader::ModuleLoader,
         store::global::GlobalStore,
-        utils::path::normalize_path,
     },
 };
+use devalang_utils::path::normalize_path;
 use devalang_utils::{
     logger::{LogLevel, Logger},
     spinner::start_spinner,
@@ -22,13 +22,15 @@ pub fn process_play(
     _config: &Option<ProjectConfig>,
     entry_file: &str,
     output: &str,
+    audio_format: crate::cli::parser::AudioFormat,
+    sample_rate: u32,
     debug: bool,
 ) -> Result<
     (
         f32,
         Vec<crate::core::parser::statement::Statement>,
-        crate::core::store::variable::VariableTable,
-        crate::core::store::function::FunctionTable,
+        devalang_types::VariableTable,
+        devalang_types::FunctionTable,
         crate::core::store::global::GlobalStore,
     ),
     String,
@@ -127,7 +129,14 @@ pub fn process_play(
     // SECTION Building AST and Audio
     let builder = Builder::new();
     builder.build_ast(&modules_statements, output, false);
-    builder.build_audio(&modules_statements, output, &mut global_store);
+    let audio_format_str = format!("{:?}", audio_format);
+    builder.build_audio(
+        &modules_statements,
+        output,
+        &mut global_store,
+        Some(audio_format_str),
+        Some(sample_rate),
+    );
     // SECTION Logging
     let logger = Logger::new();