Add a consistent rendering protocol.

This change provides a consistent API to render a htpy object as HTML or
iterate over it.

This commit introduces stream_chunks() which is identical with
__iter__() but with a better name.


With the introduction of Fragment, this commit makes render_node and
iter_node redundant and they will be deprecated in another commit.

More info: #86 (comment)

Author: pelme

htpy/__init__.py

@@ -131,10 +131,15 @@ class ContextProvider(t.Generic[T]):
     node: Node
 
     def __iter__(self) -> Iterator[str]:
-        return iter_node(self)
+        return _stream_chunks(self, {})
 
-    def __str__(self) -> str:
-        return render_node(self)
+    def __str__(self) -> _Markup:
+        return _as_markup(self)
+
+    __html__ = __str__
+
+    def stream_chunks(self) -> Iterator[str]:
+        return _stream_chunks(self, {})
 
 
 @dataclasses.dataclass(frozen=True)
@@ -143,6 +148,14 @@ class ContextConsumer(t.Generic[T]):
     debug_name: str
     func: Callable[[T], Node]
 
+    def __str__(self) -> _Markup:
+        return _as_markup(self)
+
+    __html__ = __str__
+
+    def stream_chunks(self) -> Iterator[str]:
+        return _stream_chunks(self, {})
+
 
 class _NO_DEFAULT:
     pass
@@ -168,10 +181,10 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> ContextConsumer[T]:
 
 
 def iter_node(x: Node) -> Iterator[str]:
-    return _iter_node_context(x, {})
+    return _stream_chunks(x, {})
 
 
-def _iter_node_context(x: Node, context_dict: dict[Context[t.Any], t.Any]) -> Iterator[str]:
+def _stream_chunks(x: Node, context_dict: dict[Context[t.Any], t.Any]) -> Iterator[str]:
     while not isinstance(x, BaseElement) and callable(x):
         x = x()
 
@@ -187,25 +200,26 @@ def _iter_node_context(x: Node, context_dict: dict[Context[t.Any], t.Any]) -> It
     if isinstance(x, BaseElement):
         yield from x._iter_context(context_dict)  # pyright: ignore [reportPrivateUsage]
     elif isinstance(x, ContextProvider):
-        yield from _iter_node_context(x.node, {**context_dict, x.context: x.value})  # pyright: ignore [reportUnknownMemberType]
+        yield from _stream_chunks(x.node, {**context_dict, x.context: x.value})  # pyright: ignore [reportUnknownMemberType]
     elif isinstance(x, ContextConsumer):
-        context_value = context_dict.get(x.context, x.context.default)
+        context_value = context_dict.get(x.context, x.context.default)  # pyright: ignore
+
         if context_value is _NO_DEFAULT:
             raise LookupError(
-                f'Context value for "{x.context.name}" does not exist, '
+                f'Context value for "{x.context.name}" does not exist, '  # pyright: ignore
                 f"requested by {x.debug_name}()."
             )
-        yield from _iter_node_context(x.func(context_value), context_dict)
+        yield from _stream_chunks(x.func(context_value), context_dict)  # pyright: ignore
     elif isinstance(x, Fragment):
         for node in x._nodes:  # pyright: ignore [reportPrivateUsage]
-            yield from _iter_node_context(node, context_dict)
+            yield from _stream_chunks(node, context_dict)
     elif isinstance(x, str | _HasHtml):
         yield str(_escape(x))
     elif isinstance(x, int):
         yield str(x)
     elif isinstance(x, Iterable) and not isinstance(x, _KnownInvalidChildren):  # pyright: ignore [reportUnnecessaryIsInstance]
         for child in x:
-            yield from _iter_node_context(child, context_dict)
+            yield from _stream_chunks(child, context_dict)
     else:
         raise TypeError(f"{x!r} is not a valid child element")
 
@@ -282,9 +296,12 @@ def __call__(self: BaseElementSelf, *args: t.Any, **kwargs: t.Any) -> BaseElemen
     def __iter__(self) -> Iterator[str]:
         return self._iter_context({})
 
+    def stream_chunks(self) -> Iterator[str]:
+        return self._iter_context({})
+
     def _iter_context(self, ctx: dict[Context[t.Any], t.Any]) -> Iterator[str]:
         yield f"<{self._name}{self._attrs}>"
-        yield from _iter_node_context(self._children, ctx)
+        yield from _stream_chunks(self._children, ctx)
         yield f"</{self._name}>"
 
     # Allow starlette Response.render to directly render this element without
@@ -361,16 +378,23 @@ def __init__(self, *nodes: Node) -> None:
         self._nodes = nodes
 
     def __iter__(self) -> Iterator[str]:
-        return iter_node(self)
+        return _stream_chunks(self, {})
 
-    def __str__(self) -> str:
-        return render_node(self)
+    def __str__(self) -> _Markup:
+        return _as_markup(self)
 
     __html__ = __str__
 
+    def stream_chunks(self) -> Iterator[str]:
+        return _stream_chunks(self, {})
+
+
+def _as_markup(renderable: Renderable) -> _Markup:
+    return _Markup("".join(_stream_chunks(renderable, {})))
+
 
 def render_node(node: Node) -> _Markup:
-    return _Markup("".join(iter_node(node)))
+    return _as_markup(Fragment(node))
 
 
 def comment(text: str) -> Fragment:
@@ -538,3 +562,9 @@ def __html__(self) -> str: ...
     | Callable
     | Iterable
 )
+
+
+class Renderable(t.Protocol):
+    def __str__(self) -> _Markup: ...
+    def __html__(self) -> _Markup: ...
+    def stream_chunks(self) -> Iterator[str]: ...

tests/conftest.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from htpy import Node, iter_node
+import htpy as h
 
 if t.TYPE_CHECKING:
     from collections.abc import Callable, Generator
@@ -17,7 +17,7 @@ class Trace:
 
 
 RenderResult: t.TypeAlias = list[str | Trace]
-RenderFixture: t.TypeAlias = t.Callable[[Node], RenderResult]
+RenderFixture: t.TypeAlias = t.Callable[[h.Renderable], RenderResult]
 TraceFixture: t.TypeAlias = t.Callable[[str], None]
 
 
@@ -52,14 +52,14 @@ def func(description: str) -> None:
 def render(render_result: RenderResult) -> Generator[RenderFixture, None, None]:
     called = False
 
-    def func(node: Node) -> RenderResult:
+    def func(renderable: h.Renderable) -> RenderResult:
         nonlocal called
 
         if called:
             raise AssertionError("render() must only be called once per test")
 
         called = True
-        for chunk in iter_node(node):
+        for chunk in renderable.stream_chunks():
             render_result.append(chunk)
 
         return render_result

tests/test_comment.py

@@ -22,7 +22,3 @@ def test_escape_three_dashes(render: RenderFixture) -> None:
 
 def test_escape_four_dashes(render: RenderFixture) -> None:
     assert render(div[comment("foo----bar")]) == ["<div>", "<!-- foobar -->", "</div>"]
-
-
-def test_str() -> None:
-    assert str(comment("foo")) == "<!-- foo -->"

tests/test_context.py

@@ -2,7 +2,6 @@
 
 import typing as t
 
-import markupsafe
 import pytest
 
 from htpy import Context, Fragment, Node, div
@@ -34,19 +33,6 @@ def test_context_provider(render: RenderFixture) -> None:
     assert render(result) == ["<div>", "Hello: c!", "</div>"]
 
 
-class Test_provider_outer_api:
-    """Ensure provider implements __iter__/__str__"""
-
-    def test_iter(self) -> None:
-        result = letter_ctx.provider("c", div[display_letter("Hello")])
-        assert list(result) == ["<div>", "Hello: c!", "</div>"]
-
-    def test_str(self) -> None:
-        result = str(letter_ctx.provider("c", div[display_letter("Hello")]))
-        assert result == "<div>Hello: c!</div>"
-        assert isinstance(result, markupsafe.Markup)
-
-
 def test_no_default(render: RenderFixture) -> None:
     with pytest.raises(
         LookupError,

tests/test_element.py

@@ -26,13 +26,6 @@ def test_void_element_repr() -> None:
     assert repr(htpy.hr("#a")) == """<VoidElement '<hr id="a">'>"""
 
 
-def test_markup_str() -> None:
-    result = str(div(id="a"))
-    assert isinstance(result, str)
-    assert isinstance(result, markupsafe.Markup)
-    assert result == '<div id="a"></div>'
-
-
 def test_element_type() -> None:
     assert_type(div, Element)
     assert isinstance(div, Element)
@@ -44,13 +37,6 @@ def test_element_type() -> None:
     assert isinstance(div()["a"], Element)
 
 
-def test_html_protocol() -> None:
-    element = div["test"]
-    result = element.__html__()
-    assert result == "<div>test</div>"
-    assert isinstance(result, markupsafe.Markup)
-
-
 def test_markupsafe_escape() -> None:
     result = markupsafe.escape(div["test"])
     assert result == "<div>test</div>"

tests/test_nodes.py

@@ -0,0 +1,57 @@
+from dataclasses import dataclass
+
+import markupsafe
+import pytest
+
+import htpy as h
+
+example_ctx: h.Context[str] = h.Context("example_ctx", default="default!")
+
+
+@example_ctx.consumer
+def example_consumer(value: str) -> str:
+    return value
+
+
+@dataclass(frozen=True)
+class RenderableTestCase:
+    renderable: h.Renderable
+    expected_str: str
+    expected_chunks: list[str]
+
+
+cases = [
+    RenderableTestCase(h.a, "<a></a>", ["<a>", "</a>"]),
+    RenderableTestCase(h.img, "<img>", ["<img>"]),
+    RenderableTestCase(example_ctx.provider("hi!", "stuff!"), "stuff!", ["stuff!"]),
+    RenderableTestCase(example_consumer(), "default!", ["default!"]),
+    RenderableTestCase(h.Fragment("fragment!"), "fragment!", ["fragment!"]),
+    # comment() is a Fragment but test it anyways for completeness
+    RenderableTestCase(h.comment("comment!"), "<!-- comment! -->", ["<!-- comment! -->"]),
+]
+
+
+@pytest.mark.parametrize("case", cases)
+def test_str(case: RenderableTestCase) -> None:
+    result = str(case.renderable)
+    assert isinstance(result, str)
+    assert isinstance(result, markupsafe.Markup)
+    assert result == case.expected_str
+
+
+@pytest.mark.parametrize("case", cases)
+def test_html(case: RenderableTestCase) -> None:
+    result = case.renderable.__html__()
+    assert isinstance(result, str)
+    assert isinstance(result, markupsafe.Markup)
+    assert result == case.expected_str
+
+
+@pytest.mark.parametrize("case", cases)
+def test_stream_chunks(case: RenderableTestCase) -> None:
+    result = list(case.renderable.stream_chunks())
+
+    # Ensure we get str back, not markup.
+    assert type(result[0]) is str
+
+    assert result == case.expected_chunks