[fud2] Additional Syntax to Rhai DSL

fud2/fud-core/src/cli.rs

@@ -1,8 +1,8 @@
-use crate::config;
 use crate::exec::{
     Driver, EnumeratePlanner, Request, SingleOpOutputPlanner, StateRef,
 };
 use crate::run::Run;
+use crate::{config, DriverBuilder};
 use anyhow::{anyhow, bail};
 use argh::FromArgs;
 use camino::Utf8PathBuf;
@@ -280,6 +280,27 @@ fn get_resource(driver: &Driver, cmd: GetResource) -> anyhow::Result<()> {
     bail!("unknown resource file {}", cmd.filename);
 }
 
+pub fn override_config_from_cli(
+    mut builder: DriverBuilder,
+) -> anyhow::Result<DriverBuilder> {
+    let args: FakeArgs = argh::from_env();
+
+    // Use `--set` arguments to override configuration values.
+    for set in args.set {
+        let mut parts = set.splitn(2, '=');
+        let key = parts.next().unwrap();
+        let value = parts
+            .next()
+            .ok_or(anyhow!("--set arguments must be in key=value form"))?;
+        let dict = figment::util::nest(key, value.into());
+        builder.config_data = builder
+            .config_data
+            .merge(figment::providers::Serialized::defaults(dict));
+    }
+
+    Ok(builder)
+}
+
 pub fn cli(driver: &Driver) -> anyhow::Result<()> {
     let args: FakeArgs = argh::from_env();
 
@@ -321,19 +342,6 @@ pub fn cli(driver: &Driver) -> anyhow::Result<()> {
         run.global_config.verbose = verbose;
     }
 
-    // Use `--set` arguments to override configuration values.
-    for set in args.set {
-        let mut parts = set.splitn(2, '=');
-        let key = parts.next().unwrap();
-        let value = parts
-            .next()
-            .ok_or(anyhow!("--set arguments must be in key=value form"))?;
-        let dict = figment::util::nest(key, value.into());
-        run.config_data = run
-            .config_data
-            .merge(figment::providers::Serialized::defaults(dict));
-    }
-
     // Execute.
     match args.mode {
         Mode::ShowPlan => run.show(),

fud2/fud-core/src/exec/driver.rs

@@ -16,6 +16,7 @@ pub struct Driver {
     pub ops: PrimaryMap<OpRef, Operation>,
     pub rsrc_dir: Option<Utf8PathBuf>,
     pub rsrc_files: Option<FileData>,
+    pub config_data: figment::Figment,
 }
 
 impl Driver {
@@ -271,6 +272,7 @@ pub struct DriverBuilder {
     rsrc_files: Option<FileData>,
     scripts_dir: Option<Utf8PathBuf>,
     script_files: Option<FileData>,
+    pub config_data: figment::Figment,
 }
 
 #[derive(Debug)]
@@ -305,6 +307,7 @@ impl DriverBuilder {
             rsrc_files: None,
             scripts_dir: None,
             script_files: None,
+            config_data: config::load_config(name),
         }
     }
 
@@ -465,6 +468,7 @@ impl DriverBuilder {
             ops: self.ops,
             rsrc_dir: self.rsrc_dir,
             rsrc_files: self.rsrc_files,
+            config_data: self.config_data,
         }
     }
 }

fud2/fud-core/src/run.rs

@@ -87,6 +87,20 @@ impl EmitBuild for EmitBuildFn {
     }
 }
 
+pub type EmitBuildClosure =
+    Box<dyn Fn(&mut StreamEmitter, &[&str], &[&str]) -> EmitResult>;
+
+impl EmitBuild for EmitBuildClosure {
+    fn build(
+        &self,
+        emitter: &mut StreamEmitter,
+        input: &[&str],
+        output: &[&str],
+    ) -> EmitResult {
+        self(emitter, input, output)
+    }
+}
+
 // TODO make this unnecessary...
 /// A simple `build` emitter that just runs a Ninja rule.
 pub struct EmitRuleBuild {
@@ -127,8 +141,7 @@ pub struct Run<'a> {
 
 impl<'a> Run<'a> {
     pub fn new(driver: &'a Driver, plan: Plan) -> Self {
-        let config_data = config::load_config(&driver.name);
-        Self::with_config(driver, plan, config_data)
+        Self::with_config(driver, plan, driver.config_data.clone())
     }
 
     pub fn with_config(

fud2/fud-core/src/script/error.rs

@@ -10,13 +10,48 @@ pub(super) struct RhaiSystemError {
 
 #[derive(Debug)]
 pub(super) enum RhaiSystemErrorKind {
-    ErrorSetupRef(String),
+    SetupRef(String),
+    StateRef(String),
+    BeganOp(String, String),
+    NoOp,
+    ConfigNotFound(String),
 }
 
 impl RhaiSystemError {
     pub(super) fn setup_ref(v: rhai::Dynamic) -> Self {
         Self {
-            kind: RhaiSystemErrorKind::ErrorSetupRef(v.to_string()),
+            kind: RhaiSystemErrorKind::SetupRef(v.to_string()),
+            position: rhai::Position::NONE,
+        }
+    }
+
+    pub(super) fn state_ref(v: rhai::Dynamic) -> Self {
+        Self {
+            kind: RhaiSystemErrorKind::StateRef(v.to_string()),
+            position: rhai::Position::NONE,
+        }
+    }
+
+    pub(super) fn began_op(old_name: &str, new_name: &str) -> Self {
+        Self {
+            kind: RhaiSystemErrorKind::BeganOp(
+                old_name.to_string(),
+                new_name.to_string(),
+            ),
+            position: rhai::Position::NONE,
+        }
+    }
+
+    pub(super) fn no_op() -> Self {
+        Self {
+            kind: RhaiSystemErrorKind::NoOp,
+            position: rhai::Position::NONE,
+        }
+    }
+
+    pub(super) fn config_not_found(key: &str) -> Self {
+        Self {
+            kind: RhaiSystemErrorKind::ConfigNotFound(key.to_string()),
             position: rhai::Position::NONE,
         }
     }
@@ -30,9 +65,21 @@ impl RhaiSystemError {
 impl Display for RhaiSystemError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match &self.kind {
-            RhaiSystemErrorKind::ErrorSetupRef(v) => {
+            RhaiSystemErrorKind::SetupRef(v) => {
                 write!(f, "Unable to construct SetupRef: `{v:?}`")
             }
+            RhaiSystemErrorKind::StateRef(v) => {
+                write!(f, "Unable to construct StateRef: `{v:?}`")
+            }
+            RhaiSystemErrorKind::BeganOp(old_name, new_name) => {
+                write!(f, "Unable to build two ops at once: trying to build `{new_name:?}` but already building `{old_name:?}`")
+            }
+            RhaiSystemErrorKind::NoOp => {
+                write!(f, "Unable to find current op being built. Consider calling start_op_stmts earlier in the program.")
+            }
+            RhaiSystemErrorKind::ConfigNotFound(v) => {
+                write!(f, "Unable to find config value: `{v:?}`")
+            }
         }
     }
 }