add more tests for web utils

Author: rmorshea

src/idom/web/module.py

@@ -16,6 +16,7 @@
 from .utils import (
     resolve_module_exports_from_file,
     resolve_module_exports_from_url,
+    url_suffix,
     web_module_path,
 )
 
@@ -57,8 +58,10 @@ def module_from_template(
     resolve_exports_depth: int = 5,
 ) -> WebModule:
     cdn = cdn.rstrip("/")
+    template_file = (
+        Path(__file__).parent / "templates" / f"{template}{url_suffix(name)}"
+    )
 
-    template_file = Path(__file__).parent / "templates" / f"{template}.js"
     if not template_file.exists():
         raise ValueError(f"No template for {template!r} exists")
 

src/idom/web/templates/preact.js

@@ -1,12 +1,9 @@
-export * from "$CDN/$PACKAGE";
-
-import { h, Component, render } from "$CDN/preact";
-import htm from "$CDN/htm";
-
-const html = htm.bind(h);
+import { render } from "$CDN/preact";
 
-export { h as createElement, render as renderElement };
+export { h as createElement, render as renderElement } from "$CDN/preact";
 
 export function unmountElement(container) {
-  preactRender(null, container);
+  render(null, container);
 }
+
+export * from "$CDN/$PACKAGE";

src/idom/web/templates/react.js

@@ -3,6 +3,7 @@ export * from "$CDN/$PACKAGE";
 import * as react from "$CDN/react";
 import * as reactDOM from "$CDN/react-dom";
 
-export const createElement = (component, props) => react.createElement(component, props);
+export const createElement = (component, props) =>
+  react.createElement(component, props);
 export const renderElement = reactDOM.render;
 export const unmountElement = reactDOM.unmountComponentAtNode;

src/idom/web/utils.py

@@ -1,6 +1,6 @@
 import logging
 import re
-from pathlib import Path
+from pathlib import Path, PurePosixPath
 from typing import Set, Tuple
 from urllib.parse import urlparse
 
@@ -12,9 +12,16 @@
 logger = logging.getLogger(__name__)
 
 
+def url_suffix(name: str) -> str:
+    head, _, tail = name.partition("@")  # handle version identifier
+    version, _, tail = tail.partition("/")  # get section after version
+    return PurePosixPath(tail or head).suffix or ".js"
+
+
 def web_module_path(name: str) -> Path:
+    name += url_suffix(name)
     path = IDOM_WED_MODULES_DIR.current.joinpath(*name.split("/"))
-    return path.with_suffix(path.suffix + ".js")
+    return path.with_suffix(path.suffix)
 
 
 def resolve_module_exports_from_file(file: Path, max_depth: int) -> Set[str]:
@@ -31,7 +38,7 @@ def resolve_module_exports_from_file(file: Path, max_depth: int) -> Set[str]:
         if urlparse(ref).scheme:  # is an absolute URL
             export_names.update(resolve_module_exports_from_url(ref, max_depth - 1))
         else:
-            path = _resolve_relative_file_path(file, ref)
+            path = file.parent.joinpath(*ref.split("/"))
             export_names.update(resolve_module_exports_from_file(path, max_depth - 1))
 
     return export_names
@@ -102,23 +109,19 @@ def resolve_module_exports_from_source(content: str) -> Tuple[Set[str], Set[str]
     return {n.strip() for n in names}, {r.strip() for r in references}
 
 
-def _resolve_relative_file_path(base_path: Path, rel_url: str) -> Path:
-    if rel_url.startswith("./"):
-        return base_path.parent / rel_url[2:]
-    while rel_url.startswith("../"):
-        base_path = base_path.parent
-        rel_url = rel_url[3:]
-    return base_path / rel_url
-
-
 def _resolve_relative_url(base_url: str, rel_url: str) -> str:
     if not rel_url.startswith("."):
         return rel_url
-    elif rel_url.startswith("./"):
-        return base_url.rsplit("/")[0] + rel_url[1:]
+
+    base_url = base_url.rsplit("/", 1)[0]
+
+    if rel_url.startswith("./"):
+        return base_url + rel_url[1:]
+
     while rel_url.startswith("../"):
-        base_url = base_url.rsplit("/")[0]
+        base_url = base_url.rsplit("/", 1)[0]
         rel_url = rel_url[3:]
+
     return f"{base_url}/{rel_url}"
 
 

tests/test_web/js_fixtures/export-resolution/one.js

@@ -1,2 +1,3 @@
 export {one as One};
-export * from "./two.js";
+// use ../ just to check that it works
+export * from "../export-resolution/two.js";

tests/test_web/test_utils.py

@@ -58,18 +58,30 @@ def test_resolve_module_exports_from_file_log_on_unknown_file_location(
 def test_resolve_module_exports_from_url():
     responses.add(
         responses.GET,
-        "https://first.url",
-        body="export const First = 1; export * from 'https://second.url';",
+        "https://some.url/first.js",
+        body="export const First = 1; export * from 'https://another.url/path/second.js';",
     )
     responses.add(
         responses.GET,
-        "https://second.url",
-        body="export const Second = 2;",
+        "https://another.url/path/second.js",
+        body="export const Second = 2; export * from '../third.js';",
+    )
+    responses.add(
+        responses.GET,
+        "https://another.url/third.js",
+        body="export const Third = 3; export * from './fourth.js';",
+    )
+    responses.add(
+        responses.GET,
+        "https://another.url/fourth.js",
+        body="export const Fourth = 4;",
     )
 
-    assert resolve_module_exports_from_url("https://first.url", 2) == {
+    assert resolve_module_exports_from_url("https://some.url/first.js", 4) == {
         "First",
         "Second",
+        "Third",
+        "Fourth",
     }