Merge pull request #10642 from ydb-platform/mergelibs-241019-1758

Library import 241019-1758

9 files changed, 25 insertions, 75 deletions

diff --git a/build/conf/ts/node_modules.conf b/build/conf/ts/node_modules.conf
index 6c73cd17df..719aceb578 100644
--- a/build/conf/ts/node_modules.conf
+++ b/build/conf/ts/node_modules.conf
@@ -7,59 +7,10 @@ NPM_SCRIPT=$NPM_ROOT/node_modules/npm/bin/npm-cli.js
 PM_SCRIPT=
 PM_TYPE=
 
-NPM_CONTRIBS_PATH=-
 # combined input/outputs records as list of directives ${input;hide:<path>} ${output;hide:<path>}, used in builders
 _NODE_MODULES_INOUTS=
 _YATOOL_PREBUILDER_ARG=
 
-macro CUSTOM_CONTRIB_TYPESCRIPT(P) {
-    SET(NPM_CONTRIBS_PATH -)
-}
-
-macro NO_CONTRIB_TYPESCRIPT() {
-    SET(NPM_CONTRIBS_PATH -)
-}
-
-### @usage: NPM_CONTRIBS() # internal
-###
-### Defines special module that provides contrib tarballs from internal npm registry.
-###
-### @see [FROM_NPM_LOCKFILES()](#macro_FROM_NPM_LOCKFILES)
-module NPM_CONTRIBS: _BARE_UNIT {
-    .CMD=TOUCH_UNIT
-    .PEERDIR_POLICY=as_build_from
-    .FINAL_TARGET=no
-    .ALLOWED=FROM_NPM_LOCKFILES
-    .RESTRICTED=PEERDIR
-    .EXTS=_ # Ignore all files, so module is not affected by FROM_NPM output (.EXTS=* is inherited from _BARE_UNIT)
-
-    SET(MODULE_TAG NPM_CONTRIBS)
-    SET(MODULE_LANG TS)
-
-    # .fake tells builder to not materialize it in results
-    SET(MODULE_SUFFIX .fake)
-}
-
-### @usage: FROM_NPM_LOCKFILES(LOCKFILES...) # internal
-###
-### Defines lockfile list for `NPM_CONTRIBS` module.
-###
-### @see [NPM_CONTRIBS()](#module_NPM_CONTRIBS)
-macro FROM_NPM_LOCKFILES(LOCKFILES...) {
-    # SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS $LOCKFILES)
-    # See implementation in build/plugins/nots.py
-    # _FROM_NPM_LOCKFILES($LOCKFILES)
-    MESSAGE("NPM_CONTRIBS and FROM_NPM_LOCKFILES are disabled. Please exclude them from your build process")
-}
-
-FROM_NPM_CWD=$ARCADIA_BUILD_ROOT/$NPM_CONTRIBS_PATH
-macro _FROM_NPM(TARBALL_URL, SKY_ID, INTEGRITY, INTEGRITY_ALGO, TARBALL_PATH) {
-    .CMD=${cwd:FROM_NPM_CWD} $YMAKE_PYTHON ${input:"build/scripts/fetch_from_npm.py"} ${input;hide:"build/scripts/fetch_from.py"} ${input;hide:"build/scripts/sky.py"} --tarball-url $TARBALL_URL --sky-id $SKY_ID --integrity $INTEGRITY --integrity-algorithm $INTEGRITY_ALGO --copy-to ${output;noauto:TARBALL_PATH} ${requirements;hide:"network:full"} ${kv;hide:"p TS_FNPM"} ${kv;hide:"pc magenta"}
-    # we want output to be available for other modules without affecting NPM_CONTRIBS
-    # we need to expose it (some details in https://st.yandex-team.ru/YMAKE-34)
-    _EXPOSE($TARBALL_PATH)
-}
-
 macro _TS_ADD_NODE_MODULES_FOR_BUILDER() {
     # Calculate inputs and outputs of node_modules, fill `_NODE_MODULES_INOUTS` variable
     _NODE_MODULES_CONFIGURE()
@@ -75,13 +26,13 @@ _PREPARE_DEPS_CMD=$TOUCH_UNIT \
     $_PREPARE_DEPS_INOUTS \
     $_PREPARE_DEPS_RESOURCES \
     $_PREPARE_DEPS_USE_RESOURCES_FLAG \
-    ${kv;hide:"pc magenta"} ${kv;hide:"p TS_DEP"}
+    ${hide;kv:"pc magenta"} ${hide;kv:"p TS_DEP"}
 
 # In case of no deps we need to create empty outputs for graph connectivity
 _PREPARE_NO_DEPS_CMD=$TOUCH_UNIT \
     && $YMAKE_PYTHON ${input:"build/scripts/touch.py"} \
     $_PREPARE_DEPS_INOUTS \
-    ${kv;hide:"pc magenta"} ${kv;hide:"p TS_NODEP"}
+    ${hide;kv:"pc magenta"} ${hide;kv:"p TS_NODEP"}
 
 module _PREPARE_DEPS_BASE: _BARE_UNIT {
     .CMD=_PREPARE_DEPS_CMD
diff --git a/build/conf/ts/ts.conf b/build/conf/ts/ts.conf
index 928f5cf456..0fb8cba30d 100644
--- a/build/conf/ts/ts.conf
+++ b/build/conf/ts/ts.conf
@@ -33,7 +33,6 @@ NOTS_TOOL_BASE_ARGS=\
   --nodejs-bin $NODEJS_BIN \
   --pm-script $PM_SCRIPT \
   --pm-type $PM_TYPE \
-  --contribs $NPM_CONTRIBS_PATH \
   --trace $TS_TRACE \
   --verbose $TS_LOG \
   $_YATOOL_PREBUILDER_ARG
@@ -52,7 +51,7 @@ when($AUTOCHECK == "yes") {
 
 # Arguments for builders' commands, passed after the command
 NOTS_TOOL_COMMON_BUILDER_ARGS=\
-  --output-file ${output:TS_OUTPUT_FILE} ${output;hide:TS_OUTPUT_FILE_UUID} \
+  --output-file ${output:TS_OUTPUT_FILE} ${hide;output:TS_OUTPUT_FILE_UUID} \
   --tsconfigs $TS_CONFIG_PATH \
   --vcs-info "${VCS_INFO_FILE}" \
   $NOTS_TOOL_BUILD_REQUIREMENTS__NO_UID__ \
@@ -139,7 +138,7 @@ TSYNDEXER_OUTPUT_FILE=tsyndex.ydx.pb2
 TSYNDEXER_TOOL=${tool:"devtools/codenav/typescript"}
 TSYNDEXER_CMD=${cwd:ARCADIA_BUILD_ROOT} \
     $TSYNDEXER_TOOL -m ${CURDIR} -o ${output:TSYNDEXER_OUTPUT_FILE} -r ${ARCADIA_ROOT} \
-    ${kv;hide:"pc magenta"} ${kv;hide:"p YTS"} $_AS_HIDDEN_INPUTS(IN $_TS_LINT_SRCS_VALUE)
+    ${hide;kv:"pc magenta"} ${hide;kv:"p YTS"} $_AS_HIDDEN_INPUTS(IN $_TS_LINT_SRCS_VALUE)
 
 ### _DO_TS_YNDEXING() # internal
 ###
@@ -174,7 +173,7 @@ TS_GLOB_EXCLUDE=$TS_CONFIG_PATH \
 # Ugly hack for using inputs from the variable
 macro _AS_HIDDEN_INPUTS(IN{input}[]) {
   # "context=TEXT" exclude file from the "include processing"
-  .CMD=${input;hide;context=TEXT:IN}
+  .CMD=${hide;context=TEXT;input:IN}
 }
 
 
diff --git a/build/conf/ts/ts_next.conf b/build/conf/ts/ts_next.conf
index e41f08182f..72c5a9a665 100644
--- a/build/conf/ts/ts_next.conf
+++ b/build/conf/ts/ts_next.conf
@@ -38,9 +38,9 @@ TS_NEXT_CMD=$TOUCH_UNIT \
       --bundler-config-path ${input:TS_NEXT_CONFIG_PATH} \
       --output-dirs ${TS_NEXT_OUTPUT_DIR} \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
-    ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
-    ${output;hide:"package.json"} \
-    ${kv;hide:"pc magenta"} ${kv;hide:"p TS_NXT"}
+    ${hide;input:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
+    ${hide;output:"package.json"} \
+    ${hide;kv:"pc magenta"} ${hide;kv:"p TS_NXT"}
 
 ### @usage: TS_NEXT([name])
 ###
diff --git a/build/conf/ts/ts_package.conf b/build/conf/ts/ts_package.conf
index 7eaea17e67..aa3a6baaaa 100644
--- a/build/conf/ts/ts_package.conf
+++ b/build/conf/ts/ts_package.conf
@@ -3,7 +3,7 @@ TS_PACK=$TOUCH_UNIT \
     && $NOTS_TOOL $NOTS_TOOL_BASE_ARGS build-package $_NODE_MODULES_INOUTS \
     && $COPY_CMD ${input:"package.json"} ${output:"package.json"} \
     && $_TS_FILES_COPY_CMD \
-    ${kv;hide:"p TS_PKG"} ${kv;hide:"pc magenta"}
+    ${hide;kv:"p TS_PKG"} ${hide;kv:"pc magenta"}
 
 ### # internal
 macro _TS_PACKAGE_EPILOGUE() {
diff --git a/build/conf/ts/ts_proto.conf b/build/conf/ts/ts_proto.conf
index 305728a90c..78cf3285d5 100644
--- a/build/conf/ts/ts_proto.conf
+++ b/build/conf/ts/ts_proto.conf
@@ -7,10 +7,10 @@ _TS_PROTO_IMPL_CMD=$TOUCH_UNIT \
         --proto-srcs $_TS_PROTO_SRCS_FILES \
         --proto-paths ./$PROTO_NAMESPACE $ARCADIA_ROOT/$PROTO_NAMESPACE $_PROTO__INCLUDE $ARCADIA_BUILD_ROOT $PROTOBUF_INCLUDE_PATH \
         $_NODE_MODULES_INOUTS \
-        ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
-        ${output;hide:"package.json"} \
+        ${hide;input:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
+        ${hide;output:"package.json"} \
         ${hide:PROTO_FAKEID} \
-        ${kv;hide:"pc magenta"} ${kv;hide:"p TS_PRO"}
+        ${hide;kv:"pc magenta"} ${hide;kv:"p TS_PRO"}
 
 
 ### # internal
diff --git a/build/conf/ts/ts_test.conf b/build/conf/ts/ts_test.conf
index 5051106b69..46887b8cd2 100644
--- a/build/conf/ts/ts_test.conf
+++ b/build/conf/ts/ts_test.conf
@@ -13,7 +13,7 @@ TS_TEST_JEST_CMD=$TOUCH_UNIT \
     && $NOTS_TOOL $NOTS_TOOL_BASE_ARGS create-node-modules --moddir $TS_TEST_FOR_PATH \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
     && ${cwd:BINDIR} $MOVE_FILE $TS_TEST_NM ${output:"workspace_node_modules.tar"} \
-    ${kv;hide:"p TS_JST"} ${kv;hide:"pc magenta"}
+    ${hide;kv:"p TS_JST"} ${hide;kv:"pc magenta"}
 
 ### @usage: TS_TEST_JEST_FOR(Path)
 ###
@@ -48,7 +48,7 @@ module TS_TEST_JEST_FOR: _TS_TEST_BASE {
 
 TS_TEST_HERMIONE_CMD=$TOUCH_UNIT \
     && ${cwd:BINDIR} $MOVE_FILE ${input:TS_TEST_NM} ${output:"workspace_node_modules.tar"} \
-    ${kv;hide:"p TSHRM"} ${kv;hide:"pc magenta"}
+    ${hide;kv:"p TSHRM"} ${hide;kv:"pc magenta"}
 
 ### @usage: TS_TEST_HERMIONE_FOR(Path)
 ###
@@ -82,7 +82,7 @@ TS_TEST_PLAYWRIGHT_CMD=$TOUCH_UNIT \
     && $NOTS_TOOL $NOTS_TOOL_BASE_ARGS create-node-modules --moddir $TS_TEST_FOR_PATH \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
     && ${cwd:BINDIR} $MOVE_FILE $TS_TEST_NM ${output:"workspace_node_modules.tar"} \
-    ${kv;hide:"p TSPW"} ${kv;hide:"pc magenta"}
+    ${hide;kv:"p TSPW"} ${hide;kv:"pc magenta"}
 
 ### @usage: TS_TEST_PLAYWRIGHT_FOR(Path)
 ###
@@ -115,7 +115,7 @@ module TS_TEST_PLAYWRIGHT_FOR: _TS_TEST_BASE {
 
 TS_TEST_PLAYWRIGHT_LARGE_CMD=$TOUCH_UNIT \
     && ${cwd:BINDIR} $MOVE_FILE ${input:TS_TEST_NM} ${output:"workspace_node_modules.tar"} \
-    ${kv;hide:"p TSPW"} ${kv;hide:"pc magenta"}
+    ${hide;kv:"p TSPW"} ${hide;kv:"pc magenta"}
 
 ### @usage: TS_TEST_PLAYWRIGHT_LARGE_FOR(Path)
 ###
diff --git a/build/conf/ts/ts_tsc.conf b/build/conf/ts/ts_tsc.conf
index 7dd51b29ac..0cbcbe4caa 100644
--- a/build/conf/ts/ts_tsc.conf
+++ b/build/conf/ts/ts_tsc.conf
@@ -2,9 +2,9 @@ TS_TSC_CMD=$TOUCH_UNIT \
     && $_TS_FILES_COPY_CMD \
     && $NOTS_TOOL $NOTS_TOOL_BASE_ARGS build-tsc $NOTS_TOOL_COMMON_BUILDER_ARGS \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
-    ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
-    ${output;hide:"package.json"} \
-    ${kv;hide:"pc magenta"} ${kv;hide:"p TS_TSC"}
+    ${hide;input:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
+    ${hide;output:"package.json"} \
+    ${hide;kv:"pc magenta"} ${hide;kv:"p TS_TSC"}
 
 ### @usage: TS_TSC([name])
 ###
diff --git a/build/conf/ts/ts_vite.conf b/build/conf/ts/ts_vite.conf
index ca6ff048f9..e8cb3cba98 100644
--- a/build/conf/ts/ts_vite.conf
+++ b/build/conf/ts/ts_vite.conf
@@ -40,9 +40,9 @@ TS_VITE_CMD=$TOUCH_UNIT \
       --bundler-config-path ${input:VITE_CONFIG_PATH} \
       --output-dirs ${VITE_OUTPUT_DIR} \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
-    ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
-    ${output;hide:"package.json"} \
-    ${kv;hide:"pc magenta"} ${kv;hide:"p TS_VIT"}
+    ${hide;input:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
+    ${hide;output:"package.json"} \
+    ${hide;kv:"pc magenta"} ${hide;kv:"p TS_VIT"}
 
 ### @usage: TS_VITE([name])
 ###
diff --git a/build/conf/ts/ts_webpack.conf b/build/conf/ts/ts_webpack.conf
index 6cea71c0e3..c3d5e07a9b 100644
--- a/build/conf/ts/ts_webpack.conf
+++ b/build/conf/ts/ts_webpack.conf
@@ -37,9 +37,9 @@ TS_WEBPACK_CMD=$TOUCH_UNIT \
       --bundler-config-path ${input:WEBPACK_CONFIG_PATH} \
       --output-dirs ${WEBPACK_OUTPUT_DIR} \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
-    ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
-    ${output;hide:"package.json"} \
-    ${kv;hide:"pc magenta"} ${kv;hide:"p TS_WPK"}
+    ${hide;input:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
+    ${hide;output:"package.json"} \
+    ${hide;kv:"pc magenta"} ${hide;kv:"p TS_WPK"}
 
 ### @usage: TS_WEBPACK([name])
 ###