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

Library import 241019-1758

9 files changed, 196 insertions, 172 deletions

diff --git a/build/plugins/_dart_fields.py b/build/plugins/_dart_fields.py
index 2b556e2073..9ba0fcb9da 100644
--- a/build/plugins/_dart_fields.py
+++ b/build/plugins/_dart_fields.py
@@ -863,14 +863,6 @@ class TestClasspathDeps:
             return {cls.KEY: '${DART_CLASSPATH_DEPS}'}
 
 
-class TestClasspathOrigins:
-    KEY = 'TEST_CLASSPATH_ORIGINS'
-
-    @classmethod
-    def value(cls, unit, flat_args, spec_args):
-        return None
-
-
 class TestCwd:
     KEY = 'TEST-CWD'
 
diff --git a/build/plugins/bundle.py b/build/plugins/bundle.py
index 69e3e01681..aec47ffa2c 100644
--- a/build/plugins/bundle.py
+++ b/build/plugins/bundle.py
@@ -3,20 +3,29 @@ import os
 
 def onbundle(unit, *args):
     """
-    @usage BUNDLE(<Dir [NAME Name]>...)
+    @usage BUNDLE(<Dir [SUFFIX Suffix] [NAME Name]>...)
 
     Brings build artefact from module Dir under optional Name to the current module (e.g. UNION)
     If NAME is not specified, the name of the Dir's build artefact will be preserved
+    Optional SUFFIX allows to use secondary module output. The suffix is appended to the primary output name, so the applicability is limited.
     It makes little sense to specify BUNDLE on non-final targets and so this may stop working without prior notice.
     Bundle on multimodule will select final target among multimodule variants and will fail if there are none or more than one.
     """
     i = 0
     while i < len(args):
-        if i + 2 < len(args) and args[i + 1] == "NAME":
-            target, name = args[i], args[i + 2]
-            i += 3
+        target = args[i]
+        i += 1
+
+        if i + 1 < len(args) and args[i] == "SUFFIX":
+            suffix = args[i + 1]
+            i += 2
+        else:
+            suffix = ""
+
+        if i + 1 < len(args) and args[i] == "NAME":
+            name = args[i + 1]
+            i += 2
         else:
-            target, name = args[i], os.path.basename(args[i])
-            i += 1
+            name = os.path.basename(target) + suffix
 
-        unit.on_bundle_target([target, name])
+        unit.on_bundle_target([target, name, suffix])
diff --git a/build/plugins/lib/nots/package_manager/__init__.py b/build/plugins/lib/nots/package_manager/__init__.py
index 4bb369ba47..20f47fffa1 100644
--- a/build/plugins/lib/nots/package_manager/__init__.py
+++ b/build/plugins/lib/nots/package_manager/__init__.py
@@ -1,4 +1,4 @@
-import typing
+from typing import Literal
 
 from .base import (
     bundle_node_modules,
@@ -14,10 +14,13 @@ from .base.package_json import PackageJsonWorkspaceError
 from .pnpm import PnpmPackageManager
 from .npm import NpmPackageManager
 
+
+type PackageManagerType = Literal["pnpm", "npm"]
+
 manager = PnpmPackageManager
 
 
-def get_package_manager_type(key: typing.Literal["pnpm", "npm"]) -> typing.Type[BasePackageManager]:
+def get_package_manager_type(key: PackageManagerType) -> type[BasePackageManager]:
     if key == "pnpm":
         return PnpmPackageManager
     if key == "npm":
@@ -33,6 +36,7 @@ __all__ = [
     "PackageJson",
     "PackageJsonWorkspaceError",
     "PackageManagerCommandError",
+    "PackageManagerType",
     "bundle_node_modules",
     "constants",
     "extract_node_modules",
diff --git a/build/plugins/lib/nots/package_manager/base/package_manager.py b/build/plugins/lib/nots/package_manager/base/package_manager.py
index 8805c94013..efd5038d27 100644
--- a/build/plugins/lib/nots/package_manager/base/package_manager.py
+++ b/build/plugins/lib/nots/package_manager/base/package_manager.py
@@ -34,7 +34,6 @@ class BasePackageManager(object):
         sources_path,
         nodejs_bin_path,
         script_path,
-        contribs_path,
         module_path=None,
         sources_root=None,
     ):
@@ -45,7 +44,6 @@ class BasePackageManager(object):
         self.sources_root = sources_path[: -len(self.module_path) - 1] if sources_root is None else sources_root
         self.nodejs_bin_path = nodejs_bin_path
         self.script_path = script_path
-        self.contribs_path = contribs_path
 
     @classmethod
     def load_package_json(cls, path):
@@ -150,9 +148,6 @@ class BasePackageManager(object):
     def _nm_path(self, *parts):
         return os.path.join(build_nm_path(self.build_path), *parts)
 
-    def _contrib_tarball_path(self, pkg):
-        return os.path.join(self.contribs_path, pkg.tarball_path)
-
     def _tarballs_store_path(self, pkg, store_path):
         return os.path.join(self.module_path, store_path, pkg.tarball_path)
 
diff --git a/build/plugins/lib/nots/package_manager/npm/npm_package_manager.py b/build/plugins/lib/nots/package_manager/npm/npm_package_manager.py
index 72abcd43eb..3de14b1d7c 100644
--- a/build/plugins/lib/nots/package_manager/npm/npm_package_manager.py
+++ b/build/plugins/lib/nots/package_manager/npm/npm_package_manager.py
@@ -50,9 +50,6 @@ class NpmPackageManager(BasePackageManager):
         if errors:
             raise PackageManagerError("Unable to process some lockfiles:\n{}".format("\n".join(errors)))
 
-    def calc_prepare_deps_inouts(self, store_path: str, has_deps: bool) -> tuple[list[str], list[str]]:
-        raise NotImplementedError("NPM does not support contrib/typescript flow.")
-
     def calc_prepare_deps_inouts_and_resources(
         self, store_path: str, has_deps: bool
     ) -> tuple[list[str], list[str], list[str]]:
@@ -147,7 +144,6 @@ class NpmPackageManager(BasePackageManager):
                 sources_path=dep_source_path,
                 nodejs_bin_path=self.nodejs_bin_path,
                 script_path=self.script_path,
-                contribs_path=self.contribs_path,
                 module_path=module_path,
                 sources_root=self.sources_root,
             )
diff --git a/build/plugins/lib/nots/package_manager/pnpm/package_manager.py b/build/plugins/lib/nots/package_manager/pnpm/package_manager.py
index 43e6cbfe15..8be7a2dddb 100644
--- a/build/plugins/lib/nots/package_manager/pnpm/package_manager.py
+++ b/build/plugins/lib/nots/package_manager/pnpm/package_manager.py
@@ -117,29 +117,6 @@ class PnpmPackageManager(BasePackageManager):
         return ins, outs, resources
 
     # TODO: FBP-1254
-    # def calc_prepare_deps_inouts(self, store_path: str, has_deps: bool) -> (list[str], list[str]):
-    def calc_prepare_deps_inouts(self, store_path, has_deps):
-        ins = [
-            s_rooted(build_pj_path(self.module_path)),
-            s_rooted(build_lockfile_path(self.module_path)),
-        ]
-        outs = [
-            b_rooted(build_ws_config_path(self.module_path)),
-            b_rooted(build_pre_lockfile_path(self.module_path)),
-        ]
-
-        if has_deps:
-            for dep_path in self.get_local_peers_from_package_json():
-                ins.append(b_rooted(build_ws_config_path(dep_path)))
-                ins.append(b_rooted(build_pre_lockfile_path(dep_path)))
-
-            for pkg in self.extract_packages_meta_from_lockfiles([build_lockfile_path(self.sources_path)]):
-                ins.append(b_rooted(self._contrib_tarball_path(pkg)))
-                outs.append(b_rooted(self._tarballs_store_path(pkg, store_path)))
-
-        return ins, outs
-
-    # TODO: FBP-1254
     # def calc_node_modules_inouts(self, local_cli=False) -> (list[str], list[str]):
     def calc_node_modules_inouts(self, local_cli=False):
         """
diff --git a/build/plugins/lib/nots/typescript/ts_config.py b/build/plugins/lib/nots/typescript/ts_config.py
index 52dfa20550..d05a928171 100644
--- a/build/plugins/lib/nots/typescript/ts_config.py
+++ b/build/plugins/lib/nots/typescript/ts_config.py
@@ -157,7 +157,7 @@ class TsConfig(object):
         """
         extends = self.data.get(RootFields.extends)
 
-        if type(extends) == list:
+        if isinstance(extends, list):
             paths = [self.extend_one(dep_paths, ext_value) for ext_value in extends]
             flatten_paths = [item for row in paths for item in row]
         else:
diff --git a/build/plugins/nots.py b/build/plugins/nots.py
index a193dbb52b..f6824b67e7 100644
--- a/build/plugins/nots.py
+++ b/build/plugins/nots.py
@@ -1,7 +1,8 @@
 import os
-import typing
 from enum import auto, StrEnum
+from typing import Any, Literal, TYPE_CHECKING
 
+# noinspection PyUnresolvedReferences
 import ymake
 
 import _dart_fields as df
@@ -15,29 +16,34 @@ from _common import (
 from _dart_fields import create_dart_record
 
 
+if TYPE_CHECKING:
+    from lib.nots.erm_json_lite import ErmJsonLite
+    from lib.nots.package_manager import PackageManagerType, BasePackageManager
+    from lib.nots.semver import Version
+    from lib.nots.typescript import TsConfig
+
 # 1 is 60 files per chunk for TIMEOUT(60) - default timeout for SIZE(SMALL)
 # 0.5 is 120 files per chunk for TIMEOUT(60) - default timeout for SIZE(SMALL)
 # 0.2 is 300 files per chunk for TIMEOUT(60) - default timeout for SIZE(SMALL)
 ESLINT_FILE_PROCESSING_TIME_DEFAULT = 0.2  # seconds per file
 
-COLOR_CODES = {
-    "red": "31",
-    "green": "32",
-    "yellow": "33",
-    "cyan": "36",
-    "reset": "49",
-}
-
 REQUIRED_MISSING = "~~required~~"
 
 
-class ConsoleColors(dict):
-    def __init__(self, color_codes):
-        for k, v in color_codes.items():
-            self.__dict__[k] = f"\033[0;{v}m"
+class COLORS:
+    """
+    See https://en.m.wikipedia.org/wiki/ANSI_escape_code#Colors for details
+    """
 
+    @staticmethod
+    def _wrap_color(color_code: int) -> str:
+        return f"\033[0;{color_code}m"
 
-COLORS = ConsoleColors(COLOR_CODES)
+    red = _wrap_color(31)
+    green = _wrap_color(32)
+    yellow = _wrap_color(33)
+    cyan = _wrap_color(36)
+    reset = _wrap_color(49)
 
 
 class TsTestType(StrEnum):
@@ -50,6 +56,100 @@ class TsTestType(StrEnum):
     TS_STYLELINT = auto()
 
 
+class UnitType:
+    MessageType = Literal["INFO", "WARN", "ERROR"]
+    PluginArgs = str | list[str] | tuple[str]
+
+    def message(self, args: list[MessageType | str]) -> None:
+        """
+        Print message to the log
+        """
+
+    def get(self, var_name: str) -> str | None:
+        """
+        Get variable value
+        """
+
+    def set(self, args: PluginArgs) -> None:
+        """
+        Set variable value
+        """
+
+    def enabled(self, var_name: str) -> None:
+        """
+        Set variable value to "yes"
+        """
+
+    def disabled(self, var_name: str) -> None:
+        """
+        Set variable value to "no"
+        """
+
+    def set_property(self, args: PluginArgs) -> None:
+        """
+        TODO (set vs set_property?)
+        """
+
+    def resolve(self, path: str) -> str:
+        """
+        Resolve path TODO?
+        """
+
+    def resolve_arc_path(self, path: str) -> str:
+        """
+        Resolve path TODO?
+        """
+
+    def path(self) -> str:
+        """
+        Get the project path
+        """
+
+    def ondepends(self, deps: PluginArgs) -> None:
+        """
+        Run DEPENDS(...)
+        """
+
+    def onpeerdir(self, args: str | list[str]) -> None:
+        """
+        Run PEERDIR(...)
+        """
+
+
+class NotsUnitType(UnitType):
+    def on_peerdir_ts_resource(self, *resources: str):
+        """
+        Ensure dependency installed on the project
+
+        Also check its version (is it supported by erm)
+        """
+
+    def on_do_ts_yndexing(self) -> None:
+        """
+        Turn on code navigation indexing
+        """
+
+    def on_from_npm(self, args: UnitType.PluginArgs) -> None:
+        """
+        TODO remove after removing on_from_pnpm_lockfiles
+        """
+
+    def on_setup_install_node_modules_recipe(self) -> None:
+        """
+        Setup test recipe to install node_modules before running tests
+        """
+
+    def on_setup_extract_node_modules_recipe(self, args: UnitType.PluginArgs) -> None:
+        """
+        Setup test recipe to extract workspace-node_modules.tar before running tests
+        """
+
+    def on_setup_extract_output_tars_recipe(self, args: UnitType.PluginArgs) -> None:
+        """
+        Setup test recipe to extract peer's output before running tests
+        """
+
+
 TS_TEST_FIELDS_BASE = (
     df.BinaryPath.normalized,
     df.BuildFolderPath.normalized,
@@ -128,18 +228,17 @@ TS_TEST_SPECIFIC_FIELDS = {
 
 
 class PluginLogger(object):
-    def __init__(self):
-        self.unit = None
-        self.prefix = ""
+    unit: UnitType = None
+    prefix = ""
 
-    def reset(self, unit, prefix=""):
+    def reset(self, unit: NotsUnitType | None, prefix=""):
         self.unit = unit
         self.prefix = prefix
 
     def get_state(self):
-        return (self.unit, self.prefix)
+        return self.unit, self.prefix
 
-    def _stringify_messages(self, messages):
+    def _stringify_messages(self, messages: tuple[Any, ...]):
         parts = []
         for m in messages:
             if m is None:
@@ -150,19 +249,19 @@ class PluginLogger(object):
         # cyan color (code 36) for messages
         return f"{COLORS.green}{self.prefix}{COLORS.reset}\n{COLORS.cyan}{" ".join(parts)}{COLORS.reset}"
 
-    def info(self, *messages):
+    def info(self, *messages: Any) -> None:
         if self.unit:
             self.unit.message(["INFO", self._stringify_messages(messages)])
 
-    def warn(self, *messages):
+    def warn(self, *messages: Any) -> None:
         if self.unit:
             self.unit.message(["WARN", self._stringify_messages(messages)])
 
-    def error(self, *messages):
+    def error(self, *messages: Any) -> None:
         if self.unit:
             self.unit.message(["ERROR", self._stringify_messages(messages)])
 
-    def print_vars(self, *variables):
+    def print_vars(self, *variables: str):
         if self.unit:
             values = ["{}={}".format(v, self.unit.get(v)) for v in variables]
             self.info("\n".join(values))
@@ -172,6 +271,12 @@ logger = PluginLogger()
 
 
 def _with_report_configure_error(fn):
+    """
+    Handle exceptions, report them as ymake configure error
+
+    Also wraps plugin function like `on<macro_name>` to register `unit` in the PluginLogger
+    """
+
     def _wrapper(*args, **kwargs):
         last_state = logger.get_state()
         unit = args[0]
@@ -190,9 +295,7 @@ def _with_report_configure_error(fn):
     return _wrapper
 
 
-def _build_directives(name, flags, paths):
-    # type: (str, list[str]|tuple[str], list[str]) -> str
-
+def _build_directives(name: str, flags: list[str] | tuple[str], paths: list[str]) -> str:
     parts = [p for p in [name] + (flags or []) if p]
     parts_str = ";".join(parts)
     expressions = ['${{{parts}:"{path}"}}'.format(parts=parts_str, path=path) for path in paths]
@@ -200,15 +303,14 @@ def _build_directives(name, flags, paths):
     return " ".join(expressions)
 
 
-def _build_cmd_input_paths(paths, hide=False, disable_include_processor=False):
-    # type: (list[str]|tuple[str], bool, bool) -> str
+def _build_cmd_input_paths(paths: list[str] | tuple[str], hide=False, disable_include_processor=False):
     hide_part = "hide" if hide else ""
     disable_ip_part = "context=TEXT" if disable_include_processor else ""
 
     return _build_directives("input", [hide_part, disable_ip_part], paths)
 
 
-def _create_erm_json(unit):
+def _create_erm_json(unit: NotsUnitType):
     from lib.nots.erm_json_lite import ErmJsonLite
 
     erm_packages_path = unit.get("ERM_PACKAGES_PATH")
@@ -217,20 +319,20 @@ def _create_erm_json(unit):
     return ErmJsonLite.load(path)
 
 
-def _get_pm_type(unit) -> typing.Literal["pnpm", "npm"]:
-    resolved = unit.get("PM_TYPE")
+def _get_pm_type(unit: NotsUnitType) -> 'PackageManagerType':
+    resolved: PackageManagerType | None = unit.get("PM_TYPE")
     if not resolved:
         raise Exception("PM_TYPE is not set yet. Macro _SET_PACKAGE_MANAGER() should be called before.")
 
     return resolved
 
 
-def _get_source_path(unit):
+def _get_source_path(unit: NotsUnitType) -> str:
     sources_path = unit.get("TS_TEST_FOR_DIR") if unit.get("TS_TEST_FOR") else unit.path()
     return sources_path
 
 
-def _create_pm(unit):
+def _create_pm(unit: NotsUnitType) -> 'BasePackageManager':
     from lib.nots.package_manager import get_package_manager_type
 
     sources_path = _get_source_path(unit)
@@ -243,7 +345,6 @@ def _create_pm(unit):
         sources_path=unit.resolve(sources_path),
         build_root="$B",
         build_path=unit.path().replace("$S", "$B", 1),
-        contribs_path=unit.get("NPM_CONTRIBS_PATH"),
         nodejs_bin_path=None,
         script_path=None,
         module_path=module_path,
@@ -251,7 +352,7 @@ def _create_pm(unit):
 
 
 @_with_report_configure_error
-def on_set_package_manager(unit):
+def on_set_package_manager(unit: NotsUnitType) -> None:
     pm_type = "pnpm"  # projects without any lockfile are processed by pnpm
 
     source_path = _get_source_path(unit)
@@ -279,37 +380,13 @@ def on_set_package_manager(unit):
 
 
 @_with_report_configure_error
-def on_set_append_with_directive(unit, var_name, dir, *values):
-    wrapped = ['${{{dir}:"{v}"}}'.format(dir=dir, v=v) for v in values]
-    __set_append(unit, var_name, " ".join(wrapped))
-
-
-@_with_report_configure_error
-def on_from_npm_lockfiles(unit, *args):
-    from lib.nots.package_manager.base import PackageManagerError
-
-    # This is contrib with pnpm-lock.yaml files only
-    # Force set to pnpm
-    unit.set(["PM_TYPE", "pnpm"])
-    pm = _create_pm(unit)
-    lf_paths = []
-
-    for lf_path in args:
-        abs_lf_path = unit.resolve(unit.resolve_arc_path(lf_path))
-        if abs_lf_path:
-            lf_paths.append(abs_lf_path)
-        elif unit.get("TS_STRICT_FROM_NPM_LOCKFILES") == "yes":
-            ymake.report_configure_error("lockfile not found: {}".format(lf_path))
+def on_set_append_with_directive(unit: NotsUnitType, var_name: str, directive: str, *values: str) -> None:
+    wrapped = [f'${{{directive}:"{v}"}}' for v in values]
 
-    try:
-        for pkg in pm.extract_packages_meta_from_lockfiles(lf_paths):
-            unit.on_from_npm([pkg.tarball_url, pkg.sky_id, pkg.integrity, pkg.integrity_algorithm, pkg.tarball_path])
-    except PackageManagerError as e:
-        logger.warn(str(e))
-        pass
+    __set_append(unit, var_name, " ".join(wrapped))
 
 
-def _check_nodejs_version(unit, major):
+def _check_nodejs_version(unit: NotsUnitType, major: int) -> None:
     if major < 14:
         raise Exception(
             "Node.js {} is unsupported. Update Node.js please. See https://nda.ya.ru/t/joB9Mivm6h4znu".format(major)
@@ -325,7 +402,7 @@ def _check_nodejs_version(unit, major):
 
 
 @_with_report_configure_error
-def on_peerdir_ts_resource(unit, *resources):
+def on_peerdir_ts_resource(unit: NotsUnitType, *resources: str) -> None:
     from lib.nots.package_manager import BasePackageManager
 
     pj = BasePackageManager.load_package_json_from_dir(unit.resolve(_get_source_path(unit)))
@@ -364,8 +441,7 @@ def on_peerdir_ts_resource(unit, *resources):
 
 
 @_with_report_configure_error
-def on_ts_configure(unit):
-    # type: (Unit) -> None
+def on_ts_configure(unit: NotsUnitType) -> None:
     from lib.nots.package_manager.base import PackageJson
     from lib.nots.package_manager.base.utils import build_pj_path
     from lib.nots.typescript import TsConfig
@@ -423,8 +499,8 @@ def on_ts_configure(unit):
 
 
 @_with_report_configure_error
-def on_setup_build_env(unit):  # type: (Unit) -> None
-    build_env_var = unit.get("TS_BUILD_ENV")  # type: str
+def on_setup_build_env(unit: NotsUnitType) -> None:
+    build_env_var = unit.get("TS_BUILD_ENV")
     if not build_env_var:
         return
 
@@ -441,8 +517,7 @@ def on_setup_build_env(unit):  # type: (Unit) -> None
     unit.set(["NOTS_TOOL_BUILD_ENV", " ".join(options)])
 
 
-def __set_append(unit, var_name, value):
-    # type: (Unit, str, str|list[str]|tuple[str]) -> None
+def __set_append(unit: NotsUnitType, var_name: str, value: UnitType.PluginArgs) -> None:
     """
     SET_APPEND() python naive implementation - append value/values to the list of values
     """
@@ -453,9 +528,7 @@ def __set_append(unit, var_name, value):
     unit.set([var_name, new_value])
 
 
-def __strip_prefix(prefix, line):
-    # type: (str, str) -> str
-
+def __strip_prefix(prefix: str, line: str) -> str:
     if line.startswith(prefix):
         prefix_len = len(prefix)
         return line[prefix_len:]
@@ -463,7 +536,7 @@ def __strip_prefix(prefix, line):
     return line
 
 
-def _filter_inputs_by_rules_from_tsconfig(unit, tsconfig):
+def _filter_inputs_by_rules_from_tsconfig(unit: NotsUnitType, tsconfig: 'TsConfig') -> None:
     """
     Reduce file list from the TS_GLOB_FILES variable following tsconfig.json rules
     """
@@ -476,14 +549,11 @@ def _filter_inputs_by_rules_from_tsconfig(unit, tsconfig):
     __set_append(unit, "TS_INPUT_FILES", [os.path.join(target_path, f) for f in filtered_files])
 
 
-def _is_tests_enabled(unit):
-    if unit.get("TIDY") == "yes":
-        return False
+def _is_tests_enabled(unit: NotsUnitType) -> bool:
+    return unit.get("TIDY") != "yes"
 
-    return True
 
-
-def _setup_eslint(unit):
+def _setup_eslint(unit: NotsUnitType) -> None:
     if not _is_tests_enabled(unit):
         return
 
@@ -532,7 +602,7 @@ def _setup_eslint(unit):
 
 
 @_with_report_configure_error
-def _setup_tsc_typecheck(unit):
+def _setup_tsc_typecheck(unit: NotsUnitType) -> None:
     if not _is_tests_enabled(unit):
         return
 
@@ -594,7 +664,7 @@ def _setup_tsc_typecheck(unit):
 
 
 @_with_report_configure_error
-def _setup_stylelint(unit):
+def _setup_stylelint(unit: NotsUnitType) -> None:
     if not _is_tests_enabled(unit):
         return
 
@@ -640,7 +710,7 @@ def _setup_stylelint(unit):
     unit.set(["TEST_RECIPES_VALUE", recipes_value])
 
 
-def _resolve_module_files(unit, mod_dir, file_paths):
+def _resolve_module_files(unit: NotsUnitType, mod_dir: str, file_paths: list[str]) -> list[str]:
     mod_dir_with_sep_len = len(mod_dir) + 1
     resolved_files = []
 
@@ -653,9 +723,9 @@ def _resolve_module_files(unit, mod_dir, file_paths):
     return resolved_files
 
 
-def _set_resource_vars(unit, erm_json, tool, version, nodejs_major=None):
-    # type: (any, ErmJsonLite, Version, str|None, int|None) -> None
-
+def _set_resource_vars(
+    unit: NotsUnitType, erm_json: 'ErmJsonLite', tool: str, version: 'Version', nodejs_major: int = None
+) -> None:
     resource_name = erm_json.canonize_name(tool).upper()
 
     # example: NODEJS_12_18_4 | HERMIONE_7_0_4_NODEJS_18
@@ -671,8 +741,9 @@ def _set_resource_vars(unit, erm_json, tool, version, nodejs_major=None):
     unit.set(["{}-ROOT-VAR-NAME".format(resource_name), yamake_resource_var])
 
 
-def _select_matching_version(erm_json, resource_name, range_str, dep_is_required=False):
-    # type: (ErmJsonLite, str, str, bool) -> Version
+def _select_matching_version(
+    erm_json: 'ErmJsonLite', resource_name: str, range_str: str, dep_is_required=False
+) -> 'Version':
     if dep_is_required and range_str is None:
         raise Exception(
             "Please install the '{tool}' package to the project. Run the command:\n"
@@ -702,29 +773,7 @@ def _select_matching_version(erm_json, resource_name, range_str, dep_is_required
 
 
 @_with_report_configure_error
-def on_prepare_deps_configure(unit):
-    contrib_path = unit.get("NPM_CONTRIBS_PATH")
-    if contrib_path == '-':
-        unit.on_prepare_deps_configure_no_contrib()
-        return
-    unit.onpeerdir(contrib_path)
-    pm = _create_pm(unit)
-    pj = pm.load_package_json_from_dir(pm.sources_path)
-    has_deps = pj.has_dependencies()
-    ins, outs = pm.calc_prepare_deps_inouts(unit.get("_TARBALLS_STORE"), has_deps)
-
-    if has_deps:
-        unit.onpeerdir(pm.get_local_peers_from_package_json())
-        __set_append(unit, "_PREPARE_DEPS_INOUTS", _build_directives("input", ["hide"], sorted(ins)))
-        __set_append(unit, "_PREPARE_DEPS_INOUTS", _build_directives("output", ["hide"], sorted(outs)))
-
-    else:
-        __set_append(unit, "_PREPARE_DEPS_INOUTS", _build_directives("output", [], sorted(outs)))
-        unit.set(["_PREPARE_DEPS_CMD", "$_PREPARE_NO_DEPS_CMD"])
-
-
-@_with_report_configure_error
-def on_prepare_deps_configure_no_contrib(unit):
+def on_prepare_deps_configure(unit: NotsUnitType) -> None:
     pm = _create_pm(unit)
     pj = pm.load_package_json_from_dir(pm.sources_path)
     has_deps = pj.has_dependencies()
@@ -743,7 +792,7 @@ def on_prepare_deps_configure_no_contrib(unit):
 
 
 @_with_report_configure_error
-def on_node_modules_configure(unit):
+def on_node_modules_configure(unit: NotsUnitType) -> None:
     pm = _create_pm(unit)
     pj = pm.load_package_json_from_dir(pm.sources_path)
 
@@ -800,7 +849,9 @@ def on_node_modules_configure(unit):
 
 
 @_with_report_configure_error
-def on_ts_test_for_configure(unit, test_runner, default_config, node_modules_filename):
+def on_ts_test_for_configure(
+    unit: NotsUnitType, test_runner: TsTestType, default_config: str, node_modules_filename: str
+) -> None:
     if not _is_tests_enabled(unit):
         return
 
@@ -857,8 +908,9 @@ def on_ts_test_for_configure(unit, test_runner, default_config, node_modules_fil
         unit.set_property(["DART_DATA", data])
 
 
+# noinspection PyUnusedLocal
 @_with_report_configure_error
-def on_validate_ts_test_for_args(unit, for_mod, root):
+def on_validate_ts_test_for_args(unit: NotsUnitType, for_mod: str, root: str) -> None:
     # FBP-1085
     is_arc_root = root == "${ARCADIA_ROOT}"
     is_rel_for_mod = for_mod.startswith(".")
@@ -871,14 +923,14 @@ def on_validate_ts_test_for_args(unit, for_mod, root):
 
 
 @_with_report_configure_error
-def on_set_ts_test_for_vars(unit, for_mod):
+def on_set_ts_test_for_vars(unit: NotsUnitType, for_mod: str) -> None:
     unit.set(["TS_TEST_FOR", "yes"])
     unit.set(["TS_TEST_FOR_DIR", unit.resolve_arc_path(for_mod)])
     unit.set(["TS_TEST_FOR_PATH", rootrel_arc_src(for_mod, unit)])
 
 
 @_with_report_configure_error
-def on_ts_files(unit, *files):
+def on_ts_files(unit: NotsUnitType, *files: str) -> None:
     new_cmds = ['$COPY_CMD ${{input;context=TEXT:"{0}"}} ${{output;noauto:"{0}"}}'.format(f) for f in files]
     all_cmds = unit.get("_TS_FILES_COPY_CMD")
     if all_cmds:
@@ -887,7 +939,7 @@ def on_ts_files(unit, *files):
 
 
 @_with_report_configure_error
-def on_ts_large_files(unit, destination: str, *files: list[str]):
+def on_ts_large_files(unit: NotsUnitType, destination: str, *files: list[str]) -> None:
     if destination == REQUIRED_MISSING:
         ymake.report_configure_error(
             "Macro TS_LARGE_FILES() requires to use DESTINATION parameter.\n"
@@ -901,7 +953,7 @@ def on_ts_large_files(unit, destination: str, *files: list[str]):
         return
 
     # TODO: FBP-1795
-    # ${BINDIR} prefix for input is important to resove to result of LARGE_FILES and not to SOURCEDIR
+    # ${BINDIR} prefix for input is important to resolve to result of LARGE_FILES and not to SOURCEDIR
     new_cmds = [
         '$COPY_CMD ${{input;context=TEXT:"${{BINDIR}}/{0}"}} ${{output;noauto:"{1}/{0}"}}'.format(f, destination)
         for f in files
@@ -913,7 +965,7 @@ def on_ts_large_files(unit, destination: str, *files: list[str]):
 
 
 @_with_report_configure_error
-def on_ts_package_check_files(unit):
+def on_ts_package_check_files(unit: NotsUnitType) -> None:
     ts_files = unit.get("_TS_FILES_COPY_CMD")
     if ts_files == "":
         ymake.report_configure_error(
@@ -925,7 +977,7 @@ def on_ts_package_check_files(unit):
 
 
 @_with_report_configure_error
-def on_depends_on_mod(unit):
+def on_depends_on_mod(unit: NotsUnitType) -> None:
     if unit.get("_TS_TEST_DEPENDS_ON_BUILD"):
         for_mod_path = unit.get("TS_TEST_FOR_PATH")
         unit.ondepends([for_mod_path])
diff --git a/build/plugins/ytest.py b/build/plugins/ytest.py
index f24ba674a0..ab3f227bea 100644
--- a/build/plugins/ytest.py
+++ b/build/plugins/ytest.py
@@ -869,7 +869,6 @@ def onadd_pytest_bin(fields, unit, *args):
         df.JdkForTests.value,
         df.ModuleLang.value,
         df.TestClasspath.value,
-        df.TestClasspathOrigins.value,
         df.TestClasspathDeps.value,
         df.TestJar.value,
         df.DockerImage.value,