python-injection 0.5.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

injection/core/module.py

@@ -48,12 +48,12 @@ Events
 """
 
 
-@dataclass(slots=True)
+@dataclass(frozen=True, slots=True)
 class ContainerEvent(Event, ABC):
     on_container: Container
 
 
-@dataclass(slots=True)
+@dataclass(frozen=True, slots=True)
 class ContainerDependenciesUpdated(ContainerEvent):
     references: set[type]
 
@@ -68,27 +68,39 @@ class ContainerDependenciesUpdated(ContainerEvent):
         )
 
 
-@dataclass(slots=True)
+@dataclass(frozen=True, slots=True)
 class ModuleEvent(Event, ABC):
     on_module: Module
 
 
-@dataclass(slots=True)
+@dataclass(frozen=True)
 class ModuleEventProxy(ModuleEvent):
     event: Event
 
     def __str__(self) -> str:
         return f"`{self.on_module}` has propagated an event: {self.origin}"
 
-    @property
+    @cached_property
     def origin(self) -> Event:
         if isinstance(self.event, ModuleEventProxy):
             return self.event.origin
 
         return self.event
 
+    @property
+    def is_circular(self) -> bool:
+        origin = self.origin
+        return isinstance(origin, ModuleEvent) and origin.on_module is self.on_module
+
+    @property
+    def previous_module(self) -> Module | None:
+        if isinstance(self.event, ModuleEvent):
+            return self.event.on_module
 
-@dataclass(slots=True)
+        return None
+
+
+@dataclass(frozen=True, slots=True)
 class ModuleAdded(ModuleEvent):
     module_added: Module
 
@@ -96,7 +108,7 @@ class ModuleAdded(ModuleEvent):
         return f"`{self.on_module}` now uses `{self.module_added}`."
 
 
-@dataclass(slots=True)
+@dataclass(frozen=True, slots=True)
 class ModuleRemoved(ModuleEvent):
     module_removed: Module
 
@@ -104,7 +116,7 @@ class ModuleRemoved(ModuleEvent):
         return f"`{self.on_module}` no longer uses `{self.module_removed}`."
 
 
-@dataclass(slots=True)
+@dataclass(frozen=True, slots=True)
 class ModulePriorityUpdated(ModuleEvent):
     module_updated: Module
     priority: ModulePriorities
@@ -352,10 +364,9 @@ class Module(EventListener):
         * **HIGH**: The module concerned becomes the most important of the modules used.
         """
 
-        if self.__move_module(module, priority):
-            event = ModulePriorityUpdated(self, module, priority)
-            self.notify(event)
-
+        self.__move_module(module, priority)
+        event = ModulePriorityUpdated(self, module, priority)
+        self.notify(event)
         return self
 
     def add_listener(self, listener: EventListener):
@@ -368,6 +379,13 @@ class Module(EventListener):
 
     def on_event(self, event: Event, /):
         self_event = ModuleEventProxy(self, event)
+
+        if self_event.is_circular:
+            raise ModuleError(
+                "Circular dependency between two modules: "
+                f"`{self_event.previous_module}` and `{self}`."
+            )
+
         self.notify(self_event)
 
     def notify(self, event: Event):
@@ -375,15 +393,15 @@ class Module(EventListener):
         self.__channel.dispatch(event)
         return self
 
-    def __move_module(self, module: Module, priority: ModulePriorities) -> bool:
+    def __move_module(self, module: Module, priority: ModulePriorities):
         last = priority == ModulePriorities.LOW
 
         try:
             self.__modules.move_to_end(module, last=last)
-        except KeyError:
-            return False
-
-        return True
+        except KeyError as exc:
+            raise ModuleError(
+                f"`{module}` can't be found in the modules used by `{self}`."
+            ) from exc
 
 
 """

{python_injection-0.5.0.dist-info → python_injection-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-injection
-Version: 0.5.0
+Version: 0.5.1
 Summary: Fast and easy dependency injection framework.
 Home-page: https://github.com/simplysquare/python-injection
 License: MIT

{python_injection-0.5.0.dist-info → python_injection-0.5.1.dist-info}/RECORD

@@ -3,9 +3,9 @@ injection/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 injection/common/event.py,sha256=0Jvfvws7bx-NxA32JrqeD-9ywBEgSmHtdEHbJNg_hAo,961
 injection/common/lazy.py,sha256=TqFcozHOVY6OY9Y43oCXzNHydTITf3JkM5hzEn7Z4cw,1503
 injection/core/__init__.py,sha256=zuf0ubI2dHnbjn1059eduhS-ACIkkROa6-dhp10krh0,22
-injection/core/module.py,sha256=cQvyB2Ar3Zbj33Z8rVO3kTL8g3fVJLFdF2vKgbuI2dg,15209
+injection/core/module.py,sha256=DC-iawfHKnNmNjTP7pIi3Na-v4jU9O2dQoLTrMaGnB0,15910
 injection/exceptions.py,sha256=o_LN7rDeX0fRw2cdQlyxvS4OAO2y9P2aRiiBKXPwbCQ,204
 injection/utils.py,sha256=Y_5EEbcpDNdaCaPq8g1e6lHcHRCTMWsGOnZYuHa46aQ,598
-python_injection-0.5.0.dist-info/METADATA,sha256=kyzvSjgfXq1bKa_-Cgy4hXofiBPFmrYNG-XNdCbjTpI,2842
-python_injection-0.5.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-python_injection-0.5.0.dist-info/RECORD,,
+python_injection-0.5.1.dist-info/METADATA,sha256=DJT_0yMjoi9dZ82cfWIiEYUGKKgRzgspiNK4DyPUodQ,2842
+python_injection-0.5.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+python_injection-0.5.1.dist-info/RECORD,,