Rearrange so that spin-cli isn't a dependency

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

Cargo.lock

@@ -48,15 +48,12 @@ spin-build = { path = "crates/build" }
 spin-common = { path = "crates/common" }
 spin-doctor = { path = "crates/doctor" }
 spin-expressions = { path = "crates/expressions" }
-spin-factors = { path = "crates/factors" }
-spin-factors-executor = { path = "crates/factors-executor" }
 spin-http = { path = "crates/http" }
 spin-loader = { path = "crates/loader" }
 spin-locked-app = { path = "crates/locked-app" }
 spin-manifest = { path = "crates/manifest" }
 spin-oci = { path = "crates/oci" }
 spin-plugins = { path = "crates/plugins" }
-spin-runtime-config = { path = "crates/runtime-config" }
 spin-runtime-factors = { path = "crates/runtime-factors" }
 spin-telemetry = { path = "crates/telemetry", features = [
   "tracing-log-compat",

Cargo.toml

@@ -25,7 +25,6 @@ spin-factor-sqlite = { path = "../factor-sqlite" }
 spin-factor-variables = { path = "../factor-variables" }
 spin-factor-wasi = { path = "../factor-wasi" }
 spin-factors = { path = "../factors" }
-spin-runtime-factors = { path = "../runtime-factors" }
 spin-sqlite = { path = "../sqlite" }
 spin-trigger = { path = "../trigger" }
 toml = "0.8"

crates/runtime-config/Cargo.toml

@@ -160,12 +160,6 @@ where
     }
 }
 
-impl From<ResolvedRuntimeConfig<TriggerFactorsRuntimeConfig>> for TriggerFactorsRuntimeConfig {
-    fn from(value: ResolvedRuntimeConfig<TriggerFactorsRuntimeConfig>) -> Self {
-        value.runtime_config
-    }
-}
-
 #[derive(Clone, Debug)]
 /// Resolves runtime configuration from a TOML file.
 pub struct TomlResolver<'a> {
@@ -434,11 +428,3 @@ fn sqlite_config_resolver(
         local_database_dir,
     ))
 }
-
-impl TryFrom<TomlRuntimeConfigSource<'_, '_>> for TriggerFactorsRuntimeConfig {
-    type Error = anyhow::Error;
-
-    fn try_from(value: TomlRuntimeConfigSource<'_, '_>) -> Result<Self, Self::Error> {
-        Self::from_source(value)
-    }
-}

crates/runtime-config/src/lib.rs

@@ -29,8 +29,12 @@ spin-factor-sqlite = { path = "../factor-sqlite" }
 spin-factor-variables = { path = "../factor-variables" }
 spin-factor-wasi = { path = "../factor-wasi" }
 spin-factors = { path = "../factors" }
+spin-factors-executor = { path = "../factors-executor" }
+spin-runtime-config = { path = "../runtime-config" }
+spin-trigger = { path = "../trigger" }
 spin-telemetry = { path = "../telemetry" }
 terminal = { path = "../terminal" }
+toml = "0.8"
 tracing = { workspace = true }
 
 [lints]

crates/runtime-factors/Cargo.toml

@@ -1,3 +1,7 @@
+mod runtime_factors;
+
+pub use runtime_factors::FactorsBuilder;
+
 use std::path::PathBuf;
 
 use anyhow::Context as _;
@@ -14,6 +18,7 @@ use spin_factor_sqlite::SqliteFactor;
 use spin_factor_variables::VariablesFactor;
 use spin_factor_wasi::{spin::SpinFilesMounter, WasiFactor};
 use spin_factors::RuntimeFactors;
+use spin_runtime_config::{ResolvedRuntimeConfig, TomlRuntimeConfigSource};
 
 #[derive(RuntimeFactors)]
 pub struct TriggerFactors {
@@ -99,3 +104,17 @@ pub struct TriggerAppOptions {
     #[clap(long = "sqlite")]
     pub sqlite_statements: Vec<String>,
 }
+
+impl From<ResolvedRuntimeConfig<TriggerFactorsRuntimeConfig>> for TriggerFactorsRuntimeConfig {
+    fn from(value: ResolvedRuntimeConfig<TriggerFactorsRuntimeConfig>) -> Self {
+        value.runtime_config
+    }
+}
+
+impl TryFrom<TomlRuntimeConfigSource<'_, '_>> for TriggerFactorsRuntimeConfig {
+    type Error = anyhow::Error;
+
+    fn try_from(value: TomlRuntimeConfigSource<'_, '_>) -> Result<Self, Self::Error> {
+        Self::from_source(value)
+    }
+}

crates/runtime-factors/src/lib.rs

@@ -1,17 +1,19 @@
 use std::path::{Path, PathBuf};
 
+use super::{TriggerAppOptions, TriggerFactors, TriggerFactorsRuntimeConfig};
+
 use anyhow::Context as _;
 use spin_common::ui::quoted_path;
 use spin_factors_executor::FactorsExecutor;
 use spin_runtime_config::ResolvedRuntimeConfig;
-use spin_runtime_factors::{TriggerAppOptions, TriggerFactors, TriggerFactorsRuntimeConfig};
 use spin_trigger::cli::{
     CommonTriggerOptions, InitialKvSetterHook, KeyValueDefaultStoreSummaryHook,
     RuntimeFactorsBuilder, SqlStatementExecutorHook, SqliteDefaultStoreSummaryHook,
     StdioLoggingExecutorHooks,
 };
 use toml::Value;
 
+/// A [`RuntimeFactorsBuilder`] for [`TriggerFactors`].
 pub struct FactorsBuilder;
 
 impl RuntimeFactorsBuilder for FactorsBuilder {