htmy 0.3.3__tar.gz → 0.3.5__tar.gz

{htmy-0.3.3 → htmy-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: htmy
-Version: 0.3.3
+Version: 0.3.5
 Summary: Async, pure-Python rendering engine.
 License: MIT
 Author: Peter Volf
@@ -295,6 +295,12 @@ If a component executes a potentially "long-running" synchronous call, it is str
 
 In all other cases, it's best to use sync components.
 
+## Framework integrations
+
+FastAPI:
+
+- [FastHX](https://github.com/volfpeter/fasthx)
+
 ## Why
 
 At one end of the spectrum, there are the complete application frameworks that combine the server (Python) and client (JavaScript) applications with the entire state management and synchronization into a single Python (an in some cases an additional JavaScript) package. Some of the most popular examples are: [Reflex](https://github.com/reflex-dev/reflex), [NiceGUI](https://github.com/zauberzeug/nicegui/), [ReactPy](https://github.com/reactive-python/reactpy), and [FastUI](https://github.com/pydantic/FastUI).

{htmy-0.3.3 → htmy-0.3.5}/README.md

@@ -276,6 +276,12 @@ If a component executes a potentially "long-running" synchronous call, it is str
 
 In all other cases, it's best to use sync components.
 
+## Framework integrations
+
+FastAPI:
+
+- [FastHX](https://github.com/volfpeter/fasthx)
+
 ## Why
 
 At one end of the spectrum, there are the complete application frameworks that combine the server (Python) and client (JavaScript) applications with the entire state management and synchronization into a single Python (an in some cases an additional JavaScript) package. Some of the most popular examples are: [Reflex](https://github.com/reflex-dev/reflex), [NiceGUI](https://github.com/zauberzeug/nicegui/), [ReactPy](https://github.com/reactive-python/reactpy), and [FastUI](https://github.com/pydantic/FastUI).

{htmy-0.3.3 → htmy-0.3.5}/htmy/core.py

@@ -7,6 +7,7 @@ from collections.abc import Callable, Container
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, ClassVar, Generic, TypedDict, cast, overload
 from xml.sax.saxutils import escape as xml_escape
+from xml.sax.saxutils import quoteattr as xml_quoteattr
 
 from .io import open_file
 from .typing import (
@@ -429,7 +430,7 @@ class Formatter(ContextAware):
         See `SkipProperty` for more information.
         """
         try:
-            return f'{self.format_name(name)}="{self.format_value(value)}"'
+            return f"{self.format_name(name)}={xml_quoteattr(self.format_value(value))}"
         except SkipProperty:
             return ""
 

{htmy-0.3.3 → htmy-0.3.5}/htmy/renderer.py

@@ -5,7 +5,7 @@ from collections import ChainMap
 from collections.abc import Awaitable, Callable, Iterable
 
 from .core import ErrorBoundary, xml_format_string
-from .typing import Component, ComponentType, Context, ContextProvider, HTMYComponentType
+from .typing import Component, ComponentType, Context
 
 
 class HTMY:
@@ -82,15 +82,19 @@ class HTMY:
         Returns:
             The rendered string.
         """
-        child_context = context
-        if isinstance(component, ContextProvider):
-            extra_context = component.htmy_context()
-            if isinstance(extra_context, Awaitable):
-                extra_context = await extra_context
+        if isinstance(component, str):
+            return self._string_formatter(component)
+        else:
+            child_context: Context = context
+            if hasattr(component, "htmy_context"):  # isinstance() is too expensive.
+                extra_context: Context | Awaitable[Context] = component.htmy_context()
+                if isinstance(extra_context, Awaitable):
+                    extra_context = await extra_context
 
-            child_context = ChainMap(extra_context, context)
+                if len(extra_context):
+                    # Context must not be mutated, so we can ignore that ChainMap expext mutable mappings.
+                    child_context = ChainMap(extra_context, context)  # type: ignore[arg-type]
 
-        if isinstance(component, HTMYComponentType):
             try:
                 children = component.htmy(child_context)
                 if isinstance(children, Awaitable):
@@ -102,7 +106,3 @@ class HTMY:
                     return await self._render_one(component.fallback_component(e), context)
 
                 raise e
-        elif isinstance(component, str):
-            return self._string_formatter(component)
-        else:
-            raise TypeError("Unknown component type.")

{htmy-0.3.3 → htmy-0.3.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "htmy"
-version = "0.3.3"
+version = "0.3.5"
 description = "Async, pure-Python rendering engine."
 authors = ["Peter Volf <do.volfp@gmail.com>"]
 license = "MIT"