clean logic in js_program_loader

Author: bobzhang

jscomp/all.depend

@@ -334,7 +334,7 @@ core/lam_pass_alpha_conversion.cmi : core/lam_stats.cmi core/lam.cmi
 core/lam_pass_collect.cmi : core/lam_stats.cmi core/lam.cmi \
     ext/ident_set.cmi
 core/js_program_loader.cmi : core/lam_module_ident.cmi \
-    core/js_packages_info.cmi core/j.cmx
+    core/js_packages_info.cmi
 core/js_dump.cmi : core/js_packages_info.cmi core/j.cmx ext/ext_pp.cmi
 core/js_pass_debug.cmi : core/j.cmx
 core/js_of_lam_option.cmi : core/j.cmx
@@ -513,9 +513,9 @@ core/lam_pass_collect.cmx : core/lam_util.cmx core/lam_stats_util.cmx \
     ext/ident_hashtbl.cmx core/lam_pass_collect.cmi
 core/js_program_loader.cmx : core/lam_module_ident.cmx \
     core/lam_compile_env.cmx core/js_stmt_make.cmx core/js_packages_state.cmx \
-    core/js_packages_info.cmx core/js_exp_make.cmx core/j.cmx \
-    ext/ident_set.cmx ext/ext_sys.cmx ext/ext_string.cmx ext/ext_filename.cmx \
-    core/config_util.cmx depends/bs_exception.cmx core/js_program_loader.cmi
+    core/js_packages_info.cmx core/js_exp_make.cmx ext/ext_sys.cmx \
+    ext/ext_string.cmx ext/ext_filename.cmx core/config_util.cmx \
+    depends/bs_exception.cmx core/js_program_loader.cmi
 core/js_dump.cmx : ext/literals.cmx core/lam_module_ident.cmx \
     core/js_stmt_make.cmx core/js_runtime_modules.cmx \
     core/js_program_loader.cmx core/js_packages_state.cmx \
@@ -612,7 +612,7 @@ core/lam_compile_group.cmx : ext/literals.cmx core/lam_util.cmx \
     core/lam_module_ident.cmx core/lam_group.cmx core/lam_compile_env.cmx \
     core/lam_compile_defs.cmx core/lam_compile.cmx core/lam_coercion.cmx \
     core/lam_analysis.cmx core/lam.cmx core/js_stmt_make.cmx \
-    core/js_shake.cmx core/js_runtime_modules.cmx core/js_program_loader.cmx \
+    core/js_shake.cmx core/js_runtime_modules.cmx \
     core/js_pass_tailcall_inline.cmx core/js_pass_scope.cmx \
     core/js_pass_flatten_and_mark_dead.cmx core/js_pass_flatten.cmx \
     core/js_pass_debug.cmx core/js_packages_state.cmx core/js_output.cmx \

jscomp/core/js_dump.ml

@@ -1793,7 +1793,7 @@ let goog_program ~output_prefix f goog_package (x : J.deps_program)  =
          (fun x -> 
             Lam_module_ident.id x,
             Js_program_loader.string_of_module_id
-              ~output_prefix Goog x)
+              ~hint_output_dir:(Filename.dirname output_prefix) Goog x)
          x.modules) 
   in
   program f cxt x.program  
@@ -1808,7 +1808,7 @@ let node_program ~output_prefix f ( x : J.deps_program) =
          (fun x -> 
             Lam_module_ident.id x,
             Js_program_loader.string_of_module_id
-              ~output_prefix
+              ~hint_output_dir:(Filename.dirname output_prefix)
               NodeJS x)
          x.modules)
   in
@@ -1824,7 +1824,9 @@ let amd_program ~output_prefix kind f (  x : J.deps_program) =
   P.string f (Printf.sprintf "%S" L.exports);
 
   List.iter (fun x ->
-      let s = Js_program_loader.string_of_module_id ~output_prefix kind x in
+      let s = 
+          Js_program_loader.string_of_module_id
+          ~hint_output_dir:(Filename.dirname output_prefix) kind x in
       P.string f L.comma ;
       P.space f; 
       pp_string f  s;
@@ -1862,7 +1864,7 @@ let es6_program  ~output_prefix fmt f (  x : J.deps_program) =
          (fun x -> 
             Lam_module_ident.id x,
             Js_program_loader.string_of_module_id
-              ~output_prefix
+              ~hint_output_dir:(Filename.dirname output_prefix)
               fmt x)
          x.modules)
   in

jscomp/core/js_packages_info.ml

@@ -126,15 +126,19 @@ let query_package_infos
 (* for a single pass compilation, [output_dir]
    can be cached
 *)
-let get_output_dir ~pkg_dir module_system output_prefix 
+let get_output_dir ~pkg_dir module_system 
+    ~hint_output_dir 
+    (* output_prefix   *)
     packages_info =
   match packages_info with
   | Empty | NonBrowser (_, [])->
-    if Filename.is_relative output_prefix then
+    if Filename.is_relative hint_output_dir then
       Filename.concat (Lazy.force Ext_filename.cwd )
-        (Filename.dirname output_prefix)
+        hint_output_dir
+        (* (Filename.dirname output_prefix) *)
     else
-      Filename.dirname output_prefix
+      hint_output_dir
+      (* Filename.dirname output_prefix *)
   | NonBrowser (_,  modules) ->
     begin match List.find (fun (k,_) -> 
         compatible k  module_system) modules with

jscomp/core/js_packages_info.mli

@@ -68,7 +68,7 @@ val query_package_infos :
 val get_output_dir:
   pkg_dir:string -> 
   module_system -> 
-  string -> 
+  hint_output_dir:string -> 
   t -> 
   string   
 

jscomp/core/js_program_loader.ml

@@ -68,18 +68,31 @@ module S = Js_stmt_make
 
 let (//) = Filename.concat 
 
-let string_of_module_id ~output_prefix
-    (module_system : Js_packages_info.module_system)
-    (x : Lam_module_ident.t) : string =
-#if BS_COMPILER_IN_BROWSER then   
+let string_of_module_id_in_browser (x : Lam_module_ident.t) =  
     match x.kind with
+    | External name -> name
     | Runtime | Ml -> 
       "stdlib" // String.uncapitalize x.id.name
-    | External name -> name
-#else
+    
+
 
+let string_of_module_id 
+    ~hint_output_dir
+    (module_system : Js_packages_info.module_system)
+    (x : Lam_module_ident.t) : string =
+#if BS_COMPILER_IN_BROWSER then   
+    string_of_module_id_in_browser x 
+#else
     let result = 
       match x.kind  with 
+      | External name -> name (* the literal string for external package *)
+        (** This may not be enough, 
+          1. For cross packages, we may need settle 
+            down a single js package
+          2. We may need es6 path for dead code elimination
+             But frankly, very few JS packages have no dependency, 
+             so having plugin may sound not that bad   
+        *)
       | Runtime  
       | Ml  -> 
         let id = x.id in
@@ -89,7 +102,7 @@ let string_of_module_id ~output_prefix
           let current_unit_dir =
             `Dir (Js_packages_info.get_output_dir 
                   ~pkg_dir:package_dir module_system 
-                  output_prefix 
+                  ~hint_output_dir
                   current_package_info
                   ) in
           Ext_filename.node_relative_path  different_package current_unit_dir dep 
@@ -142,7 +155,7 @@ let string_of_module_id ~output_prefix
                     (Js_packages_info.get_output_dir 
                       ~pkg_dir:(Lazy.force Ext_filename.package_dir)
                        module_system 
-                       output_prefix
+                       ~hint_output_dir
                        (Js_packages_state.get_packages_info()) 
                        )
                     ((Filename.dirname 
@@ -177,14 +190,7 @@ let string_of_module_id ~output_prefix
             end
 
         end
-      | External name -> name (* the literal string for external package *)
-        (** This may not be enough, 
-          1. For cross packages, we may need settle 
-            down a single js package
-          2. We may need es6 path for dead code elimination
-             But frankly, very few JS packages have no dependency, 
-             so having plugin may sound not that bad   
-        *)
+
       in 
     if Ext_sys.is_windows_or_cygwin then Ext_string.replace_backward_slash result 
     else result 
@@ -203,17 +209,3 @@ let string_of_module_id ~output_prefix
    FIXME: the module order matters?
 *)
 
-let make_program name  export_idents block : J.program = 
-
-  {
-    name;
-
-    exports = export_idents ; 
-    export_set = Ident_set.of_list export_idents;
-    block = block;
-
-  }
-let decorate_deps modules side_effect program : J.deps_program = 
-
-  { program ; modules ; side_effect }
-

jscomp/core/js_program_loader.mli

@@ -37,16 +37,15 @@
       this makes it easier to read code 
 *)
 
-val make_program : 
-  string -> 
-  Ident.t list -> J.block -> J.program
-
-val decorate_deps : 
-  J.required_modules ->
-  string option ->
-  J.program -> J.deps_program
 
+(**
+  generate the mdoule path so that it can be spliced here:
+  {[
+    var Xx = require("package/path/to/xx.js")
+  ]}
+  Note that it has to be consistent to how it is generated
+  *)
 val string_of_module_id :
-  output_prefix:string ->
+  hint_output_dir:string ->
   Js_packages_info.module_system ->
   Lam_module_ident.t -> string

jscomp/core/lam_compile_group.ml

@@ -315,9 +315,11 @@ let compile  ~filename output_prefix env _sigs
 #end    
   (* The file is not big at all compared with [cmo] *)
   (* Ext_marshal.to_file (Ext_filename.chop_extension filename ^ ".mj")  js; *)
-  let js = 
-    Js_program_loader.make_program filename meta.exports
-      body 
+  let js : J.program = 
+      { J.name = filename ; 
+        exports = meta.exports ; 
+        export_set = Ident_set.of_list meta.exports; 
+        block = body}
   in
   js 
   |> _j "initial"
@@ -332,11 +334,11 @@ let compile  ~filename output_prefix env _sigs
   |> (fun js -> ignore @@ Js_pass_scope.program  js ; js )
   |> Js_shake.shake_program
   |> _j "shake"
-  |> ( fun (js:  J.program) -> 
+  |> ( fun (program:  J.program) -> 
       let external_module_ids = 
         Lam_compile_env.get_required_modules  
           may_required_modules  
-          (Js_fold_basic.calculate_hard_dependencies js.block)
+          (Js_fold_basic.calculate_hard_dependencies program.block)
         |>
         (fun x ->
            if !Js_config.sort_imports then
@@ -359,7 +361,7 @@ let compile  ~filename output_prefix env _sigs
       (if not @@ !Clflags.dont_write_files then
          Js_cmj_format.to_file 
            (output_prefix ^ Literals.suffix_cmj) v);
-      Js_program_loader.decorate_deps external_module_ids v.effect js
+      {J.program = program ; side_effect = v.effect ; modules = external_module_ids }      
     )
 ;;