fastapi-voyager 0.4.4__tar.gz → 0.4.5__tar.gz

{fastapi_voyager-0.4.4 → fastapi_voyager-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-voyager
-Version: 0.4.4
+Version: 0.4.5
 Summary: Visualize FastAPI application's routing tree and dependencies
 Project-URL: Homepage, https://github.com/allmonday/fastapi-voyager
 Project-URL: Source, https://github.com/allmonday/fastapi-voyager

{fastapi_voyager-0.4.4 → fastapi_voyager-0.4.5}/src/fastapi_voyager/module.py

@@ -41,4 +41,24 @@ def build_module_tree(schema_nodes: list[SchemaNode]) -> list[ModuleNode]:
     result = list(top_modules.values())
     if root_level_nodes:
         result.append(ModuleNode(name="__root__", fullname="__root__", schema_nodes=root_level_nodes, modules=[]))
+
+    # Collapse pass: if a module has exactly one child module and no schema_nodes,
+    # merge it upward (A + B -> A.B). Repeat until fixed point.
+    def collapse(node: ModuleNode):
+        # Collapse chains at current node
+        while len(node.modules) == 1 and len(node.schema_nodes) == 0:
+            child = node.modules[0]
+            # Merge child's identity into current node
+            node.name = f"{node.name}.{child.name}"
+            # Prefer child's fullname which already reflects full path
+            node.fullname = child.fullname
+            node.schema_nodes = child.schema_nodes
+            node.modules = child.modules
+        # Recurse into children
+        for m in node.modules:
+            collapse(m)
+
+    for top in result:
+        collapse(top)
+
     return result

{fastapi_voyager-0.4.4 → fastapi_voyager-0.4.5}/src/fastapi_voyager/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "0.4.4"
+__version__ = "0.4.5"

{fastapi_voyager-0.4.4 → fastapi_voyager-0.4.5}/tests/test_module.py

@@ -50,16 +50,11 @@ def test_build_module_tree_basic():
     assert [sn.name for sn in other.schema_nodes] == ["C"]
     assert other.modules == []
 
-    # x.y.z level
-    x = _find_top(top_modules, "x")
+    # x.y.z chain should collapse to a single module named "x.y.z"
+    x = _find_top(top_modules, "x.y.z")
     assert x is not None
-    assert x.schema_nodes == []
-    y = _find_child(x, "y")
-    assert y is not None
-    z = _find_child(y, "z")
-    assert z is not None
-    assert [sn.name for sn in z.schema_nodes] == ["D"]
-    assert z.modules == []
+    assert [sn.name for sn in x.schema_nodes] == ["D"]
+    assert x.modules == []
 
 
 def test_build_module_tree_empty_input():
@@ -82,4 +77,35 @@ def test_build_module_tree_root_level_nodes():
     assert root is not None
     assert sorted(sn.name for sn in root.schema_nodes) == ["Root1", "Root2"]
     pkg = _find_top(top_modules, "pkg")
-    assert pkg is not None and [sn.name for sn in pkg.schema_nodes] == ["PkgA"]
+    assert pkg is not None and [sn.name for sn in pkg.schema_nodes] == ["PkgA"]
+
+
+def test_collapse_single_child_empty_modules():
+    # Construct a deeper chain with empty intermediate modules that should collapse
+    schema_nodes = [
+        _sn("Deep", "a.b.c.d", "Deep"),
+        _sn("Peer", "a.b.x", "Peer"),
+    ]
+    top_modules = build_module_tree(schema_nodes)
+
+    # 'a' should have one child path 'b', but due to branching at x, only a.b collapses into a.b
+    # and below it, 'c.d' should collapse to 'c.d'. Final structure:
+    # a
+    #  └── b
+    #       ├── c.d (holds Deep)
+    #       └── x (holds Peer)
+    a = _find_top(top_modules, "a")
+    assert a is not None
+    assert a.schema_nodes == []
+    # b remains as child of a
+    b = _find_child(a, "b")
+    assert b is not None
+    assert b.schema_nodes == []
+    # collapsed node under b is named "c.d"
+    cd = _find_child(b, "c.d")
+    assert cd is not None
+    assert [sn.name for sn in cd.schema_nodes] == ["Deep"]
+    # sibling x remains
+    x = _find_child(b, "x")
+    assert x is not None
+    assert [sn.name for sn in x.schema_nodes] == ["Peer"]