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

package/rust/cli/build.rs

@@ -1,51 +1,137 @@
-use std::{ thread, time::Duration };
-
 use crate::{
+    config::driver::Config,
     core::{
-        builder::{ build_ast, write_ast_to_file },
-        debugger::Debugger,
-        preprocessor::module::load_all_modules,
+        builder::Builder,
+        debugger::{
+            lexer::write_lexer_log_file,
+            preprocessor::write_preprocessor_log_file,
+            store::write_store_log_file,
+        },
+        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 };
+
+#[cfg(feature = "cli")]
+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();
+
+    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);
+    }
 
-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);
+    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_tokens, modules_statements) = module_loader.load_all_modules(&mut global_store);
 
-        let resolved_statements = execute_statements(&mut module_clone);
+    // 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()
+    );
+    write_store_log_file(&normalized_output_dir, "global_store.log", global_store.modules.clone());
 
-        let ast = build_ast(&resolved_statements);
+    // SECTION Building AST and Audio
+    let builder = Builder::new();
+    builder.build_ast(&modules_statements, &normalized_output_dir);
+    builder.build_audio(&modules_statements, &normalized_output_dir, &mut global_store);
 
-        let ast_dir = format!("{}/json", normalized_output_dir.clone());
-        write_ast_to_file(&ast, &ast_dir);
+    // SECTION Logging
+    let logger = Logger::new();
 
-        let debugger = Debugger::new(&module_clone);
-        let debug_dir = format!("{}/debug/", normalized_output_dir.clone());
-        debugger.write_files(debug_dir.as_str(), resolved_statements);
+    let success_message = format!(
+        "Build completed successfully in {:.2?}. Output files written to: '{}'",
+        duration.elapsed(),
+        normalized_output_dir
+    );
 
-        let success_message = format!(
-            "Build completed successfully in {:.2?}. Output files written to: '{}'",
-            duration.elapsed(),
-            normalized_output_dir
-        );
-        log_message(&success_message, "SUCCESS");
-    }
+    logger.log_message(LogLevel::Success, &success_message);
 }

package/rust/cli/check.rs

@@ -1,124 +1,117 @@
-use std::{ thread, time::Duration };
-
 use crate::{
+    config::driver::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/driver.rs

@@ -0,0 +1,280 @@
+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 InstallCommand {
+    /// Installs a bank.
+    Bank {
+        name: String,
+    },
+}
+
+#[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 BankCommand {
+    /// Lists installed banks.
+    List,
+    /// Lists all available banks.
+    Available,
+    /// Displays information about a specific bank.
+    Info {
+        name: String,
+    },
+    /// Removes a bank.
+    Remove {
+        name: String,
+    },
+    /// Updates a specific or all banks.
+    Update {
+        name: Option<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>,
+    },
+
+    /// Manage templates for Devalang projects.
+    ///
+    /// ### Subcommands
+    /// - `list` - Lists all available templates.
+    /// - `info <name>` - Displays information about a specific template.
+    ///
+    /// ### Example
+    /// ```bash
+    /// devalang template list
+    /// devalang template info my_template
+    /// ```bash
+    ///
+    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".
+    /// - `output` - The directory where the output files will be generated. Defaults to "./output".
+    /// - `watch` - Whether to watch for changes and re-analyze. Defaults to "true".
+    /// - `compilation_mode` - The mode of compilation. Defaults to "real-time".
+    /// - `debug` - Whether to print debug information. Defaults to "false".
+    ///
+    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 the program and generate output files.
+    ///
+    /// ### Arguments
+    /// - `entry` - The entry point of the program to play. Defaults to "./src".
+    /// - `output` - The directory where the output files will be generated. Defaults to "./output".
+    /// - `watch` - Whether to watch for changes and re-play. Defaults to "false".
+    /// - `repeat` - Whether to replay the program after it finishes. Defaults to "false".
+    ///
+    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,
+    },
+
+    /// Update the Devalang CLI to the latest version.
+    ///
+    /// ### Arguments
+    /// - `only` - Selects what to update (separated by commas). Defaults to updating all components.
+    ///
+    Update {
+        // #[arg(long, default_value_t = false)]
+        /// Whether to allow updates when the working directory is dirty.
+        // allow_dirty: bool,
+
+        #[arg(long, default_value = "")]
+        /// Selects what to update (separated by commas).
+        only: Option<String>,
+    },
+
+    /// Install templates, banks, or plugins.
+    ///
+    /// ### Subcommands
+    /// - `template` - Installs a template.
+    /// - `bank` - Installs a bank.
+    /// - `plugin` - Installs a plugin.
+    ///
+    Install {
+        #[command(subcommand)]
+        command: InstallCommand,
+    },
+
+    /// Manage banks for Devalang projects.
+    ///
+    /// ### Subcommands
+    /// - `list` - Lists all available banks.
+    /// - `info <name>` - Displays information about a specific bank.
+    ///
+    Bank {
+        #[command(subcommand)]
+        command: BankCommand,
+    },
+}