Skip to content
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

More closely match Axum + Actix Leptos server implementation #10

Merged
merged 1 commit into from
Dec 1, 2024
Merged

More closely match Axum + Actix Leptos server implementation #10

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
45 changes: 34 additions & 11 deletions src/handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ use leptos::{
use leptos_integration_utils::{ExtendResponse, PinnedStream};
use leptos_meta::ServerMetaContext;
use leptos_router::{
components::provide_server_redirect, location::RequestUrl, PathSegment,
RouteList, RouteListing, SsrMode,
components::provide_server_redirect, location::RequestUrl, ExpandOptionals,
PathSegment, RouteList, RouteListing, SsrMode,
};
use mime_guess::MimeGuess;
use routefinder::Router;
Expand Down Expand Up @@ -241,22 +241,23 @@ impl Handler {
}

let owner = Owner::new_root(Some(Arc::new(SsrSharedContext::new())));
let (mock_meta, _) = ServerMetaContext::new();
let routes = owner
.with(|| {
// as we are generating the app to extract
// the <Router/>, we want to mock the root path.
provide_context(RequestUrl::new(""));
provide_context(ResponseOptions::default());
provide_context(http::uri::Parts::default());
let (mock_meta, _) = ServerMetaContext::new();
let (mock_parts, _) = Request::new("").into_parts();
provide_context(mock_meta);
provide_context(mock_parts);
provide_context(ResponseOptions::default());
additional_context();
RouteList::generate(&app_fn)
})
.unwrap_or_default()
.into_inner()
.into_iter()
.map(|rt| (rt.path().to_rf_str_representation(), rt))
.flat_map(IntoRouteListing::into_route_listing)
.filter(|route| {
excluded_routes.as_ref().map_or(true, |excluded_routes| {
!excluded_routes.iter().any(|ex_path| *ex_path == route.0)
Expand Down Expand Up @@ -457,11 +458,34 @@ fn provide_contexts(
provide_server_redirect(redirect);
}

trait IntoRouteListing: Sized {
fn into_route_listing(self) -> Vec<(String, RouteListing)>;
}

impl IntoRouteListing for RouteListing {
fn into_route_listing(self) -> Vec<(String, RouteListing)> {
self.path()
.to_vec()
.expand_optionals()
.into_iter()
.map(|path| {
let path = path.to_rf_str_representation();
let path = if path.is_empty() {
"/".to_string()
} else {
path
};
(path, self.clone())
})
.collect()
}
}

trait RouterPathRepresentation {
fn to_rf_str_representation(&self) -> String;
}

impl RouterPathRepresentation for &[PathSegment] {
impl RouterPathRepresentation for Vec<PathSegment> {
fn to_rf_str_representation(&self) -> String {
let mut path = String::new();
for segment in self.iter() {
Expand All @@ -480,10 +504,9 @@ impl RouterPathRepresentation for &[PathSegment] {
path.push('*');
}
PathSegment::Unit => {}
PathSegment::OptionalParam(s) => {
path.push(':');
path.push_str(s);
path.push('?');
PathSegment::OptionalParam(_) => {
eprintln!("to_rf_str_representation should only be called on expanded paths, which do not have OptionalParam any longer");
Default::default()
}
}
}
Expand Down