conslidate package path handling

Author: bobzhang

jscomp/Makefile

@@ -258,6 +258,7 @@ SYNTAX_CMXS=$(addprefix syntax/, $(addsuffix .cmx, $(SYNTAX_SRCS)))
 DEPENDS_SRCS= bs_exception ast_extract binary_ast 
 DEPENDS_CMXS=$(addprefix depends/, $(addsuffix .cmx, $(DEPENDS_SRCS)))
 CORE_SRCS= js_runtime_modules \
+	config_util \
 	js_packages_info\
 	js_packages_state\
 	type_int_to_string type_util  ocaml_stdlib_slots bs_conditional_initial ocaml_options ocaml_parse\
@@ -272,7 +273,6 @@ CORE_SRCS= js_runtime_modules \
 	lam_compile_util \
 	lam_id_kind \
 	lam_stats \
-	config_util \
 	lam_compile_defs \
 	js_map js_fold js_fold_basic js_pass_scope\
 	js_op_util js_analyzer js_shake js_exp_make js_long js_of_lam_exception js_of_lam_module js_of_lam_array js_of_lam_block js_of_lam_string\

jscomp/all.depend

@@ -263,7 +263,8 @@ depends/ast_extract.cmx : ext/string_map.cmx ext/string_hashtbl.cmx \
     depends/bs_exception.cmx depends/ast_extract.cmi
 depends/binary_ast.cmx : common/ml_binary.cmx depends/ast_extract.cmx \
     depends/binary_ast.cmi
-core/js_packages_info.cmi :
+core/config_util.cmi :
+core/js_packages_info.cmi : core/lam_module_ident.cmi
 core/js_packages_state.cmi : core/js_packages_info.cmi
 core/type_util.cmi :
 core/bs_conditional_initial.cmi :
@@ -291,7 +292,6 @@ core/lam_compile_util.cmi : core/js_op.cmx
 core/lam_id_kind.cmi : core/lam_arity.cmi core/lam.cmi
 core/lam_stats.cmi : core/lam_id_kind.cmi ext/ident_set.cmi \
     ext/ident_hashtbl.cmi
-core/config_util.cmi : core/js_cmj_format.cmi
 core/lam_compile_defs.cmi : core/lam_stats.cmi core/lam.cmi core/j.cmx \
     ext/ident_map.cmi
 core/js_fold_basic.cmi : core/lam_module_ident.cmi core/j.cmx \
@@ -363,8 +363,10 @@ core/lam_compile_group.cmi : core/j.cmx
 core/js_implementation.cmi :
 core/ocaml_batch_compile.cmi :
 core/js_runtime_modules.cmx :
-core/js_packages_info.cmx : ext/ext_string.cmx ext/ext_pervasives.cmx \
-    ext/ext_filename.cmx core/js_packages_info.cmi
+core/config_util.cmx : core/config_util.cmi
+core/js_packages_info.cmx : core/lam_module_ident.cmx ext/ext_sys.cmx \
+    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_filename.cmx \
+    core/config_util.cmx depends/bs_exception.cmx core/js_packages_info.cmi
 core/js_packages_state.cmx : core/js_packages_info.cmx \
     ext/ext_pervasives.cmx core/js_packages_state.cmi
 core/type_int_to_string.cmx :
@@ -397,7 +399,7 @@ core/lam_closure.cmx : core/lam_analysis.cmx core/lam.cmx ext/ident_set.cmx \
     ext/ident_map.cmx core/lam_closure.cmi
 core/js_cmj_format.cmx : ext/string_map.cmx core/lam_arity.cmx core/lam.cmx \
     core/js_packages_info.cmx ext/ext_string.cmx ext/ext_pervasives.cmx \
-    core/js_cmj_format.cmi
+    core/config_util.cmx depends/bs_exception.cmx core/js_cmj_format.cmi
 core/js_fun_env.cmx : ext/ident_set.cmx ext/ext_list.cmx core/js_fun_env.cmi
 core/js_call_info.cmx : core/js_call_info.cmi
 core/js_closure.cmx : ext/ident_set.cmx core/js_closure.cmi
@@ -411,8 +413,6 @@ core/lam_compile_util.cmx : core/js_op.cmx core/lam_compile_util.cmi
 core/lam_id_kind.cmx : core/lam_arity.cmx core/lam.cmx core/lam_id_kind.cmi
 core/lam_stats.cmx : core/lam_id_kind.cmx ext/ident_set.cmx \
     ext/ident_hashtbl.cmx core/lam_stats.cmi
-core/config_util.cmx : core/js_cmj_format.cmx depends/bs_exception.cmx \
-    core/config_util.cmi
 core/lam_compile_defs.cmx : core/lam_stats.cmx core/lam.cmx core/j.cmx \
     ext/ident_map.cmx core/lam_compile_defs.cmi
 core/js_map.cmx : core/j.cmx
@@ -492,7 +492,7 @@ core/lam_compile_env.cmx : core/type_util.cmx ext/string_map.cmx \
     ext/literals.cmx core/lam_module_ident.cmx core/lam.cmx \
     core/js_stmt_make.cmx core/js_packages_info.cmx core/js_exp_make.cmx \
     common/js_config.cmx core/js_cmj_format.cmx ext/ext_string.cmx \
-    core/config_util.cmx core/lam_compile_env.cmi
+    core/lam_compile_env.cmi
 core/lam_stats_util.cmx : core/lam_stats.cmx core/lam_compile_env.cmx \
     core/lam_arity.cmx core/lam.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
     core/lam_stats_util.cmi
@@ -511,11 +511,8 @@ core/lam_pass_alpha_conversion.cmx : core/lam_stats_util.cmx \
 core/lam_pass_collect.cmx : core/lam_util.cmx core/lam_stats_util.cmx \
     core/lam_stats.cmx core/lam_arity.cmx core/lam.cmx ext/ident_set.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 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_program_loader.cmx : core/lam_compile_env.cmx \
+    core/js_packages_info.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 \

jscomp/bsb/bsb_package_specs.ml

@@ -186,7 +186,7 @@ let get_list_of_output_js
     package_specs output_file_sans_extension = 
   Spec_set.fold (fun format acc ->
       package_output format 
-        (Ext_filename.output_js_basename output_file_sans_extension)
+        (Ext_filename.js_name_of_basename output_file_sans_extension)
       :: acc
     ) package_specs []
 

jscomp/core/config_util.ml

@@ -48,38 +48,3 @@ let find_opt file =  find_in_path_uncap !Config.load_path file
 
 
 
-(* strategy:
-   If not installed, use the distributed [cmj] files, 
-   make sure that the distributed files are platform independent
-*)
-let find_cmj file : string * Js_cmj_format.t = 
-  match find_opt file with
-  | Some f
-    -> 
-    f, Js_cmj_format.from_file f             
-  | None -> 
-    (* ONLY read the stored cmj data in browser environment *)
-#if BS_COMPILER_IN_BROWSER then  
-        "BROWSER", (   
-        let target = String.uncapitalize (Filename.basename file) in
-        match String_map.find_exn  target Js_cmj_datasets.data_sets with 
-        | v
-          -> 
-          begin match Lazy.force v with
-            | exception _ 
-              -> 
-              Ext_log.warn __LOC__ 
-                "@[%s corrupted in database, when looking %s while compiling %s please update @]"           file target (Js_config.get_current_file ())  ;
-              Js_cmj_format.no_pure_dummy; (* FIXME *)
-            | v ->  v 
-            (* see {!Js_program_loader.string_of_module_id} *)
-          end
-        | exception Not_found 
-          ->     
-          Ext_log.warn __LOC__ "@[%s not found @]" file ;
-          Js_cmj_format.no_pure_dummy )
-#else
-        Bs_exception.error (Cmj_not_found file)
-#end        
-
-

jscomp/core/config_util.mli

@@ -37,5 +37,3 @@
 val find_opt : string -> string option
 (** [find filename] Input is a file name, output is absolute path *)
 
-(** return path and meta data *)
-val find_cmj : string -> string * Js_cmj_format.t

jscomp/core/js_cmj_format.ml

@@ -97,3 +97,41 @@ let to_file name (v : t) =
   output_string oc cmj_magic_number;
   output_value oc v;
   close_out oc 
+
+
+(* strategy:
+   If not installed, use the distributed [cmj] files, 
+   make sure that the distributed files are platform independent
+*)
+let find_cmj file : string * t = 
+  match Config_util.find_opt file with
+  | Some f
+    -> 
+    f, from_file f             
+  | None -> 
+    (* ONLY read the stored cmj data in browser environment *)
+#if BS_COMPILER_IN_BROWSER then  
+        "BROWSER", (   
+        let target = String.uncapitalize (Filename.basename file) in
+        match String_map.find_exn  target Js_cmj_datasets.data_sets with 
+        | v
+          -> 
+          begin match Lazy.force v with
+            | exception _ 
+              -> 
+              Ext_log.warn __LOC__ 
+                "@[%s corrupted in database, when looking %s while compiling %s please update @]"           file target (Js_config.get_current_file ())  ;
+              Js_cmj_format.no_pure_dummy; (* FIXME *)
+            | v ->  v 
+            (* see {!Js_program_loader.string_of_module_id} *)
+          end
+        | exception Not_found 
+          ->     
+          Ext_log.warn __LOC__ "@[%s not found @]" file ;
+          Js_cmj_format.no_pure_dummy )
+#else
+        Bs_exception.error (Cmj_not_found file)
+#end        
+
+
+  

jscomp/core/js_cmj_format.mli

@@ -81,3 +81,7 @@ val from_file : string -> t
 val from_string : string -> t
 
 val to_file : string -> t -> unit
+
+
+(** return path and meta data *)
+val find_cmj : string -> string * t

jscomp/core/js_dump.ml

@@ -1690,7 +1690,7 @@ let es6_export cxt f (idents : Ident.t list) =
           if id_name = default_export then 
             (default_export,str)::(s,str)::acc
           else 
-          (s,str) :: acc ) , max len (String.length s)   )
+            (s,str) :: acc ) , max len (String.length s)   )
       (cxt, [], 0)  idents in    
   P.newline f ;
   P.string f L.export ; 
@@ -1793,7 +1793,11 @@ 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
-              ~hint_output_dir:(Filename.dirname output_prefix) Goog x)
+              ~hint_output_dir:(Filename.dirname output_prefix) 
+              Goog 
+              (Js_packages_state.get_packages_info())
+              x)
+              
          x.modules) 
   in
   program f cxt x.program  
@@ -1809,7 +1813,9 @@ let node_program ~output_prefix f ( x : J.deps_program) =
             Lam_module_ident.id x,
             Js_program_loader.string_of_module_id
               ~hint_output_dir:(Filename.dirname output_prefix)
-              NodeJS x)
+              NodeJS 
+              (Js_packages_state.get_packages_info ())
+              x)
          x.modules)
   in
   program f cxt x.program  
@@ -1824,9 +1830,12 @@ 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
-          ~hint_output_dir:(Filename.dirname output_prefix) kind x in
+      let s : string = 
+        Js_program_loader.string_of_module_id
+          ~hint_output_dir:(Filename.dirname output_prefix) 
+          kind 
+          (Js_packages_state.get_packages_info ())
+          x in
       P.string f L.comma ;
       P.space f; 
       pp_string f  s;
@@ -1865,7 +1874,9 @@ let es6_program  ~output_prefix fmt f (  x : J.deps_program) =
             Lam_module_ident.id x,
             Js_program_loader.string_of_module_id
               ~hint_output_dir:(Filename.dirname output_prefix)
-              fmt x)
+              fmt 
+              (Js_packages_state.get_packages_info())
+              x)
          x.modules)
   in
   let () = P.force_newline f in