fix: ⚡️ ScopeState could be created before the precondition was checked

Author: remimd

injection/_core/module.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import threading
 from abc import ABC, abstractmethod
 from collections import OrderedDict, deque
 from collections.abc import (
@@ -27,7 +28,6 @@
 )
 from inspect import signature as inspect_signature
 from logging import Logger, getLogger
-from threading import Lock
 from types import MethodType
 from typing import (
     Any,
@@ -982,7 +982,7 @@ class InjectMetadata[**P, T](Caller[P, T], EventListener):
 
     def __init__(self, wrapped: Callable[P, T], /, threadsafe: bool) -> None:
         self.__dependencies = Dependencies.empty()
-        self.__lock = Lock() if threadsafe else nullcontext()
+        self.__lock = threading.Lock() if threadsafe else nullcontext()
         self.__owner = None
         self.__tasks = deque()
         self.__wrapped = wrapped

injection/_core/scope.py

@@ -157,18 +157,18 @@ def get_scope(name, default=...):  # type: ignore[no-untyped-def]
 def _bind_scope(name: str, scope: Scope, shared: bool) -> Iterator[None]:
     if shared:
         is_already_defined = bool(get_active_scopes(name))
-        state = __SHARED_SCOPES[name]
+        states = __SHARED_SCOPES
 
     else:
         is_already_defined = bool(get_scope(name, default=None))
-        state = __CONTEXTUAL_SCOPES[name]
+        states = __CONTEXTUAL_SCOPES
 
     if is_already_defined:
         raise ScopeAlreadyDefinedError(
             f"Scope `{name}` is already defined in the current context."
         )
 
-    with state.bind(scope):
+    with states[name].bind(scope):
         yield