Fix issue with recursive modules and uncurried.

CHANGELOG.md

@@ -12,6 +12,9 @@
 
 # 11.0.1 (Unreleased)
 
+#### :bug: Bug Fix
+- Fix issue with recursive modules and uncurried. https://github.com/rescript-lang/rescript-compiler/pull/6575
+
 # 11.0.0
 
 No changes compared to rc.9.

jscomp/ml/transl_recmodule.ml

@@ -51,18 +51,22 @@ let init_shape modl =
     match sg with
     | [] -> []
     | Sig_value (id, { val_kind = Val_reg; val_type = ty }) :: rem ->
+        let is_function t =
+          Ast_uncurried_utils.typeIsUncurriedFun t || match t.desc with
+          | Tarrow _ -> true
+          | _ -> false in
         let init_v =
           match Ctype.expand_head env ty with
-          | { desc = Tarrow (_, _, _, _) } ->
-              Const_pointer
-                ( 0,
-                  Pt_constructor
-                    {
-                      name = "Function";
-                      const = cstr_const;
-                      non_const = cstr_non_const;
-                      attrs = [];
-                    } )
+          | t when is_function t ->
+            Const_pointer
+            ( 0,
+              Pt_constructor
+                {
+                  name = "Function";
+                  const = cstr_const;
+                  non_const = cstr_non_const;
+                  attrs = [];
+                } )
           | { desc = Tconstr (p, _, _) } when Path.same p Predef.path_lazy_t ->
               Const_pointer
                 ( 1,

jscomp/test/recmodule.res

@@ -0,0 +1,70 @@
+type params = {id: string}
+type req = {params: params}
+
+module Entity = {
+  type light = {
+    id: string,
+    name: string,
+  }
+}
+
+module UseCase = {
+  module type Layer = {
+    let getLight: string => promise<unit>
+  }
+
+  module type Deps = {
+    let presentLight: Entity.light => promise<unit>
+  }
+
+  module MakeLayer = (Deps: Deps): Layer => {
+    let getLight = id => {
+      Deps.presentLight({
+        id,
+        name: "Light 1",
+      })
+    }
+  }
+}
+
+module Adapter = {
+  module type Layer = {
+    let handleGetLight: req => promise<unit>
+    let presentLight: Entity.light => promise<unit>
+  }
+
+  module type Deps = {
+    let presentJson: ('a, ~status: int) => promise<unit>
+  }
+
+  module MakeLayer = (Deps: Deps, UC: UseCase.Layer): Layer => {
+    let presentLight = light => light->Deps.presentJson(~status=200)
+
+    let handleGetLight = req => {
+      UC.getLight(req.params.id)
+    }
+  }
+}
+
+module Infra = {
+  module type Layer = {
+    let presentJson: ('a, ~status: int) => promise<unit>
+    let routes: unit => array<(string, req => promise<unit>)>
+  }
+
+  module type Deps = {
+    let handleGetLight: req => promise<unit>
+  }
+
+  module MakeLayer = (Deps: Deps): Layer => {
+    let presentJson = (json, ~status) => assert false
+
+    let routes = () => [("/lights", Deps.handleGetLight)]
+  }
+}
+
+module App = {
+  module rec I: Infra.Layer = Infra.MakeLayer(A)
+  and A: Adapter.Layer = Adapter.MakeLayer(I, U)
+  and U: UseCase.Layer = UseCase.MakeLayer(A)
+}