jararaca 0.3.12a0__tar.gz → 0.3.12a2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jararaca
-Version: 0.3.12a0
+Version: 0.3.12a2
 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.12a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jararaca"
-version = "0.3.12a0"
+version = "0.3.12a2"
 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.12a2}/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"],
@@ -592,8 +603,19 @@ class HttpParemeterSpec:
 
 
 def parse_path_with_params(path: str, parameters: list[HttpParemeterSpec]) -> str:
+    # Use a regular expression to match both simple parameters {param} and
+    # parameters with converters {param:converter}
+    import re
+
+    pattern = re.compile(r"{([^:}]+)(?::[^}]*)?}")
+
+    # For each parameter found in the path, replace it with :param format
     for parameter in parameters:
-        path = path.replace(f"{{{parameter.name}}}", f"${{{parameter.name}}}")
+        path = pattern.sub(
+            lambda m: f":{m.group(1)}" if m.group(1) == parameter.name else m.group(0),
+            path,
+        )
+
     return path
 
 
@@ -717,7 +739,9 @@ def extract_parameters(
                         )
                         mapped_types.update(rec_mapped_types)
                         parameters_list.extend(rec_parameters)
-                elif controller.path.find(f":{parameter_name}") != -1:
+                elif (
+                    re.search(f":{parameter_name}(?:/|$)", controller.path) is not None
+                ):
                     mapped_types.add(annotated_type)
                     parameters_list.append(
                         HttpParemeterSpec(
@@ -751,8 +775,9 @@ def extract_parameters(
                     )
                 )
             elif (
-                controller.path.find(f"{{{parameter_name}}}") != -1
-                or mapping.path.find(f"{{{parameter_name}}}") != -1
+                # Match both simple parameters {param} and parameters with converters {param:converter}
+                re.search(f"{{{parameter_name}(:.*?)?}}", controller.path) is not None
+                or re.search(f"{{{parameter_name}(:.*?)?}}", mapping.path) is not None
             ):
                 mapped_types.add(parameter_type)
                 parameters_list.append(