print module path

Author: mununki

jscomp/core/lam_compile.ml

@@ -55,7 +55,8 @@ let rec apply_with_arity_aux (fn : J.expression) (arity : int list)
           let params =
             Ext_list.init (x - len) (fun _ -> Ext_ident.create "param")
           in
-          E.ocaml_fun params ~return_unit:false (* unknown info *) ~async:false
+          E.ocaml_fun params ~return_unit:false (* unknown info *)
+            ~async:false
             [
               S.return_stmt
                 (E.call
@@ -320,7 +321,9 @@ and compile_recursive_let ~all_bindings (cxt : Lam_compile_context.t)
             ]
         else
           (* TODO:  save computation of length several times *)
-          E.ocaml_fun params (Js_output.output_as_block output) ~return_unit ~async
+          E.ocaml_fun params
+            (Js_output.output_as_block output)
+            ~return_unit ~async
       in
       ( Js_output.output_of_expression
           (Declare (Alias, id))
@@ -398,7 +401,8 @@ and compile_recursive_let ~all_bindings (cxt : Lam_compile_context.t)
                  [
                    S.exp
                      (E.runtime_call Js_runtime_modules.obj_runtime
-                        "update_dummy" [ E.var id; v ]);
+                        "update_dummy"
+                        [ E.var id; v ]);
                  ]),
             [ S.define_variable ~kind:Variable id (E.dummy_obj tag_info) ] )
       | _ -> assert false)
@@ -1366,7 +1370,7 @@ and compile_apply (appinfo : Lam.apply) (lambda_cxt : Lam_compile_context.t) =
                ~info:(call_info_of_ap_status appinfo.ap_info.ap_status)
                fn_code args))
 
-and compile_prim (prim_info : Lam.prim_info)
+and compile_prim ?output_prefix (prim_info : Lam.prim_info)
     (lambda_cxt : Lam_compile_context.t) =
   match prim_info with
   | { primitive = Pfield (_, fld_info); args = [ Lglobal_module id ]; _ } -> (
@@ -1534,13 +1538,14 @@ and compile_prim (prim_info : Lam.prim_info)
       let args_code : J.block = List.concat args_block in
       let exp =
         (* TODO: all can be done in [compile_primitive] *)
-        Lam_compile_primitive.translate loc lambda_cxt primitive args_expr
+        Lam_compile_primitive.translate ?output_prefix loc lambda_cxt primitive
+          args_expr
       in
       Js_output.output_of_block_and_expression lambda_cxt.continuation args_code
         exp
 
-and compile_lambda (lambda_cxt : Lam_compile_context.t) (cur_lam : Lam.t) :
-    Js_output.t =
+and compile_lambda ?output_prefix (lambda_cxt : Lam_compile_context.t)
+    (cur_lam : Lam.t) : Js_output.t =
   match cur_lam with
   | Lfunction { params; body; attr = { return_unit; async } } ->
       Js_output.output_of_expression lambda_cxt.continuation
@@ -1598,7 +1603,7 @@ and compile_lambda (lambda_cxt : Lam_compile_context.t) (cur_lam : Lam.t) :
       *)
       Js_output.output_of_block_and_expression lambda_cxt.continuation []
         (E.ml_module_as_var i)
-  | Lprim prim_info -> compile_prim prim_info lambda_cxt
+  | Lprim prim_info -> compile_prim ?output_prefix prim_info lambda_cxt
   | Lsequence (l1, l2) ->
       let output_l1 =
         compile_lambda { lambda_cxt with continuation = EffectCall Not_tail } l1

jscomp/core/lam_compile.mli

@@ -27,4 +27,5 @@
 val compile_recursive_lets :
   Lam_compile_context.t -> (Ident.t * Lam.t) list -> Js_output.t
 
-val compile_lambda : Lam_compile_context.t -> Lam.t -> Js_output.t
+val compile_lambda :
+  ?output_prefix:string -> Lam_compile_context.t -> Lam.t -> Js_output.t

jscomp/core/lam_compile_main.ml

@@ -34,7 +34,7 @@
 (* module S = Js_stmt_make   *)
 
 
-let compile_group (meta : Lam_stats.t) 
+let compile_group ~output_prefix (meta : Lam_stats.t) 
     (x : Lam_group.t) : Js_output.t  = 
   match x with 
   (* 
@@ -61,7 +61,7 @@ let compile_group (meta : Lam_stats.t)
     (* let lam = Optimizer.simplify_lets [] lam in  *)
     (* can not apply again, it's wrong USE it with care*)
     (* ([Js_stmt_make.comment (Gen_of_env.query_type id  env )], None)  ++ *)
-    Lam_compile.compile_lambda { continuation = Declare (kind, id);
+    Lam_compile.compile_lambda ~output_prefix { continuation = Declare (kind, id);
                                  jmp_table = Lam_compile_context.empty_handler_map;
                                  meta
                                } lam
@@ -74,7 +74,7 @@ let compile_group (meta : Lam_stats.t)
       } 
       id_lams
   | Nop lam -> (* TODO: Side effect callls, log and see statistics *)
-    Lam_compile.compile_lambda {continuation = EffectCall Not_tail;
+    Lam_compile.compile_lambda ~output_prefix {continuation = EffectCall Not_tail;
                                 jmp_table = Lam_compile_context.empty_handler_map;
                                 meta
                                } lam
@@ -231,7 +231,7 @@ let maybe_pure = no_side_effects groups in
 let () = Ext_log.dwarn ~__POS__ "\n@[[TIME:]Pre-compile: %f@]@."  (Sys.time () *. 1000.) in      
 # 224 "core/lam_compile_main.pp.ml"
 let body  =     
-  Ext_list.map groups (fun group -> compile_group meta group)
+  Ext_list.map groups (fun group -> compile_group ~output_prefix meta group)
   |> Js_output.concat
   |> Js_output.output_as_block
 in

jscomp/core/lam_compile_primitive.ml

@@ -36,8 +36,8 @@ let ensure_value_unit (st : Lam_compile_context.continuation) e : E.t =
   | EffectCall Not_tail -> e
 (* NeedValue should return a meaningful expression*)
 
-let translate loc (cxt : Lam_compile_context.t) (prim : Lam_primitive.t)
-    (args : J.expression list) : J.expression =
+let translate ?output_prefix loc (cxt : Lam_compile_context.t)
+    (prim : Lam_primitive.t) (args : J.expression list) : J.expression =
   match prim with
   | Pis_not_none -> Js_of_lam_option.is_not_none (Ext_list.singleton_exn args)
   | Pcreate_extension s -> E.make_exception s
@@ -82,9 +82,20 @@ let translate loc (cxt : Lam_compile_context.t) (prim : Lam_primitive.t)
       match args with
       | [ e ] -> (
           match e.expression_desc with
-          | _ ->
-              let d = Js_dump.string_of_expression e in
-              E.str ("TODO:import " ^ d) )
+          | _ -> (
+              match output_prefix with
+              | Some output_prefix ->
+                  let output_dir = Filename.dirname output_prefix in
+                  let d = Js_dump.string_of_expression e in
+                  let id = Ident.create d in
+                  let path =
+                    Js_name_of_module_id.string_of_module_id
+                      (Lam_module_ident.of_ml id)
+                      ~output_dir Js_packages_info.Es6
+                  in
+                  print_endline path;
+                  E.str ("TODO:import " ^ d)
+              | None -> assert false))
       | _ -> assert false)
   | Pjs_function_length -> E.function_length (Ext_list.singleton_exn args)
   | Pcaml_obj_length -> E.obj_length (Ext_list.singleton_exn args)

jscomp/core/lam_compile_primitive.mli

@@ -29,6 +29,7 @@
 *)
 
 val translate :
+  ?output_prefix:string ->
   Location.t ->
   Lam_compile_context.t ->
   Lam_primitive.t ->