Avancée dans la gestion des enums : reste à traiter le fait que Yojso…

…n sérialize les variants comme des tableaux JSON.

modules/openapi-generator/src/main/resources/ocaml-client/api.mustache

@@ -12,12 +12,10 @@
 {{#operation}}
 let {{{operationId}}} {{#allParams}}{{{paramName}}}{{#hasMore}} {{/hasMore}}{{/allParams}} =
     let headers = Request.default_headers in
-    let uri = Request.build_uri "{{{path}}}" in{{#hasPathParams}}
-    {{#pathParams}}let uri = Request.replace_path_param uri "{{{baseName}}}" {{#isString}}{{{paramName}}}{{/isString}}{{#isLong}}(Int64.to_string {{{paramName}}}){{/isLong}}{{#isInteger}}(Int32.to_string {{{paramName}}}){{/isInteger}}{{#isFloat}}(string_of_float {{{paramName}}}){{/isFloat}} in
-    {{/pathParams}}{{/hasPathParams}}{{#hasQueryParams}}
-    {{#queryParams}}let uri = Uri.add_query_param' uri ("{{{baseName}}}", {{{paramName}}}) in
-    {{/queryParams}}{{/hasQueryParams}}{{#hasBodyParam}}
-    {{#bodyParams}}{{#isBodyParam}}let body = Request.build_body {{{vendorExtensions.x-modelModule}}}.to_yojson {{{paramName}}} in{{/isBodyParam}}{{/bodyParams}}{{/hasBodyParam}}
+    let uri = Request.build_uri "{{{path}}}" in{{#pathParams}}
+    let uri = Request.replace_path_param uri "{{{baseName}}}" ({{> to_string}}{{{paramName}}}) in{{/pathParams}}{{#queryParams}}
+    let uri = Uri.add_query_param{{^isListContainer}}'{{/isListContainer}} uri ("{{{baseName}}}", {{> to_string}}{{{paramName}}}) in{{/queryParams}}{{#bodyParams}}
+    let body = Request.build_body {{{vendorExtensions.x-modelModule}}}.to_yojson {{{paramName}}} in{{/bodyParams}}
     Cohttp_lwt_unix.Client.{{{httpMethod}}} uri ~headers{{#hasBodyParam}} ~body{{/hasBodyParam}}
 
 {{/operation}}

modules/openapi-generator/src/main/resources/ocaml-client/dune.mustache

@@ -3,6 +3,6 @@
    (name {{{packageName}}})
    (public_name {{{packageName}}})
    (libraries cohttp-lwt-unix lwt yojson ppx_deriving_yojson.runtime)
-   (preprocess (pps ppx_deriving_yojson))
+   (preprocess (pps ppx_deriving_yojson ppx_deriving.std))
    (wrapped true)
 )

modules/openapi-generator/src/main/resources/ocaml-client/enums.mustache

@@ -0,0 +1,17 @@
+{{#models}}
+{{#model}}
+{{#isEnum}}
+
+{{!-- for enum schemas --}}
+
+(** {{{description}}} *)
+type {{name}} =
+{{#allowableValues}}
+{{#values}}
+| {{camlEnumValueName}} [@printer fun fmt _ -> Format.pp_print_string fmt "{{{name}}}"] [@name "{{{name}}}"]
+{{/values}}
+{{/allowableValues}}
+[@@deriving yojson, show { with_path = false }];;
+{{/isEnum}}
+{{/model}}
+{{/models}}

modules/openapi-generator/src/main/resources/ocaml-client/model.mustache

@@ -5,6 +5,10 @@
  * Schema {{{classname}}} : {{{description}}}
  *)
 {{/description}}
+{{^description}}
+ *
+ *)
+{{/description}}
 
 {{!-- for enum schemas --}}
 {{#isEnum}}
@@ -17,20 +21,6 @@ type t =
 
 {{!-- for non-enum schemas --}}
 
-{{!-- for properties that are of enum type --}}
-{{#vars}}
-{{#isEnum}}
-(** {{{description}}} *)
-type {{name}} =
-{{#allowableValues}}
-{{#enumVars}}
-| {{name}}
-{{/enumVars}}
-{{/allowableValues}}
-[@@deriving yojson];;
-{{/isEnum}}
-{{/vars}}
-
 {{^isEnum}}
 type t = {
 {{#vars}}
@@ -39,13 +29,13 @@ type t = {
     {{/description}}
     {{#isEnum}}
     (*{{{name}}}: [{{#allowableValues}}{{#enumVars}}`{{name}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}]{{^isListContainer}}{{#required}}{{#isNullable}} option{{/isNullable}}{{/required}}{{/isListContainer}}{{^isListContainer}}{{^required}} option{{/required}}{{/isListContainer}};*)
-    {{{name}}}: {{{name}}}{{^isListContainer}}{{#required}}{{#isNullable}} option{{/isNullable}}{{/required}}{{/isListContainer}}{{^isListContainer}}{{^required}} option{{/required}}{{/isListContainer}};
+    {{{name}}}: Enums.{{{datatypeWithEnum}}}{{^isListContainer}}{{#required}}{{#isNullable}} option{{/isNullable}}{{/required}}{{/isListContainer}}{{^isListContainer}}{{^required}} option{{/required}}{{/isListContainer}};
     {{/isEnum}}
     {{^isEnum}}
     {{{name}}}: {{{dataType}}}{{^isListContainer}}{{#required}}{{#isNullable}} option{{/isNullable}}{{/required}}{{/isListContainer}}{{^isListContainer}}{{^required}} option{{/required}}{{/isListContainer}};
     {{/isEnum}}
 {{/vars}}
-} [@@deriving yojson];;
+} [@@deriving yojson, show ];;
 
 {{#description}}
 (** {{{description}}} *)

modules/openapi-generator/src/main/resources/ocaml-client/to_string.mustache

@@ -0,0 +1 @@
+{{#isContainer}}{{#items}}{{#isEnum}}List.map {{> to_string}}{{/isEnum}}{{#isModel}}List.map {{> to_string}}{{/isModel}}{{/items}}{{/isContainer}}{{#isString}}{{/isString}}{{#isLong}}Int64.to_string {{/isLong}}{{#isInteger}}Int32.to_string {{/isInteger}}{{#isFloat}}string_of_float {{/isFloat}}{{#isBoolean}}string_of_bool {{/isBoolean}}{{#isModel}}{{{vendorExtensions.x-modelModule}}}.show {{/isModel}}{{^isModel}}{{^isContainer}}{{#isEnum}}Enums.show_{{{datatypeWithEnum}}} {{/isEnum}}{{/isContainer}}{{/isModel}}

samples/client/petstore/ocaml-client/.openapi-generator/VERSION

@@ -1 +1 @@
-4.1.0-SNAPSHOT
+unset

samples/client/petstore/ocaml-client/dune

@@ -3,6 +3,6 @@
    (name petstore_client)
    (public_name petstore_client)
    (libraries cohttp-lwt-unix lwt yojson ppx_deriving_yojson.runtime)
-   (preprocess (pps ppx_deriving_yojson))
+   (preprocess (pps ppx_deriving_yojson ppx_deriving.std))
    (wrapped true)
 )

samples/client/petstore/ocaml-client/src/apis/pet_api.ml

@@ -15,28 +15,24 @@ let delete_pet pet_id api_key =
     let headers = Request.default_headers in
     let uri = Request.build_uri "/pet/{petId}" in
     let uri = Request.replace_path_param uri "petId" (Int64.to_string pet_id) in
-
     Cohttp_lwt_unix.Client.delete uri ~headers
 
 let find_pets_by_status status =
     let headers = Request.default_headers in
     let uri = Request.build_uri "/pet/findByStatus" in
-    let uri = Uri.add_query_param' uri ("status", status) in
-
+    let uri = Uri.add_query_param uri ("status", List.map Enums.show_pet_status status) in
     Cohttp_lwt_unix.Client.get uri ~headers
 
 let find_pets_by_tags tags =
     let headers = Request.default_headers in
     let uri = Request.build_uri "/pet/findByTags" in
-    let uri = Uri.add_query_param' uri ("tags", tags) in
-
+    let uri = Uri.add_query_param uri ("tags", tags) in
     Cohttp_lwt_unix.Client.get uri ~headers
 
 let get_pet_by_id pet_id =
     let headers = Request.default_headers in
     let uri = Request.build_uri "/pet/{petId}" in
     let uri = Request.replace_path_param uri "petId" (Int64.to_string pet_id) in
-
     Cohttp_lwt_unix.Client.get uri ~headers
 
 let update_pet body =
@@ -49,14 +45,12 @@ let update_pet_with_form pet_id name status =
     let headers = Request.default_headers in
     let uri = Request.build_uri "/pet/{petId}" in
     let uri = Request.replace_path_param uri "petId" (Int64.to_string pet_id) in
-
     Cohttp_lwt_unix.Client.post uri ~headers
 
 let upload_file pet_id additional_metadata file =
     let headers = Request.default_headers in
     let uri = Request.build_uri "/pet/{petId}/uploadImage" in
     let uri = Request.replace_path_param uri "petId" (Int64.to_string pet_id) in
-
     Cohttp_lwt_unix.Client.post uri ~headers
 
 

samples/client/petstore/ocaml-client/src/apis/store_api.ml

@@ -8,8 +8,7 @@
 let delete_order order_id =
     let headers = Request.default_headers in
     let uri = Request.build_uri "/store/order/{orderId}" in
-    let uri = Request.replace_path_param uri "orderId" order_id in
-
+    let uri = Request.replace_path_param uri "orderId" (order_id) in
     Cohttp_lwt_unix.Client.delete uri ~headers
 
 let get_inventory  =
@@ -21,7 +20,6 @@ let get_order_by_id order_id =
     let headers = Request.default_headers in
     let uri = Request.build_uri "/store/order/{orderId}" in
     let uri = Request.replace_path_param uri "orderId" (Int64.to_string order_id) in
-
     Cohttp_lwt_unix.Client.get uri ~headers
 
 let place_order body =

samples/client/petstore/ocaml-client/src/apis/user_api.ml

@@ -26,23 +26,20 @@ let create_users_with_list_input body =
 let delete_user username =
     let headers = Request.default_headers in
     let uri = Request.build_uri "/user/{username}" in
-    let uri = Request.replace_path_param uri "username" username in
-
+    let uri = Request.replace_path_param uri "username" (username) in
     Cohttp_lwt_unix.Client.delete uri ~headers
 
 let get_user_by_name username =
     let headers = Request.default_headers in
     let uri = Request.build_uri "/user/{username}" in
-    let uri = Request.replace_path_param uri "username" username in
-
+    let uri = Request.replace_path_param uri "username" (username) in
     Cohttp_lwt_unix.Client.get uri ~headers
 
 let login_user username password =
     let headers = Request.default_headers in
     let uri = Request.build_uri "/user/login" in
     let uri = Uri.add_query_param' uri ("username", username) in
     let uri = Uri.add_query_param' uri ("password", password) in
-
     Cohttp_lwt_unix.Client.get uri ~headers
 
 let logout_user  =
@@ -53,8 +50,7 @@ let logout_user  =
 let update_user username body =
     let headers = Request.default_headers in
     let uri = Request.build_uri "/user/{username}" in
-    let uri = Request.replace_path_param uri "username" username in
-
+    let uri = Request.replace_path_param uri "username" (username) in
     let body = Request.build_body User.to_yojson body in
     Cohttp_lwt_unix.Client.put uri ~headers ~body
 

samples/client/petstore/ocaml-client/src/models/api_response.ml

@@ -8,12 +8,11 @@
 
 
 
-
 type t = {
     code: int32 option;
     _type: string option;
     message: string option;
-} [@@deriving yojson];;
+} [@@deriving yojson, show ];;
 
 (** Describes the result of uploading an image resource *)
 let create () : t = {

samples/client/petstore/ocaml-client/src/models/category.ml

@@ -8,11 +8,10 @@
 
 
 
-
 type t = {
     id: int64 option;
     name: string option;
-} [@@deriving yojson];;
+} [@@deriving yojson, show ];;
 
 (** A category for a pet *)
 let create () : t = {

samples/client/petstore/ocaml-client/src/models/order.ml

@@ -8,23 +8,16 @@
 
 
 
-(** Order Status *)
-type status =
-| Placed
-| Approved
-| Delivered
-[@@deriving yojson];;
-
 type t = {
     id: int64 option;
     pet_id: int64 option;
     quantity: int32 option;
     ship_date: string option;
     (* Order Status *)
     (*status: [`Placed | `Approved | `Delivered] option;*)
-    status: status option;
+    status: Enums.status option;
     complete: bool option;
-} [@@deriving yojson];;
+} [@@deriving yojson, show ];;
 
 (** An order for a pets from the pet store *)
 let create () : t = {

samples/client/petstore/ocaml-client/src/models/pet.ml

@@ -8,13 +8,6 @@
 
 
 
-(** pet status in the store *)
-type status =
-| Available
-| Pending
-| Sold
-[@@deriving yojson];;
-
 type t = {
     id: int64 option;
     category: Category.t option;
@@ -23,8 +16,8 @@ type t = {
     tags: Tag.t list;
     (* pet status in the store *)
     (*status: [`Available | `Pending | `Sold] option;*)
-    status: status option;
-} [@@deriving yojson];;
+    status: Enums.pet_status option;
+} [@@deriving yojson, show ];;
 
 (** A pet for sale in the pet store *)
 let create (name : string) (photo_urls : string list) : t = {

samples/client/petstore/ocaml-client/src/models/tag.ml

@@ -8,11 +8,10 @@
 
 
 
-
 type t = {
     id: int64 option;
     name: string option;
-} [@@deriving yojson];;
+} [@@deriving yojson, show ];;
 
 (** A tag for a pet *)
 let create () : t = {

samples/client/petstore/ocaml-client/src/models/user.ml

@@ -8,7 +8,6 @@
 
 
 
-
 type t = {
     id: int64 option;
     username: string option;
@@ -19,7 +18,7 @@ type t = {
     phone: string option;
     (* User Status *)
     user_status: int32 option;
-} [@@deriving yojson];;
+} [@@deriving yojson, show ];;
 
 (** A User who is purchasing from the pet store *)
 let create () : t = {

samples/client/petstore/ocaml-client/src/support/enums.ml

@@ -0,0 +1,16 @@
+
+
+(**  *)
+type status =
+| Placed [@printer fun fmt _ -> Format.pp_print_string fmt "placed"] [@name "placed"]
+| Approved [@printer fun fmt _ -> Format.pp_print_string fmt "approved"] [@name "approved"]
+| Delivered [@printer fun fmt _ -> Format.pp_print_string fmt "delivered"] [@name "delivered"]
+[@@deriving yojson, show { with_path = false }];;
+
+
+(**  *)
+type pet_status =
+| Available [@printer fun fmt _ -> Format.pp_print_string fmt "available"] [@name "available"]
+| Pending [@printer fun fmt _ -> Format.pp_print_string fmt "pending"] [@name "pending"]
+| Sold [@printer fun fmt _ -> Format.pp_print_string fmt "sold"] [@name "sold"]
+[@@deriving yojson, show { with_path = false }];;