htag 2.0.5__tar.gz → 2.0.7__tar.gz

{htag-2.0.5 → htag-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htag
-Version: 2.0.5
+Version: 2.0.7
 Summary: Python3 GUI toolkit for building 'beautiful' applications for mobile, web, and desktop from a single codebase
 Author: manatlan
 License: MIT

{htag-2.0.5 → htag-2.0.7}/htag/client_js.py

@@ -1,4 +1,12 @@
-CLIENT_JS = """
+def __minify_js(js_code: str) -> str:
+    import re
+    # Remove single line comments (but not URL schemes like http://)
+    js = re.sub(r'(?<!:)//.*', '', js_code)
+    # Remove newlines and tabs
+    js = re.sub(r'\s+', ' ', js).strip()
+    return js
+
+CLIENT_JS = __minify_js("""
 // The client-side bridge that connects the browser to the Python server.
 var ws;
 var use_fallback = false;
@@ -158,7 +166,30 @@ function handle_payload(data) {
         // Apply partial DOM updates received from the server
         for(var id in data.updates) {
             var el = document.getElementById(id) || document.querySelector('[data-htag-id="' + id + '"]');
-            if(el) el.outerHTML = data.updates[id];
+            if(el) {
+                if(el.tagName === 'BODY') {
+                    var doc = new DOMParser().parseFromString(data.updates[id], 'text/html');
+                    
+                    // Sync attributes properly
+                    var newAttrNames = new Set();
+                    for(var i = 0; i < doc.body.attributes.length; i++) {
+                        var attr = doc.body.attributes[i];
+                        el.setAttribute(attr.name, attr.value);
+                        newAttrNames.add(attr.name);
+                    }
+                    // Remove old attributes that are not in the new body
+                    for(var i = el.attributes.length - 1; i >= 0; i--) {
+                        var attrName = el.attributes[i].name;
+                        if(!newAttrNames.has(attrName)) {
+                            el.removeAttribute(attrName);
+                        }
+                    }
+                    
+                    el.innerHTML = doc.body.innerHTML;
+                } else {
+                    el.outerHTML = data.updates[id];
+                }
+            }
         }
         
         // Ensure overlays are still in the DOM (in case the body was replaced)
@@ -349,4 +380,5 @@ function htag_event(id, event_name, event) {
         window.htag_transport(payload);
     });
 }
-"""
+""")
+

{htag-2.0.5 → htag-2.0.7}/htag/core.py

@@ -438,7 +438,10 @@ class GTag:  # aka "Generic Tag"
             else:
                 self.tag = "div"  # fallback
 
-        self.id = f"{self.tag}-{id(self)}"
+        if getattr(self, "tag", None) in ("style", "script"):
+            self.id = ""
+        else:
+            self.id = f"{self.tag}-{id(self)}"
         logger.debug("Created Tag: %s (id: %s)", self.tag, self.id)
 
         # Scoped style: auto-prefix CSS rules with a unique class per component class

{htag-2.0.5 → htag-2.0.7}/htag/runner.py

@@ -339,16 +339,30 @@ class AppRunner(BaseApp):
 
     def collect_statics(self, tag: GTag, result: list[str]) -> None:
         """Recursively collects statics from the whole tag tree."""
+        seen_ids = set()
+        seen_contents = set(result)
 
         def visitor(t: GTag) -> None:
             s_instance = getattr(t, "statics", [])
             s_class = getattr(t.__class__, "statics", [])
-            for s_list in [s_class, s_instance]:
+
+            # Avoid processing the exact same list twice (common case)
+            lists = [s_class]
+            if s_instance is not s_class:
+                lists.append(s_instance)
+
+            for s_list in lists:
                 if not isinstance(s_list, (list, tuple)):
                     s_list = [s_list]
                 for s in s_list:
+                    sid = id(s)
+                    if sid in seen_ids:
+                        continue
+                    seen_ids.add(sid)
+
                     s_str = str(s)
-                    if s_str not in result:
+                    if s_str not in seen_contents:
+                        seen_contents.add(s_str)
                         result.append(s_str)
 
         self._walk_tree(tag, visitor)

{htag-2.0.5 → htag-2.0.7}/htag.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htag
-Version: 2.0.5
+Version: 2.0.7
 Summary: Python3 GUI toolkit for building 'beautiful' applications for mobile, web, and desktop from a single codebase
 Author: manatlan
 License: MIT

{htag-2.0.5 → htag-2.0.7}/htag.egg-info/SOURCES.txt

@@ -39,6 +39,7 @@ tests/test_state_advanced.py
 tests/test_state_features.py
 tests/test_state_proxy.py
 tests/test_state_reactivity.py
+tests/test_statics_deduplication.py
 tests/test_tag_names.py
 tests/test_web_sessions.py
 tests/test_webapp_run.py

{htag-2.0.5 → htag-2.0.7}/pyproject.toml

@@ -9,7 +9,7 @@ include-package-data = true
 
 [project]
 name = "htag"
-version = "2.0.5"
+version = "2.0.7"
 description = "Python3 GUI toolkit for building 'beautiful' applications for mobile, web, and desktop from a single codebase"
 readme = "README.md"
 requires-python = ">=3.10"

htag-2.0.7/tests/test_statics_deduplication.py

@@ -0,0 +1,106 @@
+from htag import Tag, App
+
+def test_statics_deduplication_same_object():
+    # A shared static object
+    SHARED_JS = Tag.script("console.log('shared')")
+
+    class Comp1(Tag.div):
+        statics = [SHARED_JS]
+    class Comp2(Tag.div):
+        statics = [SHARED_JS]
+
+    class MyApp(App):
+        def init(self):
+            self += Comp1()
+            self += Comp2()
+
+    app = MyApp()
+    html = app._render_page()
+    
+    # Count occurrences of SHARED_JS in html
+    count = html.count("console.log('shared')")
+    assert count == 1, "Deduplication failed for same object"
+
+def test_statics_deduplication_identical_content():
+    # Identical but different objects
+    JS1 = Tag.script("console.log('identical')")
+    JS2 = Tag.script("console.log('identical')")
+    
+    class Comp3(Tag.div):
+        statics = [JS1]
+    class Comp4(Tag.div):
+        statics = [JS2]
+        
+    app = App(Comp3(), Comp4())
+    html = app._render_page()
+    count = html.count("console.log('identical')")
+    assert count == 1, "Deduplication failed for identical content"
+
+def test_statics_inheritance_optimization():
+    SHARED_STYLE = Tag.style("body { color: red; }")
+
+    class Comp(Tag.div):
+        statics = [SHARED_STYLE]
+    
+    c = Comp()
+    # By default, c.statics is the same object as Comp.statics
+    assert c.statics is Comp.statics
+
+    app = App(c)
+    html = app._render_page()
+    count = html.count("body { color: red; }")
+    assert count == 1, "Deduplication failed for class/instance shared statics"
+
+def test_script_style_no_auto_id():
+    # Verify that script and style tags don't have auto-generated IDs
+    # which used to break content deduplication.
+    s = Tag.script("alert(1)")
+    st = Tag.style(".foo {}")
+    d = Tag.div("hello")
+    
+    assert s.id == ""
+    assert st.id == ""
+    assert d.id.startswith("div-")
+    
+    assert 'id=""' in str(s) or 'id' not in str(s)
+    assert 'id=""' in str(st) or 'id' not in str(st)
+    assert f'id="{d.id}"' in str(d)
+
+def test_statics_collection_with_mixed_types():
+    # Test that collect_statics handles non-list statics gracefully
+    class Comp(Tag.div):
+        statics = Tag.script("console.log('single')")
+    
+    app = App(Comp())
+    html = app._render_page()
+    assert "console.log('single')" in html
+
+def test_statics_deduplication_across_renders():
+    # Verify that App.sent_statics works and prevents re-sending same statics
+    SHARED = Tag.script("console.log('shared')")
+    
+    class MyApp(App):
+        statics = [SHARED]
+        def init(self):
+            self.main = Tag.div()
+            self += self.main
+
+    app = MyApp()
+    # Initial render: collects SHARED and puts it in sent_statics
+    app._render_page()
+    assert SHARED in app.sent_statics or str(SHARED) in app.sent_statics
+    
+    # Simulate a dynamic update adding a component with the same static (different instance/list)
+    class Comp(Tag.div):
+        statics = [SHARED]
+    
+    app.main.add(Comp())
+    
+    # broadcast_updates logic (manual verification)
+    all_statics = []
+    app.collect_statics(app, all_statics) # Should collect SHARED again
+    
+    # But new_statics calculation should skip it if already in sent_statics
+    new_statics = [s for s in all_statics if s not in app.sent_statics]
+    
+    assert "console.log('shared')" not in "".join(new_statics)