feat: combine ops and workers into one svc type

lib/bolt/config/src/service.rs

@@ -96,8 +96,9 @@ pub enum ServiceKind {
 	#[serde(rename = "operation")]
 	Operation {},
 
-	#[serde(rename = "operations")]
-	Operations {},
+	/// A collection of operations and workflows/workers.
+	#[serde(rename = "package")]
+	Package {},
 
 	// TODO: Rename to worker
 	#[serde(rename = "consumer")]
@@ -341,7 +342,7 @@ impl ServiceKind {
 			ServiceKind::Static { .. } => "static",
 			ServiceKind::Database { .. } => "database",
 			ServiceKind::Cache { .. } => "cache",
-			ServiceKind::Operations { .. } => "operations",
+			ServiceKind::Package { .. } => "package",
 		}
 	}
 
@@ -354,7 +355,7 @@ impl ServiceKind {
 			| ServiceKind::Api { .. } => ComponentClass::Executable,
 
 			ServiceKind::Operation { .. }
-			| ServiceKind::Operations { .. }
+			| ServiceKind::Package { .. }
 			| ServiceKind::Consumer { .. }
 			| ServiceKind::ApiRoutes { .. } => ComponentClass::NonExecutable,
 			ServiceKind::Database { .. } => ComponentClass::Database,

lib/bolt/core/src/context/project.rs

@@ -392,51 +392,47 @@ impl ProjectContextData {
 		let pkgs_path = workspace_path.join("pkg");
 		let mut pkg_dir = fs::read_dir(&pkgs_path).await.unwrap();
 		while let Some(pkg) = pkg_dir.next_entry().await.unwrap() {
-			// Read worker
-			let worker_path = pkg.path().join("worker");
-			if fs::metadata(&worker_path.join("Service.toml"))
-				.await
-				.is_ok()
-			{
-				// Load the service
+			// Check if pkg-level service config exists
+			if fs::metadata(pkg.path().join("Service.toml")).await.is_ok() {
+				// Load the directory as a single crate
 				let svc_ctx = context::service::ServiceContextData::from_path(
 					Weak::new(),
 					svc_ctxs_map,
 					&workspace_path,
-					&worker_path,
-				)
-				.await
-				.unwrap();
-				svc_ctxs_map.insert(svc_ctx.name(), svc_ctx.clone());
-			}
-
-			// Read standalone
-			Self::load_services_dir(svc_ctxs_map, &workspace_path, pkg.path().join("standalone"))
-				.await;
-
-			// Read ops
-			// Check if service config exists
-			if fs::metadata(pkg.path().join("ops").join("Service.toml"))
-				.await
-				.is_ok()
-			{
-				// Load the ops directory as a single service
-				let svc_ctx = context::service::ServiceContextData::from_path(
-					Weak::new(),
-					svc_ctxs_map,
-					&workspace_path,
-					&pkg.path().join("ops"),
+					&pkg.path(),
 				)
 				.await
 				.unwrap();
 
 				svc_ctxs_map.insert(svc_ctx.name(), svc_ctx.clone());
 			} else {
+				// Read worker
+				let worker_path = pkg.path().join("worker");
+				if fs::metadata(&worker_path.join("Service.toml"))
+					.await
+					.is_ok()
+				{
+					// Load the service
+					let svc_ctx = context::service::ServiceContextData::from_path(
+						Weak::new(),
+						svc_ctxs_map,
+						&workspace_path,
+						&worker_path,
+					)
+					.await
+					.unwrap();
+					svc_ctxs_map.insert(svc_ctx.name(), svc_ctx.clone());
+				}
+
 				// Load all individual ops
 				Self::load_services_dir(svc_ctxs_map, &workspace_path, pkg.path().join("ops"))
 					.await;
 			}
 
+			// Read standalone
+			Self::load_services_dir(svc_ctxs_map, &workspace_path, pkg.path().join("standalone"))
+				.await;
+
 			// Read dbs
 			Self::load_services_dir(svc_ctxs_map, &workspace_path, pkg.path().join("db")).await;
 

lib/bolt/core/src/context/service.rs

@@ -516,15 +516,15 @@ impl ServiceContextData {
 						dep.config().kind,
 						ServiceKind::Database { .. }
 							| ServiceKind::Cache { .. } | ServiceKind::Operation { .. }
-							| ServiceKind::Operations { .. }
+							| ServiceKind::Package { .. }
 							| ServiceKind::Consumer { .. }
 					)
 				} else if matches!(self.config().kind, ServiceKind::Api { .. }) {
 					matches!(
 						dep.config().kind,
 						ServiceKind::Database { .. }
 							| ServiceKind::Cache { .. } | ServiceKind::Operation { .. }
-							| ServiceKind::Operations { .. }
+							| ServiceKind::Package { .. }
 							| ServiceKind::ApiRoutes { .. }
 							| ServiceKind::Consumer { .. }
 					)
@@ -533,7 +533,7 @@ impl ServiceContextData {
 						dep.config().kind,
 						ServiceKind::Database { .. }
 							| ServiceKind::Cache { .. } | ServiceKind::Operation { .. }
-							| ServiceKind::Operations { .. }
+							| ServiceKind::Package { .. }
 							| ServiceKind::Consumer { .. }
 					)
 				};

lib/bolt/core/src/dep/k8s/gen.rs

@@ -136,7 +136,7 @@ pub async fn gen_svc(exec_ctx: &ExecServiceContext) -> Vec<serde_json::Value> {
 			ServiceKind::Oneshot { .. } => SpecType::Job,
 			ServiceKind::Periodic { .. } => SpecType::CronJob,
 			ServiceKind::Operation { .. }
-			| ServiceKind::Operations { .. }
+			| ServiceKind::Package { .. }
 			| ServiceKind::Database { .. }
 			| ServiceKind::Cache { .. }
 			| ServiceKind::ApiRoutes { .. } => {

lib/bolt/core/src/tasks/gen.rs

@@ -94,21 +94,6 @@ async fn generate_root(path: &Path) {
 			let _ = fs::remove_file(pkg.path().join("Cargo.lock")).await;
 			let _ = fs::remove_file(pkg.path().join("ops").join("Cargo.lock")).await;
 
-			// Check worker
-			let worker_path = pkg.path().join("worker");
-			if fs::metadata(&worker_path).await.is_ok() {
-				workspace_members.push(format!(
-					r#""pkg/{pkg}/worker""#,
-					pkg = pkg.file_name().into_string().unwrap(),
-				));
-
-				// Remove services' Cargo.lock files in favor of the shared svc
-				// Cargo.toml
-				let _ = fs::remove_file(worker_path.join("Cargo.lock")).await;
-
-				set_license(&worker_path.join("Cargo.toml")).await;
-			}
-
 			// Iterate through `standalone` folder
 			let standalone_path = pkg.path().join("standalone");
 			if fs::metadata(&standalone_path).await.is_ok() {
@@ -131,21 +116,37 @@ async fn generate_root(path: &Path) {
 			}
 
 			// Check if service config exists
-			if fs::metadata(pkg.path().join("ops").join("Service.toml"))
-				.await
-				.is_ok()
-			{
+			if fs::metadata(pkg.path().join("Service.toml")).await.is_ok() {
 				workspace_members.push(format!(
-					r#""pkg/{pkg}/ops""#,
+					r#""pkg/{pkg}""#,
 					pkg = pkg.file_name().into_string().unwrap(),
 				));
 
-				let _ = fs::remove_file(pkg.path().join("ops").join("Cargo.lock")).await;
+				let _ = fs::remove_file(pkg.path().join("Cargo.lock")).await;
 
-				set_license(&pkg.path().join("ops").join("Cargo.toml")).await;
-			}
-			// Iterate through `ops` folder
-			else {
+				set_license(&pkg.path().join("Cargo.toml")).await;
+
+				let types_path = pkg.path().join("types");
+				if fs::metadata(&types_path).await.is_ok() {
+					set_license(&types_path.join("Cargo.toml")).await;
+				}
+			} else {
+				// Check worker
+				let worker_path = pkg.path().join("worker");
+				if fs::metadata(&worker_path).await.is_ok() {
+					workspace_members.push(format!(
+						r#""pkg/{pkg}/worker""#,
+						pkg = pkg.file_name().into_string().unwrap(),
+					));
+
+					// Remove services' Cargo.lock files in favor of the shared svc
+					// Cargo.toml
+					let _ = fs::remove_file(worker_path.join("Cargo.lock")).await;
+
+					set_license(&worker_path.join("Cargo.toml")).await;
+				}
+
+				// Iterate through `ops` folder
 				let ops_path = pkg.path().join("ops");
 				if fs::metadata(&ops_path).await.is_ok() {
 					let mut dir = fs::read_dir(ops_path).await.unwrap();
@@ -166,6 +167,12 @@ async fn generate_root(path: &Path) {
 					}
 				}
 			}
+
+			// Utils lib
+			let util_path = pkg.path().join("util");
+			if fs::metadata(&util_path).await.is_ok() {
+				set_license(&util_path.join("Cargo.toml")).await;
+			}
 		}
 	}
 

lib/bolt/core/src/tasks/template.rs

@@ -75,20 +75,22 @@ pub async fn generate(ctx: &mut ProjectContext, opts: TemplateOpts) -> Result<()
 		);
 	}
 
-	// Check for new operations service type
-	if matches!(template_type, TemplateType::Operation)
-		&& fs::metadata(
-			base_path
-				.join("svc")
-				.join("pkg")
-				.join(&pkg_name)
-				.join("Service.toml"),
-		)
-		.await
-		.is_ok()
+	// Check for package service type
+	if matches!(
+		template_type,
+		TemplateType::Operation | TemplateType::Worker
+	) && fs::metadata(
+		base_path
+			.join("svc")
+			.join("pkg")
+			.join(&pkg_name)
+			.join("Service.toml"),
+	)
+	.await
+	.is_ok()
 	{
 		bail!(
-			"Creating operations in new `operations` service type ({pkg_name}/ops) not yet supported.",
+			"Creating operations or workers in the new refactored packages ({pkg_name}) is not yet supported.",
 		);
 	}
 
@@ -193,7 +195,7 @@ pub async fn generate(ctx: &mut ProjectContext, opts: TemplateOpts) -> Result<()
 				.join("svc")
 				.join("pkg")
 				.join(pkg_name)
-				.join("types")
+				.join("proto")
 				.join("msg");
 			let proto_file_path = proto_path.join(format!("{}.proto", service_name));
 
@@ -227,7 +229,7 @@ pub async fn generate(ctx: &mut ProjectContext, opts: TemplateOpts) -> Result<()
 				base_path
 					.join("svc")
 					.join("templates")
-					.join("types")
+					.join("proto")
 					.join("msg")
 					.join("{{ name }}.proto"),
 				proto_path,
@@ -240,7 +242,7 @@ pub async fn generate(ctx: &mut ProjectContext, opts: TemplateOpts) -> Result<()
 				.join("svc")
 				.join("pkg")
 				.join(pkg_name)
-				.join("types");
+				.join("proto");
 			let proto_file_path = proto_path.join(format!("{}.proto", service_name));
 			if fs::metadata(&proto_file_path).await.is_ok() {
 				bail!(
@@ -260,7 +262,7 @@ pub async fn generate(ctx: &mut ProjectContext, opts: TemplateOpts) -> Result<()
 				base_path
 					.join("svc")
 					.join("templates")
-					.join("types")
+					.join("proto")
 					.join("{{ name }}.proto"),
 				proto_path,
 			)

lib/types/build/src/lib.rs

@@ -40,7 +40,7 @@ where
 	for project_root in &project_roots {
 		for entry in fs::read_dir(project_root.join("svc").join("pkg"))? {
 			let entry = entry?;
-			let proto_path = entry.path().join("types");
+			let proto_path = entry.path().join("proto");
 
 			if proto_path.is_dir() {
 				println!("cargo:rerun-if-changed={}", proto_path.display());

svc/pkg/foo/worker/src/lib.rs

@@ -3,8 +3,10 @@ use chirp_workflow::prelude::*;
 pub mod workflows;
 
 pub fn registry() -> Registry {
+	use workflows::*;
+
 	let mut registry = Registry::new();
-	registry.register_workflow::<workflows::test::Test>();
+	registry.register_workflow::<test::Test>();
 
 	registry
 }

svc/pkg/foo/worker/src/workflows/test.rs

@@ -1,5 +1,4 @@
 use chirp_workflow::prelude::*;
-use serde_json::json;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct TestInput {