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

package/rust/types/src/telemetry.rs

@@ -1,85 +1,85 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
-pub enum TelemetryErrorLevel {
-    #[default]
-    None,
-    Warning,
-    Critical,
-}
-
-#[derive(Debug)]
-pub enum TelemetrySendError {
-    Http(String),
-}
-
-#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
-pub struct TelemetryProjectInfo {
-    pub config: Option<TelemetryProjectInfoConfig>,
-    pub stats: Option<TelemetryProjectInfoStats>,
-}
-
-#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
-pub struct TelemetryProjectInfoStats {
-    pub counts: TelemetryProjectInfoStatsCounts,
-    pub features: TelemetryProjectInfoStatsFeatures,
-    pub audio: TelemetryProjectInfoStatsAudio,
-}
-
-#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
-pub struct TelemetryProjectInfoStatsCounts {
-    pub nb_files: usize,
-    pub nb_modules: usize,
-    pub nb_lines: usize,
-    pub nb_banks: usize,
-    pub nb_plugins: usize,
-}
-
-#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
-pub struct TelemetryProjectInfoStatsFeatures {
-    pub uses_imports: bool,
-    pub uses_functions: bool,
-    pub uses_groups: bool,
-    pub uses_automations: bool,
-    pub uses_loops: bool,
-}
-
-#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
-pub struct TelemetryProjectInfoStatsAudio {
-    pub avg_bpm: Option<u32>,
-    pub has_synths: bool,
-    pub has_samples: bool,
-}
-
-#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
-pub struct TelemetryProjectInfoConfig {
-    pub entry_defined: bool,
-    pub output_defined: bool,
-    pub watch_defined: bool,
-    pub repeat_defined: bool,
-    pub debug_defined: bool,
-    pub compress_defined: bool,
-}
-
-#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
-pub struct TelemetryEvent {
-    pub uuid: String,
-    pub cli_version: String,
-    pub os: String,
-    pub command: Vec<String>,
-    pub project_info: Option<TelemetryProjectInfo>,
-    pub error_level: TelemetryErrorLevel,
-    pub error_message: Option<String>,
-    pub exit_code: Option<i32>,
-    pub timestamp: String,
-    pub duration: u64,
-    pub success: bool,
-}
-
-#[derive(Serialize, Deserialize, Default, Debug)]
-pub struct TelemetrySettings {
-    pub uuid: String,
-    pub stats: bool,
-    pub level: String,
-    pub enabled: bool,
-}
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
+pub enum TelemetryErrorLevel {
+    #[default]
+    None,
+    Warning,
+    Critical,
+}
+
+#[derive(Debug)]
+pub enum TelemetrySendError {
+    Http(String),
+}
+
+#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
+pub struct TelemetryProjectInfo {
+    pub config: Option<TelemetryProjectInfoConfig>,
+    pub stats: Option<TelemetryProjectInfoStats>,
+}
+
+#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
+pub struct TelemetryProjectInfoStats {
+    pub counts: TelemetryProjectInfoStatsCounts,
+    pub features: TelemetryProjectInfoStatsFeatures,
+    pub audio: TelemetryProjectInfoStatsAudio,
+}
+
+#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
+pub struct TelemetryProjectInfoStatsCounts {
+    pub nb_files: usize,
+    pub nb_modules: usize,
+    pub nb_lines: usize,
+    pub nb_banks: usize,
+    pub nb_plugins: usize,
+}
+
+#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
+pub struct TelemetryProjectInfoStatsFeatures {
+    pub uses_imports: bool,
+    pub uses_functions: bool,
+    pub uses_groups: bool,
+    pub uses_automations: bool,
+    pub uses_loops: bool,
+}
+
+#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
+pub struct TelemetryProjectInfoStatsAudio {
+    pub avg_bpm: Option<u32>,
+    pub has_synths: bool,
+    pub has_samples: bool,
+}
+
+#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
+pub struct TelemetryProjectInfoConfig {
+    pub entry_defined: bool,
+    pub output_defined: bool,
+    pub watch_defined: bool,
+    pub repeat_defined: bool,
+    pub debug_defined: bool,
+    pub compress_defined: bool,
+}
+
+#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
+pub struct TelemetryEvent {
+    pub uuid: String,
+    pub cli_version: String,
+    pub os: String,
+    pub command: Vec<String>,
+    pub project_info: Option<TelemetryProjectInfo>,
+    pub error_level: TelemetryErrorLevel,
+    pub error_message: Option<String>,
+    pub exit_code: Option<i32>,
+    pub timestamp: String,
+    pub duration: u64,
+    pub success: bool,
+}
+
+#[derive(Serialize, Deserialize, Default, Debug)]
+pub struct TelemetrySettings {
+    pub uuid: String,
+    pub stats: bool,
+    pub level: String,
+    pub enabled: bool,
+}

package/rust/utils/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "devalang_utils"
-version = "0.0.1"
+version = "0.0.2"
 description = "Utility functions and types for Devalang"
 license = "MIT"
 authors = ["Devaloop <contact@devaloop.com>"]
 edition = "2024"
 
 [dependencies]
-devalang_types = { path = "../types", version = "0.0.2" }
+devalang_types = { path = "../types", version = "0.0.3" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 include_dir = "0.7"

package/rust/utils/src/file.rs

@@ -1,94 +1,94 @@
-use include_dir::{Dir, DirEntry};
-use std::{fs, path::Path};
-
-pub fn copy_dir_recursive(dir: &Dir, target_root: &Path, base_path: &Path) {
-    for entry in dir.entries() {
-        match entry {
-            DirEntry::Dir(subdir) => {
-                copy_dir_recursive(subdir, target_root, base_path);
-            }
-            DirEntry::File(file) => {
-                // Compute the destination path relative to the provided base.
-                let rel_path = match file.path().strip_prefix(base_path) {
-                    Ok(p) => p.to_owned(),
-                    Err(_) => {
-                        eprintln!(
-                            "Warning: failed to compute relative path for {:?}, skipping",
-                            file.path()
-                        );
-                        continue;
-                    }
-                };
-
-                let dest_path = target_root.join(rel_path);
-
-                if let Some(parent) = dest_path.parent() {
-                    if let Err(e) = fs::create_dir_all(parent) {
-                        eprintln!(
-                            "Warning: failed to create directory {}: {}",
-                            parent.display(),
-                            e
-                        );
-                        continue;
-                    }
-                }
-
-                if let Err(e) = fs::write(&dest_path, file.contents()) {
-                    eprintln!("Warning: failed to write {}: {}", dest_path.display(), e);
-                    continue;
-                }
-            }
-        }
-    }
-}
-
-pub fn format_file_size(bytes: u64) -> String {
-    const KB: u64 = 1024;
-    const MB: u64 = 1024 * 1024;
-
-    if bytes >= MB {
-        format!("{:.2} Mb", (bytes as f64) / (MB as f64))
-    } else if bytes >= KB {
-        format!("{:.2} Kb", (bytes as f64) / (KB as f64))
-    } else {
-        format!("{} bytes", bytes)
-    }
-}
-
-pub fn extract_zip_safely(archive_path: &Path, dest: &Path) -> Result<(), String> {
-    let file = std::fs::File::open(archive_path)
-        .map_err(|e| format!("Failed to open archive {}: {}", archive_path.display(), e))?;
-    let mut archive = zip::ZipArchive::new(file)
-        .map_err(|e| format!("Failed to read archive {}: {}", archive_path.display(), e))?;
-
-    for i in 0..archive.len() {
-        let mut file = archive
-            .by_index(i)
-            .map_err(|e| format!("Failed to access archive entry {}: {}", i, e))?;
-
-        let enclosed = match file.enclosed_name() {
-            Some(path) => path.to_owned(),
-            None => {
-                continue;
-            }
-        };
-
-        let outpath = dest.join(enclosed);
-
-        if file.name().ends_with('/') || file.is_dir() {
-            std::fs::create_dir_all(&outpath)
-                .map_err(|e| format!("Failed to create dir {}: {}", outpath.display(), e))?;
-        } else {
-            if let Some(p) = outpath.parent() {
-                std::fs::create_dir_all(p)
-                    .map_err(|e| format!("Failed to create parent {}: {}", p.display(), e))?;
-            }
-            let mut outfile = std::fs::File::create(&outpath)
-                .map_err(|e| format!("Failed to create file {}: {}", outpath.display(), e))?;
-            std::io::copy(&mut file, &mut outfile)
-                .map_err(|e| format!("Failed to write file {}: {}", outpath.display(), e))?;
-        }
-    }
-
-    Ok(())
-}
+use include_dir::{Dir, DirEntry};
+use std::{fs, path::Path};
+
+pub fn copy_dir_recursive(dir: &Dir, target_root: &Path, base_path: &Path) {
+    for entry in dir.entries() {
+        match entry {
+            DirEntry::Dir(subdir) => {
+                copy_dir_recursive(subdir, target_root, base_path);
+            }
+            DirEntry::File(file) => {
+                // Compute the destination path relative to the provided base.
+                let rel_path = match file.path().strip_prefix(base_path) {
+                    Ok(p) => p.to_owned(),
+                    Err(_) => {
+                        eprintln!(
+                            "Warning: failed to compute relative path for {:?}, skipping",
+                            file.path()
+                        );
+                        continue;
+                    }
+                };
+
+                let dest_path = target_root.join(rel_path);
+
+                if let Some(parent) = dest_path.parent() {
+                    if let Err(e) = fs::create_dir_all(parent) {
+                        eprintln!(
+                            "Warning: failed to create directory {}: {}",
+                            parent.display(),
+                            e
+                        );
+                        continue;
+                    }
+                }
+
+                if let Err(e) = fs::write(&dest_path, file.contents()) {
+                    eprintln!("Warning: failed to write {}: {}", dest_path.display(), e);
+                    continue;
+                }
+            }
+        }
+    }
+}
+
+pub fn format_file_size(bytes: u64) -> String {
+    const KB: u64 = 1024;
+    const MB: u64 = 1024 * 1024;
+
+    if bytes >= MB {
+        format!("{:.2} Mb", (bytes as f64) / (MB as f64))
+    } else if bytes >= KB {
+        format!("{:.2} Kb", (bytes as f64) / (KB as f64))
+    } else {
+        format!("{} bytes", bytes)
+    }
+}
+
+pub fn extract_zip_safely(archive_path: &Path, dest: &Path) -> Result<(), String> {
+    let file = std::fs::File::open(archive_path)
+        .map_err(|e| format!("Failed to open archive {}: {}", archive_path.display(), e))?;
+    let mut archive = zip::ZipArchive::new(file)
+        .map_err(|e| format!("Failed to read archive {}: {}", archive_path.display(), e))?;
+
+    for i in 0..archive.len() {
+        let mut file = archive
+            .by_index(i)
+            .map_err(|e| format!("Failed to access archive entry {}: {}", i, e))?;
+
+        let enclosed = match file.enclosed_name() {
+            Some(path) => path.to_owned(),
+            None => {
+                continue;
+            }
+        };
+
+        let outpath = dest.join(enclosed);
+
+        if file.name().ends_with('/') || file.is_dir() {
+            std::fs::create_dir_all(&outpath)
+                .map_err(|e| format!("Failed to create dir {}: {}", outpath.display(), e))?;
+        } else {
+            if let Some(p) = outpath.parent() {
+                std::fs::create_dir_all(p)
+                    .map_err(|e| format!("Failed to create parent {}: {}", p.display(), e))?;
+            }
+            let mut outfile = std::fs::File::create(&outpath)
+                .map_err(|e| format!("Failed to create file {}: {}", outpath.display(), e))?;
+            std::io::copy(&mut file, &mut outfile)
+                .map_err(|e| format!("Failed to write file {}: {}", outpath.display(), e))?;
+        }
+    }
+
+    Ok(())
+}

package/rust/utils/src/first_usage.rs

@@ -1,97 +1,97 @@
-#[cfg(feature = "cli")]
-use crossterm::style::{Attribute, SetAttribute};
-
-#[cfg(feature = "cli")]
-use std::fmt::Write;
-
-use crate::logger::{LogLevel, Logger};
-use crate::signature::get_signature;
-use crate::version::get_version;
-use std::env;
-use std::path::PathBuf;
-
-fn get_devalang_homedir() -> PathBuf {
-    // Prefer explicit env var, then HOME/USERPROFILE, fallback to current dir
-    if let Ok(p) = env::var("DEVALANG_HOME") {
-        return PathBuf::from(p);
-    }
-
-    if let Ok(p) = env::var("HOME") {
-        return PathBuf::from(p).join(".devalang");
-    }
-
-    if let Ok(p) = env::var("USERPROFILE") {
-        return PathBuf::from(p).join(".devalang");
-    }
-
-    env::current_dir()
-        .unwrap_or_else(|_| PathBuf::from("."))
-        .join(".devalang")
-}
-
-pub fn check_is_first_usage() -> bool {
-    if get_devalang_homedir().exists() == true {
-        false
-    } else {
-        first_usage_welcome();
-        true
-    }
-}
-
-pub fn first_usage_welcome() {
-    std::fs::create_dir_all(get_devalang_homedir()).ok();
-
-    let version = get_version();
-    print!("{}", get_signature(&version));
-
-    let homedir = get_devalang_homedir().display().to_string();
-
-    let welcome_msg = format!(
-        "Welcome to Devalang ! \n\
-        It looks like this is your first time using the tool.\n\
-        A configuration file will be created in your home directory.\n\
-        (location: '{}')",
-        homedir
-    );
-
-    #[cfg(feature = "cli")]
-    let mut s = String::new();
-    #[cfg(feature = "cli")]
-    {
-        write!(&mut s, "{}", SetAttribute(Attribute::Bold)).unwrap();
-        write!(&mut s, "{}", welcome_msg).unwrap();
-        write!(&mut s, "{}", SetAttribute(Attribute::Reset)).unwrap();
-
-        println!("");
-        println!("{}", s);
-        println!("");
-    }
-
-    #[cfg(not(feature = "cli"))]
-    {
-        // Fallback: plain output on non-cli (wasm) builds
-        println!("");
-        println!("{}", welcome_msg);
-        println!("");
-    }
-
-    first_usage_ask_for_telemetry();
-}
-
-pub fn first_usage_ask_for_telemetry() {
-    let telemetry_msg = "Would you like to enable anonymous telemetry ?";
-    let telemetry_desc = "This data helps us improve the tool. You can opt-out at any time.";
-
-    // Non-interactive fallback for first usage: default to telemetry disabled.
-    let _ = telemetry_msg;
-    let _ = telemetry_desc;
-
-    let logger = Logger::new();
-
-    println!("");
-    logger.log_message(
-        LogLevel::Info,
-        "Telemetry disabled by default. You can enable it at any time by using 'devalang telemetry enable'"
-    );
-    println!("");
-}
+#[cfg(feature = "cli")]
+use crossterm::style::{Attribute, SetAttribute};
+
+#[cfg(feature = "cli")]
+use std::fmt::Write;
+
+use crate::logger::{LogLevel, Logger};
+use crate::signature::get_signature;
+use crate::version::get_version;
+use std::env;
+use std::path::PathBuf;
+
+fn get_devalang_homedir() -> PathBuf {
+    // Prefer explicit env var, then HOME/USERPROFILE, fallback to current dir
+    if let Ok(p) = env::var("DEVALANG_HOME") {
+        return PathBuf::from(p);
+    }
+
+    if let Ok(p) = env::var("HOME") {
+        return PathBuf::from(p).join(".devalang");
+    }
+
+    if let Ok(p) = env::var("USERPROFILE") {
+        return PathBuf::from(p).join(".devalang");
+    }
+
+    env::current_dir()
+        .unwrap_or_else(|_| PathBuf::from("."))
+        .join(".devalang")
+}
+
+pub fn check_is_first_usage() -> bool {
+    if get_devalang_homedir().exists() == true {
+        false
+    } else {
+        first_usage_welcome();
+        true
+    }
+}
+
+pub fn first_usage_welcome() {
+    std::fs::create_dir_all(get_devalang_homedir()).ok();
+
+    let version = get_version();
+    print!("{}", get_signature(&version));
+
+    let homedir = get_devalang_homedir().display().to_string();
+
+    let welcome_msg = format!(
+        "Welcome to Devalang ! \n\
+        It looks like this is your first time using the tool.\n\
+        A configuration file will be created in your home directory.\n\
+        (location: '{}')",
+        homedir
+    );
+
+    #[cfg(feature = "cli")]
+    let mut s = String::new();
+    #[cfg(feature = "cli")]
+    {
+        write!(&mut s, "{}", SetAttribute(Attribute::Bold)).unwrap();
+        write!(&mut s, "{}", welcome_msg).unwrap();
+        write!(&mut s, "{}", SetAttribute(Attribute::Reset)).unwrap();
+
+        println!("");
+        println!("{}", s);
+        println!("");
+    }
+
+    #[cfg(not(feature = "cli"))]
+    {
+        // Fallback: plain output on non-cli (wasm) builds
+        println!("");
+        println!("{}", welcome_msg);
+        println!("");
+    }
+
+    first_usage_ask_for_telemetry();
+}
+
+pub fn first_usage_ask_for_telemetry() {
+    let telemetry_msg = "Would you like to enable anonymous telemetry ?";
+    let telemetry_desc = "This data helps us improve the tool. You can opt-out at any time.";
+
+    // Non-interactive fallback for first usage: default to telemetry disabled.
+    let _ = telemetry_msg;
+    let _ = telemetry_desc;
+
+    let logger = Logger::new();
+
+    println!("");
+    logger.log_message(
+        LogLevel::Info,
+        "Telemetry disabled by default. You can enable it at any time by using 'devalang telemetry enable'"
+    );
+    println!("");
+}

package/rust/utils/src/lib.rs

@@ -1,9 +1,9 @@
-pub mod error;
-pub mod file;
-pub mod first_usage;
-pub mod logger;
-pub mod path;
-pub mod signature;
-pub mod spinner;
-pub mod version;
-pub mod watcher;
+pub mod error;
+pub mod file;
+pub mod first_usage;
+pub mod logger;
+pub mod path;
+pub mod signature;
+pub mod spinner;
+pub mod version;
+pub mod watcher;