Melange v3 long-lived branch (#6)

* Melange v3 long-lived branch * update * chore: update nix flakes
melange-community · Feb 1, 2024 · bd9532e · bd9532e
1 parent 9f29577
commit bd9532e
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 67 deletions.
diff --git a/examples/decode.ml b/examples/decode.ml
@@ -2,7 +2,7 @@
 let mapJsonObjectString f decoder (encoder : int -> Js.Json.t) str =
   let json = Json.parseOrRaise str in
   Json.Decode.(dict decoder json)
-  |> Js.Dict.map (fun [@u] v -> f v)
+  |> Js.Dict.map ~f:(fun [@u] v -> f v)
   |> Json.Encode.dict encoder |> Json.stringify
 
 let sum = Array.fold_left ( + ) 0

diff --git a/examples/encode.ml b/examples/encode.ml
@@ -2,65 +2,46 @@
 
 (* prints ["foo", "bar"] *)
 let _ =
-  [| "foo"; "bar" |]
-  |> Json.Encode.stringArray
-  |> Json.stringify
-  |> Js.log
+  [| "foo"; "bar" |] |> Json.Encode.stringArray |> Json.stringify |> Js.log
 
 (* prints ["foo", "bar"] *)
 let _ =
   [| "foo"; "bar" |]
-  |> Js.Array.map Json.Encode.string
+  |> Js.Array.map ~f:Json.Encode.string
   |> Json.Encode.jsonArray
   |> Json.stringify
   |> Js.log
 
 (* prints { x: 42, foo: 'bar' } *)
-let _ =
-  Json.Encode.(
-    object_ [
-      ("x", int 42);
-      ("foo", string "bar")
-    ]
-    |> Js.log
-  )
+let _ = Json.Encode.(object_ [ ("x", int 42); ("foo", string "bar") ] |> Js.log)
 
 (* Advanced example: encode a record *)
-type line = {
-  start: point;
-  end_: point;
-  thickness: int option
-}
-and point = {
-  x: float;
-  y: float
-}
+type line = { start : point; end_ : point; thickness : int option }
+and point = { x : float; y : float }
 
 module Encode = struct
   let point r =
-    let open! Json.Encode in (
-      object_ [
-        ("x", float r.x);
-        ("y", float r.y)
-      ]
-    )
+    let open! Json.Encode in
+    object_ [ ("x", float r.x); ("y", float r.y) ]
+
   let line r =
     Json.Encode.(
-      object_ [
-        ("start", point r.start);
-        ("end", point r.end_);
-        ("thickness", match r.thickness with Some x -> int x | None -> null)
-      ]
-    )
+      object_
+        [
+          ("start", point r.start);
+          ("end", point r.end_);
+          ("thickness", match r.thickness with Some x -> int x | None -> null);
+        ])
 end
 
-let data = {
-  start = { x = 1.1; y = -0.4 };
-  end_ = { x = 5.3; y = 3.8 };
-  thickness = Some 2
-}
+let data =
+  {
+    start = { x = 1.1; y = -0.4 };
+    end_ = { x = 5.3; y = 3.8 };
+    thickness = Some 2;
+  }
 
 let _ =
   data
   |> Encode.line
-  |> Js.log
+  |> Js.log
diff --git a/flake.lock b/flake.lock
diff --git a/src/Json_decode.ml b/src/Json_decode.ml
@@ -73,9 +73,10 @@ let pair decodeA decodeB json =
           decodeB (Array.unsafe_get source 1) )
       with DecodeError msg -> raise @@ DecodeError (msg ^ "\n\tin pair/tuple2")
     else
+      let length = Js.String.make length in
       raise
-      @@ DecodeError
-           {j|Expected array of length 2, got array of length $length|j}
+        (DecodeError
+           {j|Expected array of length 2, got array of length $length|j})
   else raise @@ DecodeError ("Expected array, got " ^ _stringify json)
 
 let tuple2 = pair
@@ -91,9 +92,10 @@ let tuple3 decodeA decodeB decodeC json =
           decodeC (Array.unsafe_get source 2) )
       with DecodeError msg -> raise @@ DecodeError (msg ^ "\n\tin tuple3")
     else
+      let length = Js.String.make length in
       raise
-      @@ DecodeError
-           {j|Expected array of length 3, got array of length $length|j}
+        (DecodeError
+           {j|Expected array of length 3, got array of length $length|j})
   else raise @@ DecodeError ("Expected array, got " ^ _stringify json)
 
 let tuple4 decodeA decodeB decodeC decodeD json =
@@ -108,9 +110,10 @@ let tuple4 decodeA decodeB decodeC decodeD json =
           decodeD (Array.unsafe_get source 3) )
       with DecodeError msg -> raise @@ DecodeError (msg ^ "\n\tin tuple4")
     else
+      let length = Js.String.make length in
       raise
-      @@ DecodeError
-           {j|Expected array of length 4, got array of length $length|j}
+        (DecodeError
+           {j|Expected array of length 4, got array of length $length|j})
   else raise @@ DecodeError ("Expected array, got " ^ _stringify json)
 
 let dict decode json =
@@ -164,7 +167,7 @@ let oneOf decoders json =
     match decoders with
     | [] ->
         let formattedErrors =
-          "\n- " ^ Js.Array.joinWith "\n- " (Array.of_list (List.rev errors))
+          "\n- " ^ Js.Array.join ~sep:"\n- " (Array.of_list (List.rev errors))
         in
         raise
         @@ DecodeError