Remove command line processing.

Author: cristianoc

jscomp/core/js_implementation.ml

@@ -41,13 +41,9 @@ let output_deps_set name set =
     set;
   output_string stdout "\n"
 
-let process_with_gentype filename =
-  match !Clflags.bs_gentype with
-  | false -> ()
-  | true ->
-      GenType.executeCliCommand
-        ~printUsageAndExit:(fun () -> ())
-        (Add (filename ^ ":" ^ !Location.input_name))
+let process_with_gentype cmt_file =
+  if !Clflags.bs_gentype then
+    GenType.processCmt cmt_file
 
 let after_parsing_sig ppf outputprefix ast =
   Ast_config.iter_on_bs_config_sigi ast;

jscomp/gentype/GenType.ml

@@ -1,47 +1,5 @@
-let version = Version.version
-
-type cliCommand = Add of string | NoOp
-
-let executeCliCommand ~printUsageAndExit cliCommand =
-  match cliCommand with
-  | Add s ->
-      Log_.Color.forceColor := true;
-      let splitColon = Str.split (Str.regexp ":") s in
-      let cmt, mlast =
-        match splitColon with
-        | cmt :: rest ->
-            let mlast = rest |> String.concat "" in
-            (cmt, mlast)
-        | _ -> assert false
-      in
-      let config = Paths.readConfig ~namespace:(cmt |> Paths.findNameSpace) in
-      if !Debug.basic then Log_.item "Add %s  %s\n" cmt mlast;
-      cmt |> GenTypeMain.processCmtFile ~config;
-      exit 0
-  | NoOp -> printUsageAndExit ()
-
-let cli () =
-  let cliCommand = ref NoOp in
-  let usage = "genType version " ^ version in
-  let versionAndExit () =
-    print_endline usage;
-    exit 0
-  in
-  let rec printUsageAndExit () =
-    Arg.usage speclist usage;
-    exit 0
-  and setCliCommand command =
-    if !cliCommand <> NoOp then printUsageAndExit ();
-    cliCommand := command
-  and setAdd s = Add s |> setCliCommand
-  and speclist =
-    [
-      ("-cmt-add", Arg.String setAdd, "compile a .cmt[i] file");
-      ("-version", Arg.Unit versionAndExit, "show version information and exit");
-      ("--version", Arg.Unit versionAndExit, "show version information and exit");
-    ]
-  in
-  let anonArg s = print_endline s
-  in
-  Arg.parse speclist anonArg usage;
-  executeCliCommand ~printUsageAndExit !cliCommand
+let processCmt cmt =
+  Log_.Color.forceColor := true;
+  let config = Paths.readConfig ~namespace:(cmt |> Paths.findNameSpace) in
+  if !Debug.basic then Log_.item "Add %s\n" cmt;
+  cmt |> GenTypeMain.processCmtFile ~config

jscomp/gentype/Version.ml

@@ -241928,66 +241928,15 @@ let processCmtFile ~config cmt =
       outputFile |> GeneratedFiles.logFileAction NoMatch;
       if Sys.file_exists outputFile then Unix.unlink outputFile)
 
-end
-module Version
-= struct
-#1 "Version.ml"
-
-(* CREATED BY genType/scripts/bump_version_module.js *)
-(* DO NOT MODIFY BY HAND, WILL BE AUTOMATICALLY UPDATED BY npm version *)
-let version = "4.4.0";
-
 end
 module GenType
 = struct
 #1 "GenType.ml"
-let version = Version.version
-
-type cliCommand = Add of string | NoOp
-
-let executeCliCommand ~printUsageAndExit cliCommand =
-  match cliCommand with
-  | Add s ->
-      Log_.Color.forceColor := true;
-      let splitColon = Str.split (Str.regexp ":") s in
-      let cmt, mlast =
-        match splitColon with
-        | cmt :: rest ->
-            let mlast = rest |> String.concat "" in
-            (cmt, mlast)
-        | _ -> assert false
-      in
-      let config = Paths.readConfig ~namespace:(cmt |> Paths.findNameSpace) in
-      if !Debug.basic then Log_.item "Add %s  %s\n" cmt mlast;
-      cmt |> GenTypeMain.processCmtFile ~config;
-      exit 0
-  | NoOp -> printUsageAndExit ()
-
-let cli () =
-  let cliCommand = ref NoOp in
-  let usage = "genType version " ^ version in
-  let versionAndExit () =
-    print_endline usage;
-    exit 0
-  in
-  let rec printUsageAndExit () =
-    Arg.usage speclist usage;
-    exit 0
-  and setCliCommand command =
-    if !cliCommand <> NoOp then printUsageAndExit ();
-    cliCommand := command
-  and setAdd s = Add s |> setCliCommand
-  and speclist =
-    [
-      ("-cmt-add", Arg.String setAdd, "compile a .cmt[i] file");
-      ("-version", Arg.Unit versionAndExit, "show version information and exit");
-      ("--version", Arg.Unit versionAndExit, "show version information and exit");
-    ]
-  in
-  let anonArg s = print_endline s
-  in
-  Arg.parse speclist anonArg usage;
-  executeCliCommand ~printUsageAndExit !cliCommand
+let processCmt cmt =
+  Log_.Color.forceColor := true;
+  let config = Paths.readConfig ~namespace:(cmt |> Paths.findNameSpace) in
+  if !Debug.basic then Log_.item "Add %s\n" cmt;
+  cmt |> GenTypeMain.processCmtFile ~config
 
 end
 module Includeclass : sig 
@@ -291711,13 +291660,9 @@ let output_deps_set name set =
     set;
   output_string stdout "\n"
 
-let process_with_gentype filename =
-  match !Clflags.bs_gentype with
-  | false -> ()
-  | true ->
-      GenType.executeCliCommand
-        ~printUsageAndExit:(fun () -> ())
-        (Add (filename ^ ":" ^ !Location.input_name))
+let process_with_gentype cmt_file =
+  if !Clflags.bs_gentype then
+    GenType.processCmt cmt_file
 
 let after_parsing_sig ppf outputprefix ast =
   Ast_config.iter_on_bs_config_sigi ast;

lib/4.06.1/whole_compiler.ml

@@ -472,7 +472,6 @@
 ../lib/4.06.1/whole_compiler.ml: ./gentype/TypeEnv.ml
 ../lib/4.06.1/whole_compiler.ml: ./gentype/TypeEnv.mli
 ../lib/4.06.1/whole_compiler.ml: ./gentype/TypeVars.ml
-../lib/4.06.1/whole_compiler.ml: ./gentype/Version.ml
 ../lib/4.06.1/whole_compiler.ml: ./js_parser/comment_attachment.ml
 ../lib/4.06.1/whole_compiler.ml: ./js_parser/declaration_parser.ml
 ../lib/4.06.1/whole_compiler.ml: ./js_parser/enum_common.ml