fix(cli): gather sub-dependencies when runnint the poly check command

components/polylith/commands/check.py

@@ -1,32 +1,42 @@
 import importlib.metadata
 from pathlib import Path
-
+from typing import Set
 from polylith import alias, check, distributions
 
 
+def collect_known_aliases_and_sub_dependencies(
+    project_data: dict, options: dict
+) -> Set[str]:
+    third_party_libs = project_data["deps"]
+    library_alias = options["alias"]
+
+    dists = list(importlib.metadata.distributions())
+
+    dist_packages = distributions.distributions_packages(dists)
+    sub_packages = distributions.distributions_sub_packages(dists)
+    custom_aliases = alias.parse(library_alias)
+
+    a = alias.pick(dist_packages, third_party_libs)
+    b = alias.pick(sub_packages, third_party_libs)
+    c = alias.pick(custom_aliases, third_party_libs)
+
+    return third_party_libs.union(a, b, c)
+
+
 def run(root: Path, ns: str, project_data: dict, options: dict) -> bool:
     is_verbose = options["verbose"]
     is_quiet = options["quiet"]
     is_strict = options["strict"]
-    library_alias = options["alias"]
 
-    third_party_libs = project_data["deps"]
     name = project_data["name"]
 
     collected_imports = check.report.collect_all_imports(root, ns, project_data)
-    dists = importlib.metadata.distributions()
-
-    known_aliases = distributions.distributions_packages(dists)
-    known_aliases.update(alias.parse(library_alias))
-
-    extra = alias.pick(known_aliases, third_party_libs)
-
-    libs = third_party_libs.union(extra)
+    collected_libs = collect_known_aliases_and_sub_dependencies(project_data, options)
 
     details = check.report.create_report(
         project_data,
         collected_imports,
-        libs,
+        collected_libs,
         is_strict,
     )
 

components/polylith/distributions/__init__.py

@@ -1,3 +1,7 @@
-from polylith.distributions.core import distributions_packages, get_distributions
+from polylith.distributions.core import (
+    distributions_packages,
+    distributions_sub_packages,
+    get_distributions,
+)
 
-__all__ = ["distributions_packages", "get_distributions"]
+__all__ = ["distributions_packages", "distributions_sub_packages", "get_distributions"]

components/polylith/distributions/core.py

@@ -1,8 +1,31 @@
 import importlib.metadata
+import re
 from functools import reduce
 from typing import Dict, List
 
 
+SUB_DEP_SEPARATORS = r"[\s!=;><\^~]"
+
+
+def parse_sub_package_name(dependency: str) -> str:
+    parts = re.split(SUB_DEP_SEPARATORS, dependency)
+
+    return str(parts[0])
+
+
+def dist_subpackages(dist) -> dict:
+    name = dist.metadata["name"]
+    dependencies = importlib.metadata.requires(name) or []
+
+    parsed_package_names = list({parse_sub_package_name(d) for d in dependencies})
+
+    return {name: parsed_package_names} if dependencies else {}
+
+
+def map_sub_packages(acc, dist) -> dict:
+    return {**acc, **dist_subpackages(dist)}
+
+
 def top_level_packages(dist) -> List[str]:
     top_level = dist.read_text("top_level.txt")
 
@@ -25,6 +48,11 @@ def distributions_packages(dists) -> Dict[str, List[str]]:
     return reduce(map_packages, dists, {})
 
 
+def distributions_sub_packages(dists) -> Dict[str, List[str]]:
+    """Return the dependencies of each distribution."""
+    return reduce(map_sub_packages, dists, {})
+
+
 def get_distributions(project_dependencies: set) -> list:
     dists = importlib.metadata.distributions()
 

projects/polylith-cli/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "polylith-cli"
-version = "0.1.0"
+version = "0.2.0"
 description = "Python tooling support for the Polylith Architecture"
 authors = ['David Vujic']
 homepage = "https://davidvujic.github.io/python-polylith-docs/"

test/components/polylith/commands/test_check.py

@@ -0,0 +1,12 @@
+from polylith.commands import check
+
+
+def test_collect_known_aliases_and_sub_dependencies():
+    fake_project_data = {"deps": {"typer", "hello-world-library"}}
+    fake_options = {"alias": ["hello-world-library=hello"]}
+
+    res = check.collect_known_aliases_and_sub_dependencies(fake_project_data, fake_options)
+
+    assert "typer" in res
+    assert "typing-extensions" in res
+    assert "hello" in res

test/components/polylith/distributions/test_core.py

@@ -4,7 +4,7 @@
 
 
 def test_distribution_packages():
-    dists = importlib.metadata.distributions()
+    dists = list(importlib.metadata.distributions())
 
     res = distributions.distributions_packages(dists)
 
@@ -13,3 +13,30 @@ def test_distribution_packages():
 
     assert res.get(expected_dist) is not None
     assert res[expected_dist] == [expected_package]
+
+
+def test_parse_package_name_from_dist_requires():
+    expected = {
+        "greenlet": "greenlet !=0.4.17",
+        "mysqlclient": "mysqlclient >=1.4.0 ; extra == 'mysql'",
+        "typing-extensions": "typing-extensions>=4.6.0",
+        "pymysql": "pymysql ; extra == 'pymysql'",
+        "one": "one<=0.4.17",
+        "two": "two^=0.4.17",
+        "three": "three~=0.4.17",
+    }
+
+    for k, v in expected.items():
+        assert k == distributions.core.parse_sub_package_name(v)
+
+
+def test_distribution_sub_packages():
+    dists = list(importlib.metadata.distributions())
+
+    res = distributions.distributions_sub_packages(dists)
+
+    expected_dist = "typer"
+    expected_sub_package = "typing-extensions"
+
+    assert res.get(expected_dist) is not None
+    assert expected_sub_package in res[expected_dist]