Bsc understand .re extension

Author: bobzhang

jscomp/bsb/bsb_build_schemas.ml

@@ -32,7 +32,7 @@ let ppx_flags = "ppx-flags"
 let pp_flags = "pp-flags"
 let bsc = "bsc"
 let refmt = "refmt"
-let refmt_flags = "refmt-flags"
+
 let bs_external_includes = "bs-external-includes"
 let bs_lib_dir = "bs-lib-dir"
 let bs_dependencies = "bs-dependencies"

jscomp/bsb/bsb_config_parse.ml

@@ -460,10 +460,6 @@ let interpret_json
              ]}
           *)          
           refmt;
-          refmt_flags = 
-            (let flags = 
-               extract_string_list map Bsb_build_schemas.refmt_flags in 
-             if flags = [] then Bsb_default.refmt_flags else flags)  ;
           js_post_build_cmd = (extract_js_post_build map cwd);
           package_specs = 
             (match toplevel_package_specs with 

jscomp/bsb/bsb_config_types.ml

@@ -72,7 +72,6 @@ type t =
       [.merlin]
     *)
     refmt : refmt;
-    refmt_flags : string list;
     js_post_build_cmd : string option;
     package_specs : Bsb_package_specs.t ; 
     file_groups : Bsb_file_groups.t;

jscomp/bsb/bsb_default.ml

@@ -25,9 +25,7 @@
 
 
 
-let refmt_flags = ["--print"; "binary"]
 
-let refmt_v3 = "refmt.exe"
-let refmt_none = "refmt.exe"
+
 
 let main_entries = [Bsb_config_types.JsTarget "Index"]

jscomp/bsb/bsb_default.mli

@@ -26,10 +26,4 @@
 
 
 
-val refmt_flags : string list  
-
-val refmt_v3 : string
-
-val refmt_none : string
-
 val main_entries : Bsb_config_types.entries_t list

jscomp/bsb/bsb_ninja_file_groups.ml

@@ -91,10 +91,14 @@ let emit_module_build
   let is_re = module_info.is_re in 
   let filename_sans_extension = module_info.name_sans_extension in 
   let is_dev = not (Bsb_dir_index.is_lib_dir group_dir_index) in
-  let input = 
+  let input_impl = 
     Bsb_config.proj_rel 
       (if is_re then filename_sans_extension ^ Literals.suffix_re 
        else filename_sans_extension ^ Literals.suffix_ml  ) in
+  let input_intf =      
+    Bsb_config.proj_rel 
+      (if is_re then filename_sans_extension ^ Literals.suffix_rei 
+       else filename_sans_extension ^ Literals.suffix_mli) in
   let output_mlast = filename_sans_extension  ^ Literals.suffix_mlast in
   let output_mliast = filename_sans_extension  ^ Literals.suffix_mliast in
   let output_d = filename_sans_extension ^ Literals.suffix_d in
@@ -116,7 +120,7 @@ let emit_module_build
       rules.build_ast in 
   Bsb_ninja_util.output_build oc
     ~output:output_mlast
-    ~input
+    ~input:input_impl
     ~rule:ast_rule;
   Bsb_ninja_util.output_build
     oc
@@ -136,9 +140,7 @@ let emit_module_build
       (* TODO: we can get rid of absloute path if we fixed the location to be 
           [lib/bs], better for testing?
       *)
-      ~input:(Bsb_config.proj_rel 
-                (if is_re then filename_sans_extension ^ Literals.suffix_rei 
-                 else filename_sans_extension ^ Literals.suffix_mli))
+      ~input:input_intf
       ~rule:ast_rule
     ;
     Bsb_ninja_util.output_build oc

jscomp/bsb/bsb_ninja_gen.ml

@@ -36,26 +36,6 @@ let bsb_helper_exe = "bsb_helper.exe"
 let dash_i = "-I"
 
 
-let output_reason_config 
-  (has_reason_files : bool)
-  (refmt : Bsb_config_types.refmt) 
-  (bsc_dir : string)
-  (refmt_flags : string) 
-  (oc : out_channel) : unit =   
-  if has_reason_files then 
-    Bsb_ninja_util.output_kvs
-      [|
-        Bsb_ninja_global_vars.refmt, 
-        (Ext_filename.maybe_quote
-           (match refmt with 
-            | Refmt_none -> 
-              Bsb_log.warn "@{<warning>Warning:@} refmt version missing. Please set it explicitly, since we may change the default in the future.@.";
-              bsc_dir // Bsb_default.refmt_none
-            | Refmt_v3 -> 
-              bsc_dir // Bsb_default.refmt_v3
-            | Refmt_custom x -> x ));        
-        Bsb_ninja_global_vars.refmt_flags, refmt_flags;
-      |] oc 
 
 let get_bsc_flags 
     ~(toplevel : bool)     
@@ -130,7 +110,6 @@ let output_ninja_and_namespace_map
       bs_dependencies;
       bs_dev_dependencies;
       refmt;
-      refmt_flags;
       js_post_build_cmd;
       package_specs;
       file_groups = { files = bs_file_groups};
@@ -147,9 +126,7 @@ let output_ninja_and_namespace_map
 
   let cwd_lib_bs = cwd // Bsb_config.lib_bs in 
   let ppx_flags = Bsb_build_util.ppx_flags ppx_files in
-  let refmt_flags = String.concat Ext_string.single_space refmt_flags in
   let oc = open_out_bin (cwd_lib_bs // Literals.build_ninja) in          
-  let has_reason_files = ref false in 
   let g_pkg_flg , g_ns_flg = 
     match namespace with
     | None -> 
@@ -209,7 +186,6 @@ let output_ninja_and_namespace_map
               else Ext_list.map_append resources acc_resources (fun x -> dir // x ) )
           )  in
       Bsb_db_util.sanity_check bs_group;
-      has_reason_files := !has_reason_files || Bsb_db.has_reason_files bs_group ;     
       [|bs_group|], source_dirs, static_resources
     else
       let bs_groups = Array.init  (number_of_dev_groups + 1 ) (fun i -> String_map.empty) in
@@ -224,11 +200,9 @@ let output_ninja_and_namespace_map
           ) in
       let lib = bs_groups.((Bsb_dir_index.lib_dir_index :> int)) in               
       Bsb_db_util.sanity_check lib;
-      has_reason_files :=  !has_reason_files || Bsb_db.has_reason_files lib ;
       for i = 1 to number_of_dev_groups  do
         let c = bs_groups.(i) in
         Bsb_db_util.sanity_check c;
-        has_reason_files :=  !has_reason_files || Bsb_db.has_reason_files c ;
         String_map.iter c 
           (fun k a -> 
             if String_map.mem lib k  then 
@@ -241,10 +215,12 @@ let output_ninja_and_namespace_map
       bs_groups,source_dirs.((Bsb_dir_index.lib_dir_index:>int)), static_resources
   in
 
-  output_reason_config !has_reason_files  refmt bsc_dir refmt_flags oc;
   let digest = Bsb_db_encode.write_build_cache ~dir:cwd_lib_bs bs_groups in
   let rules : Bsb_ninja_rule.builtin = 
       Bsb_ninja_rule.make_custom_rules 
+      ~refmt:(match refmt with 
+        | Refmt_none | Refmt_v3 -> None 
+        | Refmt_custom x -> Some x)
       ~has_gentype:(gentype_config <> None)
       ~has_postbuild:(js_post_build_cmd <> None)
       ~has_ppx:(ppx_files <> [])

jscomp/bsb/bsb_ninja_rule.ml

@@ -123,6 +123,7 @@ let make_custom_rules
   ~(bs_suffix : bool)
   ~(reason_react_jsx : Bsb_config_types.reason_react_jsx option)
   ~(digest : string)
+  ~(refmt : string option) (* set refmt path when needed *)
   (custom_rules : command String_map.t) : 
   builtin = 
   (** FIXME: We don't need set [-o ${out}] when building ast 
@@ -137,6 +138,7 @@ let make_custom_rules
     Buffer.add_string buf "$bsc -nostdlib $g_pkg_flg -color always";
     if bs_suffix then
       Buffer.add_string buf " -bs-suffix";
+    (* TODO: see if we set this dynamically *)  
     if is_re then 
       Buffer.add_string buf " -bs-re-out -bs-super-errors";
     if read_cmi then 
@@ -156,21 +158,24 @@ let make_custom_rules
       Buffer.add_string buf " $postbuild";
     Buffer.contents buf
   in   
-  let mk_ast ~has_pp ~has_ppx ~has_reason_react_jsx : string =
+  let mk_ast ~(has_pp : bool) ~has_ppx ~has_reason_react_jsx : string =
     Buffer.clear buf ; 
     Buffer.add_string buf "$bsc  $warnings -color always";
-    (match has_pp with 
-      | `regular -> Buffer.add_string buf " $pp_flags"
-      | `refmt -> Buffer.add_string buf {| -pp "$refmt $refmt_flags"|}
-      | `none -> ()
-      );
+    (match refmt with 
+    | None -> ()
+    | Some x ->
+      Buffer.add_string buf " -refmt ";
+      Buffer.add_string buf (Ext_filename.maybe_quote x);
+    );
+    if has_pp then
+      Buffer.add_string buf " $pp_flags";
     (match has_reason_react_jsx, reason_react_jsx with
-    | false, _ 
-    | _, None -> ()
-    | _, Some Jsx_v2
-      -> Buffer.add_string buf " -bs-jsx 2"
-    | _, Some Jsx_v3 
-      -> Buffer.add_string buf " -bs-jsx 3"
+     | false, _ 
+     | _, None -> ()
+     | _, Some Jsx_v2
+       -> Buffer.add_string buf " -bs-jsx 2"
+     | _, Some Jsx_v3 
+       -> Buffer.add_string buf " -bs-jsx 3"
     );
     if has_ppx then 
       Buffer.add_string buf " $ppx_flags"; 
@@ -179,12 +184,12 @@ let make_custom_rules
   in  
   let build_ast =
     define
-      ~command:(mk_ast ~has_pp:(if has_pp then `regular else `none) ~has_ppx ~has_reason_react_jsx:false )
-      "build_ast_and_module_sets" in
+      ~command:(mk_ast ~has_pp ~has_ppx ~has_reason_react_jsx:false )
+      "build_ast" in
   let build_ast_from_re =
     define
-      ~command:(mk_ast ~has_pp:`refmt ~has_ppx ~has_reason_react_jsx:true)
-      "build_ast_and_module_sets_from_re" in 
+      ~command:(mk_ast ~has_pp ~has_ppx ~has_reason_react_jsx:true)
+      "build_ast_from_re" in 
 
   let copy_resources =    
     define 

jscomp/bsb/bsb_ninja_rule.mli

@@ -82,6 +82,7 @@ val make_custom_rules :
   bs_suffix:bool ->
   reason_react_jsx : Bsb_config_types.reason_react_jsx option ->
   digest:string ->
+  refmt:string option ->
   command String_map.t ->
   builtin
 

jscomp/common/js_config.ml

@@ -109,4 +109,6 @@ let cmi_only = ref false
 let force_cmi = ref false
 let force_cmj = ref false
 
-let jsx_version = ref (-1)
+let jsx_version = ref (-1)
+
+let refmt = ref None