chore: rework top-level features

Signed-off-by: Roman Volosatovs <[email protected]>

Author: rvolosatovs

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 description = "WebAssembly component-native RPC framework based on WIT"
 name = "wrpc"
-version = "0.13.0"
+version = "0.14.0"
 
 authors.workspace = true
 categories.workspace = true
@@ -22,33 +22,29 @@ repository = "https://github.com/bytecodealliance/wrpc"
 members = ["crates/*", "examples/rust/*"]
 
 [features]
-default = ["bin", "nats", "quic", "wasmtime"]
+default = ["bin", "nats", "net", "quic", "wasmtime"]
 
-bin = [
+bin = ["bin-bindgen", "bin-wasmtime"]
+bin-bindgen = [
     "dep:clap",
-    "dep:serde",
-    "dep:serde_json",
-    "dep:tokio",
     "dep:wit-bindgen-core",
     "dep:wit-bindgen-wrpc-go",
-    "dep:wrpc-cli",
-    "dep:wrpc-wasmtime-cli",
-    "tokio/rt-multi-thread",
-    "tokio/sync",
     "wit-bindgen-wrpc-go/clap",
     "wit-bindgen-wrpc-rust/clap",
 ]
+bin-wasmtime = ["dep:tokio", "dep:wrpc-wasmtime-cli", "tokio/rt-multi-thread"]
 nats = ["dep:async-nats", "dep:wrpc-transport-nats", "wrpc-cli/nats"]
+net = ["wrpc-transport/net"]
 quic = ["dep:wrpc-transport-quic"]
 wasmtime = ["dep:wrpc-runtime-wasmtime"]
 
 [[bin]]
 name = "wit-bindgen-wrpc"
-required-features = ["bin"]
+required-features = ["bin-bindgen"]
 
 [[bin]]
 name = "wrpc-wasmtime"
-required-features = ["bin", "nats", "wasmtime"]
+required-features = ["bin-wasmtime"]
 
 [[bench]]
 name = "bench"
@@ -66,8 +62,6 @@ clap = { workspace = true, features = [
     "suggestions",
     "usage",
 ], optional = true }
-serde = { workspace = true, optional = true }
-serde_json = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true }
 tracing = { workspace = true, features = ["attributes"] }
 wit-bindgen-core = { workspace = true, optional = true }

Cargo.toml

@@ -20,4 +20,3 @@ pub mod runtime {
 }
 
 pub use transport::{Index, Invoke, Serve};
-pub use wit_bindgen_wrpc::generate;

src/lib.rs

@@ -8,7 +8,7 @@ use tracing::info;
 pub async fn assert_async<C: Default>(
     client: &impl wrpc_transport::Invoke<Context = C>,
 ) -> anyhow::Result<()> {
-    wrpc::generate!({
+    wit_bindgen_wrpc::generate!({
         world: "async-client",
         path: "tests/wit",
     });

tests/common/mod.rs

@@ -43,7 +43,7 @@ async fn go_bindgen() -> anyhow::Result<()> {
 
     wrpc_test::with_nats(|port, nats_client| async move {
         mod bindings {
-            wrpc::generate!({
+            wit_bindgen_wrpc::generate!({
                 world: "sync-client",
                 path: "tests/wit",
                 additional_derives: [::core::cmp::PartialEq],

tests/go.rs

@@ -33,7 +33,7 @@ where
     let shutdown_rx = async move { shutdown_rx.await.expect("shutdown sender dropped") }.shared();
     try_join!(
         async {
-            wrpc::generate!({
+            wit_bindgen_wrpc::generate!({
                 world: "async-server",
                 path: "tests/wit",
             });
@@ -166,7 +166,7 @@ where
             .await?
         },
         async {
-            wrpc::generate!({
+            wit_bindgen_wrpc::generate!({
                 world: "async-client",
                 path: "tests/wit",
             });
@@ -196,7 +196,7 @@ where
     try_join!(
         async {
             mod bindings {
-                wrpc::generate!({
+                wit_bindgen_wrpc::generate!({
                     inline: "
                             package wrpc-test:integration;
 
@@ -434,7 +434,7 @@ where
         }.instrument(span.clone()),
         async {
             mod bindings {
-                wrpc::generate!({
+                wit_bindgen_wrpc::generate!({
                     inline: "
                             package wrpc-test:integration;
 
@@ -629,7 +629,7 @@ where
         }.instrument(span.clone()),
         async {
             mod bindings {
-                wrpc::generate!({
+                wit_bindgen_wrpc::generate!({
                     inline: "
                             package wrpc-test:integration;