More robust keys for web module caching mechanism

Author: Archmonger

src/reactpy/web/module.py

@@ -65,8 +65,9 @@ def import_js_from_url(
         allow_children:
             Whether or not these components can have children.
     """
-    if url in _URL_WEB_MODULE_CACHE:
-        module = _URL_WEB_MODULE_CACHE[url]
+    key = f"{url}{resolve_exports}{resolve_exports_depth}{unmount_before_update}"
+    if key in _URL_WEB_MODULE_CACHE:
+        module = _URL_WEB_MODULE_CACHE[key]
     else:
         module = _module_from_url(
             url,
@@ -75,7 +76,7 @@ def import_js_from_url(
             resolve_exports_depth=resolve_exports_depth,
             unmount_before_update=unmount_before_update,
         )
-        _URL_WEB_MODULE_CACHE[url] = module
+        _URL_WEB_MODULE_CACHE[key] = module
     return _vdom_from_web_module(module, export_names, fallback, allow_children)
 
 
@@ -117,8 +118,9 @@ def import_js_from_file(
         allow_children:
             Whether or not these components can have children.
     """
-    if name in _FILE_WEB_MODULE_CACHE:
-        module = _FILE_WEB_MODULE_CACHE[name]
+    key = f"{name}{resolve_exports}{resolve_exports_depth}{unmount_before_update}"
+    if key in _FILE_WEB_MODULE_CACHE:
+        module = _FILE_WEB_MODULE_CACHE[key]
     else:
         module = _module_from_file(
             name,
@@ -129,7 +131,7 @@ def import_js_from_file(
             unmount_before_update=unmount_before_update,
             symlink=symlink,
         )
-        _FILE_WEB_MODULE_CACHE[name] = module
+        _FILE_WEB_MODULE_CACHE[key] = module
     return _vdom_from_web_module(module, export_names, fallback, allow_children)
 
 
@@ -168,8 +170,9 @@ def import_js_from_string(
         allow_children:
             Whether or not these components can have children.
     """
-    if name in _STRING_WEB_MODULE_CACHE:
-        module = _STRING_WEB_MODULE_CACHE[name]
+    key = f"{name}{resolve_exports}{resolve_exports_depth}{unmount_before_update}"
+    if key in _STRING_WEB_MODULE_CACHE:
+        module = _STRING_WEB_MODULE_CACHE[key]
     else:
         module = _module_from_string(
             name,
@@ -179,7 +182,7 @@ def import_js_from_string(
             resolve_exports_depth=resolve_exports_depth,
             unmount_before_update=unmount_before_update,
         )
-        _STRING_WEB_MODULE_CACHE[name] = module
+        _STRING_WEB_MODULE_CACHE[key] = module
     return _vdom_from_web_module(module, export_names, fallback, allow_children)
 
 

tests/test_web/test_module.py

@@ -474,12 +474,15 @@ def test_import_js_from_url_caching():
 
     # First import
     reactpy.web.import_js_from_url(url, "Component", resolve_exports=False)
-    assert url in reactpy.web.module._URL_WEB_MODULE_CACHE
-    module1 = reactpy.web.module._URL_WEB_MODULE_CACHE[url]
+    # Find the key that contains the 'url' substring
+    key = next(x for x in reactpy.web.module._URL_WEB_MODULE_CACHE.keys() if url in x)
+    module1 = reactpy.web.module._URL_WEB_MODULE_CACHE[key]
+    assert module1
+    initial_length = len(reactpy.web.module._URL_WEB_MODULE_CACHE)
 
     # Second import
     reactpy.web.import_js_from_url(url, "Component", resolve_exports=False)
-    assert reactpy.web.module._URL_WEB_MODULE_CACHE[url] is module1
+    assert len(reactpy.web.module._URL_WEB_MODULE_CACHE) == initial_length
 
 
 def test_import_js_from_file_caching(tmp_path):
@@ -489,11 +492,13 @@ def test_import_js_from_file_caching(tmp_path):
     reactpy.web.module._FILE_WEB_MODULE_CACHE.clear()
 
     reactpy.web.import_js_from_file(name, file, "Component")
-    assert name in reactpy.web.module._FILE_WEB_MODULE_CACHE
-    module1 = reactpy.web.module._FILE_WEB_MODULE_CACHE[name]
+    key = next(x for x in reactpy.web.module._FILE_WEB_MODULE_CACHE.keys() if name in x)
+    module1 = reactpy.web.module._FILE_WEB_MODULE_CACHE[key]
+    assert module1
+    initial_length = len(reactpy.web.module._FILE_WEB_MODULE_CACHE)
 
     reactpy.web.import_js_from_file(name, file, "Component")
-    assert reactpy.web.module._FILE_WEB_MODULE_CACHE[name] is module1
+    assert len(reactpy.web.module._FILE_WEB_MODULE_CACHE) == initial_length
 
 
 def test_import_js_from_string_caching():
@@ -502,8 +507,12 @@ def test_import_js_from_string_caching():
     reactpy.web.module._STRING_WEB_MODULE_CACHE.clear()
 
     reactpy.web.import_js_from_string(name, content, "Component")
-    assert name in reactpy.web.module._STRING_WEB_MODULE_CACHE
-    module1 = reactpy.web.module._STRING_WEB_MODULE_CACHE[name]
+    key = next(
+        x for x in reactpy.web.module._STRING_WEB_MODULE_CACHE.keys() if name in x
+    )
+    module1 = reactpy.web.module._STRING_WEB_MODULE_CACHE[key]
+    assert module1
+    initial_length = len(reactpy.web.module._STRING_WEB_MODULE_CACHE)
 
     reactpy.web.import_js_from_string(name, content, "Component")
-    assert reactpy.web.module._STRING_WEB_MODULE_CACHE[name] is module1
+    assert len(reactpy.web.module._STRING_WEB_MODULE_CACHE) == initial_length