Support for labeled tuples

CHANGES.md

@@ -33,11 +33,13 @@
   function can be provided directly, e.g. `[@json.drop_default Int.equal]`
   ([#77](https://github.com/melange-community/melange-json/pull/77))
 - Add `Melange_json.equal` for comparing two JSON values, and
-  `[@drop_default_if_json_equal]` as an alternative to `[@.drop_default]`
+  `[@drop_default_if_json_equal]` as an alternative to `[@json.drop_default]`
   that compares values at the JSON level
   ([#77](https://github.com/melange-community/melange-json/pull/77))
 - PPX: Fix `unused-var` warning with polyvars without own cases
   ([#38](https://github.com/melange-community/melange-json/pull/38))
+- PPX: Add support for labeled tuples, e.g. `[%to_json: a:string * b:int]`,
+  encoded as JSON objects like records
 
 ## 2.0.0 (2025-03-11)
 

README.md

@@ -219,6 +219,25 @@ and `of_json` extension points:
 let json = [%to_json: int * string] (42, "foo")
 ```
 
+Labeled tuples (OCaml 5.4+) are supported as well, and serialize to JSON objects
+keyed by each label:
+
+```ocaml
+let json = [%to_json: x:int * y:int] (~x:1, ~y:2)
+(* {"x": 1, "y": 2} *)
+
+let (~x, ~y) =
+  [%of_json: x:int * y:int] (Melange_json.of_string {|{"x": 1, "y": 2}|})
+(* x = 1, y = 2 *)
+```
+
+Members without a label are keyed by their position:
+
+```ocaml
+let json = [%to_json: x:int * string] (~x:1, "foo")
+(* {"x": 1, "1": "foo"} *)
+```
+
 #### `[@json.default E]`: default values for records
 
 You can specify default values for record fields using the `[@json.default E]`

dune-project

@@ -35,7 +35,7 @@
     (>= "3.10.0")
     :with-test))
   (ppxlib
-   (>= "0.36.0"))
+   (>= "0.38.0"))
   (opam-check-npm-deps :with-dev-setup)
   (ocaml-lsp-server :with-dev-setup)
   (ocamlformat
@@ -53,6 +53,6 @@
   (ocaml
    (>= "4.12"))
   (ppxlib
-   (>= "0.36.0"))
+   (>= "0.38.0"))
   (yojson
    (>= "1.6.0"))))

melange-json-native.opam

@@ -14,7 +14,7 @@ bug-reports: "https://github.com/melange-community/melange-json/issues"
 depends: [
   "dune" {>= "3.16"}
   "ocaml" {>= "4.12"}
-  "ppxlib" {>= "0.36.0"}
+  "ppxlib" {>= "0.38.0"}
   "yojson" {>= "1.6.0"}
   "odoc" {with-doc}
 ]

melange-json.opam

@@ -17,7 +17,7 @@ depends: [
   "melange" {>= "4.0.0"}
   "melange-jest" {with-test}
   "reason" {>= "3.10.0" & with-test}
-  "ppxlib" {>= "0.36.0"}
+  "ppxlib" {>= "0.38.0"}
   "opam-check-npm-deps" {with-dev-setup}
   "ocaml-lsp-server" {with-dev-setup}
   "ocamlformat" {= "0.28.1" & with-dev-setup}

ppx/browser/ppx_deriving_json_js.ml

@@ -30,7 +30,7 @@ module Of_json = struct
       Option.value ~default:n (ld_attr_json_key ld)
     in
     let handle_field fs ld =
-      ( map_loc lident ld.pld_name,
+      ( ld.pld_name,
         let n = field_key ld in
         [%expr
           match
@@ -62,10 +62,8 @@ module Of_json = struct
       [%expr
         let fs = (Obj.magic [%e x] : [%t build_js_type ~loc fs]) in
         [%e
-          make
-            (pexp_record ~loc
-               (List.map fs ~f:(handle_field [%expr fs]))
-               None)]]
+          let fs = List.map fs ~f:(handle_field [%expr fs]) in
+          make ~loc fs]]
     in
     if allow_extra_fields then body
     else
@@ -136,10 +134,28 @@ module Of_json = struct
   let derive_of_record derive t x =
     let loc = t.rcd_loc in
     let allow_extra_fields = td_allow_extra_fields t.rcd_ctx in
+    let make ~loc fs =
+      let fs = List.map fs ~f:(fun (n, v) -> map_loc lident n, v) in
+      pexp_record ~loc fs None
+    in
     [%expr
       [%e ensure_json_object ~loc x];
       [%e
-        build_record ~allow_extra_fields ~loc derive t.rcd_fields x Fun.id]]
+        build_record ~allow_extra_fields ~loc derive t.rcd_fields x make]]
+
+  let derive_of_labeled_tuple derive t x =
+    let loc = t.rcd_loc in
+    let make ~loc fs =
+      let fs =
+        List.map fs ~f:(fun (n, v) -> labeled_tuple_arg_label n, v)
+      in
+      pexp_labeled_tuple ~loc fs
+    in
+    [%expr
+      [%e ensure_json_object ~loc x];
+      [%e
+        build_record ~allow_extra_fields:true ~loc derive t.rcd_fields x
+          make]]
 
   let derive_of_variant ?(is_compact_variants = false) _derive t
       ~allow_any_constr body x =
@@ -235,6 +251,10 @@ module Of_json = struct
     | Vcs_record (n, r) ->
         let loc = n.loc in
         let n = Option.value ~default:n (vcs_attr_json_name r.rcd_ctx) in
+        let make ~loc fs =
+          let fs = List.map fs ~f:(fun (n, v) -> map_loc lident n, v) in
+          make (Some (pexp_record ~loc fs None))
+        in
         [%expr
           if Stdlib.( = ) [%e tag] [%e estring ~loc:n.loc n.txt] then
             [%e
@@ -251,7 +271,7 @@ module Of_json = struct
                         | Vcs_ctx_polyvariant _ -> true
                       in
                       build_record ~allow_extra_fields ~loc derive
-                        r.rcd_fields [%expr fs] (fun e -> make (Some e))]]]
+                        r.rcd_fields [%expr fs] make]]]
           else [%e next]]
     | Vcs_tuple (n, t) ->
         let loc = n.loc in
@@ -284,7 +304,7 @@ module Of_json = struct
     deriving_of () ~name:"of_json"
       ~of_t:(fun ~loc -> [%type: Js.Json.t])
       ~is_allow_any_constr ~derive_of_tuple ~derive_of_record
-      ~derive_of_variant ~derive_of_variant_case
+      ~derive_of_labeled_tuple ~derive_of_variant ~derive_of_variant_case
 end
 
 module To_json = struct
@@ -419,7 +439,8 @@ module To_json = struct
   let deriving : Ppx_deriving_tools.deriving =
     deriving_to () ~name:"to_json"
       ~t_to:(fun ~loc -> [%type: Js.Json.t])
-      ~derive_of_tuple ~derive_of_record ~derive_of_variant_case
+      ~derive_of_tuple ~derive_of_labeled_tuple:derive_of_record
+      ~derive_of_record ~derive_of_variant_case
 end
 
 let () =