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

package/rust/main.rs

@@ -51,7 +51,7 @@ async fn main() -> io::Result<()> {
     cmd = cmd.version(version_static).before_help(signature_static);
 
     let raw_args: Vec<String> = std::env::args().collect();
-    if raw_args.iter().any(|a| a == "--version" || a == "-V") {
+    if raw_args.iter().any(|a| (a == "--version" || a == "-V")) {
         println!("{}", signature_static);
         return Ok(());
     }
@@ -121,8 +121,21 @@ async fn main() -> io::Result<()> {
             watch,
             debug,
             compress,
+            output_format,
+            audio_format,
+            sample_rate,
         } => {
-            if let Err(err) = handle_build_command(config, entry, output, watch, debug, compress) {
+            if let Err(err) = handle_build_command(
+                config,
+                entry,
+                output,
+                output_format,
+                audio_format,
+                sample_rate,
+                watch,
+                debug,
+                compress,
+            ) {
                 let logger = devalang_utils::logger::Logger::new();
                 logger.log_message(
                     devalang_utils::logger::LogLevel::Error,
@@ -137,11 +150,22 @@ async fn main() -> io::Result<()> {
         Commands::Play {
             entry,
             output,
+            sample_rate,
             watch,
             repeat,
             debug,
+            audio_format,
         } => {
-            if let Err(err) = handle_play_command(config, entry, output, watch, repeat, debug) {
+            if let Err(err) = handle_play_command(
+                config,
+                entry,
+                output,
+                audio_format,
+                sample_rate,
+                watch,
+                repeat,
+                debug,
+            ) {
                 let logger = devalang_utils::logger::Logger::new();
                 logger.log_message(
                     devalang_utils::logger::LogLevel::Error,

package/rust/types/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "devalang_types"
-version = "0.0.2"
+version = "0.0.3"
 description = "Types and traits for Devalang"
 license = "MIT"
 authors = ["Devaloop <contact@devaloop.com>"]

package/rust/types/src/addons.rs

@@ -1,55 +1,55 @@
-use serde::Deserialize;
-
-#[derive(Debug, Clone)]
-pub struct DiscoveredAddon {
-    pub path: std::path::PathBuf,
-    pub name: String,
-    pub extension: String,
-    pub addon_type: String,
-}
-
-#[derive(Debug, Clone)]
-pub struct AddonWithMetadata {
-    pub name: String,
-    pub path: String,
-    pub addon_type: String,
-    pub metadata: AddonMetadata,
-}
-
-#[derive(Debug, Clone)]
-pub struct AddonMetadata {
-    pub name: String,
-    pub author: String,
-    pub version: String,
-    pub description: String,
-    pub access: String,
-}
-
-#[derive(Debug, Clone)]
-pub enum AddonType {
-    Bank,
-    Plugin,
-    Preset,
-    Template,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct BankInfo {
-    pub name: String,
-    pub version: String,
-    pub description: String,
-    pub author: String,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct BankFile {
-    pub bank: BankInfo,
-    pub triggers: Option<Vec<BankTrigger>>,
-    pub audio_path: Option<String>,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct BankTrigger {
-    pub name: String,
-    pub path: String,
-}
+use serde::Deserialize;
+
+#[derive(Debug, Clone)]
+pub struct DiscoveredAddon {
+    pub path: std::path::PathBuf,
+    pub name: String,
+    pub extension: String,
+    pub addon_type: String,
+}
+
+#[derive(Debug, Clone)]
+pub struct AddonWithMetadata {
+    pub name: String,
+    pub path: String,
+    pub addon_type: String,
+    pub metadata: AddonMetadata,
+}
+
+#[derive(Debug, Clone)]
+pub struct AddonMetadata {
+    pub name: String,
+    pub author: String,
+    pub version: String,
+    pub description: String,
+    pub access: String,
+}
+
+#[derive(Debug, Clone)]
+pub enum AddonType {
+    Bank,
+    Plugin,
+    Preset,
+    Template,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct BankInfo {
+    pub name: String,
+    pub version: String,
+    pub description: String,
+    pub author: String,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct BankFile {
+    pub bank: BankInfo,
+    pub triggers: Option<Vec<BankTrigger>>,
+    pub audio_path: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct BankTrigger {
+    pub name: String,
+    pub path: String,
+}

package/rust/types/src/config.rs

@@ -1,74 +1,84 @@
-use serde::{Deserialize, Serialize};
-use toml::Value as TomlValue;
-
-use crate::TelemetrySettings;
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct PluginExport {
-    pub name: String,
-    pub kind: String,
-    /// Optional default value provided by the plugin manifest (keeps toml::Value to preserve types)
-    #[serde(default)]
-    pub default: Option<TomlValue>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct PluginInfo {
-    pub author: String,
-    pub name: String,
-    /// Optional version string when available from a plugin file
-    #[serde(default)]
-    pub version: Option<String>,
-    /// Optional human-friendly description
-    #[serde(default)]
-    pub description: Option<String>,
-    pub exports: Vec<PluginExport>,
-}
-
-// --- Config types (centralised) ------------------------------------------
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
-pub struct ProjectConfig {
-    pub defaults: ProjectConfigDefaults,
-    pub banks: Option<Vec<ProjectConfigBankEntry>>,
-    pub plugins: Option<Vec<ProjectConfigPluginEntry>>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
-pub struct ProjectConfigDefaults {
-    pub entry: Option<String>,
-    pub output: Option<String>,
-    pub watch: Option<bool>,
-    pub repeat: Option<bool>,
-    pub debug: Option<bool>,
-    pub compress: Option<bool>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
-pub struct ProjectConfigBankEntry {
-    pub path: String,
-    pub version: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
-pub struct ProjectConfigPluginEntry {
-    pub path: String,
-    pub version: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
-pub struct PluginEntry {
-    pub path: String,
-    #[serde(default)]
-    pub version: String,
-    #[serde(default)]
-    pub author: String,
-    #[serde(default)]
-    pub access: String,
-}
-
-#[derive(Serialize, Deserialize, Default, Debug)]
-pub struct UserSettings {
-    pub session: String,
-    pub telemetry: TelemetrySettings,
-}
+use serde::{Deserialize, Serialize};
+use toml::Value as TomlValue;
+
+use crate::TelemetrySettings;
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub struct PluginExport {
+    pub name: String,
+    pub kind: String,
+    /// Optional default value provided by the plugin manifest (keeps toml::Value to preserve types)
+    #[serde(default)]
+    pub default: Option<TomlValue>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub struct PluginInfo {
+    pub author: String,
+    pub name: String,
+    /// Optional version string when available from a plugin file
+    #[serde(default)]
+    pub version: Option<String>,
+    /// Optional human-friendly description
+    #[serde(default)]
+    pub description: Option<String>,
+    pub exports: Vec<PluginExport>,
+}
+
+// --- Config types (centralised) ------------------------------------------
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
+pub struct ProjectConfig {
+    pub defaults: ProjectConfigDefaults,
+    pub banks: Option<Vec<ProjectConfigBankEntry>>,
+    pub plugins: Option<Vec<ProjectConfigPluginEntry>>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
+pub struct ProjectConfigDefaults {
+    pub entry: Option<String>,
+    pub output: Option<String>,
+    pub watch: Option<bool>,
+    pub repeat: Option<bool>,
+    pub debug: Option<bool>,
+    pub compress: Option<bool>,
+    pub sample_rate: Option<u32>,
+    /// Preferred audio format for exports (e.g. "wav16", "wav24", "wav32").
+    /// Stored as a string to avoid cross-crate enum coupling.
+    #[serde(default)]
+    pub audio_format: Option<String>,
+
+    /// Preferred output formats (e.g. ["wav", "mid"]).
+    /// Stored as a list of strings for flexibility and backwards compatibility.
+    #[serde(default)]
+    pub output_format: Option<Vec<String>>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
+pub struct ProjectConfigBankEntry {
+    pub path: String,
+    pub version: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
+pub struct ProjectConfigPluginEntry {
+    pub path: String,
+    pub version: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
+pub struct PluginEntry {
+    pub path: String,
+    #[serde(default)]
+    pub version: String,
+    #[serde(default)]
+    pub author: String,
+    #[serde(default)]
+    pub access: String,
+}
+
+#[derive(Serialize, Deserialize, Default, Debug)]
+pub struct UserSettings {
+    pub session: String,
+    pub telemetry: TelemetrySettings,
+}

package/rust/types/src/lib.rs

@@ -1,12 +1,15 @@
-//! Common shared types for Devalang
-
-pub mod addons;
-pub mod ast;
-pub mod config;
-pub mod telemetry;
-
-// Re-exports for convenience
-pub use addons::*;
-pub use ast::*;
-pub use config::*;
-pub use telemetry::*;
+//! Common shared types for Devalang
+
+pub mod addons;
+pub mod ast;
+pub mod config;
+pub mod telemetry;
+pub mod store;
+pub mod plugin;
+
+// Re-exports for convenience
+pub use addons::*;
+pub use ast::*;
+pub use config::*;
+pub use telemetry::*;
+pub use store::*;

package/rust/types/src/plugin.rs

@@ -0,0 +1,20 @@
+use serde::{Deserialize, Serialize};
+use toml::Value as TomlValue;
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub struct PluginExport {
+    pub name: String,
+    #[serde(rename = "type")]
+    pub kind: String,
+    #[serde(default)]
+    pub default: Option<TomlValue>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub struct PluginInfo {
+    pub author: String,
+    pub name: String,
+    pub version: Option<String>,
+    pub description: Option<String>,
+    pub exports: Vec<PluginExport>,
+}

package/rust/types/src/store.rs

@@ -0,0 +1,139 @@
+use std::collections::HashMap;
+
+use crate::ast::Value;
+
+#[derive(Debug, Default, Clone, PartialEq)]
+pub struct VariableTable {
+    pub variables: HashMap<String, Value>,
+    pub parent: Option<Box<VariableTable>>,
+}
+
+impl VariableTable {
+    pub fn new() -> Self {
+        VariableTable {
+            variables: HashMap::new(),
+            parent: None,
+        }
+    }
+
+    pub fn set(&mut self, name: String, value: Value) {
+        self.variables.insert(name, value);
+    }
+
+    pub fn with_parent(parent: VariableTable) -> Self {
+        Self {
+            variables: HashMap::new(),
+            parent: Some(Box::new(parent)),
+        }
+    }
+
+    pub fn get(&self, name: &str) -> Option<&Value> {
+        if let Some(v) = self.variables.get(name) {
+            return Some(v);
+        }
+        let mut current = &self.parent;
+        while let Some(boxed) = current {
+            if let Some(v) = boxed.variables.get(name) {
+                return Some(v);
+            }
+            current = &boxed.parent;
+        }
+        None
+    }
+
+    pub fn remove(&mut self, name: &str) -> Option<Value> {
+        self.variables.remove(name)
+    }
+}
+
+#[derive(Debug, Default, Clone, PartialEq)]
+pub struct ImportTable {
+    pub imports: HashMap<String, Value>,
+}
+
+impl ImportTable {
+    pub fn new() -> Self {
+        ImportTable {
+            imports: HashMap::new(),
+        }
+    }
+
+    pub fn add_import(&mut self, name: String, value: Value) {
+        self.imports.insert(name, value);
+    }
+
+    pub fn get_import(&self, name: &str) -> Option<&Value> {
+        self.imports.get(name)
+    }
+
+    pub fn remove_import(&mut self, name: &str) -> Option<Value> {
+        self.imports.remove(name)
+    }
+}
+
+use crate::ast::Statement;
+
+#[derive(Debug, Clone)]
+pub struct FunctionDef {
+    pub name: String,
+    pub parameters: Vec<String>,
+    pub body: Vec<Statement>,
+}
+
+#[derive(Debug, Clone)]
+pub struct FunctionTable {
+    pub functions: HashMap<String, FunctionDef>,
+}
+
+impl Default for FunctionTable {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl FunctionTable {
+    pub fn new() -> Self {
+        FunctionTable {
+            functions: HashMap::new(),
+        }
+    }
+
+    pub fn add_function(&mut self, function: FunctionDef) {
+        self.functions.insert(function.name.clone(), function);
+    }
+
+    pub fn get_function(&self, name: &str) -> Option<&FunctionDef> {
+        self.functions.get(name)
+    }
+
+    pub fn remove_function(&mut self, name: &str) -> Option<FunctionDef> {
+        self.functions.remove(name)
+    }
+}
+
+#[derive(Debug, Default, Clone, PartialEq)]
+pub struct ExportTable {
+    pub exports: HashMap<String, Value>,
+}
+
+impl ExportTable {
+    pub fn new() -> Self {
+        ExportTable {
+            exports: HashMap::new(),
+        }
+    }
+
+    pub fn add_export(&mut self, name: String, value: Value) {
+        self.exports.insert(name, value);
+    }
+
+    pub fn get_export(&self, name: &str) -> Option<&Value> {
+        self.exports.get(name)
+    }
+
+    pub fn remove_export(&mut self, name: &str) -> Option<Value> {
+        self.exports.remove(name)
+    }
+}
+
+// GlobalStore lives in core to avoid cyclic dependencies (it references Module).