mkdocs2confluence 0.7.12__tar.gz → 0.7.13__tar.gz

{mkdocs2confluence-0.7.12/src/mkdocs2confluence.egg-info → mkdocs2confluence-0.7.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.7.12
+Version: 0.7.13
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later

{mkdocs2confluence-0.7.12 → mkdocs2confluence-0.7.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mkdocs2confluence"
-version = "0.7.12"
+version = "0.7.13"
 description = "Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }

{mkdocs2confluence-0.7.12 → mkdocs2confluence-0.7.13/src/mkdocs2confluence.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.7.12
+Version: 0.7.13
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later

{mkdocs2confluence-0.7.12 → mkdocs2confluence-0.7.13}/src/mkdocs_to_confluence/transforms/abbrevs.py

@@ -35,6 +35,7 @@ from mkdocs_to_confluence.ir.nodes import (
     BlockQuote,
     BoldNode,
     BulletList,
+    CodeBlock,
     ContentTabs,
     Expandable,
     IRNode,
@@ -52,6 +53,12 @@ from mkdocs_to_confluence.ir.nodes import (
     TextNode,
 )
 
+# Block node types that can appear as direct children of a ListItem in a loose list.
+_BLOCK_TYPES = (
+    Section, Paragraph, CodeBlock, Admonition,
+    BulletList, OrderedList, Table, BlockQuote, ContentTabs, Expandable,
+)
+
 # ── Internal state ────────────────────────────────────────────────────────────
 
 
@@ -148,7 +155,12 @@ def _transform_block(node: IRNode, state: _State) -> IRNode:
 
 
 def _transform_list_item(item: ListItem, state: _State) -> ListItem:
-    new_children = tuple(_transform_block(c, state) for c in item.children)
+    if any(isinstance(c, _BLOCK_TYPES) for c in item.children):
+        # Loose item: children are block nodes (paragraphs, nested lists, etc.)
+        new_children = tuple(_transform_block(c, state) for c in item.children)
+    else:
+        # Tight item: children are inline nodes — expand directly.
+        new_children = _inline(item.children, state, safe=True)
     return replace(item, children=new_children)
 
 

{mkdocs2confluence-0.7.12 → mkdocs2confluence-0.7.13}/tests/test_abbrevs.py

@@ -234,3 +234,23 @@ def test_extras_sorted_alphabetically():
     assert isinstance(glossary, AbbrevGlossaryBlock)
     extra_abbrs = [abbr for abbr, _ in glossary.extras]
     assert extra_abbrs == sorted(extra_abbrs)
+
+
+def test_expands_in_tight_list_item():
+    from mkdocs_to_confluence.ir.nodes import BulletList, ListItem
+    abbrevs = {"API": "Application Programming Interface"}
+    item = ListItem(children=(TextNode("Use the API here."),))
+    nodes = (BulletList(items=(item,)),)
+    result = apply_abbreviations(nodes, abbrevs, page_text="Use the API here.")
+    item_children = result[0].items[0].children  # type: ignore[union-attr]
+    assert any(isinstance(c, AbbrevFootnoteNode) and c.abbr == "API" for c in item_children)
+
+
+def test_expands_in_loose_list_item():
+    from mkdocs_to_confluence.ir.nodes import BulletList, ListItem
+    abbrevs = {"API": "Application Programming Interface"}
+    item = ListItem(children=(Paragraph(children=(TextNode("Use the API here."),)),))
+    nodes = (BulletList(items=(item,)),)
+    result = apply_abbreviations(nodes, abbrevs, page_text="Use the API here.")
+    para_children = result[0].items[0].children[0].children  # type: ignore[union-attr]
+    assert any(isinstance(c, AbbrevFootnoteNode) and c.abbr == "API" for c in para_children)