🐛 fix: not resolving aliases

Author: StummeJ

rodi/__init__.py

@@ -511,7 +511,7 @@ def _get_resolvers_for_parameters(
                 # but at least Optional could be supported in the future
                 raise UnsupportedUnionTypeException(param_name, concrete_type)
 
-            if param_type is _empty:
+            if param_type is _empty or param_type not in services._map:
                 if services.strict:
                     raise CannotResolveParameterException(param_name, concrete_type)
 
@@ -523,6 +523,14 @@ def _get_resolvers_for_parameters(
                 else:
                     aliases = services._aliases[param_name]
 
+                    if not aliases:
+                        cls_name = class_name(param_type)
+                        aliases = (
+                            services._aliases[cls_name]
+                            or services._aliases[cls_name.lower()]
+                            or services._aliases[to_standard_param_name(cls_name)]
+                        )
+
                     if aliases:
                         assert (
                             len(aliases) == 1

tests/test_services.py

@@ -687,6 +687,33 @@ def __init__(self, cats_controller, service_settings):
     assert isinstance(u.cats_controller.cat_request_handler, GetCatRequestHandler)
 
 
+def test_alias_dep_resolving():
+    container = arrange_cats_example()
+
+    class BaseClass:
+        pass
+
+    class DerivedClass(BaseClass):
+        pass
+
+    class UsingAliasByType:
+        def __init__(self, example: BaseClass):
+            self.example = example
+
+    def resolve_derived_class(_) -> DerivedClass:
+        return DerivedClass()
+
+    container.add_scoped_by_factory(resolve_derived_class, DerivedClass)
+    container.add_alias("BaseClass", DerivedClass)
+    container.add_scoped(UsingAliasByType)
+
+    provider = container.build_provider()
+    u = provider.get(UsingAliasByType)
+
+    assert isinstance(u, UsingAliasByType)
+    assert isinstance(u.example, DerivedClass)
+
+
 def test_get_service_by_name_or_alias():
     container = arrange_cats_example()
     container.add_alias("k", CatsController)
@@ -2381,15 +2408,17 @@ def factory() -> annotation:
 
 
 def test_factory_without_locals_raises():
-    def factory_without_context() -> None: ...
+    def factory_without_context() -> None:
+        pass
 
     with pytest.raises(FactoryMissingContextException):
         _get_factory_annotations_or_throw(factory_without_context)
 
 
 def test_factory_with_locals_get_annotations():
     @inject()
-    def factory_without_context() -> "Cat": ...
+    def factory_without_context() -> "Cat":
+        pass
 
     annotations = _get_factory_annotations_or_throw(factory_without_context)
 
@@ -2406,17 +2435,21 @@ def test_deps_github_scenario():
                                               └── HTTPClient
     """
 
-    class HTTPClient: ...
+    class HTTPClient:
+        pass
 
-    class CommentsService: ...
+    class CommentsService:
+        pass
 
-    class ChecksService: ...
+    class ChecksService:
+        pass
 
     class CLAHandler:
         comments_service: CommentsService
         checks_service: ChecksService
 
-    class GitHubSettings: ...
+    class GitHubSettings:
+        pass
 
     class GitHubAuthHandler:
         settings: GitHubSettings
@@ -2530,7 +2563,8 @@ class B:
 
 def test_provide_protocol_with_attribute_dependency() -> None:
     class P(Protocol):
-        def foo(self) -> Any: ...
+        def foo(self) -> Any:
+            pass
 
     class Dependency:
         pass
@@ -2557,7 +2591,8 @@ def foo(self) -> Any:
 
 def test_provide_protocol_with_init_dependency() -> None:
     class P(Protocol):
-        def foo(self) -> Any: ...
+        def foo(self) -> Any:
+            pass
 
     class Dependency:
         pass
@@ -2586,9 +2621,11 @@ def test_provide_protocol_generic() -> None:
     T = TypeVar("T")
 
     class P(Protocol[T]):
-        def foo(self, t: T) -> T: ...
+        def foo(self, t: T) -> T:
+            pass
 
-    class A: ...
+    class A:
+        pass
 
     class Impl(P[A]):
         def foo(self, t: A) -> A:
@@ -2610,9 +2647,11 @@ def test_provide_protocol_generic_with_inner_dependency() -> None:
     T = TypeVar("T")
 
     class P(Protocol[T]):
-        def foo(self, t: T) -> T: ...
+        def foo(self, t: T) -> T:
+            pass
 
-    class A: ...
+    class A:
+        pass
 
     class Dependency:
         pass