fix: Fix relative imports to absolute with wildcards

Issue mkdocstrings/mkdocstrings#382: mkdocstrings/mkdocstrings#382
mkdocstrings · Feb 16, 2022 · 69500dd · 69500dd
1 parent 87ff1df
commit 69500dd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/griffe/agents/visitor.py b/src/griffe/agents/visitor.py
@@ -373,8 +373,8 @@ def visit_import(self, node: ast.Import) -> None:
             node: The node to visit.
         """
         for name in node.names:
-            alias_path = name.name.split(".", 1)[0]
-            alias_name = name.asname or alias_path
+            alias_path = name.name
+            alias_name = name.asname or alias_path.split(".", 1)[0]
             self.current.imports[alias_name] = alias_path
             self.current[alias_name] = Alias(
                 alias_name,
@@ -399,12 +399,12 @@ def visit_importfrom(self, node: ast.ImportFrom) -> None:  # noqa: WPS231
                     # have the same name and can be accessed the same way
                     continue
 
+            alias_path = relative_to_absolute(node, name, self.current.module)
             if name.name == "*":
-                alias_name = node.module.replace(".", "/") + "/*"  # type: ignore[union-attr]
-                alias_path = node.module
+                alias_name = alias_path.replace(".", "/")  # type: ignore[union-attr]
+                alias_path = alias_path.replace(".*", "")
             else:
                 alias_name = name.asname or name.name
-                alias_path = relative_to_absolute(node, name, self.current.module)
                 self.current.imports[alias_name] = alias_path
             self.current[alias_name] = Alias(
                 alias_name,

diff --git a/tests/test_nodes.py b/tests/test_nodes.py
@@ -22,6 +22,14 @@
         ("from ... import f", "a.c.d.i", False, "a.f"),
         ("from ...b import f", "a.c.d.i", False, "a.b.f"),
         ("from ...c.d import e", "a.c.d.i", False, "a.c.d.e"),
+        ("from .c import *", "a", False, "a.c.*"),
+        ("from .c import *", "a.b", False, "a.c.*"),
+        ("from .b import *", "a.b", True, "a.b.b.*"),
+        ("from .. import *", "a.c.d.i", False, "a.c.*"),
+        ("from ..d import *", "a.c.d.i", False, "a.c.d.*"),
+        ("from ... import *", "a.c.d.i", False, "a.*"),
+        ("from ...b import *", "a.c.d.i", False, "a.b.*"),
+        ("from ...c.d import *", "a.c.d.i", False, "a.c.d.*"),
     ],
 )
 def test_relative_to_absolute_imports(code, path, is_package, expected):