Merge pull request #4158 from BuckleScript/experiment_in_memory_loading_cmi

in memory loading cmi/j for browser target

Author: bobzhang

jscomp/bin/reactjs_jsx_ppx_v2.bspp.ml

@@ -332,7 +332,7 @@ let jsxMapper () =
   { default_mapper with structure; expr }
 #end
 
-#if BS_COMPILER_IN_BROWSER then
+#if BS_BROWSER then
 
 module Js = struct
   module Unsafe = struct

jscomp/core/bs_cmi_load.ml

@@ -0,0 +1,11 @@
+
+
+(* TODO: provide native load*)
+let browse_load ~unit_name : Env.Persistent_signature.t option=
+  match Ext_string_array.find_sorted Builtin_cmi_datasets.module_sets unit_name with
+  | Some index ->
+    (* Format.fprintf Format.err_formatter "reading %s@." unit_name; *)
+    Some {filename = Sys.executable_name ; 
+          cmi = 
+            Lazy.force Builtin_cmi_datasets.module_sets_cmi.(index)}
+  | None -> assert false

jscomp/core/bs_conditional_initial.ml

@@ -22,20 +22,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
+(* Clflags.keep_docs := false; *)
+(* default to false -check later*)
+(* Clflags.keep_locs := false; *)
 let setup_env () =
-#if 0 then
-  let old_loader = !Env.Persistent_signature.load in   
-  Env.Persistent_signature.load := (fun ~unit_name -> 
-    match Ext_string_array.find_sorted Js_cmi_datasets.module_sets unit_name with
-    | Some index ->
-      Format.fprintf Format.err_formatter "reading %s@." unit_name;
-       Some {filename = Sys.executable_name ; cmi = 
-        Lazy.force Js_cmi_datasets.module_sets_cmi.(index)}
-    | None -> old_loader ~unit_name
-  );
-  Clflags.keep_locs := false;
-  Clflags.keep_docs := false;
+#if BS_BROWSER then
+  Env.Persistent_signature.load := Bs_cmi_load.browse_load;  
 #end
   Warnings.parse_options false Bsc_warnings.defaults_w;
   Warnings.parse_options true Bsc_warnings.defaults_warn_error;

jscomp/core/builtin_cmi_datasets.ml

@@ -243,4 +243,10 @@ let pp_cmj
           k i 
           (Format.asprintf "%a" Lam_arity.print arity ))
          xs
-    )    
+    )    
+
+type path = string  
+type cmj_load_info = {
+  cmj_table : t ; 
+  cmj_path : path ;
+}    

jscomp/core/builtin_cmj_datasets.ml

@@ -108,4 +108,11 @@ val from_string : string -> t
 val to_file : 
   string -> check_exists:bool -> t -> unit
 
-val pp_cmj: t -> unit 
+val pp_cmj: t -> unit 
+
+
+type path = string  
+type cmj_load_info = {
+  cmj_table : t ; 
+  cmj_path : path ;
+}    

jscomp/core/js_cmj_datasets.ml

@@ -28,32 +28,20 @@
 *)
 
 
-type path = string  
-type cmj_load_info = {
-  cmj_table : Js_cmj_format.t ; 
-  cmj_path : path ;
-}
 
-#if BS_COMPILER_IN_BROWSER then 
-let find_cmj_exn file : cmj_load_info = 
+
+#if BS_BROWSER  then 
+let find_cmj_exn file : Js_cmj_format.cmj_load_info = 
   let target = Ext_string.uncapitalize_ascii (Filename.basename file) in
-  match Map_string.find_exn !Js_cmj_datasets.data_sets target with
-  | v
+  match Builtin_cmj_datasets.query_by_name target with
+  | Some 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 !Location.input_name  ;
-        Bs_exception.error (Cmj_not_found file)
-      | v ->  {cmj_path = "BROWSER"; cmj_table = v} 
-      (* see {!Js_packages_info.string_of_module_id} *)
-    end
-  | exception Not_found 
+    {cmj_path = "BROWSER"; cmj_table = v}
+  | None
     ->     
     Bs_exception.error (Cmj_not_found file)
 #else    
-let find_cmj_exn file : cmj_load_info = 
+let find_cmj_exn file : Js_cmj_format.cmj_load_info = 
   match Config_util.find_opt file with
   | Some f
     ->