(fix) Remove remaining references to bs_suffix in bsb

This gets everything compiling again, but we're far from done! 😫

Author: ELLIOTTCABLE

jscomp/bsb/bsb_ninja_file_groups.ml

@@ -60,7 +60,7 @@ let make_common_shadows package_specs dirname dir_index :
 
 let emit_module_build (rules : Bsb_ninja_rule.builtin)
     (package_specs : Bsb_package_specs.t) (group_dir_index : Bsb_dir_index.t) oc
-    ~bs_suffix js_post_build_cmd namespace (module_info : Bsb_db.module_info) =
+    js_post_build_cmd namespace (module_info : Bsb_db.module_info) =
   let has_intf_file = module_info.info = Ml_mli in
   let is_re = module_info.is_re in
   let filename_sans_extension = module_info.name_sans_extension in
@@ -90,7 +90,7 @@ let emit_module_build (rules : Bsb_ninja_rule.builtin)
   let output_cmi = output_filename_sans_extension ^ Literals.suffix_cmi in
   let output_cmj = output_filename_sans_extension ^ Literals.suffix_cmj in
   let output_js =
-    Bsb_package_specs.get_list_of_output_js package_specs bs_suffix
+    Bsb_package_specs.get_list_of_output_js package_specs
       output_filename_sans_extension
   in
   let common_shadows =
@@ -155,8 +155,8 @@ let emit_module_build (rules : Bsb_ninja_rule.builtin)
     ~order_only_deps:[ output_d ] ~rule
 
 
-let handle_files_per_dir oc ~bs_suffix ~(rules : Bsb_ninja_rule.builtin)
-    ~package_specs ~js_post_build_cmd ~(files_to_install : Hash_set_string.t)
+let handle_files_per_dir oc ~(rules : Bsb_ninja_rule.builtin) ~package_specs
+    ~js_post_build_cmd ~(files_to_install : Hash_set_string.t)
     ~(namespace : string option) (group : Bsb_file_groups.file_group) : unit =
   handle_generators oc group rules.customs;
   let installable =
@@ -168,7 +168,7 @@ let handle_files_per_dir oc ~bs_suffix ~(rules : Bsb_ninja_rule.builtin)
   Map_string.iter group.sources (fun module_name module_info ->
       if installable module_name then
         Hash_set_string.add files_to_install module_info.name_sans_extension;
-      emit_module_build rules package_specs group.dir_index oc ~bs_suffix
-        js_post_build_cmd namespace module_info)
+      emit_module_build rules package_specs group.dir_index oc js_post_build_cmd
+        namespace module_info)
 
 (* pseuduo targets per directory *)

jscomp/bsb/bsb_ninja_file_groups.mli

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

jscomp/bsb/bsb_ninja_gen.ml

@@ -70,7 +70,6 @@ let output_static_resources (static_resources : string list) copy_rule oc =
 
 let output_ninja_and_namespace_map ~per_proj_dir ~toplevel
     ({
-       bs_suffix;
        package_name;
        external_includes;
        bsc_flags;
@@ -195,17 +194,16 @@ let output_ninja_and_namespace_map ~per_proj_dir ~toplevel
       ~has_postbuild:(js_post_build_cmd <> None)
       ~has_ppx:(ppx_files <> []) ~has_pp:(pp_file <> None)
       ~has_builtin:(built_in_dependency <> None)
-      ~reason_react_jsx ~bs_suffix ~digest generators
+      ~reason_react_jsx ~digest generators
   in
 
   emit_bsc_lib_includes bs_dependencies bsc_lib_dirs external_includes namespace
     oc;
   output_static_resources static_resources rules.copy_resources oc;
   (* Generate build statement for each file *)
   Ext_list.iter bs_file_groups (fun files_per_dir ->
-      Bsb_ninja_file_groups.handle_files_per_dir oc ~bs_suffix ~rules
-        ~js_post_build_cmd ~package_specs ~files_to_install ~namespace
-        files_per_dir);
+      Bsb_ninja_file_groups.handle_files_per_dir oc ~rules ~js_post_build_cmd
+        ~package_specs ~files_to_install ~namespace files_per_dir);
 
   Ext_option.iter namespace (fun ns ->
       let namespace_dir = per_proj_dir // Bsb_config.lib_bs in

jscomp/bsb/bsb_ninja_rule.ml

@@ -89,7 +89,7 @@ type builtin = {
 }
 
 let make_custom_rules ~(has_gentype : bool) ~(has_postbuild : bool)
-    ~(has_ppx : bool) ~(has_pp : bool) ~(has_builtin : bool) ~(bs_suffix : bool)
+    ~(has_ppx : bool) ~(has_pp : bool) ~(has_builtin : bool)
     ~(reason_react_jsx : Bsb_config_types.reason_react_jsx option)
     ~(digest : string) ~(refmt : string option)
     (* set refmt path when needed *)
@@ -100,7 +100,6 @@ let make_custom_rules ~(has_gentype : bool) ~(has_postbuild : bool)
   let mk_ml_cmj_cmd ~read_cmi ~is_dev ~postbuild : string =
     Buffer.clear buf;
     Buffer.add_string buf "$bsc -nostdlib $g_pkg_flg -color always";
-    if bs_suffix then Buffer.add_string buf " -bs-suffix";
     if read_cmi then Buffer.add_string buf " -bs-read-cmi";
     if is_dev then Buffer.add_string buf " $g_dev_incls";
     Buffer.add_string buf " $g_lib_incls";

jscomp/bsb/bsb_ninja_rule.mli

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

jscomp/bsb/bsb_package_specs.ml

@@ -27,11 +27,7 @@ let ( // ) = Ext_path.combine
 (* TODO: sync up with {!Js_package_info.module_system} *)
 type format = NodeJS | Es6 | Es6_global
 
-type spec = {
-  format : format;
-  in_source : bool;
-  suffix : string
-}
+type spec = { format : format; in_source : bool; suffix : string }
 
 module Spec_set = Set.Make (struct
   type t = spec
@@ -90,13 +86,13 @@ let default_suffix format in_source =
   | _, false -> Literals.suffix_mjs
   | _, true -> Literals.suffix_bs_mjs
 
-module SS = Set.Make(String)
 
-let supported_bs_suffixes = Literals.[suffix_bs_js; suffix_bs_mjs]
+module SS = Set.Make (String)
+
+let supported_bs_suffixes = Literals.[ suffix_bs_js; suffix_bs_mjs ]
 
 (** Produces a [list] of supported, bs-prefixed file-suffixes used in
-    [in-source] package-specs.
-*)
+    [in-source] package-specs. *)
 let extract_in_source_bs_suffixes (package_specs : Spec_set.t) =
   let f spec suffixes =
     if spec.in_source && List.mem spec.suffix supported_bs_suffixes then
@@ -106,6 +102,7 @@ let extract_in_source_bs_suffixes (package_specs : Spec_set.t) =
   let suffixes = Spec_set.fold f package_specs SS.empty in
   SS.elements suffixes
 
+
 let rec from_array (arr : Ext_json_types.t array) : Spec_set.t =
   let spec = ref Spec_set.empty in
   let has_in_source = ref false in
@@ -195,14 +192,13 @@ let default_package_specs =
 
 
 (** [get_list_of_output_js specs true "src/hi/hello"] *)
-let get_list_of_output_js (package_specs : Spec_set.t) (bs_suffix : bool)
+let get_list_of_output_js (package_specs : Spec_set.t)
     (output_file_sans_extension : string) =
   Spec_set.fold
-    (fun (spec : spec) acc ->
+    (fun spec acc ->
       let basename =
         Ext_namespace.replace_namespace_with_extension
-          ~name:output_file_sans_extension
-          ~ext:(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js)
+          ~name:output_file_sans_extension ~ext:spec.suffix
       in
       ( Bsb_config.proj_rel
       @@

jscomp/bsb/bsb_package_specs.mli

@@ -28,7 +28,7 @@ val default_package_specs : t
 
 val from_json : Ext_json_types.t -> t
 
-val get_list_of_output_js : t -> bool -> string -> string list
+val get_list_of_output_js : t -> string -> string list
 
 val extract_in_source_bs_suffixes : t -> string list