diff options
| author | dankolesnikov <dankolesnikov@yandex-team.ru> | 2022-02-10 16:51:07 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:51:07 +0300 |
| commit | 98174ab8f0e6dbed8894c8226f62cac4bf36171d (patch) | |
| tree | 00cab7b3b62da0fe104a2a99c2886064cc0b0d63 /build/plugins/lib/nots/package_manager | |
| parent | 2e8363373770594fa3e83f1410d513cff82abb30 (diff) | |
| download | ydb-98174ab8f0e6dbed8894c8226f62cac4bf36171d.tar.gz | |
Restoring authorship annotation for <dankolesnikov@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'build/plugins/lib/nots/package_manager')
19 files changed, 1333 insertions, 1333 deletions
diff --git a/build/plugins/lib/nots/package_manager/__init__.py b/build/plugins/lib/nots/package_manager/__init__.py index 52bf62644c..4fc30d2525 100644 --- a/build/plugins/lib/nots/package_manager/__init__.py +++ b/build/plugins/lib/nots/package_manager/__init__.py @@ -1,9 +1,9 @@ -from .pnpm import PnpmPackageManager -from .base import constants - - -manager = PnpmPackageManager - -__all__ = [ - "constants", -] +from .pnpm import PnpmPackageManager +from .base import constants + + +manager = PnpmPackageManager + +__all__ = [ + "constants", +] diff --git a/build/plugins/lib/nots/package_manager/base/__init__.py b/build/plugins/lib/nots/package_manager/base/__init__.py index 1b55fe3f56..b7f6729eec 100644 --- a/build/plugins/lib/nots/package_manager/base/__init__.py +++ b/build/plugins/lib/nots/package_manager/base/__init__.py @@ -1,11 +1,11 @@ -from . import constants -from .lockfile import BaseLockfile, LockfilePackageMeta, LockfilePackageMetaInvalidError -from .package_json import PackageJson -from .package_manager import BasePackageManager, PackageManagerError, PackageManagerCommandError - -__all__ = [ - "constants", - "BaseLockfile", "LockfilePackageMeta", "LockfilePackageMetaInvalidError", - "BasePackageManager", "PackageManagerError", "PackageManagerCommandError", - "PackageJson", -] +from . import constants +from .lockfile import BaseLockfile, LockfilePackageMeta, LockfilePackageMetaInvalidError +from .package_json import PackageJson +from .package_manager import BasePackageManager, PackageManagerError, PackageManagerCommandError + +__all__ = [ + "constants", + "BaseLockfile", "LockfilePackageMeta", "LockfilePackageMetaInvalidError", + "BasePackageManager", "PackageManagerError", "PackageManagerCommandError", + "PackageJson", +] diff --git a/build/plugins/lib/nots/package_manager/base/constants.py b/build/plugins/lib/nots/package_manager/base/constants.py index 0b9fcb76af..89bfe8a42e 100644 --- a/build/plugins/lib/nots/package_manager/base/constants.py +++ b/build/plugins/lib/nots/package_manager/base/constants.py @@ -1,5 +1,5 @@ -PACKAGE_JSON_FILENAME = "package.json" -NODE_MODULES_BUNDLE_FILENAME = "node_modules.tar" -NPM_REGISTRY_URL = "http://npm.yandex-team.ru" -PNPM_WS_FILENAME = "pnpm-workspace.yaml" -PNPM_LOCKFILE_FILENAME = "pnpm-lock.yaml" +PACKAGE_JSON_FILENAME = "package.json" +NODE_MODULES_BUNDLE_FILENAME = "node_modules.tar" +NPM_REGISTRY_URL = "http://npm.yandex-team.ru" +PNPM_WS_FILENAME = "pnpm-workspace.yaml" +PNPM_LOCKFILE_FILENAME = "pnpm-lock.yaml" diff --git a/build/plugins/lib/nots/package_manager/base/lockfile.py b/build/plugins/lib/nots/package_manager/base/lockfile.py index 9b9c0be954..8a377045ed 100644 --- a/build/plugins/lib/nots/package_manager/base/lockfile.py +++ b/build/plugins/lib/nots/package_manager/base/lockfile.py @@ -1,68 +1,68 @@ -import os - -from abc import ABCMeta, abstractmethod -from six import add_metaclass - - -class LockfilePackageMeta(object): - """ - Basic struct representing package meta from lockfile. - """ - __slots__ = ("name", "version", "sky_id", "integrity", "integrity_algorithm", "tarball_path") - - @staticmethod - def from_str(s): - return LockfilePackageMeta(*s.strip().split(" ")) - - def __init__(self, name, version, sky_id, integrity, integrity_algorithm): - self.name = name - self.version = version - self.sky_id = sky_id - self.integrity = integrity - self.integrity_algorithm = integrity_algorithm - self.tarball_path = "{}-{}.tgz".format(name, version) - - def to_str(self): - return " ".join([self.name, self.version, self.sky_id, self.integrity, self.integrity_algorithm]) - - -class LockfilePackageMetaInvalidError(RuntimeError): - pass - - -@add_metaclass(ABCMeta) -class BaseLockfile(object): - @classmethod - def load(cls, path): - """ - :param path: lockfile path - :type path: str - :rtype: BaseLockfile - """ - pj = cls(path) - pj.read() - - return pj - - def __init__(self, path): - if not os.path.isabs(path): - raise TypeError("Absolute path required, given: {}".format(path)) - - self.path = path - self.data = None - - @abstractmethod - def read(self): - pass - - @abstractmethod - def write(self, path=None): - pass - - @abstractmethod - def get_packages_meta(self): - pass - - @abstractmethod - def update_tarball_resolutions(self, fn): - pass +import os + +from abc import ABCMeta, abstractmethod +from six import add_metaclass + + +class LockfilePackageMeta(object): + """ + Basic struct representing package meta from lockfile. + """ + __slots__ = ("name", "version", "sky_id", "integrity", "integrity_algorithm", "tarball_path") + + @staticmethod + def from_str(s): + return LockfilePackageMeta(*s.strip().split(" ")) + + def __init__(self, name, version, sky_id, integrity, integrity_algorithm): + self.name = name + self.version = version + self.sky_id = sky_id + self.integrity = integrity + self.integrity_algorithm = integrity_algorithm + self.tarball_path = "{}-{}.tgz".format(name, version) + + def to_str(self): + return " ".join([self.name, self.version, self.sky_id, self.integrity, self.integrity_algorithm]) + + +class LockfilePackageMetaInvalidError(RuntimeError): + pass + + +@add_metaclass(ABCMeta) +class BaseLockfile(object): + @classmethod + def load(cls, path): + """ + :param path: lockfile path + :type path: str + :rtype: BaseLockfile + """ + pj = cls(path) + pj.read() + + return pj + + def __init__(self, path): + if not os.path.isabs(path): + raise TypeError("Absolute path required, given: {}".format(path)) + + self.path = path + self.data = None + + @abstractmethod + def read(self): + pass + + @abstractmethod + def write(self, path=None): + pass + + @abstractmethod + def get_packages_meta(self): + pass + + @abstractmethod + def update_tarball_resolutions(self, fn): + pass diff --git a/build/plugins/lib/nots/package_manager/base/package_json.py b/build/plugins/lib/nots/package_manager/base/package_json.py index 3d0bf3238e..f9c1caf368 100644 --- a/build/plugins/lib/nots/package_manager/base/package_json.py +++ b/build/plugins/lib/nots/package_manager/base/package_json.py @@ -1,113 +1,113 @@ -import os -import json - -from six import iteritems - -from . import constants - - -class PackageJsonWorkspaceError(RuntimeError): - pass - - -class PackageJson(object): - DEP_KEY = "dependencies" - DEV_DEP_KEY = "devDependencies" - PEER_DEP_KEY = "peerDependencies" - OPT_DEP_KEY = "optionalDependencies" - DEP_KEYS = (DEP_KEY, DEV_DEP_KEY, PEER_DEP_KEY, OPT_DEP_KEY) - - WORKSPACE_SCHEMA = "workspace:" - - @classmethod - def load(cls, path): - """ - :param path: package.json path - :type path: str - :rtype: PackageJson - """ - pj = cls(path) - pj.read() - - return pj - - def __init__(self, path): - if not os.path.isabs(path): - raise TypeError("Absolute path required, given: {}".format(path)) - - self.path = path - self.data = None - - def read(self): - with open(self.path) as f: - self.data = json.load(f) - - def get_name(self): - return self.data.get("name") - - def get_workspace_dep_paths(self): - """ - :return: Workspace dependencies. - :rtype: list of (str, str) - """ - dep_paths = [] - schema = self.WORKSPACE_SCHEMA - schema_len = len(schema) - - for deps in map(lambda x: self.data.get(x), self.DEP_KEYS): - if not deps: - continue - - for name, spec in iteritems(deps): - if not spec.startswith(schema): - continue - - spec_path = spec[schema_len:] - if not (spec_path.startswith(".") or spec_path.startswith("..")): - raise PackageJsonWorkspaceError( - "Expected relative path specifier for workspace dependency, but got '{}' for {} in {}".format(spec, name, self.path)) - - dep_paths.append((name, spec_path)) - - return dep_paths - - def get_workspace_deps(self): - """ - :rtype: list of PackageJson - """ - ws_deps = [] - pj_dir = os.path.dirname(self.path) - - for (name, rel_path) in self.get_workspace_dep_paths(): - dep_path = os.path.normpath(os.path.join(pj_dir, rel_path)) - dep_pj = PackageJson.load(os.path.join(dep_path, constants.PACKAGE_JSON_FILENAME)) - - if name != dep_pj.get_name(): - raise PackageJsonWorkspaceError( - "Workspace dependency name mismatch, found '{}' instead of '{}' in {}".format(name, dep_pj.get_name(), self.path)) - - ws_deps.append(dep_pj) - - return ws_deps - - def get_workspace_map(self): - """ - :return: Absolute paths of workspace dependencies (including transitive) mapped to package.json and depth. - :rtype: dict of (PackageJson, int) - """ - ws_deps = {} - # list of (pj, depth) - pj_queue = [(self, 0)] - - while len(pj_queue): - (pj, depth) = pj_queue.pop() - pj_dir = os.path.dirname(pj.path) - if pj_dir in ws_deps: - continue - - ws_deps[pj_dir] = (pj, depth) - - for dep_pj in pj.get_workspace_deps(): - pj_queue.append((dep_pj, depth + 1)) - - return ws_deps +import os +import json + +from six import iteritems + +from . import constants + + +class PackageJsonWorkspaceError(RuntimeError): + pass + + +class PackageJson(object): + DEP_KEY = "dependencies" + DEV_DEP_KEY = "devDependencies" + PEER_DEP_KEY = "peerDependencies" + OPT_DEP_KEY = "optionalDependencies" + DEP_KEYS = (DEP_KEY, DEV_DEP_KEY, PEER_DEP_KEY, OPT_DEP_KEY) + + WORKSPACE_SCHEMA = "workspace:" + + @classmethod + def load(cls, path): + """ + :param path: package.json path + :type path: str + :rtype: PackageJson + """ + pj = cls(path) + pj.read() + + return pj + + def __init__(self, path): + if not os.path.isabs(path): + raise TypeError("Absolute path required, given: {}".format(path)) + + self.path = path + self.data = None + + def read(self): + with open(self.path) as f: + self.data = json.load(f) + + def get_name(self): + return self.data.get("name") + + def get_workspace_dep_paths(self): + """ + :return: Workspace dependencies. + :rtype: list of (str, str) + """ + dep_paths = [] + schema = self.WORKSPACE_SCHEMA + schema_len = len(schema) + + for deps in map(lambda x: self.data.get(x), self.DEP_KEYS): + if not deps: + continue + + for name, spec in iteritems(deps): + if not spec.startswith(schema): + continue + + spec_path = spec[schema_len:] + if not (spec_path.startswith(".") or spec_path.startswith("..")): + raise PackageJsonWorkspaceError( + "Expected relative path specifier for workspace dependency, but got '{}' for {} in {}".format(spec, name, self.path)) + + dep_paths.append((name, spec_path)) + + return dep_paths + + def get_workspace_deps(self): + """ + :rtype: list of PackageJson + """ + ws_deps = [] + pj_dir = os.path.dirname(self.path) + + for (name, rel_path) in self.get_workspace_dep_paths(): + dep_path = os.path.normpath(os.path.join(pj_dir, rel_path)) + dep_pj = PackageJson.load(os.path.join(dep_path, constants.PACKAGE_JSON_FILENAME)) + + if name != dep_pj.get_name(): + raise PackageJsonWorkspaceError( + "Workspace dependency name mismatch, found '{}' instead of '{}' in {}".format(name, dep_pj.get_name(), self.path)) + + ws_deps.append(dep_pj) + + return ws_deps + + def get_workspace_map(self): + """ + :return: Absolute paths of workspace dependencies (including transitive) mapped to package.json and depth. + :rtype: dict of (PackageJson, int) + """ + ws_deps = {} + # list of (pj, depth) + pj_queue = [(self, 0)] + + while len(pj_queue): + (pj, depth) = pj_queue.pop() + pj_dir = os.path.dirname(pj.path) + if pj_dir in ws_deps: + continue + + ws_deps[pj_dir] = (pj, depth) + + for dep_pj in pj.get_workspace_deps(): + pj_queue.append((dep_pj, depth + 1)) + + return ws_deps 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 0de9d8acc3..9c0fcb8c34 100644 --- a/build/plugins/lib/nots/package_manager/base/package_manager.py +++ b/build/plugins/lib/nots/package_manager/base/package_manager.py @@ -1,108 +1,108 @@ -import os -import sys -import subprocess -import tarfile - -from abc import ABCMeta, abstractmethod -from six import add_metaclass - -from . import constants - - -class PackageManagerError(RuntimeError): - pass - - -class PackageManagerCommandError(PackageManagerError): - def __init__(self, cmd, code, stdout, stderr): - self.cmd = cmd - self.code = code - self.stdout = stdout - self.stderr = stderr - - msg = "package manager exited with code {} while running {}:\n{}\n{}".format(code, cmd, stdout, stderr) - super(PackageManagerCommandError, self).__init__(msg) - - -@add_metaclass(ABCMeta) -class BasePackageManager(object): - def __init__(self, build_root, build_path, sources_path, nodejs_bin_path, script_path, contribs_path): - self.module_path = build_path[len(build_root) + 1:] - self.build_path = build_path - self.sources_path = sources_path - self.build_root = build_root - self.sources_root = sources_path[:-len(self.module_path) - 1] - self.nodejs_bin_path = nodejs_bin_path - self.script_path = script_path - self.contribs_path = contribs_path - - @abstractmethod - def install(self): - pass - - @abstractmethod - def get_peer_paths_from_package_json(self): - pass - - @abstractmethod - def calc_node_modules_inouts(self): - pass - - @abstractmethod - def extract_packages_meta_from_lockfiles(self, lf_paths): - pass - - def create_node_modules_bundle(self, path): - """ - Creates tarball from the node_modules directory contents. - :param path: tarball path - :type path: str - """ - with tarfile.open(path, "w") as tf: - tf.add(self._nm_path(), arcname=".") - - def _exec_command(self, args, include_defaults=True): - if not self.nodejs_bin_path: - raise PackageManagerError("Unable to execute command: nodejs_bin_path is not configured") - - cmd = [self.nodejs_bin_path, self.script_path] + args + (self._get_default_options() if include_defaults else []) - p = subprocess.Popen( - cmd, - cwd=self.build_path, - stdin=None, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - ) - stdout, stderr = p.communicate() - - if p.returncode != 0: - self._dump_debug_log() - - raise PackageManagerCommandError(cmd, p.returncode, stdout.decode("utf-8"), stderr.decode("utf-8")) - - def _nm_path(self, *parts): - return os.path.join(self.build_path, "node_modules", *parts) - - def _contrib_tarball_path(self, pkg): - return os.path.join(self.contribs_path, pkg.tarball_path) - - def _contrib_tarball_url(self, pkg): - return "file:" + self._contrib_tarball_path(pkg) - - def _get_default_options(self): - return ["--registry", constants.NPM_REGISTRY_URL] - - def _get_debug_log_path(self): - return None - - def _dump_debug_log(self): - log_path = self._get_debug_log_path() - - if not log_path: - return - - try: - with open(log_path) as f: - sys.stderr.write("Package manager log {}:\n{}\n".format(log_path, f.read())) - except: - sys.stderr.write("Failed to dump package manager log {}.\n".format(log_path)) +import os +import sys +import subprocess +import tarfile + +from abc import ABCMeta, abstractmethod +from six import add_metaclass + +from . import constants + + +class PackageManagerError(RuntimeError): + pass + + +class PackageManagerCommandError(PackageManagerError): + def __init__(self, cmd, code, stdout, stderr): + self.cmd = cmd + self.code = code + self.stdout = stdout + self.stderr = stderr + + msg = "package manager exited with code {} while running {}:\n{}\n{}".format(code, cmd, stdout, stderr) + super(PackageManagerCommandError, self).__init__(msg) + + +@add_metaclass(ABCMeta) +class BasePackageManager(object): + def __init__(self, build_root, build_path, sources_path, nodejs_bin_path, script_path, contribs_path): + self.module_path = build_path[len(build_root) + 1:] + self.build_path = build_path + self.sources_path = sources_path + self.build_root = build_root + self.sources_root = sources_path[:-len(self.module_path) - 1] + self.nodejs_bin_path = nodejs_bin_path + self.script_path = script_path + self.contribs_path = contribs_path + + @abstractmethod + def install(self): + pass + + @abstractmethod + def get_peer_paths_from_package_json(self): + pass + + @abstractmethod + def calc_node_modules_inouts(self): + pass + + @abstractmethod + def extract_packages_meta_from_lockfiles(self, lf_paths): + pass + + def create_node_modules_bundle(self, path): + """ + Creates tarball from the node_modules directory contents. + :param path: tarball path + :type path: str + """ + with tarfile.open(path, "w") as tf: + tf.add(self._nm_path(), arcname=".") + + def _exec_command(self, args, include_defaults=True): + if not self.nodejs_bin_path: + raise PackageManagerError("Unable to execute command: nodejs_bin_path is not configured") + + cmd = [self.nodejs_bin_path, self.script_path] + args + (self._get_default_options() if include_defaults else []) + p = subprocess.Popen( + cmd, + cwd=self.build_path, + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + ) + stdout, stderr = p.communicate() + + if p.returncode != 0: + self._dump_debug_log() + + raise PackageManagerCommandError(cmd, p.returncode, stdout.decode("utf-8"), stderr.decode("utf-8")) + + def _nm_path(self, *parts): + return os.path.join(self.build_path, "node_modules", *parts) + + def _contrib_tarball_path(self, pkg): + return os.path.join(self.contribs_path, pkg.tarball_path) + + def _contrib_tarball_url(self, pkg): + return "file:" + self._contrib_tarball_path(pkg) + + def _get_default_options(self): + return ["--registry", constants.NPM_REGISTRY_URL] + + def _get_debug_log_path(self): + return None + + def _dump_debug_log(self): + log_path = self._get_debug_log_path() + + if not log_path: + return + + try: + with open(log_path) as f: + sys.stderr.write("Package manager log {}:\n{}\n".format(log_path, f.read())) + except: + sys.stderr.write("Failed to dump package manager log {}.\n".format(log_path)) diff --git a/build/plugins/lib/nots/package_manager/base/tests/package_json.py b/build/plugins/lib/nots/package_manager/base/tests/package_json.py index 3657e581bc..64a7841e50 100644 --- a/build/plugins/lib/nots/package_manager/base/tests/package_json.py +++ b/build/plugins/lib/nots/package_manager/base/tests/package_json.py @@ -1,114 +1,114 @@ -import os -import pytest - -from build.plugins.lib.nots.package_manager.base.package_json import PackageJson, PackageJsonWorkspaceError - - -def test_get_workspace_dep_paths_ok(): - pj = PackageJson("/packages/foo/package.json") - pj.data = { - "dependencies": { - "@yandex-int/bar": "workspace:../bar", - }, - "devDependencies": { - "@yandex-int/baz": "workspace:../baz", - }, - } - - ws_dep_paths = pj.get_workspace_dep_paths() - - assert ws_dep_paths == [ - ("@yandex-int/bar", "../bar"), - ("@yandex-int/baz", "../baz"), - ] - - -def test_get_workspace_dep_paths_invalid_path(): - pj = PackageJson("/packages/foo/package.json") - pj.data = { - "dependencies": { - "@yandex-int/bar": "workspace:*", - }, - } - - with pytest.raises(PackageJsonWorkspaceError) as e: - pj.get_workspace_dep_paths() - - assert str(e.value) == "Expected relative path specifier for workspace dependency, but got 'workspace:*' for @yandex-int/bar in /packages/foo/package.json" - - -def test_get_workspace_deps_ok(): - pj = PackageJson("/packages/foo/package.json") - pj.data = { - "dependencies": { - "@yandex-int/bar": "workspace:../bar", - }, - "devDependencies": { - "@yandex-int/baz": "workspace:../baz", - }, - } - - def load_mock(cls, path): - p = PackageJson(path) - p.data = { - "name": "@yandex-int/{}".format(os.path.basename(os.path.dirname(path))), - } - return p - PackageJson.load = classmethod(load_mock) - - ws_deps = pj.get_workspace_deps() - - assert len(ws_deps) == 2 - assert ws_deps[0].path == "/packages/bar/package.json" - assert ws_deps[1].path == "/packages/baz/package.json" - - -def test_get_workspace_deps_with_wrong_name(): - pj = PackageJson("/packages/foo/package.json") - pj.data = { - "dependencies": { - "@yandex-int/bar": "workspace:../bar", - }, - } - - def load_mock(cls, path): - p = PackageJson(path) - p.data = { - "name": "@shouldbe/{}".format(os.path.basename(os.path.dirname(path))), - } - return p - PackageJson.load = classmethod(load_mock) - - with pytest.raises(PackageJsonWorkspaceError) as e: - pj.get_workspace_deps() - - assert str(e.value) == "Workspace dependency name mismatch, found '@yandex-int/bar' instead of '@shouldbe/bar' in /packages/foo/package.json" - - -def test_get_workspace_map_ok(): - pj = PackageJson("/packages/foo/package.json") - pj.data = { - "dependencies": { - "@yandex-int/bar": "workspace:../bar", - }, - } - - def load_mock(cls, path): - name = os.path.basename(os.path.dirname(path)) - p = PackageJson(path) - p.data = { - "name": "@yandex-int/{}".format(name), - "dependencies": ({"@yandex-int/qux": "workspace:../qux"} if name == "bar" else {}), - } - return p - PackageJson.load = classmethod(load_mock) - - ws_map = pj.get_workspace_map() - - assert len(ws_map) == 3 - assert ws_map["/packages/foo"][0].path == "/packages/foo/package.json" - assert ws_map["/packages/foo"][1] == 0 - assert ws_map["/packages/bar"][0].path == "/packages/bar/package.json" - assert ws_map["/packages/bar"][1] == 1 - assert ws_map["/packages/qux"][0].path == "/packages/qux/package.json" - assert ws_map["/packages/qux"][1] == 2 +import os +import pytest + +from build.plugins.lib.nots.package_manager.base.package_json import PackageJson, PackageJsonWorkspaceError + + +def test_get_workspace_dep_paths_ok(): + pj = PackageJson("/packages/foo/package.json") + pj.data = { + "dependencies": { + "@yandex-int/bar": "workspace:../bar", + }, + "devDependencies": { + "@yandex-int/baz": "workspace:../baz", + }, + } + + ws_dep_paths = pj.get_workspace_dep_paths() + + assert ws_dep_paths == [ + ("@yandex-int/bar", "../bar"), + ("@yandex-int/baz", "../baz"), + ] + + +def test_get_workspace_dep_paths_invalid_path(): + pj = PackageJson("/packages/foo/package.json") + pj.data = { + "dependencies": { + "@yandex-int/bar": "workspace:*", + }, + } + + with pytest.raises(PackageJsonWorkspaceError) as e: + pj.get_workspace_dep_paths() + + assert str(e.value) == "Expected relative path specifier for workspace dependency, but got 'workspace:*' for @yandex-int/bar in /packages/foo/package.json" + + +def test_get_workspace_deps_ok(): + pj = PackageJson("/packages/foo/package.json") + pj.data = { + "dependencies": { + "@yandex-int/bar": "workspace:../bar", + }, + "devDependencies": { + "@yandex-int/baz": "workspace:../baz", + }, + } + + def load_mock(cls, path): + p = PackageJson(path) + p.data = { + "name": "@yandex-int/{}".format(os.path.basename(os.path.dirname(path))), + } + return p + PackageJson.load = classmethod(load_mock) + + ws_deps = pj.get_workspace_deps() + + assert len(ws_deps) == 2 + assert ws_deps[0].path == "/packages/bar/package.json" + assert ws_deps[1].path == "/packages/baz/package.json" + + +def test_get_workspace_deps_with_wrong_name(): + pj = PackageJson("/packages/foo/package.json") + pj.data = { + "dependencies": { + "@yandex-int/bar": "workspace:../bar", + }, + } + + def load_mock(cls, path): + p = PackageJson(path) + p.data = { + "name": "@shouldbe/{}".format(os.path.basename(os.path.dirname(path))), + } + return p + PackageJson.load = classmethod(load_mock) + + with pytest.raises(PackageJsonWorkspaceError) as e: + pj.get_workspace_deps() + + assert str(e.value) == "Workspace dependency name mismatch, found '@yandex-int/bar' instead of '@shouldbe/bar' in /packages/foo/package.json" + + +def test_get_workspace_map_ok(): + pj = PackageJson("/packages/foo/package.json") + pj.data = { + "dependencies": { + "@yandex-int/bar": "workspace:../bar", + }, + } + + def load_mock(cls, path): + name = os.path.basename(os.path.dirname(path)) + p = PackageJson(path) + p.data = { + "name": "@yandex-int/{}".format(name), + "dependencies": ({"@yandex-int/qux": "workspace:../qux"} if name == "bar" else {}), + } + return p + PackageJson.load = classmethod(load_mock) + + ws_map = pj.get_workspace_map() + + assert len(ws_map) == 3 + assert ws_map["/packages/foo"][0].path == "/packages/foo/package.json" + assert ws_map["/packages/foo"][1] == 0 + assert ws_map["/packages/bar"][0].path == "/packages/bar/package.json" + assert ws_map["/packages/bar"][1] == 1 + assert ws_map["/packages/qux"][0].path == "/packages/qux/package.json" + assert ws_map["/packages/qux"][1] == 2 diff --git a/build/plugins/lib/nots/package_manager/base/tests/ya.make b/build/plugins/lib/nots/package_manager/base/tests/ya.make index 1968fac42e..d1d9042d21 100644 --- a/build/plugins/lib/nots/package_manager/base/tests/ya.make +++ b/build/plugins/lib/nots/package_manager/base/tests/ya.make @@ -1,13 +1,13 @@ -PY23_TEST() - -OWNER(dankolesnikov) - -TEST_SRCS( - package_json.py -) - -PEERDIR( - build/plugins/lib/nots/package_manager/base -) - -END() +PY23_TEST() + +OWNER(dankolesnikov) + +TEST_SRCS( + package_json.py +) + +PEERDIR( + build/plugins/lib/nots/package_manager/base +) + +END() diff --git a/build/plugins/lib/nots/package_manager/base/ya.make b/build/plugins/lib/nots/package_manager/base/ya.make index aa73cfbe25..4b00ef4d85 100644 --- a/build/plugins/lib/nots/package_manager/base/ya.make +++ b/build/plugins/lib/nots/package_manager/base/ya.make @@ -1,21 +1,21 @@ -PY23_LIBRARY() - -OWNER(dankolesnikov) - -PY_SRCS( - __init__.py - constants.py - lockfile.py - package_json.py - package_manager.py -) - -PEERDIR( - contrib/python/six -) - -END() - -RECURSE_FOR_TESTS( - tests -) +PY23_LIBRARY() + +OWNER(dankolesnikov) + +PY_SRCS( + __init__.py + constants.py + lockfile.py + package_json.py + package_manager.py +) + +PEERDIR( + contrib/python/six +) + +END() + +RECURSE_FOR_TESTS( + tests +) diff --git a/build/plugins/lib/nots/package_manager/pnpm/__init__.py b/build/plugins/lib/nots/package_manager/pnpm/__init__.py index 4b8f0d0e92..2db11bd080 100644 --- a/build/plugins/lib/nots/package_manager/pnpm/__init__.py +++ b/build/plugins/lib/nots/package_manager/pnpm/__init__.py @@ -1,9 +1,9 @@ -from .lockfile import PnpmLockfile -from .package_manager import PnpmPackageManager -from .workspace import PnpmWorkspace - -__all__ = [ - "PnpmLockfile", - "PnpmPackageManager", - "PnpmWorkspace", -] +from .lockfile import PnpmLockfile +from .package_manager import PnpmPackageManager +from .workspace import PnpmWorkspace + +__all__ = [ + "PnpmLockfile", + "PnpmPackageManager", + "PnpmWorkspace", +] diff --git a/build/plugins/lib/nots/package_manager/pnpm/lockfile.py b/build/plugins/lib/nots/package_manager/pnpm/lockfile.py index 1c09f96432..8bfb2beda1 100644 --- a/build/plugins/lib/nots/package_manager/pnpm/lockfile.py +++ b/build/plugins/lib/nots/package_manager/pnpm/lockfile.py @@ -1,163 +1,163 @@ -import base64 -import binascii -import yaml -import os - -from six.moves.urllib import parse as urlparse -from six import iteritems - -from ..base import PackageJson, BaseLockfile, LockfilePackageMeta, LockfilePackageMetaInvalidError - - -class PnpmLockfile(BaseLockfile): - IMPORTER_KEYS = PackageJson.DEP_KEYS + ("specifiers",) - - def read(self): - with open(self.path, "r") as f: - self.data = yaml.load(f, Loader=yaml.CSafeLoader) - - def write(self, path=None): - """ - :param path: path to store lockfile, defaults to original path - :type path: str - """ - if path is None: - path = self.path - - with open(path, "w") as f: - yaml.dump(self.data, f, Dumper=yaml.CSafeDumper) - - def get_packages_meta(self): - """ - Extracts packages meta from lockfile. - :rtype: list of LockfilePackageMeta - """ - packages = self.data.get("packages", {}) - - return map(lambda x: _parse_package_meta(*x), iteritems(packages)) - - def update_tarball_resolutions(self, fn): - """ - :param fn: maps `LockfilePackageMeta` instance to new `resolution.tarball` value - :type fn: lambda - """ - packages = self.data.get("packages", {}) - - for key, meta in iteritems(packages): - meta["resolution"]["tarball"] = fn(_parse_package_meta(key, meta)) - packages[key] = meta - - def get_importers(self): - """ - Returns "importers" section from the lockfile or creates similar structure from "dependencies" and "specifiers". - :rtype: dict of dict of dict of str - """ - importers = self.data.get("importers") - if importers is not None: - return importers - - importer = {k: self.data[k] for k in self.IMPORTER_KEYS if k in self.data} - - return ({".": importer} if importer else {}) - - def merge(self, lf): - """ - Merges two lockfiles: - 1. Converts the lockfile to monorepo-like lockfile with "importers" section instead of "dependencies" and "specifiers". - 2. Merges `lf`'s dependencies and specifiers to importers. - 3. Merges `lf`'s packages to the lockfile. - :param lf: lockfile to merge - :type lf: PnpmLockfile - """ - importers = self.get_importers() - build_path = os.path.dirname(self.path) - - for [importer, imports] in iteritems(lf.get_importers()): - importer_path = os.path.normpath(os.path.join(os.path.dirname(lf.path), importer)) - importer_rel_path = os.path.relpath(importer_path, build_path) - importers[importer_rel_path] = imports - - self.data["importers"] = importers - - for k in self.IMPORTER_KEYS: - self.data.pop(k, None) - - packages = self.data.get("packages", {}) - for k, v in iteritems(lf.data.get("packages", {})): - if k not in packages: - packages[k] = v - self.data["packages"] = packages - - -def _parse_package_meta(key, meta): - """ - :param key: uniq package key from lockfile - :type key: string - :param meta: package meta dict from lockfile - :type meta: dict - :rtype: LockfilePackageMetaInvalidError - """ - try: - name, version = _parse_package_key(key) - sky_id = _parse_sky_id_from_tarball_url(meta["resolution"]["tarball"]) - integrity_algorithm, integrity = _parse_package_integrity(meta["resolution"]["integrity"]) - except KeyError as e: - raise TypeError("Invalid package meta for key {}, missing {} key".format(key, e)) - except LockfilePackageMetaInvalidError as e: - raise TypeError("Invalid package meta for key {}, parse error: {}".format(key, e)) - - return LockfilePackageMeta(name, version, sky_id, integrity, integrity_algorithm) - - -def _parse_package_key(key): - """ - :param key: package key in format "/({scope}/)?{package_name}/{package_version}(_{peer_dependencies})?" - :type key: string - :return: tuple of scoped package name and version - :rtype: (str, str) - """ - try: - tokens = key.split("/")[1:] - version = tokens.pop().split("_", 1)[0] - - if len(tokens) < 1 or len(tokens) > 2: - raise TypeError() - except (IndexError, TypeError): - raise LockfilePackageMetaInvalidError("Invalid package key") - - return ("/".join(tokens), version) - - -def _parse_sky_id_from_tarball_url(tarball_url): - """ - :param tarball_url: tarball url - :type tarball_url: string - :return: sky id - :rtype: string - """ - if tarball_url.startswith("file:"): - return "" - - rbtorrent_param = urlparse.parse_qs(urlparse.urlparse(tarball_url).query).get("rbtorrent") - - if rbtorrent_param is None: - raise LockfilePackageMetaInvalidError("Missing rbtorrent param in tarball url {}".format(tarball_url)) - - return "rbtorrent:{}".format(rbtorrent_param[0]) - - -def _parse_package_integrity(integrity): - """ - :param integrity: package integrity in format "{algo}-{base64_of_hash}" - :type integrity: string - :return: tuple of algorithm and hash (hex) - :rtype: (str, str) - """ - algo, hash_b64 = integrity.split("-", 1) - - try: - hash_hex = binascii.hexlify(base64.b64decode(hash_b64)) - except TypeError as e: - raise LockfilePackageMetaInvalidError("Invalid package integrity encoding, integrity: {}, error: {}".format(integrity, e)) - - return (algo, hash_hex) +import base64 +import binascii +import yaml +import os + +from six.moves.urllib import parse as urlparse +from six import iteritems + +from ..base import PackageJson, BaseLockfile, LockfilePackageMeta, LockfilePackageMetaInvalidError + + +class PnpmLockfile(BaseLockfile): + IMPORTER_KEYS = PackageJson.DEP_KEYS + ("specifiers",) + + def read(self): + with open(self.path, "r") as f: + self.data = yaml.load(f, Loader=yaml.CSafeLoader) + + def write(self, path=None): + """ + :param path: path to store lockfile, defaults to original path + :type path: str + """ + if path is None: + path = self.path + + with open(path, "w") as f: + yaml.dump(self.data, f, Dumper=yaml.CSafeDumper) + + def get_packages_meta(self): + """ + Extracts packages meta from lockfile. + :rtype: list of LockfilePackageMeta + """ + packages = self.data.get("packages", {}) + + return map(lambda x: _parse_package_meta(*x), iteritems(packages)) + + def update_tarball_resolutions(self, fn): + """ + :param fn: maps `LockfilePackageMeta` instance to new `resolution.tarball` value + :type fn: lambda + """ + packages = self.data.get("packages", {}) + + for key, meta in iteritems(packages): + meta["resolution"]["tarball"] = fn(_parse_package_meta(key, meta)) + packages[key] = meta + + def get_importers(self): + """ + Returns "importers" section from the lockfile or creates similar structure from "dependencies" and "specifiers". + :rtype: dict of dict of dict of str + """ + importers = self.data.get("importers") + if importers is not None: + return importers + + importer = {k: self.data[k] for k in self.IMPORTER_KEYS if k in self.data} + + return ({".": importer} if importer else {}) + + def merge(self, lf): + """ + Merges two lockfiles: + 1. Converts the lockfile to monorepo-like lockfile with "importers" section instead of "dependencies" and "specifiers". + 2. Merges `lf`'s dependencies and specifiers to importers. + 3. Merges `lf`'s packages to the lockfile. + :param lf: lockfile to merge + :type lf: PnpmLockfile + """ + importers = self.get_importers() + build_path = os.path.dirname(self.path) + + for [importer, imports] in iteritems(lf.get_importers()): + importer_path = os.path.normpath(os.path.join(os.path.dirname(lf.path), importer)) + importer_rel_path = os.path.relpath(importer_path, build_path) + importers[importer_rel_path] = imports + + self.data["importers"] = importers + + for k in self.IMPORTER_KEYS: + self.data.pop(k, None) + + packages = self.data.get("packages", {}) + for k, v in iteritems(lf.data.get("packages", {})): + if k not in packages: + packages[k] = v + self.data["packages"] = packages + + +def _parse_package_meta(key, meta): + """ + :param key: uniq package key from lockfile + :type key: string + :param meta: package meta dict from lockfile + :type meta: dict + :rtype: LockfilePackageMetaInvalidError + """ + try: + name, version = _parse_package_key(key) + sky_id = _parse_sky_id_from_tarball_url(meta["resolution"]["tarball"]) + integrity_algorithm, integrity = _parse_package_integrity(meta["resolution"]["integrity"]) + except KeyError as e: + raise TypeError("Invalid package meta for key {}, missing {} key".format(key, e)) + except LockfilePackageMetaInvalidError as e: + raise TypeError("Invalid package meta for key {}, parse error: {}".format(key, e)) + + return LockfilePackageMeta(name, version, sky_id, integrity, integrity_algorithm) + + +def _parse_package_key(key): + """ + :param key: package key in format "/({scope}/)?{package_name}/{package_version}(_{peer_dependencies})?" + :type key: string + :return: tuple of scoped package name and version + :rtype: (str, str) + """ + try: + tokens = key.split("/")[1:] + version = tokens.pop().split("_", 1)[0] + + if len(tokens) < 1 or len(tokens) > 2: + raise TypeError() + except (IndexError, TypeError): + raise LockfilePackageMetaInvalidError("Invalid package key") + + return ("/".join(tokens), version) + + +def _parse_sky_id_from_tarball_url(tarball_url): + """ + :param tarball_url: tarball url + :type tarball_url: string + :return: sky id + :rtype: string + """ + if tarball_url.startswith("file:"): + return "" + + rbtorrent_param = urlparse.parse_qs(urlparse.urlparse(tarball_url).query).get("rbtorrent") + + if rbtorrent_param is None: + raise LockfilePackageMetaInvalidError("Missing rbtorrent param in tarball url {}".format(tarball_url)) + + return "rbtorrent:{}".format(rbtorrent_param[0]) + + +def _parse_package_integrity(integrity): + """ + :param integrity: package integrity in format "{algo}-{base64_of_hash}" + :type integrity: string + :return: tuple of algorithm and hash (hex) + :rtype: (str, str) + """ + algo, hash_b64 = integrity.split("-", 1) + + try: + hash_hex = binascii.hexlify(base64.b64decode(hash_b64)) + except TypeError as e: + raise LockfilePackageMetaInvalidError("Invalid package integrity encoding, integrity: {}, error: {}".format(integrity, e)) + + return (algo, hash_hex) 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 1a48675834..81692c825f 100644 --- a/build/plugins/lib/nots/package_manager/pnpm/package_manager.py +++ b/build/plugins/lib/nots/package_manager/pnpm/package_manager.py @@ -1,181 +1,181 @@ -import os -import shutil -import yaml - -from six import iteritems - -from ..base import PackageJson, BasePackageManager, PackageManagerError -from .lockfile import PnpmLockfile -from .workspace import PnpmWorkspace -from .utils import build_pj_path, build_lockfile_path, build_ws_config_path, build_nm_bundle_path - - -class PnpmPackageManager(BasePackageManager): - _STORE_NM_PATH = os.path.join(".pnpm", "store") - _VSTORE_NM_PATH = os.path.join(".pnpm", "virtual-store") - _STORE_VER = "v3" - - def install(self): - """ - Creates node_modules directory according to the lockfile. - """ - self._prepare_workspace() - self._exec_command([ - "install", - "--offline", - "--frozen-lockfile", - "--store-dir", self._nm_path(self._STORE_NM_PATH), - "--virtual-store-dir", self._nm_path(self._VSTORE_NM_PATH), - "--no-verify-store-integrity", - "--package-import-method", "hardlink", - "--ignore-pnpmfile", - "--ignore-scripts", - "--strict-peer-dependencies", - ]) - self._fix_stores_in_modules_yaml() - - def get_peer_paths_from_package_json(self): - """ - Returns paths of direct workspace dependencies (source root related). - :rtype: list of str - """ - pj = PackageJson.load(build_pj_path(self.sources_path)) - - return map(lambda x: os.path.normpath(os.path.join(self.module_path, x[1])), pj.get_workspace_dep_paths()) - - def calc_node_modules_inouts(self): - """ - Returns input and output paths for command that creates `node_modules` bundle. - :return: Pair of input and output paths with correct roots ($S or $B). - :rtype: (list of str, list of str) - """ - # Inputs: source package.json and lockfile, built package.jsons, lockfiles and workspace configs of deps, tarballs. - ins = [] - # Source lockfiles are used only to get tarballs info. - src_lf_paths = [build_lockfile_path(self.sources_path)] - pj = PackageJson.load(build_pj_path(self.sources_path)) - - for [dep_src_path, (dep_pj, depth)] in iteritems(pj.get_workspace_map()): - if dep_src_path == self.sources_path: - continue - dep_mod_path = dep_src_path[len(self.sources_root) + 1:] - # pnpm requires all package.jsons. - ins.append(build_pj_path(dep_mod_path)) - dep_lf_src_path = build_lockfile_path(dep_src_path) - if not os.path.isfile(dep_lf_src_path): - continue - src_lf_paths.append(dep_lf_src_path) - # Merged workspace configs and lockfiles of direct deps. - if depth == 1: - ins.append(build_ws_config_path(dep_mod_path)) - ins.append(build_lockfile_path(dep_mod_path)) - - for pkg in self.extract_packages_meta_from_lockfiles(src_lf_paths): - ins.append(self._contrib_tarball_path(pkg)) - - s_root = lambda x: os.path.join("$S", x) - b_root = lambda x: os.path.join("$B", x) - - ins = map(b_root, ins) + [ - s_root(build_pj_path(self.module_path)), - s_root(build_lockfile_path(self.module_path)), - ] - - # Outputs: patched lockfile, generated workspace config, created node_modules bundle. - outs = [b_root(f(self.module_path)) for f in (build_lockfile_path, build_ws_config_path, build_nm_bundle_path)] - - return (ins, outs) - - def extract_packages_meta_from_lockfiles(self, lf_paths): - """ - :type lf_paths: iterable of BaseLockfile - :rtype: iterable of LockfilePackageMeta - """ - tarballs = set() - - for lf_path in lf_paths: - try: - for pkg in PnpmLockfile.load(lf_path).get_packages_meta(): - if pkg.tarball_path not in tarballs: - tarballs.add(pkg.tarball_path) - yield pkg - except Exception as e: - raise PackageManagerError("Unable to process lockfile {}: {}".format(lf_path, e)) - - def _prepare_workspace(self): - pj = self._build_package_json() - ws = PnpmWorkspace(build_ws_config_path(self.build_path)) - ws.set_from_package_json(pj) - dep_paths = ws.get_paths() - self._build_merged_workspace_config(ws, dep_paths) - self._build_merged_lockfile(dep_paths) - - def _build_package_json(self): - """ - :rtype: PackageJson - """ - in_pj_path = build_pj_path(self.sources_path) - out_pj_path = build_pj_path(self.build_path) - shutil.copyfile(in_pj_path, out_pj_path) - - return PackageJson.load(out_pj_path) - - def _build_merged_lockfile(self, dep_paths): - """ - :type dep_paths: list of str - :rtype: PnpmLockfile - """ - in_lf_path = build_lockfile_path(self.sources_path) - out_lf_path = build_lockfile_path(self.build_path) - - lf = PnpmLockfile.load(in_lf_path) - # Change to the output path for correct path calcs on merging. - lf.path = out_lf_path - - for dep_path in dep_paths: - if dep_path is self.build_path: - continue - lf_path = build_lockfile_path(dep_path) - if os.path.isfile(lf_path): - lf.merge(PnpmLockfile.load(lf_path)) - - lf.update_tarball_resolutions(lambda p: self._contrib_tarball_url(p)) - lf.write() - - def _build_merged_workspace_config(self, ws, dep_paths): - """ - :type ws: PnpmWorkspaceConfig - :type dep_paths: list of str - """ - for dep_path in dep_paths: - if dep_path is self.build_path: - continue - ws_config_path = build_ws_config_path(dep_path) - if os.path.isfile(ws_config_path): - ws.merge(PnpmWorkspace.load(ws_config_path)) - - ws.write() - - def _fix_stores_in_modules_yaml(self): - """ - Ensures that store paths are the same as would be after installing deps in the source dir. - This is required to reuse `node_modules` after build. - """ - with open(self._nm_path(".modules.yaml"), "r+") as f: - data = yaml.load(f, Loader=yaml.CSafeLoader) - # NOTE: pnpm requires absolute store path here. - data["storeDir"] = os.path.join(self.sources_path, "node_modules", self._STORE_NM_PATH, self._STORE_VER) - data["virtualStoreDir"] = self._VSTORE_NM_PATH - f.seek(0) - yaml.dump(data, f, Dumper=yaml.CSafeDumper) - f.truncate() - - def _get_default_options(self): - return super(PnpmPackageManager, self)._get_default_options() + [ - "--stream", - "--reporter", "append-only", - "--no-color", - ] - - def _get_debug_log_path(self): - return self._nm_path(".pnpm-debug.log") +import os +import shutil +import yaml + +from six import iteritems + +from ..base import PackageJson, BasePackageManager, PackageManagerError +from .lockfile import PnpmLockfile +from .workspace import PnpmWorkspace +from .utils import build_pj_path, build_lockfile_path, build_ws_config_path, build_nm_bundle_path + + +class PnpmPackageManager(BasePackageManager): + _STORE_NM_PATH = os.path.join(".pnpm", "store") + _VSTORE_NM_PATH = os.path.join(".pnpm", "virtual-store") + _STORE_VER = "v3" + + def install(self): + """ + Creates node_modules directory according to the lockfile. + """ + self._prepare_workspace() + self._exec_command([ + "install", + "--offline", + "--frozen-lockfile", + "--store-dir", self._nm_path(self._STORE_NM_PATH), + "--virtual-store-dir", self._nm_path(self._VSTORE_NM_PATH), + "--no-verify-store-integrity", + "--package-import-method", "hardlink", + "--ignore-pnpmfile", + "--ignore-scripts", + "--strict-peer-dependencies", + ]) + self._fix_stores_in_modules_yaml() + + def get_peer_paths_from_package_json(self): + """ + Returns paths of direct workspace dependencies (source root related). + :rtype: list of str + """ + pj = PackageJson.load(build_pj_path(self.sources_path)) + + return map(lambda x: os.path.normpath(os.path.join(self.module_path, x[1])), pj.get_workspace_dep_paths()) + + def calc_node_modules_inouts(self): + """ + Returns input and output paths for command that creates `node_modules` bundle. + :return: Pair of input and output paths with correct roots ($S or $B). + :rtype: (list of str, list of str) + """ + # Inputs: source package.json and lockfile, built package.jsons, lockfiles and workspace configs of deps, tarballs. + ins = [] + # Source lockfiles are used only to get tarballs info. + src_lf_paths = [build_lockfile_path(self.sources_path)] + pj = PackageJson.load(build_pj_path(self.sources_path)) + + for [dep_src_path, (dep_pj, depth)] in iteritems(pj.get_workspace_map()): + if dep_src_path == self.sources_path: + continue + dep_mod_path = dep_src_path[len(self.sources_root) + 1:] + # pnpm requires all package.jsons. + ins.append(build_pj_path(dep_mod_path)) + dep_lf_src_path = build_lockfile_path(dep_src_path) + if not os.path.isfile(dep_lf_src_path): + continue + src_lf_paths.append(dep_lf_src_path) + # Merged workspace configs and lockfiles of direct deps. + if depth == 1: + ins.append(build_ws_config_path(dep_mod_path)) + ins.append(build_lockfile_path(dep_mod_path)) + + for pkg in self.extract_packages_meta_from_lockfiles(src_lf_paths): + ins.append(self._contrib_tarball_path(pkg)) + + s_root = lambda x: os.path.join("$S", x) + b_root = lambda x: os.path.join("$B", x) + + ins = map(b_root, ins) + [ + s_root(build_pj_path(self.module_path)), + s_root(build_lockfile_path(self.module_path)), + ] + + # Outputs: patched lockfile, generated workspace config, created node_modules bundle. + outs = [b_root(f(self.module_path)) for f in (build_lockfile_path, build_ws_config_path, build_nm_bundle_path)] + + return (ins, outs) + + def extract_packages_meta_from_lockfiles(self, lf_paths): + """ + :type lf_paths: iterable of BaseLockfile + :rtype: iterable of LockfilePackageMeta + """ + tarballs = set() + + for lf_path in lf_paths: + try: + for pkg in PnpmLockfile.load(lf_path).get_packages_meta(): + if pkg.tarball_path not in tarballs: + tarballs.add(pkg.tarball_path) + yield pkg + except Exception as e: + raise PackageManagerError("Unable to process lockfile {}: {}".format(lf_path, e)) + + def _prepare_workspace(self): + pj = self._build_package_json() + ws = PnpmWorkspace(build_ws_config_path(self.build_path)) + ws.set_from_package_json(pj) + dep_paths = ws.get_paths() + self._build_merged_workspace_config(ws, dep_paths) + self._build_merged_lockfile(dep_paths) + + def _build_package_json(self): + """ + :rtype: PackageJson + """ + in_pj_path = build_pj_path(self.sources_path) + out_pj_path = build_pj_path(self.build_path) + shutil.copyfile(in_pj_path, out_pj_path) + + return PackageJson.load(out_pj_path) + + def _build_merged_lockfile(self, dep_paths): + """ + :type dep_paths: list of str + :rtype: PnpmLockfile + """ + in_lf_path = build_lockfile_path(self.sources_path) + out_lf_path = build_lockfile_path(self.build_path) + + lf = PnpmLockfile.load(in_lf_path) + # Change to the output path for correct path calcs on merging. + lf.path = out_lf_path + + for dep_path in dep_paths: + if dep_path is self.build_path: + continue + lf_path = build_lockfile_path(dep_path) + if os.path.isfile(lf_path): + lf.merge(PnpmLockfile.load(lf_path)) + + lf.update_tarball_resolutions(lambda p: self._contrib_tarball_url(p)) + lf.write() + + def _build_merged_workspace_config(self, ws, dep_paths): + """ + :type ws: PnpmWorkspaceConfig + :type dep_paths: list of str + """ + for dep_path in dep_paths: + if dep_path is self.build_path: + continue + ws_config_path = build_ws_config_path(dep_path) + if os.path.isfile(ws_config_path): + ws.merge(PnpmWorkspace.load(ws_config_path)) + + ws.write() + + def _fix_stores_in_modules_yaml(self): + """ + Ensures that store paths are the same as would be after installing deps in the source dir. + This is required to reuse `node_modules` after build. + """ + with open(self._nm_path(".modules.yaml"), "r+") as f: + data = yaml.load(f, Loader=yaml.CSafeLoader) + # NOTE: pnpm requires absolute store path here. + data["storeDir"] = os.path.join(self.sources_path, "node_modules", self._STORE_NM_PATH, self._STORE_VER) + data["virtualStoreDir"] = self._VSTORE_NM_PATH + f.seek(0) + yaml.dump(data, f, Dumper=yaml.CSafeDumper) + f.truncate() + + def _get_default_options(self): + return super(PnpmPackageManager, self)._get_default_options() + [ + "--stream", + "--reporter", "append-only", + "--no-color", + ] + + def _get_debug_log_path(self): + return self._nm_path(".pnpm-debug.log") diff --git a/build/plugins/lib/nots/package_manager/pnpm/tests/lockfile.py b/build/plugins/lib/nots/package_manager/pnpm/tests/lockfile.py index 06315a4992..a4e4b68eb7 100644 --- a/build/plugins/lib/nots/package_manager/pnpm/tests/lockfile.py +++ b/build/plugins/lib/nots/package_manager/pnpm/tests/lockfile.py @@ -1,320 +1,320 @@ -import pytest - -from build.plugins.lib.nots.package_manager.pnpm.lockfile import PnpmLockfile - - -def test_lockfile_get_packages_meta_ok(): - lf = PnpmLockfile(path="/pnpm-lock.yaml") - lf.data = { - "packages": { - "/@babel/cli/7.6.2_@babel+core@7.6.2": { - "resolution": { - "integrity": "sha512-JDZ+T/br9pPfT2lmAMJypJDTTTHM9ePD/ED10TRjRzJVdEVy+JB3iRlhzYmTt5YkNgHvxWGlUVnLtdv6ruiDrQ==", - "tarball": "@babel%2fcli/-/cli-7.6.2.tgz?rbtorrent=cb1849da3e4947e56a8f6bde6a1ec42703ddd187", - }, - }, - }, - } - - packages = list(lf.get_packages_meta()) - pkg = packages[0] - - assert len(packages) == 1 - assert pkg.name == "@babel/cli" - assert pkg.version == "7.6.2" - assert pkg.sky_id == "rbtorrent:cb1849da3e4947e56a8f6bde6a1ec42703ddd187" - assert pkg.integrity == b"24367e4ff6ebf693df4f696600c272a490d34d31ccf5e3c3fc40f5d13463473255744572f89077891961cd8993b796243601efc561a55159cbb5dbfaaee883ad" - assert pkg.integrity_algorithm == "sha512" - - -def test_lockfile_get_packages_empty(): - lf = PnpmLockfile(path="/pnpm-lock.yaml") - lf.data = {} - - assert len(list(lf.get_packages_meta())) == 0 - - -def test_package_meta_invalid_key(): - lf = PnpmLockfile(path="/pnpm-lock.yaml") - lf.data = { - "packages": { - "in/valid": {}, - }, - } - - with pytest.raises(TypeError) as e: - list(lf.get_packages_meta()) - - assert str(e.value) == "Invalid package meta for key in/valid, parse error: Invalid package key" - - -def test_package_meta_missing_resolution(): - lf = PnpmLockfile(path="/pnpm-lock.yaml") - lf.data = { - "packages": { - "/valid/1.2.3": {}, - }, - } - - with pytest.raises(TypeError) as e: - list(lf.get_packages_meta()) - - assert str(e.value) == "Invalid package meta for key /valid/1.2.3, missing 'resolution' key" - - -def test_package_meta_missing_tarball(): - lf = PnpmLockfile(path="/pnpm-lock.yaml") - lf.data = { - "packages": { - "/valid/1.2.3": { - "resolution": {}, - }, - }, - } - - with pytest.raises(TypeError) as e: - list(lf.get_packages_meta()) - - assert str(e.value) == "Invalid package meta for key /valid/1.2.3, missing 'tarball' key" - - -def test_package_meta_missing_rbtorrent(): - lf = PnpmLockfile(path="/pnpm-lock.yaml") - lf.data = { - "packages": { - "/valid/1.2.3": { - "resolution": { - "tarball": "valid-1.2.3.tgz", - }, - }, - }, - } - - with pytest.raises(TypeError) as e: - list(lf.get_packages_meta()) - - assert str(e.value) == "Invalid package meta for key /valid/1.2.3, parse error: Missing rbtorrent param in tarball url valid-1.2.3.tgz" - - -def test_lockfile_meta_file_tarball(): - lf = PnpmLockfile(path="/pnpm-lock.yaml") - lf.data = { - "packages": { - "/@babel/cli/7.6.2": { - "resolution": { - "integrity": "sha512-JDZ+T/br9pPfT2lmAMJypJDTTTHM9ePD/ED10TRjRzJVdEVy+JB3iRlhzYmTt5YkNgHvxWGlUVnLtdv6ruiDrQ==", - "tarball": "file:/some/abs/path.tgz", - }, - }, - }, - } - - packages = list(lf.get_packages_meta()) - pkg = packages[0] - - assert len(packages) == 1 - assert pkg.name == "@babel/cli" - assert pkg.version == "7.6.2" - assert pkg.sky_id == "" - - -def test_lockfile_update_tarball_resolutions_ok(): - lf = PnpmLockfile(path="/pnpm-lock.yaml") - lf.data = { - "packages": { - "/@babel/cli/7.6.2_@babel+core@7.6.2": { - "resolution": { - "integrity": "sha512-JDZ+T/br9pPfT2lmAMJypJDTTTHM9ePD/ED10TRjRzJVdEVy+JB3iRlhzYmTt5YkNgHvxWGlUVnLtdv6ruiDrQ==", - "tarball": "@babel%2fcli/-/cli-7.6.2.tgz?rbtorrent=cb1849da3e4947e56a8f6bde6a1ec42703ddd187", - }, - }, - }, - } - - lf.update_tarball_resolutions(lambda p: p.name) - - assert lf.data["packages"]["/@babel/cli/7.6.2_@babel+core@7.6.2"]["resolution"]["tarball"] == "@babel/cli" - - -def test_lockfile_merge(): - lf1 = PnpmLockfile(path="/foo/pnpm-lock.yaml") - lf1.data = { - "dependencies": { - "a": "1.0.0", - }, - "specifiers": { - "a": "1.0.0", - }, - "packages": { - "/a/1.0.0": {}, - }, - } - - lf2 = PnpmLockfile(path="/bar/pnpm-lock.yaml") - lf2.data = { - "dependencies": { - "b": "1.0.0", - }, - "specifiers": { - "b": "1.0.0", - }, - "packages": { - "/b/1.0.0": {}, - }, - } - - lf3 = PnpmLockfile(path="/another/baz/pnpm-lock.yaml") - lf3.data = { - "importers": { - ".": { - "dependencies": { - "@a/qux": "link:../qux", - "a": "1.0.0", - }, - "specifiers": { - "@a/qux": "workspace:../qux", - "a": "1.0.0", - }, - }, - "../qux": { - "dependencies": { - "b": "1.0.1", - }, - "specifiers": { - "b": "1.0.1", - }, - }, - }, - "packages": { - "/a/1.0.0": {}, - "/b/1.0.1": {}, - }, - } - - lf4 = PnpmLockfile(path="/another/quux/pnpm-lock.yaml") - lf4.data = { - "dependencies": { - "@a/bar": "link:../../bar", - }, - "specifiers": { - "@a/bar": "workspace:../../bar", - }, - } - - lf1.merge(lf2) - lf1.merge(lf3) - lf1.merge(lf4) - - assert lf1.data == { - "importers": { - ".": { - "dependencies": { - "a": "1.0.0", - }, - "specifiers": { - "a": "1.0.0", - }, - }, - "../bar": { - "dependencies": { - "b": "1.0.0", - }, - "specifiers": { - "b": "1.0.0", - }, - }, - "../another/baz": { - "dependencies": { - "@a/qux": "link:../qux", - "a": "1.0.0", - }, - "specifiers": { - "@a/qux": "workspace:../qux", - "a": "1.0.0", - }, - }, - "../another/qux": { - "dependencies": { - "b": "1.0.1", - }, - "specifiers": { - "b": "1.0.1", - }, - }, - "../another/quux": { - "dependencies": { - "@a/bar": "link:../../bar", - }, - "specifiers": { - "@a/bar": "workspace:../../bar", - }, - }, - }, - "packages": { - "/a/1.0.0": {}, - "/b/1.0.0": {}, - "/b/1.0.1": {}, - }, - } - - -def test_lockfile_merge_dont_overrides_packages(): - lf1 = PnpmLockfile(path="/foo/pnpm-lock.yaml") - lf1.data = { - "dependencies": { - "a": "1.0.0", - }, - "specifiers": { - "a": "1.0.0", - }, - "packages": { - "/a/1.0.0": {}, - }, - } - - lf2 = PnpmLockfile(path="/bar/pnpm-lock.yaml") - lf2.data = { - "dependencies": { - "a": "1.0.0", - "b": "1.0.0", - }, - "specifiers": { - "a": "1.0.0", - "b": "1.0.0", - }, - "packages": { - "/a/1.0.0": { - "overriden": True, - }, - "/b/1.0.0": {}, - }, - } - - lf1.merge(lf2) - - assert lf1.data == { - "importers": { - ".": { - "dependencies": { - "a": "1.0.0", - }, - "specifiers": { - "a": "1.0.0", - }, - }, - "../bar": { - "dependencies": { - "a": "1.0.0", - "b": "1.0.0", - }, - "specifiers": { - "a": "1.0.0", - "b": "1.0.0", - }, - }, - }, - "packages": { - "/a/1.0.0": {}, - "/b/1.0.0": {}, - }, - } +import pytest + +from build.plugins.lib.nots.package_manager.pnpm.lockfile import PnpmLockfile + + +def test_lockfile_get_packages_meta_ok(): + lf = PnpmLockfile(path="/pnpm-lock.yaml") + lf.data = { + "packages": { + "/@babel/cli/7.6.2_@babel+core@7.6.2": { + "resolution": { + "integrity": "sha512-JDZ+T/br9pPfT2lmAMJypJDTTTHM9ePD/ED10TRjRzJVdEVy+JB3iRlhzYmTt5YkNgHvxWGlUVnLtdv6ruiDrQ==", + "tarball": "@babel%2fcli/-/cli-7.6.2.tgz?rbtorrent=cb1849da3e4947e56a8f6bde6a1ec42703ddd187", + }, + }, + }, + } + + packages = list(lf.get_packages_meta()) + pkg = packages[0] + + assert len(packages) == 1 + assert pkg.name == "@babel/cli" + assert pkg.version == "7.6.2" + assert pkg.sky_id == "rbtorrent:cb1849da3e4947e56a8f6bde6a1ec42703ddd187" + assert pkg.integrity == b"24367e4ff6ebf693df4f696600c272a490d34d31ccf5e3c3fc40f5d13463473255744572f89077891961cd8993b796243601efc561a55159cbb5dbfaaee883ad" + assert pkg.integrity_algorithm == "sha512" + + +def test_lockfile_get_packages_empty(): + lf = PnpmLockfile(path="/pnpm-lock.yaml") + lf.data = {} + + assert len(list(lf.get_packages_meta())) == 0 + + +def test_package_meta_invalid_key(): + lf = PnpmLockfile(path="/pnpm-lock.yaml") + lf.data = { + "packages": { + "in/valid": {}, + }, + } + + with pytest.raises(TypeError) as e: + list(lf.get_packages_meta()) + + assert str(e.value) == "Invalid package meta for key in/valid, parse error: Invalid package key" + + +def test_package_meta_missing_resolution(): + lf = PnpmLockfile(path="/pnpm-lock.yaml") + lf.data = { + "packages": { + "/valid/1.2.3": {}, + }, + } + + with pytest.raises(TypeError) as e: + list(lf.get_packages_meta()) + + assert str(e.value) == "Invalid package meta for key /valid/1.2.3, missing 'resolution' key" + + +def test_package_meta_missing_tarball(): + lf = PnpmLockfile(path="/pnpm-lock.yaml") + lf.data = { + "packages": { + "/valid/1.2.3": { + "resolution": {}, + }, + }, + } + + with pytest.raises(TypeError) as e: + list(lf.get_packages_meta()) + + assert str(e.value) == "Invalid package meta for key /valid/1.2.3, missing 'tarball' key" + + +def test_package_meta_missing_rbtorrent(): + lf = PnpmLockfile(path="/pnpm-lock.yaml") + lf.data = { + "packages": { + "/valid/1.2.3": { + "resolution": { + "tarball": "valid-1.2.3.tgz", + }, + }, + }, + } + + with pytest.raises(TypeError) as e: + list(lf.get_packages_meta()) + + assert str(e.value) == "Invalid package meta for key /valid/1.2.3, parse error: Missing rbtorrent param in tarball url valid-1.2.3.tgz" + + +def test_lockfile_meta_file_tarball(): + lf = PnpmLockfile(path="/pnpm-lock.yaml") + lf.data = { + "packages": { + "/@babel/cli/7.6.2": { + "resolution": { + "integrity": "sha512-JDZ+T/br9pPfT2lmAMJypJDTTTHM9ePD/ED10TRjRzJVdEVy+JB3iRlhzYmTt5YkNgHvxWGlUVnLtdv6ruiDrQ==", + "tarball": "file:/some/abs/path.tgz", + }, + }, + }, + } + + packages = list(lf.get_packages_meta()) + pkg = packages[0] + + assert len(packages) == 1 + assert pkg.name == "@babel/cli" + assert pkg.version == "7.6.2" + assert pkg.sky_id == "" + + +def test_lockfile_update_tarball_resolutions_ok(): + lf = PnpmLockfile(path="/pnpm-lock.yaml") + lf.data = { + "packages": { + "/@babel/cli/7.6.2_@babel+core@7.6.2": { + "resolution": { + "integrity": "sha512-JDZ+T/br9pPfT2lmAMJypJDTTTHM9ePD/ED10TRjRzJVdEVy+JB3iRlhzYmTt5YkNgHvxWGlUVnLtdv6ruiDrQ==", + "tarball": "@babel%2fcli/-/cli-7.6.2.tgz?rbtorrent=cb1849da3e4947e56a8f6bde6a1ec42703ddd187", + }, + }, + }, + } + + lf.update_tarball_resolutions(lambda p: p.name) + + assert lf.data["packages"]["/@babel/cli/7.6.2_@babel+core@7.6.2"]["resolution"]["tarball"] == "@babel/cli" + + +def test_lockfile_merge(): + lf1 = PnpmLockfile(path="/foo/pnpm-lock.yaml") + lf1.data = { + "dependencies": { + "a": "1.0.0", + }, + "specifiers": { + "a": "1.0.0", + }, + "packages": { + "/a/1.0.0": {}, + }, + } + + lf2 = PnpmLockfile(path="/bar/pnpm-lock.yaml") + lf2.data = { + "dependencies": { + "b": "1.0.0", + }, + "specifiers": { + "b": "1.0.0", + }, + "packages": { + "/b/1.0.0": {}, + }, + } + + lf3 = PnpmLockfile(path="/another/baz/pnpm-lock.yaml") + lf3.data = { + "importers": { + ".": { + "dependencies": { + "@a/qux": "link:../qux", + "a": "1.0.0", + }, + "specifiers": { + "@a/qux": "workspace:../qux", + "a": "1.0.0", + }, + }, + "../qux": { + "dependencies": { + "b": "1.0.1", + }, + "specifiers": { + "b": "1.0.1", + }, + }, + }, + "packages": { + "/a/1.0.0": {}, + "/b/1.0.1": {}, + }, + } + + lf4 = PnpmLockfile(path="/another/quux/pnpm-lock.yaml") + lf4.data = { + "dependencies": { + "@a/bar": "link:../../bar", + }, + "specifiers": { + "@a/bar": "workspace:../../bar", + }, + } + + lf1.merge(lf2) + lf1.merge(lf3) + lf1.merge(lf4) + + assert lf1.data == { + "importers": { + ".": { + "dependencies": { + "a": "1.0.0", + }, + "specifiers": { + "a": "1.0.0", + }, + }, + "../bar": { + "dependencies": { + "b": "1.0.0", + }, + "specifiers": { + "b": "1.0.0", + }, + }, + "../another/baz": { + "dependencies": { + "@a/qux": "link:../qux", + "a": "1.0.0", + }, + "specifiers": { + "@a/qux": "workspace:../qux", + "a": "1.0.0", + }, + }, + "../another/qux": { + "dependencies": { + "b": "1.0.1", + }, + "specifiers": { + "b": "1.0.1", + }, + }, + "../another/quux": { + "dependencies": { + "@a/bar": "link:../../bar", + }, + "specifiers": { + "@a/bar": "workspace:../../bar", + }, + }, + }, + "packages": { + "/a/1.0.0": {}, + "/b/1.0.0": {}, + "/b/1.0.1": {}, + }, + } + + +def test_lockfile_merge_dont_overrides_packages(): + lf1 = PnpmLockfile(path="/foo/pnpm-lock.yaml") + lf1.data = { + "dependencies": { + "a": "1.0.0", + }, + "specifiers": { + "a": "1.0.0", + }, + "packages": { + "/a/1.0.0": {}, + }, + } + + lf2 = PnpmLockfile(path="/bar/pnpm-lock.yaml") + lf2.data = { + "dependencies": { + "a": "1.0.0", + "b": "1.0.0", + }, + "specifiers": { + "a": "1.0.0", + "b": "1.0.0", + }, + "packages": { + "/a/1.0.0": { + "overriden": True, + }, + "/b/1.0.0": {}, + }, + } + + lf1.merge(lf2) + + assert lf1.data == { + "importers": { + ".": { + "dependencies": { + "a": "1.0.0", + }, + "specifiers": { + "a": "1.0.0", + }, + }, + "../bar": { + "dependencies": { + "a": "1.0.0", + "b": "1.0.0", + }, + "specifiers": { + "a": "1.0.0", + "b": "1.0.0", + }, + }, + }, + "packages": { + "/a/1.0.0": {}, + "/b/1.0.0": {}, + }, + } diff --git a/build/plugins/lib/nots/package_manager/pnpm/tests/workspace.py b/build/plugins/lib/nots/package_manager/pnpm/tests/workspace.py index f6a73e0d4c..8a39710821 100644 --- a/build/plugins/lib/nots/package_manager/pnpm/tests/workspace.py +++ b/build/plugins/lib/nots/package_manager/pnpm/tests/workspace.py @@ -1,58 +1,58 @@ -from build.plugins.lib.nots.package_manager.base import PackageJson -from build.plugins.lib.nots.package_manager.pnpm.workspace import PnpmWorkspace - - -def test_workspace_get_paths(): - ws = PnpmWorkspace(path="/packages/foo/pnpm-workspace.yaml") - ws.packages = set([".", "../bar", "../../another/baz"]) - - assert sorted(ws.get_paths()) == [ - "/another/baz", - "/packages/bar", - "/packages/foo", - ] - - -def test_workspace_set_from_package_json(): - ws = PnpmWorkspace(path="/packages/foo/pnpm-workspace.yaml") - pj = PackageJson(path="/packages/foo/package.json") - pj.data = { - "dependencies": { - "@a/bar": "workspace:../bar", - }, - "devDependencies": { - "@a/baz": "workspace:../../another/baz", - }, - "peerDependencies": { - "@a/qux": "workspace:../../another/qux", - }, - "optionalDependencies": { - "@a/quux": "workspace:../../another/quux", - } - } - - ws.set_from_package_json(pj) - - assert sorted(ws.get_paths()) == [ - "/another/baz", - "/another/quux", - "/another/qux", - "/packages/bar", - "/packages/foo", - ] - - -def test_workspace_merge(): - ws1 = PnpmWorkspace(path="/packages/foo/pnpm-workspace.yaml") - ws1.packages = set([".", "../bar", "../../another/baz"]) - ws2 = PnpmWorkspace(path="/another/baz/pnpm-workspace.yaml") - ws2.packages = set([".", "../qux"]) - - ws1.merge(ws2) - - assert sorted(ws1.get_paths()) == [ - "/another/baz", - "/another/qux", - "/packages/bar", - "/packages/foo", - ] +from build.plugins.lib.nots.package_manager.base import PackageJson +from build.plugins.lib.nots.package_manager.pnpm.workspace import PnpmWorkspace + + +def test_workspace_get_paths(): + ws = PnpmWorkspace(path="/packages/foo/pnpm-workspace.yaml") + ws.packages = set([".", "../bar", "../../another/baz"]) + + assert sorted(ws.get_paths()) == [ + "/another/baz", + "/packages/bar", + "/packages/foo", + ] + + +def test_workspace_set_from_package_json(): + ws = PnpmWorkspace(path="/packages/foo/pnpm-workspace.yaml") + pj = PackageJson(path="/packages/foo/package.json") + pj.data = { + "dependencies": { + "@a/bar": "workspace:../bar", + }, + "devDependencies": { + "@a/baz": "workspace:../../another/baz", + }, + "peerDependencies": { + "@a/qux": "workspace:../../another/qux", + }, + "optionalDependencies": { + "@a/quux": "workspace:../../another/quux", + } + } + + ws.set_from_package_json(pj) + + assert sorted(ws.get_paths()) == [ + "/another/baz", + "/another/quux", + "/another/qux", + "/packages/bar", + "/packages/foo", + ] + + +def test_workspace_merge(): + ws1 = PnpmWorkspace(path="/packages/foo/pnpm-workspace.yaml") + ws1.packages = set([".", "../bar", "../../another/baz"]) + ws2 = PnpmWorkspace(path="/another/baz/pnpm-workspace.yaml") + ws2.packages = set([".", "../qux"]) + + ws1.merge(ws2) + + assert sorted(ws1.get_paths()) == [ + "/another/baz", + "/another/qux", + "/packages/bar", + "/packages/foo", + ] diff --git a/build/plugins/lib/nots/package_manager/pnpm/tests/ya.make b/build/plugins/lib/nots/package_manager/pnpm/tests/ya.make index 94712f1db9..1a0cc8d4fc 100644 --- a/build/plugins/lib/nots/package_manager/pnpm/tests/ya.make +++ b/build/plugins/lib/nots/package_manager/pnpm/tests/ya.make @@ -1,15 +1,15 @@ -PY23_TEST() - -OWNER(dankolesnikov) - -TEST_SRCS( - lockfile.py - workspace.py -) - -PEERDIR( - build/plugins/lib/nots/package_manager/base - build/plugins/lib/nots/package_manager/pnpm -) - -END() +PY23_TEST() + +OWNER(dankolesnikov) + +TEST_SRCS( + lockfile.py + workspace.py +) + +PEERDIR( + build/plugins/lib/nots/package_manager/base + build/plugins/lib/nots/package_manager/pnpm +) + +END() diff --git a/build/plugins/lib/nots/package_manager/pnpm/utils.py b/build/plugins/lib/nots/package_manager/pnpm/utils.py index d8e99e3ab8..5cdec184d2 100644 --- a/build/plugins/lib/nots/package_manager/pnpm/utils.py +++ b/build/plugins/lib/nots/package_manager/pnpm/utils.py @@ -1,19 +1,19 @@ -import os - -from ..base.constants import PACKAGE_JSON_FILENAME, PNPM_LOCKFILE_FILENAME, PNPM_WS_FILENAME, NODE_MODULES_BUNDLE_FILENAME - - -def build_pj_path(p): - return os.path.join(p, PACKAGE_JSON_FILENAME) - - -def build_lockfile_path(p): - return os.path.join(p, PNPM_LOCKFILE_FILENAME) - - -def build_ws_config_path(p): - return os.path.join(p, PNPM_WS_FILENAME) - - -def build_nm_bundle_path(p): - return os.path.join(p, NODE_MODULES_BUNDLE_FILENAME) +import os + +from ..base.constants import PACKAGE_JSON_FILENAME, PNPM_LOCKFILE_FILENAME, PNPM_WS_FILENAME, NODE_MODULES_BUNDLE_FILENAME + + +def build_pj_path(p): + return os.path.join(p, PACKAGE_JSON_FILENAME) + + +def build_lockfile_path(p): + return os.path.join(p, PNPM_LOCKFILE_FILENAME) + + +def build_ws_config_path(p): + return os.path.join(p, PNPM_WS_FILENAME) + + +def build_nm_bundle_path(p): + return os.path.join(p, NODE_MODULES_BUNDLE_FILENAME) diff --git a/build/plugins/lib/nots/package_manager/pnpm/workspace.py b/build/plugins/lib/nots/package_manager/pnpm/workspace.py index 635b77dcb2..8f1b8c8bbd 100644 --- a/build/plugins/lib/nots/package_manager/pnpm/workspace.py +++ b/build/plugins/lib/nots/package_manager/pnpm/workspace.py @@ -1,69 +1,69 @@ -import os -import yaml - - -class PnpmWorkspace(object): - @classmethod - def load(cls, path): - ws = cls(path) - ws.read() - - return ws - - def __init__(self, path): - if not os.path.isabs(path): - raise TypeError("Absolute path required, given: {}".format(path)) - - self.path = path - # NOTE: pnpm requires relative workspace paths. - self.packages = set() - - def read(self): - with open(self.path) as f: - self.packages = set(yaml.load(f, Loader=yaml.CSafeLoader).get("packages", [])) - - def write(self, path=None): - if not path: - path = self.path - - with open(path, "w") as f: - data = { - "packages": list(self.packages), - } - yaml.dump(data, f, Dumper=yaml.CSafeDumper) - - def get_paths(self): - """ - Returns absolute paths of workspace packages. - :rtype: list of str - """ - dir_path = os.path.dirname(self.path) - - return [os.path.normpath(os.path.join(dir_path, pkg_path)) for pkg_path in self.packages] - - def set_from_package_json(self, package_json): - """ - Sets packages to "workspace" deps from given package.json. - :param package_json: package.json of workspace - :type package_json: PackageJson - """ - if os.path.dirname(package_json.path) != os.path.dirname(self.path): - raise TypeError( - "package.json should be in workspace directory {}, given: {}".format(os.path.dirname(self.path), package_json.path)) - - self.packages = set(path for name, path in package_json.get_workspace_dep_paths()) - # Add relative path to self. - self.packages.add(".") - - def merge(self, ws): - """ - Adds `ws`'s packages to the workspace. - :param ws: workspace to merge - :type ws: PnpmWorkspace - """ - dir_path = os.path.dirname(self.path) - ws_dir_path = os.path.dirname(ws.path) - - for p_rel_path in ws.packages: - p_path = os.path.normpath(os.path.join(ws_dir_path, p_rel_path)) - self.packages.add(os.path.relpath(p_path, dir_path)) +import os +import yaml + + +class PnpmWorkspace(object): + @classmethod + def load(cls, path): + ws = cls(path) + ws.read() + + return ws + + def __init__(self, path): + if not os.path.isabs(path): + raise TypeError("Absolute path required, given: {}".format(path)) + + self.path = path + # NOTE: pnpm requires relative workspace paths. + self.packages = set() + + def read(self): + with open(self.path) as f: + self.packages = set(yaml.load(f, Loader=yaml.CSafeLoader).get("packages", [])) + + def write(self, path=None): + if not path: + path = self.path + + with open(path, "w") as f: + data = { + "packages": list(self.packages), + } + yaml.dump(data, f, Dumper=yaml.CSafeDumper) + + def get_paths(self): + """ + Returns absolute paths of workspace packages. + :rtype: list of str + """ + dir_path = os.path.dirname(self.path) + + return [os.path.normpath(os.path.join(dir_path, pkg_path)) for pkg_path in self.packages] + + def set_from_package_json(self, package_json): + """ + Sets packages to "workspace" deps from given package.json. + :param package_json: package.json of workspace + :type package_json: PackageJson + """ + if os.path.dirname(package_json.path) != os.path.dirname(self.path): + raise TypeError( + "package.json should be in workspace directory {}, given: {}".format(os.path.dirname(self.path), package_json.path)) + + self.packages = set(path for name, path in package_json.get_workspace_dep_paths()) + # Add relative path to self. + self.packages.add(".") + + def merge(self, ws): + """ + Adds `ws`'s packages to the workspace. + :param ws: workspace to merge + :type ws: PnpmWorkspace + """ + dir_path = os.path.dirname(self.path) + ws_dir_path = os.path.dirname(ws.path) + + for p_rel_path in ws.packages: + p_path = os.path.normpath(os.path.join(ws_dir_path, p_rel_path)) + self.packages.add(os.path.relpath(p_path, dir_path)) diff --git a/build/plugins/lib/nots/package_manager/pnpm/ya.make b/build/plugins/lib/nots/package_manager/pnpm/ya.make index b2f2727c3f..deeb991d66 100644 --- a/build/plugins/lib/nots/package_manager/pnpm/ya.make +++ b/build/plugins/lib/nots/package_manager/pnpm/ya.make @@ -1,23 +1,23 @@ -PY23_LIBRARY() - -OWNER(dankolesnikov) - -PY_SRCS( - __init__.py - lockfile.py - package_manager.py - workspace.py - utils.py -) - -PEERDIR( - build/plugins/lib/nots/package_manager/base - contrib/python/PyYAML - contrib/python/six -) - -END() - -RECURSE_FOR_TESTS( - tests -) +PY23_LIBRARY() + +OWNER(dankolesnikov) + +PY_SRCS( + __init__.py + lockfile.py + package_manager.py + workspace.py + utils.py +) + +PEERDIR( + build/plugins/lib/nots/package_manager/base + contrib/python/PyYAML + contrib/python/six +) + +END() + +RECURSE_FOR_TESTS( + tests +) diff --git a/build/plugins/lib/nots/package_manager/ya.make b/build/plugins/lib/nots/package_manager/ya.make index 79ee0ea175..dd90019b72 100644 --- a/build/plugins/lib/nots/package_manager/ya.make +++ b/build/plugins/lib/nots/package_manager/ya.make @@ -1,14 +1,14 @@ -PY23_LIBRARY() - -OWNER(dankolesnikov) - -PY_SRCS( - __init__.py -) - -PEERDIR( - build/plugins/lib/nots/package_manager/base - build/plugins/lib/nots/package_manager/pnpm -) - -END() +PY23_LIBRARY() + +OWNER(dankolesnikov) + +PY_SRCS( + __init__.py +) + +PEERDIR( + build/plugins/lib/nots/package_manager/base + build/plugins/lib/nots/package_manager/pnpm +) + +END() |