From 9b20561cf993dd40b048be05e30e36e7ce9f9a42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Istv=C3=A1n=20B=C3=ADr=C3=B3?=
 <noise64@gmail.com>
Date: Tue, 15 Oct 2024 13:18:53 +0200
Subject: [PATCH] more cleanups

---
 wasm-rpc-stubgen/src/cargo.rs             |  2 +-
 wasm-rpc-stubgen/src/commands/generate.rs |  4 ++--
 wasm-rpc-stubgen/src/commands/log.rs      |  2 +-
 wasm-rpc-stubgen/src/stub.rs              |  4 +---
 wasm-rpc-stubgen/src/wit.rs               | 19 ++++++-------------
 5 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/wasm-rpc-stubgen/src/cargo.rs b/wasm-rpc-stubgen/src/cargo.rs
index 567686b..72559f0 100644
--- a/wasm-rpc-stubgen/src/cargo.rs
+++ b/wasm-rpc-stubgen/src/cargo.rs
@@ -96,7 +96,7 @@ pub fn generate_cargo_toml(def: &StubDefinition) -> anyhow::Result<()> {
     );
 
     let stub_package_name = def.stub_package_name();
-    for (dep_package, dep_package_sources) in def.source_packages_with_wit_sources() {
+    for (dep_package, dep_package_sources) in def.packages_with_wit_sources() {
         let dep_package_name = &dep_package.name;
 
         if *dep_package_name == stub_package_name {
diff --git a/wasm-rpc-stubgen/src/commands/generate.rs b/wasm-rpc-stubgen/src/commands/generate.rs
index 8722d2a..456f494 100644
--- a/wasm-rpc-stubgen/src/commands/generate.rs
+++ b/wasm-rpc-stubgen/src/commands/generate.rs
@@ -18,7 +18,7 @@ use crate::fs::copy;
 use crate::naming;
 use crate::rust::generate_stub_source;
 use crate::stub::StubDefinition;
-use crate::wit::{copy_wit_files, generate_stub_wit_to_target};
+use crate::wit::{copy_wit_dependencies, generate_stub_wit_to_target};
 use crate::wit_resolve::ResolvedWitDir;
 use anyhow::Context;
 use fs_extra::dir::CopyOptions;
@@ -56,7 +56,7 @@ pub async fn build(
 
 pub fn generate_stub_wit_dir(stub_def: &StubDefinition) -> anyhow::Result<ResolvedWitDir> {
     generate_stub_wit_to_target(stub_def).context("Failed to generate the stub wit file")?;
-    copy_wit_files(stub_def).context("Failed to copy the dependent wit files")?;
+    copy_wit_dependencies(stub_def).context("Failed to copy the dependent wit files")?;
     stub_def
         .resolve_target_wit()
         .context("Failed to resolve the result WIT root")
diff --git a/wasm-rpc-stubgen/src/commands/log.rs b/wasm-rpc-stubgen/src/commands/log.rs
index 917246c..4fe8712 100644
--- a/wasm-rpc-stubgen/src/commands/log.rs
+++ b/wasm-rpc-stubgen/src/commands/log.rs
@@ -1,6 +1,6 @@
+use crate::fs::{OverwriteSafeAction, OverwriteSafeActionPlan};
 use crate::model::validation::ValidatedResult;
 use colored::Colorize;
-use crate::fs::{OverwriteSafeAction, OverwriteSafeActionPlan};
 
 pub fn log_action<T: AsRef<str>>(action: &str, subject: T) {
     println!("{} {}", action.green(), subject.as_ref())
diff --git a/wasm-rpc-stubgen/src/stub.rs b/wasm-rpc-stubgen/src/stub.rs
index b0e2b4f..b991be7 100644
--- a/wasm-rpc-stubgen/src/stub.rs
+++ b/wasm-rpc-stubgen/src/stub.rs
@@ -90,9 +90,7 @@ impl StubDefinition {
     //       and similar reasoning is used when in one function we get and resolve an ID, since
     //       these would be internal arena errors.
 
-    pub fn source_packages_with_wit_sources(
-        &self,
-    ) -> impl Iterator<Item = (&Package, &Vec<PathBuf>)> {
+    pub fn packages_with_wit_sources(&self) -> impl Iterator<Item = (&Package, &Vec<PathBuf>)> {
         self.resolve
             .topological_packages()
             .into_iter()
diff --git a/wasm-rpc-stubgen/src/wit.rs b/wasm-rpc-stubgen/src/wit.rs
index ef4ad9b..bfb6f5a 100644
--- a/wasm-rpc-stubgen/src/wit.rs
+++ b/wasm-rpc-stubgen/src/wit.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use crate::commands::log::{log_action, log_warn_action};
-use crate::fs::{copy, copy_transformed};
+use crate::fs::{copy, copy_transformed, must_get_file_name};
 use crate::stub::{
     FunctionParamStub, FunctionResultStub, FunctionStub, InterfaceStub, InterfaceStubImport,
     InterfaceStubTypeDef, StubDefinition,
@@ -495,14 +495,14 @@ fn write_param_list(
     Ok(())
 }
 
-pub fn copy_wit_files(def: &StubDefinition) -> anyhow::Result<()> {
+pub fn copy_wit_dependencies(def: &StubDefinition) -> anyhow::Result<()> {
     let stub_package_name = def.stub_package_name();
     let remove_stub_imports = import_remover(&stub_package_name);
 
     let target_wit_root = def.target_wit_root();
     let target_deps = target_wit_root.join(naming::wit::DEPS_DIR);
 
-    for (package, sources) in def.source_packages_with_wit_sources() {
+    for (package, sources) in def.packages_with_wit_sources() {
         if package.name == stub_package_name {
             log_warn_action("Skipping", format!("package {}", package.name));
             continue;
@@ -513,18 +513,11 @@ pub fn copy_wit_files(def: &StubDefinition) -> anyhow::Result<()> {
         log_action("Copying", format!("source package {}", package.name));
         for source in sources {
             if is_source_package {
-                // TODO: naming to def and review this naming
                 let dest = target_deps
-                    .join(format!(
-                        "{}_{}",
-                        def.source_package_name.namespace, def.source_package_name.name
+                    .join(naming::wit::package_dep_folder_name(
+                        &def.source_package_name,
                     ))
-                    .join(source.file_name().ok_or_else(|| {
-                        anyhow!(
-                            "Failed to get file name for source: {}",
-                            source.to_string_lossy()
-                        )
-                    })?);
+                    .join(must_get_file_name(source)?);
                 log_action(
                     "  Copying",
                     format!(