From b1b274ea1274c8a78d16b7221944ebc45bbed3c6 Mon Sep 17 00:00:00 2001
From: Mustafa Zaki Assagaf <mustafa.segf@gmail.com>
Date: Tue, 17 Dec 2024 22:47:23 +0700
Subject: [PATCH] feat: update tuono macro handler naming to avoid naming
 collisions (#225)

---
 crates/tuono/src/source_builder.rs     | 4 ++--
 crates/tuono/tests/cli_tests.rs        | 9 +++++----
 crates/tuono_lib_macros/src/handler.rs | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/crates/tuono/src/source_builder.rs b/crates/tuono/src/source_builder.rs
index 4199dc12..c8770d2d 100644
--- a/crates/tuono/src/source_builder.rs
+++ b/crates/tuono/src/source_builder.rs
@@ -84,11 +84,11 @@ fn create_routes_declaration(routes: &HashMap<String, Route>) -> String {
 
             if !route.is_api() {
                 route_declarations.push_str(&format!(
-                    r#".route("{axum_route}", get({module_import}::route))"#
+                    r#".route("{axum_route}", get({module_import}::tuono__internal__route))"#
                 ));
 
                 route_declarations.push_str(&format!(
-                    r#".route("/__tuono/data{axum_route}", get({module_import}::api))"#
+                    r#".route("/__tuono/data{axum_route}", get({module_import}::tuono__internal__api))"#
                 ));
             } else {
                 for method in route.api_data.as_ref().unwrap().methods.clone() {
diff --git a/crates/tuono/tests/cli_tests.rs b/crates/tuono/tests/cli_tests.rs
index b2b8a3ff..215d97df 100644
--- a/crates/tuono/tests/cli_tests.rs
+++ b/crates/tuono/tests/cli_tests.rs
@@ -30,7 +30,7 @@ fn it_successfully_create_the_index_route() {
     assert!(temp_main_rs_content.contains("mod index;"));
 
     assert!(temp_main_rs_content
-        .contains(r#".route("/", get(index::route)).route("/__tuono/data/", get(index::api))"#));
+        .contains(r#".route("/", get(index::tuono__internal__route)).route("/__tuono/data/", get(index::tuono__internal__api))"#));
 }
 
 #[test]
@@ -129,9 +129,10 @@ fn it_successfully_create_catch_all_routes() {
         r#".route("/api/*all_apis", post(api_dyn__catch_all_all_apis::post__tuono_internal_api))"#
     ));
 
-    assert!(temp_main_rs_content
-        .contains(r#".route("/*all_routes", get(dyn__catch_all_all_routes::route))"#));
+    assert!(temp_main_rs_content.contains(
+        r#".route("/*all_routes", get(dyn__catch_all_all_routes::tuono__internal__route))"#
+    ));
 
     assert!(temp_main_rs_content
-        .contains(r#".route("/__tuono/data/*all_routes", get(dyn__catch_all_all_routes::api))"#));
+        .contains(r#".route("/__tuono/data/*all_routes", get(dyn__catch_all_all_routes::tuono__internal__api))"#));
 }
diff --git a/crates/tuono_lib_macros/src/handler.rs b/crates/tuono_lib_macros/src/handler.rs
index 74b115c0..e253727a 100644
--- a/crates/tuono_lib_macros/src/handler.rs
+++ b/crates/tuono_lib_macros/src/handler.rs
@@ -45,7 +45,7 @@ pub fn handler_core(_args: TokenStream, item: TokenStream) -> TokenStream {
 
         #item
 
-        pub async fn route(
+        pub async fn tuono__internal__route(
             #axum_arguments
         ) -> impl tuono_lib::axum::response::IntoResponse {
 
@@ -59,7 +59,7 @@ pub fn handler_core(_args: TokenStream, item: TokenStream) -> TokenStream {
            #fn_name(req.clone(), #argument_names).await.render_to_string(req)
         }
 
-        pub async fn api(
+        pub async fn tuono__internal__api(
             #axum_arguments
         ) -> impl tuono_lib::axum::response::IntoResponse {