Make ContextProvider inherit from Component

Author: Archmonger

src/reactpy/core/layout.py

@@ -12,7 +12,7 @@
 )
 from collections import Counter
 from collections.abc import Callable, Sequence
-from contextlib import AsyncExitStack
+from contextlib import AsyncExitStack, suppress
 from logging import getLogger
 from types import TracebackType
 from typing import (
@@ -73,7 +73,7 @@ class Layout:
     def __init__(self, root: Component | Context[Any] | ContextProvider[Any]) -> None:
         super().__init__()
         if not isinstance(root, Component):
-            msg = f"Expected a ComponentType, not {type(root)!r}."
+            msg = f"Expected a ReactPy component, not {type(root)!r}."
             raise TypeError(msg)
         self.root = root
 
@@ -98,11 +98,8 @@ async def __aexit__(
 
         for t in self._render_tasks:
             t.cancel()
-            try:
+            with suppress(CancelledError):
                 await t
-            except CancelledError:
-                pass
-
         await self._unmount_model_states([root_model_state])
 
         # delete attributes here to avoid access after exiting context manager

src/reactpy/types.py

@@ -1013,7 +1013,7 @@ def __call__(
     ) -> ContextProvider[_Type]: ...
 
 
-class ContextProvider(Generic[_Type]):
+class ContextProvider(Component, Generic[_Type]):
     def __init__(
         self,
         *children: Any,

tests/test_core/test_layout.py

@@ -56,9 +56,9 @@ def MyComponent(): ...
 
 
 def test_layout_expects_abstract_component():
-    with pytest.raises(TypeError, match="Expected a ComponentType"):
+    with pytest.raises(TypeError, match="Expected a ReactPy component"):
         Layout(None)
-    with pytest.raises(TypeError, match="Expected a ComponentType"):
+    with pytest.raises(TypeError, match="Expected a ReactPy component"):
         Layout(reactpy.html.div())
 
 

tests/test_web/test_module.py

@@ -422,12 +422,12 @@ def App():
 
 def test_reactjs_component_from_string():
     reactpy.web.reactjs_component_from_string(
-        "temp", "old", "Component", resolve_imports=False
+        "old", "Component", resolve_imports=False, name="temp"
     )
     reactpy.web.module._STRING_WEB_MODULE_CACHE.clear()
     with assert_reactpy_did_log(r"Existing web module .* will be replaced with"):
         reactpy.web.reactjs_component_from_string(
-            "temp", "new", "Component", resolve_imports=False
+            "new", "Component", resolve_imports=False, name="temp"
         )
 
 
@@ -452,7 +452,7 @@ def ShowSimpleButton():
 
 async def test_reactjs_component_from_file(display: DisplayFixture):
     SimpleButton = reactpy.web.reactjs_component_from_file(
-        "simple-button", JS_FIXTURES_DIR / "simple-button.js", "SimpleButton"
+        JS_FIXTURES_DIR / "simple-button.js", "SimpleButton", name="simple-button"
     )
 
     is_clicked = reactpy.Ref(False)
@@ -493,13 +493,13 @@ def test_reactjs_component_from_file_caching(tmp_path):
     name = "test-file-module"
     reactpy.web.module._FILE_WEB_MODULE_CACHE.clear()
 
-    reactpy.web.reactjs_component_from_file(name, file, "Component")
+    reactpy.web.reactjs_component_from_file(file, "Component", name=name)
     key = next(x for x in reactpy.web.module._FILE_WEB_MODULE_CACHE.keys() if name in x)
     module1 = reactpy.web.module._FILE_WEB_MODULE_CACHE[key]
     assert module1
     initial_length = len(reactpy.web.module._FILE_WEB_MODULE_CACHE)
 
-    reactpy.web.reactjs_component_from_file(name, file, "Component")
+    reactpy.web.reactjs_component_from_file(file, "Component", name=name)
     assert len(reactpy.web.module._FILE_WEB_MODULE_CACHE) == initial_length
 
 
@@ -508,13 +508,24 @@ def test_reactjs_component_from_string_caching():
     content = "export function Component() {}"
     reactpy.web.module._STRING_WEB_MODULE_CACHE.clear()
 
-    reactpy.web.reactjs_component_from_string(name, content, "Component")
+    reactpy.web.reactjs_component_from_string(content, "Component", name=name)
     key = next(
         x for x in reactpy.web.module._STRING_WEB_MODULE_CACHE.keys() if name in x
     )
     module1 = reactpy.web.module._STRING_WEB_MODULE_CACHE[key]
     assert module1
     initial_length = len(reactpy.web.module._STRING_WEB_MODULE_CACHE)
 
-    reactpy.web.reactjs_component_from_string(name, content, "Component")
+    reactpy.web.reactjs_component_from_string(content, "Component", name=name)
+    assert len(reactpy.web.module._STRING_WEB_MODULE_CACHE) == initial_length
+
+
+def test_reactjs_component_from_string_with_no_name():
+    content = "export function Component() {}"
+    reactpy.web.module._STRING_WEB_MODULE_CACHE.clear()
+
+    reactpy.web.reactjs_component_from_string(content, "Component")
+    initial_length = len(reactpy.web.module._STRING_WEB_MODULE_CACHE)
+
+    reactpy.web.reactjs_component_from_string(content, "Component")
     assert len(reactpy.web.module._STRING_WEB_MODULE_CACHE) == initial_length