moved tempfile method into separate function

Author: mkatychev

crates/wkg/src/main.rs

@@ -24,6 +24,8 @@ mod wit;
 use oci::OciCommands;
 use wit::WitCommands;
 
+use crate::wit::temp_wit_file;
+
 #[derive(Parser, Debug)]
 #[command(version)]
 struct Cli {
@@ -252,15 +254,15 @@ impl PublishArgs {
     pub async fn run(self) -> anyhow::Result<()> {
         let client = self.common.get_client().await?;
 
-        let package = if let Some(package) = self.package {
-            Some((
-                package.package,
-                package.version.ok_or_else(|| {
-                    anyhow::anyhow!("version is required when manually overriding the package ID")
-                })?,
-            ))
-        } else {
-            None
+        let package = match self.package {
+            Some(PackageSpec {
+                package,
+                version: Some(v),
+            }) => Some((package, v)),
+            Some(PackageSpec { version: None, .. }) => {
+                anyhow::bail!("version is required when manually overriding the package ID");
+            }
+            None => None,
         };
 
         // If the input is a directory, build a WIT package from it into a temp
@@ -269,7 +271,7 @@ impl PublishArgs {
         let (publish_path, _tmp) = if self.path.is_dir() {
             let mut lock_file = LockFile::load(true).await?;
             let prev_lock_ref = (lock_file.version, lock_file.packages.clone());
-            let (build_ref, _, bytes) =
+            let (pkg_ref, _, bytes) =
                 wit::build_wit_dir(&self.path, client.clone(), &mut lock_file).await?;
             // There is no way to check if we are in a git repository unlike `cargo publish --allow-dirty` so
             // check against previous values.
@@ -285,22 +287,9 @@ impl PublishArgs {
                 });
             }
 
-            // Sanitize the package ref for use as a filename prefix: `namespace:name`
-            // contains characters (`:`, `/`) that are invalid in filenames on some
-            // platforms (notably Windows).
-            let prefix: String = build_ref.to_string().replace([':', '/'], "_");
-            let tmp = tempfile::Builder::new()
-                .prefix(&prefix)
-                .suffix(".wasm")
-                .tempfile()
-                .context("Failed to create temporary file for built WIT package")?;
-            tokio::fs::write(tmp.path(), &bytes)
-                .await
-                .context("Failed to write built WIT package to temp file")?;
-            let tmp_pkg_path = tmp.path().to_path_buf();
-            tracing::debug!(tmp_pkg_path = %tmp_pkg_path.display(), "Wrote temporary WIT package file");
+            let tmp = temp_wit_file(&pkg_ref, &bytes).await?;
 
-            (tmp_pkg_path, Some(tmp))
+            (tmp.path().to_path_buf(), Some(tmp))
         } else {
             (self.path.clone(), None)
         };

crates/wkg/src/wit.rs

@@ -3,6 +3,7 @@ use std::path::{Path, PathBuf};
 
 use anyhow::Context;
 use clap::{Args, Subcommand};
+use tempfile::NamedTempFile;
 use wasm_pkg_client::caching::{CachingClient, FileCache};
 use wasm_pkg_common::package::{PackageRef, Version};
 use wasm_pkg_core::{
@@ -123,6 +124,26 @@ pub async fn build_wit_dir(
     Ok(result)
 }
 
+pub async fn temp_wit_file(package: &PackageRef, bytes: &[u8]) -> anyhow::Result<NamedTempFile> {
+    // Sanitize the package ref for use as a filename prefix: `namespace:name`
+    // contains characters (`:`, `/`) that are invalid in filenames on some
+    // platforms (notably Windows).
+    let prefix: String = package.to_string().replace([':', '/'], "_");
+    let tmp_handle = tempfile::Builder::new()
+        .prefix(&prefix)
+        .suffix(".wasm")
+        .tempfile()
+        .context("Failed to create temporary file for built WIT package")
+        .with_context(|| format!("package: {package}"))?;
+    tokio::fs::write(tmp_handle.path(), &bytes)
+        .await
+        .context("Failed to write built WIT package to temp file")
+        .with_context(|| format!("package: {package}"))?;
+
+    tracing::debug!(tmp_pkg_path = %tmp_handle.path().display(), "Wrote temporary WIT package file");
+    Ok(tmp_handle)
+}
+
 impl FetchArgs {
     pub async fn run(self) -> anyhow::Result<()> {
         check_dir(&self.dir).await?;