test web module exports

Author: rmorshea

docs/main.py

@@ -16,6 +16,7 @@
         "@material-ui/core",
         "victory",
         "semantic-ui-react",
+        "jquery",
     ]
 }
 

idom/client/utils.py

@@ -16,7 +16,8 @@ def open_modifiable_json(path: Path) -> Iterator[Any]:
         json.dump(data, f)
 
 
-_JS_MODULE_EXPORT_PATTERN = re.compile(r";export{(.*)};")
+_JS_MODULE_EXPORT_PATTERN = re.compile(r";export{(.*?)};")
+_JS_MODULE_EXPORT_NAME_PATTERN = re.compile(r";export (.*?) .*?;")
 
 
 def find_js_module_exports(path: Path) -> List[str]:
@@ -25,7 +26,9 @@ def find_js_module_exports(path: Path) -> List[str]:
         # we only know how to do this for javascript modules
         return []
     with path.open() as f:
-        for match in _JS_MODULE_EXPORT_PATTERN.findall(f.read()):
+        content = f.read()
+        for match in _JS_MODULE_EXPORT_PATTERN.findall(content):
             for export in match.split(","):
                 names.append(export.split(" as ", 1)[1].strip())
+        names.extend(_JS_MODULE_EXPORT_NAME_PATTERN.findall(content))
     return names

idom/server/prefab.py

@@ -1,11 +1,11 @@
 from importlib import import_module
-from socket import socket
 from typing import Any, Dict, Optional, Tuple, Type, TypeVar, cast
 
 from idom.core.element import ElementConstructor
 from idom.widgets.utils import multiview, hotswap, MultiViewMount, MountFunc
 
 from .base import AbstractRenderServer
+from .utils import find_available_port
 
 
 _S = TypeVar("_S", bound=AbstractRenderServer[Any, Any])
@@ -53,7 +53,7 @@ def run(
     if server_type is None:  # pragma: no cover
         raise ValueError("No default server available.")
     if port is None:  # pragma: no cover
-        port = _find_available_port(host)
+        port = find_available_port(host)
 
     server = server_type(element, server_options)
 
@@ -150,10 +150,3 @@ def hotswap_server(
     )
 
     return mount, server
-
-
-def _find_available_port(host: str) -> int:
-    """Get a port that's available for the given host"""
-    sock = socket()
-    sock.bind((host, 0))
-    return cast(int, sock.getsockname()[1])

idom/server/utils.py

@@ -0,0 +1,9 @@
+from socket import socket
+from typing import cast
+
+
+def find_available_port(host: str) -> int:
+    """Get a port that's available for the given host"""
+    sock = socket()
+    sock.bind((host, 0))
+    return cast(int, sock.getsockname()[1])

tests/test_client/test_manage.py

@@ -1,18 +1,114 @@
 import pytest
 
+from idom.client.manage import web_module_url, web_module_exports, build, restore
 
-from idom.client.manage import web_module_url, build, restore
+from tests.general_utils import assert_same_items
 
 
 @pytest.fixture(scope="module", autouse=True)
 def _setup_build_for_tests():
-    build([{"source_name": "tests", "js_dependencies": ["jquery"]}])
+    build([{"source_name": "tests", "js_dependencies": ["victory@35.4.0"]}])
     try:
         yield
     finally:
         restore()
 
 
 def test_web_module_url():
-    assert web_module_url("tests", "path/does/not/exist.js") is None
-    assert web_module_url("tests", "jquery") == "../web_modules/jquery-tests-56e1841.js"
+    assert web_module_url("tests", "does/not/exist") is None
+    assert (
+        web_module_url("tests", "victory") == "../web_modules/victory-tests-24fa38b.js"
+    )
+
+
+def test_web_module_exports():
+    assert web_module_exports("tests", "does/not/exist") == []
+    assert_same_items(
+        web_module_exports("tests", "victory"),
+        [
+            "Area",
+            "Axis",
+            "Background",
+            "Bar",
+            "Border",
+            "Box",
+            "BrushHelpers",
+            "Candle",
+            "Circle",
+            "ClipPath",
+            "Collection",
+            "CursorHelpers",
+            "Curve",
+            "Data",
+            "DefaultTransitions",
+            "Domain",
+            "ErrorBar",
+            "Events",
+            "Flyout",
+            "Helpers",
+            "LabelHelpers",
+            "Line",
+            "LineSegment",
+            "Log",
+            "Path",
+            "Point",
+            "Portal",
+            "PropTypes",
+            "RawZoomHelpers",
+            "Rect",
+            "Scale",
+            "Selection",
+            "SelectionHelpers",
+            "Slice",
+            "Style",
+            "TSpan",
+            "Text",
+            "TextSize",
+            "Transitions",
+            "VictoryAnimation",
+            "VictoryArea",
+            "VictoryAxis",
+            "VictoryBar",
+            "VictoryBoxPlot",
+            "VictoryBrushContainer",
+            "VictoryBrushLine",
+            "VictoryCandlestick",
+            "VictoryChart",
+            "VictoryClipContainer",
+            "VictoryContainer",
+            "VictoryCursorContainer",
+            "VictoryErrorBar",
+            "VictoryGroup",
+            "VictoryHistogram",
+            "VictoryLabel",
+            "VictoryLegend",
+            "VictoryLine",
+            "VictoryPie",
+            "VictoryPolarAxis",
+            "VictoryPortal",
+            "VictoryScatter",
+            "VictorySelectionContainer",
+            "VictorySharedEvents",
+            "VictoryStack",
+            "VictoryTheme",
+            "VictoryTooltip",
+            "VictoryTransition",
+            "VictoryVoronoi",
+            "VictoryVoronoiContainer",
+            "VictoryZoomContainer",
+            "Voronoi",
+            "VoronoiHelpers",
+            "Whisker",
+            "Wrapper",
+            "ZoomHelpers",
+            "addEvents",
+            "brushContainerMixin",
+            "combineContainerMixins",
+            "createContainer",
+            "cursorContainerMixin",
+            "makeCreateContainerFunction",
+            "selectionContainerMixin",
+            "voronoiContainerMixin",
+            "zoomContainerMixin",
+        ],
+    )