do not assume source suffix in client

Author: rmorshea

src/idom/client/packages/idom-app-react/src/index.js

@@ -26,7 +26,7 @@ function getWebSocketEndpoint() {
 }
 
 function loadImportSource(source, sourceType) {
-  return import(sourceType == "NAME" ? `/modules/${source}.js` : source);
+  return import(sourceType == "NAME" ? `/modules/${source}` : source);
 }
 
 function shouldReconnect() {

src/idom/web/module.py

@@ -10,14 +10,13 @@
 from pathlib import Path
 from typing import Any, List, NewType, Optional, Set, Tuple, Union, overload
 
-from idom.config import IDOM_DEBUG_MODE
+from idom.config import IDOM_DEBUG_MODE, IDOM_WED_MODULES_DIR
 from idom.core.vdom import ImportSourceDict, VdomDictConstructor, make_vdom_constructor
 
 from .utils import (
+    module_name_suffix,
     resolve_module_exports_from_file,
     resolve_module_exports_from_url,
-    url_suffix,
-    web_module_path,
 )
 
 
@@ -59,21 +58,21 @@ def module_from_template(
 ) -> WebModule:
     cdn = cdn.rstrip("/")
     template_file = (
-        Path(__file__).parent / "templates" / f"{template}{url_suffix(name)}"
+        Path(__file__).parent / "templates" / f"{template}{module_name_suffix(name)}"
     )
 
     if not template_file.exists():
         raise ValueError(f"No template for {template!r} exists")
 
-    target_file = web_module_path(name)
+    target_file = _web_module_path(name)
     if not target_file.exists():
         target_file.parent.mkdir(parents=True, exist_ok=True)
         target_file.write_text(
             template_file.read_text().replace("$PACKAGE", name).replace("$CDN", cdn)
         )
 
     return WebModule(
-        source=name,
+        source=name + module_name_suffix(name),
         source_type=NAME_SOURCE,
         default_fallback=fallback,
         file=target_file,
@@ -93,15 +92,15 @@ def module_from_file(
     resolve_exports_depth: int = 5,
 ) -> WebModule:
     source_file = Path(file)
-    target_file = web_module_path(name)
+    target_file = _web_module_path(name)
     if target_file.exists():
         if target_file.resolve() != source_file.resolve():
             raise ValueError(f"{name!r} already exists as {target_file.resolve()}")
     else:
         target_file.parent.mkdir(parents=True, exist_ok=True)
         target_file.symlink_to(source_file)
     return WebModule(
-        source=name,
+        source=name + module_name_suffix(name),
         source_type=NAME_SOURCE,
         default_fallback=fallback,
         file=target_file,
@@ -180,3 +179,9 @@ def _make_export(
             fallback=(fallback or web_module.default_fallback),
         ),
     )
+
+
+def _web_module_path(name: str) -> Path:
+    name += module_name_suffix(name)
+    path = IDOM_WED_MODULES_DIR.current.joinpath(*name.split("/"))
+    return path.with_suffix(path.suffix)

src/idom/web/utils.py

@@ -6,24 +6,16 @@
 
 import requests
 
-from idom.config import IDOM_WED_MODULES_DIR
-
 
 logger = logging.getLogger(__name__)
 
 
-def url_suffix(name: str) -> str:
+def module_name_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)
-
-
 def resolve_module_exports_from_file(file: Path, max_depth: int) -> Set[str]:
     if max_depth == 0:
         logger.warning(f"Did not resolve all exports for {file} - max depth reached")