Accept a directory as the single command line argument.

Author: cknitt

.gitignore

@@ -8,5 +8,5 @@ _esyinstall
 _release
 *.byte
 *.native
-esy-reason-project.install
+bs-react-intl-extractor.install
 .DS_Store

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
   "reason.format.width": 120,
   "editor.rulers": [120],
-  "editor.tabSize": 2
+  "editor.tabSize": 2,
+  "editor.renderIndentGuides": false
 }

bin/Extract.re

@@ -1,28 +1,56 @@
 open Migrate_parsetree;
 
-open Ast_mapper;
-
-open Parsetree;
-
 open Lib;
 
 let messages = ref([]);
 
-let mapper = ExtractionMapper.getMapper(message => messages := [message, ...messages^]);
+let iterator = ExtractionIterator.getIterator(message => messages := [message, ...messages^]);
+
+let extractMessages = ast => iterator.structure(iterator, Obj.magic(ast));
+
+let readMessagesFromChannel = channel =>
+  switch (Ast_io.from_channel(channel)) {
+  | Result.Ok((_, Ast_io.Impl((module Version), ast))) =>
+    module Convert = Convert(Version, OCaml_406);
+    let converted = Obj.magic(Convert.copy_structure(ast));
+    extractMessages(converted);
+  | Result.Ok((_, Ast_io.Intf(_, _))) => Printf.eprintf("Interface AST not supported, only implementation AST\n")
+  | Result.Error(Not_a_binary_ast(_)) => Printf.eprintf("Error: input is not a binary AST\n")
+  | Result.Error(Unknown_version(v)) => Printf.eprintf("Error: unknown AST version: %s\n", v)
+  };
+
+let processFile = filename => {
+  let channel = Unix.open_process_in("refmt -p binary " ++ filename);
+  readMessagesFromChannel(channel);
+};
+
+let rec processDirectory = dir =>
+  Sys.readdir(dir)
+  |> Array.iter(filename => {
+       let path = Filename.concat(dir, filename);
+       if (Sys.is_directory(path)) {
+         processDirectory(path);
+       } else if (Filename.extension(filename) == ".re") {
+         processFile(path);
+       };
+     });
 
-let extractMessages = ast => {
-  mapper.structure(mapper, Obj.magic(ast)) |> ignore;
+let outputJson = () => {
   let sortedJsonObjects = messages^ |> List.sort(Message.compare) |> List.map(Message.toJson);
   Yojson.Basic.pretty_to_channel(stdout, `List(sortedJsonObjects));
   print_newline();
 };
 
-switch (Ast_io.from_channel(stdin)) {
-| Result.Ok((_, Ast_io.Impl((module Version), ast))) =>
-  module Convert = Convert(Version, OCaml_406);
-  let converted = Obj.magic(Convert.copy_structure(ast));
-  extractMessages(converted);
-| Result.Ok((_, Ast_io.Intf(_, _))) => print_endline("Intf AST!")
-| Result.Error(Not_a_binary_ast(_)) => print_endline("Error: not a binary AST: ")
-| Result.Error(Unknown_version(v)) => print_endline("Error: unknown version: " ++ v)
+switch (Array.to_list(Sys.argv)) {
+| [_exe, dir] =>
+  if (! Sys.is_directory(dir)) {
+    Printf.eprintf("Not a directory: %s\n", dir);
+    exit(2);
+  };
+  processDirectory(dir);
+  outputJson();
+| [exe, ..._params] =>
+  Printf.eprintf("Usage: %s <directory>\n", exe);
+  exit(1);
+| _ => () /* cannot happen */
 };

esy-reason-project.opam renamed to bs-react-intl-extractor.opam

@@ -1,18 +1,11 @@
-open Ast_mapper;
+open Ast_iterator;
 
 open Parsetree;
 
 let getLabelString = (key, labels) =>
-  try (
-    {
-      let value = labels |> List.assoc(Asttypes.Labelled(key));
-      switch (value) {
-      | {pexp_desc: Pexp_constant(Pconst_string(text, _))} => Some(text)
-      | _ => None
-      };
-    }
-  ) {
-  | Not_found => None
+  switch (labels |> List.assoc_opt(Asttypes.Labelled(key))) {
+  | Some({pexp_desc: Pexp_constant(Pconst_string(text, _))}) => Some(text)
+  | _ => None
   };
 
 let getMessage = expr =>
@@ -36,13 +29,13 @@ let getMessage = expr =>
   | _ => None
   };
 
-let getMapper = callback => {
-  ...default_mapper,
-  expr: (mapper, expr) => {
+let getIterator = callback => {
+  ...default_iterator,
+  expr: (iterator, expr) => {
     switch (getMessage(expr)) {
     | Some(message) => callback(message)
     | None => ()
     };
-    default_mapper.expr(mapper, expr);
+    default_iterator.expr(iterator, expr);
   },
 };

lib/ExtractionMapper.re renamed to lib/ExtractionIterator.re

@@ -3,5 +3,5 @@
 (library
  ((name lib)
   (flags (-w -40 -w +26))
-  (public_name esy-reason-project)
-  (libraries (ocaml-migrate-parsetree yojson))))
+  (public_name bs-react-intl-extractor)
+  (libraries (ocaml-migrate-parsetree yojson unix))))