jararaca 0.3.11a15__py3-none-any.whl → 0.3.12__py3-none-any.whl

jararaca/tools/typescript/interface_parser.py

@@ -8,7 +8,7 @@ from datetime import date, datetime, time
 from decimal import Decimal
 from enum import Enum
 from io import StringIO
-from types import NoneType, UnionType
+from types import FunctionType, NoneType, UnionType
 from typing import (
     IO,
     Annotated,
@@ -24,10 +24,10 @@ from typing import (
 from uuid import UUID
 
 from fastapi import Request, Response, UploadFile
-from fastapi.params import Body, Cookie, Depends, Header, Path, Query
+from fastapi.params import Body, Cookie, Depends, Form, Header, Path, Query
 from fastapi.security.http import HTTPBase
 from pydantic import BaseModel, PlainValidator
-from pydantic_core import PydanticUndefinedType
+from pydantic_core import PydanticUndefined
 
 from jararaca.microservice import Microservice
 from jararaca.presentation.decorators import HttpMapping, RestController
@@ -35,6 +35,11 @@ from jararaca.presentation.websocket.decorators import RegisterWebSocketMessage
 from jararaca.presentation.websocket.websocket_interceptor import (
     WebSocketMessageWrapper,
 )
+from jararaca.tools.typescript.decorators import (
+    MutationEndpoint,
+    QueryEndpoint,
+    SplitInputOutput,
+)
 
 CONSTANT_PATTERN = re.compile(r"^[A-Z_]+$")
 
@@ -43,6 +48,206 @@ def is_constant(name: str) -> bool:
     return CONSTANT_PATTERN.match(name) is not None
 
 
+def unwrap_annotated_type(field_type: Any) -> tuple[Any, list[Any]]:
+    """
+    Recursively unwrap Annotated types to find the real underlying type.
+
+    Args:
+        field_type: The type to unwrap, which may be deeply nested Annotated types
+
+    Returns:
+        A tuple of (unwrapped_type, all_metadata) where:
+        - unwrapped_type is the final non-Annotated type
+        - all_metadata is a list of all metadata from all Annotated layers
+    """
+    all_metadata = []
+    current_type = field_type
+
+    while get_origin(current_type) == Annotated:
+        # Collect metadata from current layer
+        if hasattr(current_type, "__metadata__"):
+            all_metadata.extend(current_type.__metadata__)
+
+        # Move to the next inner type
+        if hasattr(current_type, "__args__") and len(current_type.__args__) > 0:
+            current_type = current_type.__args__[0]
+        else:
+            break
+
+    return current_type, all_metadata
+
+
+def is_upload_file_type(field_type: Any) -> bool:
+    """
+    Check if a type is UploadFile or a list/array of UploadFile.
+
+    Args:
+        field_type: The type to check
+
+    Returns:
+        True if it's UploadFile or list[UploadFile], False otherwise
+    """
+    if field_type == UploadFile:
+        return True
+
+    # Check for list[UploadFile], List[UploadFile], etc.
+    origin = get_origin(field_type)
+    if origin in (list, frozenset, set):
+        args = getattr(field_type, "__args__", ())
+        if args and args[0] == UploadFile:
+            return True
+
+    return False
+
+
+def should_exclude_field(
+    field_name: str, field_type: Any, basemodel_type: Type[Any]
+) -> bool:
+    """
+    Check if a field should be excluded from TypeScript interface generation.
+
+    Args:
+        field_name: The name of the field
+        field_type: The type annotation of the field
+        basemodel_type: The BaseModel class containing the field
+
+    Returns:
+        True if the field should be excluded, False otherwise
+    """
+    # Check if field is private (starts with underscore)
+    if field_name.startswith("_"):
+        return True
+
+    # Check if field has Pydantic Field annotation and is excluded via model_fields
+    if (
+        hasattr(basemodel_type, "model_fields")
+        and field_name in basemodel_type.model_fields
+    ):
+        field_info = basemodel_type.model_fields[field_name]
+
+        # Check if field is excluded via Field(exclude=True)
+        if hasattr(field_info, "exclude") and field_info.exclude:
+            return True
+
+        # Check if field is marked as private via Field(..., alias=None) pattern
+        if (
+            hasattr(field_info, "alias")
+            and field_info.alias is None
+            and field_name.startswith("_")
+        ):
+            return True
+
+    # Check for Annotated types with Field metadata
+    if get_origin(field_type) == Annotated:
+        unwrapped_type, all_metadata = unwrap_annotated_type(field_type)
+        for metadata in all_metadata:
+            # Check if this is a Pydantic Field by looking for expected attributes
+            if hasattr(metadata, "exclude") or hasattr(metadata, "alias"):
+                # Check if Field has exclude=True
+                if hasattr(metadata, "exclude") and metadata.exclude:
+                    return True
+                # Check for private fields with alias=None
+                if (
+                    hasattr(metadata, "alias")
+                    and metadata.alias is None
+                    and field_name.startswith("_")
+                ):
+                    return True
+
+    # Check for Field instances assigned as default values
+    # This handles cases like: field_name: str = Field(exclude=True)
+    if (
+        hasattr(basemodel_type, "__annotations__")
+        and field_name in basemodel_type.__annotations__
+    ):
+        # Check if there's a default value that's a Field instance
+        if hasattr(basemodel_type, field_name):
+            default_value = getattr(basemodel_type, field_name, None)
+            # Check if default value has Field-like attributes (duck typing approach)
+            if default_value is not None and hasattr(default_value, "exclude"):
+                if getattr(default_value, "exclude", False):
+                    return True
+            # Check for private fields with alias=None in default Field
+            if (
+                default_value is not None
+                and hasattr(default_value, "alias")
+                and getattr(default_value, "alias", None) is None
+                and field_name.startswith("_")
+            ):
+                return True
+
+    return False
+
+
+def has_default_value(
+    field_name: str, field_type: Any, basemodel_type: Type[Any]
+) -> bool:
+    """
+    Check if a field has a default value (making it optional in TypeScript).
+
+    Args:
+        field_name: The name of the field
+        field_type: The type annotation of the field
+        basemodel_type: The BaseModel class containing the field
+
+    Returns:
+        True if the field has a default value, False otherwise
+    """
+    # Skip literal types as they don't have defaults in the traditional sense
+    if get_origin(field_type) is Literal:
+        return False
+
+    # Check if field has default in model_fields (standard Pydantic way)
+    if (
+        hasattr(basemodel_type, "model_fields")
+        and field_name in basemodel_type.model_fields
+    ):
+        field_info = basemodel_type.model_fields[field_name]
+        if field_info.default is not PydanticUndefined:
+            return True
+
+    # Check for Field instances assigned as default values
+    # This handles cases like: field_name: str = Field(default="value")
+    if (
+        hasattr(basemodel_type, "__annotations__")
+        and field_name in basemodel_type.__annotations__
+    ):
+        if hasattr(basemodel_type, field_name):
+            default_value = getattr(basemodel_type, field_name, None)
+            # Check if it's a Field instance with a default
+            if default_value is not None and hasattr(default_value, "default"):
+                # Check if the Field has a default value set
+                field_default = getattr(default_value, "default", PydanticUndefined)
+                if field_default is not PydanticUndefined:
+                    return True
+
+    # Check for non-Field default values assigned directly to class attributes
+    # This handles cases like: field_name: str = "default_value"
+    if hasattr(basemodel_type, field_name):
+        default_value = getattr(basemodel_type, field_name, None)
+        # If it's not a Field instance but has a value, it's a default
+        if (
+            default_value is not None
+            and not hasattr(default_value, "exclude")  # Not a Field instance
+            and not hasattr(default_value, "alias")
+        ):  # Not a Field instance
+            return True
+
+    # Check for Annotated types with Field metadata that have defaults
+    if get_origin(field_type) == Annotated:
+        unwrapped_type, all_metadata = unwrap_annotated_type(field_type)
+        for metadata in all_metadata:
+            # Check if this is a Pydantic Field with a default
+            if hasattr(metadata, "default") and hasattr(
+                metadata, "exclude"
+            ):  # Ensure it's a Field
+                field_default = getattr(metadata, "default", PydanticUndefined)
+                if field_default is not PydanticUndefined:
+                    return True
+
+    return False
+
+
 class ParseContext:
     def __init__(self) -> None:
         self.mapped_types: set[Any] = set()
@@ -67,6 +272,13 @@ def snake_to_camel(snake_str: str) -> str:
     return components[0] + "".join(x.title() for x in components[1:])
 
 
+def pascal_to_camel(pascal_str: str) -> str:
+    """Convert a PascalCase string to camelCase."""
+    if not pascal_str:
+        return pascal_str
+    return pascal_str[0].lower() + pascal_str[1:]
+
+
 def parse_literal_value(value: Any) -> str:
     if value is None:
         return "null"
@@ -94,7 +306,14 @@ def parse_literal_value(value: Any) -> str:
     return "unknown"
 
 
-def get_field_type_for_ts(field_type: Any) -> Any:
+def get_field_type_for_ts(field_type: Any, context_suffix: str = "") -> Any:
+    """
+    Convert a Python type to its TypeScript equivalent.
+
+    Args:
+        field_type: The Python type to convert
+        context_suffix: Suffix for split models (e.g., "Input", "Output")
+    """
     if field_type is Response:
         return "unknown"
     if field_type is Any:
@@ -122,17 +341,20 @@ def get_field_type_for_ts(field_type: Any) -> Any:
     if field_type == Decimal:
         return "number"
     if get_origin(field_type) == ClassVar:
-        return get_field_type_for_ts(field_type.__args__[0])
+        return get_field_type_for_ts(field_type.__args__[0], context_suffix)
     if get_origin(field_type) == tuple:
-        return f"[{', '.join([get_field_type_for_ts(field) for field in field_type.__args__])}]"
+        return f"[{', '.join([get_field_type_for_ts(field, context_suffix) for field in field_type.__args__])}]"
     if get_origin(field_type) == list or get_origin(field_type) == frozenset:
-        return f"Array<{get_field_type_for_ts(field_type.__args__[0])}>"
+        return f"Array<{get_field_type_for_ts(field_type.__args__[0], context_suffix)}>"
     if get_origin(field_type) == set:
-        return f"Array<{get_field_type_for_ts(field_type.__args__[0])}> // Set"
+        return f"Array<{get_field_type_for_ts(field_type.__args__[0], context_suffix)}> // Set"
     if get_origin(field_type) == dict:
-        return f"{{[key: {get_field_type_for_ts(field_type.__args__[0])}]: {get_field_type_for_ts(field_type.__args__[1])}}}"
+        return f"{{[key: {get_field_type_for_ts(field_type.__args__[0], context_suffix)}]: {get_field_type_for_ts(field_type.__args__[1], context_suffix)}}}"
     if inspect.isclass(field_type):
         if not hasattr(field_type, "__pydantic_generic_metadata__"):
+            # Check if this is a split model and use appropriate suffix
+            if SplitInputOutput.is_split_model(field_type) and context_suffix:
+                return f"{field_type.__name__}{context_suffix}"
             return field_type.__name__
         pydantic_metadata = getattr(field_type, "__pydantic_generic_metadata__")
 
@@ -141,12 +363,17 @@ def get_field_type_for_ts(field_type: Any) -> Any:
             if pydantic_metadata.get("origin") is not None
             else field_type.__name__
         )
+
+        # Check if this is a split model and use appropriate suffix
+        if SplitInputOutput.is_split_model(field_type) and context_suffix:
+            name = f"{field_type.__name__}{context_suffix}"
+
         args = pydantic_metadata.get("args")
 
         if len(args) > 0:
             return "%s<%s>" % (
                 name,
-                ", ".join([get_field_type_for_ts(arg) for arg in args]),
+                ", ".join([get_field_type_for_ts(arg, context_suffix) for arg in args]),
             )
 
         return name
@@ -156,16 +383,22 @@ def get_field_type_for_ts(field_type: Any) -> Any:
     if get_origin(field_type) == Literal:
         return " | ".join([parse_literal_value(x) for x in field_type.__args__])
     if get_origin(field_type) == UnionType or get_origin(field_type) == typing.Union:
-        return " | ".join([get_field_type_for_ts(x) for x in field_type.__args__])
+        return " | ".join(
+            [get_field_type_for_ts(x, context_suffix) for x in field_type.__args__]
+        )
     if (get_origin(field_type) == Annotated) and (len(field_type.__args__) > 0):
+        unwrapped_type, all_metadata = unwrap_annotated_type(field_type)
+
         if (
             plain_validator := next(
-                (x for x in field_type.__metadata__ if isinstance(x, PlainValidator)),
+                (x for x in all_metadata if isinstance(x, PlainValidator)),
                 None,
             )
         ) is not None:
-            return get_field_type_for_ts(plain_validator.json_schema_input_type)
-        return get_field_type_for_ts(field_type.__args__[0])
+            return get_field_type_for_ts(
+                plain_validator.json_schema_input_type, context_suffix
+            )
+        return get_field_type_for_ts(unwrapped_type, context_suffix)
     return "unknown"
 
 
@@ -180,6 +413,59 @@ def get_generic_args(field_type: Any) -> Any:
 def parse_type_to_typescript_interface(
     basemodel_type: Type[Any],
 ) -> tuple[set[type], str]:
+    """
+    Parse a Pydantic model into TypeScript interface(s).
+
+    If the model is decorated with @SplitInputOutput, it generates both Input and Output interfaces.
+    Otherwise, it generates a single interface.
+    """
+    # Check if this model should be split into Input/Output interfaces
+    if SplitInputOutput.is_split_model(basemodel_type):
+        return parse_split_input_output_interfaces(basemodel_type)
+
+    return parse_single_typescript_interface(basemodel_type)
+
+
+def parse_split_input_output_interfaces(
+    basemodel_type: Type[Any],
+) -> tuple[set[type], str]:
+    """
+    Generate both Input and Output TypeScript interfaces for a split model.
+    """
+    mapped_types: set[type] = set()
+    combined_output = StringIO()
+
+    # Generate Input interface (with optional fields)
+    input_mapped_types, input_interface = parse_single_typescript_interface(
+        basemodel_type, interface_suffix="Input", force_optional_defaults=True
+    )
+    mapped_types.update(input_mapped_types)
+    combined_output.write(input_interface)
+
+    # Generate Output interface (all fields required as they come from the backend)
+    output_mapped_types, output_interface = parse_single_typescript_interface(
+        basemodel_type, interface_suffix="Output", force_optional_defaults=False
+    )
+    mapped_types.update(output_mapped_types)
+    combined_output.write(output_interface)
+
+    return mapped_types, combined_output.getvalue()
+
+
+def parse_single_typescript_interface(
+    basemodel_type: Type[Any],
+    interface_suffix: str = "",
+    force_optional_defaults: bool | None = None,
+) -> tuple[set[type], str]:
+    """
+    Generate a single TypeScript interface for a Pydantic model.
+
+    Args:
+        basemodel_type: The Pydantic model class
+        interface_suffix: Suffix to add to the interface name (e.g., "Input", "Output")
+        force_optional_defaults: If True, fields with defaults are optional. If False, all fields are required.
+                                If None, uses the default behavior (fields with defaults are optional).
+    """
     string_builder = StringIO()
     mapped_types: set[type] = set()
 
@@ -206,7 +492,7 @@ def parse_type_to_typescript_interface(
         enum_values = sorted([(x._name_, x.value) for x in basemodel_type])
         return (
             set(),
-            f"export enum {basemodel_type.__name__} {{\n"
+            f"export enum {basemodel_type.__name__}{interface_suffix} {{\n"
             + "\n ".join([f'\t{name} = "{value}",' for name, value in enum_values])
             + "\n}\n",
         )
@@ -230,46 +516,46 @@ def parse_type_to_typescript_interface(
         for inherited_class in valid_inherited_classes
     }
 
-    extends_expression = (
-        " extends %s"
-        % ", ".join(
-            sorted(
-                [
-                    (
-                        "%s" % get_field_type_for_ts(inherited_class)
-                        if not inherited_classes_consts_conflict[inherited_class]
-                        else "Omit<%s, %s>"
-                        % (
-                            get_field_type_for_ts(inherited_class),
-                            " | ".join(
-                                sorted(
-                                    [
-                                        '"%s"' % field_name
-                                        for field_name in inherited_classes_consts_conflict[
-                                            inherited_class
-                                        ]
-                                    ]
-                                )
-                            ),
+    # Modify inheritance for split interfaces
+    extends_expression = ""
+    if len(valid_inherited_classes) > 0:
+        extends_base_names = []
+        for inherited_class in valid_inherited_classes:
+            base_name = get_field_type_for_ts(inherited_class, interface_suffix)
+            # If the inherited class is also a split model, use the appropriate suffix
+            if SplitInputOutput.is_split_model(inherited_class) and interface_suffix:
+                base_name = f"{inherited_class.__name__}{interface_suffix}"
+
+            if inherited_classes_consts_conflict[inherited_class]:
+                base_name = "Omit<%s, %s>" % (
+                    base_name,
+                    " | ".join(
+                        sorted(
+                            [
+                                '"%s"' % field_name
+                                for field_name in inherited_classes_consts_conflict[
+                                    inherited_class
+                                ]
+                            ]
                         )
-                    )
-                    for inherited_class in valid_inherited_classes
-                ],
-                key=lambda x: str(x),
-            )
+                    ),
+                )
+            extends_base_names.append(base_name)
+
+        extends_expression = " extends %s" % ", ".join(
+            sorted(extends_base_names, key=lambda x: str(x))
         )
-        if len(valid_inherited_classes) > 0
-        else ""
-    )
+
+    interface_name = f"{basemodel_type.__name__}{interface_suffix}"
 
     if is_generic_type(basemodel_type):
         generic_args = get_generic_args(basemodel_type)
         string_builder.write(
-            f"export interface {basemodel_type.__name__}<{', '.join(sorted([arg.__name__ for arg in generic_args]))}>{extends_expression} {{\n"
+            f"export interface {interface_name}<{', '.join(sorted([arg.__name__ for arg in generic_args]))}>{extends_expression} {{\n"
         )
     else:
         string_builder.write(
-            f"export interface {basemodel_type.__name__}{extends_expression} {{\n"
+            f"export interface {interface_name}{extends_expression} {{\n"
         )
 
     if hasattr(basemodel_type, "__annotations__"):
@@ -282,16 +568,23 @@ def parse_type_to_typescript_interface(
             if field_name in cls_consts:
                 continue
 
-            has_default_value = (
-                get_origin(field) is not Literal
-                and field_name in basemodel_type.model_fields
-                and not isinstance(
-                    basemodel_type.model_fields[field_name].default,
-                    PydanticUndefinedType,
-                )
-            )
+            # Check if field should be excluded (private or excluded via Field)
+            if should_exclude_field(field_name, field, basemodel_type):
+                continue
+
+            # Determine if field is optional based on the force_optional_defaults parameter
+            if force_optional_defaults is True:
+                # Input interface: fields with defaults are optional
+                is_optional = has_default_value(field_name, field, basemodel_type)
+            elif force_optional_defaults is False:
+                # Output interface: all fields are required (backend provides complete data)
+                is_optional = False
+            else:
+                # Default behavior: fields with defaults are optional
+                is_optional = has_default_value(field_name, field, basemodel_type)
+
             string_builder.write(
-                f"  {snake_to_camel(field_name) if not is_constant(field_name) else field_name}{'?' if has_default_value else ''}: {get_field_type_for_ts(field)};\n"
+                f"  {snake_to_camel(field_name) if not is_constant(field_name) else field_name}{'?' if is_optional else ''}: {get_field_type_for_ts(field, interface_suffix)};\n"
             )
             mapped_types.update(extract_all_envolved_types(field))
             mapped_types.add(field)
@@ -318,7 +611,7 @@ def parse_type_to_typescript_interface(
                     return_type = NoneType
 
                 string_builder.write(
-                    f"  {snake_to_camel(field_name)}: {get_field_type_for_ts(return_type)};\n"
+                    f"  {snake_to_camel(field_name)}: {get_field_type_for_ts(return_type, interface_suffix)};\n"
                 )
                 mapped_types.update(extract_all_envolved_types(return_type))
                 mapped_types.add(return_type)
@@ -354,12 +647,17 @@ def write_microservice_to_typescript_interface(
         if rest_controller is None:
             continue
 
-        controller_class_str, types = write_rest_controller_to_typescript_interface(
-            rest_controller, controller
+        controller_class_strio, types, hooks_strio = (
+            write_rest_controller_to_typescript_interface(
+                rest_controller,
+                controller,
+            )
         )
 
         mapped_types_set.update(types)
-        rest_controller_buffer.write(controller_class_str)
+        rest_controller_buffer.write(controller_class_strio.getvalue())
+        if hooks_strio is not None:
+            rest_controller_buffer.write(hooks_strio.getvalue())
 
         registered = RegisterWebSocketMessage.get(controller)
 
@@ -376,6 +674,42 @@ def write_microservice_to_typescript_interface(
 
     final_buffer.write(
         """
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+import { HttpService, HttpBackend, HttpBackendRequest, ResponseType, createClassQueryHooks , createClassMutationHooks, createClassInfiniteQueryHooks, paginationModelByFirstArgPaginationFilter } from "@jararaca/core";
+
+function makeFormData(data: Record<string, any>): FormData {
+  const formData = new FormData();
+  for (const key in data) {
+    const value = data[key];
+    for (const v of genFormDataValue(value)) {
+      formData.append(key, v);
+    }
+  }
+  return formData;
+}
+
+function* genFormDataValue(value: any): any {
+  if (Array.isArray(value)) {
+    // Stringify arrays as JSON
+    for (const item of value) {
+      // formData.append(`${key}`, item);
+      yield* genFormDataValue(item);
+    }
+  } else if (typeof value === "object" && value.constructor === Object) {
+    // Stringify plain objects as JSON
+    // formData.append(key, JSON.stringify(value));
+    yield JSON.stringify(value);
+  } else {
+    // For primitives (string, number, boolean), append as-is
+    yield value;
+  }
+}
+
 export type WebSocketMessageMap = {
 %s
 }
@@ -391,36 +725,6 @@ export type WebSocketMessageMap = {
         )
     )
 
-    final_buffer.write(
-        """
-export type ResponseType =
-    | "arraybuffer"
-    | "blob"
-    | "document"
-    | "json"
-    | "text"
-    | "stream"
-    | "formdata";
-
-
-export interface HttpBackendRequest {
-  method: string;
-  path: string;
-  headers: { [key: string]: string };
-  query: { [key: string]: unknown };
-  body: unknown;
-  responseType?: ResponseType;
-}
-
-export interface HttpBackend {
-  request<T>(request: HttpBackendRequest): Promise<T>;
-}
-
-export abstract class HttpService {
-  constructor(protected readonly httpBackend: HttpBackend) {}
-}
-"""
-    )
     processed_types: set[Any] = set()
     backlog: set[Any] = mapped_types_set.copy()
 
@@ -493,11 +797,16 @@ def is_primitive(field_type: Any) -> bool:
 
 def write_rest_controller_to_typescript_interface(
     rest_controller: RestController, controller: type
-) -> tuple[str, set[Any]]:
+) -> tuple[StringIO, set[Any], StringIO | None]:
+
+    class_name = controller.__name__
+
+    decorated_queries: list[tuple[str, FunctionType, QueryEndpoint]] = []
+    decorated_mutations: list[tuple[str, FunctionType]] = []
 
     class_buffer = StringIO()
 
-    class_buffer.write(f"export class {controller.__name__} extends HttpService {{\n")
+    class_buffer.write(f"export class {class_name} extends HttpService {{\n")
 
     mapped_types: set[Any] = set()
 
@@ -513,9 +822,15 @@ def write_rest_controller_to_typescript_interface(
             if return_type is None:
                 return_type = NoneType
 
+            if query_endpoint := QueryEndpoint.extract_query_endpoint(member):
+                decorated_queries.append((name, member, query_endpoint))
+            if MutationEndpoint.is_mutation(member):
+                decorated_mutations.append((name, member))
+
             mapped_types.update(extract_all_envolved_types(return_type))
 
-            return_value_repr = get_field_type_for_ts(return_type)
+            # For return types, use Output suffix if it's a split model
+            return_value_repr = get_field_type_for_ts(return_type, "Output")
 
             arg_params_spec, parametes_mapped_types = extract_parameters(
                 member, rest_controller, mapping
@@ -538,10 +853,31 @@ def write_rest_controller_to_typescript_interface(
             class_buffer.write(f'\t\t\tmethod: "{mapping.method}",\n')
 
             endpoint_path = parse_path_with_params(mapping.path, arg_params_spec)
-            final_path = "/".join(
-                s.strip("/") for s in [rest_controller.path, endpoint_path]
+
+            # Properly handle path joining to avoid double slashes
+            controller_path = rest_controller.path or ""
+            path_parts = []
+
+            if controller_path and controller_path.strip("/"):
+                path_parts.append(controller_path.strip("/"))
+            if endpoint_path and endpoint_path.strip("/"):
+                path_parts.append(endpoint_path.strip("/"))
+
+            final_path = "/".join(path_parts) if path_parts else ""
+            # Ensure the path starts with a single slash
+            formatted_path = f"/{final_path}" if final_path else "/"
+
+            class_buffer.write(f"\t\t\tpath: `{formatted_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(f"\t\t\tpath: `/{final_path}`,\n")
+            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(
@@ -563,10 +899,25 @@ def write_rest_controller_to_typescript_interface(
                 class_buffer.write(f'\t\t\t\t"{param.name}": {param.name},\n')
             class_buffer.write("\t\t\t},\n")
 
-            if (
-                body := next((x for x in arg_params_spec if x.type_ == "body"), None)
-            ) is not None:
-                class_buffer.write(f"\t\t\tbody: {body.name}\n")
+            # Check if we need to use FormData (for file uploads or form parameters)
+            form_params = [param for param in arg_params_spec if param.type_ == "form"]
+            body_param = next((x for x in arg_params_spec if x.type_ == "body"), None)
+
+            if form_params:
+                # Use FormData for file uploads and form parameters
+                class_buffer.write("\t\t\tbody: makeFormData({\n")
+
+                # Add form parameters (including file uploads)
+                for param in form_params:
+                    class_buffer.write(f'\t\t\t\t"{param.name}": {param.name},\n')
+
+                # Add body parameter if it exists alongside form params
+                if body_param:
+                    class_buffer.write(f"\t\t\t\t...{body_param.name},\n")
+
+                class_buffer.write("\t\t\t})\n")
+            elif body_param is not None:
+                class_buffer.write(f"\t\t\tbody: {body_param.name}\n")
             else:
                 class_buffer.write("\t\t\tbody: undefined\n")
 
@@ -577,7 +928,44 @@ def write_rest_controller_to_typescript_interface(
 
     class_buffer.write("}\n")
 
-    return class_buffer.getvalue(), mapped_types
+    controller_hooks_builder: StringIO | None = None
+
+    if decorated_queries or decorated_mutations:
+        controller_hooks_builder = StringIO()
+        controller_hooks_builder.write(
+            f"export const {pascal_to_camel(class_name)} = {{\n"
+        )
+
+        if decorated_queries:
+            controller_hooks_builder.write(
+                f"\t...createClassQueryHooks({class_name},\n"
+            )
+            for name, member, _ in decorated_queries:
+                controller_hooks_builder.write(f'\t\t"{snake_to_camel(name)}",\n')
+            controller_hooks_builder.write("\t),\n")
+
+        if decorated_queries and any(
+            query.has_infinite_query for _, _, query in decorated_queries
+        ):
+            controller_hooks_builder.write(
+                f"\t...createClassInfiniteQueryHooks({class_name}, {{\n"
+            )
+            for name, member, query in decorated_queries:
+                if query.has_infinite_query:
+                    controller_hooks_builder.write(
+                        f'\t\t"{snake_to_camel(name)}": paginationModelByFirstArgPaginationFilter(),\n'
+                    )
+            controller_hooks_builder.write("\t}),\n")
+        if decorated_mutations:
+            controller_hooks_builder.write(
+                f"\t...createClassMutationHooks({class_name},\n"
+            )
+            for name, member in decorated_mutations:
+                controller_hooks_builder.write(f'\t\t"{snake_to_camel(name)}",\n')
+            controller_hooks_builder.write("\t),\n")
+        controller_hooks_builder.write("};\n")
+
+    return class_buffer, mapped_types, controller_hooks_builder
 
 
 EXCLUDED_REQUESTS_TYPES = [Request, Response]
@@ -585,15 +973,26 @@ EXCLUDED_REQUESTS_TYPES = [Request, Response]
 
 @dataclass
 class HttpParemeterSpec:
-    type_: Literal["query", "path", "body", "header", "cookie"]
+    type_: Literal["query", "path", "body", "header", "cookie", "form"]
     name: str
     required: bool
     argument_type_str: str
 
 
 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
 
 
@@ -622,15 +1021,16 @@ def extract_parameters(
     if is_primitive(member):
 
         if get_origin(member) is Annotated:
+            unwrapped_type, all_metadata = unwrap_annotated_type(member)
             if (
                 plain_validator := next(
-                    (x for x in member.__metadata__ if isinstance(x, PlainValidator)),
+                    (x for x in all_metadata if isinstance(x, PlainValidator)),
                     None,
                 )
             ) is not None:
                 mapped_types.add(plain_validator.json_schema_input_type)
                 return parameters_list, mapped_types
-            return extract_parameters(member.__args__[0], controller, mapping)
+            return extract_parameters(unwrapped_type, controller, mapping)
         return parameters_list, mapped_types
 
     if hasattr(member, "__bases__"):
@@ -650,8 +1050,21 @@ def extract_parameters(
                 continue
 
             if get_origin(parameter_type) == Annotated:
-                annotated_type_hook = parameter_type.__metadata__[0]
-                annotated_type = parameter_type.__args__[0]
+                unwrapped_type, all_metadata = unwrap_annotated_type(parameter_type)
+                # Look for FastAPI parameter annotations in all metadata layers
+                annotated_type_hook = None
+                for metadata in all_metadata:
+                    if isinstance(
+                        metadata, (Header, Cookie, Form, Body, Query, Path, Depends)
+                    ):
+                        annotated_type_hook = metadata
+                        break
+
+                if annotated_type_hook is None and all_metadata:
+                    # Fallback to first metadata if no FastAPI annotation found
+                    annotated_type_hook = all_metadata[0]
+
+                annotated_type = unwrapped_type
                 if isinstance(annotated_type_hook, Header):
                     mapped_types.add(str)
                     parameters_list.append(
@@ -672,34 +1085,80 @@ def extract_parameters(
                             argument_type_str=get_field_type_for_ts(str),
                         )
                     )
+                elif isinstance(annotated_type_hook, Form):
+                    mapped_types.add(annotated_type)
+                    parameters_list.append(
+                        HttpParemeterSpec(
+                            type_="form",
+                            name=parameter_name,
+                            required=True,
+                            argument_type_str=get_field_type_for_ts(annotated_type),
+                        )
+                    )
                 elif isinstance(annotated_type_hook, Body):
                     mapped_types.update(extract_all_envolved_types(parameter_type))
+                    # For body parameters, use Input suffix if it's a split model
+                    context_suffix = (
+                        "Input"
+                        if (
+                            inspect.isclass(parameter_type)
+                            and hasattr(parameter_type, "__dict__")
+                            and SplitInputOutput.is_split_model(parameter_type)
+                        )
+                        else ""
+                    )
                     parameters_list.append(
                         HttpParemeterSpec(
                             type_="body",
                             name=parameter_name,
                             required=True,
-                            argument_type_str=get_field_type_for_ts(parameter_type),
+                            argument_type_str=get_field_type_for_ts(
+                                parameter_type, context_suffix
+                            ),
                         )
                     )
                 elif isinstance(annotated_type_hook, Query):
                     mapped_types.add(parameter_type)
+                    # For query parameters, use Input suffix if it's a split model
+                    context_suffix = (
+                        "Input"
+                        if (
+                            inspect.isclass(parameter_type)
+                            and hasattr(parameter_type, "__dict__")
+                            and SplitInputOutput.is_split_model(parameter_type)
+                        )
+                        else ""
+                    )
                     parameters_list.append(
                         HttpParemeterSpec(
                             type_="query",
                             name=parameter_name,
                             required=True,
-                            argument_type_str=get_field_type_for_ts(parameter_type),
+                            argument_type_str=get_field_type_for_ts(
+                                parameter_type, context_suffix
+                            ),
                         )
                     )
                 elif isinstance(annotated_type_hook, Path):
                     mapped_types.add(parameter_type)
+                    # For path parameters, use Input suffix if it's a split model
+                    context_suffix = (
+                        "Input"
+                        if (
+                            inspect.isclass(parameter_type)
+                            and hasattr(parameter_type, "__dict__")
+                            and SplitInputOutput.is_split_model(parameter_type)
+                        )
+                        else ""
+                    )
                     parameters_list.append(
                         HttpParemeterSpec(
                             type_="path",
                             name=parameter_name,
                             required=True,
-                            argument_type_str=get_field_type_for_ts(parameter_type),
+                            argument_type_str=get_field_type_for_ts(
+                                parameter_type, context_suffix
+                            ),
                         )
                     )
 
@@ -717,62 +1176,152 @@ 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)
+                    # For path parameters, use Input suffix if it's a split model
+                    context_suffix = (
+                        "Input"
+                        if (
+                            inspect.isclass(annotated_type)
+                            and hasattr(annotated_type, "__dict__")
+                            and SplitInputOutput.is_split_model(annotated_type)
+                        )
+                        else ""
+                    )
                     parameters_list.append(
                         HttpParemeterSpec(
                             type_="path",
                             name=parameter_name,
                             required=True,
-                            argument_type_str=get_field_type_for_ts(annotated_type),
+                            argument_type_str=get_field_type_for_ts(
+                                annotated_type, context_suffix
+                            ),
                         )
                     )
                 else:
                     mapped_types.add(annotated_type)
-                    parameters_list.append(
-                        HttpParemeterSpec(
-                            type_="query",
-                            name=parameter_name,
-                            required=True,
-                            argument_type_str=get_field_type_for_ts(annotated_type),
+                    # Special handling for UploadFile and list[UploadFile] - should be treated as form data
+                    if is_upload_file_type(annotated_type):
+                        parameters_list.append(
+                            HttpParemeterSpec(
+                                type_="form",
+                                name=parameter_name,
+                                required=True,
+                                argument_type_str=get_field_type_for_ts(annotated_type),
+                            )
+                        )
+                    else:
+                        # For default parameters (treated as query), use Input suffix if it's a split model
+                        context_suffix = (
+                            "Input"
+                            if (
+                                inspect.isclass(annotated_type)
+                                and hasattr(annotated_type, "__dict__")
+                                and SplitInputOutput.is_split_model(annotated_type)
+                            )
+                            else ""
+                        )
+                        parameters_list.append(
+                            HttpParemeterSpec(
+                                type_="query",
+                                name=parameter_name,
+                                required=True,
+                                argument_type_str=get_field_type_for_ts(
+                                    annotated_type, context_suffix
+                                ),
+                            )
                         )
-                    )
 
             elif inspect.isclass(parameter_type) and issubclass(
                 parameter_type, BaseModel
             ):
                 mapped_types.update(extract_all_envolved_types(parameter_type))
+                # For BaseModel parameters, use Input suffix if it's a split model
+                context_suffix = (
+                    "Input" if SplitInputOutput.is_split_model(parameter_type) else ""
+                )
                 parameters_list.append(
                     HttpParemeterSpec(
                         type_="body",
                         name=parameter_name,
                         required=True,
-                        argument_type_str=get_field_type_for_ts(parameter_type),
+                        argument_type_str=get_field_type_for_ts(
+                            parameter_type, context_suffix
+                        ),
                     )
                 )
-            elif (
-                controller.path.find(f"{{{parameter_name}}}") != -1
-                or mapping.path.find(f"{{{parameter_name}}}") != -1
-            ):
+            elif parameter_type == UploadFile or is_upload_file_type(parameter_type):
+                # UploadFile and list[UploadFile] should be treated as form data
                 mapped_types.add(parameter_type)
                 parameters_list.append(
                     HttpParemeterSpec(
-                        type_="path",
+                        type_="form",
                         name=parameter_name,
                         required=True,
                         argument_type_str=get_field_type_for_ts(parameter_type),
                     )
                 )
-            else:
+            elif (
+                # 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)
+                # For path parameters, use Input suffix if it's a split model
+                context_suffix = (
+                    "Input"
+                    if (
+                        inspect.isclass(parameter_type)
+                        and hasattr(parameter_type, "__dict__")
+                        and SplitInputOutput.is_split_model(parameter_type)
+                    )
+                    else ""
+                )
                 parameters_list.append(
                     HttpParemeterSpec(
-                        type_="query",
+                        type_="path",
                         name=parameter_name,
                         required=True,
-                        argument_type_str=get_field_type_for_ts(parameter_type),
+                        argument_type_str=get_field_type_for_ts(
+                            parameter_type, context_suffix
+                        ),
                     )
                 )
+            else:
+                mapped_types.add(parameter_type)
+                # Special handling for UploadFile and list[UploadFile] - should be treated as form data
+                if is_upload_file_type(parameter_type):
+                    parameters_list.append(
+                        HttpParemeterSpec(
+                            type_="form",
+                            name=parameter_name,
+                            required=True,
+                            argument_type_str=get_field_type_for_ts(parameter_type),
+                        )
+                    )
+                else:
+                    # For default parameters (treated as query), use Input suffix if it's a split model
+                    context_suffix = (
+                        "Input"
+                        if (
+                            inspect.isclass(parameter_type)
+                            and hasattr(parameter_type, "__dict__")
+                            and SplitInputOutput.is_split_model(parameter_type)
+                        )
+                        else ""
+                    )
+                    parameters_list.append(
+                        HttpParemeterSpec(
+                            type_="query",
+                            name=parameter_name,
+                            required=True,
+                            argument_type_str=get_field_type_for_ts(
+                                parameter_type, context_suffix
+                            ),
+                        )
+                    )
 
             if inspect.isclass(parameter_type) and not is_primitive(parameter_type):
                 signature = inspect.signature(parameter_type)
@@ -782,21 +1331,22 @@ def extract_parameters(
                 for _, parameter_type in parameter_members.items():
                     if is_primitive(parameter_type.annotation):
                         if get_origin(parameter_type.annotation) is not None:
-                            if (
-                                get_origin(parameter_type.annotation) == Annotated
-                                and (
-                                    plain_validator := next(
-                                        (
-                                            x
-                                            for x in parameter_type.annotation.__metadata__
-                                            if isinstance(x, PlainValidator)
-                                        ),
-                                        None,
-                                    )
+                            if get_origin(parameter_type.annotation) == Annotated:
+                                unwrapped_type, all_metadata = unwrap_annotated_type(
+                                    parameter_type.annotation
+                                )
+                                plain_validator = next(
+                                    (
+                                        x
+                                        for x in all_metadata
+                                        if isinstance(x, PlainValidator)
+                                    ),
+                                    None,
                                 )
-                                is not None
-                            ):
-                                mapped_types.add(plain_validator.json_schema_input_type)
+                                if plain_validator is not None:
+                                    mapped_types.add(
+                                        plain_validator.json_schema_input_type
+                                    )
                             else:
                                 args = parameter_type.annotation.__args__
                                 mapped_types.update(args)
@@ -827,22 +1377,15 @@ def extract_all_envolved_types(field_type: Any) -> set[Any]:
 
     if is_primitive(field_type):
         if get_origin(field_type) is not None:
-            if (
-                get_origin(field_type) == Annotated
-                and (
-                    plain_validator := next(
-                        (
-                            x
-                            for x in field_type.__metadata__
-                            if isinstance(x, PlainValidator)
-                        ),
-                        None,
-                    )
+            if get_origin(field_type) == Annotated:
+                unwrapped_type, all_metadata = unwrap_annotated_type(field_type)
+                plain_validator = next(
+                    (x for x in all_metadata if isinstance(x, PlainValidator)),
+                    None,
                 )
-                is not None
-            ):
-                mapped_types.add(plain_validator.json_schema_input_type)
-                return mapped_types
+                if plain_validator is not None:
+                    mapped_types.add(plain_validator.json_schema_input_type)
+                    return mapped_types
             else:
                 mapped_types.update(
                     *[extract_all_envolved_types(arg) for arg in field_type.__args__]