self review

Author: Archmonger

docs/source/about/changelog.rst

@@ -16,9 +16,9 @@ Unreleased
 ----------
 
 **Added**
-- :pull:`1113` - Added ``reactpy.asgi.ReactPy`` that can be used to run ReactPy in standalone mode via ASGI.
-- :pull:`1269` - Added ``reactpy.asgi.ReactPyPyodide`` that can be used to run ReactPy in standalone mode via ASGI, but rendered entirely client-sided.
-- :pull:`1113` - Added ``reactpy.asgi.ReactPyMiddleware`` that can be used to utilize ReactPy within any ASGI compatible framework.
+- :pull:`1113` - Added ``reactpy.executors.asgi.ReactPy`` that can be used to run ReactPy in standalone mode via ASGI.
+- :pull:`1269` - Added ``reactpy.executors.asgi.ReactPyPyodide`` that can be used to run ReactPy in standalone mode via ASGI, but rendered entirely client-sided.
+- :pull:`1113` - Added ``reactpy.executors.asgi.ReactPyMiddleware`` that can be used to utilize ReactPy within any ASGI compatible framework.
 - :pull:`1113` :pull:`1269` - Added ``reactpy.templatetags.Jinja`` that can be used alongside ``ReactPyMiddleware`` to embed several ReactPy components into your existing application. This includes the following template tags: ``{% component %}``, ``{% pyscript_component %}``, and ``{% pyscript_setup %}``.
 - :pull:`1269` - Added ``reactpy.pyscript_component`` that can be used to embed ReactPy components into your existing application.
 - :pull:`1113` - Added ``uvicorn`` and ``jinja`` installation extras (for example ``pip install reactpy[jinja]``).

src/reactpy/executors/asgi/middleware.py

@@ -136,7 +136,7 @@ def match_web_modules_path(self, scope: asgi_types.HTTPScope) -> bool:
 
     def match_extra_paths(self, scope: asgi_types.Scope) -> AsgiApp | None:
         # Custom defined routes are unused by default to encourage users to handle
-        # routing within their root ASGI application.
+        # routing within their ASGI framework of choice.
         return None
 
 

src/reactpy/executors/asgi/pyscript.py

@@ -64,7 +64,7 @@ def __init__(
                 are not applicable to CSR and will have no effect.
         """
         ReactPyMiddleware.__init__(
-            self, app=ReactPyPyodideApp(self), root_components=[], **settings
+            self, app=ReactPyPyscriptApp(self), root_components=[], **settings
         )
         if not file_paths:
             raise ValueError("At least one component file path must be provided.")
@@ -85,8 +85,8 @@ def match_dispatch_path(self, scope: WebSocketScope) -> bool:  # pragma: no cove
 
 
 @dataclass
-class ReactPyPyodideApp(ReactPyApp):
-    """ReactPy's standalone ASGI application for Client-Side Rendering (CSR)."""
+class ReactPyPyscriptApp(ReactPyApp):
+    """ReactPy's standalone ASGI application for Client-Side Rendering (CSR) via PyScript."""
 
     parent: ReactPyPyscript
     _index_html = ""

src/reactpy/executors/asgi/standalone.py

@@ -71,9 +71,11 @@ def __init__(
             extra_py = pyscript_options.get("extra_py", [])
             extra_js = pyscript_options.get("extra_js", {})
             config = pyscript_options.get("config", {})
-            self.html_head["children"].append(  # type: ignore
-                html_to_vdom(pyscript_setup_html(extra_py, extra_js, config))
+            pyscript_head_vdom = html_to_vdom(
+                pyscript_setup_html(extra_py, extra_js, config)
             )
+            pyscript_head_vdom["tagName"] = ""
+            self.html_head["children"].append(pyscript_head_vdom)  # type: ignore
 
     def match_dispatch_path(self, scope: asgi_types.WebSocketScope) -> bool:
         """Method override to remove `dotted_path` from the dispatcher URL."""

src/reactpy/pyscript/components.py

@@ -5,7 +5,7 @@
 
 from reactpy import component, hooks
 from reactpy.pyscript.utils import pyscript_component_html
-from reactpy.types import ComponentType
+from reactpy.types import ComponentType, Key
 from reactpy.utils import html_to_vdom
 
 if TYPE_CHECKING:
@@ -30,17 +30,18 @@ def _pyscript_component(
         set_rendered(True)
         return None
 
-    result = html_to_vdom(
+    component_vdom = html_to_vdom(
         pyscript_component_html(tuple(str(fp) for fp in file_paths), initial, root)
     )
-    result["tagName"] = ""
-    return result
+    component_vdom["tagName"] = ""
+    return component_vdom
 
 
 def pyscript_component(
     *file_paths: str | Path,
     initial: str | VdomDict | ComponentType = "",
     root: str = "root",
+    key: Key | None = None,
 ) -> ComponentType:
     """
     Args:
@@ -57,4 +58,5 @@ def pyscript_component(
         *file_paths,
         initial=initial,
         root=root,
+        key=key,
     )

src/reactpy/pyscript/utils.py

@@ -31,8 +31,8 @@ def minify_python(source: str) -> str:
     # Remove comments
     source = re.sub(r"#.*\n", "\n", source)
     # Remove docstrings
-    source = re.sub(r'""".*?"""', "", source, flags=re.DOTALL)
-    # Remove extra newlines
+    source = re.sub(r'\n\s*""".*?"""', "", source, flags=re.DOTALL)
+    # Remove excess newlines
     source = re.sub(r"\n+", "\n", source)
     # Remove empty lines
     source = re.sub(r"\s+\n", "\n", source)