Add tests for standalone pyscript

Author: Archmonger

src/reactpy/executors/asgi/pyscript.py

@@ -78,7 +78,7 @@ def __init__(
         self.html_head = html_head or html.head()
         self.html_lang = html_lang
 
-    def match_dispatch_path(self, scope: WebSocketScope) -> bool:
+    def match_dispatch_path(self, scope: WebSocketScope) -> bool:  # pragma: no cover
         """We do not use a WebSocket dispatcher for Client-Side Rendering (CSR)."""
         return False
 

src/reactpy/pyscript/utils.py

@@ -140,17 +140,11 @@ def extend_pyscript_config(
     return orjson.dumps(pyscript_config).decode("utf-8")
 
 
-@functools.cache
 def reactpy_version_string() -> str:  # pragma: no cover
     local_version = reactpy.__version__
 
     # Get a list of all versions via `pip index versions`
-    result = subprocess.run(
-        ["pip", "index", "versions", "reactpy"],
-        capture_output=True,
-        text=True,
-        check=False,
-    )
+    result = cached_pip_index_versions("reactpy")
 
     # Check if the command failed
     if result.returncode != 0:
@@ -177,11 +171,7 @@ def reactpy_version_string() -> str:  # pragma: no cover
         return f"reactpy=={local_version}"
 
     # Begin determining an alternative method of installing ReactPy
-    _logger.warning(
-        "'reactpy==%s' is not available on PyPi, "
-        "Attempting to determine an alternative to use within PyScript...",
-        local_version,
-    )
+
     if not latest_version:
         _logger.warning("Failed to determine the latest version of ReactPy on PyPi. ")
 
@@ -199,7 +189,7 @@ def reactpy_version_string() -> str:  # pragma: no cover
         )
     wheel_glob = glob(str(dist_dir / f"reactpy-{local_version}-*.whl"))
 
-    # Building a local wheel failed, find an alternative installation method
+    # Building a local wheel failed, try our best to give the user any possible version.
     if not wheel_glob:
         if latest_version:
             _logger.warning(
@@ -213,14 +203,29 @@ def reactpy_version_string() -> str:  # pragma: no cover
         )
         return f"reactpy=={local_version}"
 
-    # Move the wheel file to the web_modules directory, if needed
+    # Move the local file to the web modules directory, if needed
     wheel_file = Path(wheel_glob[0])
     new_path = REACTPY_WEB_MODULES_DIR.current / wheel_file.name
     if not new_path.exists():
+        _logger.warning(
+            "'reactpy==%s' is not available on PyPi. "
+            "PyScript will utilize a local wheel of ReactPy instead.",
+            local_version,
+        )
         shutil.copy(wheel_file, new_path)
     return f"{REACTPY_PATH_PREFIX.current}modules/{wheel_file.name}"
 
 
+@functools.cache
+def cached_pip_index_versions(package_name: str) -> subprocess.CompletedProcess[str]:
+    return subprocess.run(
+        ["pip", "index", "versions", package_name],
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+
+
 @functools.cache
 def cached_file_read(file_path: str, minifiy=True) -> str:
     content = Path(file_path).read_text(encoding="utf-8").strip()

src/reactpy/templatetags/jinja.py

@@ -3,7 +3,7 @@
 
 from jinja2_simple_tags import StandaloneTag
 
-from reactpy.asgi.utils import asgi_component_html
+from reactpy.executors.utils import server_side_component_html
 from reactpy.pyscript.utils import pyscript_component_html, pyscript_setup_html
 
 
@@ -28,7 +28,7 @@ def component(dotted_path: str, **kwargs: str) -> str:
     class_ = kwargs.pop("class", "")
     if kwargs:
         raise ValueError(f"Unexpected keyword arguments: {', '.join(kwargs)}")
-    return asgi_component_html(
+    return server_side_component_html(
         element_id=uuid4().hex, class_=class_, component_path=f"{dotted_path}/"
     )
 

src/reactpy/testing/backend.py

@@ -9,11 +9,11 @@
 
 import uvicorn
 
-from reactpy.asgi.executors.standalone import ReactPy
-from reactpy.asgi.middleware import ReactPyMiddleware
 from reactpy.config import REACTPY_TESTS_DEFAULT_TIMEOUT
 from reactpy.core.component import component
 from reactpy.core.hooks import use_callback, use_effect, use_state
+from reactpy.executors.asgi.middleware import ReactPyMiddleware
+from reactpy.executors.asgi.standalone import ReactPy
 from reactpy.testing.logs import (
     LogAssertionError,
     capture_reactpy_logs,

src/reactpy/types.py

@@ -295,3 +295,9 @@ class ReactPyConfig(TypedDict, total=False):
     async_rendering: bool
     debug: bool
     tests_default_timeout: int
+
+
+class PyScriptOptions(TypedDict, total=False):
+    extra_py: Sequence[str]
+    extra_js: dict[str, Any] | str
+    config: dict[str, Any] | str

tests/test_asgi/pyscript_components/load_first.py

@@ -0,0 +1,11 @@
+from typing import TYPE_CHECKING
+
+from reactpy import component
+
+if TYPE_CHECKING:
+    from .load_second import child
+
+
+@component
+def root():
+    return child()

tests/test_asgi/pyscript_components/load_second.py

@@ -0,0 +1,16 @@
+from reactpy import component, hooks, html
+
+
+@component
+def child():
+    count, set_count = hooks.use_state(0)
+
+    def increment(event):
+        set_count(count + 1)
+
+    return html.div(
+        html.button(
+            {"onClick": increment, "id": "incr", "data-count": count}, "Increment"
+        ),
+        html.p(f"PyScript Count: {count}"),
+    )

tests/test_asgi/pyscript_components/root.py

@@ -0,0 +1,16 @@
+from reactpy import component, hooks, html
+
+
+@component
+def root():
+    count, set_count = hooks.use_state(0)
+
+    def increment(event):
+        set_count(count + 1)
+
+    return html.div(
+        html.button(
+            {"onClick": increment, "id": "incr", "data-count": count}, "Increment"
+        ),
+        html.p(f"PyScript Count: {count}"),
+    )

tests/test_asgi/test_middleware.py

@@ -11,8 +11,8 @@
 from starlette.templating import Jinja2Templates
 
 import reactpy
-from reactpy.asgi.middleware import ReactPyMiddleware
 from reactpy.config import REACTPY_PATH_PREFIX, REACTPY_TESTS_DEFAULT_TIMEOUT
+from reactpy.executors.asgi.middleware import ReactPyMiddleware
 from reactpy.testing import BackendFixture, DisplayFixture