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

package/rust/cli/discover/metadata.rs

@@ -1,48 +1,48 @@
-use devalang_types::AddonMetadata;
-use toml::Value;
-
-pub fn parse_metadata_file(addon_type: &str, metadata_content: &str) -> Option<AddonMetadata> {
-    let parsed = metadata_content.parse::<Value>().ok()?;
-
-    let table = (match addon_type {
-        "bank" => parsed.get("bank"),
-        "plugin" => parsed.get("plugin"),
-        "preset" => parsed.get("preset"),
-        "template" => parsed.get("template"),
-        _ => None,
-    })?;
-
-    let name = table
-        .get("name")
-        .and_then(|v| v.as_str())
-        .unwrap_or("")
-        .to_string();
-    let version = table
-        .get("version")
-        .and_then(|v| v.as_str())
-        .unwrap_or("")
-        .to_string();
-    let description = table
-        .get("description")
-        .and_then(|v| v.as_str())
-        .unwrap_or("")
-        .to_string();
-    let author = table
-        .get("author")
-        .and_then(|v| v.as_str())
-        .unwrap_or("unknown")
-        .to_string();
-    let access = table
-        .get("access")
-        .and_then(|v| v.as_str())
-        .unwrap_or("")
-        .to_string();
-
-    Some(AddonMetadata {
-        name,
-        author,
-        version,
-        description,
-        access,
-    })
-}
+use devalang_types::AddonMetadata;
+use toml::Value;
+
+pub fn parse_metadata_file(addon_type: &str, metadata_content: &str) -> Option<AddonMetadata> {
+    let parsed = metadata_content.parse::<Value>().ok()?;
+
+    let table = (match addon_type {
+        "bank" => parsed.get("bank"),
+        "plugin" => parsed.get("plugin"),
+        "preset" => parsed.get("preset"),
+        "template" => parsed.get("template"),
+        _ => None,
+    })?;
+
+    let name = table
+        .get("name")
+        .and_then(|v| v.as_str())
+        .unwrap_or("")
+        .to_string();
+    let version = table
+        .get("version")
+        .and_then(|v| v.as_str())
+        .unwrap_or("")
+        .to_string();
+    let description = table
+        .get("description")
+        .and_then(|v| v.as_str())
+        .unwrap_or("")
+        .to_string();
+    let publisher = table
+        .get("publisher")
+        .and_then(|v| v.as_str())
+        .unwrap_or("unknown")
+        .to_string();
+    let access = table
+        .get("access")
+        .and_then(|v| v.as_str())
+        .unwrap_or("")
+        .to_string();
+
+    Some(AddonMetadata {
+        name,
+        publisher,
+        version,
+        description,
+        access,
+    })
+}

package/rust/cli/discover/mod.rs

@@ -1,5 +1,5 @@
-pub mod commands;
-pub mod config;
-pub mod fs;
-pub mod install;
-pub mod metadata;
+pub mod commands;
+pub mod config;
+pub mod fs;
+pub mod install;
+pub mod metadata;

package/rust/cli/me/commands.rs

@@ -0,0 +1,52 @@
+pub async fn handle_me_command() -> Result<(), String> {
+    let auth_url = crate::web::auth::get_auth_url();
+
+    let url = format!("{}/v1/auth/me", auth_url);
+
+    let client = reqwest::Client::new();
+    let mut req = client.get(url);
+
+    if let Some(user) = crate::config::settings::get_user_config() {
+        if !user.session.is_empty() {
+            req = req.bearer_auth(user.session);
+        }
+    } else {
+        return Err("No user session found. Please log in.".to_string());
+    }
+
+    let response = req.send().await.map_err(|e| e.to_string())?;
+
+    if !response.status().is_success() {
+        return Err(format!("Failed to get user info: HTTP {}", response.status()).into());
+    }
+
+    let status = response.status();
+    let body_text = response
+        .text()
+        .await
+        .map_err(|e| format!("Failed to read response body: {}", e))?;
+
+    let json: serde_json::Value = match serde_json::from_str(&body_text) {
+        Ok(v) => v,
+        Err(_) => {
+            return Err(format!(
+                "Invalid JSON response (status {}): {}",
+                status, body_text
+            ));
+        }
+    };
+
+    let payload = json.get("payload");
+
+    let email = payload
+        .unwrap_or(&serde_json::Value::Null)
+        .get("userData")
+        .unwrap_or(&serde_json::Value::Null)
+        .get("email")
+        .and_then(|v| v.as_str())
+        .unwrap_or("unknown");
+
+    println!("Logged in as: {}", email);
+
+    Ok(())
+}

package/rust/cli/me/mod.rs

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

package/rust/cli/mod.rs

@@ -1,12 +1,12 @@
-pub mod bank;
-pub mod build;
-pub mod check;
-pub mod discover;
-pub mod init;
-pub mod install;
-pub mod login;
-pub mod parser;
-pub mod play;
-pub mod telemetry;
-pub mod template;
-pub mod update;
+pub mod addon;
+pub mod build;
+pub mod check;
+pub mod discover;
+pub mod init;
+pub mod login;
+pub mod me;
+pub mod parser;
+pub mod play;
+pub mod telemetry;
+pub mod template;
+pub mod update;

package/rust/cli/parser.rs

@@ -34,18 +34,6 @@ pub enum TelemetryCommand {
     Disable {},
 }
 
-#[derive(Subcommand)]
-pub enum InstallCommand {
-    /// Installs a template.
-    Template { name: String },
-    /// Installs a bank.
-    Bank { name: String },
-    /// Installs a plugin.
-    Plugin { name: String },
-    /// Installs a preset.
-    Preset { name: String },
-}
-
 #[derive(Subcommand)]
 pub enum TemplateCommand {
     /// Lists all available templates for Devalang projects.
@@ -55,17 +43,22 @@ pub enum TemplateCommand {
 }
 
 #[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.
+pub enum AddonCommand {
+    /// Installs an addon.
+    Install {
+        name: String,
+        #[arg(long, default_value_t = false)]
+        no_clear_tmp: bool,
+    },
+
+    /// Updates an addon.
+    Update { name: String },
+
+    /// Lists installed addons.
+    List {},
+
+    /// Removes an addon.
     Remove { name: String },
-    /// Updates a specific or all banks.
-    Update { name: Option<String> },
 }
 
 #[derive(Subcommand)]
@@ -172,7 +165,6 @@ pub enum Commands {
         /// - `false`
         ///
         debug: bool,
-
         #[arg(short, long, default_value_t = false)]
         /// Whether to compress the output files.
         ///
@@ -283,47 +275,24 @@ pub enum Commands {
         debug: 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.
-    /// - `preset` - Installs a preset.
-    ///
-    Install {
-        #[command(subcommand)]
-        command: InstallCommand,
-    },
-
     /// Discover available local addons for Devalang.
     ///
-    Discover {},
+    Discover {
+        #[arg(long, default_value_t = false)]
+        /// Do not clear the temporary extraction folder after installation.
+        no_clear_tmp: bool,
+    },
 
-    /// Manage banks for Devalang projects.
+    /// Manage addons for Devalang projects.
     ///
     /// ### Subcommands
-    /// - `list` - Lists all available banks.
-    /// - `info <name>` - Displays information about a specific bank.
+    /// - `install <publisher>.<name>` - Installs a new addon.
+    /// - `list` - Lists installed addons.
+    /// - `remove <publisher>.<name>` - Removes an existing addon.
     ///
-    Bank {
+    Addon {
         #[command(subcommand)]
-        command: BankCommand,
+        command: AddonCommand,
     },
 
     /// Telemetry settings for Devalang.
@@ -337,22 +306,14 @@ pub enum Commands {
         command: TelemetryCommand,
     },
 
-    /// Generate addon scaffolding for Devalang.
-    ///
-    /// ### Subcommands
-    /// - `bank` - Generates a bank scaffold.
-    /// - `plugin` - Generates a plugin scaffold.
-    /// - `preset` - Generates a preset scaffold.
-    ///
-    // Scaffold {
-    //     #[command(subcommand)]
-    //     command: ScaffoldCommand,
-    // },
-
     /// Log in to your Devaloop account.
     ///
     Login {},
 
+    /// Display information about the current Devalang user.
+    ///
+    Me {},
+
     /// Log out of your Devaloop account.
     ///
     Logout {},