fix(node-mono-repo): execute non-ESM compileProtos command when not E…

…SM (#1906) * fix(node): ensure compileProtos is run normally if not esm
googleapis · Nov 29, 2023 · 62fecb3 · 62fecb3
1 parent 9367caa
commit 62fecb3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/synthtool/languages/node_mono_repo.py b/synthtool/languages/node_mono_repo.py
@@ -357,7 +357,7 @@ def compile_protos_hermetic(relative_dir, is_esm=False, hide_output=False):
     """
     logger.debug("Compiling protos...")
     command = (
-        [f"{_TOOLS_DIRECTORY}/node_modules/.bin/compileProtos", "esm/src", "--esm"]
+        [f"{_TOOLS_DIRECTORY}/node_modules/.bin/compileProtos", "src"]
         if not is_esm
         else [f"{_TOOLS_DIRECTORY}/node_modules/.bin/compileProtos", "esm/src", "--esm"]
     )

diff --git a/tests/test_node_mono_repo.py b/tests/test_node_mono_repo.py
@@ -371,6 +371,28 @@ def test_compile_protos_esm(self, shell_run_mock):
             ]
         )
 
+    @patch("synthtool.shell.run")
+    def test_compile_protos_hermetic(self, shell_run_mock):
+        node_mono_repo.compile_protos_hermetic(relative_dir="any", is_esm=False)
+        calls = shell_run_mock.call_args_list
+        assert any(
+            [
+                "/node_modules/.bin/compileProtos src" in " ".join(call[0][0])
+                for call in calls
+            ]
+        )
+
+    @patch("synthtool.shell.run")
+    def test_compile_protos_hermetic_esm(self, shell_run_mock):
+        node_mono_repo.compile_protos_hermetic(relative_dir="any", is_esm=True)
+        calls = shell_run_mock.call_args_list
+        assert any(
+            [
+                "/node_modules/.bin/compileProtos esm/src --esm" in " ".join(call[0][0])
+                for call in calls
+            ]
+        )
+
     @patch("synthtool.shell.run")
     def test_postprocess_gapic_library(self, shell_run_mock):
         node_mono_repo.postprocess_gapic_library()