Merge pull request #22 from alexfedoseev/allow-dup-ids

Add --allow-duplicates flag

Author: cknitt

bin/Extract.re

@@ -4,15 +4,21 @@ module StringMap = Map.Make(String);
 
 let messages = ref(StringMap.empty);
 
+let duplicatesAreAllowed = ref(false);
+
 let iterator =
   ExtractionIterator.getIterator(message => {
-    let {Message.id} = message;
-    if (messages^ |> StringMap.mem(id)) {
+    let {Message.id, defaultMessage} = message;
+    switch (messages^ |> StringMap.find_opt(id)) {
+    | None => messages := messages^ |> StringMap.add(id, message)
+    | Some(existingMessage) when duplicatesAreAllowed^ && defaultMessage == existingMessage.defaultMessage =>
+      messages := messages^ |> StringMap.add(id, message)
+    | Some(existingMessage) when duplicatesAreAllowed^ && defaultMessage != existingMessage.defaultMessage =>
+      Printf.eprintf("Error: duplicate message id: %s with different default messages\n", id);
+      exit(3);
+    | Some(_) =>
       Printf.eprintf("Error: duplicate message id: %s\n", id);
       exit(3);
-    } else {
-      messages := messages^ |> StringMap.add(id, message);
-      ();
     };
   });
 
@@ -27,7 +33,7 @@ let processReasonFile = path => {
 };
 
 let rec processPath = path => {
-  if (!Sys.file_exists(path)) {
+  if (! Sys.file_exists(path)) {
     Printf.eprintf("Error: file or directory does not exist: %s\n", path);
     exit(1);
   };
@@ -60,7 +66,16 @@ let showVersion = () => {
   exit(0);
 };
 
-let args = [("-v", Arg.Unit(showVersion), "shows the program version")];
+let allowDuplicates = () => duplicatesAreAllowed := true;
+
+let args = [
+  ("-v", Arg.Unit(showVersion), "shows the program version"),
+  (
+    "--allow-duplicates",
+    Arg.Unit(allowDuplicates),
+    "allows entities with identical `id` props if `defaultMessage` props are identical as well",
+  ),
+];
 
 let usage = "Usage: " ++ Sys.argv[0] ++ " [path...]";
 

test/Test.re

@@ -9,6 +9,7 @@ module Usage = {
     ++ CmdLine.pathToExtractExe
     ++ " [path...]
   -v shows the program version
+  --allow-duplicates allows entities with identical `id` props if `defaultMessage` props are identical as well
   -help  Display this list of options
   --help  Display this list of options
 ";
@@ -69,7 +70,34 @@ module Extract = {
 
   let testExtractPartial = () => checkRes("test/test1/subdir/Test_1_2.re test/test2", (partial, ""));
 
-  let testSet = [("Extract full", `Quick, testExtractFull), ("Extract partial", `Quick, testExtractPartial)];
+  let dup = {|[
+  { "id": "test3.msg1.1", "defaultMessage": "This is message 1.1" },
+  { "id": "test3.msg1.2", "defaultMessage": "This is message 1.2" },
+  { "id": "test3.msg1.3", "defaultMessage": "This is message 1.3" }
+]
+|};
+
+  let testExtractDup = () => checkRes("--allow-duplicates test/test3/Test_1_1.re test/test3/Test_1_2.re", (dup, ""));
+
+  let dupWithoutFlagError = "Error: duplicate message id: test3.msg1.1\n";
+
+  let testExtractDupWithoutFlagError = () => checkRes("test/test3/Test_1_1.re test/test3/Test_1_2.re", ("", dupWithoutFlagError));
+
+  let dupWithDifferentDefaultMessageError = "Error: duplicate message id: test3.msg1.1 with different default messages\n";
+
+  let testExtractDupWithDifferentDefaultMessageError = () =>
+    checkRes(
+      "--allow-duplicates test/test3/Test_1_1.re test/test3/Test_1_2.re test/test3/Test_1_3.re",
+      ("", dupWithDifferentDefaultMessageError),
+    );
+
+  let testSet = [
+    ("Extract full", `Quick, testExtractFull),
+    ("Extract partial", `Quick, testExtractPartial),
+    ("Extract dup", `Quick, testExtractDup),
+    ("Extract dup without flag error", `Quick, testExtractDupWithoutFlagError),
+    ("Extract dup with different defaultMessage error", `Quick, testExtractDupWithDifferentDefaultMessageError),
+  ];
 };
 
 let () =

test/test3/Test_1_1.re

@@ -0,0 +1,2 @@
+let renderMessage1 = () => <ReactIntl.FormattedMessage id="test3.msg1.1" defaultMessage="This is message 1.1" />;
+let renderMessage2 = () => <ReactIntl.FormattedMessage id="test3.msg1.2" defaultMessage="This is message 1.2" />;

test/test3/Test_1_2.re

@@ -0,0 +1,2 @@
+let renderMessage1 = () => <ReactIntl.FormattedMessage id="test3.msg1.1" defaultMessage="This is message 1.1" />;
+let renderMessage3 = () => <ReactIntl.FormattedMessage id="test3.msg1.3" defaultMessage="This is message 1.3" />;

test/test3/Test_1_3.re

@@ -0,0 +1 @@
+let renderMessage1 = () => <ReactIntl.FormattedMessage id="test3.msg1.1" defaultMessage="This is different message 1.1" />;