feat: add sdk check command and support union types

na2axl · na2axl · commit f84174b57a81 · 2026-04-12T19:23:21.000+01:00
Implement `am sdk check` to verify Amplitude SDK configuration.
Update build.rs to generate proper serde-tagged enums for
FlatBuffers union types instead of skipping them. Adapt
collection builder and tests for newly generated fields
(sounds, scheduler config).
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/build.rs b/build.rs
@@ -53,6 +53,7 @@ struct EnumDef {
 struct EnumVariant {
     name: String,
     value: i64,
+    rust_type: Option<String>,
 }
 
 #[derive(Debug, Clone)]
@@ -196,6 +197,9 @@ fn process_schema(
     let schema = reflection::root_as_schema(schema_bytes)
         .map_err(|e| format!("Failed to parse schema: {}", e))?;
 
+    // Collect objects (tables and structs) first so we can resolve union variants
+    let schema_objects = schema.objects();
+
     // Collect enums
     let schema_enums = schema.enums();
     for i in 0..schema_enums.len() {
@@ -213,9 +217,29 @@ fn process_schema(
         let vals = e.values();
         for j in 0..vals.len() {
             let v = vals.get(j);
+            let rust_type = if is_union {
+                if let Some(union_type) = v.union_type() {
+                    let base = union_type.base_type();
+                    let idx = union_type.index();
+                    if base == BaseType::Obj {
+                        let obj_fqn = schema_objects.get(idx as usize).name().to_string();
+                        Some(leaf_name(&obj_fqn).to_string())
+                    } else if base == BaseType::String {
+                        Some("String".to_string())
+                    } else {
+                        None
+                    }
+                } else {
+                    None
+                }
+            } else {
+                None
+            };
+
             variants.push(EnumVariant {
                 name: v.name().to_string(),
                 value: v.value(),
+                rust_type,
             });
         }
 
@@ -229,8 +253,7 @@ fn process_schema(
         );
     }
 
-    // Collect objects (tables and structs)
-    let schema_objects = schema.objects();
+    // Process fields for objects
     for i in 0..schema_objects.len() {
         let obj = schema_objects.get(i);
         let fqn = obj.name().to_string();
@@ -253,17 +276,17 @@ fn process_schema(
                 continue;
             }
 
-            // Skip union fields — unions require special handling (TODO: Story 2c.2)
-            if base == BaseType::Union {
-                continue;
-            }
+            // Union fields are now processed
+            // if base == BaseType::Union {
+            //     continue;
+            // }
 
-            // Skip union vector fields (vector of unions or their discriminators)
-            if base == BaseType::Vector
-                && (ty.element() == BaseType::Union || ty.element() == BaseType::UType)
-            {
-                continue;
-            }
+            // Union vector fields are now processed
+            // if base == BaseType::Vector
+            //     && (ty.element() == BaseType::Union || ty.element() == BaseType::UType)
+            // {
+            //     continue;
+            // }
 
             // Determine the Rust type for this field
             let Some((rust_type, is_optional, default_value, serde_rename)) =
@@ -357,6 +380,14 @@ fn resolve_field_type(
     }
 
     match base {
+        BaseType::Union => {
+            let enum_fqn = schema_enums.get(idx as usize).name().to_string();
+            let enum_name = all_enum_names
+                .get(&enum_fqn)
+                .cloned()
+                .unwrap_or_else(|| leaf_name(&enum_fqn).to_string());
+            Some((enum_name, is_opt, None, None))
+        }
         BaseType::Obj => {
             let obj_fqn = objects.get(idx as usize).name().to_string();
             let obj_name = leaf_name(&obj_fqn).to_string();
@@ -365,6 +396,10 @@ fn resolve_field_type(
         }
         BaseType::Vector => {
             let inner = match ty.element() {
+                BaseType::Union => {
+                    let enum_fqn = schema_enums.get(idx as usize).name().to_string();
+                    leaf_name(&enum_fqn).to_string()
+                }
                 BaseType::Obj => {
                     let obj_fqn = objects.get(idx as usize).name().to_string();
                     leaf_name(&obj_fqn).to_string()
@@ -453,10 +488,21 @@ fn generate_code(
         if def.is_union {
             writeln!(
                 out,
-                "// TODO: Union type {} skipped — requires special serde handling (Story 2c.2)",
-                def.name
+                "#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]"
             )
             .unwrap();
+            writeln!(out, "#[serde(untagged)]").unwrap();
+            writeln!(out, "pub enum {} {{", def.name).unwrap();
+            for variant in &def.variants {
+                let rust_name = &variant.name;
+                if rust_name == "NONE" {
+                    writeln!(out, "    None,").unwrap();
+                } else {
+                    let ty = variant.rust_type.as_deref().unwrap_or(rust_name);
+                    writeln!(out, "    {}({}),", rust_name, ty).unwrap();
+                }
+            }
+            writeln!(out, "}}").unwrap();
             writeln!(out).unwrap();
             continue;
         }
@@ -738,7 +784,7 @@ See the README for detailed setup instructions.
     let union_count = enums.values().filter(|e| e.is_union).count();
     let struct_count = structs.len();
     println!(
-        "cargo:warning=Generated asset types from {} schema files: {} enums, {} structs ({} unions skipped)",
+        "cargo:warning=Generated asset types from {} schema files: {} enums, {} structs ({} unions processed)",
         bfbs_files.len(),
         enum_count,
         struct_count,
diff --git a/src/app.rs b/src/app.rs
@@ -82,6 +82,12 @@ pub enum Commands {
         command: SudoCommands,
     },
 
+    /// SDK-related tasks
+    Sdk {
+        #[command(subcommand)]
+        command: crate::commands::sdk::SdkCommands,
+    },
+
     /// Manage project templates
     Template {
         #[command(subcommand)]
diff --git a/src/assets/collection.rs b/src/assets/collection.rs
@@ -88,6 +88,7 @@ impl CollectionBuilder {
                 scope: Scope::World,
                 play_mode: CollectionPlayMode::PlayOne,
                 scheduler: Some(SoundSchedulerSettings::default()),
+                sounds: Some(Vec::new()),
             },
         }
     }
@@ -166,7 +167,7 @@ impl CollectionBuilder {
 
     /// Sets the scheduler mode.
     pub fn scheduler_mode(mut self, mode: SoundSchedulerMode) -> Self {
-        self.collection.scheduler = Some(SoundSchedulerSettings { mode });
+        self.collection.scheduler = Some(SoundSchedulerSettings { mode, config: None });
         self
     }
 
@@ -293,7 +294,8 @@ mod tests {
         assert_eq!(
             c.scheduler,
             Some(SoundSchedulerSettings {
-                mode: SoundSchedulerMode::Random
+                mode: SoundSchedulerMode::Random,
+                config: None,
             })
         );
     }
@@ -329,7 +331,8 @@ mod tests {
         assert_eq!(
             c.scheduler,
             Some(SoundSchedulerSettings {
-                mode: SoundSchedulerMode::Sequence
+                mode: SoundSchedulerMode::Sequence,
+                config: None,
             })
         );
     }
@@ -430,7 +433,8 @@ mod tests {
         assert_eq!(
             c.scheduler,
             Some(SoundSchedulerSettings {
-                mode: SoundSchedulerMode::Sequence
+                mode: SoundSchedulerMode::Sequence,
+                config: None,
             })
         );
         assert_eq!(c.spatialization, Spatialization::Position);
diff --git a/src/assets/extensions.rs b/src/assets/extensions.rs
@@ -255,13 +255,15 @@ impl SoundSchedulerSettings {
     pub fn random() -> Self {
         Self {
             mode: SoundSchedulerMode::Random,
+            config: None,
         }
     }
 
     /// Creates a sequential scheduler configuration.
     pub fn sequential() -> Self {
         Self {
             mode: SoundSchedulerMode::Sequence,
+            config: None,
         }
     }
 }
diff --git a/src/commands/asset/collection.rs b/src/commands/asset/collection.rs
@@ -719,7 +719,10 @@ fn apply_flag_updates(
                 "Invalid scheduler mode value",
             )
         })?;
-        collection.scheduler = Some(crate::assets::SoundSchedulerSettings { mode });
+        collection.scheduler = Some(crate::assets::SoundSchedulerSettings {
+            mode,
+            config: None,
+        });
         updated_fields.push("scheduler_mode".to_string());
     }
 
@@ -767,7 +770,10 @@ fn prompt_collection_updates(
         .map(|s| s.mode)
         .unwrap_or(SoundSchedulerMode::Random);
     if let Some(new_sm) = prompt_update_scheduler_mode(input, &current_scheduler)? {
-        collection.scheduler = Some(crate::assets::SoundSchedulerSettings { mode: new_sm });
+        collection.scheduler = Some(crate::assets::SoundSchedulerSettings {
+            mode: new_sm,
+            config: None,
+        });
         updated_fields.push("scheduler_mode".to_string());
     }
 
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
@@ -14,5 +14,6 @@
 
 pub mod asset;
 pub mod project;
+pub mod sdk;
 pub mod sudo;
 pub mod template;
diff --git a/src/commands/sdk.rs b/src/commands/sdk.rs
@@ -0,0 +1,50 @@
+// Copyright (c) 2026-present Sparky Studios. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::config::sdk::discover_sdk;
+use crate::database::Database;
+use crate::input::Input;
+use crate::presentation::Output;
+use clap::Subcommand;
+use serde_json::json;
+use std::sync::Arc;
+
+#[derive(Subcommand, Debug)]
+pub enum SdkCommands {
+    /// Check if the Amplitude SDK is properly configured
+    Check,
+}
+
+pub async fn handler(
+    command: &SdkCommands,
+    _database: Option<Arc<Database>>,
+    _input: &dyn Input,
+    output: &dyn Output,
+) -> anyhow::Result<()> {
+    match command {
+        SdkCommands::Check => {
+            let location = discover_sdk()?;
+            
+            output.success(
+                json!({
+                    "message": "SDK is properly configured",
+                    "path": location.root().to_string_lossy(),
+                    "schemas_dir": location.schemas_dir().to_string_lossy(),
+                }),
+                None,
+            );
+            Ok(())
+        }
+    }
+}
diff --git a/src/common/errors.rs b/src/common/errors.rs
@@ -376,15 +376,6 @@ pub fn asset_already_exists(asset_type: &str, name: &str) -> CliError {
     )
 }
 
-/// Create an error for the SDK not being found.
-pub fn sdk_not_found() -> CliError {
-    CliError::new(
-        codes::ERR_SDK_NOT_FOUND,
-        "Amplitude SDK not found",
-        "The AM_SDK_PATH environment variable is not set or points to an invalid location",
-    )
-}
-
 // =============================================================================
 // Macro for quick error construction
 // =============================================================================
diff --git a/src/lib.rs b/src/lib.rs
@@ -29,6 +29,7 @@ pub mod schema;
 pub mod commands {
     pub mod asset;
     pub mod project;
+    pub mod sdk;
     pub mod sudo;
     pub mod template;
 }
diff --git a/src/main.rs b/src/main.rs
@@ -26,7 +26,8 @@ use crate::{
     app::{App, Commands},
     commands::{
         asset::handler as handle_asset_command, project::handler as handle_project_command,
-        sudo::handler as handle_sudo_command, template::handler as handle_template_command,
+        sdk::handler as handle_sdk_command, sudo::handler as handle_sudo_command,
+        template::handler as handle_template_command,
     },
     common::errors::{CliError, determine_exit_code, exit_codes},
     common::logger::{init_logger, setup_crash_logging, write_crash_log_on_error},
@@ -197,6 +198,7 @@ async fn run_command(
         Commands::Project { command } => {
             handle_project_command(command, database, input, output).await
         }
+        Commands::Sdk { command } => handle_sdk_command(command, database, input, output).await,
         Commands::Sudo { command } => handle_sudo_command(command, database, input, output).await,
         Commands::Template { command } => {
             handle_template_command(command, database, input, output).await
diff --git a/tests/feature_exit_codes_test.rs b/tests/feature_exit_codes_test.rs
@@ -233,16 +233,21 @@ fn test_p1_exit_code_json_mode_error_on_stdout() {
 // =============================================================================
 
 #[test]
-#[ignore] // Enable when SDK validation command is implemented
 fn test_p2_exit_code_system_error_sdk_not_found() {
-    // GIVEN: AM_SDK_PATH is not set or invalid
-    // WHEN: Running a command that requires SDK (e.g., 'am sdk check')
+    // GIVEN: AM_SDK_PATH is explicitly removed
+    // WHEN: Running a command that requires SDK ('am sdk check')
+    let output = std::process::Command::new(env!("CARGO_BIN_EXE_am"))
+        .args(["sdk", "check"])
+        .env_remove("AM_SDK_PATH")
+        .output()
+        .expect("Failed to execute command");
+
     // THEN: Exit code should be 2 (system error)
-    //
-    // TODO: Implement when a command that validates SDK presence is added.
-    // The determine_exit_code() function maps -28xxx errors to exit code 2,
-    // which is tested in unit tests (src/common/errors.rs:437-446).
-    panic!("Test not yet implemented - awaiting SDK validation command");
+    assert_eq!(
+        output.status.code(),
+        Some(am::common::errors::exit_codes::SYSTEM_ERROR),
+        "Expected system error exit code for missing SDK"
+    );
 }
 
 #[test]
diff --git a/tests/unit_generated_assets_test.rs b/tests/unit_generated_assets_test.rs

Original file line number	Diff line number	Diff line change
`@@ -255,13 +255,15 @@ impl SoundSchedulerSettings {`
`255`	`255`	`pub fn random() -> Self {`
`256`	`256`	`Self {`
`257`	`257`	`mode: SoundSchedulerMode::Random,`
	`258`	`+ config: None,`
`258`	`259`	`}`
`259`	`260`	`}`
`260`	`261`
`261`	`262`	`/// Creates a sequential scheduler configuration.`
`262`	`263`	`pub fn sequential() -> Self {`
`263`	`264`	`Self {`
`264`	`265`	`mode: SoundSchedulerMode::Sequence,`
	`266`	`+ config: None,`
`265`	`267`	`}`
`266`	`268`	`}`
`267`	`269`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ pub mod schema;`
`29`	`29`	`pub mod commands {`
`30`	`30`	`pub mod asset;`
`31`	`31`	`pub mod project;`
	`32`	`+ pub mod sdk;`
`32`	`33`	`pub mod sudo;`
`33`	`34`	`pub mod template;`
`34`	`35`	`}`