wip

Author: m-hilgendorf

packages/cli/src/config.rs

@@ -202,6 +202,10 @@ pub struct Build {
 	#[serde(default, skip_serializing_if = "Option::is_none")]
 	pub max_depth: Option<u64>,
 
+	/// Configure if path and tag are set for builds.
+	#[serde(default, skip_serializing_if = "Option::is_none")]
+	pub set_path_and_tag: Option<bool>,
+
 	/// The remotes to build for.
 	#[serde(default, skip_serializing_if = "Option::is_none")]
 	pub remotes: Option<Vec<String>>,

packages/cli/src/target/build.rs

@@ -193,14 +193,14 @@ impl Cli {
 		};
 
 		// Get the source map.
-		let source_map = if let Some(lockfile) = lockfile {
+		let (source_map, lock) = if let Some(lockfile) = lockfile {
 			let lockfile = tg::Lockfile::try_read(&lockfile)
 				.await?
 				.ok_or_else(|| tg::error!(%path = lockfile.display(), "failed to read lockfile"))?;
 			let source_map = tg::SourceMap::new(&handle, &lockfile, object.clone()).await?;
-			Some(source_map)
+			(Some(source_map), Some(lockfile))
 		} else {
-			None
+			(None, None)
 		};
 
 		// Create the target.
@@ -352,6 +352,7 @@ impl Cli {
 		let id = target.id(&handle).await?;
 		let arg = tg::target::build::Arg {
 			create: args.create,
+			lock,
 			parent: None,
 			remote: remote.clone(),
 			retry,

packages/cli/src/view.rs

@@ -1,5 +1,5 @@
 use crate::Cli;
-use tangram_client as tg;
+use tangram_client::{self as tg, handle::Ext as _};
 use tangram_either::Either;
 use tangram_futures::task::Task;
 
@@ -58,7 +58,23 @@ impl Cli {
 			},
 		};
 		let (item, source_map) = match item {
-			Either::Left(build) => (crate::viewer::Item::Build(build), None),
+			Either::Left(build) => {
+				let source_map = if let Some(lockfile) = handle.get_build(build.id()).await?.lock {
+					// Only attempt to load the target if the lock is set.
+					if let Some(executable) =
+						&*build.target(&handle).await?.executable(&handle).await?
+					{
+						let object = executable.object()[0].clone();
+						let source_map = tg::SourceMap::new(&handle, &lockfile, object).await?;
+						Some(source_map)
+					} else {
+						None
+					}
+				} else {
+					None
+				};
+				(crate::viewer::Item::Build(build), source_map)
+			},
 			Either::Right(object) => {
 				// Get the source map.
 				let source_map = if let Some(lockfile) = lockfile {

packages/client/src/build/get.rs

@@ -18,6 +18,9 @@ pub struct Output {
 
 	pub host: String,
 
+	#[serde(default, skip_serializing_if = "Option::is_none")]
+	pub lock: Option<tg::Lockfile>,
+
 	#[serde(default, skip_serializing_if = "Option::is_none")]
 	pub log: Option<tg::blob::Id>,
 

packages/client/src/reference/get.rs

@@ -1,6 +1,5 @@
-use std::path::PathBuf;
-
 use crate as tg;
+use std::path::PathBuf;
 use tangram_either::Either;
 use tangram_http::{incoming::response::Ext as _, outgoing::request::Ext as _};
 

packages/client/src/target/build.rs

@@ -10,6 +10,9 @@ pub struct Arg {
 	#[serde(default = "return_true", skip_serializing_if = "is_true")]
 	pub create: bool,
 
+	#[serde(default, skip_serializing_if = "Option::is_none")]
+	pub lock: Option<tg::Lockfile>,
+
 	#[serde(default, skip_serializing_if = "Option::is_none")]
 	pub parent: Option<tg::build::Id>,
 
@@ -76,6 +79,7 @@ impl Default for Arg {
 	fn default() -> Self {
 		Self {
 			create: true,
+			lock: None,
 			parent: None,
 			remote: None,
 			retry: tg::build::Retry::default(),

packages/server/src/artifact/checkin/object.rs

@@ -38,10 +38,10 @@ pub struct Edge {
 #[derive(Clone, Debug)]
 struct RemappedEdge {
 	pub id: Either<usize, tg::object::Id>,
-	pub _path: Option<PathBuf>,
+	pub path: Option<PathBuf>,
 	pub reference: tg::Reference,
 	pub subpath: Option<PathBuf>,
-	pub _tag: Option<tg::Tag>,
+	pub tag: Option<tg::Tag>,
 }
 
 impl Server {
@@ -114,12 +114,13 @@ impl Server {
 				paths,
 			))
 			.await;
+			let tag = unify.nodes.get(&edge.referent).unwrap().tag.clone();
 			let edge = Edge {
 				index: dependency_index,
-				path: None,
+				path: edge.path.clone(),
 				reference: reference.clone(),
 				subpath: edge.subpath.clone(),
-				tag: None,
+				tag,
 			};
 			nodes[index].edges.push(edge);
 		}
@@ -309,10 +310,10 @@ impl Server {
 				};
 				RemappedEdge {
 					id,
-					_path: edge.path.clone(),
+					path: edge.path.clone(),
 					reference: edge.reference.clone(),
 					subpath: edge.subpath.clone(),
-					_tag: edge.tag.clone(),
+					tag: edge.tag.clone(),
 				}
 			})
 			.collect::<Vec<_>>();
@@ -398,10 +399,10 @@ impl Server {
 				};
 				RemappedEdge {
 					id,
-					_path: edge.path.clone(),
+					path: edge.path.clone(),
 					reference: edge.reference.clone(),
 					subpath: edge.subpath.clone(),
-					_tag: edge.tag.clone(),
+					tag: edge.tag.clone(),
 				}
 			})
 			.collect::<Vec<_>>();
@@ -454,14 +455,21 @@ impl Server {
 					} => (contents, executable),
 				};
 				// Compute the dependencies, which will be shared in all cases.
+				let set_path_and_tag = self
+					.config()
+					.build
+					.as_ref()
+					.map_or(false, |build| build.set_path_and_tag);
 				let dependencies = edges
 					.into_iter()
 					.map(|edge| {
+						let path = set_path_and_tag.then(|| edge.path.clone()).flatten();
+						let tag = set_path_and_tag.then(|| edge.tag.clone()).flatten();
 						let dependency = tg::Referent {
 							item: edge.id,
-							path: None,
+							path,
 							subpath: edge.subpath,
-							tag: None,
+							tag,
 						};
 						(edge.reference, dependency)
 					})

packages/server/src/build/get.rs

@@ -44,6 +44,8 @@ impl Server {
 			pub error: Option<db::value::Json<tg::Error>>,
 			pub host: String,
 			#[serde(default)]
+			pub lock: Option<tg::Lockfile>,
+			#[serde(default)]
 			pub log: Option<tg::blob::Id>,
 			#[serde(default)]
 			pub logs_count: Option<u64>,
@@ -92,6 +94,7 @@ impl Server {
 					depth,
 					error,
 					host,
+					lock,
 					log,
 					logs_complete,
 					logs_count,
@@ -126,6 +129,7 @@ impl Server {
 			depth: row.depth,
 			error: row.error.map(|error| error.0),
 			host: row.host,
+			lock: row.lock,
 			log: row.log,
 			logs_count: row.logs_count,
 			logs_depth: row.logs_depth,

packages/server/src/config.rs

@@ -58,6 +58,7 @@ pub struct Build {
 	pub concurrency: usize,
 	pub heartbeat_interval: Duration,
 	pub max_depth: u64,
+	pub set_path_and_tag: bool,
 	pub remotes: Vec<String>,
 }
 
@@ -194,6 +195,7 @@ impl Default for Build {
 			concurrency: n.into(),
 			heartbeat_interval: Duration::from_secs(1),
 			max_depth: 4096,
+			set_path_and_tag: false,
 			remotes: Vec::new(),
 		}
 	}

packages/server/src/database.rs

@@ -97,6 +97,7 @@ async fn migration_0000(database: &Database) -> tg::Result<()> {
 				host text not null,
 				index_status text,
 				index_started_at text,
+				lock text,
 				log text,
 				logs_complete integer not null default 0,
 				logs_count integer,