Fix path

Author: owjs3901

libs/python/core/src/py_utils.rs

@@ -39,8 +39,22 @@ pub fn get_cwd() -> PyResult<String> {
 pub fn convert_to_route_path(path: &str) -> String {
     let mut result = path.replace("\\", "/");
 
-    if result.starts_with("routes/") {
-        result = result[7..].to_string();
+    if result.starts_with("./") {
+        result = result[2..].to_string();
+    }
+    if result.starts_with(".\\") {
+        result = result[2..].to_string();
+    }
+
+    if result.starts_with("/") {
+        result = result[1..].to_string();
+    }
+
+    if result.starts_with("\\") {
+        result = result[1..].to_string();
+    }
+    if result.starts_with("routes") {
+        result = result[6..].to_string();
     }
 
     while let Some(start) = result.find("/(") {
@@ -79,6 +93,10 @@ mod tests {
     #[test]
     fn test_convert_to_route_path() {
         assert_eq!(convert_to_route_path("routes/crud.py"), "/crud");
+        assert_eq!(convert_to_route_path("/routes/a/crud.py"), "/a/crud");
+        assert_eq!(convert_to_route_path("\\routes/a/crud.py"), "/a/crud");
+        assert_eq!(convert_to_route_path("./routes/a/crud.py"), "/a/crud");
+        assert_eq!(convert_to_route_path(".\\routes/a/crud.py"), "/a/crud");
         assert_eq!(convert_to_route_path("routes\\crud.py"), "/crud");
         assert_eq!(convert_to_route_path("routes/a/b/c/crud.py"), "/a/b/c/crud");
         assert_eq!(
@@ -89,6 +107,14 @@ mod tests {
         assert_eq!(convert_to_route_path("routes/a/(b)/(c)/crud.py"), "/a/crud");
 
         assert_eq!(convert_to_route_path("routes/a/(b)/(c)/__init__.py"), "/a");
+        assert_eq!(
+            convert_to_route_path("routes/(singleton)/global_info.py"),
+            "/global-info"
+        );
+        assert_eq!(
+            convert_to_route_path("routes\\(singleton)\\global_info.py"),
+            "/global-info"
+        );
 
         assert_eq!(convert_to_route_path("routes/__init__.py"), "/");
 

libs/python/core/src/router/singleton_router.rs

@@ -12,7 +12,9 @@ impl PySingletonRouter {
     #[new]
     fn new(model: &Bound<'_, PyType>) -> PyResult<Self> {
         let model_name = model.getattr("name")?.extract::<String>()?;
+        println!("get_route_path: {}", get_route_path()?);
         let path = convert_to_route_path(get_route_path()?.as_str());
+        println!("path: {}", path);
         Ok(Self(
             add_singleton_router(SingletonRouter {
                 path,

package.json

@@ -5,7 +5,7 @@
     "build": "node build.js",
     "setup:project": "pnpm build && node project-install.js",
     "project:fastapi": "cd project/python/fastapi && uvicorn main:app --reload",
-    "test": "node test.js",
+    "test": "cargo test && node test.js",
     "test:vitest": "vitest --run"
   },
   "devDependencies": {