Merge pull request rescript-lang#4689 from rescript-lang/fix_sys_directory

prepare rescript-lang#4687, allow user to customize js suffix per package specs

Author: bobzhang

jscomp/bsb/bsb_config_parse.ml

@@ -142,12 +142,14 @@ let check_stdlib (map : json_map) cwd (*built_in_package*) =
       | _ -> assert false 
 
     end
-let extract_bs_suffix_exn (map : json_map) =  
+
+
+let extract_bs_suffix_exn (map : json_map) : Ext_js_suffix.t =  
   match Map_string.find_opt map Bsb_build_schemas.suffix with 
-  | None -> false  
+  | None -> Js  
   | Some (Str {str} as config ) -> 
-    if str = Literals.suffix_js then false 
-    else if str = Literals.suffix_bs_js then true
+    if str = Literals.suffix_js then Js
+    else if str = Literals.suffix_bs_js then Bs_js
     else Bsb_exception.config_error config 
         "expect .bs.js or .js string here"
   | Some config -> 

jscomp/bsb/bsb_config_types.ml

@@ -75,6 +75,6 @@ type t =
     reason_react_jsx : reason_react_jsx option; (* whether apply PPX transform or not*)
     generators : command Map_string.t ; 
     cut_generators : bool; (* note when used as a dev mode, we will always ignore it *)
-    bs_suffix : bool ; (* true means [.bs.js] we should pass [-bs-suffix] flag *)
+    bs_suffix : Ext_js_suffix.t ; 
     gentype_config : gentype_config option;
   }

jscomp/bsb/bsb_ninja_file_groups.ml

@@ -93,7 +93,7 @@ let emit_module_build
     (package_specs : Bsb_package_specs.t)
     (is_dev : bool) 
     oc 
-    ~bs_suffix
+    ~(bs_suffix : Ext_js_suffix.t)
     js_post_build_cmd
     namespace
     (module_info : Bsb_db.module_info)
@@ -187,7 +187,7 @@ let emit_module_build
 
 let handle_files_per_dir
     oc 
-    ~bs_suffix
+    ~(bs_suffix : Ext_js_suffix.t)
     ~(rules : Bsb_ninja_rule.builtin)
     ~package_specs 
     ~js_post_build_cmd  

jscomp/bsb/bsb_ninja_file_groups.mli

@@ -27,7 +27,7 @@
 
 val handle_files_per_dir :
   out_channel ->
-  bs_suffix:bool ->
+  bs_suffix:Ext_js_suffix.t ->
   rules:Bsb_ninja_rule.builtin ->
   package_specs:Bsb_package_specs.t ->
   js_post_build_cmd:string option ->

jscomp/bsb/bsb_ninja_rule.ml

@@ -115,7 +115,7 @@ let make_custom_rules
   ~(has_ppx : bool)
   ~(has_pp : bool)
   ~(has_builtin : bool)
-  ~(bs_suffix : bool)
+  ~(bs_suffix : Ext_js_suffix.t)
   ~(reason_react_jsx : Bsb_config_types.reason_react_jsx option)
   ~(digest : string)
   ~(refmt : string option) (* set refmt path when needed *)
@@ -131,8 +131,7 @@ let make_custom_rules
     Ext_buffer.clear buf;
     Ext_buffer.add_string buf "$bsc";
     Ext_buffer.add_ninja_prefix_var buf Bsb_ninja_global_vars.g_pkg_flg;
-    if bs_suffix then
-      Ext_buffer.add_string buf " -bs-suffix";
+    Ext_js_suffix.to_bsc_flag bs_suffix buf;
     if read_cmi then 
       Ext_buffer.add_string buf " -bs-read-cmi";
     if is_dev then 

jscomp/bsb/bsb_ninja_rule.mli

@@ -74,7 +74,7 @@ val make_custom_rules :
   has_ppx:bool ->
   has_pp:bool ->
   has_builtin:bool -> 
-  bs_suffix:bool ->
+  bs_suffix:Ext_js_suffix.t ->
   reason_react_jsx : Bsb_config_types.reason_react_jsx option ->
   digest:string ->
   refmt:string option ->

jscomp/bsb/bsb_package_specs.ml

@@ -152,17 +152,17 @@ let default_package_specs =
 *)
 let get_list_of_output_js 
     (package_specs : Spec_set.t)
-    (bs_suffix : bool)
+    (bs_suffix : Ext_js_suffix.t)
     (output_file_sans_extension : string)
     = 
   Spec_set.fold 
     (fun (spec : spec) acc ->
         let basename =  Ext_namespace.change_ext_ns_suffix
              output_file_sans_extension
-             (if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js)
+             (Ext_js_suffix.to_string bs_suffix)
         in 
-        (Bsb_config.proj_rel @@ (if spec.in_source then basename
-        else prefix_of_format spec.format // basename))         
+        (Bsb_config.proj_rel (if spec.in_source then basename
+        else prefix_of_format spec.format // basename))   
        :: acc
     ) package_specs []
 

jscomp/bsb/bsb_package_specs.mli

@@ -31,7 +31,10 @@ val from_json:
   Ext_json_types.t -> t 
 
 val get_list_of_output_js : 
-  t -> bool -> string -> string list
+  t -> 
+  Ext_js_suffix.t -> 
+  string -> 
+  string list
 
 (**
   Sample output: {[ -bs-package-output commonjs:lib/js/jscomp/test]}

jscomp/bsb/bsb_parse_sources.ml

@@ -51,7 +51,6 @@ type cxt = {
   cut_generators : bool;
   traverse : bool;
   namespace : string option;
-  bs_suffix: bool;
   ignored_dirs : Set_string.t
 }
 
@@ -392,7 +391,7 @@ let scan
   ~root 
   ~cut_generators 
   ~namespace 
-  ~bs_suffix 
+  ~(bs_suffix : Ext_js_suffix.t)
   ~ignored_dirs
   x : t  = 
   parse_sources {
@@ -403,7 +402,6 @@ let scan
     root ;
     cut_generators;
     namespace;
-    bs_suffix;
     traverse = false
   } x 
 

jscomp/bsb/bsb_parse_sources.mli

@@ -34,7 +34,7 @@ val scan :
   root: string ->  
   cut_generators: bool -> 
   namespace : string option -> 
-  bs_suffix:bool -> 
+  bs_suffix:Ext_js_suffix.t -> 
   ignored_dirs:Set_string.t ->
   Ext_json_types.t ->   
   Bsb_file_groups.t 

jscomp/common/js_config.ml

@@ -61,7 +61,7 @@ let syntax_only = ref false
 let binary_ast = ref false
 
 
-let bs_suffix = ref false 
+let bs_suffix : Ext_js_suffix.t ref = ref Ext_js_suffix.Js
 
 let debug = ref false
 

jscomp/common/js_config.mli

@@ -77,7 +77,7 @@ val binary_ast : bool ref
 
 
 
-val bs_suffix : bool ref
+val bs_suffix : Ext_js_suffix.t ref
 val debug : bool ref
 
 val cmi_only  : bool ref

jscomp/core/lam_compile_main.ml

@@ -37,10 +37,10 @@ let get_cmj_case output_prefix : Ext_js_file_kind.t =
     Ext_char.is_lower_case (Filename.basename output_prefix).[0] 
   in 
   match little, !Js_config.bs_suffix with 
-  | true, true -> Little_bs
-  | true, false -> Little_js
-  | false, true -> Upper_bs 
-  | false, false -> Upper_js
+  | true, Bs_js -> Little_bs
+  | true, Js -> Little_js
+  | false, Bs_js -> Upper_bs 
+  | false, Js -> Upper_js
 
 
 let compile_group (meta : Lam_stats.t) 
@@ -278,7 +278,7 @@ let compile
           meta  
           effect 
           coerced_input.export_map
-          (get_cmj_case output_prefix)
+          ~js_file_kind:(get_cmj_case output_prefix)
       in
       (if not !Clflags.dont_write_files then
          Js_cmj_format.to_file 
@@ -298,7 +298,7 @@ let lambda_as_module
     Ext_namespace.change_ext_ns_suffix 
       (Filename.basename
          output_prefix) 
-      (if !Js_config.bs_suffix then Literals.suffix_bs_js else Literals.suffix_js) 
+      (Ext_js_suffix.to_string  !Js_config.bs_suffix) 
   in
   let package_info = Js_packages_state.get_packages_info () in 
   if Js_packages_info.is_empty package_info && !Js_config.js_stdout then begin    

jscomp/core/lam_stats_export.ml

@@ -148,7 +148,7 @@ let export_to_cmj
     (meta : Lam_stats.t ) 
     effect 
     export_map
-    js_file_kind
+    ~js_file_kind
   : Js_cmj_format.t = 
   let values =  values_of_export meta export_map in
 

jscomp/core/lam_stats_export.mli

@@ -34,6 +34,6 @@ val export_to_cmj :
   Lam_stats.t ->
   Js_cmj_format.effect ->
   Lam.t Map_ident.t ->
-  Ext_js_file_kind.t ->
+  js_file_kind:Ext_js_file_kind.t ->
   Js_cmj_format.t
 

jscomp/ext/ext_js_suffix.ml

@@ -0,0 +1,14 @@
+type t = 
+  | Js 
+  | Bs_js   
+
+
+let to_string (x : t) =   
+  match x with 
+  | Js -> Literals.suffix_js
+  | Bs_js -> Literals.suffix_bs_js  
+
+let to_bsc_flag (x : t) (buf : Ext_buffer.t) = 
+    match x with 
+    | Js -> ()
+    | Bs_js -> Ext_buffer.add_string buf " -bs-suffix"

jscomp/main/js_main.ml

@@ -328,7 +328,7 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
     "-bs-g", unit_call (fun _ -> Js_config.debug := true; Lexer.replace_directive_bool "DEBUG" true),
     "Debug mode";
 
-    "-bs-suffix", set Js_config.bs_suffix, 
+    "-bs-suffix", unit_call (fun _ -> Js_config.bs_suffix := Bs_js), 
     "*internal* set suffix to .bs.js";
 
     "-bs-package-name", string_call Js_packages_state.set_package_name,