reactpy 2.0.0b2__py3-none-any.whl → 2.0.0b4__py3-none-any.whl

reactpy/templatetags/__init__.py

@@ -1,3 +1,3 @@
-from reactpy.templatetags.jinja import Jinja
+from reactpy.templatetags.jinja import ReactPyJinja
 
-__all__ = ["Jinja"]
+__all__ = ["ReactPyJinja"]

reactpy/templatetags/jinja.py

@@ -7,7 +7,7 @@ from reactpy.executors.utils import server_side_component_html
 from reactpy.pyscript.utils import pyscript_component_html, pyscript_setup_html
 
 
-class Jinja(StandaloneTag):  # type: ignore
+class ReactPyJinja(StandaloneTag):  # type: ignore
     safe_output = True
     tags: ClassVar[set[str]] = {"component", "pyscript_component", "pyscript_setup"}
 

reactpy/testing/backend.py

@@ -119,7 +119,7 @@ class BackendFixture:
         self.log_records = self._exit_stack.enter_context(capture_reactpy_logs())
 
         # Wait for the server to start
-        self.webserver.config.setup_event_loop()
+        self.webserver.config.get_loop_factory()
         self.webserver_task = asyncio.create_task(self.webserver.serve())
         await asyncio.sleep(1)
 

reactpy/types.py

@@ -1071,3 +1071,19 @@ class CustomVdomConstructor(Protocol):
 class EllipsisRepr:
     def __repr__(self) -> str:
         return "..."
+
+
+class Event(dict):
+    """
+    A light `dict` wrapper for event data passed to event handler functions.
+    """
+
+    def __getattr__(self, name: str) -> Any:
+        value = self.get(name)
+        return Event(value) if isinstance(value, dict) else value
+
+    def preventDefault(self) -> None:
+        """Prevent the default action of the event."""
+
+    def stopPropagation(self) -> None:
+        """Stop the event from propagating."""

reactpy/utils.py

@@ -45,6 +45,8 @@ class Ref(Generic[_RefValue]):
         self.current = new
         return old
 
+    __hash__ = None  # type: ignore
+
     def __eq__(self, other: object) -> bool:
         try:
             return isinstance(other, Ref) and (other.current == self.current)
@@ -111,19 +113,17 @@ def string_to_reactpy(
     try:
         root_node: etree._Element = fromstring(
             html.strip(),
-            parser=etree.HTMLParser(
+            parser=etree.HTMLParser(  # type: ignore
                 remove_comments=True,
                 remove_pis=True,
                 remove_blank_text=True,
                 recover=not strict,
             ),
         )
-    except etree.XMLSyntaxError as e:
-        if not strict:
-            raise e  # nocov
+    except Exception as e:
         msg = (
             "An error has occurred while parsing the HTML.\n\n"
-            "This HTML may be malformatted, or may not perfectly adhere to HTML5.\n"
+            "This HTML may be malformatted, or may not adhere to the HTML5 spec.\n"
             "If you believe the exception above was due to something intentional, you "
             "can disable the strict parameter on string_to_reactpy().\n"
             "Otherwise, repair your broken HTML and try again."

reactpy/web/__init__.py

@@ -3,6 +3,9 @@ from reactpy.web.module import (
     module_from_file,
     module_from_string,
     module_from_url,
+    reactjs_component_from_file,
+    reactjs_component_from_string,
+    reactjs_component_from_url,
 )
 
 __all__ = [
@@ -10,4 +13,7 @@ __all__ = [
     "module_from_file",
     "module_from_string",
     "module_from_url",
+    "reactjs_component_from_file",
+    "reactjs_component_from_string",
+    "reactjs_component_from_url",
 ]

reactpy/web/module.py

@@ -7,6 +7,7 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, NewType, overload
 
+from reactpy._warnings import warn
 from reactpy.config import REACTPY_DEBUG, REACTPY_WEB_MODULES_DIR
 from reactpy.core.vdom import Vdom
 from reactpy.types import ImportSourceDict, VdomConstructor
@@ -27,71 +28,138 @@ URL_SOURCE = SourceType("URL")
 """A source loaded from a URL, usually a CDN"""
 
 
-def module_from_url(
+_URL_WEB_MODULE_CACHE: dict[str, WebModule] = {}
+_FILE_WEB_MODULE_CACHE: dict[str, WebModule] = {}
+_STRING_WEB_MODULE_CACHE: dict[str, WebModule] = {}
+
+
+@overload
+def reactjs_component_from_url(
+    url: str,
+    import_names: str,
+    fallback: Any | None = ...,
+    resolve_imports: bool | None = ...,
+    resolve_imports_depth: int = ...,
+    unmount_before_update: bool = ...,
+    allow_children: bool = ...,
+) -> VdomConstructor: ...
+
+
+@overload
+def reactjs_component_from_url(
+    url: str,
+    import_names: list[str] | tuple[str, ...],
+    fallback: Any | None = ...,
+    resolve_imports: bool | None = ...,
+    resolve_imports_depth: int = ...,
+    unmount_before_update: bool = ...,
+    allow_children: bool = ...,
+) -> list[VdomConstructor]: ...
+
+
+def reactjs_component_from_url(
     url: str,
+    import_names: str | list[str] | tuple[str, ...],
     fallback: Any | None = None,
-    resolve_exports: bool | None = None,
-    resolve_exports_depth: int = 5,
+    resolve_imports: bool | None = None,
+    resolve_imports_depth: int = 5,
     unmount_before_update: bool = False,
-) -> WebModule:
-    """Load a :class:`WebModule` from a :data:`URL_SOURCE`
+    allow_children: bool = True,
+) -> VdomConstructor | list[VdomConstructor]:
+    """Import a component from a URL.
 
     Parameters:
         url:
-            Where the javascript module will be loaded from which conforms to the
-            interface for :ref:`Custom Javascript Components`
+            The URL to import the component from.
+        import_names:
+            One or more component names to import. If given as a string, a single component
+            will be returned. If a list is given, then a list of components will be
+            returned.
         fallback:
             What to temporarily display while the module is being loaded.
         resolve_imports:
-            Whether to try and find all the named exports of this module.
-        resolve_exports_depth:
-            How deeply to search for those exports.
+            Whether to try and find all the named imports of this module.
+        resolve_imports_depth:
+            How deeply to search for those imports.
         unmount_before_update:
             Cause the component to be unmounted before each update. This option should
             only be used if the imported package fails to re-render when props change.
             Using this option has negative performance consequences since all DOM
             elements must be changed on each render. See :issue:`461` for more info.
+        allow_children:
+            Whether or not these components can have children.
     """
-    return WebModule(
-        source=url,
-        source_type=URL_SOURCE,
-        default_fallback=fallback,
-        file=None,
-        export_names=(
-            resolve_module_exports_from_url(url, resolve_exports_depth)
-            if (
-                resolve_exports
-                if resolve_exports is not None
-                else REACTPY_DEBUG.current
-            )
-            else None
-        ),
-        unmount_before_update=unmount_before_update,
-    )
+    key = f"{url}{resolve_imports}{resolve_imports_depth}{unmount_before_update}"
+    if key in _URL_WEB_MODULE_CACHE:
+        module = _URL_WEB_MODULE_CACHE[key]
+    else:
+        module = _module_from_url(
+            url,
+            fallback=fallback,
+            resolve_imports=resolve_imports,
+            resolve_imports_depth=resolve_imports_depth,
+            unmount_before_update=unmount_before_update,
+        )
+        _URL_WEB_MODULE_CACHE[key] = module
+    return _vdom_from_web_module(module, import_names, fallback, allow_children)
 
 
-def module_from_file(
+@overload
+def reactjs_component_from_file(
+    name: str,
+    file: str | Path,
+    import_names: str,
+    fallback: Any | None = ...,
+    resolve_imports: bool | None = ...,
+    resolve_imports_depth: int = ...,
+    unmount_before_update: bool = ...,
+    symlink: bool = ...,
+    allow_children: bool = ...,
+) -> VdomConstructor: ...
+
+
+@overload
+def reactjs_component_from_file(
     name: str,
     file: str | Path,
+    import_names: list[str] | tuple[str, ...],
+    fallback: Any | None = ...,
+    resolve_imports: bool | None = ...,
+    resolve_imports_depth: int = ...,
+    unmount_before_update: bool = ...,
+    symlink: bool = ...,
+    allow_children: bool = ...,
+) -> list[VdomConstructor]: ...
+
+
+def reactjs_component_from_file(
+    name: str,
+    file: str | Path,
+    import_names: str | list[str] | tuple[str, ...],
     fallback: Any | None = None,
-    resolve_exports: bool | None = None,
-    resolve_exports_depth: int = 5,
+    resolve_imports: bool | None = None,
+    resolve_imports_depth: int = 5,
     unmount_before_update: bool = False,
     symlink: bool = False,
-) -> WebModule:
-    """Load a :class:`WebModule` from a given ``file``
+    allow_children: bool = True,
+) -> VdomConstructor | list[VdomConstructor]:
+    """Import a component from a file.
 
     Parameters:
         name:
             The name of the package
         file:
             The file from which the content of the web module will be created.
+        import_names:
+            One or more component names to import. If given as a string, a single component
+            will be returned. If a list is given, then a list of components will be
+            returned.
         fallback:
             What to temporarily display while the module is being loaded.
         resolve_imports:
-            Whether to try and find all the named exports of this module.
-        resolve_exports_depth:
-            How deeply to search for those exports.
+            Whether to try and find all the named imports of this module.
+        resolve_imports_depth:
+            How deeply to search for those imports.
         unmount_before_update:
             Cause the component to be unmounted before each update. This option should
             only be used if the imported package fails to re-render when props change.
@@ -99,7 +167,203 @@ def module_from_file(
             elements must be changed on each render. See :issue:`461` for more info.
         symlink:
             Whether the web module should be saved as a symlink to the given ``file``.
+        allow_children:
+            Whether or not these components can have children.
+    """
+    key = f"{name}{resolve_imports}{resolve_imports_depth}{unmount_before_update}"
+    if key in _FILE_WEB_MODULE_CACHE:
+        module = _FILE_WEB_MODULE_CACHE[key]
+    else:
+        module = _module_from_file(
+            name,
+            file,
+            fallback=fallback,
+            resolve_imports=resolve_imports,
+            resolve_imports_depth=resolve_imports_depth,
+            unmount_before_update=unmount_before_update,
+            symlink=symlink,
+        )
+        _FILE_WEB_MODULE_CACHE[key] = module
+    return _vdom_from_web_module(module, import_names, fallback, allow_children)
+
+
+@overload
+def reactjs_component_from_string(
+    name: str,
+    content: str,
+    import_names: str,
+    fallback: Any | None = ...,
+    resolve_imports: bool | None = ...,
+    resolve_imports_depth: int = ...,
+    unmount_before_update: bool = ...,
+    allow_children: bool = ...,
+) -> VdomConstructor: ...
+
+
+@overload
+def reactjs_component_from_string(
+    name: str,
+    content: str,
+    import_names: list[str] | tuple[str, ...],
+    fallback: Any | None = ...,
+    resolve_imports: bool | None = ...,
+    resolve_imports_depth: int = ...,
+    unmount_before_update: bool = ...,
+    allow_children: bool = ...,
+) -> list[VdomConstructor]: ...
+
+
+def reactjs_component_from_string(
+    name: str,
+    content: str,
+    import_names: str | list[str] | tuple[str, ...],
+    fallback: Any | None = None,
+    resolve_imports: bool | None = None,
+    resolve_imports_depth: int = 5,
+    unmount_before_update: bool = False,
+    allow_children: bool = True,
+) -> VdomConstructor | list[VdomConstructor]:
+    """Import a component from a string.
+
+    Parameters:
+        name:
+            The name of the package
+        content:
+            The contents of the web module
+        import_names:
+            One or more component names to import. If given as a string, a single component
+            will be returned. If a list is given, then a list of components will be
+            returned.
+        fallback:
+            What to temporarily display while the module is being loaded.
+        resolve_imports:
+            Whether to try and find all the named imports of this module.
+        resolve_imports_depth:
+            How deeply to search for those imports.
+        unmount_before_update:
+            Cause the component to be unmounted before each update. This option should
+            only be used if the imported package fails to re-render when props change.
+            Using this option has negative performance consequences since all DOM
+            elements must be changed on each render. See :issue:`461` for more info.
+        allow_children:
+            Whether or not these components can have children.
     """
+    key = f"{name}{resolve_imports}{resolve_imports_depth}{unmount_before_update}"
+    if key in _STRING_WEB_MODULE_CACHE:
+        module = _STRING_WEB_MODULE_CACHE[key]
+    else:
+        module = _module_from_string(
+            name,
+            content,
+            fallback=fallback,
+            resolve_imports=resolve_imports,
+            resolve_imports_depth=resolve_imports_depth,
+            unmount_before_update=unmount_before_update,
+        )
+        _STRING_WEB_MODULE_CACHE[key] = module
+    return _vdom_from_web_module(module, import_names, fallback, allow_children)
+
+
+def module_from_url(
+    url: str,
+    fallback: Any | None = None,
+    resolve_exports: bool | None = None,
+    resolve_exports_depth: int = 5,
+    unmount_before_update: bool = False,
+) -> WebModule:  # pragma: no cover
+    warn(
+        "module_from_url is deprecated, use reactjs_component_from_url instead",
+        DeprecationWarning,
+    )
+    return _module_from_url(
+        url,
+        fallback=fallback,
+        resolve_imports=resolve_exports,
+        resolve_imports_depth=resolve_exports_depth,
+        unmount_before_update=unmount_before_update,
+    )
+
+
+def module_from_file(
+    name: str,
+    file: str | Path,
+    fallback: Any | None = None,
+    resolve_exports: bool | None = None,
+    resolve_exports_depth: int = 5,
+    unmount_before_update: bool = False,
+    symlink: bool = False,
+) -> WebModule:  # pragma: no cover
+    warn(
+        "module_from_file is deprecated, use reactjs_component_from_file instead",
+        DeprecationWarning,
+    )
+    return _module_from_file(
+        name,
+        file,
+        fallback=fallback,
+        resolve_imports=resolve_exports,
+        resolve_imports_depth=resolve_exports_depth,
+        unmount_before_update=unmount_before_update,
+        symlink=symlink,
+    )
+
+
+def module_from_string(
+    name: str,
+    content: str,
+    fallback: Any | None = None,
+    resolve_exports: bool | None = None,
+    resolve_exports_depth: int = 5,
+    unmount_before_update: bool = False,
+) -> WebModule:  # pragma: no cover
+    warn(
+        "module_from_string is deprecated, use reactjs_component_from_string instead",
+        DeprecationWarning,
+    )
+    return _module_from_string(
+        name,
+        content,
+        fallback=fallback,
+        resolve_imports=resolve_exports,
+        resolve_imports_depth=resolve_exports_depth,
+        unmount_before_update=unmount_before_update,
+    )
+
+
+def _module_from_url(
+    url: str,
+    fallback: Any | None = None,
+    resolve_imports: bool | None = None,
+    resolve_imports_depth: int = 5,
+    unmount_before_update: bool = False,
+) -> WebModule:
+    return WebModule(
+        source=url,
+        source_type=URL_SOURCE,
+        default_fallback=fallback,
+        file=None,
+        export_names=(
+            resolve_module_exports_from_url(url, resolve_imports_depth)
+            if (
+                resolve_imports
+                if resolve_imports is not None
+                else REACTPY_DEBUG.current
+            )
+            else None
+        ),
+        unmount_before_update=unmount_before_update,
+    )
+
+
+def _module_from_file(
+    name: str,
+    file: str | Path,
+    fallback: Any | None = None,
+    resolve_imports: bool | None = None,
+    resolve_imports_depth: int = 5,
+    unmount_before_update: bool = False,
+    symlink: bool = False,
+) -> WebModule:
     name += module_name_suffix(name)
 
     source_file = Path(file).resolve()
@@ -124,10 +388,10 @@ def module_from_file(
         default_fallback=fallback,
         file=target_file,
         export_names=(
-            resolve_module_exports_from_file(source_file, resolve_exports_depth)
+            resolve_module_exports_from_file(source_file, resolve_imports_depth)
             if (
-                resolve_exports
-                if resolve_exports is not None
+                resolve_imports
+                if resolve_imports is not None
                 else REACTPY_DEBUG.current
             )
             else None
@@ -152,33 +416,14 @@ def _copy_file(target: Path, source: Path, symlink: bool) -> None:
         shutil.copy(source, target)
 
 
-def module_from_string(
+def _module_from_string(
     name: str,
     content: str,
     fallback: Any | None = None,
-    resolve_exports: bool | None = None,
-    resolve_exports_depth: int = 5,
+    resolve_imports: bool | None = None,
+    resolve_imports_depth: int = 5,
     unmount_before_update: bool = False,
 ) -> WebModule:
-    """Load a :class:`WebModule` whose ``content`` comes from a string.
-
-    Parameters:
-        name:
-            The name of the package
-        content:
-            The contents of the web module
-        fallback:
-            What to temporarily display while the module is being loaded.
-        resolve_imports:
-            Whether to try and find all the named exports of this module.
-        resolve_exports_depth:
-            How deeply to search for those exports.
-        unmount_before_update:
-            Cause the component to be unmounted before each update. This option should
-            only be used if the imported package fails to re-render when props change.
-            Using this option has negative performance consequences since all DOM
-            elements must be changed on each render. See :issue:`461` for more info.
-    """
     name += module_name_suffix(name)
 
     target_file = _web_module_path(name)
@@ -199,10 +444,10 @@ def module_from_string(
         default_fallback=fallback,
         file=target_file,
         export_names=(
-            resolve_module_exports_from_file(target_file, resolve_exports_depth)
+            resolve_module_exports_from_file(target_file, resolve_imports_depth)
             if (
-                resolve_exports
-                if resolve_exports is not None
+                resolve_imports
+                if resolve_imports is not None
                 else REACTPY_DEBUG.current
             )
             else None
@@ -244,6 +489,19 @@ def export(
     export_names: str | list[str] | tuple[str, ...],
     fallback: Any | None = None,
     allow_children: bool = True,
+) -> VdomConstructor | list[VdomConstructor]:  # pragma: no cover
+    warn(
+        "export is deprecated, use reactjs_component_from_* functions instead",
+        DeprecationWarning,
+    )
+    return _vdom_from_web_module(web_module, export_names, fallback, allow_children)
+
+
+def _vdom_from_web_module(
+    web_module: WebModule,
+    export_names: str | list[str] | tuple[str, ...],
+    fallback: Any | None = None,
+    allow_children: bool = True,
 ) -> VdomConstructor | list[VdomConstructor]:
     """Return one or more VDOM constructors from a :class:`WebModule`
 

reactpy/web/utils.py

@@ -12,7 +12,7 @@ def module_name_suffix(name: str) -> str:
     if name.startswith("@"):
         name = name[1:]
     head, _, tail = name.partition("@")  # handle version identifier
-    version, _, tail = tail.partition("/")  # get section after version
+    _, _, tail = tail.partition("/")  # get section after version
     return PurePosixPath(tail or head).suffix or ".js"
 
 

reactpy/widgets.py

@@ -2,12 +2,11 @@ from __future__ import annotations
 
 from base64 import b64encode
 from collections.abc import Sequence
-from typing import TYPE_CHECKING, Any, Callable, Protocol, TypeVar
+from typing import Any, Callable, Protocol, TypeVar
 
 import reactpy
 from reactpy._html import html
-from reactpy._warnings import warn
-from reactpy.types import ComponentConstructor, VdomAttributes, VdomDict
+from reactpy.types import VdomAttributes, VdomDict
 
 
 def image(
@@ -22,11 +21,7 @@ def image(
     if format == "svg":
         format = "svg+xml"  # noqa: A001
 
-    if isinstance(value, str):
-        bytes_value = value.encode()
-    else:
-        bytes_value = value
-
+    bytes_value = value.encode() if isinstance(value, str) else value
     base64_value = b64encode(bytes_value).decode()
     src = f"data:image/{format};base64,{base64_value}"
 
@@ -83,20 +78,3 @@ _CastTo_co = TypeVar("_CastTo_co", covariant=True)
 
 class _CastFunc(Protocol[_CastTo_co]):
     def __call__(self, value: str) -> _CastTo_co: ...
-
-
-if TYPE_CHECKING:
-    from reactpy.testing.backend import _MountFunc
-
-
-def hotswap(
-    update_on_change: bool = False,
-) -> tuple[_MountFunc, ComponentConstructor]:  # nocov
-    warn(
-        "The 'hotswap' function is deprecated and will be removed in a future release",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    from reactpy.testing.backend import _hotswap
-
-    return _hotswap(update_on_change)

{reactpy-2.0.0b2.dist-info → reactpy-2.0.0b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reactpy
-Version: 2.0.0b2
+Version: 2.0.0b4
 Summary: It's React, but in Python.
 Project-URL: Changelog, https://reactpy.dev/docs/about/changelog.html
 Project-URL: Documentation, https://reactpy.dev/
@@ -44,8 +44,7 @@ Requires-Dist: jinja2-simple-tags; extra == 'jinja'
 Requires-Dist: jinja2>=3; extra == 'jinja'
 Provides-Extra: testing
 Requires-Dist: playwright; extra == 'testing'
-Provides-Extra: uvicorn
-Requires-Dist: uvicorn[standard]; extra == 'uvicorn'
+Requires-Dist: uvicorn[standard]; extra == 'testing'
 Description-Content-Type: text/markdown
 
 # <img src="https://raw.githubusercontent.com/reactive-python/reactpy/main/branding/svg/reactpy-logo-square.svg" align="left" height="45"/> ReactPy