get clever with functions

Author: rmorshea

src/idom/__init__.py

@@ -4,7 +4,6 @@
 from .core.component import component
 from .core.events import event
 from .core.hooks import (
-    Context,
     create_context,
     use_callback,
     use_context,
@@ -28,7 +27,6 @@
 __all__ = [
     "component",
     "config",
-    "Context",
     "create_context",
     "event",
     "hooks",

src/idom/backend/flask.py

@@ -37,9 +37,7 @@
 
 logger = logging.getLogger(__name__)
 
-ConnectionContext: Context[Connection | None] = create_context(
-    None, "ConnectionContext"
-)
+ConnectionContext: Context[Connection | None] = create_context(None)
 
 
 def configure(

src/idom/backend/sanic.py

@@ -32,9 +32,7 @@
 
 logger = logging.getLogger(__name__)
 
-ConnectionContext: Context[Connection | None] = create_context(
-    None, "ConnectionContext"
-)
+ConnectionContext: Context[Connection | None] = create_context(None)
 
 
 def configure(

src/idom/backend/starlette.py

@@ -30,7 +30,7 @@
 
 logger = logging.getLogger(__name__)
 
-WebSocketContext: Context[WebSocket | None] = create_context(None, "WebSocketContext")
+WebSocketContext: Context[WebSocket | None] = create_context(None)
 
 
 def configure(

src/idom/backend/tornado.py

@@ -26,9 +26,7 @@
 from .utils import CLIENT_BUILD_DIR, safe_client_build_dir_path
 
 
-ConnectionContext: Context[Connection | None] = create_context(
-    None, "ConnectionContext"
-)
+ConnectionContext: Context[Connection | None] = create_context(None)
 
 
 def configure(

src/idom/core/hooks.py

@@ -20,13 +20,13 @@
     cast,
     overload,
 )
-from warnings import warn
 
 from typing_extensions import Protocol
 
 from idom.config import IDOM_DEBUG_MODE
 from idom.utils import Ref
 
+from ._f_back import f_module_name
 from ._thread_local import ThreadLocal
 from .types import ComponentType, Key, VdomDict
 from .vdom import vdom
@@ -239,43 +239,36 @@ def use_debug_value(
         logger.debug(f"{current_hook().component} {new}")
 
 
-def create_context(
-    default_value: _StateType, name: str = "Context"
-) -> Context[_StateType]:
+def create_context(default_value: _StateType) -> Context[_StateType]:
     """Return a new context type for use in :func:`use_context`"""
-    warn(
-        "The 'create_context' function is deprecated. "
-        "Use the 'Context' class instead. "
-        "This function will be removed in a future release."
-    )
-    return Context(name, default_value)
 
+    def context(
+        *children: Any,
+        value: _StateType = default_value,
+        key: Key | None = None,
+    ) -> ContextProvider[_StateType]:
+        return ContextProvider(
+            *children,
+            value=value,
+            key=key,
+            type=context,
+        )
 
-_UNDEFINED = cast(Any, object())
+    context.__qualname__ = "context"
 
+    return context
 
-class Context(Generic[_StateType]):
-    """Returns a :class:`ContextProvider` component"""
 
-    def __init__(self, name: str, default_value: _StateType) -> None:
-        self.name = name
-        self.default_value = default_value
+class Context(Protocol[_StateType]):
+    """Returns a :class:`ContextProvider` component"""
 
     def __call__(
         self,
         *children: Any,
-        value: _StateType = _UNDEFINED,
-        key: Key | None = None,
+        value: _StateType = ...,
+        key: Key | None = ...,
     ) -> ContextProvider[_StateType]:
-        return ContextProvider(
-            *children,
-            value=self.default_value if value is _UNDEFINED else value,
-            key=key,
-            type=self,
-        )
-
-    def __repr__(self) -> str:
-        return f"{type(self).__name__}({self.name!r})"
+        ...
 
 
 def use_context(context: Context[_StateType]) -> _StateType:
@@ -284,10 +277,15 @@ def use_context(context: Context[_StateType]) -> _StateType:
     See the full :ref:`Use Context` docs for more information.
     """
     hook = current_hook()
-
     provider = hook.get_context_provider(context)
+
     if provider is None:
-        return context.default_value
+        try:
+            # force type checker to realize this is just a normal function
+            assert isinstance(context, FunctionType)
+            return cast(_StateType, context.__kwdefaults__["value"])
+        except KeyError:
+            raise TypeError(f"{context} does not implement the Context interface")
     subscribers = provider._subscribers
 
     @use_effect
@@ -325,7 +323,7 @@ def should_render(self, new: ContextProvider[_StateType]) -> bool:
         return False
 
     def __repr__(self) -> str:
-        return f"{type(self).__name__}({self.type.name!r})"
+        return f"{type(self).__name__}({self.type!r})"
 
 
 _ActionType = TypeVar("_ActionType")

tests/test_core/test_hooks.py

@@ -1249,7 +1249,7 @@ def SomeComponent():
 async def test_conditionally_rendered_components_can_use_context():
     set_state = idom.Ref()
     used_context_values = []
-    some_context = idom.Context("some_context", None)
+    some_context = idom.create_context("some_context", None)
 
     @idom.component
     def SomeComponent():