refactor

hhugo · hhugo · commit 231bc2051815 · 2025-06-10T15:31:14.000+02:00
diff --git a/src/dune_rules/jsoo/jsoo_rules.ml b/src/dune_rules/jsoo/jsoo_rules.ml
@@ -316,25 +316,14 @@ let wasmoo ~dir sctx =
     "wasm_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 (6, 0) with
+let jsoo_has_shapes (mode : Js_of_ocaml.Mode.t) jsoo_version =
+  match mode, jsoo_version with
+  | JS, Some version ->
+    (match Version.compare version (6, 1) with
      | Lt -> false
      | Gt | Eq -> true)
-  | None -> false
+  | Wasm, Some _version -> false
+  | _, None -> false
 ;;
 
 type sub_command =
@@ -632,22 +621,18 @@ let build_cm' sctx ~dir ~in_context ~mode ~src ~target ~config ~shapes ~sourcema
     Command.Args.(
       S
         [ Dep src
-        ; (match shapes with
-           | Some shapes ->
-             S
-               [ Dyn
-                   (let open Action_builder.O in
-                    let* has_shape = Action_builder.of_memo (jsoo_has_shapes ~dir sctx) in
-                    match has_shape with
-                    | false -> Action_builder.return (S [])
-                    | true ->
-                      let+ shapes = shapes in
-                      S
-                        [ S [ A "--write-shape" ]
-                        ; S (List.map shapes ~f:(fun s -> S [ A "--load-shape"; Dep s ]))
-                        ])
-               ]
-           | None -> S [])
+        ; Dyn
+            (let open Action_builder.O in
+             let* jsoo_version =
+               let* jsoo = jsoo ~dir sctx in
+               Action_builder.of_memo @@ Version.jsoo_version jsoo
+             in
+             let+ shapes =
+               match jsoo_has_shapes mode jsoo_version with
+               | false -> Action_builder.return []
+               | true -> shapes
+             in
+             S (List.map shapes ~f:(fun s -> S [ A "--load-shape"; Dep s ])))
         ])
   in
   let flags = in_context.Js_of_ocaml.In_context.flags in
@@ -670,24 +655,19 @@ let build_cm cctx ~dir ~in_context ~mode ~src ~obj_dir ~config:config_opt =
   let sctx = Compilation_context.super_context cctx in
   let ctx = Super_context.context sctx |> Context.build_context in
   let shapes =
-    match mode with
-    | JS ->
-      Some
-        (let open Action_builder.O in
-         let+ libs = Resolve.Memo.read (Compilation_context.requires_link cctx)
-         and+ config =
-           match config_opt with
-           | None ->
-             let flags = in_context.Js_of_ocaml.In_context.flags in
-             js_of_ocaml_flags sctx ~dir ~mode flags
-             |> Action_builder.bind ~f:(fun (x : _ Js_of_ocaml.Flags.t) -> x.compile)
-             |> Action_builder.map ~f:Config.of_flags
-           | Some config -> Action_builder.return config
-         in
-         Path.build
-           (in_build_dir ctx ~config [ "stdlib"; with_js_ext ~mode "stdlib.cma" ])
-         :: List.concat_map libs ~f:(fun lib -> jsoo_archives ~mode ctx config lib))
-    | Wasm -> None
+    let open Action_builder.O in
+    let+ libs = Resolve.Memo.read (Compilation_context.requires_link cctx)
+    and+ config =
+      match config_opt with
+      | None ->
+        let flags = in_context.Js_of_ocaml.In_context.flags in
+        js_of_ocaml_flags sctx ~dir ~mode flags
+        |> Action_builder.bind ~f:(fun (x : _ Js_of_ocaml.Flags.t) -> x.compile)
+        |> Action_builder.map ~f:Config.of_flags
+      | Some config -> Action_builder.return config
+    in
+    Path.build (in_build_dir ctx ~config [ "stdlib"; with_js_ext ~mode "stdlib.cma" ])
+    :: List.concat_map libs ~f:(fun lib -> jsoo_archives ~mode ctx config lib)
   in
   build_cm'
     sctx
@@ -736,7 +716,7 @@ let setup_separate_compilation_rules sctx components =
            in
            archive "stdlib.cma" :: archive "std_exit.cmo" :: archives
          | _ -> Memo.return archives
-       and* requires = Resolve.Memo.read_memo requires in
+       in
        Memo.parallel_iter Js_of_ocaml.Mode.all ~f:(fun mode ->
          Memo.parallel_iter archives ~f:(fun fn ->
            let build_context = Context.build_context ctx in
@@ -750,25 +730,21 @@ let setup_separate_compilation_rules sctx components =
              in_build_dir build_context ~config [ lib_name; with_js_ext ~mode name ]
            in
            let shapes =
-             match mode with
-             | JS ->
-               let l =
-                 List.concat_map requires ~f:(fun lib ->
-                   jsoo_archives ~mode build_context config lib)
-               in
-               let l =
-                 match lib_name with
-                 | "stdlib" -> l
-                 | _ ->
-                   Path.build
-                     (in_build_dir
-                        build_context
-                        ~config
-                        [ "stdlib"; with_js_ext ~mode "stdlib.cma" ])
-                   :: l
-               in
-               Some (Action_builder.return l)
-             | Wasm -> None
+             let open Action_builder.O in
+             let+ requires = Resolve.Memo.read requires in
+             let l =
+               List.concat_map requires ~f:(fun lib ->
+                 jsoo_archives ~mode build_context config lib)
+             in
+             match lib_name with
+             | "stdlib" -> l
+             | _ ->
+               Path.build
+                 (in_build_dir
+                    build_context
+                    ~config
+                    [ "stdlib"; with_js_ext ~mode "stdlib.cma" ])
+               :: l
            in
            build_cm'
              sctx
diff --git a/test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t/run.t b/test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t/run.t
@@ -25,12 +25,12 @@ specify js mode (#1940).
   $ dune build --display short @@all 2>&1 | grep js_of_ocaml
    js_of_ocaml .b.eobjs/jsoo/b.bc.runtime.js
    js_of_ocaml .e.eobjs/jsoo/e.bc.runtime.js
-   js_of_ocaml .js/default/stdlib/stdlib.cma.{js,jsoo-shape}
-   js_of_ocaml .js/default/stdlib/std_exit.cmo.{js,jsoo-shape}
-   js_of_ocaml .b.eobjs/jsoo/b.cmo.{js,jsoo-shape}
+   js_of_ocaml .js/default/stdlib/std_exit.cmo.js
+   js_of_ocaml .js/default/stdlib/stdlib.cma.js
+   js_of_ocaml .b.eobjs/jsoo/b.cmo.js
    js_of_ocaml b.bc.js
-   js_of_ocaml .foo.objs/jsoo/default/foo.cma.{js,jsoo-shape}
-   js_of_ocaml .e.eobjs/jsoo/e.cmo.{js,jsoo-shape}
+   js_of_ocaml .e.eobjs/jsoo/e.cmo.js
+   js_of_ocaml .foo.objs/jsoo/default/foo.cma.js
    js_of_ocaml e.bc.js
 
 Check that building a JS-enabled executable that depends on a library works.
diff --git a/test/blackbox-tests/test-cases/jsoo/no-check-prim.t/run.t b/test/blackbox-tests/test-cases/jsoo/no-check-prim.t/run.t
@@ -10,21 +10,21 @@ Compilation using jsoo
       ocamldep bin/.technologic.eobjs/z.impl.d
       ocamlopt lib/.x.objs/native/x__.{cmx,o}
         ocamlc lib/.x.objs/byte/x__Y.{cmi,cmo,cmt}
-   js_of_ocaml .js/default/js_of_ocaml-compiler.runtime/jsoo_runtime.cma.{js,jsoo-shape}
-   js_of_ocaml .js/default/js_of_ocaml/js_of_ocaml.cma.{js,jsoo-shape}
-   js_of_ocaml .js/default/stdlib/std_exit.cmo.{js,jsoo-shape}
-   js_of_ocaml .js/default/stdlib/stdlib.cma.{js,jsoo-shape}
+   js_of_ocaml .js/default/js_of_ocaml-compiler.runtime/jsoo_runtime.cma.js
+   js_of_ocaml .js/default/js_of_ocaml/js_of_ocaml.cma.js
+   js_of_ocaml .js/default/stdlib/std_exit.cmo.js
+   js_of_ocaml .js/default/stdlib/stdlib.cma.js
       ocamlopt lib/.x.objs/native/x__Y.{cmx,o}
         ocamlc lib/.x.objs/byte/x.{cmi,cmo,cmt}
       ocamlopt lib/.x.objs/native/x.{cmx,o}
         ocamlc bin/.technologic.eobjs/byte/z.{cmi,cmo,cmt}
         ocamlc lib/x.cma
       ocamlopt lib/x.{a,cmxa}
         ocamlc bin/.technologic.eobjs/byte/technologic.{cmi,cmo,cmt}
-   js_of_ocaml lib/.x.objs/jsoo/default/x.cma.{js,jsoo-shape}
+   js_of_ocaml bin/.technologic.eobjs/jsoo/z.cmo.js
+   js_of_ocaml lib/.x.objs/jsoo/default/x.cma.js
       ocamlopt lib/x.cmxs
-   js_of_ocaml bin/.technologic.eobjs/jsoo/technologic.cmo.{js,jsoo-shape}
-   js_of_ocaml bin/.technologic.eobjs/jsoo/z.cmo.{js,jsoo-shape}
+   js_of_ocaml bin/.technologic.eobjs/jsoo/technologic.cmo.js
    js_of_ocaml bin/technologic.bc.js
   $ node ./_build/default/bin/technologic.bc.js
   buy it
