get module_system from Js_packages_info

Author: mununki

jscomp/core/lam_compile_primitive.ml

@@ -106,12 +106,22 @@ let translate ?output_prefix loc (cxt : Lam_compile_context.t)
                     (* TODO: graceful error message here *)
                   in
 
+                  let packages_info = Js_packages_state.get_packages_info () in
+
+                  let module_system = ref None in
+                  let _ =
+                    Js_packages_info.iter packages_info
+                      (fun { module_system = ms } -> module_system := Some ms)
+                  in
+
                   let path =
-                    Js_name_of_module_id.string_of_module_id module_id
-                      ~output_dir
-                      (* TODO: where is Js_package_info.module_system ? *)
-                      Js_packages_info.NodeJS
+                    match !module_system with
+                    | Some module_system ->
+                        Js_name_of_module_id.string_of_module_id module_id
+                          ~output_dir module_system
+                    | _ -> assert false
                   in
+
                   let arg_of_callback_fn = Ident.create "m" in
                   match value with
                   | Some value ->

lib/4.06.1/unstable/js_compiler.ml

@@ -96718,12 +96718,22 @@ let translate ?output_prefix loc (cxt : Lam_compile_context.t)
                     (* TODO: graceful error message here *)
                   in
 
+                  let packages_info = Js_packages_state.get_packages_info () in
+
+                  let module_system = ref None in
+                  let _ =
+                    Js_packages_info.iter packages_info
+                      (fun { module_system = ms } -> module_system := Some ms)
+                  in
+
                   let path =
-                    Js_name_of_module_id.string_of_module_id module_id
-                      ~output_dir
-                      (* TODO: where is Js_package_info.module_system ? *)
-                      Js_packages_info.NodeJS
+                    match !module_system with
+                    | Some module_system ->
+                        Js_name_of_module_id.string_of_module_id module_id
+                          ~output_dir module_system
+                    | _ -> assert false
                   in
+
                   let arg_of_callback_fn = Ident.create "m" in
                   match value with
                   | Some value ->

lib/4.06.1/unstable/js_playground_compiler.ml

@@ -96718,12 +96718,22 @@ let translate ?output_prefix loc (cxt : Lam_compile_context.t)
                     (* TODO: graceful error message here *)
                   in
 
+                  let packages_info = Js_packages_state.get_packages_info () in
+
+                  let module_system = ref None in
+                  let _ =
+                    Js_packages_info.iter packages_info
+                      (fun { module_system = ms } -> module_system := Some ms)
+                  in
+
                   let path =
-                    Js_name_of_module_id.string_of_module_id module_id
-                      ~output_dir
-                      (* TODO: where is Js_package_info.module_system ? *)
-                      Js_packages_info.NodeJS
+                    match !module_system with
+                    | Some module_system ->
+                        Js_name_of_module_id.string_of_module_id module_id
+                          ~output_dir module_system
+                    | _ -> assert false
                   in
+
                   let arg_of_callback_fn = Ident.create "m" in
                   match value with
                   | Some value ->

lib/4.06.1/whole_compiler.ml

@@ -265912,12 +265912,22 @@ let translate ?output_prefix loc (cxt : Lam_compile_context.t)
                     (* TODO: graceful error message here *)
                   in
 
+                  let packages_info = Js_packages_state.get_packages_info () in
+
+                  let module_system = ref None in
+                  let _ =
+                    Js_packages_info.iter packages_info
+                      (fun { module_system = ms } -> module_system := Some ms)
+                  in
+
                   let path =
-                    Js_name_of_module_id.string_of_module_id module_id
-                      ~output_dir
-                      (* TODO: where is Js_package_info.module_system ? *)
-                      Js_packages_info.NodeJS
+                    match !module_system with
+                    | Some module_system ->
+                        Js_name_of_module_id.string_of_module_id module_id
+                          ~output_dir module_system
+                    | _ -> assert false
                   in
+
                   let arg_of_callback_fn = Ident.create "m" in
                   match value with
                   | Some value ->