@devaloop/devalang 0.0.1-beta.3 → 0.1.2

package/rust/cli/build/commands.rs

@@ -1,153 +0,0 @@
-use crate::config::driver::ProjectConfig;
-use devalang_utils::logger::{LogLevel, Logger};
-use devalang_utils::path::find_entry_file;
-use devalang_utils::watcher::watch_directory;
-
-#[cfg(feature = "cli")]
-pub fn handle_build_command(
-    config: Option<ProjectConfig>,
-    entry: Option<String>,
-    output: Option<String>,
-    output_format: Vec<crate::cli::parser::OutputFormat>,
-    audio_format: crate::cli::parser::AudioFormat,
-    sample_rate: u32,
-    watch: bool,
-    debug: bool,
-    compress: bool,
-) -> Result<(), String> {
-    // determine fetched values from config or CLI
-    let fetched_entry = if entry.is_none() {
-        config
-            .as_ref()
-            .and_then(|c| c.defaults.entry.clone())
-            .unwrap_or_default()
-    } else {
-        entry.clone().unwrap_or_default()
-    };
-
-    let fetched_output = if output.is_none() {
-        config
-            .as_ref()
-            .and_then(|c| c.defaults.output.clone())
-            .unwrap_or_default()
-    } else {
-        output.clone().unwrap_or_default()
-    };
-
-    let fetched_watch = if watch {
-        watch
-    } else {
-        config
-            .as_ref()
-            .and_then(|c| c.defaults.watch)
-            .unwrap_or(false)
-    };
-
-    let logger = Logger::new();
-
-    // Determine final audio_format: prefer CLI, else config default if present
-    let mut final_audio_format = audio_format;
-    if let Some(cfg) = config.as_ref() {
-        if let Some(af) = cfg.defaults.audio_format.as_ref() {
-            // Only override if CLI provided an empty/placeholder — clap provides a default, so we only override when CLI wasn't explicit (rare).
-            // We'll accept values: "wav16", "wav24", "wav32" (case-insensitive)
-            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,
-            };
-        }
-    }
-
-    // Determine final output_format: prefer CLI vector, else config default list
-    let mut final_output_format: Vec<crate::cli::parser::OutputFormat> = output_format.clone();
-    if final_output_format.is_empty() {
-        if let Some(cfg) = config.as_ref() {
-            if let Some(ofs) = cfg.defaults.output_format.as_ref() {
-                for s in ofs {
-                    match s.to_lowercase().as_str() {
-                        "mid" | "midi" => {
-                            final_output_format.push(crate::cli::parser::OutputFormat::Mid);
-                        }
-                        _ => final_output_format.push(crate::cli::parser::OutputFormat::Wav),
-                    }
-                }
-            }
-        }
-    }
-
-    if fetched_entry.is_empty() {
-        logger.log_message(
-            LogLevel::Error,
-            "Entry path is not specified. Please provide a valid entry path.",
-        );
-        return Err("missing entry path".to_string());
-    }
-    if fetched_output.is_empty() {
-        logger.log_message(
-            LogLevel::Error,
-            "Output directory is not specified. Please provide a valid output directory.",
-        );
-        return Err("missing output directory".to_string());
-    }
-
-    let entry_file = match find_entry_file(&fetched_entry) {
-        Some(p) => p,
-        None => {
-            logger.log_message(
-                LogLevel::Error,
-                &format!("❌ index.deva not found in directory: {}", fetched_entry),
-            );
-            return Err("index.deva not found".to_string());
-        }
-    };
-
-    // SECTION Begin build
-    if fetched_watch {
-        let _ = crate::cli::build::process::process_build(
-            entry_file.clone(),
-            fetched_output.clone(),
-            final_output_format.clone(),
-            final_audio_format,
-            sample_rate,
-            debug,
-            compress,
-        );
-
-        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...");
-
-            let _ = crate::cli::build::process::process_build(
-                entry_file.clone(),
-                fetched_output.clone(),
-                final_output_format.clone(),
-                final_audio_format,
-                sample_rate,
-                debug,
-                compress,
-            );
-        })
-        .unwrap();
-    } else {
-        let res = crate::cli::build::process::process_build(
-            entry_file,
-            fetched_output,
-            final_output_format,
-            final_audio_format,
-            sample_rate,
-            debug,
-            compress,
-        );
-        if let Err(e) = res {
-            return Err(e);
-        }
-    }
-
-    Ok(())
-}

package/rust/cli/build/mod.rs

@@ -1,2 +0,0 @@
-pub mod commands;
-pub mod process;

package/rust/cli/build/process.rs

@@ -1,165 +0,0 @@
-use crate::core::{
-    builder::Builder,
-    debugger::{
-        lexer::write_lexer_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,
-};
-use devalang_utils::path::normalize_path;
-use devalang_utils::{
-    logger::{LogLevel, Logger},
-    spinner::start_spinner,
-};
-
-pub struct BuildStatsInput {
-    pub statements_by_module:
-        std::collections::HashMap<String, Vec<crate::core::parser::statement::Statement>>,
-    pub global_store: crate::core::store::global::GlobalStore,
-}
-
-pub fn process_build(
-    entry: String,
-    output: String,
-    output_format: Vec<crate::cli::parser::OutputFormat>,
-    audio_format: crate::cli::parser::AudioFormat,
-    sample_rate: u32,
-    debug: bool,
-    compress: bool,
-) -> Result<BuildStatsInput, String> {
-    let spinner = start_spinner("Building...");
-
-    let duration = std::time::Instant::now();
-
-    let normalized_entry_file = normalize_path(&entry);
-    let normalized_output_dir = normalize_path(&output);
-
-    let mut global_store = GlobalStore::new();
-    let module_loader = ModuleLoader::new(&normalized_entry_file, &normalized_output_dir);
-
-    // SECTION Load
-    // NOTE: We use modules in the build command, so we need to load them
-    let (modules_tokens, modules_statements) = module_loader.load_all_modules(&mut global_store);
-
-    // SECTION Write logs
-    if debug {
-        for (module_path, module) in global_store.modules.clone() {
-            write_module_variable_log_file(
-                &normalized_output_dir,
-                &module_path,
-                &module.variable_table,
-            );
-            write_module_function_log_file(
-                &normalized_output_dir,
-                &module_path,
-                &module.function_table,
-            );
-        }
-
-        write_lexer_log_file(
-            &normalized_output_dir,
-            "lexer_tokens.log",
-            modules_tokens.clone(),
-        );
-        write_preprocessor_log_file(
-            &normalized_output_dir,
-            "resolved_statements.log",
-            modules_statements.clone(),
-        );
-        write_variables_log_file(
-            &normalized_output_dir,
-            "global_variables.log",
-            global_store.variables.clone(),
-        );
-        write_function_log_file(
-            &normalized_output_dir,
-            "global_functions.log",
-            global_store.functions.clone(),
-        );
-    }
-
-    // SECTION Detect build-time errors prior to building
-    let all_errors = crate::core::error::collect_all_errors_with_modules(&modules_statements);
-    let (warnings, criticals) = crate::core::error::partition_errors(all_errors);
-    crate::core::error::log_errors_with_stack("Build", &warnings, &criticals);
-    if !criticals.is_empty() {
-        spinner.finish_and_clear();
-        return Err(format!(
-            "build failed with {} critical error(s): {}",
-            criticals.len(),
-            criticals[0].message
-        ));
-    }
-
-    // SECTION Building AST and Audio
-    let builder = Builder::new();
-    builder.build_ast(&modules_statements, &normalized_output_dir, compress);
-
-    // generate audio output if requested
-    if output_format.contains(&crate::cli::parser::OutputFormat::Wav) {
-        let audio_format_str = format!("{:?}", audio_format);
-        builder.build_audio(
-            &modules_statements,
-            &normalized_output_dir,
-            &mut global_store,
-            Some(audio_format_str),
-            Some(sample_rate),
-        );
-    }
-
-    // generate midi output if requested
-    if output_format.contains(&crate::cli::parser::OutputFormat::Mid) {
-        builder.build_midi(
-            &modules_statements,
-            &normalized_output_dir,
-            &mut global_store,
-        );
-    }
-
-    // SECTION Logging
-    let logger = Logger::new();
-
-    if debug {
-        let modules_loaded = global_store.modules.keys().collect::<Vec<_>>();
-        let global_variables_loaded = global_store.variables.variables.keys().collect::<Vec<_>>();
-        let global_functions_loaded = global_store.functions.functions.keys().collect::<Vec<_>>();
-
-        logger.log_message_with_trace(
-            LogLevel::Debug,
-            &format!("Modules loaded: {}", global_store.modules.len()),
-            modules_loaded.iter().map(|s| s.as_str()).collect(),
-        );
-        logger.log_message_with_trace(
-            LogLevel::Debug,
-            &format!(
-                "Global variables: {}",
-                global_store.variables.variables.len()
-            ),
-            global_variables_loaded.iter().map(|s| s.as_str()).collect(),
-        );
-        logger.log_message_with_trace(
-            LogLevel::Debug,
-            &format!(
-                "Global functions: {}",
-                global_store.functions.functions.len()
-            ),
-            global_functions_loaded.iter().map(|s| s.as_str()).collect(),
-        );
-    }
-
-    let success_message = format!(
-        "Build completed successfully in {:.2?}. Output files written to: '{}'",
-        duration.elapsed(),
-        normalized_output_dir
-    );
-
-    spinner.finish_and_clear();
-    logger.log_message(LogLevel::Success, &success_message);
-    Ok(BuildStatsInput {
-        statements_by_module: modules_statements,
-        global_store,
-    })
-}

package/rust/cli/check/mod.rs

@@ -1,208 +0,0 @@
-use crate::{
-    config::driver::ProjectConfig,
-    core::{
-        debugger::{
-            lexer::write_lexer_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,
-    },
-};
-use devalang_utils::path::{find_entry_file, normalize_path};
-
-use devalang_utils::{
-    logger::{LogLevel, Logger},
-    spinner::start_spinner,
-    watcher::watch_directory,
-};
-
-#[cfg(feature = "cli")]
-pub fn handle_check_command(
-    config: Option<ProjectConfig>,
-    entry: Option<String>,
-    output: Option<String>,
-    watch: bool,
-    debug: bool,
-) -> Result<(), String> {
-    let fetched_entry = if entry.is_none() {
-        config
-            .as_ref()
-            .and_then(|c| c.defaults.entry.clone())
-            .unwrap_or_default()
-    } else {
-        entry.clone().unwrap_or_default()
-    };
-
-    let fetched_output = if output.is_none() {
-        config
-            .as_ref()
-            .and_then(|c| c.defaults.output.clone())
-            .unwrap_or_default()
-    } else {
-        output.clone().unwrap_or_default()
-    };
-
-    let fetched_watch = if watch {
-        watch
-    } else {
-        config
-            .as_ref()
-            .and_then(|c| c.defaults.watch)
-            .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.",
-        );
-        return Err("missing entry path".to_string());
-    }
-    if fetched_output.is_empty() {
-        logger.log_message(
-            LogLevel::Error,
-            "Output directory is not specified. Please provide a valid output directory.",
-        );
-        return Err("missing output directory".to_string());
-    }
-
-    let entry_file = match find_entry_file(&fetched_entry) {
-        Some(p) => p,
-        None => {
-            logger.log_message(
-                LogLevel::Error,
-                &format!("❌ index.deva not found in directory: {}", fetched_entry),
-            );
-            return Err("index.deva not found".to_string());
-        }
-    };
-
-    // SECTION Begin check
-    if fetched_watch {
-        let _ = begin_check(
-            entry_file.clone(),
-            fetched_output.clone(),
-            debug,
-            config.clone(),
-        );
-
-        logger.log_message(
-            LogLevel::Watcher,
-            &format!("Watching for changes in '{}'...", fetched_entry),
-        );
-
-        let cfg_for_watch = config.clone();
-        watch_directory(entry_file.clone(), move || {
-            logger.log_message(LogLevel::Watcher, "Detected changes, re-checking...");
-            if let Err(e) = begin_check(
-                entry_file.clone(),
-                fetched_output.clone(),
-                debug,
-                cfg_for_watch.clone(),
-            ) {
-                eprintln!("[check] failed: {}", e);
-            }
-        })
-        .unwrap();
-    } else {
-        begin_check(
-            entry_file.clone(),
-            fetched_output.clone(),
-            debug,
-            config.clone(),
-        )?;
-    }
-    Ok(())
-}
-
-fn begin_check(
-    entry: String,
-    output: String,
-    debug: bool,
-    _config: Option<ProjectConfig>,
-) -> Result<(), String> {
-    let spinner = start_spinner("Checking...");
-
-    let duration = std::time::Instant::now();
-
-    let normalized_entry_file = normalize_path(&entry);
-    let normalized_output_dir = normalize_path(&output);
-
-    let mut global_store = GlobalStore::new();
-    let module_loader = ModuleLoader::new(&normalized_entry_file, &normalized_output_dir);
-
-    // 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_modules(&mut global_store);
-
-    // Debugging: Log loaded modules and errors
-    let logger = Logger::new();
-    logger.log_message(LogLevel::Info, "Loaded modules:");
-    for module_name in modules.0.keys() {
-        logger.log_message(LogLevel::Info, &format!("- {}", module_name));
-    }
-
-    if debug {
-        for (module_path, module) in global_store.modules.clone() {
-            write_module_variable_log_file(
-                &normalized_output_dir,
-                &module_path,
-                &module.variable_table,
-            );
-            write_module_function_log_file(
-                &normalized_output_dir,
-                &module_path,
-                &module.function_table,
-            );
-        }
-
-        write_lexer_log_file(
-            &normalized_output_dir,
-            "lexer_tokens.log",
-            modules.0.clone(),
-        );
-        write_preprocessor_log_file(
-            &normalized_output_dir,
-            "resolved_statements.log",
-            modules.1.clone(),
-        );
-        write_variables_log_file(
-            &normalized_output_dir,
-            "global_variables.log",
-            global_store.variables.clone(),
-        );
-        write_function_log_file(
-            &normalized_output_dir,
-            "global_functions.log",
-            global_store.functions.clone(),
-        );
-    }
-
-    let all_errors = crate::core::error::collect_all_errors_with_modules(&modules.1);
-
-    let (warnings, criticals) = crate::core::error::partition_errors(all_errors);
-    crate::core::error::log_errors_with_stack("Check", &warnings, &criticals);
-
-    if !criticals.is_empty() {
-        spinner.finish_and_clear();
-        return Err("check failed with critical errors".to_string());
-    } else {
-        logger.log_message(LogLevel::Success, "No errors detected.");
-
-        let success_message = format!(
-            "Check completed successfully in {:.2?}. Output files written to: '{}'",
-            duration.elapsed(),
-            normalized_output_dir
-        );
-
-        spinner.finish_and_clear();
-        logger.log_message(LogLevel::Success, &success_message);
-    }
-
-    Ok(())
-}