WIP

Author: hhugo

src/dune_rules/jsoo/jsoo_rules.ml

@@ -194,6 +194,27 @@ let jsoo ~dir sctx =
     "js_of_ocaml"
 ;;
 
+let jsoo_memo ~dir sctx =
+  Super_context.resolve_program_memo
+    sctx
+    ~dir
+    ~loc:None
+    ~where:Original_path
+    ~hint:install_jsoo_hint
+    "js_of_ocaml"
+;;
+
+let jsoo_has_shapes ~dir sctx =
+  let* jsoo = jsoo_memo ~dir sctx in
+  let+ jsoo_version = Version.jsoo_version jsoo in
+  match jsoo_version with
+  | Some version ->
+    (match Version.compare version (5, 8) with
+     | Lt -> false
+     | Gt | Eq -> true)
+  | None -> false
+;;
+
 type sub_command =
   | Compile
   | Link
@@ -427,15 +448,14 @@ let build_cm' sctx ~dir ~in_context ~src ~target ~config ~shapes ~sourcemap =
   js_of_ocaml_rule sctx ~sub_command:Compile ~dir ~flags ~spec ~target ~config ~sourcemap
 ;;
 
-let shapes_enabled = true
-
 let build_cm cctx ~dir ~in_context ~src ~obj_dir ~config:config_opt =
   let name = with_js_ext (Path.basename src) in
   let target = in_obj_dir ~obj_dir ~config:config_opt [ name ] in
   let sctx = Compilation_context.super_context cctx in
   let ctx = Super_context.context sctx |> Context.build_context in
+  let+ jsoo_has_shapes = jsoo_has_shapes ~dir sctx in
   let shapes =
-    if shapes_enabled
+    if jsoo_has_shapes
     then
       Some
         (let open Action_builder.O in
@@ -475,7 +495,10 @@ let setup_separate_compilation_rules sctx components =
     let config = Config.of_string s_config in
     let pkg = Lib_name.parse_string_exn (Loc.none, s_pkg) in
     let ctx = Super_context.context sctx in
-    let* installed_libs = Lib.DB.installed ctx in
+    let* installed_libs = Lib.DB.installed ctx
+    and* jsoo_has_shapes =
+      jsoo_has_shapes ~dir:(Context.build_context ctx).build_dir sctx
+    in
     Lib.DB.find installed_libs pkg
     >>= (function
      | None -> Memo.return ()
@@ -512,7 +535,7 @@ let setup_separate_compilation_rules sctx components =
          in
          let target = in_build_dir build_context ~config [ lib_name; with_js_ext name ] in
          let shapes =
-           if shapes_enabled
+           if jsoo_has_shapes
            then (* FIXME: we should load shapes *)
              Some (Action_builder.return [])
            else None

src/dune_rules/jsoo/jsoo_rules.mli

@@ -22,7 +22,7 @@ val build_cm
   -> src:Path.t
   -> obj_dir:Path.Build.t Obj_dir.t
   -> config:Config.t option
-  -> Action.Full.t Action_builder.With_targets.t
+  -> Action.Full.t Action_builder.With_targets.t Memo.t
 
 val build_exe
   :  Compilation_context.t

src/dune_rules/lib_rules.ml

@@ -485,6 +485,7 @@ let setup_build_archives (lib : Library.t) ~top_sorted_modules ~cctx ~expander ~
             ~obj_dir)
       in
       Memo.parallel_iter action_with_targets ~f:(fun rule ->
+        let* rule = rule in
         Super_context.add_rule sctx ~dir ~loc:lib.buildable.loc rule))
   in
   Memo.when_

src/dune_rules/module_compilation.ml

@@ -316,7 +316,7 @@ let build_module ?(force_write_cmi = false) ?(precompiled_cmi = false) cctx m =
           (* Build *.cmo.js *)
           let sctx = Compilation_context.super_context cctx in
           let dir = Compilation_context.dir cctx in
-          let action_with_targets =
+          let* action_with_targets =
             Jsoo_rules.build_cm
               cctx
               ~dir

test/blackbox-tests/test-cases/jsoo/inline-tests.t/run.t

@@ -9,9 +9,9 @@ Run inline tests using node js
   $ dune runtest
   inline tests (Byte)
   inline tests (Byte)
+  Warning: your program contains effect handlers; you should probably run js_of_ocaml with option '--enable=effects'
   inline tests (Native)
   inline tests (Native)
-  Warning: your program contains effect handlers; you should probably run js_of_ocaml with option '--enable=effects'
   inline tests (JS)
   inline tests (JS)