Include namespaces in graph

Author: seddonym

src/grimp/application/usecases.py

@@ -3,7 +3,7 @@
 """
 
 from typing import cast
-
+import itertools
 from collections.abc import Sequence, Iterable
 
 from .scanning import scan_imports
@@ -158,6 +158,11 @@ def _assemble_graph(
 ) -> ImportGraph:
     graph: ImportGraph = settings.IMPORT_GRAPH_CLASS()
 
+    for namespace_package in itertools.chain.from_iterable(
+        found_package.namespace_packages for found_package in found_packages
+    ):
+        graph.add_module(namespace_package)
+
     package_modules = {Module(found_package.name) for found_package in found_packages}
 
     for module, direct_imports in imports_by_module.items():

tests/functional/test_namespace_packages.py

@@ -25,7 +25,7 @@
 def test_build_graph_for_namespace():
     graph = build_graph("mynamespace", cache_dir=None)
 
-    assert graph.modules == YELLOW_MODULES | GREEN_MODULES | BLUE_MODULES
+    assert graph.modules == {"mynamespace"} | YELLOW_MODULES | GREEN_MODULES | BLUE_MODULES
     assert graph.count_imports()
 
 
@@ -120,16 +120,31 @@ def test_import_between_namespace_children():
 @pytest.mark.parametrize(
     "package_name, expected",
     [
-        # TODO: include the namespace packages as modules too.
         (
             "nestednamespace",
-            FOO_ALPHA_BLUE_MODULES | FOO_ALPHA_GREEN_MODULES | BAR_BETA_MODULES,
+            {
+                "nestednamespace",
+                "nestednamespace.foo",
+                "nestednamespace.foo.alpha",
+                "nestednamespace.bar",
+            }
+            | FOO_ALPHA_BLUE_MODULES
+            | FOO_ALPHA_GREEN_MODULES
+            | BAR_BETA_MODULES,
         ),
         (
             "nestednamespace.foo",
-            FOO_ALPHA_BLUE_MODULES | FOO_ALPHA_GREEN_MODULES,
+            {
+                "nestednamespace.foo",
+                "nestednamespace.foo.alpha",
+            }
+            | FOO_ALPHA_BLUE_MODULES
+            | FOO_ALPHA_GREEN_MODULES,
+        ),
+        (
+            "nestednamespace.foo.alpha",
+            {"nestednamespace.foo.alpha"} | FOO_ALPHA_BLUE_MODULES | FOO_ALPHA_GREEN_MODULES,
         ),
-        ("nestednamespace.foo.alpha", FOO_ALPHA_BLUE_MODULES | FOO_ALPHA_GREEN_MODULES),
     ],
 )
 def test_build_graph_for_nested_namespace(package_name, expected):

tests/unit/application/test_usecases.py

@@ -197,7 +197,7 @@ class FakePackageFinder(BaseFakePackageFinder):
             graph = usecases.build_graph("mypackage")
 
         assert graph.modules == {
-            # TODO "mypackage" should also be included.
+            "mypackage",
             "mypackage.foo",
             "mypackage.foo.one",
             "mypackage.foo.two",