Updated/changed the uhtml demo

Author: WebReflection

test/uhtml/index.html

@@ -4,7 +4,10 @@
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width,initial-scale=1.0">
         <title>Template</title>
-        <script defer src="https://cdn.jsdelivr.net/npm/uhtml/es.js"></script>
+        <script type="module">
+            import * as uhtml from "https://cdn.jsdelivr.net/npm/uhtml/index.js";
+            globalThis.uhtml = uhtml;
+        </script>
         <script type="module" src="https://cdn.jsdelivr.net/npm/polyscript"></script>
         <script type="pyodide" src="./index.py" config="./config.toml"></script>
     </head>

test/uhtml/index.py

@@ -1,7 +1,23 @@
 from js import document
-from uhtml import render, html
+from uhtml import local
+# grab utilities passing current module name
+render, html, svg = local(__name__)
 
-def update(count):
+# define handlers and whatnot
+def h3_click(event):
+  print(event.type)
+
+def button_click(event):
+  global count, value
+  count = count + 1
+  value = f"World {count}"
+  show()
+
+value = "World"
+count = 0
+
+# define the driver
+def show():
     render(document.body, html(
         """
           <h3 onclick=${h3_click}>
@@ -10,11 +26,7 @@ def update(count):
           <button onclick=${button_click}>
             Clicks ${count}
           </button>
-        """,
-        h3_click=lambda event: print(event.type),
-        value="World",
-        button_click=lambda _: update(count + 1),
-        count=count
+        """
     ))
 
-update(0)
+show()

test/uhtml/js_template.py

@@ -1,5 +1,6 @@
 # A silly idea by Andrea Giammarchi
 from string import Template as _Template
+from sys import modules
 
 # The goal of this utility is to create a JS
 # Template Literal Tag like function that accepts
@@ -8,8 +9,8 @@
 # If a cache dictionary is passed, it never parses the same
 # template string more than once, improving performance
 # for more complex scenarios / use cases.
-def tag(fn, cache=None):
-    return lambda tpl, **kw: _tag(tpl, cache)(fn, **kw)
+def tag(name, fn, cache=None):
+    return lambda tpl: _tag(tpl, cache)(fn, modules[name])
 
 def _create(tpl):
     i = 0
@@ -36,7 +37,7 @@ def _create(tpl):
         i += 1
     # make the template immutable
     t = tuple(a)
-    return lambda fn, **kw: fn(t, *[kw[k] for k in keys])
+    return lambda fn, kw: fn(t, *[kw.__dict__[k] for k in keys])
 
 # given a template string, maps all non interpolated
 # parts as tuple and orchestrate ordered values to send

test/uhtml/uhtml.py

@@ -27,7 +27,9 @@ def hole(tpl, *values):
         return lambda: uhtml(_arrays[i], *[_to_js(v) for v in values])
     return hole
 
-# export uhtml API as Python
-html = _tag(_kind(_uhtml.html), cache=_cache)
-svg = _tag(_kind(_uhtml.svg), cache=_cache)
-render = _uhtml.render
+def local(name):
+    return (
+        _uhtml.render,
+        _tag(name, _kind(_uhtml.html), cache=_cache),
+        _tag(name, _kind(_uhtml.svg), cache=_cache)
+    )