jararaca 0.3.12a0__tar.gz → 0.3.12a1__tar.gz

{jararaca-0.3.12a0 → jararaca-0.3.12a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jararaca
-Version: 0.3.12a0
+Version: 0.3.12a1
 Summary: A simple and fast API framework for Python
 Home-page: https://github.com/LuscasLeo/jararaca
 Author: Lucas S

{jararaca-0.3.12a0 → jararaca-0.3.12a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jararaca"
-version = "0.3.12a0"
+version = "0.3.12a1"
 description = "A simple and fast API framework for Python"
 authors = ["Lucas S <me@luscasleo.dev>"]
 readme = "README.md"

{jararaca-0.3.12a0 → jararaca-0.3.12a1}/src/jararaca/tools/typescript/interface_parser.py

@@ -406,6 +406,7 @@ export type ResponseType =
 export interface HttpBackendRequest {
   method: string;
   path: string;
+  pathParams: { [key: string]: string };
   headers: { [key: string]: string };
   query: { [key: string]: unknown };
   body: unknown;
@@ -543,6 +544,16 @@ def write_rest_controller_to_typescript_interface(
             )
             class_buffer.write(f"\t\t\tpath: `/{final_path}`,\n")
 
+            # Sort path params
+            path_params = sorted(
+                [param for param in arg_params_spec if param.type_ == "path"],
+                key=lambda x: x.name,
+            )
+            class_buffer.write("\t\t\tpathParams: {\n")
+            for param in path_params:
+                class_buffer.write(f'\t\t\t\t"{param.name}": {param.name},\n')
+            class_buffer.write("\t\t\t},\n")
+
             # Sort headers
             header_params = sorted(
                 [param for param in arg_params_spec if param.type_ == "header"],
@@ -593,7 +604,7 @@ class HttpParemeterSpec:
 
 def parse_path_with_params(path: str, parameters: list[HttpParemeterSpec]) -> str:
     for parameter in parameters:
-        path = path.replace(f"{{{parameter.name}}}", f"${{{parameter.name}}}")
+        path = path.replace(f"{{{parameter.name}}}", f":{parameter.name}")
     return path