clean *.re.js when running bsb -clean, fix #2956

Author: bobzhang

jscomp/all.depend

@@ -874,8 +874,9 @@ bsb/bsb_build_util.cmx : ext/string_map.cmx ext/string_hashtbl.cmx \
     ext/ext_list.cmx ext/ext_json_types.cmx ext/ext_json_parse.cmx \
     ext/ext_json.cmx ext/ext_array.cmx bsb/bsb_pkg.cmx bsb/bsb_log.cmx \
     bsb/bsb_exception.cmx bsb/bsb_build_schemas.cmx bsb/bsb_build_util.cmi
-bsb/bsb_clean.cmx : ext/ext_path.cmx bsb/bsb_unix.cmx bsb/bsb_log.cmx \
-    bsb/bsb_config.cmx bsb/bsb_build_util.cmx bsb/bsb_clean.cmi
+bsb/bsb_clean.cmx : ext/ext_path.cmx bsb/bsb_unix.cmx \
+    bsb/bsb_parse_sources.cmx bsb/bsb_log.cmx bsb/bsb_config.cmx \
+    bsb/bsb_build_util.cmx bsb/bsb_clean.cmi
 bsb/bsb_config.cmx : ext/ext_path.cmx bsb/bsb_config.cmi
 bsb/bsb_config_parse.cmx : ext/string_map.cmx ext/string_hash_set.cmx \
     ext/literals.cmx ext/ext_path.cmx ext/ext_namespace.cmx ext/ext_list.cmx \
@@ -957,11 +958,12 @@ bsb/bsb_package_specs.cmx : ext/string_map.cmx ext/literals.cmx \
 bsb/bsb_parse_sources.cmx : ext/string_vec.cmx ext/string_set.cmx \
     ext/string_map.cmx ext/literals.cmx ext/ext_string.cmx \
     ext/ext_position.cmx ext/ext_path.cmx ext/ext_namespace.cmx \
-    ext/ext_json_types.cmx ext/ext_json.cmx ext/ext_filename.cmx \
-    ext/ext_file_pp.cmx ext/ext_array.cmx bsb/bsb_log.cmx \
-    bsb/bsb_file_groups.cmx bsb/bsb_exception.cmx bsb/bsb_dir_index.cmx \
-    bsb/bsb_db.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
-    bsb/bsb_build_schemas.cmx bsb/bsb_parse_sources.cmi
+    ext/ext_json_types.cmx ext/ext_json_parse.cmx ext/ext_json.cmx \
+    ext/ext_filename.cmx ext/ext_file_pp.cmx ext/ext_array.cmx \
+    bsb/bsb_log.cmx bsb/bsb_file_groups.cmx bsb/bsb_exception.cmx \
+    bsb/bsb_dir_index.cmx bsb/bsb_db.cmx bsb/bsb_config.cmx \
+    bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx \
+    bsb/bsb_parse_sources.cmi
 bsb/bsb_pkg.cmx : ext/string_hashtbl.cmx ext/literals.cmx bsb/bsb_log.cmx \
     bsb/bsb_exception.cmx bsb/bsb_pkg.cmi
 bsb/bsb_query.cmx : ext/string_map.cmx ext/ext_json_noloc.cmx \

jscomp/bsb/bsb_clean.ml

@@ -45,6 +45,7 @@ let clean_bs_garbage bsc_dir proj_dir =
     if Sys.file_exists x then
       Bsb_unix.remove_dir_recursive x  in
   try  
+    Bsb_parse_sources.clean_re_js proj_dir; (* clean re.js files*)
     ninja_clean bsc_dir proj_dir ; 
     List.iter try_remove Bsb_config.all_lib_artifacts;    
   with

jscomp/bsb/bsb_config_parse.ml

@@ -293,6 +293,7 @@ let interpret_json
             ~not_dev
             ~root: cwd
             ~cut_generators: !cut_generators
+            ~clean_staled_bs_js:true (*TODO: IMPROVE if not suffix .bs.js *)
             ~namespace
             x in 
         if generate_watch_metadata then

jscomp/bsb/bsb_parse_sources.ml

@@ -51,6 +51,7 @@ type cxt = {
   cut_generators : bool;
   traverse : bool;
   namespace : string option;
+  clean_staled_bs_js: bool;
 }
 
 (** [public] has a list of modules, we do a sanity check to see if all the listed 
@@ -217,6 +218,9 @@ let try_unlink s =
     Bsb_log.info "@{<info>Failed to remove %s}@." s 
 
 
+(** This is the only place where we do some removal during scanning,
+  configurabl
+*)    
 let clean_staled_bs_js_files 
     (context : cxt) 
     (cur_sources : _ String_map.t ) 
@@ -369,7 +373,10 @@ let rec
     | Some s, _  -> parse_sources cxt s 
   in 
   (** Do some clean up *)  
-  clean_staled_bs_js_files cxt cur_sources (Lazy.force file_array );  
+  if cxt.clean_staled_bs_js then 
+  begin
+    clean_staled_bs_js_files cxt cur_sources (Lazy.force file_array )
+  end;
   Bsb_file_groups.merge {
     files =  [ { dir ; 
                  sources = cur_sources; 
@@ -396,7 +403,8 @@ and parsing_single_source ({not_dev; dir_index ; cwd} as cxt ) (x : Ext_json_typ
   | Obj {map} ->
     let current_dir_index = 
       match String_map.find_opt Bsb_build_schemas.type_ map with 
-      | Some (Str {str="dev"}) -> Bsb_dir_index.get_dev_index ()
+      | Some (Str {str="dev"}) -> 
+        Bsb_dir_index.get_dev_index ()
       | Some _ -> Bsb_exception.config_error x {|type field expect "dev" literal |}
       | None -> dir_index in 
     if not_dev && not (Bsb_dir_index.is_lib_dir current_dir_index) then 
@@ -430,13 +438,89 @@ and  parse_sources ( cxt : cxt) (sources : Ext_json_types.t )  =
 
 
 
-let scan ~not_dev ~root ~cut_generators ~namespace x = 
+let scan ~not_dev ~root ~cut_generators ~namespace ~clean_staled_bs_js x = 
   parse_sources {
     not_dev;
     dir_index = Bsb_dir_index.lib_dir_index;
     cwd = Filename.current_dir_name;
     root ;
     cut_generators;
     namespace;
+    clean_staled_bs_js;
     traverse = false
-  } x
+  } x
+
+
+
+type walk_cxt = {
+    cwd : string ;
+    root : string;
+    traverse : bool;
+  }
+let rec walk_sources (cxt : walk_cxt) (sources : Ext_json_types.t) = 
+  match sources with 
+  | Arr {content =  file_groups} -> 
+    Array.iter (fun x -> walk_single_source cxt x) file_groups
+  | x -> walk_single_source  cxt x    
+and walk_single_source cxt (x : Ext_json_types.t) =      
+  match x with 
+  | Str {str = dir} 
+    -> 
+    walk_source_dir_map 
+      {cxt with 
+        cwd = 
+        Ext_path.concat cxt.cwd 
+        (Ext_filename.simple_convert_node_path_to_os_path dir)
+      }
+      String_map.empty   
+  | Obj {map} ->       
+    begin match String_map.find_opt Bsb_build_schemas.dir map with 
+    | Some (Str{str}) -> 
+      let dir = Ext_filename.simple_convert_node_path_to_os_path str  in 
+      walk_source_dir_map 
+      {cxt with cwd = Ext_path.concat cxt.cwd dir} map
+    | _ -> ()
+    end
+  | _ -> ()  
+and walk_source_dir_map (cxt : walk_cxt) (input : Ext_json_types.t String_map.t) =   
+    let working_dir = Filename.concat cxt.root cxt.cwd in 
+    let file_array = Sys.readdir working_dir in 
+    file_array |> Array.iter begin fun file -> 
+        if Ext_string.ends_with file ".re.js" then 
+          Sys.remove file 
+    end; 
+    let sub_dirs_field = 
+        String_map.find_opt Bsb_build_schemas.subdirs input in 
+    let cxt_traverse = cxt.traverse in     
+    match sub_dirs_field, cxt_traverse with     
+    | None, true 
+    | Some(True _), _ -> 
+      file_array |> Array.iter begin fun f -> 
+      if Sys.is_directory (Filename.concat working_dir f ) then 
+        walk_source_dir_map 
+        {cxt with 
+          cwd = 
+            Ext_path.concat cxt.cwd
+            (Ext_filename.simple_convert_node_path_to_os_path f);
+          traverse = true
+          } String_map.empty 
+      end   
+    | None, _ 
+    | Some (False _), _ -> ()      
+    | Some s, _ -> walk_sources cxt s 
+
+let clean_re_js root =     
+  match Ext_json_parse.parse_json_from_file 
+      (Filename.concat root Literals.bsconfig_json) with 
+  | Obj {map ; loc} -> 
+    begin match String_map.find_opt Bsb_build_schemas.sources map with 
+    | Some config -> 
+      (try 
+        walk_sources 
+        { root ; traverse = true; cwd = Filename.current_dir_name} config
+      with _ -> ())
+    | None  -> ()
+    end  
+  | _  -> () 
+  | exception _ -> ()    
+  

jscomp/bsb/bsb_parse_sources.mli

@@ -34,5 +34,9 @@ val scan :
   root: string ->  
   cut_generators: bool -> 
   namespace : string option -> 
+  clean_staled_bs_js:bool -> 
   Ext_json_types.t ->   
-  Bsb_file_groups.t
+  Bsb_file_groups.t
+
+val clean_re_js:  
+  string -> unit