Skip to content

Draft: jsoo interface #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
maxtori wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

Draft: jsoo interface #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4f01a1e
jsoo interface
maxtori Jan 15, 2026
38e06d7
clerk jsoo backend
maxtori Jan 22, 2026
80f8d89
fill jsoo stdlib
maxtori Jan 27, 2026
ba9249e
opam dependencies
maxtori Feb 2, 2026
db36579
remove stdlib_internals from jsoo stdlib
maxtori Feb 2, 2026
0197d52
missing Js module for optdef
maxtori Feb 2, 2026
595a7a0
add ocaml warning attribute
maxtori Feb 2, 2026
4ac135a
avoid redundant names
maxtori Feb 2, 2026
f487f5a
remove dependency to ocaml.5.4
maxtori Feb 2, 2026
85bb103
change manpages.sexp
maxtori Feb 3, 2026
55fce35
jsoo stdlib internal mli
maxtori Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build_system/clerk_config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ open Catala_utils
open Otoml

type backend = ..
type backend += C | OCaml | Java | Python
type backend += C | OCaml | Java | Python | Jsoo

let registered_backends = ref []

Expand All @@ -29,7 +29,8 @@ let () =
register_backend ~name:"c" C;
register_backend ~name:"ocaml" OCaml;
register_backend ~name:"java" Java;
register_backend ~name:"python" Python
register_backend ~name:"python" Python;
register_backend ~name:"jsoo" Jsoo

let registered_backends () = !registered_backends

Expand Down
2 changes: 1 addition & 1 deletion build_system/clerk_config.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
open Catala_utils

type backend = ..
type backend += C | OCaml | Java | Python
type backend += C | OCaml | Java | Python | Jsoo

val register_backend : name:string -> backend -> unit

Expand Down
55 changes: 45 additions & 10 deletions build_system/clerk_driver.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ let backend_src_extensions =
Clerk_rules.Python, ["py"];
Clerk_rules.Java, ["java"];
Clerk_rules.Tests, ["catala_en"; "catala_fr"; "catala_pl"];
Clerk_rules.Jsoo, ["ml"];
]

let backend_obj_extensions =
Expand All @@ -142,6 +143,7 @@ let backend_obj_extensions =
Clerk_rules.Python, [];
Clerk_rules.Java, ["class"];
Clerk_rules.Tests, [];
Clerk_rules.Jsoo, [];
]

let backend_extensions =
Expand All @@ -163,6 +165,7 @@ let backend_subdir_list =
Clerk_rules.Java, "java";
Clerk_rules.OCaml, "ocaml";
Clerk_rules.Tests, "";
Clerk_rules.Jsoo, "jsoo";
]

let subdir_backend_list =
Expand All @@ -173,6 +176,16 @@ let backend_subdir bk = List.assoc bk backend_subdir_list
let rule_subdir rule =
backend_subdir (Clerk_rules.backend_from_config rule.Config.backend)

let backend_suffix =
[
Clerk_rules.C, None;
Clerk_rules.Python, None;
Clerk_rules.Java, None;
Clerk_rules.OCaml, None;
Clerk_rules.Tests, None;
Clerk_rules.Jsoo, Some "_jsoo";
]

let linking_command ~build_dir ~backend ~var_bindings link_deps item target =
let open File in
match backend with
Expand All @@ -195,6 +208,7 @@ let linking_command ~build_dir ~backend ~var_bindings link_deps item target =
"-o";
target -.- "exe";
]
| `Jsoo -> []
| `C ->
get_var var_bindings Var.cc_exe
@ [build_dir / Scan.libcatala / "c" / "dates_calc.o"]
Expand Down Expand Up @@ -336,13 +350,15 @@ let rules_backend = function
| Clerk_rules.Python -> `Python
| Clerk_rules.Java -> `Java
| Clerk_rules.Tests -> `Interpret
| Clerk_rules.Jsoo -> `Jsoo

let string_of_backend = function
| `OCaml -> "ocaml"
| `C -> "c"
| `Python -> "python"
| `Java -> "java"
| `Interpret -> "interpret"
| `Jsoo -> "jsoo"

let make_target ~build_dir ~backend item =
let open File in
Expand All @@ -359,6 +375,7 @@ let make_target ~build_dir ~backend item =
| `C -> (dir / "c" / base) -.- "o"
| `Python -> (dir / "python" / base) -.- "py"
| `Java -> (dir / "java" / base) -.- "class"
| `Jsoo -> File.with_extension ~suffix:"_jsoo" (dir / "ocaml" / base) ".ml"
| `Custom rule ->
(dir / rule_subdir rule / base) -.- List.hd rule.Config.in_exts
in
Expand All @@ -371,8 +388,10 @@ let backend_runtime_targets ?(only_source = false) enabled_backends =
@ (if List.mem Clerk_rules.C enabled_backends then [src "@runtime-c"] else [])
@ (if List.mem Clerk_rules.Python enabled_backends then ["@runtime-python"]
else [])
@ (if List.mem Clerk_rules.Java enabled_backends then [src "@runtime-java"]
else [])
@
if List.mem Clerk_rules.Java enabled_backends then [src "@runtime-java"]
if List.mem Clerk_rules.Jsoo enabled_backends then [src "@runtime-jsoo"]
else []

open Cmdliner
Expand Down Expand Up @@ -484,8 +503,11 @@ let build_clerk_target
if target.include_objects then List.assoc bk backend_extensions
else List.assoc bk backend_src_extensions
in
let suffix = List.assoc bk backend_suffix in
List.map
(fun ext -> (module_item, target, bk), base -.- ext)
(fun ext ->
( (module_item, target, bk),
File.with_extension ?suffix base ext ))
extensions)
all_modules_deps)
enabled_backends
Expand All @@ -508,7 +530,8 @@ let build_clerk_target
List.assoc backend backend_extensions
else List.assoc backend backend_src_extensions
in
List.map File.(fun ext -> tf -.- ext) exts
let suffix = List.assoc backend backend_suffix in
List.map (fun ext -> File.with_extension ?suffix tf ext) exts
in
targets @ acc)
(backend_runtime_targets
Expand Down Expand Up @@ -552,10 +575,21 @@ let build_clerk_target
["catala"; "org"]
| Clerk_rules.Tests -> assert false
| bk ->
let suffix = List.assoc bk backend_suffix in
List.iter
(fun ext ->
let src = (local_runtime_dir bk / "catala_runtime") -.- ext in
if File.exists src then copy_in ~dir ~src)
let runtime_src =
File.with_extension ?suffix
(local_runtime_dir bk / "catala_runtime")
ext
in
if File.exists runtime_src then copy_in ~dir ~src:runtime_src;
let dates_calc_src =
File.with_extension ?suffix
(local_runtime_dir bk / "dates_calc")
ext
in
if File.exists dates_calc_src then copy_in ~dir ~src:dates_calc_src)
extensions);
if target.Config.include_sources then
all_modules_deps
Expand Down Expand Up @@ -883,7 +917,7 @@ let setup_report_format ?fix_path verbosity diff_command coverage =
let run_artifact config ~backend ~var_bindings ?scope src =
let open File in
match backend with
| `OCaml ->
| `OCaml | `Jsoo ->
let cmd = (src -.- "exe") :: Option.to_list scope in
Message.debug "Executing artifact: '%s'..." (String.concat " " cmd);
run_command cmd
Expand Down Expand Up @@ -926,6 +960,7 @@ let enable_backend =
| `C -> C
| `Python -> Python
| `Java -> Java
| `Jsoo -> Jsoo

let build_test_deps
~config
Expand Down Expand Up @@ -967,7 +1002,7 @@ let build_test_deps
let backend =
match backend with
| `Interpret -> `Interpret_module
| (`OCaml | `C | `Python | `Java) as bk -> bk
| (`OCaml | `C | `Python | `Java | `Jsoo) as bk -> bk
in
List.fold_left
(fun acc (it, t) ->
Expand Down Expand Up @@ -1004,7 +1039,7 @@ let run_tests
scope_input
(test_targets, link_deps, var_bindings) =
let build_dir = config.Cli.options.global.build_dir in
match (backend : [ `Interpret | `C | `OCaml | `Python | `Java ]) with
match (backend : [ `Interpret | `C | `OCaml | `Python | `Java | `Jsoo ]) with
| `Interpret ->
let () =
match scope_input, test_targets with
Expand All @@ -1031,7 +1066,7 @@ let run_tests
let cmd = exec @ [cmd; target] @ catala_flags in
Message.debug "Running command: '%s'..." (String.concat " " cmd);
run_command cmd
| (`C | `OCaml | `Python | `Java) as backend -> (
| (`C | `OCaml | `Python | `Java | `Jsoo) as backend -> (
let link_cmd =
linking_command ~build_dir ~backend ~var_bindings link_deps
in
Expand Down Expand Up @@ -1197,7 +1232,7 @@ let run_clerk_test
config
quiet
(clerk_targets_or_files_or_folders : string list)
(backend : [ `Interpret | `OCaml | `C | `Python | `Java ])
(backend : [ `Interpret | `OCaml | `C | `Python | `Java | `Jsoo ])
(reset_test_outputs : bool)
verbosity
(report_format : [ `Terminal | `JUnitXML | `VSCodeJSON ])
Expand Down
Loading