Merge pull request #1153 from chenglou/fix-hack

Author: bobzhang

jscomp/bin/bsb.ml

@@ -7,6 +7,7 @@ let ppx_flags = "ppx-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"
@@ -23,7 +24,7 @@ let resources = "resources"
 let public = "public"
 let js_post_build = "js-post-build"
 let cmd = "cmd"
-let ninja = "ninja" 
+let ninja = "ninja"
 let package_specs = "package-specs"
 
 let generate_merlin = "generate-merlin"
@@ -35,4 +36,4 @@ let export_all = "all"
 let export_none = "none"
 
 let bsb_dir_group = "bsb_dir_group"
-let bsc_lib_includes = "bsc_lib_includes"
+let bsc_lib_includes = "bsc_lib_includes"

jscomp/bsb/bsb_build_schemas.ml

@@ -27,25 +27,25 @@ let (//) = Ext_filename.combine
 
 
 (* Magic path resolution:
-   foo => foo 
+   foo => foo
    foo/ => /absolute/path/to/projectRoot/node_modules/foo
    foo/bar => /absolute/path/to/projectRoot/node_modules/foo.bar
    /foo/bar => /foo/bar
-   ./foo/bar => /absolute/path/to/projectRoot/./foo/bar 
+   ./foo/bar => /absolute/path/to/projectRoot/./foo/bar
    Input is node path, output is OS dependent path
 *)
 let resolve_bsb_magic_file ~cwd ~desc p =
-  let p_len = String.length p in 
-  let no_slash = Ext_string.no_slash p in  
-  if no_slash then 
-    p 
+  let p_len = String.length p in
+  let no_slash = Ext_string.no_slash p in
+  if no_slash then
+    p
   else if Filename.is_relative p &&
      p_len > 0 &&
      String.unsafe_get p 0 <> '.' then
-    let p = if Ext_sys.is_windows_or_cygwin then Ext_string.replace_slash_backward p else p in  
+    let p = if Ext_sys.is_windows_or_cygwin then Ext_string.replace_slash_backward p else p in
     match Bs_pkg.resolve_npm_package_file ~cwd p with
     | None -> failwith (p ^ " not found when resolving " ^ desc)
-    | Some v -> v 
+    | Some v -> v
   else
     Bsb_build_util.convert_and_resolve_path p
 
@@ -55,32 +55,32 @@ let (|?)  m (key, cb) =
 
 
 
-(** 
-  TODO: check duplicate package name 
+(**
+  TODO: check duplicate package name
    ?use path as identity?
 *)
-let rec walk_all_deps top dir cb =   
-  let bsconfig_json =  (dir // Literals.bsconfig_json) in 
-  match Ext_json.parse_json_from_file bsconfig_json with 
+let rec walk_all_deps top dir cb =
+  let bsconfig_json =  (dir // Literals.bsconfig_json) in
+  match Ext_json.parse_json_from_file bsconfig_json with
   | `Obj map ->
     map
-    |? 
-    (Bsb_build_schemas.bs_dependencies, 
-      `Arr (fun (new_packages : Ext_json.t array) -> 
+    |?
+    (Bsb_build_schemas.bs_dependencies,
+      `Arr (fun (new_packages : Ext_json.t array) ->
          new_packages
-         |> Array.iter (fun (js : Ext_json.t) -> 
-          begin match js with 
-          | `Str {Ext_json.str = new_package} -> 
-            begin match Bs_pkg.resolve_bs_package ~cwd:dir new_package with 
+         |> Array.iter (fun (js : Ext_json.t) ->
+          begin match js with
+          | `Str {Ext_json.str = new_package} ->
+            begin match Bs_pkg.resolve_bs_package ~cwd:dir new_package with
             | None -> failwith (new_package ^ " not found as dependency of " ^ bsconfig_json )
-            | Some package_dir  -> 
-              walk_all_deps  false package_dir cb  ;              
-            end;            
+            | Some package_dir  ->
+              walk_all_deps  false package_dir cb  ;
+            end;
           | _ -> () (* TODO: add a log framework, warning here *)
-          end 
+          end
       )))
     |> ignore ;
-    cb top dir 
+    cb top dir
   | _ -> ()
   | exception _ -> failwith ( "failed to parse" ^ bsconfig_json ^ " properly")
 
@@ -111,17 +111,22 @@ let get_bs_external_includes () = !bs_external_includes
 
 
 let ocamllex =  ref  "ocamllex.opt"
-let set_ocamllex ~cwd s = 
+let set_ocamllex ~cwd s =
   ocamllex := resolve_bsb_magic_file ~cwd ~desc:"ocamllex" s
 let get_ocamllex () = !ocamllex
 
 
 
 let refmt = ref "refmt"
 let get_refmt () = !refmt
-let set_refmt ~cwd p = 
+let set_refmt ~cwd p =
   refmt := resolve_bsb_magic_file ~cwd ~desc:"refmt" p
 
+let refmt_flags = ref []
+let get_refmt_flags () = !refmt_flags
+let set_refmt_flags s =
+  refmt_flags := get_list_string s
+
 
 let ppx_flags = ref []
 let get_ppx_flags () = !ppx_flags
@@ -136,7 +141,7 @@ let set_ppx_flags ~cwd s =
   ppx_flags := s
 
 
-let js_post_build_cmd = ref None 
+let js_post_build_cmd = ref None
 let get_js_post_build_cmd () = !js_post_build_cmd
 let set_js_post_build_cmd ~cwd s =
   js_post_build_cmd := Some (resolve_bsb_magic_file ~cwd ~desc:"js-post-build:cmd" s )
@@ -149,49 +154,49 @@ let get_ninja () = !ninja
    Second we need store it so that we can call ninja correctly
 *)
 let set_ninja ~cwd p  =
-  ninja := resolve_bsb_magic_file ~cwd ~desc:"ninja" p 
+  ninja := resolve_bsb_magic_file ~cwd ~desc:"ninja" p
 
 
 type package_specs = String_set.t
 
 let package_specs = ref (String_set.singleton Literals.commonjs)
-let package_specs_overriden = ref false 
+let package_specs_overriden = ref false
 
 let get_package_specs () = !package_specs
 
-let set_package_specs_from_array arr = 
-    if not  !package_specs_overriden then 
-    let new_package_specs = 
-      arr 
+let set_package_specs_from_array arr =
+    if not  !package_specs_overriden then
+    let new_package_specs =
+      arr
       |> get_list_string
       |> List.fold_left (fun acc x ->
-          let v = 
+          let v =
             if x = Literals.amdjs || x = Literals.commonjs || x = Literals.goog   then String_set.add x acc
-            else   
-              failwith ("Unkonwn package spec" ^ x) in 
+            else
+              failwith ("Unkonwn package spec" ^ x) in
           v
-        ) String_set.empty in 
+        ) String_set.empty in
    package_specs := new_package_specs
 
 
 
 
-let internal_override_package_specs str = 
-  package_specs_overriden := true ; 
-  let lst = Ext_string.split ~keep_empty:false str ',' in 
-  package_specs := 
-    List.fold_left (fun acc x -> 
-          let v = 
+let internal_override_package_specs str =
+  package_specs_overriden := true ;
+  let lst = Ext_string.split ~keep_empty:false str ',' in
+  package_specs :=
+    List.fold_left (fun acc x ->
+          let v =
             if x = Literals.amdjs || x = Literals.commonjs || x = Literals.goog   then String_set.add x acc
-            else   
-              failwith ("Unkonwn package spec" ^ x) in 
+            else
+              failwith ("Unkonwn package spec" ^ x) in
           v
-    ) String_set.empty lst 
+    ) String_set.empty lst
 
 
 let generate_merlin = ref true
 
-let get_generate_merlin () = !generate_merlin 
+let get_generate_merlin () = !generate_merlin
 
-let set_generate_merlin b = 
+let set_generate_merlin b =
   generate_merlin := b

jscomp/bsb/bsb_default.ml

@@ -47,6 +47,8 @@ val get_package_name : unit -> string option
 val set_refmt : cwd:string -> string -> unit
 val get_refmt : unit -> string
 
+val set_refmt_flags : Ext_json.t array -> unit
+val get_refmt_flags : unit -> string list
 
 val get_bs_dependencies : unit  -> string list
 val set_bs_dependencies : Ext_json.t array  -> unit
@@ -55,16 +57,16 @@ val set_bs_dependencies : Ext_json.t array  -> unit
 val get_js_post_build_cmd : unit -> string option
 val set_js_post_build_cmd : cwd:string -> string -> unit
 
-val get_ninja : unit -> string 
+val get_ninja : unit -> string
 val set_ninja : cwd:string -> string -> unit
 
 type package_specs = String_set.t
 val get_package_specs : unit -> package_specs
-val set_package_specs_from_array : Ext_json.t array -> unit  
-val internal_override_package_specs : string -> unit 
+val set_package_specs_from_array : Ext_json.t array -> unit
+val internal_override_package_specs : string -> unit
 
 
-val get_generate_merlin : unit -> bool 
-val set_generate_merlin : bool -> unit 
+val get_generate_merlin : unit -> bool
+val set_generate_merlin : bool -> unit
 
-val walk_all_deps : bool -> string -> (bool -> string -> unit) -> unit 
+val walk_all_deps : bool -> string -> (bool -> string -> unit) -> unit

jscomp/bsb/bsb_default.mli

@@ -34,7 +34,7 @@ let merge_module_info_map acc sources =
       | None , None ->
         assert false
       | Some a, Some b  ->
-        failwith ("conflict files found: " ^ modname ^ "in ("   
+        failwith ("conflict files found: " ^ modname ^ "in ("
                   ^  Binary_cache.dir_of_module_info a ^ Ext_string.single_space ^ Binary_cache.dir_of_module_info b ^  " )")
       | Some v, None  -> Some v
       | None, Some v ->  Some v
@@ -56,10 +56,12 @@ let output_ninja
     ppx_flags
     bs_dependencies
     refmt
+    refmt_flags
 
   =
   let ppx_flags = Bsb_build_util.flag_concat "-ppx" ppx_flags in
   let bsc_flags =  String.concat Ext_string.single_space bsc_flags in
+  let refmt_flags = String.concat Ext_string.single_space refmt_flags in
   let oc = open_out_bin (builddir // Literals.build_ninja) in
   begin
     let () =
@@ -80,7 +82,8 @@ let output_ninja
           "bsc_flags", bsc_flags ;
           "ppx_flags", ppx_flags;
           "bs_package_includes", (Bsb_build_util.flag_concat "-bs-package-include" bs_dependencies);
-          "refmt", "\"" ^ refmt ^ "\"";
+          "refmt", refmt;
+          "refmt_flags", refmt_flags;
           Bsb_build_schemas.bsb_dir_group, "0"  (*TODO: avoid name conflict in the future *)
         |] oc ;
     in

jscomp/bsb/bsb_gen.ml

@@ -26,7 +26,7 @@
 val output_ninja :
   builddir:string ->
   cwd:string ->
-  js_post_build_cmd:string option -> 
+  js_post_build_cmd:string option ->
   package_specs:Bsb_default.package_specs ->
   string ->
   string ->
@@ -38,4 +38,5 @@ val output_ninja :
   string list ->
   string list ->
   string ->
+  string list ->
   unit