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

package/rust/cli/check.rs

@@ -1,124 +1,117 @@
-use std::{ thread, time::Duration };
-
 use crate::{
+    config::Config,
     core::{
-        debugger::Debugger,
-        preprocessor::module::load_all_modules,
-        types::{
-            statement::{
-                Statement,
-                StatementIterator,
-                StatementKind,
-                StatementResolved,
-                StatementResolvedValue,
-            },
-            variable::VariableValue,
-        },
+        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_check_command(entry: String, output: String) -> () {
-    let entry_file = find_entry_file(&entry).unwrap_or_else(|| {
-        eprintln!("❌ index.deva not found in directory: {}", entry);
+#[cfg(feature = "cli")]
+pub fn handle_check_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();
+
+    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 spinner = with_spinner("Checking...", || {
-        thread::sleep(Duration::from_millis(800));
+    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);
     });
 
-    let duration = std::time::Instant::now();
-
-    let normalized_entry_file = normalize_path(&entry_file);
-    let normalized_output_dir = normalize_path(&output);
-
-    let global_store = load_all_modules(&normalized_entry_file);
+    // SECTION Begin check
+    if fetched_watch {
+        begin_check(entry_file.clone(), fetched_output.clone());
 
-    if let Some(module) = global_store.modules.get(&normalized_entry_file) {
-        let mut module_clone = module.clone();
+        logger.log_message(
+            LogLevel::Watcher,
+            &format!("Watching for changes in '{}'...", fetched_entry)
+        );
 
-        let resolved_statements = execute_statements(&mut module_clone);
+        watch_directory(entry_file.clone(), move || {
+            logger.log_message(LogLevel::Watcher, "Detected changes, re-checking...");
 
-        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());
+            begin_check(entry_file.clone(), fetched_output.clone());
+        }).unwrap();
+    } else {
+        begin_check(entry_file.clone(), fetched_output.clone());
+    }
+}
 
-        let has_errors = resolved_statements.iter().any(|stmt| {
-            match_error_recursively_resolved(&stmt.clone())
-        });
+fn begin_check(entry: String, output: String) {
+    let spinner = with_spinner("Checking...", || {
+        thread::sleep(Duration::from_millis(800));
+    });
 
-        if has_errors {
-            let warning_message = format!(
-                "Check completed with errors in {:.2?}. Output files written to: '{}'",
-                duration.elapsed(),
-                normalized_output_dir
-            );
+    let duration = std::time::Instant::now();
 
-            log_message(&warning_message, "WARNING");
-        } else {
-            let success_message = format!(
-                "Check completed successfully in {:.2?}. Output files written to: '{}'",
-                duration.elapsed(),
-                normalized_output_dir
-            );
+    let normalized_entry_file = normalize_path(&entry);
+    let normalized_output_dir = normalize_path(&output);
 
-            log_message(&success_message, "SUCCESS");
-        }
-    }
-}
+    let mut global_store = GlobalStore::new();
+    let module_loader = ModuleLoader::new(&normalized_entry_file, &normalized_output_dir);
 
-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;
-            }
-        }
-    }
+    // 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);
 
-    false
-}
+    // TODO: Implement debugging
 
-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

@@ -0,0 +1,79 @@
+use std::{ fs, path::Path };
+use include_dir::{ include_dir, Dir };
+use crate::{ cli::template::get_available_templates, utils::file::copy_dir_recursive };
+
+#[cfg(feature = "cli")]
+use inquire::{ Select, Confirm };
+
+static TEMPLATES_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/templates");
+
+#[cfg(feature = "cli")]
+pub fn handle_init_command(name: Option<String>, template: Option<String>) {
+    let current_dir = std::env::current_dir().unwrap();
+    let project_name = name
+        .clone()
+        .unwrap_or_else(|| {
+            current_dir.file_name().unwrap_or_default().to_string_lossy().to_string()
+        });
+
+    // Select a template if not provided
+    let selected_template = template.unwrap_or_else(|| {
+        Select::new("Select a template for your project:", get_available_templates())
+            .prompt()
+            .unwrap_or_else(|_| {
+                eprintln!("No template selected. Exiting...");
+                std::process::exit(1);
+            })
+    });
+
+    if selected_template.is_empty() {
+        eprintln!("Template cannot be empty.");
+        std::process::exit(1);
+    }
+
+    if name.is_none() {
+        // Case of initialization in the current directory
+        if fs::read_dir(&current_dir).unwrap().next().is_some() {
+            let confirm = Confirm::new(
+                "The current directory is not empty. Do you want to continue?"
+            )
+                .with_default(false)
+                .prompt()
+                .unwrap_or(false);
+
+            if !confirm {
+                eprintln!("Operation cancelled by the user.");
+                std::process::exit(0);
+            }
+        }
+
+        scaffold_project_current_dir(current_dir.as_path(), selected_template);
+        println!(
+            "✅ Initialized '{}' project in current directory: {}",
+            project_name,
+            current_dir.display()
+        );
+    } else {
+        // Case of initialization in a new directory
+        let target_path = current_dir.join(&project_name);
+
+        if target_path.exists() {
+            eprintln!("❌ A folder named '{}' already exists.", project_name);
+            std::process::exit(1);
+        }
+
+        fs::create_dir_all(&target_path).expect("Error creating project directory");
+
+        scaffold_project_current_dir(&target_path, selected_template);
+        println!("✅ Initialized '{}' project in: {}", project_name, target_path.display());
+    }
+}
+
+fn scaffold_project_current_dir(path: &Path, template: String) {
+    let template_dir = TEMPLATES_DIR.get_dir(&template).unwrap_or_else(|| {
+        eprintln!("❌ The template '{}' doesn't exist.", template);
+        std::process::exit(1);
+    });
+
+    copy_dir_recursive(template_dir, path, &template_dir.path());
+}

package/rust/cli/mod.rs

@@ -1,3 +1,205 @@
 pub mod check;
-pub mod new;
 pub mod build;
+pub mod init;
+pub mod template;
+pub mod play;
+
+use clap::{ Parser, Subcommand };
+use crate::utils::version::get_version;
+
+#[derive(Parser)]
+#[command(name = "devalang")]
+#[command(author = "Devaloop")]
+#[command(version = get_version())]
+#[command(about = "🦊 Devalang – A programming language for music and sound.")]
+pub struct Cli {
+    #[arg(long, global = true)]
+    /// Skips loading the configuration file.
+    pub no_config: bool,
+
+    #[command(subcommand)]
+    pub command: Commands,
+}
+
+#[derive(Subcommand)]
+pub enum TemplateCommand {
+    /// Lists all available templates for Devalang projects.
+    List,
+    /// Displays information about a specific template.
+    Info {
+        name: String,
+    },
+}
+
+#[derive(Subcommand)]
+pub enum Commands {
+    /// Create a new Devalang project.
+    ///
+    /// ### Arguments
+    /// - `name` - The name of the project to create.
+    /// - `template` - The template to use for the project. Defaults to "default".
+    ///
+    /// ### Example
+    /// ```bash
+    /// devalang init --name my_project --template default
+    ///
+    Init {
+        #[arg(short, long)]
+        /// The optional name (directory) of the project to create.
+        name: Option<String>,
+
+        #[arg(short, long)]
+        /// The template to use for the project.
+        ///
+        /// ### Default value
+        /// - `default`
+        ///
+        template: Option<String>,
+    },
+
+    Template {
+        #[command(subcommand)]
+        /// The template command to execute.
+        command: TemplateCommand,
+    },
+
+    /// Build the program and generate output files.
+    ///
+    /// ### Arguments
+    /// - `entry` - The entry point of the program to build. Defaults to "./src".
+    /// - `output` - The directory where the output files will be generated. Defaults to "./output".
+    /// - `watch` - Whether to watch for changes and rebuild. Defaults to "true".
+    ///
+    /// ### Example
+    /// ```bash
+    /// devalang build --entry ./src --output ./output --watch true
+    /// ```
+    ///
+    Build {
+        #[arg(short, long)]
+        /// The entry point of the program to build.
+        ///
+        entry: Option<String>,
+
+        #[arg(short, long)]
+        /// The directory where the output files will be generated.
+        ///
+        output: Option<String>,
+
+        #[arg(long, default_value_t = false)]
+        /// Whether to watch for changes and rebuild.
+        ///
+        /// ### Default value
+        /// - `false`
+        ///
+        watch: bool,
+
+        #[arg(long, default_value = "real-time")]
+        /// The mode of compilation.
+        ///
+        /// ### Default value
+        /// - `real-time`
+        ///
+        /// ### Possible values
+        /// - `real-time` - Compiles files as soon as possible.
+        /// - `batch` - Compiles files one by one.
+        /// - `check` - Analyzes the code without compiling it.
+        ///
+        compilation_mode: String,
+
+        #[arg(short, long, default_value_t = false)]
+        /// Whether to print debug information.
+        ///
+        /// ### Default value
+        /// - `false`
+        ///
+        debug: bool,
+
+        #[arg(short, long, default_value_t = false)]
+        /// Whether to compress the output files.
+        ///
+        /// ### Default value
+        /// - `false`
+        ///
+        compress: bool,
+    },
+
+    /// Analyze the program for errors and warnings.
+    ///
+    /// ### Arguments
+    /// - `entry` - The entry point of the program to analyze. Defaults to "./src".
+    /// - `watch` - Whether to watch for changes and re-analyze. Defaults to "true".
+    ///
+    /// ### Example
+    /// ```bash
+    /// devalang check --entry ./src --watch true --compilation-mode real-time
+    /// ```
+    Check {
+        #[arg(short, long)]
+        /// The entry point of the program to analyze.
+        ///
+        entry: Option<String>,
+
+        #[arg(short, long)]
+        /// The directory where the output files will be generated.
+        ///
+        output: Option<String>,
+
+        #[arg(long, default_value_t = false)]
+        /// Whether to watch for changes and re-analyze.
+        ///
+        /// ### Default value
+        /// - `false`
+        ///
+        watch: bool,
+
+        #[arg(short, long, default_value = "real-time")]
+        /// The mode of compilation.
+        ///
+        /// ### Default value
+        /// - `real-time`
+        ///
+        /// ### Possible values
+        /// - `real-time` - Analyzes files as soon as possible.
+        /// - `batch` - Analyzes files one by one.
+        /// - `check` - Analyzes the code without compiling it.
+        ///
+        compilation_mode: String,
+
+        #[arg(short, long, default_value_t = false)]
+        /// Whether to print debug information.
+        ///
+        /// ### Default value
+        /// - `false`
+        ///
+        debug: bool,
+    },
+
+    Play {
+        #[arg(short, long)]
+        /// The entry point of the program to play.
+        ///
+        entry: Option<String>,
+
+        #[arg(short, long)]
+        /// The directory where the output files will be generated.
+        ///
+        output: Option<String>,
+
+        #[arg(long, default_value_t = false)]
+        /// Whether to watch for changes and re-play.
+        ///
+        /// ### Default value
+        /// - `false`
+        ///
+        watch: bool,
+
+        #[arg(long, default_value_t = false)]
+        /// Whether to replay the program after it finishes.
+        ///
+        /// ### Default value
+        /// - `false`
+        ///
+        repeat: bool,
+    },
+}

package/rust/cli/play.rs

@@ -0,0 +1,193 @@
+use crate::{
+    config::Config,
+    core::{
+        builder::Builder,
+        debugger::{ lexer::write_lexer_log_file, preprocessor::write_preprocessor_log_file },
+        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::{ path::Path, sync::mpsc::channel, thread, time::Duration };
+use std::fs;
+use std::collections::HashMap;
+
+#[cfg(feature = "cli")]
+pub fn handle_play_command(
+    config: Option<Config>,
+    entry: Option<String>,
+    output: Option<String>,
+    watch: bool,
+    repeat: bool
+) {
+    use crate::core::audio::player::AudioPlayer;
+
+    let logger = Logger::new();
+
+    let entry_path = entry
+        .or_else(|| config.as_ref().and_then(|c| c.defaults.entry.clone()))
+        .unwrap_or_else(|| "".to_string());
+
+    let output_path = output
+        .or_else(|| config.as_ref().and_then(|c| c.defaults.output.clone()))
+        .unwrap_or_else(|| "".to_string());
+
+    let fetched_repeat = if repeat {
+        true
+    } else {
+        config
+            .as_ref()
+            .and_then(|c| c.defaults.repeat)
+            .unwrap_or(false)
+    };
+
+    if entry_path.is_empty() || output_path.is_empty() {
+        logger.log_message(LogLevel::Error, "Entry or output path not specified.");
+        std::process::exit(1);
+    }
+
+    let entry_file = find_entry_file(&entry_path).unwrap_or_else(|| {
+        logger.log_message(LogLevel::Error, "index.deva not found");
+        std::process::exit(1);
+    });
+
+    let audio_file = format!("{}/audio/index.wav", normalize_path(&output_path));
+    let mut audio_player = AudioPlayer::new();
+
+    if watch && fetched_repeat {
+        logger.log_message(
+            LogLevel::Error,
+            "Watch and repeat cannot be used together. Use repeat instead."
+        );
+        std::process::exit(1);
+    }
+
+    if watch {
+        let (tx, rx) = channel::<()>();
+
+        // Thread 1 : Watcher sending changes
+        let entry_clone = entry_path.clone();
+        thread::spawn(move || {
+            let _ = watch_directory(entry_clone, move || {
+                let _ = tx.send(()); // signal a change
+            });
+        });
+
+        // Main thread: build + play in a loop
+        begin_play(&config, &entry_file, &output_path);
+        audio_player.play_file_once(&audio_file);
+
+        logger.log_message(LogLevel::Watcher, "Watching for changes... Press Ctrl+C to exit.");
+
+        while let Ok(_) = rx.recv() {
+            logger.log_message(LogLevel::Watcher, "Change detected, rebuilding...");
+
+            begin_play(&config, &entry_file, &output_path);
+
+            logger.log_message(LogLevel::Info, "🎵 Playback started (once mode)...");
+
+            audio_player.play_file_once(&audio_file);
+        }
+    } else if fetched_repeat {
+        // Initial build to start from a clean slate
+        begin_play(&config, &entry_file, &output_path);
+
+        logger.log_message(LogLevel::Info, "🎵 Playback started (repeat mode)...");
+
+        let mut last_snapshot = snapshot_files(&entry_path);
+        let mut audio_player = AudioPlayer::new();
+        audio_player.play_file_once(&audio_file);
+
+        loop {
+            let current_snapshot = snapshot_files(&entry_path);
+            let has_changed = files_changed(&last_snapshot, &current_snapshot);
+
+            if has_changed {
+                logger.log_message(LogLevel::Info, "Change detected, rebuilding in background...");
+                let entry_file = entry_file.clone();
+                let output_path = output_path.clone();
+                let config_clone = config.clone();
+
+                // Rebuild in a separate thread
+                std::thread::spawn(move || {
+                    begin_play(&config_clone, &entry_file, &output_path);
+                });
+
+                last_snapshot = current_snapshot;
+            }
+
+            // Wait for the audio to finish without blocking the current playback
+            audio_player.wait_until_end();
+
+            // Then replay the audio (rebuilt or not)
+            audio_player.play_file_once(&audio_file);
+        }
+    } else {
+        // Single execution
+        begin_play(&config, &entry_file, &output_path);
+        
+        logger.log_message(LogLevel::Info, "🎵 Playback started (once mode)...");
+
+        audio_player.play_file_once(&audio_file);
+        audio_player.wait_until_end();
+    }
+}
+
+fn begin_play(config: &Option<Config>, entry_file: &str, output: &str) {
+    let spinner = with_spinner("Building...", || {
+        thread::sleep(Duration::from_millis(800));
+    });
+
+    let normalized_entry = normalize_path(entry_file);
+    let normalized_output_dir = normalize_path(&output);
+
+    let duration = std::time::Instant::now();
+    let mut global_store = GlobalStore::new();
+    let loader = ModuleLoader::new(&normalized_entry, &normalized_output_dir);
+    let (modules_tokens, modules_statements) = loader.load_all_modules(&mut global_store);
+
+    // SECTION Write logs
+    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()
+    );
+
+    // SECTION Building AST and Audio
+    let builder = Builder::new();
+    builder.build_ast(&modules_statements, &output);
+    builder.build_audio(&modules_statements, &output, &mut global_store);
+
+    // SECTION Logging
+    let logger = Logger::new();
+    let success_message = format!(
+        "Build completed successfully in {:.2?}. Output files written to: '{}'",
+        duration.elapsed(),
+        normalized_output_dir
+    );
+
+    logger.log_message(LogLevel::Success, &success_message);
+}
+
+fn snapshot_files<P: AsRef<Path>>(dir: P) -> HashMap<String, u64> {
+    let mut map = HashMap::new();
+    if let Ok(entries) = fs::read_dir(dir) {
+        for entry in entries.flatten() {
+            if let Ok(meta) = entry.metadata() {
+                if let Ok(mtime) = meta.modified() {
+                    if let Ok(duration) = mtime.duration_since(std::time::UNIX_EPOCH) {
+                        map.insert(entry.path().display().to_string(), duration.as_secs());
+                    }
+                }
+            }
+        }
+    }
+    map
+}
+
+fn files_changed(old: &HashMap<String, u64>, new: &HashMap<String, u64>) -> bool {
+    old != new
+}