Refactor and fix type hints

Author: Archmonger

pyproject.toml

@@ -89,7 +89,6 @@ flask = ["flask", "markupsafe>=1.1.1,<2.1", "flask-cors", "flask-sock"]
 tornado = ["tornado"]
 testing = ["playwright"]
 
-
 #############################
 # >>> Hatch Test Runner <<< #
 #############################
@@ -134,11 +133,6 @@ xfail_strict = true
 asyncio_mode = "auto"
 log_cli_level = "INFO"
 
-[tool.hatch.envs.default.scripts]
-test-cov = "playwright install && coverage run -m pytest {args:tests}"
-cov-report = ["coverage report"]
-cov = ["test-cov {args}", "cov-report"]
-
 [tool.hatch.envs.default.env-vars]
 REACTPY_DEBUG_MODE = "1"
 

src/reactpy/core/_life_cycle_hook.py

@@ -17,28 +17,19 @@ async def __call__(self, stop: Event) -> None: ...
 
 
 logger = logging.getLogger(__name__)
-
-_hook_state = ContextVar("_hook_state")
-
-
-def create_hook_state(initial: list | None = None) -> Token[list]:
-    return _hook_state.set(initial or [])
+_HOOK_STATE: ContextVar[list[LifeCycleHook]] = ContextVar("_hook_state")
 
 
 def clear_hook_state(token: Token[list]) -> None:
-    hook_stack = _hook_state.get()
+    hook_stack = _HOOK_STATE.get()
     if hook_stack:
         logger.warning("clear_hook_state: Hook stack was not empty")
-    _hook_state.reset(token)
-
-
-def get_hook_state() -> list[LifeCycleHook]:
-    return _hook_state.get()
+    _HOOK_STATE.reset(token)
 
 
 def current_hook() -> LifeCycleHook:
     """Get the current :class:`LifeCycleHook`"""
-    hook_stack = _hook_state.get()
+    hook_stack = _HOOK_STATE.get()
     if not hook_stack:
         msg = "No life cycle hook is active. Are you rendering in a layout?"
         raise RuntimeError(msg)
@@ -247,13 +238,13 @@ def set_current(self) -> None:
         This method is called by a layout before entering the render method
         of this hook's associated component.
         """
-        hook_stack = get_hook_state()
+        hook_stack = _HOOK_STATE.get()
         if hook_stack:
             parent = hook_stack[-1]
             self._context_providers.update(parent._context_providers)
         hook_stack.append(self)
 
     def unset_current(self) -> None:
         """Unset this hook as the active hook in this thread"""
-        if get_hook_state().pop() is not self:
+        if _HOOK_STATE.get().pop() is not self:
             raise RuntimeError("Hook stack is in an invalid state")  # nocov

src/reactpy/core/serve.py

@@ -9,7 +9,7 @@
 from anyio.abc import TaskGroup
 
 from reactpy.config import REACTPY_DEBUG_MODE
-from reactpy.core._life_cycle_hook import clear_hook_state, create_hook_state
+from reactpy.core._life_cycle_hook import _HOOK_STATE, clear_hook_state
 from reactpy.core.types import LayoutEventMessage, LayoutType, LayoutUpdateMessage
 
 logger = getLogger(__name__)
@@ -59,7 +59,7 @@ async def _single_outgoing_loop(
     layout: LayoutType[LayoutUpdateMessage, LayoutEventMessage], send: SendCoroutine
 ) -> None:
     while True:
-        token = create_hook_state()
+        token = _HOOK_STATE.set([])
         try:
             update = await layout.render()
             try: