fix: 🐛 fixed inconsistent path prefixing in build_state calls

Author: arctic-hen7

examples/showcase/app/src/lib.rs

@@ -14,8 +14,8 @@ enum AppRoute {
     About,
     #[to("/post/new")]
     NewPost,
-    #[to("/post/<slug>")]
-    Post { slug: String },
+    #[to("/post/<slug..>")]
+    Post { slug: Vec<String> },
     #[to("/ip")]
     Ip,
     #[to("/time")]
@@ -82,7 +82,7 @@ pub fn run() -> Result<(), JsValue> {
                             get_error_pages()
                         ),
                         AppRoute::Post { slug } => app_shell(
-                            format!("post/{}", slug),
+                            format!("post/{}", slug.join("/")),
                             pages::post::template_fn(),
                             get_error_pages()
                         ),

examples/showcase/app/src/pages/post.rs

@@ -31,13 +31,11 @@ pub fn get_page<G: GenericNode>() -> Template<G> {
 }
 
 pub async fn get_static_props(path: String) -> Result<String, String> {
-    let path_vec: Vec<&str> = path.split('/').collect();
-    let title_slug = path_vec[path_vec.len() - 1];
     // This is just an example
-    let title = urlencoding::decode(title_slug).unwrap();
+    let title = urlencoding::decode(&path).unwrap();
     let content = format!(
         "This is a post entitled '{}'. Its original slug was '{}'.",
-        title, title_slug
+        title, path
     );
 
     Ok(serde_json::to_string(&PostPageProps {
@@ -48,7 +46,10 @@ pub async fn get_static_props(path: String) -> Result<String, String> {
 }
 
 pub async fn get_static_paths() -> Result<Vec<String>, String> {
-    Ok(vec!["test".to_string()])
+    Ok(vec![
+        "test".to_string(),
+        "blah/test/blah".to_string()
+    ])
 }
 
 pub fn template_fn<G: GenericNode>() -> perseus::template::TemplateFn<G> {

src/build.rs

@@ -40,8 +40,8 @@ pub async fn build_template(
         // Handle static initial state generation
         // We'll only write a static state if one is explicitly generated
         if template.uses_build_state() {
-            // We pass in the latter part of the path, without the base specifier (because that would be the same for everything in the template)
-            let initial_state = template.get_build_state(path.to_string()).await?;
+            // We pass in the path to get a state (including the template path for consistency with the incremental logic)
+            let initial_state = template.get_build_state(full_path.clone()).await?;
             // Write that intial state to a static JSON file
             config_manager.write(&format!("./dist/static/{}.json", full_path), &initial_state)?;
             // Prerender the template using that state

src/serve.rs

@@ -135,7 +135,6 @@ async fn revalidate(
 
 /// Gets the HTML/JSON data for the given page path. This will call SSG/SSR/etc., whatever is needed for that page. Note that HTML generated
 /// at request-time will **always** replace anything generated at build-time, incrementally, revalidated, etc.
-// TODO let this function take a request struct of some form
 // TODO possible further optimizations on this for futures?
 pub async fn get_page(
     path: &str,
@@ -225,7 +224,7 @@ pub async fn get_page(
                     // We need to generate and cache this page for future usage
                     let state = Some(
                         template
-                            .get_build_state(format!("{}/{}", template.get_path(), path))
+                            .get_build_state(path.to_string())
                             .await?,
                     );
                     let html_val =