Use uncurried type for @deriving(jsConverter)

This goes towards making all arities explicit.

Author: cristianoc

compiler/frontend/ast_derive_js_mapper.ml

@@ -128,7 +128,9 @@ let app1 = Ast_compatible.app1
 
 let app2 = Ast_compatible.app2
 
-let ( ->~ ) a b = Ast_compatible.arrow a b
+let ( ->~ ) a b =
+  Ast_uncurried.uncurried_type ~loc:Location.none ~arity:1
+    (Ast_compatible.arrow a b)
 
 let raise_when_not_found_ident =
   Longident.Ldot (Lident Primitive_modules.util, "raiseWhenNotFound")
@@ -167,9 +169,10 @@ let init () =
               in
               let to_js_body body =
                 Ast_comb.single_non_rec_value pat_to_js
-                  (Ast_compatible.fun_ ~arity:None
-                     (Pat.constraint_ (Pat.var pat_param) core_type)
-                     body)
+                  (Ast_uncurried.uncurried_fun ~loc:Location.none ~arity:1
+                     (Ast_compatible.fun_ ~arity:None
+                        (Pat.constraint_ (Pat.var pat_param) core_type)
+                        body))
               in
               let ( +> ) a ty = Exp.constraint_ (erase_type a) ty in
               let ( +: ) a ty = erase_type (Exp.constraint_ a ty) in
@@ -211,12 +214,16 @@ let init () =
                 in
                 let from_js =
                   Ast_comb.single_non_rec_value pat_from_js
-                    (Ast_compatible.fun_ ~arity:None (Pat.var pat_param)
-                       (if create_type then
-                          Exp.let_ Nonrecursive
-                            [Vb.mk (Pat.var pat_param) (exp_param +: new_type)]
-                            (Exp.constraint_ obj_exp core_type)
-                        else Exp.constraint_ obj_exp core_type))
+                    (Ast_uncurried.uncurried_fun ~loc:Location.none ~arity:1
+                       (Ast_compatible.fun_ ~arity:(Some 1) (Pat.var pat_param)
+                          (if create_type then
+                             Exp.let_ Nonrecursive
+                               [
+                                 Vb.mk (Pat.var pat_param)
+                                   (exp_param +: new_type);
+                               ]
+                               (Exp.constraint_ obj_exp core_type)
+                           else Exp.constraint_ obj_exp core_type)))
                 in
                 let rest = [to_js; from_js] in
                 if create_type then erase_type_str :: new_type_str :: rest
@@ -253,12 +260,14 @@ let init () =
                            app2 unsafe_index_get_exp exp_map exp_param
                          else app1 erase_type_exp exp_param);
                       Ast_comb.single_non_rec_value pat_from_js
-                        (Ast_compatible.fun_ ~arity:None (Pat.var pat_param)
-                           (let result =
-                              app2 unsafe_index_get_exp rev_exp_map exp_param
-                            in
-                            if create_type then raise_when_not_found result
-                            else result));
+                        (Ast_uncurried.uncurried_fun ~loc:Location.none ~arity:1
+                           (Ast_compatible.fun_ ~arity:(Some 1)
+                              (Pat.var pat_param)
+                              (let result =
+                                 app2 unsafe_index_get_exp rev_exp_map exp_param
+                               in
+                               if create_type then raise_when_not_found result
+                               else result)));
                     ]
                   in
                   if create_type then new_type_str :: v else v
@@ -285,7 +294,8 @@ let init () =
               let pat_from_js = {Asttypes.loc; txt = from_js} in
               let to_js_type result =
                 Ast_comb.single_non_rec_val pat_to_js
-                  (Ast_compatible.arrow core_type result)
+                  (Ast_uncurried.uncurried_type ~loc:Location.none ~arity:1
+                     (Ast_compatible.arrow core_type result))
               in
               let new_type, new_tdcl =
                 U.new_type_of_type_declaration tdcl ("abs_" ^ name)

tests/tests/src/ast_abstract_test.mjs

@@ -68,6 +68,10 @@ function idx(v) {
   eq("File \"ast_abstract_test.res\", line 29, characters 18-25", xFromJs(v), v);
 }
 
+let x0 = "a";
+
+let x1 = "b";
+
 idx("a");
 
 idx("b");
@@ -76,10 +80,6 @@ idx("c");
 
 Mt.from_pair_suites("Ast_abstract_test", suites.contents);
 
-let x0 = "a";
-
-let x1 = "b";
-
 export {
   suites,
   test_id,