feat(cli): props injection and batch rendering over the variables system

crates/rustmotion-cli/src/commands/mod.rs

@@ -1,3 +1,4 @@
+mod batch;
 mod geometry;
 mod info;
 mod render;
@@ -8,6 +9,7 @@ mod validate_attrs;
 mod validate_schema;
 pub mod validation;
 
+pub use batch::cmd_batch;
 pub use info::cmd_info;
 pub use render::{cmd_render, cmd_watch};
 pub use schema::cmd_schema;

crates/rustmotion-cli/src/commands/validate.rs

@@ -2,7 +2,7 @@ use rustmotion::error::{Result, RustmotionError};
 use std::path::{Path, PathBuf};
 
 use super::geometry::{GeometryViolation, ViolationKind};
-use super::validation::{self, ValidationReport, ValidationSource};
+use super::validation::{self, ValidationReport, ValidationSource, VarOverrides};
 
 pub fn cmd_validate(
     input: &PathBuf,
@@ -11,8 +11,9 @@ pub fn cmd_validate(
     strict_anim: bool,
     strict_attrs: bool,
     lenient: bool,
+    overrides: Option<&VarOverrides>,
 ) -> Result<()> {
-    let loaded = match validation::load(ValidationSource::File(input)) {
+    let loaded = match validation::load_with_vars(ValidationSource::File(input), overrides) {
         Ok(l) => l,
         Err(e) => {
             eprintln!("Error: {}", e);
@@ -49,7 +50,7 @@ pub fn cmd_validate(
 
             // Re-run checks after the fixes so the rest of the function reflects
             // the on-disk state.
-            let reloaded = validation::load(ValidationSource::File(input))?;
+            let reloaded = validation::load_with_vars(ValidationSource::File(input), overrides)?;
             report_out = validation::run_checks(&reloaded, strict_anim);
             if strict_attrs {
                 report_out.promote_attr_warnings();

crates/rustmotion-cli/src/commands/validation.rs

@@ -14,6 +14,7 @@ use rustmotion::error::{Result, RustmotionError};
 use rustmotion::include::{self, IncludeSource};
 use rustmotion::schema::{ResolvedScenario, Scenario};
 use rustmotion::variables;
+use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 
 use super::geometry::{validate_geometry, validate_geometry_animated, GeometryViolation};
@@ -25,6 +26,10 @@ pub enum ValidationSource<'a> {
     Inline(&'a str),
 }
 
+/// Runtime variable overrides from `--props` / `--var` flags.
+/// An empty map means "use defaults only".
+pub type VarOverrides = HashMap<String, serde_json::Value>;
+
 /// A scenario after parsing, variable resolution, and include resolution.
 /// Keeps the raw JSON around so it can be inspected by validators (e.g. for
 /// path-based auto-fixes).
@@ -87,6 +92,14 @@ impl ValidationReport {
 /// Load + parse + apply variable defaults + resolve includes. Returns the
 /// raw JSON (post-substitution) and the resolved scenario.
 pub fn load(source: ValidationSource<'_>) -> Result<LoadedScenario> {
+    load_with_vars(source, None)
+}
+
+/// Like [`load`] but injects runtime variable overrides before substitution.
+pub fn load_with_vars(
+    source: ValidationSource<'_>,
+    overrides: Option<&VarOverrides>,
+) -> Result<LoadedScenario> {
     let (json_str, source_path, include_source) = match source {
         ValidationSource::File(path) => {
             let s = std::fs::read_to_string(path).map_err(|e| RustmotionError::FileRead {
@@ -119,7 +132,11 @@ pub fn load(source: ValidationSource<'_>) -> Result<LoadedScenario> {
     let mut json_value: serde_json::Value =
         serde_json::from_str(&json_str).map_err(RustmotionError::from)?;
 
-    variables::apply_defaults(&mut json_value)?;
+    let label = source_path
+        .as_ref()
+        .map(|p| p.display().to_string())
+        .unwrap_or_else(|| "<inline>".to_string());
+    variables::apply_variables(&mut json_value, overrides, &label)?;
 
     let scenario: Scenario = serde_json::from_value(json_value.clone())?;
     let resolved = include::resolve_includes(scenario, &include_source)?;