chore: Update dfx generate output (#4097)

Author: adamspofford-dfinity

src/dfx/src/commands/generate.rs

@@ -69,14 +69,17 @@ pub fn exec(env: &dyn Environment, opts: GenerateOpts) -> DfxResult {
         .unwrap_or(false)
     {
         let canister_pool_build = CanisterPool::load(&env, true, &build_dependees)?;
-        slog::info!(log, "Building canisters before generate for Motoko");
+        let spinner = env.new_spinner("Building Motoko canisters before generation...".into());
         let runtime = Runtime::new().expect("Unable to create a runtime");
         runtime.block_on(canister_pool_build.build_or_fail(&env, log, &build_config))?;
+        spinner.finish_and_clear();
     }
 
+    let spinner = env.new_spinner("Generating type declarations...".into());
     for canister in canister_pool_load.canisters_to_build(&generate_config) {
         canister.generate(&env, log, &canister_pool_load, &generate_config)?;
     }
+    spinner.finish_and_clear();
 
     Ok(())
 }

src/dfx/src/lib/builders/mod.rs

@@ -12,7 +12,7 @@ use dfx_core::network::provider::get_network_context;
 use dfx_core::util;
 use fn_error_context::context;
 use handlebars::Handlebars;
-use slog::{trace, Logger};
+use slog::{info, trace, Logger};
 use std::borrow::Cow;
 use std::collections::BTreeMap;
 use std::ffi::OsStr;
@@ -115,7 +115,7 @@ pub trait CanisterBuilder {
                 .with_context(|| {
                     format!(
                         "Failed to canonicalize output dir {}.",
-                        generate_output_dir.to_string_lossy()
+                        generate_output_dir.display()
                     )
                 })?;
             if !generate_output_dir.starts_with(info.get_workspace_root()) {
@@ -125,10 +125,7 @@ pub trait CanisterBuilder {
                 );
             }
             std::fs::remove_dir_all(&generate_output_dir).with_context(|| {
-                format!(
-                    "Failed to remove dir: {}",
-                    generate_output_dir.to_string_lossy()
-                )
+                format!("Failed to remove dir: {}", generate_output_dir.display())
             })?;
         }
 
@@ -139,29 +136,24 @@ pub trait CanisterBuilder {
             .context("`bindings` must not be None")?;
 
         if bindings.is_empty() {
-            eprintln!("`{}.declarations.bindings` in dfx.json was set to be an empty list, so no type declarations will be generated.", &info.get_name());
+            info!(logger, "`{}.declarations.bindings` in dfx.json was set to be an empty list, so no type declarations will be generated.", &info.get_name());
             return Ok(());
         }
 
-        trace!(
-            logger,
-            "Generating type declarations for canister {}",
-            &info.get_name()
-        );
-
-        std::fs::create_dir_all(generate_output_dir).with_context(|| {
+        let spinner = env.new_spinner(
             format!(
-                "Failed to create dir: {}",
-                generate_output_dir.to_string_lossy()
+                "Generating type declarations for canister {}",
+                &info.get_name()
             )
-        })?;
+            .into(),
+        );
+
+        std::fs::create_dir_all(generate_output_dir)
+            .with_context(|| format!("Failed to create dir: {}", generate_output_dir.display()))?;
 
         let did_from_build = self.get_candid_path(env, pool, info, config)?;
         if !did_from_build.exists() {
-            bail!(
-                "Candid file: {} doesn't exist.",
-                did_from_build.to_string_lossy()
-            );
+            bail!("Candid file: {} doesn't exist.", did_from_build.display());
         }
 
         let (env, ty) = CandidSource::File(did_from_build.as_path()).load()?;
@@ -192,12 +184,8 @@ pub trait CanisterBuilder {
                 .with_extension("did.js");
             let content =
                 ensure_trailing_newline(candid_parser::bindings::javascript::compile(&env, &ty));
-            std::fs::write(&output_did_js_path, content).with_context(|| {
-                format!(
-                    "Failed to write to {}.",
-                    output_did_js_path.to_string_lossy()
-                )
-            })?;
+            std::fs::write(&output_did_js_path, content)
+                .with_context(|| format!("Failed to write to {}.", output_did_js_path.display()))?;
             trace!(logger, "  {}", &output_did_js_path.display());
 
             compile_handlebars_files("js", info, generate_output_dir)?;
@@ -210,9 +198,8 @@ pub trait CanisterBuilder {
                 .with_extension("mo");
             let content =
                 ensure_trailing_newline(candid_parser::bindings::motoko::compile(&env, &ty));
-            std::fs::write(&output_mo_path, content).with_context(|| {
-                format!("Failed to write to {}.", output_mo_path.to_string_lossy())
-            })?;
+            std::fs::write(&output_mo_path, content)
+                .with_context(|| format!("Failed to write to {}.", output_mo_path.display()))?;
             trace!(logger, "  {}", &output_mo_path.display());
         }
 
@@ -226,6 +213,14 @@ pub trait CanisterBuilder {
             trace!(logger, "  {}", &output_did_path.display());
         }
 
+        spinner.finish_and_clear();
+        info!(
+            logger,
+            "Generated type declarations for canister {} to {}",
+            &info.get_name(),
+            generate_output_dir.display()
+        );
+
         Ok(())
     }