Merge pull request #7 from feldroy/fix-render-in-newer-air

Fix child rendering for Air 0.45+

Author: audreyfeldroy

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
       matrix:
         # Test all supported Python versions under Ubuntu
         os: [ubuntu-latest]
-        python-version: ['3.12', '3.13']
+        python-version: ['3.13']
 
     runs-on: ${{ matrix.os }}
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "air-markdown"
-version = "0.4.0"
+version = "0.5.0"
 description = "Air Tags + Markdown"
 readme = "README.md"
 authors = [
@@ -26,17 +26,14 @@ classifiers = [
     "Framework :: FastAPI",
     "Intended Audience :: Developers",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
 ]
 license = {text = "MIT"}
 dependencies = [
-  "air>=0.15.0",
+  "air>=0.45.0",
   "mistletoe>=1.4.0",
 ]
-requires-python = ">= 3.10"
+requires-python = ">= 3.13"
 
 [project.optional-dependencies]
 dev = ["rust-just"]

src/air_markdown/tags.py

@@ -5,6 +5,7 @@
 
 import air
 import mistletoe
+from air.tags import BaseTag
 from mistletoe import block_token
 from mistletoe.html_renderer import HtmlRenderer
 
@@ -59,8 +60,12 @@ def wrapper(self):
         """
         return content
 
-    def render(self) -> str:
-        """Render the string with the Markdown library."""
+    def _render(self) -> str:
+        """Render the string with the Markdown library.
+
+        Note: We override _render() rather than render() because Air 0.25+
+        renders child tags via __str__ -> html property -> _render().
+        """
         content = self._children[0] if self._children else ""
         return self.wrapper(mistletoe.markdown(content, self.html_renderer))
 
@@ -100,7 +105,7 @@ def render_block_code(self, token: block_token.BlockCode) -> str:
                         expr_obj = compile(ast.Expression(body=node.value), "<string>", "eval")
                         # Ensure local_scope is passed to eval
                         result = eval(expr_obj, globals(), local_scope)
-                        if isinstance(result, air.Tag):
+                        if isinstance(result, BaseTag):
                             rendered_parts.append(result.render())
                     else:
                         # Execute other statements (imports, assignments, etc.)

tests/test_air_markdown.py

@@ -1,5 +1,6 @@
 """Tests for `air_markdown` package."""
 
+import air
 import mistletoe
 
 from air_markdown import Markdown, TailwindTypographyMarkdown
@@ -53,9 +54,12 @@ def render_strong(self, token: mistletoe.span_token.Strong) -> str:  # type: ign
 
 
 def test_custom_wrapper_dynamic_assignment():
-    Markdown.wrapper = lambda self, x: f"<section>{x}</section>"  # type: ignore
-
-    assert Markdown("# Big").render() == "<section><h1>Big</h1>\n</section>"
+    original_wrapper = Markdown.wrapper
+    try:
+        Markdown.wrapper = lambda self, x: f"<section>{x}</section>"  # type: ignore
+        assert Markdown("# Big").render() == "<section><h1>Big</h1>\n</section>"
+    finally:
+        Markdown.wrapper = original_wrapper
 
 
 def test_TailwindTypographyMarkdown():
@@ -184,3 +188,25 @@ def test_air_markdown_airtag_multiple_tags_with_logic():
         '<article class="prose"><h1>Multiple Tags with Logic</h1>\n<h1>My Title</h1>\n<p>Some content.</p>\n</article>'
     )
     assert html == expected_html
+
+
+def test_markdown_as_child_of_div():
+    """Test that Markdown renders correctly when used as a child of another tag.
+
+    This tests the fix for Air 0.25+ where child tags are rendered via
+    __str__ -> html property -> _render() rather than render().
+    """
+    div = air.Div(Markdown("# Hello"))
+    html = div.render()
+    assert html == "<div><h1>Hello</h1>\n</div>"
+
+
+def test_markdown_nested_in_layout():
+    """Test Markdown inside a more complex tag structure."""
+    layout = air.Main(
+        air.Header(air.H1("Site Title")),
+        air.Article(Markdown("## Article\n\nSome content.")),
+    )
+    html = layout.render()
+    assert "<h2>Article</h2>" in html
+    assert "<p>Some content.</p>" in html