Fix: Correctly encode/decode maps

Author: sir4ur0n

modules/openapi-generator/src/main/resources/ocaml/json.mustache

@@ -53,3 +53,16 @@ let of_int64 x = `Intlit (Int64.to_string x)
 let of_list_of of_f l = `List (Stdlib.List.map of_f l)
 
 let of_map_of of_f l = `Assoc (Stdlib.List.map (fun (k, v) -> (k, of_f v)) l)
+
+let to_map_of of_f json =
+  match json with
+  | `Assoc l ->
+    Stdlib.List.fold_right
+      (fun (k, json) acc ->
+        match (of_f json, acc) with
+        | Stdlib.Result.Ok parsed_v, Stdlib.Result.Ok tl ->
+          Stdlib.Result.Ok ((k, parsed_v) :: tl)
+        | Stdlib.Result.Error e, _ -> Stdlib.Result.Error e
+        | _, Stdlib.Result.Error e -> Stdlib.Result.Error e)
+      l (Stdlib.Result.Ok [])
+  | _ -> Stdlib.Result.Error "Expected"

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

@@ -28,7 +28,7 @@ type t = {
           {{^required}} option [@default None]{{/required}}
         {{/isContainer}}
         {{#isArray}}{{^required}} [@default []]{{/required}}{{/isArray}}
-        {{#isMap}}{{^required}} [@default []]{{/required}}{{/isMap}}
+        {{#isMap}}{{^required}} [@default []] [@to_yojson JsonSupport.of_map_of [%to_yojson: {{{items.datatypeWithEnum}}}]] [@of_yojson JsonSupport.to_map_of [%of_yojson: {{{items.datatypeWithEnum}}}]] {{/required}}{{/isMap}}
         ; [@key "{{{baseName}}}"]
     {{/isEnum}}
 {{/vars}}

modules/openapi-generator/src/main/resources/ocaml/to_json.mustache

@@ -8,29 +8,32 @@
         (JsonSupport.of_map_of {{> to_json}})
     {{/items}}
 {{/isMap}}
-{{#isString}}JsonSupport.of_string{{/isString}}
-{{#isLong}}JsonSupport.of_int64{{/isLong}}
-{{#isInteger}}JsonSupport.of_int32{{/isInteger}}
-{{#isFloat}}JsonSupport.of_float{{/isFloat}}
-{{#isNumber}}JsonSupport.of_float{{/isNumber}}
-{{#isDouble}}JsonSupport.of_float{{/isDouble}}
-{{#isBoolean}}JsonSupport.of_bool{{/isBoolean}}
-{{^isEnum}}
-    {{#isModel}}
-        {{#vendorExtensions.x-model-module}}
-            {{{vendorExtensions.x-model-module}}}.to_yojson
-        {{/vendorExtensions.x-model-module}}
-        {{^vendorExtensions.x-model-module}}
-            {{{baseType}}}.to_yojson
-        {{/vendorExtensions.x-model-module}}
+{{^isContainer}}
+    {{#isString}}JsonSupport.of_string{{/isString}}
+    {{#isLong}}JsonSupport.of_int64{{/isLong}}
+    {{#isInteger}}JsonSupport.of_int32{{/isInteger}}
+    {{#isFloat}}JsonSupport.of_float{{/isFloat}}
+    {{#isNumber}}JsonSupport.of_float{{/isNumber}}
+    {{#isDouble}}JsonSupport.of_float{{/isDouble}}
+    {{#isBoolean}}JsonSupport.of_bool{{/isBoolean}}
+    {{^isEnum}}
+        {{#isModel}}
+            {{#vendorExtensions.x-model-module}}
+                {{{vendorExtensions.x-model-module}}}.to_yojson
+            {{/vendorExtensions.x-model-module}}
+            {{^vendorExtensions.x-model-module}}
+                {{{baseType}}}.to_yojson
+            {{/vendorExtensions.x-model-module}}
+        {{/isModel}}
+    {{/isEnum}}
+    {{^isModel}}
+        {{^isContainer}}
+            {{#isEnum}}
+                Enums.{{{datatypeWithEnum}}}_to_yojson
+            {{/isEnum}}
+        {{/isContainer}}
     {{/isModel}}
-{{/isEnum}}
-{{^isModel}}
-    {{^isContainer}}
-        {{#isEnum}}
-            Enums.{{{datatypeWithEnum}}}_to_yojson
-        {{/isEnum}}
-    {{/isContainer}}
-{{/isModel}}
-{{#isBinary}}JsonSupport.of_string{{/isBinary}}
-{{#isAnyType}}(fun x -> x){{/isAnyType}}
+    {{#isBinary}}JsonSupport.of_string{{/isBinary}}
+    {{#isAnyType}}(fun x -> x){{/isAnyType}}
+    {{#isFreeFormObject}}(fun x -> x){{/isFreeFormObject}}
+{{/isContainer}}

samples/client/petstore/ocaml-fake-petstore/src/apis/another_fake_api.ml

@@ -11,16 +11,17 @@ let call_123_test_special_tags ~client_t =
     let headers = Request.default_headers in
     let body = Request.
 
-        write_as_json_body 
-
-
-
-
-
-
-            Client.to_yojson
-
-
+        write_as_json_body     
+    
+    
+    
+    
+    
+    
+                Client.to_yojson
+    
+    
+    
  client_t
     in
     Cohttp_lwt_unix.Client.call `PATCH uri ~headers ~body >>= fun (resp, body) ->