Switch TS modules to the new command engine

commit_hash:4a47a06eeb108a583bf158b4e3dc36c22591be92

10 files changed, 26 insertions, 13 deletions

diff --git a/build/conf/ts/node_modules.conf b/build/conf/ts/node_modules.conf
index 585da219047..7c2fdd91450 100644
--- a/build/conf/ts/node_modules.conf
+++ b/build/conf/ts/node_modules.conf
@@ -48,7 +48,8 @@ _PREPARE_NO_DEPS_CMD=$TOUCH_UNIT \
     ${hide;kv:"pc magenta"} ${hide;kv:"p TS_NODEP"}
 
 module _PREPARE_DEPS_BASE: _BARE_UNIT {
-    .CMD=_PREPARE_DEPS_CMD
+    .CMD=$_PREPARE_DEPS_CMD
+    .STRUCT_CMD=yes
     .IGNORED=SRCS FILES TS_FILES COPY_FILE RUN_JAVASCRIPT_AFTER_BUILD RUN_JAVASCRIPT
     # Propagates peers to related modules
     .PEERDIR_POLICY=as_build_from
diff --git a/build/conf/ts/ts_next.conf b/build/conf/ts/ts_next.conf
index 0ac853ec76f..57122abda94 100644
--- a/build/conf/ts/ts_next.conf
+++ b/build/conf/ts/ts_next.conf
@@ -56,7 +56,8 @@ TS_NEXT_CMD=$_TS_PROJECT_SETUP_CMD \
 ###
 multimodule TS_NEXT {
     module BUILD: _TS_BASE_UNIT {
-        .CMD=TS_NEXT_CMD
+        .CMD=$TS_NEXT_CMD
+        .STRUCT_CMD=yes
         .SEM=_SEM_IGNORED
         .EPILOGUE=_TS_CONFIG_EPILOGUE
         .PEERDIRSELF=TS_PREPARE_DEPS
diff --git a/build/conf/ts/ts_package.conf b/build/conf/ts/ts_package.conf
index cef3941822d..63ba21b5758 100644
--- a/build/conf/ts/ts_package.conf
+++ b/build/conf/ts/ts_package.conf
@@ -1,6 +1,6 @@
 TS_PACK=$_TS_PROJECT_SETUP_CMD \
     && $NOTS_TOOL $NOTS_TOOL_BASE_ARGS build-package \
-    --output-file ${output:TARGET} \
+    --output-file ${TARGET} \
     $_NODE_MODULES_INOUTS $_TS_FILES_INOUTS \
     ${hide;kv:"p TS_PKG"} ${hide;kv:"pc magenta"} \
     $_RUN_JAVASCRIPT_AFTER_BUILD_TS_PACKAGE_EXTRA \
@@ -33,7 +33,8 @@ macro _TS_PACKAGE_EPILOGUE() {
 ###
 multimodule TS_PACKAGE {
     module BUILD: _TS_BASE_UNIT {
-        .CMD=TS_PACK
+        .CMD=$TS_PACK
+        .STRUCT_CMD=yes
         .SEM=_SEM_IGNORED
         .EPILOGUE=_TS_PACKAGE_EPILOGUE
         .ALLOWED=TS_FILES TS_FILES_GLOB
diff --git a/build/conf/ts/ts_proto.conf b/build/conf/ts/ts_proto.conf
index f90f3906cfc..57fe5c9a0fe 100644
--- a/build/conf/ts/ts_proto.conf
+++ b/build/conf/ts/ts_proto.conf
@@ -14,7 +14,8 @@ _TS_PROTO_IMPL_CMD=$_TS_PROJECT_SETUP_CMD \
 
 ### # internal
 module _TS_PROTO_IMPL: _TS_BASE_UNIT {
-    .CMD=_TS_PROTO_IMPL_CMD
+    .CMD=$_TS_PROTO_IMPL_CMD
+    .STRUCT_CMD=yes
     .SEM=_SEM_IGNORED
     .IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER USE_SKIFF CPP_PROTO_PLUGIN2 PY_PROTO_PLUGIN YMAPS_SPROTO RESOURCE PY_SRCS
     # We need to collect SRCS paths into list to pass to command
diff --git a/build/conf/ts/ts_rspack.conf b/build/conf/ts/ts_rspack.conf
index fe75f9bea43..2ed1478460d 100644
--- a/build/conf/ts/ts_rspack.conf
+++ b/build/conf/ts/ts_rspack.conf
@@ -47,7 +47,8 @@ TS_RSPACK_CMD=$_TS_PROJECT_SETUP_CMD \
 ###
 multimodule TS_RSPACK {
     module BUILD: _TS_BASE_UNIT {
-        .CMD=TS_RSPACK_CMD
+        .CMD=$TS_RSPACK_CMD
+        .STRUCT_CMD=yes
         .SEM=_SEM_IGNORED
         .EPILOGUE=_TS_CONFIG_EPILOGUE
         .PEERDIRSELF=TS_PREPARE_DEPS
diff --git a/build/conf/ts/ts_test.conf b/build/conf/ts/ts_test.conf
index d81d8316b20..9e48a7aaa81 100644
--- a/build/conf/ts/ts_test.conf
+++ b/build/conf/ts/ts_test.conf
@@ -33,7 +33,8 @@ TS_TEST_JEST_CMD=$TOUCH_UNIT \
 ###     END()
 ###
 module TS_TEST_JEST_FOR: _TS_TEST_BASE {
-    .CMD=TS_TEST_JEST_CMD
+    .CMD=$TS_TEST_JEST_CMD
+    .STRUCT_CMD=yes
 
     # compatibility with old TS_TEST_SRCS
     SET(TS_TEST_EXTENSION (test|spec).(ts|tsx|mts|cts|js|jsx|mjs|cjs))
@@ -65,7 +66,8 @@ TS_TEST_HERMIONE_CMD=$TOUCH_UNIT ${hide:PEERS} \
 ###     END()
 ###
 module TS_TEST_HERMIONE_FOR: _TS_TEST_BASE {
-    .CMD=TS_TEST_HERMIONE_CMD
+    .CMD=$TS_TEST_HERMIONE_CMD
+    .STRUCT_CMD=yes
 
     # compatibility with old TS_TEST_SRCS
     SET(TS_TEST_EXTENSION hermione.(ts|js))
@@ -98,7 +100,8 @@ TS_TEST_PLAYWRIGHT_CMD=$TOUCH_UNIT \
 ###     END()
 ###
 module TS_TEST_PLAYWRIGHT_FOR: _TS_TEST_BASE {
-    .CMD=TS_TEST_PLAYWRIGHT_CMD
+    .CMD=$TS_TEST_PLAYWRIGHT_CMD
+    .STRUCT_CMD=yes
 
     # compatibility with old TS_TEST_SRCS
     SET(TS_TEST_EXTENSION (playwright|spec|test).(ts|js))
@@ -129,7 +132,8 @@ TS_TEST_PLAYWRIGHT_LARGE_CMD=$TOUCH_UNIT \
 ###     END()
 ###
 module TS_TEST_PLAYWRIGHT_LARGE_FOR: _TS_TEST_BASE {
-    .CMD=TS_TEST_PLAYWRIGHT_LARGE_CMD
+    .CMD=$TS_TEST_PLAYWRIGHT_LARGE_CMD
+    .STRUCT_CMD=yes
 
     # compatibility with old TS_TEST_SRCS
     SET(TS_TEST_EXTENSION (playwright|spec).(ts|js))
diff --git a/build/conf/ts/ts_tsc.conf b/build/conf/ts/ts_tsc.conf
index b77e564917a..758d7be508d 100644
--- a/build/conf/ts/ts_tsc.conf
+++ b/build/conf/ts/ts_tsc.conf
@@ -20,7 +20,8 @@ TS_TSC_CMD=$_TS_PROJECT_SETUP_CMD \
 ###
 multimodule TS_TSC {
     module BUILD: _TS_BASE_UNIT {
-        .CMD=TS_TSC_CMD
+        .CMD=$TS_TSC_CMD
+        .STRUCT_CMD=yes
         .SEM=_SEM_IGNORED
         .EPILOGUE=_TS_CONFIG_EPILOGUE
         .PEERDIRSELF=TS_PREPARE_DEPS
diff --git a/build/conf/ts/ts_vite.conf b/build/conf/ts/ts_vite.conf
index ed4796a1ebe..1228a2b9144 100644
--- a/build/conf/ts/ts_vite.conf
+++ b/build/conf/ts/ts_vite.conf
@@ -56,7 +56,8 @@ TS_VITE_CMD=$_TS_PROJECT_SETUP_CMD \
 ###
 multimodule TS_VITE {
     module BUILD: _TS_BASE_UNIT {
-        .CMD=TS_VITE_CMD
+        .CMD=$TS_VITE_CMD
+        .STRUCT_CMD=yes
         .SEM=_SEM_IGNORED
         .EPILOGUE=_TS_CONFIG_EPILOGUE
         .PEERDIRSELF=TS_PREPARE_DEPS
diff --git a/build/conf/ts/ts_webpack.conf b/build/conf/ts/ts_webpack.conf
index 7a088b92468..06c8fa226bd 100644
--- a/build/conf/ts/ts_webpack.conf
+++ b/build/conf/ts/ts_webpack.conf
@@ -54,7 +54,8 @@ TS_WEBPACK_CMD=$_TS_PROJECT_SETUP_CMD \
 ###
 multimodule TS_WEBPACK {
     module BUILD: _TS_BASE_UNIT {
-        .CMD=TS_WEBPACK_CMD
+        .CMD=$TS_WEBPACK_CMD
+        .STRUCT_CMD=yes
         .SEM=_SEM_IGNORED
         .EPILOGUE=_TS_CONFIG_EPILOGUE
         .PEERDIRSELF=TS_PREPARE_DEPS
diff --git a/build/plugins/nots.py b/build/plugins/nots.py
index 6a3f42b779a..65aa51c2632 100644
--- a/build/plugins/nots.py
+++ b/build/plugins/nots.py
@@ -993,6 +993,7 @@ def __on_ts_files(unit: NotsUnitType, files_in: list[str], files_out: list[str])
             )
 
     new_items = _build_cmd_input_paths(paths=files_in, hide=True, disable_include_processor=True)
+    new_items += " "
     new_items += _build_cmd_output_paths(paths=files_out, hide=True)
     __set_append(unit, "_TS_FILES_INOUTS", new_items)