+28 -14

bin/jtw.ml

··· 399 399 | _ -> None) hidden in 400 400 let prefixes = Util.StringSet.(of_list prefixes |> to_list) in 401 401 let d = relativize_or_fallback ~findlib_dir dir in 402 402 - (* Include pkg_path in dcs_url so it's correct relative to the HTTP root *) 402 402 + (* dcs_url is relative to the package's own findlib_index.json *) 403 403 let dcs = { 404 404 - Js_top_worker.Impl.dcs_url = Fpath.(v pkg_path / "lib" // d |> to_string); 404 404 + Js_top_worker.Impl.dcs_url = Fpath.(v "lib" // d |> to_string); 405 405 dcs_toplevel_modules = List.map String.capitalize_ascii non_hidden; 406 406 dcs_file_prefixes = prefixes; 407 407 } in ··· 450 450 let _ = Bos.OS.Dir.create ~path:true output_dir in 451 451 let findlib_dir = Ocamlfind.findlib_dir () |> Fpath.v in 452 452 453 453 - (* Build dependency map: package -> list of direct dependency paths *) 453 453 + (* Build dependency map: package -> list of dependency packages. 454 454 + Stdlib is implicitly required by everything, so add it for all 455 455 + non-stdlib packages even if ocamlfind doesn't list it. *) 454 456 let dep_map = Hashtbl.create 64 in 457 457 + let all_packages_set = Util.StringSet.of_list all_packages in 455 458 List.iter (fun pkg -> 456 459 let deps = match Ocamlfind.deps [pkg] with 457 457 - | Ok l -> List.filter (fun d -> d <> pkg) l (* Remove self from deps *) 460 460 + | Ok l -> List.filter (fun d -> d <> pkg) l 458 461 | Error _ -> [] 462 462 + in 463 463 + (* Add stdlib as implicit dependency for non-stdlib packages *) 464 464 + let deps = 465 465 + if pkg <> "stdlib" && not (List.mem "stdlib" deps) 466 466 + && Util.StringSet.mem "stdlib" all_packages_set 467 467 + then "stdlib" :: deps 468 468 + else deps 459 469 in 460 470 Hashtbl.add dep_map pkg deps) 461 471 all_packages; ··· 475 485 Hashtbl.add meta_path_map pkg_path full_meta_path) 476 486 pkg_results; 477 487 478 478 - (* Generate findlib_index for each package with correct META paths *) 488 488 + (* Generate findlib_index for each package. 489 489 + - meta_files: only this package's own META (relative to its own dir) 490 490 + - universes: relative paths to dependency package dirs (e.g., "../stdlib") *) 479 491 List.iter (fun (pkg_path, local_meta_path, deps) -> 480 480 - let this_meta = pkg_path ^ "/" ^ local_meta_path in 481 481 - let dep_metas = List.filter_map (fun dep -> 482 482 - match Hashtbl.find_opt meta_path_map dep with 483 483 - | Some path -> Some path 484 484 - | None -> 485 485 - Format.eprintf "Warning: no META path found for dep %s\n%!" dep; 486 486 - None) 492 492 + let dep_universes = List.filter_map (fun dep -> 493 493 + if Hashtbl.mem meta_path_map dep then 494 494 + Some ("../" ^ dep) 495 495 + else begin 496 496 + Format.eprintf "Warning: no universe found for dep %s\n%!" dep; 497 497 + None 498 498 + end) 487 499 deps 488 500 in 489 489 - let all_metas = this_meta :: dep_metas in 490 490 - let findlib_json = `Assoc [("meta_files", `List (List.map (fun s -> `String s) all_metas))] in 501 501 + let fields = [("meta_files", `List [`String local_meta_path])] in 502 502 + let fields = if dep_universes = [] then fields 503 503 + else fields @ [("universes", `List (List.map (fun s -> `String s) dep_universes))] in 504 504 + let findlib_json = `Assoc fields in 491 505 Out_channel.with_open_bin Fpath.(output_dir / pkg_path / "findlib_index.json" |> to_string) 492 506 (fun oc -> Printf.fprintf oc "%s\n" (Yojson.Safe.to_string findlib_json))) 493 507 pkg_results;

+13 -8

idl/js_top_worker_client_msg.ml

··· 46 46 exception InitError of string 47 47 exception EvalError of string 48 48 49 49 + (** Use plain JSON.stringify/JSON.parse for cross-jsoo-version compatibility. *) 50 50 + let json_global : 'a Js_of_ocaml.Js.t = Js_of_ocaml.Js.Unsafe.pure_js_expr "JSON" 51 51 + let plain_stringify obj = json_global##stringify obj 52 52 + let plain_parse (s : Js_of_ocaml.Js.js_string Js_of_ocaml.Js.t) = json_global##parse s 53 53 + 49 54 (** Parse a worker message from JSON string *) 50 55 let parse_worker_msg s = 51 56 let open Js_of_ocaml in 52 52 - let obj = Json.unsafe_input (Js.string s) in 57 57 + let obj = plain_parse (Js.string s) in 53 58 let typ = Js.to_string (Js.Unsafe.get obj (Js.string "type")) in 54 59 let get_int key = Js.Unsafe.get obj (Js.string key) in 55 60 let get_string key = Js.to_string (Js.Unsafe.get obj (Js.string key)) in ··· 230 235 ("stdlib_dcs", Js.Unsafe.inject (match config.Msg.stdlib_dcs with Some s -> Js.some (Js.string s) | None -> Js.null)); 231 236 ("findlib_index", Js.Unsafe.inject (match config.Msg.findlib_index with Some s -> Js.some (Js.string s) | None -> Js.null)); 232 237 |] in 233 233 - Js.to_string (Json.output obj) 238 238 + Js.to_string (plain_stringify obj) 234 239 | `Eval (cell_id, env_id, code) -> 235 240 let obj = Js.Unsafe.obj [| 236 241 ("type", Js.Unsafe.inject (Js.string "eval")); ··· 238 243 ("env_id", Js.Unsafe.inject (Js.string env_id)); 239 244 ("code", Js.Unsafe.inject (Js.string code)); 240 245 |] in 241 241 - Js.to_string (Json.output obj) 246 246 + Js.to_string (plain_stringify obj) 242 247 | `Complete (cell_id, env_id, source, position, filename) -> 243 248 let pairs = [| 244 249 ("type", Js.Unsafe.inject (Js.string "complete")); ··· 251 256 | Some f -> Array.append pairs [| ("filename", Js.Unsafe.inject (Js.string f)) |] 252 257 | None -> pairs 253 258 in 254 254 - Js.to_string (Json.output (Js.Unsafe.obj pairs)) 259 259 + Js.to_string (plain_stringify (Js.Unsafe.obj pairs)) 255 260 | `TypeAt (cell_id, env_id, source, position, filename) -> 256 261 let pairs = [| 257 262 ("type", Js.Unsafe.inject (Js.string "type_at")); ··· 264 269 | Some f -> Array.append pairs [| ("filename", Js.Unsafe.inject (Js.string f)) |] 265 270 | None -> pairs 266 271 in 267 267 - Js.to_string (Json.output (Js.Unsafe.obj pairs)) 272 272 + Js.to_string (plain_stringify (Js.Unsafe.obj pairs)) 268 273 | `Errors (cell_id, env_id, source, filename) -> 269 274 let pairs = [| 270 275 ("type", Js.Unsafe.inject (Js.string "errors")); ··· 276 281 | Some f -> Array.append pairs [| ("filename", Js.Unsafe.inject (Js.string f)) |] 277 282 | None -> pairs 278 283 in 279 279 - Js.to_string (Json.output (Js.Unsafe.obj pairs)) 284 284 + Js.to_string (plain_stringify (Js.Unsafe.obj pairs)) 280 285 | `CreateEnv env_id -> 281 286 let obj = Js.Unsafe.obj [| 282 287 ("type", Js.Unsafe.inject (Js.string "create_env")); 283 288 ("env_id", Js.Unsafe.inject (Js.string env_id)); 284 289 |] in 285 285 - Js.to_string (Json.output obj) 290 290 + Js.to_string (plain_stringify obj) 286 291 | `DestroyEnv env_id -> 287 292 let obj = Js.Unsafe.obj [| 288 293 ("type", Js.Unsafe.inject (Js.string "destroy_env")); 289 294 ("env_id", Js.Unsafe.inject (Js.string env_id)); 290 295 |] in 291 291 - Js.to_string (Json.output obj) 296 296 + Js.to_string (plain_stringify obj) 292 297 in 293 298 Brr_worker.post t.worker (Js.string json) 294 299

+11 -2

idl/message.ml

··· 95 95 96 96 (** {1 JSON helpers} *) 97 97 98 98 + (** Use plain JSON.stringify/JSON.parse instead of jsoo's Json.output/Json.unsafe_input. 99 99 + The jsoo versions use bytestring revivers that are incompatible across different 100 100 + jsoo versions (e.g., 6.0.1+ox vs 6.2.0). Since all values in our message objects 101 101 + are already proper JS values (created via Js.string, Js.Unsafe.inject, etc.), 102 102 + plain JSON works correctly and is cross-version compatible. *) 103 103 + let json_global : 'a Js.t = Js.Unsafe.pure_js_expr "JSON" 104 104 + let plain_stringify obj = json_global##stringify obj 105 105 + let plain_parse (s : Js.js_string Js.t) = json_global##parse s 106 106 + 98 107 let json_of_obj pairs = 99 108 Js.Unsafe.obj (Array.of_list (List.map (fun (k, v) -> (k, Js.Unsafe.inject v)) pairs)) 100 109 ··· 244 253 ("env_id", json_string env_id); 245 254 ] 246 255 in 247 247 - Js.to_string (Json.output obj) 256 256 + Js.to_string (plain_stringify obj) 248 257 249 258 (** {1 Client message parsing} *) 250 259 ··· 256 265 } 257 266 258 267 let client_msg_of_string s = 259 259 - let obj = Json.unsafe_input (Js.string s) in 268 268 + let obj = plain_parse (Js.string s) in 260 269 let typ = get_string obj "type" in 261 270 match typ with 262 271 | "init" ->

+12 -59

lib/dune

··· 1 1 - ; Worker library -- upstream OCaml 1 1 + ; Generate impl.ml from impl.cppo.ml with conditional OXCAML flag 2 2 3 3 - (library 4 4 - (public_name js_top_worker) 3 3 + (rule 4 4 + (targets impl.ml) 5 5 + (deps (:x impl.cppo.ml)) 5 6 (enabled_if (not %{ocaml-config:ox})) 6 6 - (modules toplexer ocamltop impl environment) 7 7 - (libraries 8 8 - logs 9 9 - lwt 10 10 - js_of_ocaml-compiler 11 11 - js_of_ocaml-ppx 12 12 - astring 13 13 - mime_printer 14 14 - compiler-libs.common 15 15 - compiler-libs.toplevel 16 16 - merlin-lib.kernel 17 17 - merlin-lib.utils 18 18 - merlin-lib.query_protocol 19 19 - merlin-lib.query_commands 20 20 - merlin-lib.ocaml_parsing 21 21 - ppxlib 22 22 - ppx_deriving.api) 23 23 - (js_of_ocaml 24 24 - (javascript_files stubs.js)) 25 25 - (preprocess 26 26 - (per_module 27 27 - ((action 28 28 - (run %{bin:cppo} -V OCAML:%{ocaml_version} %{input-file})) 29 29 - impl)))) 7 7 + (action (run %{bin:cppo} -V OCAML:%{ocaml_version} %{x} -o %{targets}))) 30 8 31 31 - ; Worker library -- OxCaml 9 9 + (rule 10 10 + (targets impl.ml) 11 11 + (deps (:x impl.cppo.ml)) 12 12 + (enabled_if %{ocaml-config:ox}) 13 13 + (action (run %{bin:cppo} -V OCAML:%{ocaml_version} -D OXCAML %{x} -o %{targets}))) 32 14 33 15 (library 34 16 (public_name js_top_worker) 35 35 - (enabled_if %{ocaml-config:ox}) 36 17 (modules toplexer ocamltop impl environment) 37 18 (libraries 38 19 logs ··· 51 32 ppxlib 52 33 ppx_deriving.api) 53 34 (js_of_ocaml 54 54 - (javascript_files stubs.js)) 55 55 - (preprocess 56 56 - (per_module 57 57 - ((action 58 58 - (run %{bin:cppo} -V OCAML:%{ocaml_version} -D "OXCAML" %{input-file})) 59 59 - impl)))) 35 35 + (javascript_files stubs.js))) 60 36 61 37 (ocamllex toplexer) 62 38 63 63 - ; Web worker library -- upstream OCaml 39 39 + ; Web worker library (no OxCaml differences) 64 40 65 41 (library 66 42 (public_name js_top_worker-web) 67 43 (name js_top_worker_web) 68 68 - (enabled_if (not %{ocaml-config:ox})) 69 69 - (modules worker findlibish jslib) 70 70 - (preprocess 71 71 - (pps js_of_ocaml-ppx)) 72 72 - (libraries 73 73 - js_top_worker 74 74 - js_top_worker-rpc.message 75 75 - js_of_ocaml-ppx 76 76 - js_of_ocaml-toplevel 77 77 - js_of_ocaml-lwt 78 78 - logs.browser 79 79 - uri 80 80 - angstrom 81 81 - findlib 82 82 - fpath 83 83 - yojson)) 84 84 - 85 85 - ; Web worker library -- OxCaml 86 86 - 87 87 - (library 88 88 - (public_name js_top_worker-web) 89 89 - (name js_top_worker_web) 90 90 - (enabled_if %{ocaml-config:ox}) 91 44 (modules worker findlibish jslib) 92 45 (preprocess 93 46 (pps js_of_ocaml-ppx))

+27 -2

lib/findlibish.ml

··· 258 258 in 259 259 (* Load META files from this universe *) 260 260 let* local_libs = Lwt_list.filter_map_p (load_meta async_get) resolved_metas in 261 261 - (* Resolve universe paths from root (they're already full paths) *) 261 261 + (* Resolve universe paths relative to this findlib_index's directory. 262 262 + Universe paths can be relative (e.g., "../stdlib") or absolute from 263 263 + root (e.g., "packages/stdlib"). Relative paths are the common case 264 264 + from opam-all; absolute paths are kept for backward compatibility. *) 262 265 let universe_index_urls = 263 266 List.map (fun u -> 264 264 - resolve_from_root ~base:index_url (Filename.concat u "findlib_index.json")) 267 267 + let index_path = Filename.concat u "findlib_index.json" in 268 268 + if String.length u > 0 && u.[0] = '.' then 269 269 + (* Relative path (e.g., "../stdlib") — resolve from this index's dir *) 270 270 + resolve_relative_to_dir ~base:index_url index_path 271 271 + else 272 272 + (* Absolute-from-root path — legacy behavior *) 273 273 + resolve_from_root ~base:index_url index_path) 265 274 universes 266 275 in 267 276 let* universe_libs = Lwt_list.map_p load_universe universe_index_urls in ··· 328 337 dcss) 329 338 in 330 339 List.fold_left require [] packages 340 340 + 341 341 + let find_dcs_url v package_name = 342 342 + match List.find_opt (fun lib -> lib.name = package_name) v with 343 343 + | None -> None 344 344 + | Some lib -> 345 345 + let path = Fpath.(v (Uri.path lib.meta_uri) |> parent) in 346 346 + let dir = 347 347 + match lib.dir with 348 348 + | None -> path 349 349 + | Some "+" -> Fpath.parent path 350 350 + | Some d when String.length d > 0 && d.[0] = '^' -> 351 351 + Fpath.parent path 352 352 + | Some d -> Fpath.(path // v d) 353 353 + in 354 354 + let dcs = Fpath.(dir / dcs_filename |> to_string) in 355 355 + Some (Uri.with_path lib.meta_uri dcs |> Uri.to_string)

+34

lib/findlibish.mli

··· 1 1 + (** Lightweight findlib for the browser. 2 2 + 3 3 + Parses META files fetched over HTTP and manages package loading 4 4 + for the js_of_ocaml toplevel worker. *) 5 5 + 6 6 + (** Opaque type representing a loaded set of findlib libraries. *) 7 7 + type t 8 8 + 9 9 + (** Initialize findlib by fetching and parsing a findlib_index file. 10 10 + Follows universe links to transitively load all META files. *) 11 11 + val init : 12 12 + (string -> (string, [ `Msg of string ]) result Lwt.t) -> 13 13 + string -> 14 14 + t Lwt.t 15 15 + 16 16 + (** Fetch dynamic CMI information from the given URL. *) 17 17 + val fetch_dynamic_cmis : 18 18 + (string -> string option) -> 19 19 + string -> 20 20 + (Js_top_worker_rpc.Toplevel_api_gen.dynamic_cmis, [ `Msg of string ]) result 21 21 + 22 22 + (** Load the named packages and their transitive dependencies. 23 23 + Returns the dynamic CMI descriptors for all newly loaded packages. *) 24 24 + val require : 25 25 + import_scripts:(string list -> unit) -> 26 26 + (string -> string option) -> 27 27 + bool -> 28 28 + t -> 29 29 + string list -> 30 30 + Js_top_worker_rpc.Toplevel_api_gen.dynamic_cmis list 31 31 + 32 32 + (** Find the dynamic_cmis.json URL for a named package. 33 33 + Returns [None] if the package is not in the library list. *) 34 34 + val find_dcs_url : t -> string -> string option

+38 -8

lib/impl.ml lib/impl.cppo.ml

··· 274 274 val import_scripts : string list -> unit 275 275 val init_function : string -> unit -> unit 276 276 val get_stdlib_dcs : string -> dynamic_cmis list 277 277 + val find_stdlib_dcs : findlib_t -> dynamic_cmis list 277 278 val findlib_init : string -> findlib_t Lwt.t 278 279 val path : string 279 280 ··· 422 423 let info = { Toploop.section = "Findlib"; doc = "Load a package (js_top_worker)" } in 423 424 Toploop.add_directive "require" (Toploop.Directive_string require_handler) info 424 425 426 426 + (* Merlin-lib's Load_path.reset asserts Ocaml_utils.Local_store.is_bound(). 427 427 + This is a DIFFERENT Local_store from compiler-libs' Local_store — they 428 428 + have separate mutable state. We must bind the merlin-lib one. *) 429 429 + let the_store = lazy (Ocaml_utils.Local_store.fresh ()) 430 430 + 425 431 let setup functions () = 426 432 let stdout_buff = Buffer.create 100 in 427 433 let stderr_buff = Buffer.create 100 in ··· 442 448 match !path with Some p -> p | None -> failwith "Path not set" 443 449 in 444 450 451 451 + (* Bind the local store around the entire setup so that 452 452 + merlin-lib's Load_path assertions (is_bound) are satisfied. 453 453 + All Load_path operations (dir_directory, initialize_toplevel_env, 454 454 + exec' "open Stdlib", etc.) need the store bound. *) 455 455 + let store = Lazy.force the_store in 456 456 + Ocaml_utils.Local_store.with_store store (fun () -> 445 457 Topdirs.dir_directory path; 446 458 447 459 Toploop.initialize_toplevel_env (); ··· 453 465 exec' "#enable \"pretty\";;"; 454 466 exec' "#disable \"shortvar\";;"; 455 467 Sys.interactive := true; 456 456 - Logs.info (fun m -> m "Setup complete"); 468 468 + Logs.info (fun m -> m "Setup complete")); 457 469 { 458 470 stdout = Buffer.contents stdout_buff; 459 471 stderr = Buffer.contents stderr_buff; ··· 508 520 if l >= 2 && String.sub phrase (l - 2) 2 = ";;" then phrase 509 521 else phrase ^ ";;" 510 522 in 523 523 + (* Bind the merlin-lib local store so Toploop.execute_phrase can access 524 524 + Load_path without hitting merlin-lib assertions. *) 525 525 + let store = Lazy.force the_store in 511 526 let o, () = 527 527 + Ocaml_utils.Local_store.with_store store (fun () -> 512 528 Environment.with_env env (fun () -> 513 529 S.capture 514 530 (fun () -> ··· 527 543 done 528 544 with End_of_file -> ()); 529 545 flush_all ()) 530 530 - ()) 546 546 + ())) 531 547 in 532 548 let mime_vals = Mime_printer.get () in 533 549 Format.pp_print_flush pp_code (); ··· 572 588 if l >= 2 && String.sub phrase (l - 2) 2 = ";;" then phrase 573 589 else phrase ^ ";;" 574 590 in 591 591 + (* Bind the merlin-lib local store so Toploop.execute_phrase can access 592 592 + Load_path without hitting merlin-lib assertions. *) 593 593 + let store = Lazy.force the_store in 575 594 let o, () = 595 595 + Ocaml_utils.Local_store.with_store store (fun () -> 576 596 Environment.with_env env (fun () -> 577 597 S.capture 578 598 (fun () -> ··· 607 627 done 608 628 with End_of_file -> ()); 609 629 flush_all ()) 610 610 - ()) 630 630 + ())) 611 631 in 612 632 (* Get any remaining mime_vals (shouldn't be any after last callback) *) 613 633 let mime_vals = Mime_printer.get () in ··· 760 780 path := Some S.path; 761 781 762 782 let findlib_path = Option.value ~default:"findlib_index.json" init_libs.findlib_index in 763 763 - findlib_v := Some (S.findlib_init findlib_path); 783 783 + let findlib_promise = S.findlib_init findlib_path in 784 784 + findlib_v := Some findlib_promise; 764 785 765 786 let stdlib_dcs = 766 787 match init_libs.stdlib_dcs with ··· 770 791 let* () = 771 792 match S.get_stdlib_dcs stdlib_dcs with 772 793 | [ dcs ] -> add_dynamic_cmis dcs 773 773 - | _ -> Lwt.return () 794 794 + | _ -> 795 795 + (* stdlib_dcs not found at expected path (e.g. multiverse layout). 796 796 + Await findlib resolution to discover stdlib via universe links. *) 797 797 + Logs.info (fun m -> m "stdlib_dcs not found at %s, trying findlib discovery" stdlib_dcs); 798 798 + let* v = findlib_promise in 799 799 + (match S.find_stdlib_dcs v with 800 800 + | [ dcs ] -> add_dynamic_cmis dcs 801 801 + | _ -> 802 802 + Logs.info (fun m -> m "stdlib not found in findlib either"); 803 803 + Lwt.return ()) 774 804 in 775 805 #if defined OXCAML 776 806 Language_extension.(set_universe_and_enable_all Universe.Beta); ··· 1135 1165 let unit_info = Unit_info.make ~source_file:filename Impl prefix in 1136 1166 #endif 1137 1167 try 1138 1138 - let store = Local_store.fresh () in 1139 1139 - Local_store.with_store store (fun () -> 1140 1140 - Local_store.reset (); 1168 1168 + let store = Ocaml_utils.Local_store.fresh () in 1169 1169 + Ocaml_utils.Local_store.with_store store (fun () -> 1170 1170 + Ocaml_utils.Local_store.reset (); 1141 1171 let env = 1142 1172 Typemod.initial_env ~loc ~initially_opened_module:(Some "Stdlib") 1143 1173 ~open_implicit_modules:dep_modules

+6

lib/jslib.ml

··· 11 11 in 12 12 Option.map Js.to_string x 13 13 in 14 14 + let has_scheme = 15 15 + let len = String.length url in 16 16 + (len >= 7 && String.sub url 0 7 = "http://") || 17 17 + (len >= 8 && String.sub url 0 8 = "https://") 18 18 + in 14 19 match global_rel_url with 20 20 + | _ when has_scheme -> url 15 21 | Some rel -> 16 22 (* If url starts with /, it's relative to server root - just use the scheme/host *) 17 23 if String.length url > 0 && url.[0] = '/' then

+26

lib/worker.ml

··· 57 57 let get_stdlib_dcs uri = 58 58 Findlibish.fetch_dynamic_cmis sync_get uri |> Result.to_list 59 59 60 60 + let find_stdlib_dcs v = 61 61 + (* Try "stdlib" first (standard META name), fall back to "ocaml" *) 62 62 + let pkg = match Findlibish.find_dcs_url v "stdlib" with 63 63 + | Some _ as r -> r 64 64 + | None -> Findlibish.find_dcs_url v "ocaml" 65 65 + in 66 66 + match pkg with 67 67 + | Some url -> 68 68 + Jslib.log "Found stdlib dcs via findlib: %s" url; 69 69 + (match Findlibish.fetch_dynamic_cmis sync_get url with 70 70 + | Ok dcs -> 71 71 + (* The dcs_url in the JSON is relative to the package dir. 72 72 + Rewrite it to be absolute using the dynamic_cmis.json URL 73 73 + parent directory. *) 74 74 + let abs_dcs_url = 75 75 + match String.rindex_opt url '/' with 76 76 + | Some i -> String.sub url 0 (i + 1) 77 77 + | None -> url 78 78 + in 79 79 + Jslib.log "Rewriting dcs_url from %s to %s" dcs.Js_top_worker_rpc.Toplevel_api_gen.dcs_url abs_dcs_url; 80 80 + [{ dcs with Js_top_worker_rpc.Toplevel_api_gen.dcs_url = abs_dcs_url }] 81 81 + | Error _ -> []) 82 82 + | None -> 83 83 + Jslib.log "stdlib not found in findlib (tried 'stdlib' and 'ocaml')"; 84 84 + [] 85 85 + 60 86 let import_scripts urls = 61 87 (* Map relative URLs to absolute using the global base URL *) 62 88 let absolute_urls = List.map Jslib.map_url urls in

+1

test/browser/test_worker.ml

··· 26 26 let async_get _ = Lwt.return (Error (`Msg "Not implemented")) 27 27 let create_file = Js_of_ocaml.Sys_js.create_file 28 28 let get_stdlib_dcs _ = [] 29 29 + let find_stdlib_dcs _ = [] 29 30 let import_scripts _ = () 30 31 let findlib_init _ = Lwt.return () 31 32 let require _ () _ = []

+11

test/node/node_dependency_test.ml

··· 73 73 Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get uri 74 74 |> Result.to_list 75 75 76 76 + let find_stdlib_dcs v = 77 77 + let pkg = match Js_top_worker_web.Findlibish.find_dcs_url v "stdlib" with 78 78 + | Some _ as r -> r 79 79 + | None -> Js_top_worker_web.Findlibish.find_dcs_url v "ocaml" 80 80 + in 81 81 + match pkg with 82 82 + | Some url -> 83 83 + Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get url 84 84 + |> Result.to_list 85 85 + | None -> [] 86 86 + 76 87 let require b v = function 77 88 | [] -> [] 78 89 | packages ->

+11

test/node/node_directive_test.ml

··· 88 88 Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get uri 89 89 |> Result.to_list 90 90 91 91 + let find_stdlib_dcs v = 92 92 + let pkg = match Js_top_worker_web.Findlibish.find_dcs_url v "stdlib" with 93 93 + | Some _ as r -> r 94 94 + | None -> Js_top_worker_web.Findlibish.find_dcs_url v "ocaml" 95 95 + in 96 96 + match pkg with 97 97 + | Some url -> 98 98 + Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get url 99 99 + |> Result.to_list 100 100 + | None -> [] 101 101 + 91 102 let require b v = function 92 103 | [] -> [] 93 104 | packages ->

+11

test/node/node_env_test.ml

··· 73 73 Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get uri 74 74 |> Result.to_list 75 75 76 76 + let find_stdlib_dcs v = 77 77 + let pkg = match Js_top_worker_web.Findlibish.find_dcs_url v "stdlib" with 78 78 + | Some _ as r -> r 79 79 + | None -> Js_top_worker_web.Findlibish.find_dcs_url v "ocaml" 80 80 + in 81 81 + match pkg with 82 82 + | Some url -> 83 83 + Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get url 84 84 + |> Result.to_list 85 85 + | None -> [] 86 86 + 76 87 let require b v = function 77 88 | [] -> [] 78 89 | packages ->

+11

test/node/node_incremental_test.ml

··· 64 64 Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get uri 65 65 |> Result.to_list 66 66 67 67 + let find_stdlib_dcs v = 68 68 + let pkg = match Js_top_worker_web.Findlibish.find_dcs_url v "stdlib" with 69 69 + | Some _ as r -> r 70 70 + | None -> Js_top_worker_web.Findlibish.find_dcs_url v "ocaml" 71 71 + in 72 72 + match pkg with 73 73 + | Some url -> 74 74 + Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get url 75 75 + |> Result.to_list 76 76 + | None -> [] 77 77 + 67 78 let require b v = function 68 79 | [] -> [] 69 80 | packages -> Js_top_worker_web.Findlibish.require ~import_scripts sync_get b v packages

+11

test/node/node_mime_test.ml

··· 75 75 Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get uri 76 76 |> Result.to_list 77 77 78 78 + let find_stdlib_dcs v = 79 79 + let pkg = match Js_top_worker_web.Findlibish.find_dcs_url v "stdlib" with 80 80 + | Some _ as r -> r 81 81 + | None -> Js_top_worker_web.Findlibish.find_dcs_url v "ocaml" 82 82 + in 83 83 + match pkg with 84 84 + | Some url -> 85 85 + Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get url 86 86 + |> Result.to_list 87 87 + | None -> [] 88 88 + 78 89 let require b v = function 79 90 | [] -> [] 80 91 | packages ->

+11

test/node/node_ppx_test.ml

··· 76 76 Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get uri 77 77 |> Result.to_list 78 78 79 79 + let find_stdlib_dcs v = 80 80 + let pkg = match Js_top_worker_web.Findlibish.find_dcs_url v "stdlib" with 81 81 + | Some _ as r -> r 82 82 + | None -> Js_top_worker_web.Findlibish.find_dcs_url v "ocaml" 83 83 + in 84 84 + match pkg with 85 85 + | Some url -> 86 86 + Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get url 87 87 + |> Result.to_list 88 88 + | None -> [] 89 89 + 79 90 let require b v = function 80 91 | [] -> [] 81 92 | packages -> Js_top_worker_web.Findlibish.require ~import_scripts sync_get b v packages

+11

test/node/node_test.ml

··· 65 65 Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get uri 66 66 |> Result.to_list 67 67 68 68 + let find_stdlib_dcs v = 69 69 + let pkg = match Js_top_worker_web.Findlibish.find_dcs_url v "stdlib" with 70 70 + | Some _ as r -> r 71 71 + | None -> Js_top_worker_web.Findlibish.find_dcs_url v "ocaml" 72 72 + in 73 73 + match pkg with 74 74 + | Some url -> 75 75 + Js_top_worker_web.Findlibish.fetch_dynamic_cmis sync_get url 76 76 + |> Result.to_list 77 77 + | None -> [] 78 78 + 68 79 let require b v = function 69 80 | [] -> [] 70 81 | packages -> Js_top_worker_web.Findlibish.require ~import_scripts sync_get b v packages

+1

test/unix/unix_test.ml

··· 73 73 let init_function _ () = failwith "Not implemented" 74 74 let findlib_init _ = Lwt.return () 75 75 let get_stdlib_dcs _uri = [] 76 76 + let find_stdlib_dcs _ = [] 76 77 77 78 let require _ () packages = 78 79 try