Introduce OptionalType with default value

Author: kubk

src/Bridge/ApiPlatform/ApiPlatformDtoResourceVisitor.php

@@ -16,6 +16,7 @@
 use Riverwaysoft\DtoConverter\Dto\ApiClient\ApiEndpointMethod;
 use Riverwaysoft\DtoConverter\Dto\ApiClient\ApiEndpointParam;
 use Riverwaysoft\DtoConverter\Dto\PhpType\PhpBaseType;
+use Riverwaysoft\DtoConverter\Dto\PhpType\PhpOptionalType;
 use Riverwaysoft\DtoConverter\Dto\PhpType\PhpTypeFactory;
 use Riverwaysoft\DtoConverter\Dto\PhpType\PhpTypeInterface;
 
@@ -135,7 +136,7 @@ private function createApiEndpoint(Node\Expr\ArrayItem $item, bool $isCollection
 
         // All API Platform GET methods can be filtered
         if ($isCollection && $method->equals(ApiEndpointMethod::get())) {
-            $queryParams[] = new ApiEndpointParam('filters', PhpBaseType::object());
+            $queryParams[] = new ApiEndpointParam('filters', new PhpOptionalType(PhpBaseType::object()));
         }
 
         $output = $arrayItemValue ? ($this->findArrayAttributeValueByKey('output', $arrayItemValue) ?? $mainOutput) : $mainOutput;
@@ -151,7 +152,7 @@ private function createApiEndpoint(Node\Expr\ArrayItem $item, bool $isCollection
             }
         }
 
-        $inputType = $input !== null ? new ApiEndpointParam(name: 'body', type: PhpTypeFactory::create($input)) : null;
+        $inputType = $input !== null ? new ApiEndpointParam('body', PhpTypeFactory::create($input)) : null;
 
         return new ApiEndpoint(
             route: $route,

src/Dto/ApiClient/ApiEndpointParam.php

@@ -18,7 +18,7 @@ public function jsonSerialize(): mixed
     {
         return [
             'name' => $this->name,
-            'type' => $this->type
+            'type' => $this->type,
         ];
     }
 }

src/Dto/PhpType/PhpOptionalType.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Riverwaysoft\DtoConverter\Dto\PhpType;
+
+class PhpOptionalType implements PhpTypeInterface
+{
+    public function __construct(
+        private PhpTypeInterface $type,
+    ) {
+    }
+
+    public function getType(): PhpTypeInterface
+    {
+        return $this->type;
+    }
+
+    public function jsonSerialize(): mixed
+    {
+        return [
+            'type' => $this->type,
+            'isOptional' => true,
+        ];
+    }
+}

src/Language/TypeScript/TypeScriptGenerator.php

@@ -14,6 +14,7 @@
 use Riverwaysoft\DtoConverter\Dto\ExpressionType;
 use Riverwaysoft\DtoConverter\Dto\PhpType\PhpBaseType;
 use Riverwaysoft\DtoConverter\Dto\PhpType\PhpListType;
+use Riverwaysoft\DtoConverter\Dto\PhpType\PhpOptionalType;
 use Riverwaysoft\DtoConverter\Dto\PhpType\PhpTypeInterface;
 use Riverwaysoft\DtoConverter\Dto\PhpType\PhpUnionType;
 use Riverwaysoft\DtoConverter\Dto\PhpType\PhpUnknownType;
@@ -220,6 +221,10 @@ private function getTypeScriptTypeFromPhp(PhpTypeInterface $type, DtoType|null $
             return sprintf('%s[]', $listType);
         }
 
+        if ($type instanceof PhpOptionalType) {
+            return sprintf('%s | null = null', $this->getTypeScriptTypeFromPhp($type->getType(), $dto, $dtoList));
+        }
+
         if ($type instanceof PhpBaseType) {
             /** @var PhpBaseType $type */
             return match (true) {

tests/__snapshots__/TypeScriptGeneratorTest__testApiClientGenerationWithApiPlatformResource__1.ts

@@ -32,7 +32,7 @@ export type StudentNotesOutput = {
 export type StudentNotesUpdateInput = {
 };
 
-export const apiChatsGet = (filters: any): Promise<CollectionResponse<ChatOutput>> => {
+export const apiChatsGet = (filters: any | null = null): Promise<CollectionResponse<ChatOutput>> => {
   return axios
     .get<CollectionResponse<ChatOutput>>(`/api/chats`, { params: filters })
     .then((response) => response.data);
@@ -62,7 +62,7 @@ export const apiChatsIdMutePut = (id: string): Promise<ChatOutput> => {
     .then((response) => response.data);
 }
 
-export const apiChatsAdminZoneGet = (filters: any): Promise<CollectionResponse<AdminZoneChatOutput>> => {
+export const apiChatsAdminZoneGet = (filters: any | null = null): Promise<CollectionResponse<AdminZoneChatOutput>> => {
   return axios
     .get<CollectionResponse<AdminZoneChatOutput>>(`/api/chats_admin_zone`, { params: filters })
     .then((response) => response.data);
@@ -86,7 +86,7 @@ export const apiChatsAdminZoneIdGet = (id: string): Promise<AdminZoneChatOutput>
     .then((response) => response.data);
 }
 
-export const apiStudentNotesGet = (filters: any): Promise<CollectionResponse<StudentNotesOutput>> => {
+export const apiStudentNotesGet = (filters: any | null = null): Promise<CollectionResponse<StudentNotesOutput>> => {
   return axios
     .get<CollectionResponse<StudentNotesOutput>>(`/api/student_notes`, { params: filters })
     .then((response) => response.data);