reactpy 2.0.0b5__py3-none-any.whl → 2.0.0b7__py3-none-any.whl

reactpy/__init__.py

@@ -1,4 +1,4 @@
-from reactpy import config, logging, types, web, widgets
+from reactpy import config, logging, reactjs, types, web, widgets
 from reactpy._html import html
 from reactpy.core import hooks
 from reactpy.core.component import component
@@ -19,11 +19,11 @@ from reactpy.core.hooks import (
     use_state,
 )
 from reactpy.core.vdom import Vdom
-from reactpy.pyscript.components import pyscript_component
+from reactpy.executors.pyscript.components import pyscript_component
 from reactpy.utils import Ref, reactpy_to_string, string_to_reactpy
 
 __author__ = "The Reactive Python Team"
-__version__ = "2.0.0b5"
+__version__ = "2.0.0b7"
 
 __all__ = [
     "Ref",
@@ -36,6 +36,7 @@ __all__ = [
     "html",
     "logging",
     "pyscript_component",
+    "reactjs",
     "reactpy_to_string",
     "string_to_reactpy",
     "types",

reactpy/_html.py

@@ -6,7 +6,6 @@ from typing import ClassVar, overload
 from reactpy.core.vdom import Vdom
 from reactpy.types import (
     EventHandlerDict,
-    Key,
     VdomAttributes,
     VdomChild,
     VdomChildren,
@@ -14,7 +13,7 @@ from reactpy.types import (
     VdomDict,
 )
 
-__all__ = ["html"]
+__all__ = ["h", "html"]
 
 NO_CHILDREN_ALLOWED_HTML_BODY = {
     "area",
@@ -100,12 +99,10 @@ NO_CHILDREN_ALLOWED_SVG = {
 def _fragment(
     attributes: VdomAttributes,
     children: Sequence[VdomChild],
-    key: Key | None,
     event_handlers: EventHandlerDict,
 ) -> VdomDict:
     """An HTML fragment - this element will not appear in the DOM"""
-    attributes.pop("key", None)
-    if attributes or event_handlers:
+    if any(k != "key" for k in attributes) or event_handlers:
         msg = "Fragments cannot have attributes besides 'key'"
         raise TypeError(msg)
     model = VdomDict(tagName="")
@@ -113,8 +110,8 @@ def _fragment(
     if children:
         model["children"] = children
 
-    if key is not None:
-        model["key"] = key
+    if attributes:
+        model["attributes"] = attributes
 
     return model
 
@@ -122,7 +119,6 @@ def _fragment(
 def _script(
     attributes: VdomAttributes,
     children: Sequence[VdomChild],
-    key: Key | None,
     event_handlers: EventHandlerDict,
 ) -> VdomDict:
     """Create a new `<script> <https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script>`__ element.
@@ -148,6 +144,8 @@ def _script(
         msg = "'script' elements do not support event handlers"
         raise ValueError(msg)
 
+    key = attributes.get("key")
+
     if children:
         if len(children) > 1:
             msg = "'script' nodes may have, at most, one child."
@@ -165,7 +163,9 @@ def _script(
             key = attributes["src"]
 
     if key is not None:
-        model["key"] = key
+        if "attributes" not in model:
+            model["attributes"] = {}
+        model["attributes"]["key"] = key
 
     return model
 
@@ -287,6 +287,7 @@ class HtmlConstructor:
         "fragment": Vdom("", custom_constructor=_fragment),
         "svg": SvgConstructor(),
     }
+    __call__ = __cache__["fragment"].__call__
 
     def __getattr__(self, value: str) -> VdomConstructor:
         value = value.rstrip("_").replace("_", "-")
@@ -423,3 +424,4 @@ class HtmlConstructor:
 
 
 html = HtmlConstructor()
+h = html  # shorthand alias for html

reactpy/config.py

@@ -77,7 +77,7 @@ set of publicly available APIs for working with the client.
 
 REACTPY_TESTS_DEFAULT_TIMEOUT = Option(
     "REACTPY_TESTS_DEFAULT_TIMEOUT",
-    10.0,
+    15.0,
     mutable=False,
     validator=float,
 )

reactpy/core/_life_cycle_hook.py

@@ -33,7 +33,10 @@ class _HookStack(Singleton):  # nocov
     )
 
     def get(self) -> list[LifeCycleHook]:
-        return self._state.get()
+        try:
+            return self._state.get()
+        except LookupError:
+            return []
 
     def initialize(self) -> Token[list[LifeCycleHook]] | None:
         return None if isinstance(self._state, ThreadLocal) else self._state.set([])

reactpy/core/_thread_local.py

@@ -8,7 +8,7 @@ _StateType = TypeVar("_StateType")
 
 class ThreadLocal(Generic[_StateType]):  # nocov
     """Utility for managing per-thread state information. This is only used in
-    environments where ContextVars are not available, such as the `pyodide`
+    environments where ContextVars are not available, such as the `pyscript`
     executor."""
 
     def __init__(self, default: Callable[[], _StateType]):

reactpy/core/hooks.py

@@ -84,11 +84,7 @@ class _CurrentState(Generic[_Type]):
         self,
         initial_value: _Type | Callable[[], _Type],
     ) -> None:
-        if callable(initial_value):
-            self.value = initial_value()
-        else:
-            self.value = initial_value
-
+        self.value = initial_value() if callable(initial_value) else initial_value
         hook = HOOK_STACK.current_hook()
 
         def dispatch(new: _Type | Callable[[_Type], _Type]) -> None:
@@ -434,10 +430,7 @@ def use_callback(
     def setup(function: _CallbackFunc) -> _CallbackFunc:
         return memoize(lambda: function)
 
-    if function is not None:
-        return setup(function)
-    else:
-        return setup
+    return setup(function) if function is not None else setup
 
 
 class _LambdaCaller(Protocol):
@@ -553,17 +546,16 @@ def _try_to_infer_closure_values(
     func: Callable[..., Any] | None,
     values: Sequence[Any] | ellipsis | None,
 ) -> Sequence[Any] | None:
-    if values is ...:
-        if isinstance(func, FunctionType):
-            return (
-                [cell.cell_contents for cell in func.__closure__]
-                if func.__closure__
-                else []
-            )
-        else:
-            return None
-    else:
+    if values is not ...:
         return values
+    if isinstance(func, FunctionType):
+        return (
+            [cell.cell_contents for cell in func.__closure__]
+            if func.__closure__
+            else []
+        )
+    else:
+        return None
 
 
 def strictly_equal(x: Any, y: Any) -> bool:

reactpy/core/layout.py

@@ -34,7 +34,7 @@ from reactpy.config import (
     REACTPY_CHECK_VDOM_SPEC,
     REACTPY_DEBUG,
 )
-from reactpy.core._life_cycle_hook import LifeCycleHook
+from reactpy.core._life_cycle_hook import HOOK_STACK, LifeCycleHook
 from reactpy.core.vdom import validate_vdom_json
 from reactpy.types import (
     BaseLayout,
@@ -162,43 +162,47 @@ class Layout(BaseLayout):
     async def _create_layout_update(
         self, old_state: _ModelState
     ) -> LayoutUpdateMessage:
-        component = old_state.life_cycle_state.component
+        token = HOOK_STACK.initialize()
         try:
-            parent: _ModelState | None = old_state.parent
-        except AttributeError:
-            parent = None
-
-        async with AsyncExitStack() as exit_stack:
-            new_state = await self._render_component(
-                exit_stack,
-                old_state,
-                parent,
-                old_state.index,
-                old_state.key,
-                component,
-            )
+            component = old_state.life_cycle_state.component
+            try:
+                parent: _ModelState | None = old_state.parent
+            except AttributeError:
+                parent = None
+
+            async with AsyncExitStack() as exit_stack:
+                new_state = await self._render_component(
+                    exit_stack,
+                    old_state,
+                    parent,
+                    old_state.index,
+                    old_state.key,
+                    component,
+                )
 
-        if parent is not None:
-            parent.children_by_key[new_state.key] = new_state
-            old_parent_model = parent.model.current
-            old_parent_children = old_parent_model.setdefault("children", [])
-            parent.model.current = {
-                **old_parent_model,
-                "children": [
-                    *old_parent_children[: new_state.index],
-                    new_state.model.current,
-                    *old_parent_children[new_state.index + 1 :],
-                ],
+            if parent is not None:
+                parent.children_by_key[new_state.key] = new_state
+                old_parent_model = parent.model.current
+                old_parent_children = old_parent_model.setdefault("children", [])
+                parent.model.current = {
+                    **old_parent_model,
+                    "children": [
+                        *old_parent_children[: new_state.index],
+                        new_state.model.current,
+                        *old_parent_children[new_state.index + 1 :],
+                    ],
+                }
+
+            if REACTPY_CHECK_VDOM_SPEC.current:
+                validate_vdom_json(new_state.model.current)
+
+            return {
+                "type": "layout-update",
+                "path": new_state.patch_path,
+                "model": new_state.model.current,
             }
-
-        if REACTPY_CHECK_VDOM_SPEC.current:
-            validate_vdom_json(new_state.model.current)
-
-        return {
-            "type": "layout-update",
-            "path": new_state.patch_path,
-            "model": new_state.model.current,
-        }
+        finally:
+            HOOK_STACK.reset(token)
 
     async def _render_component(
         self,
@@ -299,8 +303,9 @@ class Layout(BaseLayout):
         except Exception as e:  # nocov
             msg = f"Expected a VDOM element dict, not {raw_model}"
             raise ValueError(msg) from e
-        if "key" in raw_model:
-            new_state.key = new_state.model.current["key"] = raw_model["key"]
+        key = raw_model.get("attributes", {}).get("key")
+        if key is not None:
+            new_state.key = key
         if "importSource" in raw_model:
             new_state.model.current["importSource"] = raw_model["importSource"]
         self._render_model_attributes(old_state, new_state, raw_model)
@@ -722,7 +727,7 @@ def _get_children_info(
             continue
         elif isinstance(child, dict):
             child_type = _DICT_TYPE
-            key = child.get("key")
+            key = child.get("attributes", {}).get("key")
         elif isinstance(child, Component):
             child_type = _COMPONENT_TYPE
             key = child.key

reactpy/core/serve.py

@@ -8,7 +8,6 @@ from anyio import create_task_group
 from anyio.abc import TaskGroup
 
 from reactpy.config import REACTPY_DEBUG
-from reactpy.core._life_cycle_hook import HOOK_STACK
 from reactpy.types import BaseLayout, LayoutEventMessage, LayoutUpdateMessage
 
 logger = getLogger(__name__)
@@ -45,22 +44,18 @@ async def _single_outgoing_loop(
     send: SendCoroutine,
 ) -> None:
     while True:
-        token = HOOK_STACK.initialize()
+        update = await layout.render()
         try:
-            update = await layout.render()
-            try:
-                await send(update)
-            except Exception:  # nocov
-                if not REACTPY_DEBUG.current:
-                    msg = (
-                        "Failed to send update. More info may be available "
-                        "if you enabling debug mode by setting "
-                        "`reactpy.config.REACTPY_DEBUG.current = True`."
-                    )
-                    logger.error(msg)
-                raise
-        finally:
-            HOOK_STACK.reset(token)
+            await send(update)
+        except Exception:  # nocov
+            if not REACTPY_DEBUG.current:
+                msg = (
+                    "Failed to send update. More info may be available "
+                    "if you enabling debug mode by setting "
+                    "`reactpy.config.REACTPY_DEBUG.current = True`."
+                )
+                logger.error(msg)
+            raise
 
 
 async def _single_incoming_loop(

reactpy/core/vdom.py

@@ -41,7 +41,6 @@ VDOM_JSON_SCHEMA = {
             "type": "object",
             "properties": {
                 "tagName": {"type": "string"},
-                "key": {"type": ["string", "number", "null"]},
                 "error": {"type": "string"},
                 "children": {"$ref": "#/definitions/elementChildren"},
                 "attributes": {"type": "object"},
@@ -170,7 +169,6 @@ class Vdom:
     ) -> VdomDict:
         """The entry point for the VDOM API, for example reactpy.html(<WE_ARE_HERE>)."""
         attributes, children = separate_attributes_and_children(attributes_and_children)
-        key = attributes.get("key", None)
         attributes, event_handlers, inline_javascript = (
             separate_attributes_handlers_and_inline_javascript(attributes)
         )
@@ -180,7 +178,6 @@ class Vdom:
         # Run custom constructor, if defined
         if self.custom_constructor:
             result = self.custom_constructor(
-                key=key,
                 children=children,
                 attributes=attributes,
                 event_handlers=event_handlers,
@@ -189,7 +186,6 @@ class Vdom:
         # Otherwise, use the default constructor
         else:
             result = {
-                **({"key": key} if key is not None else {}),
                 **({"children": children} if children else {}),
                 **({"attributes": attributes} if attributes else {}),
                 **({"eventHandlers": event_handlers} if event_handlers else {}),
@@ -277,7 +273,9 @@ def _validate_child_key_integrity(value: Any) -> None:
         for child in value:
             if isinstance(child, Component) and child.key is None:
                 warn(f"Key not specified for child in list {child}", UserWarning)
-            elif isinstance(child, Mapping) and "key" not in child:
+            elif isinstance(child, Mapping) and "key" not in child.get(
+                "attributes", {}
+            ):
                 # remove 'children' to reduce log spam
                 child_copy = {**child, "children": EllipsisRepr()}
                 warn(f"Key not specified for child in list {child_copy}", UserWarning)

reactpy/executors/asgi/pyscript.py

@@ -13,8 +13,11 @@ from reactpy import html
 from reactpy.executors.asgi.middleware import ReactPyMiddleware
 from reactpy.executors.asgi.standalone import ReactPy, ReactPyApp
 from reactpy.executors.asgi.types import AsgiWebsocketScope
+from reactpy.executors.pyscript.utils import (
+    pyscript_component_html,
+    pyscript_setup_html,
+)
 from reactpy.executors.utils import vdom_head_to_html
-from reactpy.pyscript.utils import pyscript_component_html, pyscript_setup_html
 from reactpy.types import ReactPyConfig, VdomDict
 
 

reactpy/executors/asgi/standalone.py

@@ -23,8 +23,8 @@ from reactpy.executors.asgi.types import (
     AsgiV3WebsocketApp,
     AsgiWebsocketScope,
 )
+from reactpy.executors.pyscript.utils import pyscript_setup_html
 from reactpy.executors.utils import server_side_component_html, vdom_head_to_html
-from reactpy.pyscript.utils import pyscript_setup_html
 from reactpy.types import (
     PyScriptOptions,
     ReactPyConfig,

reactpy/{pyscript → executors/pyscript}/component_template.py

@@ -2,7 +2,7 @@
 # type: ignore
 import asyncio
 
-from reactpy.pyscript.layout_handler import ReactPyLayoutHandler
+from reactpy.executors.pyscript.layout_handler import ReactPyLayoutHandler
 
 
 # User component is inserted below by regex replacement

reactpy/{pyscript → executors/pyscript}/components.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 from reactpy import component, hooks
-from reactpy.pyscript.utils import pyscript_component_html
+from reactpy.executors.pyscript.utils import pyscript_component_html
 from reactpy.types import Component, Key
 from reactpy.utils import string_to_reactpy
 

reactpy/{pyscript → executors/pyscript}/utils.py

@@ -123,7 +123,7 @@ def extend_pyscript_config(
     pyscript_config["packages"].extend(extra_py)
 
     # FIXME: https://github.com/pyscript/pyscript/issues/2282
-    if any(pkg.endswith(".whl") for pkg in pyscript_config["packages"]):
+    if any(pkg.endswith(".whl") for pkg in pyscript_config["packages"]):  # nocov
         pyscript_config["packages_cache"] = "never"
 
     # Extend the JavaScript dependency list

reactpy/executors/utils.py

@@ -64,16 +64,41 @@ def server_side_component_html(
 ) -> str:
     return (
         f'<div id="{element_id}" class="{class_}"></div>'
+        "<script>"
+        'if (!document.querySelector("#reactpy-importmap")) {'
+        "   console.debug("
+        '     "ReactPy did not detect a suitable JavaScript import map. Falling back to ReactPy\'s internal framework (Preact)."'
+        "   );"
+        '   const im = document.createElement("script");'
+        '   im.type = "importmap";'
+        f"  im.textContent = '{default_import_map()}';"
+        '   im.id = "reactpy-importmap";'
+        "   document.head.appendChild(im);"
+        "   delete im;"
+        "}"
+        "</script>"
         '<script type="module" crossorigin="anonymous">'
         f'import {{ mountReactPy }} from "{REACTPY_PATH_PREFIX.current}static/index.js";'
         "mountReactPy({"
-        f' mountElement: document.getElementById("{element_id}"),'
-        f' pathPrefix: "{REACTPY_PATH_PREFIX.current}",'
-        f' componentPath: "{component_path}",'
-        f" reconnectInterval: {REACTPY_RECONNECT_INTERVAL.current},"
-        f" reconnectMaxInterval: {REACTPY_RECONNECT_MAX_INTERVAL.current},"
-        f" reconnectMaxRetries: {REACTPY_RECONNECT_MAX_RETRIES.current},"
-        f" reconnectBackoffMultiplier: {REACTPY_RECONNECT_BACKOFF_MULTIPLIER.current},"
+        f'  mountElement: document.getElementById("{element_id}"),'
+        f'  pathPrefix: "{REACTPY_PATH_PREFIX.current}",'
+        f'  componentPath: "{component_path}",'
+        f"  reconnectInterval: {REACTPY_RECONNECT_INTERVAL.current},"
+        f"  reconnectMaxInterval: {REACTPY_RECONNECT_MAX_INTERVAL.current},"
+        f"  reconnectMaxRetries: {REACTPY_RECONNECT_MAX_RETRIES.current},"
+        f"  reconnectBackoffMultiplier: {REACTPY_RECONNECT_BACKOFF_MULTIPLIER.current},"
         "});"
         "</script>"
     )
+
+
+def default_import_map() -> str:
+    path_prefix = REACTPY_PATH_PREFIX.current.strip("/")
+    return f"""{{
+                "imports": {{
+                    "react": "/{path_prefix}/static/preact.js",
+                    "react-dom": "/{path_prefix}/static/preact-dom.js",
+                    "react-dom/client": "/{path_prefix}/static/preact-dom.js",
+                    "react/jsx-runtime": "/{path_prefix}/static/preact-jsx-runtime.js"
+                }}
+            }}""".replace("\n", "").replace(" ", "")