fix component source dir vs component source mix-up

golemcloud · Dec 9, 2024 · ae90320 · ae90320
1 parent 8c24833
commit ae90320
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/wasm-rpc-stubgen/src/commands/app.rs b/wasm-rpc-stubgen/src/commands/app.rs
@@ -390,7 +390,7 @@ async fn link_rpc<CPE: ComponentPropertiesExtensions>(
     let _indent = LogIndent::new();
 
     for component_name in ctx.application.component_names() {
-        let source = ctx.application.component_source_dir(component_name);
+        let source = ctx.application.component_source(component_name);
         let dependencies = ctx
             .application
             .component_wasm_rpc_dependencies(component_name);

diff --git a/wasm-rpc-stubgen/src/model/app.rs b/wasm-rpc-stubgen/src/model/app.rs
@@ -873,6 +873,10 @@ impl<CPE: ComponentPropertiesExtensions> Application<CPE> {
             .unwrap_or_else(|| panic!("Component not found: {}", component_name))
     }
 
+    pub fn component_source(&self, component_name: &ComponentName) -> &Path {
+        &self.component(component_name).source
+    }
+
     pub fn component_source_dir(&self, component_name: &ComponentName) -> &Path {
         self.component(component_name).source_dir()
     }

diff --git a/wasm-rpc-stubgen/src/wit_resolve.rs b/wasm-rpc-stubgen/src/wit_resolve.rs
@@ -422,9 +422,7 @@ impl ResolvedWitApplication {
                 {
                     validation.push_context(
                         "source",
-                        app.component_source_dir(component_name)
-                            .to_string_lossy()
-                            .to_string(),
+                        app.component_source(component_name).display().to_string(),
                     );
                 }