Reboot

Cargo.toml

@@ -16,53 +16,36 @@ categories = ["web-programming", "asynchronous"]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
-[[test]]
-name = "tests"
-path = "tests/tauri/tauri_test.rs"
-harness = false
-
-[[bench]]
-name = "benchmarks"
-harness = false
-
 [features]
-default = ["typescript"]
-typescript = ["rspc-core/typescript", "specta/typescript"]
-tracing = ["rspc-core/tracing", "dep:tracing"]
-
-unstable = ["rspc-core/unstable"] # APIs where one line of code can blow up your whole app
+default = []
+tracing = ["dep:tracing"]
 
 [dependencies]
-rspc-core = { path = "./crates/core" }
+rspc-core = { version = "0.0.1", path = "./crates/core" }
 specta = { workspace = true }
 
 serde = { workspace = true }
 thiserror = { workspace = true }
-futures = { version = "0.3.28", default-features = false, features = ["std", "async-await"] } # TODO: Drop for `futures_core` if possible
-pin-project-lite = "0.2.13"
+futures = { version = "0.3.30", default-features = false, features = ["std", "async-await"] } # TODO: Drop for `futures_core` if possible
 
-# Optional
-serde_json = { version = "1", default-features = false }
 tracing = { version = "0.1.40", default-features = false, optional = true }
 
-# Even though this `cfg` can never be enabled, it still forces cargo to keep `rspc-core` in lockstep with `rspc`.
-[target.'cfg(any())'.dependencies]
-rspc-core = { version = "=1.0.0-rc.5", path = "./crates/core" }
+
+# TODO: Remove `serde_json`
+serde_json = { version = "1", default-features = false }
 
 [dev-dependencies]
 # Tests
 async-stream = "0.3.5"
 tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread"] }
 tauri = { version = "1.5.2", features = ["api-all"] }
 
-# Benchmark
-criterion = { version = "0.5", features = ["async_tokio", "html_reports"] }
-pprof = { version = "0.13.0", features = ["flamegraph", "criterion", "protobuf-codec", "frame-pointer"] }
-
 [workspace]
-members = ["./crates/*", "./examples", "./examples/axum", "./examples/vercel", "./examples/tauri/src-tauri"]
+members = ["./crates/*", "./examples", "./examples/axum", "./examples/tauri/src-tauri"]
+
 
+# TODO: Probs remove this
 [workspace.dependencies]
-specta = { version = "=2.0.0-rc.6", default-features = false, features = ["serde", "serde_json"] }
+specta = { version = "=2.0.0-rc.7", default-features = false, features = ["serde", "serde_json", "typescript"] }
 serde = { version = "1", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.50", default-features = false }

crates/axum/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "rspc-axum"
+version = "0.0.1"
+edition = "2021"
+
+# /bin/sh RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --all-features
+[package.metadata."docs.rs"]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[dependencies]
+axum = { version = "0.7.2", no-default-features = true }
+rspc-core = { version = "0.0.1", path = "../core", default-features = false }

crates/axum/src/lib.rs

@@ -0,0 +1,43 @@
+//! Integrate rspc with an [Axum](https://docs.rs/axum/latest/axum/) HTTP server so it can be accessed from your frontend.
+#![warn(
+    clippy::all,
+    clippy::cargo,
+    clippy::unwrap_used,
+    clippy::panic,
+    clippy::todo,
+    clippy::panic_in_result_fn,
+    // missing_docs
+)]
+#![forbid(unsafe_code)]
+#![allow(clippy::module_inception)]
+#![cfg_attr(docsrs, feature(doc_cfg))]
+
+use axum::{
+    extract::Request,
+    http::{Method, StatusCode},
+    routing::{on, MethodFilter},
+    Router,
+};
+use rspc_core::IntoRouter;
+
+// TODO: Async context function
+// TODO: Allow context function to access request
+
+pub fn endpoint<R: IntoRouter>(router: R, ctx_fn: impl Fn() -> R::Ctx) -> Router {
+    let executor = router.build();
+    Router::new().route(
+        "/:id",
+        on(
+            MethodFilter::GET.or(MethodFilter::POST),
+            |req: Request| async move {
+                match (req.method(), &req.uri().path()[1..]) {
+                    (&Method::GET, "ws") => todo!(), // handle_websocket(router, ctx_fn, req).into_response(),
+                    (&Method::GET, _) => todo!(), // handle_http(router, ctx_fn, req).await.into_response(),
+                    (&Method::POST, "_batch") => todo!(), // handle_http_batch(router, ctx_fn, req).await.into_response()
+                    (&Method::POST, _) => todo!(), // handle_http(router, ctx_fn, req).await.into_response(),
+                    _ => (StatusCode::METHOD_NOT_ALLOWED, Vec::<u8>::new()),
+                }
+            },
+        ),
+    )
+}

crates/core/Cargo.toml

@@ -1,29 +1,26 @@
 [package]
 name = "rspc-core"
-version = "1.0.0-rc.5"
+version = "0.0.1"
 edition = "2021"
+publish = false    # TODO
 
-# TODO: Remove all features from this crate cause they mean we can optimise build time
-[features]
-default = []
-typescript = ["specta/typescript"]
-tracing = ["dep:tracing"]
-unstable = []
+# /bin/sh RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --all-features
+[package.metadata."docs.rs"]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-specta = { workspace = true, features = ["typescript"] }                                      # TODO: `typescript` should be required
-serde = { workspace = true }
-thiserror = { workspace = true }
-futures = { version = "0.3.28", default-features = false, features = ["std", "async-await"] } # TODO: Drop for `futures_core` if possible
-pin-project-lite = "0.2.13"
-serde_json = { version = "1", default-features = false }
-streamunordered = "0.5.3"
+# Public API
+futures-core = "0.3"
+serde = "1"
 
-# TODO: Remove these from core
-tracing = { version = "0.1.40", default-features = false, optional = true }
+# Private API
+erased-serde = "0.4.1"
 
-# TODO: Make something like this work
-# # Even though this `cfg` can never be enabled, it still forces cargo to keep `rspc-core` in lockstep with `rspc-*`.
-# [target.'cfg(any())'.dependencies]
-# rspc-httpz = { version = "=1.0.0-rc.5", path = "../httpz" }
-# rspc-tauri = { version = "=1.0.0-rc.5", path = "../tauri" }
+# TODO: Remove
+serde-value = "0.7.0"
+
+[dev-dependencies]
+tokio = { version = "1", features = ["full"] }
+serde_json = "1"                               # TODO: Remove this
+futures = "0.3"