Skip to content

fix(csharp): export the world stubs with correct namespace #756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
silesmo merged 1 commit into from
Nov 19, 2023
Merged

fix(csharp): export the world stubs with correct namespace #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 39 additions & 21 deletions crates/csharp/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,37 +440,50 @@ impl WorldGenerator for CSharp {

files.push(&format!("{name}.cs"), indent(&src).as_bytes());

let generate_stub =
|name: String, files: &mut Files, fragments: &Vec<InterfaceFragment>| {
let stub_file_name = format!("{name}Impl");
let interface_name = CSharp::get_class_name_from_qualified_name(name.clone());
let stub_class_name = format!("{interface_name}Impl");
let generate_stub = |name: String, files: &mut Files, stubs: Stubs| {
let stub_file_name = format!("{name}Impl");
let interface_name = CSharp::get_class_name_from_qualified_name(name.clone());
let stub_class_name = format!("{interface_name}Impl");

let (fragments, fully_qaulified_namespace) = match stubs {
Stubs::World(fragments) => {
let fully_qaulified_namespace = format!("{namespace}");
(fragments, fully_qaulified_namespace)
}
Stubs::Interface(fragments) => {
let fully_qaulified_namespace = format!("{namespace}.{name}");
(fragments, fully_qaulified_namespace)
}
};

let body = fragments
.iter()
.map(|f| f.stub.deref())
.collect::<Vec<_>>()
.join("\n");
let body = fragments
.iter()
.map(|f| f.stub.deref())
.collect::<Vec<_>>()
.join("\n");

let body = format!(
"// Generated by `wit-bindgen` {version}. DO NOT EDIT!
let body = format!(
"// Generated by `wit-bindgen` {version}. DO NOT EDIT!
{CSHARP_IMPORTS}

namespace {namespace}.{name};
namespace {fully_qaulified_namespace};

public partial class {stub_class_name} : {interface_name} {{
{body}
}}
"
);
);

files.push(&format!("{stub_file_name}.cs"), indent(&body).as_bytes());
};
files.push(&format!("{stub_file_name}.cs"), indent(&body).as_bytes());
};

// TODO: is the world Impl class useful?
// if self.opts.generate_stub {
// generate_stub(format!("{name}"), files);
// }
if self.opts.generate_stub {
generate_stub(
format!("{name}World"),
files,
Stubs::World(&self.world_fragments),
);
}

files.push(
&format!("{snake}_component_type.o",),
Expand Down Expand Up @@ -529,7 +542,7 @@ impl WorldGenerator for CSharp {
files.push(&format!("{name}Interop.cs"), indent(&body).as_bytes());

if interface_type_and_fragments.is_export && self.opts.generate_stub {
generate_stub(format!("{name}"), files, fragments);
generate_stub(format!("{name}"), files, Stubs::Interface(fragments));
}
}
}
Expand Down Expand Up @@ -1259,6 +1272,11 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for InterfaceGenerator<'a> {
}
}

enum Stubs<'a> {
World(&'a Vec<InterfaceFragment>),
Interface(&'a Vec<InterfaceFragment>),
}

struct Block {
_body: String,
_results: Vec<String>,
Expand Down
2 changes: 0 additions & 2 deletions crates/csharp/tests/codegen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,11 @@ macro_rules! codegen_test {
"result-empty",
"ret-areas",
"return-resource-from-export",
"same-names2",
"same-names5",
"simple-functions",
"simple-http",
"simple-lists",
"small-anonymous",
"smoke-default",
"strings",
"unused-import",
"use-across-interfaces",
Expand Down