Upgrade Kxclib and use Json_ext.to/of_xjv (#404)

* upgrade kxclib to latest main * fix code to build successfully * update example/ex01/test/test.t * update jsoo_full_bridge to use Kxclib_js * gen dune inc files * regenerate examples --------- Co-authored-by: Haochen M. Kotoi-Xie <[email protected]>
kxcdev · Jan 10, 2024 · b81ff79 · b81ff79
1 parent 49ce37a
commit b81ff79
Show file tree

Hide file tree

Showing 17 changed files with 51 additions and 87 deletions.
diff --git a/example/ex01/test/test.t b/example/ex01/test/test.t
@@ -42,9 +42,9 @@ Check endpoints
   >   -d '{"kind":"student","studentId":0}'
   HTTP/1.1 400 Status 400
   Content-Type: application/json
-  content-length: 764
+  content-length: 1611
 
-  "Bad request: invalid json format - mandatory field 'name' does not exist at root; expected shape: `with_warning (\n(\"not considering any config if exists\",\n `named ((\"Person\",\n          `anyone_of ([`object_of ([`mandatory_field ((\"kind\", `exactly (\"anonymous\")))]);\n`object_of ([`mandatory_field ((\"kind\", `exactly (\"with-id\"))); `mandatory_field ((\"value\", `integral))]);\n`object_of ([`mandatory_field ((\"kind\", `exactly (\"student\"))); `mandatory_field ((\"studentId\", `integral));\n`mandatory_field ((\"name\", `string))]);\n`object_of ([`mandatory_field ((\"kind\", `exactly (\"teacher\"))); `mandatory_field ((\"facultyId\", `integral));\n`mandatory_field ((\"name\", `string));\n`mandatory_field ((\"department\", `string))])\n])))))"
+  "Bad request: invalid json format - mandatory field 'name' does not exist at root; expected shape: `with_warning (\n(\"not considering any config if exists\",\n `named ((\"Person\",\n          `anyone_of ([`object_of ([`mandatory_field ((\"kind\",\n                                                       `exactly (\"anonymous\")))\n                                     ]);\n                        `object_of ([`mandatory_field ((\"kind\",\n                                                        `exactly (\"with-id\")));\n                                      `mandatory_field ((\"value\", `integral))\n                                      ]);\n                        `object_of ([`mandatory_field ((\"kind\",\n                                                        `exactly (\"student\")));\n                                      `mandatory_field ((\"studentId\",\n                                                         `integral));\n                                      `mandatory_field ((\"name\", `string))]);\n                        `object_of ([`mandatory_field ((\"kind\",\n                                                        `exactly (\"teacher\")));\n                                      `mandatory_field ((\"facultyId\",\n                                                         `integral));\n                                      `mandatory_field ((\"name\", `string));\n                                      `mandatory_field ((\"department\",\n                                                         `string))\n                                      ])\n                        ])))))"
 
 Kill the server process in the background.
   $ kill -9 $PID
diff --git a/example/for_dev/generator/duneinc_generator.ml b/example/for_dev/generator/duneinc_generator.ml
@@ -246,10 +246,9 @@ let () =
               "bindoj.objintf_shared";
               "bindoj_objintf_gen_jsoo_test_gen_utils";
               "js_of_ocaml";
-              "yojson";
+              "kxclib.js";
               objintf_gen_lib_name;
-            ]
-            ~preprocess:[ "(pps js_of_ocaml-ppx)" ];
+            ];
             many (
               let outputs = [
                 fmt "%s_jsoo_gen.ml";

diff --git a/example/for_dev/objintf_examples-dune.inc b/example/for_dev/objintf_examples-dune.inc
@@ -78,7 +78,6 @@
 (subdir objintf_examples/lib_objintf_gen_jsoo
  (library
   (name dev_example_objintf_examples_lib_objintf_gen_jsoo)
-  (preprocess (pps js_of_ocaml-ppx))
   (modules
    ex_objintf_system_io_jsoo_gen
    ex_objintf_empty_jsoo_gen
@@ -92,7 +91,7 @@
    bindoj.objintf_shared
    bindoj_objintf_gen_jsoo_test_gen_utils
    js_of_ocaml
-   yojson
+   kxclib.js
    dev_example_objintf_examples_lib_objintf_gen))
  (rule
   (alias gen)

diff --git a/example/for_dev/objintf_examples/lib_objintf_gen_jsoo/ex_objintf_one_directional_jsoo_gen.ml b/example/for_dev/objintf_examples/lib_objintf_gen_jsoo/ex_objintf_one_directional_jsoo_gen.ml
@@ -348,20 +348,11 @@ module Full_bridge_with_jsoo : Peer_setup_only_full_bridge =
                                                   Unsafe.obj
                                                     [|("student",
                                                         (Unsafe.inject
-                                                           ((let open Js_of_ocaml in
-                                                               fun x ->
-                                                                 ((((ex_record_student_to_json
-                                                                    x) |>
-                                                                    Kxclib.Json.to_yojson)
-                                                                    |>
-                                                                    Yojson.Safe.to_string)
-                                                                    |>
-                                                                    Js.string)
-                                                                   |>
-                                                                   (fun x ->
-                                                                    (Js._JSON
-                                                                    ## parse)
-                                                                    x))
+                                                           ((fun x ->
+                                                               (ex_record_student_to_json
+                                                                  x)
+                                                                 |>
+                                                                 Kxclib_js.Json_ext.to_xjv)
                                                               (student |>
                                                                  (Option.value
                                                                     ~default:

diff --git a/...or_dev/objintf_examples/lib_objintf_gen_jsoo/ex_objintf_one_directional_jsoo_trans_gen.ml b/...or_dev/objintf_examples/lib_objintf_gen_jsoo/ex_objintf_one_directional_jsoo_trans_gen.ml
@@ -304,25 +304,18 @@ module Full_bridge_with_jsoo : Endemic_setup_only_full_bridge = functor (M :
                                             (fun la ->
                                                Optdef.map
                                                  (Unsafe.get la "student")
-                                                 (let open Js_of_ocaml in
-                                                    fun x ->
-                                                      ((((((Js._JSON ##
-                                                              stringify) x)
-                                                            |> to_string)
-                                                           |>
-                                                           Yojson.Safe.from_string)
-                                                          |>
-                                                          Kxclib.Json.of_yojson)
-                                                         |>
-                                                         ex_record_student_of_json')
-                                                        |>
-                                                        (function
-                                                         | Error e ->
-                                                             failwith
-                                                               (Bindoj_runtime.OfJsonResult.Err.to_string
-                                                                  e)
-                                                         | Ok result ->
-                                                             result))))
+                                                 (fun x ->
+                                                    ((Kxclib_js.Json_ext.of_xjv
+                                                        x)
+                                                       |>
+                                                       ex_record_student_of_json')
+                                                      |>
+                                                      (function
+                                                       | Error e ->
+                                                           failwith
+                                                             (Bindoj_runtime.OfJsonResult.Err.to_string
+                                                                e)
+                                                       | Ok result -> result))))
                                            |> Optdef.to_option)
                                         |>
                                         (Option.value

diff --git a/example/for_dev/objintf_examples/lib_objintf_gen_jsoo/ex_objintf_system_io_jsoo_gen.ml b/example/for_dev/objintf_examples/lib_objintf_gen_jsoo/ex_objintf_system_io_jsoo_gen.ml
@@ -270,14 +270,9 @@ module Full_bridge_with_jsoo : Dual_setup_full_bridge = functor (M :
                                (__caml_obj : byte_source') =
                                Js_of_ocaml.Js.Unsafe.callback
                                  (fun labeledArgs ->
-                                    (let open Js_of_ocaml in
-                                       fun x ->
-                                         ((((byte_source_state_to_json x) |>
-                                              Kxclib.Json.to_yojson)
-                                             |> Yojson.Safe.to_string)
-                                            |> Js.string)
-                                           |>
-                                           (fun x -> (Js._JSON ## parse) x))
+                                    (fun x ->
+                                       (byte_source_state_to_json x) |>
+                                         Kxclib_js.Json_ext.to_xjv)
                                       (__caml_obj
                                          ?max:(let open Js_of_ocaml.Js in
                                                  (Optdef.bind labeledArgs

diff --git a/example/for_dev/objintf_examples/lib_objintf_gen_jsoo/ex_objintf_system_io_jsoo_trans_gen.ml b/example/for_dev/objintf_examples/lib_objintf_gen_jsoo/ex_objintf_system_io_jsoo_trans_gen.ml
@@ -417,20 +417,16 @@ module Full_bridge_with_jsoo : Dual_setup_full_bridge = functor (M :
                              let rec decode_byte_source'_of_js __js_obj ?max 
                                () =
                                let open Js_of_ocaml in
-                                 (let open Js_of_ocaml in
-                                    fun x ->
-                                      ((((((Js._JSON ## stringify) x) |>
-                                            to_string)
-                                           |> Yojson.Safe.from_string)
-                                          |> Kxclib.Json.of_yojson)
-                                         |> byte_source_state_of_json')
-                                        |>
-                                        (function
-                                         | Error e ->
-                                             failwith
-                                               (Bindoj_runtime.OfJsonResult.Err.to_string
-                                                  e)
-                                         | Ok result -> result))
+                                 (fun x ->
+                                    ((Kxclib_js.Json_ext.of_xjv x) |>
+                                       byte_source_state_of_json')
+                                      |>
+                                      (function
+                                       | Error e ->
+                                           failwith
+                                             (Bindoj_runtime.OfJsonResult.Err.to_string
+                                                e)
+                                       | Ok result -> result))
                                    (Js.Unsafe.fun_call __js_obj
                                       [|(Js.Unsafe.inject
                                            (let open Js_of_ocaml.Js in

diff --git a/src/lib_objintf_gen_jsoo/jsoo_full_bridge.ml b/src/lib_objintf_gen_jsoo/jsoo_full_bridge.ml
@@ -449,12 +449,9 @@ let jsoo_full_bridge_impl : type bridgeable_ident.
             | _ -> codec
           in
           let open_, name = Json_config.get_encoder_name ~resolution_strategy:codec td_name in
-          [%expr Js_of_ocaml.(fun x ->
+          [%expr (fun x ->
             [%e evar ?open_ name] x
-            |> Kxclib.Json.to_yojson
-            |> Yojson.Safe.to_string
-            |> Js.string
-            |> (fun x -> Js._JSON##parse x)
+            |> Kxclib_js.Json_ext.to_xjv
           )]
         | `bridgeable (party, bi) ->
           bi
@@ -494,11 +491,8 @@ let jsoo_full_bridge_impl : type bridgeable_ident.
             | _ -> codec
           in
           let open_, name = Json_config.get_decoder_name ~resolution_strategy:codec td_name in
-          [%expr Js_of_ocaml.(fun x ->
-            Js._JSON##stringify x
-            |> to_string
-            |> Yojson.Safe.from_string
-            |> Kxclib.Json.of_yojson
+          [%expr (fun x ->
+            Kxclib_js.Json_ext.of_xjv x
             |> [%e evar ?open_ name]
             |> (function
               | Error e -> failwith (Bindoj_runtime.OfJsonResult.Err.to_string e)

diff --git a/src/lib_objintf_gen_jsoo/unit_test/gen/duneinc_generator.ml b/src/lib_objintf_gen_jsoo/unit_test/gen/duneinc_generator.ml
@@ -92,10 +92,9 @@ let () =
                 | `output_full_bridge_only -> [ "bindoj_objintf_gen_test_gen_output" ]
               ) @ [
               "kxclib";
-              "yojson";
+              "kxclib.js";
               "js_of_ocaml";
-            ])
-            ~preprocess:[ "(pps js_of_ocaml-ppx)" ];
+            ]);
             many caml_module
         ]
       ]

diff --git a/src/lib_objintf_gen_jsoo/unit_test/gen/output-dune.inc b/src/lib_objintf_gen_jsoo/unit_test/gen/output-dune.inc
@@ -3,7 +3,6 @@
 (subdir output
  (library
   (name bindoj_objintf_gen_jsoo_test_gen_output)
-  (preprocess (pps js_of_ocaml-ppx))
   (modules
    ex_objintf_system_io_jsoo_gen
    ex_objintf_empty_jsoo_gen
@@ -17,7 +16,7 @@
    bindoj.std_runtime
    bindoj.objintf_shared
    kxclib
-   yojson
+   kxclib.js
    js_of_ocaml))
  (rule
   (alias gen)

diff --git a/src/lib_objintf_gen_jsoo/unit_test/gen/output-full_bridge_only-dune.inc b/src/lib_objintf_gen_jsoo/unit_test/gen/output-full_bridge_only-dune.inc
@@ -3,7 +3,6 @@
 (subdir output_full_bridge_only
  (library
   (name bindoj_objintf_gen_jsoo_test_gen_output_full_bridge_only)
-  (preprocess (pps js_of_ocaml-ppx))
   (modules
    ex_objintf_system_io_jsoo_gen
    ex_objintf_empty_jsoo_gen
@@ -18,7 +17,7 @@
    bindoj.objintf_shared
    bindoj_objintf_gen_test_gen_output
    kxclib
-   yojson
+   kxclib.js
    js_of_ocaml))
  (rule
   (alias gen)

diff --git a/src/lib_typedesc/unit_test/coretypes.ml b/src/lib_typedesc/unit_test/coretypes.ml
@@ -161,7 +161,7 @@ module TestTup2(M0 : Testable) (M1 : Testable) : Testable = struct
   let testable = Alcotest.pair M0.testable M1.testable
   let to_string (a0, a1) = sprintf "(%s, %s)" (M0.to_string a0) (M1.to_string a1)
   let values =
-    let open MonadOps(List0) in
+    let open MonadOps(List) in
     M0.values
     >>= (fun v0 ->
       M1.values
@@ -176,7 +176,7 @@ module TestTup3(M0 : Testable) (M1 : Testable) (M2 : Testable) : Testable = stru
   let testable = Alcotest.triple M0.testable M1.testable M2.testable
   let to_string (a0, a1, a2) = sprintf "(%s, %s, %s)" (M0.to_string a0) (M1.to_string a1) (M2.to_string a2)
   let values =
-    let open MonadOps(List0) in
+    let open MonadOps(List) in
     M0.values
     >>= (fun v0 ->
       M1.values

diff --git a/vendors/kxclib b/vendors/kxclib
diff --git a/with_js/apidir-typescript-tests/gen/dune b/with_js/apidir-typescript-tests/gen/dune
@@ -16,7 +16,7 @@
    bindoj_apidir_shared bindoj_apidir_runtime bindoj_apidir_typescript
    bindoj_test_common_jsoo_utils
    js_of_ocaml prr
-   kxclib kxclib.jsoo)
+   kxclib kxclib-jsoo kxclib.js)
  (preprocess (pps js_of_ocaml-ppx))
  (flags (:standard -open Kxclib)))
 

diff --git a/with_js/apidir-typescript-tests/gen/gen_mock_server.ml b/with_js/apidir-typescript-tests/gen/gen_mock_server.ml
@@ -55,7 +55,7 @@ let export_to_js (module Dir : Sample_apidir) =
     let postprocess resp =
       let open FutexnIoOps in
       resp >|= prepare_response_for_js
-      >|= cast % Kxclib_jsoo.Json_ext.to_xjv
+      >|= cast % Kxclib_js.Json_ext.to_xjv
       |> FutexnIo.to_promise in
     object%js
       method handle_path_json_get_js path =
@@ -65,7 +65,7 @@ let export_to_js (module Dir : Sample_apidir) =
       method handle_path_json_post_js path reqbody =
         let path = ostr path in
         let reqbody : Json.jv =
-          reqbody |> Kxclib_jsoo.Json_ext.of_xjv |> cast in
+          reqbody |> Kxclib_js.Json_ext.of_xjv |> cast in
         Bridge.handle_path_json_post path reqbody
         |> postprocess
     end

diff --git a/with_js/objintf-tests/design-validation/js-sameworld-bridge/dune b/with_js/objintf-tests/design-validation/js-sameworld-bridge/dune
@@ -6,7 +6,7 @@
   bindoj_runtime
   bindoj_typedesc
   bindoj_test_common_objintf_examples
-  kxclib kxclib.jsoo yojson jsonm js_of_ocaml prr)
+  kxclib kxclib-jsoo yojson jsonm js_of_ocaml prr)
  (flags (:standard -open Kxclib))
  (preprocess (pps ppx_deriving.show js_of_ocaml-ppx))
  (modes js))

diff --git a/with_js/objintf-tests/tests/dune b/with_js/objintf-tests/tests/dune
@@ -10,7 +10,7 @@
   bindoj_runtime
   bindoj_typedesc
   bindoj_objintf_gen_jsoo_test_gen_output
-  kxclib kxclib.jsoo yojson jsonm js_of_ocaml prr)
+  kxclib kxclib-jsoo yojson jsonm js_of_ocaml prr)
  (flags (:standard -open Kxclib))
  (preprocess (pps ppx_deriving.show js_of_ocaml-ppx))
  (modes js))
+0 −71		.github/workflows/matrix-check.yml
+6 −3		.github/workflows/ocaml-general.yml
+2 −1		README.md
+5 −0		classic/dune
+129 −57		classic/kxclib.ml
+1 −9		dune
+29 −6		dune-project
+7 −0		intf/dune
+7 −0		intf/js/dune
+40 −0		intf/js/kxclib_js.mli
+1,352 −0		intf/kxclib.mli
+26 −4		jsoo/dune
+16 −16		jsoo/futexn_io.ml
+187 −0		jsoo/kxclib_js.ml
+0 −140		jsoo/kxclib_jsoo.ml
+12 −3		jsoo/unit_test/dune
+37 −0		kxclib-jsoo.opam
+35 −0		kxclib-melange.opam
+3 −6		kxclib.opam
+2 −4		melange/.gitignore
+80 −0		melange/dune
+99 −0		melange/kxclib_js.ml
+1 −0		melange/kxclib_melange.ml
+16 −0		melange/package.json
+5 −0		melange/ppx/dune
+32 −0		melange/ppx/kxc_melange_ppx.ml
+39 −0		melange/promise.ml
+133 −0		melange/src/kxclib_comp_mel.ml
+24 −0		melange/tests/dune
+103 −0		melange/tests/kxclib.spec.js
+128 −0		melange/tests/kxclib_melange_test.ml
+69 −87		melange/yarn.lock
+0 −29		rescript/bsconfig.json
+0 −40		rescript/dune
+0 −1,338		rescript/kxclib_comp_re.ml
+0 −44		rescript/package.json
+0 −81		rescript/re_stubs.ml
+0 −72		rescript/src/kxclib.spec.js
+4 −1		unit_test/dune