continue shrinking cmj size

Author: bobzhang

jscomp/core/js_cmj_format.mli

@@ -70,7 +70,7 @@ type keyed_cmj_value = {
   persistent_closed_lambda : Lam.t option
 }
 
-type t = private {
+type t =  {
   values : keyed_cmj_value array ;
   pure : bool;
   package_spec : Js_packages_info.t ;

jscomp/core/js_cmj_load.ml

@@ -42,7 +42,9 @@ then
     if Js_config.get_diagnose () then
       Format.fprintf Format.err_formatter ">Cmj: %s@." unit_name;
     let cmj_table : Js_cmj_format.t = 
-        Marshal.from_string Builtin_cmj_datasets.module_data.(i) 0 in   
+       let values, pure =  Marshal.from_string Builtin_cmj_datasets.module_data.(i) 0 in   
+       {values; pure; package_spec = Js_packages_info.runtime_package_specs;js_file_kind = Little_js} 
+    in 
     if Js_config.get_diagnose () then
       Format.fprintf Format.err_formatter "<Cmj: %s@." unit_name;
     {package_path =  

jscomp/core/js_packages_info.ml

@@ -76,6 +76,13 @@ type t =
     module_systems: package_info  list
   }
 
+let runtime_package_specs : t = {
+  name = Pkg_runtime;
+  module_systems =[
+    {module_system = Es6; path = "lib/es6"};
+    {module_system = NodeJS; path = "lib/js"};
+  ]
+}   
 let same_package_by_name (x : t) (y : t) = x.name = y.name 
 
 let is_runtime_package (x : t) = 

jscomp/core/js_packages_info.mli

@@ -45,6 +45,7 @@ type package_info = {
 
 type t 
 
+val runtime_package_specs : t 
 val is_runtime_package:
   t ->
   bool

jscomp/main/builtin_cmj_datasets.ml

@@ -57,10 +57,13 @@ let from_cmj (files : string list) (output_file : string) : unit =
   let abs = 
     Ext_list.map files (fun file -> 
         let module_name = (cmp file) in 
+        let content : Js_cmj_format.t = Js_cmj_format.from_file file in 
+        assert (content.js_file_kind = Little_js);
+        assert (content.package_spec = Js_packages_info.runtime_package_specs);
+        (* prerr_endline (Ext_obj.dump content.package_spec); *)
         let c = 
-          (let content = Ext_io.load_file file in 
-           String.sub content Ext_cmj_magic.header_length (String.length content - Ext_cmj_magic.header_length)
-          ) in 
+          Marshal.to_string (content.values, content.pure) []
+           in 
         Printf.sprintf {|%S (* %d *)|} module_name           
           (String.length c),
         Printf.sprintf {|(* %s *)%S|} module_name c   

jscomp/main/cmij_main.ml

@@ -1649,7 +1649,7 @@ build ./bin/bspack.exe: link stubs/stubs.cmxa ext/ext.cmxa ./common/common.cmxa
     flags = -I ./bin -w -40-30    
 build ./bin/cmjdump.exe: link ./stubs/stubs.cmxa ext/ext.cmxa common/common.cmxa syntax/syntax.cmxa depends/depends.cmxa core/core.cmxa main/cmjdump_main.cmx
     libs = ocamlcommon.cmxa    
-build ./bin/cmij.exe: link ./stubs/stubs.cmxa ext/ext.cmxa  main/cmij_main.cmx
+build ./bin/cmij.exe: link ./stubs/stubs.cmxa ext/ext.cmxa  common/common.cmxa syntax/syntax.cmxa depends/depends.cmxa core/core.cmxa main/cmij_main.cmx
     libs = ocamlcommon.cmxa
 
 rule bspack