Define pandoc InlineContent type to be recursive

InlineContent is already processed recursively, this
change makes the type definition recursive too.

And it also defines a clearer relationship between InlineContent
and BlockContent.

Author: has2k1

quartodoc/pandoc/blocks.py

@@ -20,6 +20,7 @@
 from quartodoc.pandoc.inlines import (
     Inline,
     InlineContent,
+    InlineContentItem,
     inlinecontent_to_str,
     str_as_list_item,
 )
@@ -79,8 +80,8 @@ def as_list_item(self):
 
 # TypeAlias declared here to avoid forward-references which
 # break beartype
-ContentItem: TypeAlias = Union[str, Inline, Block]
-BlockContent: TypeAlias = Union[ContentItem, Sequence[ContentItem]]
+BlockContentItem: TypeAlias = Union[InlineContentItem, Block]
+BlockContent: TypeAlias = Union[BlockContentItem, Sequence[BlockContentItem]]
 DefinitionItem: TypeAlias = tuple[InlineContent, BlockContent]
 
 

quartodoc/pandoc/inlines.py

@@ -65,7 +65,8 @@ def as_list_item(self):
 
 # TypeAlias declared here to avoid forward-references which
 # break beartype
-InlineContent: TypeAlias = Union[str, Inline, Union[Sequence[str], Inline]]
+InlineContentItem = Union[str, Inline]
+InlineContent: TypeAlias = Union[InlineContentItem, Sequence[InlineContentItem]]
 
 
 @dataclass

quartodoc/tests/pandoc/test_inlines.py

@@ -87,6 +87,9 @@ def test_span():
     s = Span("a", Attr("span-id", classes=["c1", "c2"], attributes={"data-value": "1"}))
     assert str(s) == '[a]{#span-id .c1 .c2 data-value="1"}'
 
+    s = Span([Span("a"), Span("b"), "c"])
+    assert str(s) == "[[a]{} [b]{} c]{}"
+
 
 def test_str():
     s = Str("a")