move asgi_component_html function

Author: Archmonger

src/reactpy/asgi/executors/standalone.py

@@ -15,9 +15,12 @@
 from reactpy import html
 from reactpy.asgi.middleware import ReactPyMiddleware
 from reactpy.asgi.types import AsgiApp, AsgiHttpApp, AsgiLifespanApp, AsgiWebsocketApp
-from reactpy.asgi.utils import import_dotted_path, vdom_head_to_html
+from reactpy.asgi.utils import (
+    asgi_component_html,
+    import_dotted_path,
+    vdom_head_to_html,
+)
 from reactpy.types import ReactPyConfig, RootComponentConstructor, VdomDict
-from reactpy.utils import asgi_component_html
 
 _logger = getLogger(__name__)
 

src/reactpy/asgi/utils.py

@@ -6,6 +6,13 @@
 from typing import Any
 
 from reactpy._option import Option
+from reactpy.config import (
+    REACTPY_PATH_PREFIX,
+    REACTPY_RECONNECT_BACKOFF_MULTIPLIER,
+    REACTPY_RECONNECT_INTERVAL,
+    REACTPY_RECONNECT_MAX_INTERVAL,
+    REACTPY_RECONNECT_MAX_RETRIES,
+)
 from reactpy.types import ReactPyConfig, VdomDict
 from reactpy.utils import vdom_to_html
 
@@ -73,3 +80,21 @@ def process_settings(settings: ReactPyConfig) -> None:
             config_object.set_current(settings[setting])  # type: ignore
         else:
             raise ValueError(f'Unknown ReactPy setting "{setting}".')
+
+
+def asgi_component_html(element_id: str, class_: str, component_path: str) -> str:
+    return (
+        f'<div id="{element_id}" class="{class_}"></div>'
+        '<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},"
+        "});"
+        "</script>"
+    )

src/reactpy/templatetags/jinja.py

@@ -3,11 +3,8 @@
 
 from jinja2_simple_tags import StandaloneTag
 
-from reactpy.pyscript.utils import (
-    pyscript_component_html,
-    pyscript_setup_html,
-)
-from reactpy.utils import asgi_component_html
+from reactpy.asgi.utils import asgi_component_html
+from reactpy.pyscript.utils import pyscript_component_html, pyscript_setup_html
 
 
 class Jinja(StandaloneTag):  # type: ignore

src/reactpy/utils.py

@@ -8,7 +8,6 @@
 from lxml import etree
 from lxml.html import fromstring, tostring
 
-from reactpy import config
 from reactpy.core.vdom import vdom as make_vdom
 from reactpy.types import ComponentType, VdomDict
 
@@ -314,21 +313,3 @@ def _vdom_attr_to_html_str(key: str, value: Any) -> tuple[str, str]:
 
 # Pattern for delimitting camelCase names (e.g. camelCase to camel-case)
 _CAMEL_CASE_SUB_PATTERN = re.compile(r"(?<!^)(?=[A-Z])")
-
-
-def asgi_component_html(element_id: str, class_: str, component_path: str) -> str:
-    return (
-        f'<div id="{element_id}" class="{class_}"></div>'
-        '<script type="module" crossorigin="anonymous">'
-        f'import {{ mountReactPy }} from "{config.REACTPY_PATH_PREFIX.current}static/index.js";'
-        "mountReactPy({"
-        f' mountElement: document.getElementById("{element_id}"),'
-        f' pathPrefix: "{config.REACTPY_PATH_PREFIX.current}",'
-        f' componentPath: "{component_path}",'
-        f" reconnectInterval: {config.REACTPY_RECONNECT_INTERVAL.current},"
-        f" reconnectMaxInterval: {config.REACTPY_RECONNECT_MAX_INTERVAL.current},"
-        f" reconnectMaxRetries: {config.REACTPY_RECONNECT_MAX_RETRIES.current},"
-        f" reconnectBackoffMultiplier: {config.REACTPY_RECONNECT_BACKOFF_MULTIPLIER.current},"
-        "});"
-        "</script>"
-    )