wip

Author: nitsky

AGENTS.md

@@ -1 +1 @@
-Please run `cargo` commands with `--workspace` for better cache hits. Please prefer `cargo clippy` over `cargo check` and clear clippy warnings when you complete tasks. Please do not omit articles in error messages and comments and make comments complete sentences that end in periods.
+Please run `cargo` commands with `--workspace` for better cache hits. Please prefer `cargo clippy` over `cargo check` and clear clippy warnings when you complete tasks. Please do not omit articles in error messages and comments and make comments complete sentences that end in periods and do not use contractions.

Cargo.lock

@@ -7,6 +7,7 @@ members = [
   "packages/compiler",
   "packages/database",
   "packages/either",
+  "packages/fdb",
   "packages/futures",
   "packages/http",
   "packages/ignore",
@@ -73,6 +74,7 @@ byte-unit = { version = "5", features = ["byte"] }
 byteorder = "1"
 bytes = { version = "1", features = ["serde"] }
 clap = { version = "4", features = ["derive", "env", "string", "unstable-v5"] }
+comfy-table = "7"
 console-subscriber = "0.4"
 crossterm = { version = "0.29", features = ["event-stream"] }
 dashmap = "6"
@@ -146,6 +148,7 @@ tangram_client = { path = "packages/client" }
 tangram_compiler = { path = "packages/compiler" }
 tangram_database = { path = "packages/database" }
 tangram_either = { path = "packages/either" }
+tangram_fdb = { path = "packages/fdb" }
 tangram_futures = { path = "packages/futures" }
 tangram_http = { path = "packages/http" }
 tangram_ignore = { path = "packages/ignore" }

Cargo.toml

@@ -36,6 +36,7 @@ anstream = { workspace = true }
 byte-unit = { workspace = true }
 bytes = { workspace = true }
 clap = { workspace = true }
+comfy-table = { workspace = true }
 console-subscriber = { workspace = true }
 crossterm = { workspace = true }
 data-encoding = { workspace = true }

packages/cli/Cargo.toml

@@ -1,9 +1,7 @@
 use {
 	crate::Cli,
-	anstream::{eprintln, println},
-	crossterm::style::Stylize as _,
 	futures::{FutureExt as _, TryStreamExt as _},
-	std::path::PathBuf,
+	std::{fmt::Write as _, path::PathBuf},
 	tangram_client::{self as tg, prelude::*},
 	tangram_futures::task::Task,
 };
@@ -40,17 +38,8 @@ pub struct Options {
 	#[arg(long, short)]
 	pub detach: bool,
 
-	/// Whether to print blobs.
-	#[arg(long)]
-	pub print_blobs: bool,
-
-	/// The depth with which to print the output.
-	#[arg(default_value = "0", long)]
-	pub print_depth: crate::object::get::Depth,
-
-	/// Whether to pretty print the output.
-	#[arg(long)]
-	pub print_pretty: Option<bool>,
+	#[command(flatten)]
+	pub print: crate::print::ValueOptions,
 
 	#[command(flatten)]
 	pub spawn: crate::process::spawn::Options,
@@ -93,17 +82,21 @@ impl Cli {
 
 		// If the detach flag is set, then print the process ID and return.
 		if options.detach {
-			Self::print_json(&output, None).await?;
+			let options = crate::print::Options {
+				json: options.print.json,
+				pretty: options.print.pretty,
+			};
+			Self::print_one(output, options).await?;
 			return Ok(());
 		}
 
 		// Print the process.
 		if !self.args.quiet {
-			eprint!("{} {}", "info".blue().bold(), process.item().id());
+			let mut message = process.item().id().to_string();
 			if let Some(token) = process.item().token() {
-				eprint!(" {token}");
+				write!(message, " {token}").unwrap();
 			}
-			eprintln!();
+			Self::print_info_message(&message);
 		}
 
 		// Get the process's status.
@@ -265,21 +258,18 @@ impl Cli {
 				.map_err(|source| tg::error!(!source, "failed to check out the artifact"))?;
 
 			// Print the path.
-			println!("{}", path.display());
+			let options = crate::print::Options {
+				json: options.print.json,
+				pretty: options.print.pretty,
+			};
+			Self::print_one(path, options).await?;
 
 			return Ok(());
 		}
 
 		// Print the output.
 		if !output.is_null() {
-			Self::print_value(
-				&handle,
-				&output,
-				options.print_depth,
-				options.print_pretty,
-				options.print_blobs,
-			)
-			.await?;
+			Self::print_value(&handle, &output, options.print).await?;
 		}
 
 		Ok(())

packages/cli/src/build.rs

@@ -15,6 +15,9 @@ pub struct Args {
 	#[arg(default_value = ".", index = 1)]
 	pub path: Option<PathBuf>,
 
+	#[command(flatten)]
+	pub print: crate::print::Options,
+
 	#[arg(
 		action = clap::ArgAction::Append,
 		long = "update",
@@ -189,7 +192,7 @@ impl Cli {
 		let output = self.render_progress_stream(stream).await?;
 
 		// Print the artifact.
-		println!("{}", output.referent.item);
+		Self::print_one(output, args.print).await?;
 
 		Ok(())
 	}

packages/cli/src/checkin.rs

@@ -23,6 +23,9 @@ pub struct Args {
 	#[arg(index = 2)]
 	pub path: Option<PathBuf>,
 
+	#[command(flatten)]
+	pub print: crate::print::Options,
+
 	/// The artifact to check out.
 	#[arg(index = 1)]
 	pub reference: tg::Reference,
@@ -124,8 +127,8 @@ impl Cli {
 			.map_err(|source| tg::error!(!source, "failed to create the checkout stream"))?;
 		let output = self.render_progress_stream(stream).await?;
 
-		// Print the path.
-		println!("{}", output.path.display());
+		// Print the output.
+		Self::print_one(output, args.print).await?;
 
 		Ok(())
 	}

packages/cli/src/checkout.rs

@@ -4,6 +4,9 @@ use {crate::Cli, tangram_client as tg, tangram_either::Either};
 #[derive(Clone, Debug, clap::Args)]
 #[group(skip)]
 pub struct Args {
+	#[command(flatten)]
+	pub print: crate::print::Options,
+
 	/// The object or process.
 	#[arg(default_value = ".", index = 1)]
 	pub reference: tg::Reference,
@@ -17,6 +20,7 @@ impl Cli {
 				let args = crate::process::children::Args {
 					length: None,
 					position: None,
+					print: args.print,
 					process: process.id().clone(),
 					remote: None,
 					size: None,
@@ -26,6 +30,7 @@ impl Cli {
 			Either::Right(object) => {
 				let args = crate::object::children::Args {
 					object: object.id(),
+					print: args.print,
 				};
 				self.command_object_children(args).await?;
 			},

packages/cli/src/children.rs

@@ -1,6 +1,5 @@
 use {
 	crate::Cli,
-	crossterm::style::Stylize as _,
 	std::os::unix::fs::PermissionsExt as _,
 	tangram_client::{self as tg, prelude::*},
 };
@@ -29,12 +28,11 @@ impl Cli {
 		// Clean.
 		let stream = handle.clean().await?;
 		let output = self.render_progress_stream(stream).await?;
-		eprintln!(
-			"{} cleaned {} processes, {} objects",
-			"info".blue().bold(),
-			output.processes,
-			output.objects,
+		let message = format!(
+			"cleaned {} processes, {} objects",
+			output.processes, output.objects,
 		);
+		Self::print_info_message(&message);
 
 		Ok(())
 	}

packages/cli/src/clean.rs

@@ -11,9 +11,6 @@ pub struct Args {
 	#[arg(long)]
 	pub locked: bool,
 
-	#[arg(long)]
-	pub pretty: Option<bool>,
-
 	#[arg(default_value = ".", index = 1)]
 	pub reference: tg::Reference,
 
@@ -52,7 +49,7 @@ impl Cli {
 		let output = handle.document(arg).await?;
 
 		// Print the document.
-		Self::print_json(&output, args.pretty).await?;
+		Self::print_json(output, None).await?;
 
 		Ok(())
 	}