pyweber 1.2.0.dev20260428__tar.gz → 1.2.0.dev20260430__tar.gz

{pyweber-1.2.0.dev20260428/pyweber.egg-info → pyweber-1.2.0.dev20260430}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyweber
-Version: 1.2.0.dev20260428
+Version: 1.2.0.dev20260430
 Summary: A lightweight Python framework for building and managing web applications.
 Author-email: DevPythonMZ <pypi.dev@gmail.com>
 License-Expression: MIT

{pyweber-1.2.0.dev20260428 → pyweber-1.2.0.dev20260430}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyweber"
-version = "1.2.0.dev20260428"
+version = "1.2.0.dev20260430"
 description = "A lightweight Python framework for building and managing web applications."
 readme = "README.md"
 authors = [{ name = "DevPythonMZ", email = "pypi.dev@gmail.com" }]

{pyweber-1.2.0.dev20260428 → pyweber-1.2.0.dev20260430}/pyweber/core/element.py

@@ -1,8 +1,10 @@
+import os
 import re
 from uuid import uuid4
 import lxml.html as HTMLPARSER
 from lxml.html import fromstring
 from typing import Union, Any, Literal
+from pyweber.utils.loads import LoadStaticFiles
 from pyweber.utils.types import HTMLTag, GetBy
 from pyweber.models.file import File
 from pyweber.models.element import (
@@ -244,33 +246,23 @@ class Element(ElementConstrutor): # pragma: no cover
 
     def querySelector(self, selector: str, element: 'Element' = None, search_mode: SEARCH_MODE = 'exact') -> 'Element':
         results = self.querySelectorAll(selector=selector, element=element, search_mode=search_mode)
-
         return results[0] if results else None
 
     def querySelectorAll(self, selector: str, element: 'Element' = None, search_mode: SEARCH_MODE = 'exact') -> list['Element']:
         element = element or self
-        results: list['Element'] = []
 
         if selector.startswith('.'):
             classes = ' '.join(selector.split('.')).strip()
-            return self.getElements(by=GetBy.classes, value=classes, search_mode=search_mode)
+            return self.getElements(by=GetBy.classes, value=classes, element=element, search_mode=search_mode)
 
         elif selector.startswith('#'):
-            if selector[1:].strip() == element.id:
-                results.append(element)
+            return self.getElements(by='id', value=selector[1:].strip(), element=element, search_mode=search_mode)
 
         elif selector.startswith('['):
             sel = selector.removeprefix('[').removesuffix(']')
-            return self.getElements(by=GetBy.attrs, value=sel, search_mode=search_mode)
-
-        else:
-            if selector.strip() == element.tag:
-                results.append(element)
-
-        for child in element.childs:
-            results.extend(self.querySelectorAll(selector=selector, element=child, search_mode=search_mode))
+            return self.getElements(by='attrs', value=sel, element=element, search_mode=search_mode)
 
-        return results
+        return self.getElements(by='tag', value=selector.strip(), element=element, search_mode=search_mode)
 
     @property
     def clone(self):
@@ -339,7 +331,7 @@ class Element(ElementConstrutor): # pragma: no cover
 
     @classmethod
     def from_html(cls, html: str, include_uuid: bool = True, **kwargs):
-        HtmlElement = fromstring(html.strip())
+        HtmlElement = fromstring(cls.read_file(html).strip())
         return cls._create_element(HTMLElement=HtmlElement, parent=None, include_uuid=include_uuid, **kwargs)
 
     @classmethod
@@ -422,6 +414,16 @@ class Element(ElementConstrutor): # pragma: no cover
             except: pass
         return element
 
+    @classmethod
+    def read_file(cls, file_path: str) -> str:
+        if file_path.endswith('.html'):
+            path = os.path.join('templates', file_path) if not os.path.isfile(file_path) else file_path
+
+            try: return LoadStaticFiles(path=path).load
+            except FileNotFoundError: raise FileNotFoundError(f'{path} not found, please include on templates path')
+
+        return file_path
+
     def update(self):
         raise NotImplementedError
 
@@ -433,5 +435,6 @@ class Element(ElementConstrutor): # pragma: no cover
         else:
             return obj
 
+
     def __str__(self):
         return self.to_html()

{pyweber-1.2.0.dev20260428 → pyweber-1.2.0.dev20260430}/pyweber/core/template.py

@@ -1,14 +1,13 @@
 import os
 from uuid import uuid4
 from pyweber.core.element import Element, SEARCH_MODE
-from pyweber.utils.loads import LoadStaticFiles
 from pyweber.config.config import config
 from pyweber.utils.types import HTTPStatusCode, GetBy
 
 class Template: # pragma: no cover
     def __init__(self, template: str, status_code: int = 200, title: str = None, include_uuid: bool = True, **kwargs):
         self.__include_uuid = include_uuid
-        self.__template = self.__read_file(file_path=template)
+        self.__template = Element.read_file(file_path=template)
         self.kwargs = kwargs
         self.data = None
         self.__status_code = status_code
@@ -135,22 +134,6 @@ class Template: # pragma: no cover
 
         return element
 
-    def __read_file(self, file_path: str) -> str:
-        from pyweber.models.error_pages import ErrorPages
-        if file_path.endswith('.html'):
-            path = os.path.join('templates', file_path) if not os.path.isfile(file_path) else file_path
-
-            try:
-                return LoadStaticFiles(path=path).load
-
-            except FileNotFoundError:
-                return ErrorPages().page_server_error.build_html().replace(
-                    "{{error}}",
-                    f'{path} not found, please include on templates file'
-                )
-
-        return file_path
-
     def __create_default_element(self, *args, **kwargs):
         return Element(*args, **kwargs)
 

{pyweber-1.2.0.dev20260428 → pyweber-1.2.0.dev20260430}/pyweber/models/element.py

@@ -369,8 +369,7 @@ class ElementConstrutor: # pragma: no cover
                         else:
                             child.remove_attr('selected')
 
-        elif self.get_attr('type', None) == 'checkbox':
-            self.__value = None
+        elif self.attrs.get('type', None) == 'checkbox':
             if value == 'on':
                 self.set_attr('checked', '')
 
@@ -468,7 +467,7 @@ class ElementConstrutor: # pragma: no cover
         return html
 
     @classmethod
-    def render_dynamic_values(self, content: str, **kwargs):
+    def render_dynamic_values(cls, content: str, **kwargs):
 
         if content:
             pattern = r'\{\{(.*?)\}\}'
@@ -479,7 +478,7 @@ class ElementConstrutor: # pragma: no cover
                     value = kwargs.get(r.strip(), None)
                     if value is not None:
                         if isinstance(value, ElementConstrutor):
-                            value = self.to_html(element=value)
+                            value = value.to_html(element=value)
 
                         content = content.replace("{{" + r + "}}", str(value))
         return content

{pyweber-1.2.0.dev20260428 → pyweber-1.2.0.dev20260430}/pyweber/models/template_diff.py

@@ -6,10 +6,10 @@ class TemplateDiff: # pragma: no cover
     def __init__(self):
         self.__differences: dict[str, dict[str, str]] = {}
         self.__checked_elements: list[Element] = []
-    
+
     @property
     def differences(self): return self.__differences
-    
+
     def __raise_typr_error(self, *elements: Element):
         for element in elements:
             if not isinstance(element, Element):
@@ -18,49 +18,39 @@ class TemplateDiff: # pragma: no cover
     def track_differences(self, new_element: Union[Element, Template], old_element: Union[Element, Template]):
         if isinstance(old_element, Template):
             old_element = old_element.root
-        
+
         if isinstance(new_element, Template):
             new_element = new_element.root
-        
+
         self.__raise_typr_error(old_element, new_element)
-        
+
         status = None
         methods = new_element.get_element_methods()
-        
+
         if new_element.uuid != old_element.uuid:
             status = 'Added'
-
         else:
             if new_element.id != old_element.id:
                 status = 'Changed'
-            
             elif new_element.content != old_element.content:
                 status = 'Changed'
-            
             elif new_element.value != old_element.value:
                 status = 'Changed'
-            
             elif new_element.tag != old_element.tag:
                 status = 'Changed'
-            
             elif new_element.attrs != old_element.attrs:
                 status = 'Changed'
-            
             elif new_element.style != old_element.style:
                 status = 'Changed'
-            
             elif new_element.events.__dict__ != old_element.events.__dict__:
                 status = 'Changed'
-            
             elif [v for v in new_element.classes if v not in old_element.classes]:
                 status = 'Changed'
-            
             elif [v for v in old_element.classes if v not in new_element.classes]:
                 status = 'Changed'
-            
             elif methods:
                 status = 'Changed'
-            
+
         if status:
             self.add_element_on_diff(element=new_element, status=status, methods=methods)
 
@@ -68,22 +58,27 @@ class TemplateDiff: # pragma: no cover
                 self.add_element_on_diff(element=old_element, status='Removed', methods=methods)
 
             self.__checked_elements.append(new_element.uuid)
-        
+
         new_element_childs_map = {child.uuid: child for child in new_element.childs}
         old_element_childs_map = {child.uuid: child for child in old_element.childs}
-        
+
         for uuid, old_child in old_element_childs_map.items():
             if uuid in new_element_childs_map:
                 if old_child.parent and old_child.parent.uuid not in self.__checked_elements:
                     self.track_differences(new_element_childs_map[uuid], old_child)
-            
             else:
-                self.add_element_on_diff(element=old_child, status='Removed', methods=methods)
+                # ✅ só marca Removed se o pai NÃO está já no diff como Changed
+                parent_uuid = old_child.parent.uuid if old_child.parent else None
+                if parent_uuid not in self.__differences or self.__differences[parent_uuid]['status'] != 'Changed':
+                    self.add_element_on_diff(element=old_child, status='Removed', methods=methods)
 
         for uuid, new_child in new_element_childs_map.items():
             if uuid not in old_element_childs_map:
-                self.add_element_on_diff(element=new_child, status='Added', methods=methods)
-    
+                # ✅ só marca Added se o pai NÃO está já no diff como Changed
+                parent_uuid = new_child.parent.uuid if new_child.parent else None
+                if parent_uuid not in self.__differences or self.__differences[parent_uuid]['status'] != 'Changed':
+                    self.add_element_on_diff(element=new_child, status='Added', methods=methods)
+
     def add_element_on_diff(self, element: Element, status: Literal['Added', 'Changed', 'Removed'], methods: dict[str, dict[str, Any]]):
         self.differences[element.uuid] = {
             'parent': element.parent.uuid if element.parent else None,
@@ -94,4 +89,4 @@ class TemplateDiff: # pragma: no cover
         if status != 'Removed':
             self.differences[element.uuid]['methods'] = {**methods}
 
-            element.remove_element_methods()
+            element.remove_element_methods()

{pyweber-1.2.0.dev20260428 → pyweber-1.2.0.dev20260430/pyweber.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyweber
-Version: 1.2.0.dev20260428
+Version: 1.2.0.dev20260430
 Summary: A lightweight Python framework for building and managing web applications.
 Author-email: DevPythonMZ <pypi.dev@gmail.com>
 License-Expression: MIT