mkdocs2confluence 0.9.7__tar.gz → 0.9.9__tar.gz

{mkdocs2confluence-0.9.7 → mkdocs2confluence-0.9.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.9.7
+Version: 0.9.9
 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
@@ -393,6 +393,7 @@ confluence:
 | Content tabs `=== "Label"` | `expand` macros (one per tab) |
 | Details blocks `??? "title"` | `expand` macro |
 | Footnotes `[^1]` | Superscript anchor links + *Footnotes* section at page bottom |
+| In-page anchors `<a id="...">` / `<a name="...">` | Confluence `anchor` macro; same-page links `[text](#target)` resolve correctly |
 | Mermaid diagrams | PNG via Kroki, uploaded as attachment (`<ac:image ac:align="center">`) |
 | Internal links `[text](page.md)` | Native Confluence page link; `#fragment` anchors preserved |
 | `awesome-pages` nav (`.pages` files) | Fully supported |

{mkdocs2confluence-0.9.7 → mkdocs2confluence-0.9.9}/README.md

@@ -353,6 +353,7 @@ confluence:
 | Content tabs `=== "Label"` | `expand` macros (one per tab) |
 | Details blocks `??? "title"` | `expand` macro |
 | Footnotes `[^1]` | Superscript anchor links + *Footnotes* section at page bottom |
+| In-page anchors `<a id="...">` / `<a name="...">` | Confluence `anchor` macro; same-page links `[text](#target)` resolve correctly |
 | Mermaid diagrams | PNG via Kroki, uploaded as attachment (`<ac:image ac:align="center">`) |
 | Internal links `[text](page.md)` | Native Confluence page link; `#fragment` anchors preserved |
 | `awesome-pages` nav (`.pages` files) | Fully supported |

{mkdocs2confluence-0.9.7 → mkdocs2confluence-0.9.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mkdocs2confluence"
-version = "0.9.7"
+version = "0.9.9"
 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.9.7 → mkdocs2confluence-0.9.9}/src/mkdocs2confluence.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.9.7
+Version: 0.9.9
 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
@@ -393,6 +393,7 @@ confluence:
 | Content tabs `=== "Label"` | `expand` macros (one per tab) |
 | Details blocks `??? "title"` | `expand` macro |
 | Footnotes `[^1]` | Superscript anchor links + *Footnotes* section at page bottom |
+| In-page anchors `<a id="...">` / `<a name="...">` | Confluence `anchor` macro; same-page links `[text](#target)` resolve correctly |
 | Mermaid diagrams | PNG via Kroki, uploaded as attachment (`<ac:image ac:align="center">`) |
 | Internal links `[text](page.md)` | Native Confluence page link; `#fragment` anchors preserved |
 | `awesome-pages` nav (`.pages` files) | Fully supported |

{mkdocs2confluence-0.9.7 → mkdocs2confluence-0.9.9}/src/mkdocs_to_confluence/emitter/xhtml.py

@@ -24,6 +24,7 @@ from mkdocs_to_confluence.ir.nodes import (
     AbbrevFootnoteNode,
     AbbrevGlossaryBlock,
     Admonition,
+    AnchorNode,
     BlockQuote,
     BoldNode,
     BulletList,
@@ -685,6 +686,13 @@ def _emit_inline(node: IRNode) -> str:
         return f"{open_tag}{_emit_inlines(node.children)}{close_tag}"
     if isinstance(node, RawInlineHtml):
         return node.html_str
+    if isinstance(node, AnchorNode):
+        name = html.escape(node.name)
+        return (
+            f'<ac:structured-macro ac:name="anchor">'
+            f"<ac:parameter ac:name=\"\"><![CDATA[{name}]]></ac:parameter>"
+            f"</ac:structured-macro>"
+        )
     # Fallback: emit unknown inline nodes as escaped repr
     return html.escape(repr(node))
 

{mkdocs2confluence-0.9.7 → mkdocs2confluence-0.9.9}/src/mkdocs_to_confluence/ir/__init__.py

@@ -13,6 +13,8 @@ from mkdocs_to_confluence.ir.document import Document, PageMeta, compute_sha
 from mkdocs_to_confluence.ir.nodes import (
     # Material extension nodes
     Admonition,
+    # Inline HTML nodes
+    AnchorNode,
     BlockQuote,
     BoldNode,
     # List nodes
@@ -31,7 +33,6 @@ from mkdocs_to_confluence.ir.nodes import (
     GridCards,
     HorizontalRule,
     ImageNode,
-    # Inline HTML nodes
     InlineHtmlNode,
     InsertNode,
     # Traversal utility
@@ -83,6 +84,7 @@ __all__ = [
     "LineBreakNode",
     "InlineHtmlNode",
     "RawInlineHtml",
+    "AnchorNode",
     "InsertNode",
     # Block
     "Section",

{mkdocs2confluence-0.9.7 → mkdocs2confluence-0.9.9}/src/mkdocs_to_confluence/ir/nodes.py

@@ -137,6 +137,17 @@ class RawInlineHtml(IRNode):
     html_str: str
 
 
+@dataclass(frozen=True)
+class AnchorNode(IRNode):
+    """An in-page anchor target (``<a id="...">`` or ``<a name="...">``) in Markdown.
+
+    Emitted as a Confluence ``anchor`` macro so that same-page links
+    (e.g. ``[text](#target)``) resolve correctly in Confluence.
+    """
+
+    name: str
+
+
 @dataclass(frozen=True)
 class ImageNode(IRNode):
     """An image reference.

{mkdocs2confluence-0.9.7 → mkdocs2confluence-0.9.9}/src/mkdocs_to_confluence/parser/markdown.py

@@ -56,6 +56,7 @@ from typing import Union
 
 from mkdocs_to_confluence.ir.nodes import (
     Admonition,
+    AnchorNode,
     BlockQuote,
     BoldNode,
     BulletList,
@@ -981,6 +982,18 @@ def _scan_inline(text: str, fn_map: dict[str, int] | None = None) -> list[IRNode
                     i = close_idx + len(close)
                     continue
 
+            # Anchor target: <a id="..."> / <a name="..."> (all forms)
+            anchor_m = re.match(
+                r'<a\s+(?:id|name)="([^"]+)"[^>]*/?>(?:\s*</a>)?',
+                text[i:],
+                re.IGNORECASE,
+            )
+            if anchor_m:
+                flush()
+                nodes.append(AnchorNode(name=anchor_m.group(1)))
+                i += len(anchor_m.group(0))
+                continue
+
             # Generic inline HTML with attributes (e.g. <span class="...">) — pass through verbatim
             generic_m = re.match(
                 r"<([a-z][a-z0-9]*)\b[^>]*>.*?</\1>", text[i:], re.DOTALL | re.IGNORECASE

{mkdocs2confluence-0.9.7 → mkdocs2confluence-0.9.9}/tests/test_parser.py

@@ -1343,3 +1343,41 @@ class TestGridCards:
         nodes = parse(md)
         gc = next(n for n in nodes if isinstance(n, GridCards))
         assert len(gc.items) == 3
+
+
+class TestAnchorNode:
+    def test_anchor_id_parsed(self) -> None:
+        from mkdocs_to_confluence.ir import AnchorNode
+        para = first(parse('Some text <a id="my-anchor"></a> more\n'), Paragraph)
+        assert any(isinstance(n, AnchorNode) and n.name == "my-anchor" for n in para.children)
+
+    def test_anchor_name_parsed(self) -> None:
+        from mkdocs_to_confluence.ir import AnchorNode
+        para = first(parse('Some text <a name="my-anchor"></a> more\n'), Paragraph)
+        assert any(isinstance(n, AnchorNode) and n.name == "my-anchor" for n in para.children)
+
+    def test_anchor_self_closing_parsed(self) -> None:
+        from mkdocs_to_confluence.ir import AnchorNode
+        para = first(parse('Before <a id="target"/> after\n'), Paragraph)
+        assert any(isinstance(n, AnchorNode) and n.name == "target" for n in para.children)
+
+    def test_anchor_open_only_parsed(self) -> None:
+        from mkdocs_to_confluence.ir import AnchorNode
+        para = first(parse('Before <a id="target"> after\n'), Paragraph)
+        assert any(isinstance(n, AnchorNode) and n.name == "target" for n in para.children)
+
+    def test_anchor_emitted_as_confluence_macro(self) -> None:
+        from mkdocs_to_confluence.emitter.xhtml import emit
+        nodes = parse('Go to <a id="section-1"></a> here\n')
+        xhtml = emit(nodes)
+        assert 'ac:structured-macro ac:name="anchor"' in xhtml
+        assert "section-1" in xhtml
+
+    def test_anchor_link_and_target_roundtrip(self) -> None:
+        """[Text](#target) link + <a id="target"> definition renders correctly."""
+        from mkdocs_to_confluence.emitter.xhtml import emit
+        nodes = parse('[Jump](#section-1)\n\n<a id="section-1"></a>\n')
+        xhtml = emit(nodes)
+        assert 'href="#section-1"' in xhtml
+        assert 'ac:structured-macro ac:name="anchor"' in xhtml
+        assert "section-1" in xhtml

{mkdocs2confluence-0.9.7 → mkdocs2confluence-0.9.9}/tests/test_publish_client.py

@@ -728,6 +728,37 @@ def test_find_folder_under_returns_none_when_not_found() -> None:
     assert result is None
 
 
+# ── resolve_inline_comment ─────────────────────────────────────────────────────
+
+
+def test_resolve_inline_comment_sends_get_then_put() -> None:
+    """resolve_inline_comment GETs the current comment, then PUTs with resolved=True and a version bump."""
+    existing = {
+        "id": "42",
+        "version": {"number": 3},
+        "body": {"storage": {"value": "<p>Original body</p>"}},
+        "resolved": False,
+    }
+    transport = _MockTransport(
+        _json_response(existing),  # GET → current state
+        _json_response({}),        # PUT → resolved
+    )
+    config = _make_config()
+    with ConfluenceClient(config) as client:
+        client._client = httpx.Client(transport=transport)  # type: ignore[assignment]
+        client.resolve_inline_comment("42")
+    assert len(transport.requests) == 2
+    get_req = transport.requests[0]
+    assert get_req.method == "GET"
+    assert "/inline-comments/42" in str(get_req.url)
+    put_req = transport.requests[1]
+    assert put_req.method == "PUT"
+    body = json.loads(put_req.content)
+    assert body["version"]["number"] == 4
+    assert body["resolved"] is True
+    assert body["body"]["value"] == "<p>Original body</p>"
+
+
 # ── find_folder_in_space ──────────────────────────────────────────────────────
 
 
@@ -786,3 +817,141 @@ def test_create_folder_returns_existing_on_400_duplicate() -> None:
         client._client = httpx.Client(transport=transport)  # type: ignore[assignment]
         result = client.create_folder("42", "MySection")
     assert result["id"] == "77"
+
+
+def test_create_folder_with_parent_id() -> None:
+    """create_folder sends parentId in the payload when provided."""
+    payload = {"id": "99", "title": "Sub", "spaceId": "42"}
+    transport = _MockTransport(_json_response(payload))
+    config = _make_config()
+    with ConfluenceClient(config) as client:
+        client._client = httpx.Client(transport=transport)  # type: ignore[assignment]
+        result = client.create_folder("42", "Sub", parent_id="77")
+    assert result["id"] == "99"
+    body = json.loads(transport.requests[0].content)
+    assert body["parentId"] == "77"
+
+
+# ── get_page_inline_comments ───────────────────────────────────────────────────
+
+
+def test_get_page_inline_comments_returns_comments() -> None:
+    payload = {
+        "results": [
+            {"id": "c1", "body": {"storage": {"value": "<p>Nice</p>"}}},
+            {"id": "c2", "body": {"storage": {"value": "<p>Fix this</p>"}}},
+        ],
+        "_links": {},
+    }
+    transport = _MockTransport(_json_response(payload))
+    config = _make_config()
+    with ConfluenceClient(config) as client:
+        client._client = httpx.Client(transport=transport)  # type: ignore[assignment]
+        comments = client.get_page_inline_comments("42")
+    assert len(comments) == 2
+    assert comments[0]["id"] == "c1"
+    assert comments[1]["id"] == "c2"
+    req = transport.requests[0]
+    assert "/pages/42/inline-comments" in str(req.url)
+    assert "resolution-status=open" in str(req.url)
+
+
+def test_get_page_inline_comments_paginates() -> None:
+    page1 = {
+        "results": [{"id": "c1"}],
+        "_links": {"next": "/wiki/api/v2/pages/42/inline-comments?cursor=abc"},
+    }
+    page2 = {
+        "results": [{"id": "c2"}],
+        "_links": {},
+    }
+    transport = _MockTransport(_json_response(page1), _json_response(page2))
+    config = _make_config()
+    with ConfluenceClient(config) as client:
+        client._client = httpx.Client(transport=transport)  # type: ignore[assignment]
+        comments = client.get_page_inline_comments("42")
+    assert len(comments) == 2
+    assert len(transport.requests) == 2
+
+
+# ── get_page_footer_comments ───────────────────────────────────────────────────
+
+
+def test_get_page_footer_comments_returns_comments() -> None:
+    payload = {
+        "results": [{"id": "f1", "body": {"storage": {"value": "<p>Footer note</p>"}}}],
+        "_links": {},
+    }
+    transport = _MockTransport(_json_response(payload))
+    config = _make_config()
+    with ConfluenceClient(config) as client:
+        client._client = httpx.Client(transport=transport)  # type: ignore[assignment]
+        comments = client.get_page_footer_comments("42")
+    assert len(comments) == 1
+    assert comments[0]["id"] == "f1"
+    req = transport.requests[0]
+    assert "/pages/42/footer-comments" in str(req.url)
+
+
+def test_get_page_footer_comments_paginates() -> None:
+    page1 = {
+        "results": [{"id": "f1"}],
+        "_links": {"next": "/wiki/api/v2/pages/42/footer-comments?cursor=xyz"},
+    }
+    page2 = {
+        "results": [{"id": "f2"}],
+        "_links": {},
+    }
+    transport = _MockTransport(_json_response(page1), _json_response(page2))
+    config = _make_config()
+    with ConfluenceClient(config) as client:
+        client._client = httpx.Client(transport=transport)  # type: ignore[assignment]
+        comments = client.get_page_footer_comments("42")
+    assert len(comments) == 2
+    assert len(transport.requests) == 2
+
+
+# ── add_comment_reply ──────────────────────────────────────────────────────────
+
+
+def test_add_comment_reply_posts_reply() -> None:
+    transport = _MockTransport(_json_response({"id": "reply-1"}))
+    config = _make_config()
+    with ConfluenceClient(config) as client:
+        client._client = httpx.Client(transport=transport)  # type: ignore[assignment]
+        client.add_comment_reply("42", "Thanks, fixed!")
+    req = transport.requests[0]
+    assert req.method == "POST"
+    assert "/content/42/child/comment" in str(req.url)
+    body = json.loads(req.content)
+    assert body["type"] == "comment"
+    assert "<p>Thanks, fixed!</p>" in body["body"]["storage"]["value"]
+
+
+# ── resolve_footer_comment ─────────────────────────────────────────────────────
+
+
+def test_resolve_footer_comment_sends_get_then_put() -> None:
+    existing = {
+        "id": "99",
+        "version": {"number": 2},
+        "body": {"storage": {"value": "<p>Old footer</p>"}},
+        "resolved": False,
+    }
+    transport = _MockTransport(
+        _json_response(existing),  # GET
+        _json_response({}),        # PUT
+    )
+    config = _make_config()
+    with ConfluenceClient(config) as client:
+        client._client = httpx.Client(transport=transport)  # type: ignore[assignment]
+        client.resolve_footer_comment("99")
+    assert len(transport.requests) == 2
+    get_req = transport.requests[0]
+    assert "/footer-comments/99" in str(get_req.url)
+    put_req = transport.requests[1]
+    assert put_req.method == "PUT"
+    body = json.loads(put_req.content)
+    assert body["version"]["number"] == 3
+    assert body["resolved"] is True
+    assert body["body"]["value"] == "<p>Old footer</p>"