Merge pull request #5060 from rescript-lang/fix_5055

fix #5055, add rescript format/convert subcommands

Author: bobzhang

jscomp/bsb/bsb_arg.ml

@@ -71,19 +71,15 @@ let usage_b (buf : Ext_buffer.t) ~usage (speclist : t) =
         let cur = ref 0 in 
         let doc_length = String.length doc in 
         while !cur < doc_length do 
+          if !cur <> 0 then begin 
+            buf +>  "\n";
+            buf +> String.make (!max_col + 4) ' ' ;
+          end;
           match String.index_from_opt doc !cur '\n' with 
           | None -> 
-            if !cur <> 0 then begin 
-              buf +>  "\n";
-              buf +> String.make (!max_col + 4) ' ' ;
-            end;
             buf +> String.sub doc !cur (String.length doc - !cur );
             cur := doc_length
           | Some new_line_pos -> 
-            if !cur <> 0 then begin 
-              buf +>  "\n";
-              buf +> String.make (!max_col + 4) ' ' ;
-            end;
             buf +> String.sub doc !cur (new_line_pos - !cur );
             cur := new_line_pos + 1
         done ;
@@ -149,4 +145,3 @@ let parse_exn  ~usage ~argv ?(start=1) ?(finish=Array.length argv) (speclist : t
   anonfun ~rev_args:!rev_list
 ;;
 
-

jscomp/main/rescript_main.ml

@@ -30,11 +30,7 @@ let watch_mode = ref false
 let make_world = ref false 
 let do_install = ref false
 let force_regenerate = ref false
-let bs_version_string = Bs_version.version
-let print_version_string () = 
-  print_string bs_version_string;
-  print_newline (); 
-  exit 0 
+
 type spec = Bsb_arg.spec
 
 let call_spec f : spec = Unit (Unit_call f )
@@ -115,17 +111,7 @@ let install_target () =
   if eid <> 0 then   
     Bsb_unix.command_fatal_error install_command eid  
 
-let global_help () =  
-  print_string {|Available flags
--v, -version  display version number
--h, -help     display help 
-Subcommands:
-  build    
-  clean
-  help
-Run rescript subcommand -h for more details, for example
-  rescript build -h
-|}     
+
 
 let build_subcommand ~start  argv argv_len =
   let i =  Ext_array.rfind_with_index argv Ext_string.equal separator in   
@@ -189,7 +175,47 @@ let init_subcommand ~start argv =
        Bsb_theme_init.init_sample_project 
          ~cwd:Bsb_global_paths.cwd
          ~theme:!current_theme location
-     )  
+     )
+
+let list_files = ref false     
+let info_subcommand ~start argv =        
+  Bsb_arg.parse_exn 
+    ~usage:"query the project" ~start ~argv [|
+    "-list-files", unit_set_spec list_files,
+    "list source files"
+  |] (fun 
+       ~rev_args -> 
+
+       (match rev_args with 
+        | x :: _  ->
+          raise (Bsb_arg.Bad ("Don't know what to do with " ^ x))
+        | [] -> 
+          ());
+       if !list_files then begin 
+         match 
+           Bsb_ninja_regen.regenerate_ninja 
+             ~package_kind:Toplevel           
+             ~forced:true ~per_proj_dir:Bsb_global_paths.cwd with 
+         | None -> assert false
+         | Some {file_groups = {files}} ->
+           Ext_list.iter files (fun {sources } -> 
+            Map_string.iter sources (fun _ {info;syntax_kind;name_sans_extension} ->
+              let extensions = 
+                  match syntax_kind,info with 
+                  | _, Intf -> assert false 
+                  | Reason , Impl -> [".re" ]
+                  | Reason, Impl_intf -> [".re"; ".rei"]                   
+                  | Ml, Impl -> [".ml"]
+                  | Ml, Impl_intf -> [".ml"; ".mli"]
+                  | Res, Impl -> [".res"]
+                  | Res, Impl_intf -> [".res"; ".resi"] in 
+              Ext_list.iter extensions (fun x -> 
+                print_endline (name_sans_extension ^ x )
+              )      
+             )
+           )
+       end
+     )  ;;
 (* see discussion #929, if we catch the exception, we don't have stacktrace... *)
 let () =  
   let argv = Sys.argv in   
@@ -203,21 +229,15 @@ let () =
         ~per_proj_dir:Bsb_global_paths.cwd  |> ignore;
       ninja_command_exit  [||] 
     end else
-
-
-
       match argv.(1) with 
-      | "-version" | "-v"
-        -> print_version_string ()
-      | "-help" | "-h"
-        -> global_help ()
       | "build" -> 
         build_subcommand ~start:2 argv argv_len
       | "clean" ->         
         clean_subcommand ~start:2 argv      
       | "init" ->  
         init_subcommand ~start:2 argv 
-      | "help" -> global_help ()
+      | "info" -> (* internal *)
+        info_subcommand ~start:2 argv   
       | first_arg -> 
         prerr_endline @@ "Unknown subcommand or flags: " ^ first_arg;
         exit 1

lib/4.06.1/bsb.ml

@@ -1794,19 +1794,15 @@ let usage_b (buf : Ext_buffer.t) ~usage (speclist : t) =
         let cur = ref 0 in 
         let doc_length = String.length doc in 
         while !cur < doc_length do 
+          if !cur <> 0 then begin 
+            buf +>  "\n";
+            buf +> String.make (!max_col + 4) ' ' ;
+          end;
           match String.index_from_opt doc !cur '\n' with 
           | None -> 
-            if !cur <> 0 then begin 
-              buf +>  "\n";
-              buf +> String.make (!max_col + 4) ' ' ;
-            end;
             buf +> String.sub doc !cur (String.length doc - !cur );
             cur := doc_length
           | Some new_line_pos -> 
-            if !cur <> 0 then begin 
-              buf +>  "\n";
-              buf +> String.make (!max_col + 4) ' ' ;
-            end;
             buf +> String.sub doc !cur (new_line_pos - !cur );
             cur := new_line_pos + 1
         done ;
@@ -1873,7 +1869,6 @@ let parse_exn  ~usage ~argv ?(start=1) ?(finish=Array.length argv) (speclist : t
 ;;
 
 
-
 end
 module Bsb_build_schemas
 = struct