From 7392d7882b0a3221dde198f20daa8057ba59e523 Mon Sep 17 00:00:00 2001
From: Christian Iversen <ci@iversenit.dk>
Date: Wed, 7 May 2025 22:21:58 +0200
Subject: [PATCH] fix: dx bundle progress output off-by-one in log lines
 (#4014)

* fix: dx bundle progress output off-by-one in log lines

* fix: Emit the name of the last compiled unit (feedback from @DogeDark)

* fix: Log "Compiled" instead of "Compiling", since the log refers to completed units, not in-progress ones

---------

Co-authored-by: Jonathan Kelley <jkelleyrtp@gmail.com>
---
 packages/cli/src/build/builder.rs |  8 ++++++--
 packages/cli/src/build/request.rs | 10 ++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/cli/src/build/builder.rs b/packages/cli/src/build/builder.rs
index 2fc4e55f3..34ad64611 100644
--- a/packages/cli/src/build/builder.rs
+++ b/packages/cli/src/build/builder.rs
@@ -359,7 +359,7 @@ impl AppBuilder {
                             krate,
                             ..
                         } => {
-                            tracing::info!("Compiling [{current:>3}/{total}]: {krate}");
+                            tracing::info!("Compiled [{current:>3}/{total}]: {krate}");
                         }
                         BuildStage::RunningBindgen => tracing::info!("Running wasm-bindgen..."),
                         BuildStage::CopyingAssets {
@@ -367,7 +367,11 @@ impl AppBuilder {
                             total,
                             path,
                         } => {
-                            tracing::info!("Copying asset ({current}/{total}): {}", path.display());
+                            tracing::info!(
+                                "Copying asset ({}/{total}): {}",
+                                current + 1,
+                                path.display()
+                            );
                         }
                         BuildStage::Bundling => tracing::info!("Bundling app..."),
                         _ => {}
diff --git a/packages/cli/src/build/request.rs b/packages/cli/src/build/request.rs
index 359156ce4..80d4a80f0 100644
--- a/packages/cli/src/build/request.rs
+++ b/packages/cli/src/build/request.rs
@@ -843,14 +843,8 @@ session_cache_dir: {}"#,
                 }
                 Message::CompilerArtifact(artifact) => {
                     units_compiled += 1;
-                    match artifact.executable {
-                        Some(executable) => output_location = Some(executable.into()),
-                        None => ctx.status_build_progress(
-                            units_compiled,
-                            crate_count,
-                            artifact.target.name,
-                        ),
-                    }
+                    ctx.status_build_progress(units_compiled, crate_count, artifact.target.name);
+                    output_location = artifact.executable.map(Into::into);
                 }
                 // todo: this can occasionally swallow errors, so we should figure out what exactly is going wrong
                 //       since that is a really bad user experience.