Polish.

Author: milesj

Cargo.lock

@@ -32,8 +32,8 @@ reqwest-middleware = { version = "0.4.0", default-features = false, features = [
     "http2",
 ] }
 reqwest-netrc = "0.1.2"
-rustc-hash = "2.1.0"
-scc = "2.3.0"
+rustc-hash = "2.1.1"
+scc = "2.3.3"
 schematic = { version = "0.17.11", default-features = false }
 semver = { version = "1.0.25", features = ["serde"] }
 serde = { version = "1.0.217", features = ["derive"] }
@@ -66,7 +66,7 @@ starbase_utils = { version = "0.10.1", default-features = false, features = [
 thiserror = "2.0.11"
 tokio = { version = "1.43.0", features = ["full", "tracing"] }
 tracing = "0.1.41"
-uuid = { version = "1.12.1", features = ["v4"] }
+uuid = { version = "1.13.1", features = ["v4"] }
 
 [profile.dist]
 inherits = "release"

Cargo.toml

@@ -2,7 +2,6 @@ use super::is_false;
 use crate::ToolContext;
 use rustc_hash::FxHashMap;
 use semver::VersionReq;
-use std::collections::HashMap;
 use std::path::PathBuf;
 use system_env::SystemDependency;
 use warpgate_api::{api_enum, api_struct};
@@ -67,7 +66,8 @@ api_struct!(
         pub exe: PathBuf,
 
         /// Secondary executables, relative from the source root.
-        pub exes: HashMap<String, PathBuf>,
+        #[serde(default, skip_serializing_if = "FxHashMap::is_empty")]
+        pub exes: FxHashMap<String, PathBuf>,
 
         /// The Git source location for the builder.
         pub git: GitSource,

crates/pdk-api/src/api/build_source.rs

@@ -31,9 +31,8 @@ api_struct!(
     }
 );
 
-api_enum!(
+api_unit_enum!(
     /// Supported types of plugins.
-    #[derive(Default)]
     pub enum PluginType {
         #[serde(alias = "CLI")]
         CommandLine,
@@ -69,9 +68,8 @@ api_struct!(
     }
 );
 
-api_enum!(
+api_unit_enum!(
     /// Supported strategies for installing a tool.
-    #[derive(Copy, Default)]
     pub enum InstallStrategy {
         BuildFromSource,
         #[default]

crates/pdk-api/src/api/mod.rs

@@ -36,21 +36,22 @@ impl Default for DependencyName {
 #[serde(default)]
 pub struct DependencyConfig {
     /// Only install on this architecture.
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub arch: Option<SystemArch>,
 
     /// The dependency name or name(s) to install.
     pub dep: DependencyName,
 
     /// Only install with this package manager.
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub manager: Option<SystemPackageManager>,
 
     /// Only install on this operating system.
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub os: Option<SystemOS>,
 
-    /// Install using sudo.
-    pub sudo: bool,
-
     /// The version to install.
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub version: Option<String>,
 }
 

crates/system-env/src/deps.rs

@@ -34,7 +34,13 @@ impl ListParser {
         let mut packages = HashMap::default();
 
         for line in output.lines() {
-            if let Some(caps) = self.regex.captures(line.trim()) {
+            let line = line.trim();
+
+            if line.starts_with('#') || line.starts_with("//") {
+                continue;
+            }
+
+            if let Some(caps) = self.regex.captures(line) {
                 let Some(name) = caps.name("package") else {
                     continue;
                 };

crates/system-env/src/pm_vendor.rs

@@ -65,7 +65,7 @@ impl System {
 
         for arg in base_args {
             if arg == "$" {
-                args.extend(self.extract_package_args(dep_config, &pm_config, &pm)?);
+                args.extend(self.extract_package_args(dep_config, &pm_config, pm)?);
             } else {
                 args.push(arg);
             }
@@ -97,7 +97,7 @@ impl System {
         for arg in base_args {
             if arg == "$" {
                 for dep_config in dep_configs {
-                    args.extend(self.extract_package_args(dep_config, &pm_config, &pm)?);
+                    args.extend(self.extract_package_args(dep_config, &pm_config, pm)?);
                 }
             } else {
                 args.push(arg);

crates/system-env/src/system.rs

@@ -1,12 +1,10 @@
 use crate::virtual_path::VirtualPath;
-use crate::{api_enum, api_struct, AnyResult};
+use crate::{api_struct, api_unit_enum, AnyResult};
 use rustc_hash::FxHashMap;
 use serde::de::DeserializeOwned;
 
-api_enum!(
+api_unit_enum!(
     /// Target where host logs should be written to.
-    #[derive(Default)]
-    #[serde(rename_all = "lowercase")]
     pub enum HostLogTarget {
         Stderr,
         Stdout,

crates/warpgate-api/src/host_funcs.rs

@@ -31,6 +31,17 @@ macro_rules! api_enum {
     };
 }
 
+/// Wrap a unit-only enum with common derives and serde required attributes.
+#[macro_export]
+macro_rules! api_unit_enum {
+    ($struct:item) => {
+        #[derive(Clone, Copy, Debug, Default, serde::Deserialize, PartialEq, serde::Serialize)]
+        #[serde(rename_all = "kebab-case")]
+        #[cfg_attr(feature = "schematic", derive(schematic::Schematic))]
+        $struct
+    };
+}
+
 api_struct!(
     /// Represents an empty input.
     pub struct EmptyInput {}