mkdocs2confluence 0.9.6__tar.gz → 0.9.8__tar.gz

{mkdocs2confluence-0.9.6 → mkdocs2confluence-0.9.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.9.6
+Version: 0.9.8
 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.6 → mkdocs2confluence-0.9.8}/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.6 → mkdocs2confluence-0.9.8}/pyproject.toml

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.9.6
+Version: 0.9.8
 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.6 → mkdocs2confluence-0.9.8}/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.6 → mkdocs2confluence-0.9.8}/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.6 → mkdocs2confluence-0.9.8}/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.6 → mkdocs2confluence-0.9.8}/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.6 → mkdocs2confluence-0.9.8}/src/mkdocs_to_confluence/transforms/mermaid.py

@@ -135,11 +135,13 @@ def _render_one(source: str, kroki_url: str, *, quiet: bool = False) -> Path | N
                 continue  # retry
             _warn(f"mermaid diagram: Kroki returned HTTP {exc.code} {exc.reason} — falling back to code block")
             return None
-        except urllib.error.URLError as exc:
+        except (urllib.error.URLError, OSError) as exc:
+            # URLError covers connection errors; OSError covers read-phase timeouts
+            # (socket.timeout is OSError but not URLError when raised by resp.read()).
             last_exc = exc
-            kroki_unavailable = True  # timeout or connection refused — kroki unreachable
+            kroki_unavailable = True
             continue  # retry — network blip
-        except (OSError, ValueError) as exc:
+        except ValueError as exc:
             _warn(f"mermaid diagram: {exc} — falling back to code block")
             return None
 

{mkdocs2confluence-0.9.6 → mkdocs2confluence-0.9.8}/tests/test_mermaid.py

@@ -398,7 +398,7 @@ def test_render_one_504_on_public_kroki_falls_back_to_mermaid_ink(tmp_path, caps
 
 
 def test_render_one_timeout_on_public_kroki_falls_back_to_mermaid_ink(tmp_path):
-    """Public kroki.io timeout → automatic fallback to mermaid.ink."""
+    """Public kroki.io URLError timeout → automatic fallback to mermaid.ink."""
     import urllib.error
 
     from mkdocs_to_confluence.transforms.mermaid import _render_one
@@ -416,6 +416,25 @@ def test_render_one_timeout_on_public_kroki_falls_back_to_mermaid_ink(tmp_path):
     mock_ink.assert_called_once_with(_SAMPLE_SOURCE)
 
 
+def test_render_one_read_phase_timeout_falls_back_to_mermaid_ink(tmp_path):
+    """socket.timeout during resp.read() (OSError, not URLError) → fallback to mermaid.ink."""
+    import socket
+
+    from mkdocs_to_confluence.transforms.mermaid import _render_one
+
+    with patch("mkdocs_to_confluence.transforms.mermaid._CACHE_DIR", tmp_path), \
+         patch("mkdocs_to_confluence.transforms.mermaid.time.sleep"), \
+         patch("mkdocs_to_confluence.transforms.mermaid._kroki_png",
+               side_effect=socket.timeout("The read operation timed out")), \
+         patch("mkdocs_to_confluence.transforms.mermaid._mermaid_ink_png",
+               return_value=_FAKE_PNG) as mock_ink:
+        result = _render_one(_SAMPLE_SOURCE, "https://kroki.io")
+
+    assert result is not None
+    assert result.exists()
+    mock_ink.assert_called_once_with(_SAMPLE_SOURCE)
+
+
 def test_render_one_504_on_self_hosted_kroki_does_not_fall_back(tmp_path):
     """Self-hosted Kroki 504 → no mermaid.ink fallback (privacy isolation)."""
     import urllib.error
@@ -435,7 +454,7 @@ def test_render_one_504_on_self_hosted_kroki_does_not_fall_back(tmp_path):
 
 
 def test_render_one_timeout_on_self_hosted_kroki_does_not_fall_back(tmp_path):
-    """Self-hosted Kroki timeout → no mermaid.ink fallback (privacy isolation)."""
+    """Self-hosted Kroki URLError timeout → no mermaid.ink fallback (privacy isolation)."""
     import urllib.error
 
     from mkdocs_to_confluence.transforms.mermaid import _render_one
@@ -452,6 +471,24 @@ def test_render_one_timeout_on_self_hosted_kroki_does_not_fall_back(tmp_path):
     mock_ink.assert_not_called()
 
 
+def test_render_one_read_phase_timeout_self_hosted_does_not_fall_back(tmp_path):
+    """socket.timeout on self-hosted Kroki → no mermaid.ink fallback (privacy isolation)."""
+    import socket
+
+    from mkdocs_to_confluence.transforms.mermaid import _render_one
+
+    with patch("mkdocs_to_confluence.transforms.mermaid._CACHE_DIR", tmp_path), \
+         patch("mkdocs_to_confluence.transforms.mermaid.time.sleep"), \
+         patch("mkdocs_to_confluence.transforms.mermaid._kroki_png",
+               side_effect=socket.timeout("The read operation timed out")), \
+         patch("mkdocs_to_confluence.transforms.mermaid._mermaid_ink_png",
+               return_value=_FAKE_PNG) as mock_ink:
+        result = _render_one(_SAMPLE_SOURCE, "https://my-internal-kroki.corp")
+
+    assert result is None
+    mock_ink.assert_not_called()
+
+
 def test_render_one_mermaid_ink_fallback_also_fails_returns_none(tmp_path, capsys):
     """When mermaid.ink fallback also fails, returns None (code-block fallback)."""
     import urllib.error

{mkdocs2confluence-0.9.6 → mkdocs2confluence-0.9.8}/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