functional rendering on standalone pyscript

Archmonger · Archmonger · commit e4f59018ffff · 2025-02-05T17:29:56.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 # --- Build Artifacts ---
-src/reactpy/static/*
+src/reactpy/static/index.js*
+src/reactpy/static/morphdom/
+src/reactpy/static/pyscript/
 
 # --- Jupyter ---
 *.ipynb_checkpoints
diff --git a/src/js/packages/@reactpy/app/bun.lockb b/src/js/packages/@reactpy/app/bun.lockb
diff --git a/src/js/packages/@reactpy/app/package.json b/src/js/packages/@reactpy/app/package.json
@@ -8,7 +8,9 @@
     "preact": "^10.25.4"
   },
   "devDependencies": {
-    "typescript": "^5.7.3"
+    "typescript": "^5.7.3",
+    "@pyscript/core": "^0.6",
+    "morphdom": "^2"
   },
   "scripts": {
     "build": "bun build \"src/index.ts\" --outdir=\"dist\" --minify --sourcemap=\"linked\"",
diff --git a/src/reactpy/asgi/executors/pyscript.py b/src/reactpy/asgi/executors/pyscript.py
@@ -7,6 +7,7 @@
 from email.utils import formatdate
 from pathlib import Path
 
+from asgiref.typing import WebSocketScope
 from typing_extensions import Unpack
 
 from reactpy import html
@@ -55,6 +56,9 @@ def __init__(
         self.html_head = html_head or html.head()
         self.html_lang = html_lang
 
+    def match_dispatch_path(self, scope: WebSocketScope) -> bool:
+        return False
+
 
 @dataclass
 class ReactPyAppCSR(ReactPyApp):
@@ -78,7 +82,7 @@ def render_index_html(self) -> None:
             initial=self.parent.initial,
             root=self.parent.root_name,
         )
-        head_content.replace("</head>", f"{pyscript_setup}</head>")
+        head_content = head_content.replace("</head>", f"{pyscript_setup}</head>")
 
         self._index_html = (
             "<!doctype html>"
diff --git a/src/reactpy/asgi/middleware.py b/src/reactpy/asgi/middleware.py
@@ -11,7 +11,7 @@
 from typing import Any
 
 import orjson
-from asgi_tools import ResponseWebSocket
+from asgi_tools import ResponseText, ResponseWebSocket
 from asgiref import typing as asgi_types
 from asgiref.compatibility import guarantee_single_callable
 from servestatic import ServeStaticASGI
@@ -81,8 +81,6 @@ def __init__(
         self.dispatcher_pattern = re.compile(
             f"^{self.dispatcher_path}(?P<dotted_path>[a-zA-Z0-9_.]+)/$"
         )
-        self.js_modules_pattern = re.compile(f"^{self.web_modules_path}.*")
-        self.static_pattern = re.compile(f"^{self.static_path}.*")
 
         # User defined ASGI apps
         self.extra_http_routes: dict[str, AsgiHttpApp] = {}
@@ -134,13 +132,13 @@ def match_dispatch_path(self, scope: asgi_types.WebSocketScope) -> bool:
         return bool(re.match(self.dispatcher_pattern, scope["path"]))
 
     def match_static_path(self, scope: asgi_types.HTTPScope) -> bool:
-        return bool(re.match(self.static_pattern, scope["path"]))
+        return scope["path"].startswith(self.static_path)
 
     def match_web_modules_path(self, scope: asgi_types.HTTPScope) -> bool:
-        return bool(re.match(self.js_modules_pattern, scope["path"]))
+        return scope["path"].startswith(self.web_modules_path)
 
     def match_extra_paths(self, scope: asgi_types.Scope) -> AsgiApp | None:
-        # Custom defined routes are unused within middleware to encourage users to handle
+        # Custom defined routes are unused by default to encourage users to handle
         # routing within their root ASGI application.
         return None
 
@@ -263,7 +261,7 @@ async def __call__(
         """ASGI app for ReactPy static files."""
         if not self._static_file_server:
             self._static_file_server = ServeStaticASGI(
-                self.parent.asgi_app,
+                Error404App(),
                 root=self.parent.static_dir,
                 prefix=self.parent.static_path,
             )
@@ -285,10 +283,16 @@ async def __call__(
         """ASGI app for ReactPy web modules."""
         if not self._static_file_server:
             self._static_file_server = ServeStaticASGI(
-                self.parent.asgi_app,
+                Error404App(),
                 root=self.parent.web_modules_dir,
                 prefix=self.parent.web_modules_path,
                 autorefresh=True,
             )
 
         await self._static_file_server(scope, receive, send)
+
+
+class Error404App:
+    async def __call__(self, scope, receive, send):
+        response = ResponseText("Resource not found on this server.", status_code=404)
+        await response(scope, receive, send)
diff --git a/src/reactpy/pyscript/utils.py b/src/reactpy/pyscript/utils.py
@@ -77,7 +77,7 @@ def pyscript_setup_html(
         f"{'' if REACTPY_DEBUG.current else hide_pyscript_debugger}"
         f'<script type="module" async crossorigin="anonymous" src="{REACTPY_PATH_PREFIX.current}static/pyscript/core.js">'
         "</script>"
-        f'<py-script async config="{pyscript_config}">{PYSCRIPT_LAYOUT_HANDLER}</py-script>'
+        f"<py-script async config='{pyscript_config}'>{PYSCRIPT_LAYOUT_HANDLER}</py-script>"
     )
 
 
diff --git a/src/reactpy/static/pyscript-custom.css b/src/reactpy/static/pyscript-custom.css
@@ -0,0 +1,3 @@
+py-script {
+    display: none;
+}
diff --git a/src/reactpy/static/pyscript-hide-debug.css b/src/reactpy/static/pyscript-hide-debug.css
@@ -0,0 +1,3 @@
+.py-error {
+    display: none;
+}

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ def pyscript_setup_html(`
`77`	`77`	`f"{'' if REACTPY_DEBUG.current else hide_pyscript_debugger}"`
`78`	`78`	`f'<script type="module" async crossorigin="anonymous" src="{REACTPY_PATH_PREFIX.current}static/pyscript/core.js">'`
`79`	`79`	`"</script>"`
`80`		`- f'<py-script async config="{pyscript_config}">{PYSCRIPT_LAYOUT_HANDLER}</py-script>'`
	`80`	`+ f"<py-script async config='{pyscript_config}'>{PYSCRIPT_LAYOUT_HANDLER}</py-script>"`
`81`	`81`	`)`
`82`	`82`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+py-script {`
	`2`	`+ display: none;`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.py-error {`
	`2`	`+ display: none;`
	`3`	`+}`