Extract messages from ReactIntl.defineMessages, too.

Author: cknitt

bin/Extract.re

@@ -4,7 +4,7 @@ open Lib;
 
 let messages = ref([]);
 
-let iterator = ExtractionIterator.getIterator(message => messages := [message, ...messages^]);
+let iterator = ExtractionIterator.getIterator(message => (messages := [message, ...messages^]) |> ignore);
 
 let extractMessages = ast => iterator.structure(iterator, Obj.magic(ast));
 

lib/ExtractionIterator.re

@@ -1,40 +1,100 @@
 open Ast_iterator;
 
+open Asttypes;
+
 open Parsetree;
 
-let getLabelString = (key, labels) =>
-  switch (labels |> List.assoc_opt(Asttypes.Labelled(key))) {
-  | Some({pexp_desc: Pexp_constant(Pconst_string(text, _))}) => Some(text)
-  | _ => None
-  };
-
-let getMessage = expr =>
-  switch (expr) {
-  | {
-      pexp_desc:
-        Pexp_apply(
-          {
-            pexp_desc: Pexp_ident({txt: Ldot(Ldot(Lident("ReactIntl"), "FormattedMessage"), "createElement"), loc}),
-          },
-          labels,
-        ),
-    } =>
-    let id = labels |> getLabelString("id");
-    let defaultMessage = labels |> getLabelString("defaultMessage");
-    let description = labels |> getLabelString("description");
-    switch (id, defaultMessage) {
-    | (Some(id), Some(defaultMessage)) => Some({Message.id, defaultMessage, description})
-    | _ => None
-    };
-  | _ => None
-  };
+open Longident;
+
+module StringMap = Map.Make(String);
+
+let extractMessageFromLabels = labels => {
+  let map = ref(StringMap.empty);
+  labels
+  |> List.iter(assoc =>
+       switch (assoc) {
+       | (Asttypes.Labelled(key), {pexp_desc: Pexp_constant(Pconst_string(value, _))}) =>
+         map := map^ |> StringMap.add(key, value)
+       | _ => ()
+       }
+     );
+  Message.fromStringMap(map^);
+};
+
+let extractMessageFromRecord = fields => {
+  let map = ref(StringMap.empty);
+  fields
+  |> List.iter(field =>
+       switch (field) {
+       | ({txt: Lident(key)}, {pexp_desc: Pexp_constant(Pconst_string(value, _))}) =>
+         map := map^ |> StringMap.add(key, value)
+       | _ => ()
+       }
+     );
+  Message.fromStringMap(map^);
+};
+
+let extractMessagesFromRecords = (callback, records) =>
+  records
+  |> List.iter(field =>
+       switch (field) {
+       | (
+           {txt: Lident(s)},
+           {
+             pexp_desc:
+               Pexp_extension((
+                 {txt: "bs.obj"},
+                 PStr([{pstr_desc: Pstr_eval({pexp_desc: Pexp_record(fields, _)}, _), pstr_loc: _}]),
+               )),
+           },
+         ) =>
+         switch (extractMessageFromRecord(fields)) {
+         | Some(message) => callback(message)
+         | _ => ()
+         }
+       | _ => ()
+       }
+     );
 
 let getIterator = callback => {
   ...default_iterator,
   expr: (iterator, expr) => {
-    switch (getMessage(expr)) {
-    | Some(message) => callback(message)
-    | None => ()
+    switch (expr) {
+    /* Match ReactIntl.FormattedMessage.createElement */
+    | {
+        pexp_desc:
+          Pexp_apply(
+            {
+              pexp_desc: Pexp_ident({txt: Ldot(Ldot(Lident("ReactIntl"), "FormattedMessage"), "createElement"), _}),
+            },
+            labels,
+          ),
+      } =>
+      switch (extractMessageFromLabels(labels)) {
+      | Some(message) => callback(message)
+      | _ => ()
+      }
+    /* Match ReactIntl.defineMessages */
+    | {
+        pexp_desc:
+          Pexp_apply(
+            {pexp_desc: Pexp_ident({txt: Ldot(Lident("ReactIntl"), "defineMessages"), _})},
+            [
+              (
+                Asttypes.Nolabel,
+                {
+                  pexp_desc:
+                    Pexp_extension((
+                      {txt: "bs.obj"},
+                      PStr([{pstr_desc: Pstr_eval({pexp_desc: Pexp_record(fields, _)}, _), pstr_loc: _}]),
+                    )),
+                },
+              ),
+            ],
+          ),
+      } =>
+      extractMessagesFromRecords(callback, fields)
+    | _ => ()
     };
     default_iterator.expr(iterator, expr);
   },

lib/Message.re

@@ -1,3 +1,5 @@
+module StringMap = Map.Make(String);
+
 type t = {
   id: string,
   defaultMessage: string,
@@ -6,6 +8,16 @@ type t = {
 
 let compare = (a, b) => compare(a.id, b.id);
 
+let fromStringMap = map => {
+  let id = map |> StringMap.find_opt("id");
+  let defaultMessage = map |> StringMap.find_opt("defaultMessage");
+  let description = map |> StringMap.find_opt("description");
+  switch (id, defaultMessage) {
+  | (Some(id), Some(defaultMessage)) => Some({id, defaultMessage, description})
+  | _ => None
+  };
+};
+
 let toJson = ({id, defaultMessage, description}) =>
   switch (description) {
   | Some(description) =>