mkdocs2confluence 0.17.2__tar.gz → 0.17.4__tar.gz

{mkdocs2confluence-0.17.2/src/mkdocs2confluence.egg-info → mkdocs2confluence-0.17.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.17.2
+Version: 0.17.4
 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
@@ -24,11 +24,11 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML>=6.0.3
-Requires-Dist: httpx>=0.27
-Requires-Dist: idna>=3.15
+Requires-Dist: httpx>=0.28
+Requires-Dist: idna>=3.18
 Requires-Dist: tinycss2>=1.5.1
 Provides-Extra: pdf
-Requires-Dist: weasyprint>=60.0; extra == "pdf"
+Requires-Dist: weasyprint>=69.0; extra == "pdf"
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mkdocs2confluence"
-version = "0.17.2"
+version = "0.17.4"
 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" }
@@ -31,8 +31,8 @@ classifiers = [
 ]
 dependencies = [
   "PyYAML>=6.0.3",
-  "httpx>=0.27",
-  "idna>=3.15",
+  "httpx>=0.28",
+  "idna>=3.18",
   "tinycss2>=1.5.1",
 ]
 
@@ -44,7 +44,7 @@ Changelog = "https://github.com/jeckyl2010/mkdocs2confluence/releases"
 
 [project.optional-dependencies]
 pdf = [
-  "weasyprint>=60.0",
+  "weasyprint>=69.0",
 ]
 dev = [
   "pytest",
@@ -132,8 +132,8 @@ layers = [
 
 [dependency-groups]
 dev = [
-    "import-linter>=2.11",
-    "pip-audit>=2.10.0",
+    "import-linter>=2.12",
+    "pip-audit>=2.10.1",
     "radon>=6.0.1",
     "vulture>=2.16",
 ]

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4/src/mkdocs2confluence.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.17.2
+Version: 0.17.4
 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
@@ -24,11 +24,11 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML>=6.0.3
-Requires-Dist: httpx>=0.27
-Requires-Dist: idna>=3.15
+Requires-Dist: httpx>=0.28
+Requires-Dist: idna>=3.18
 Requires-Dist: tinycss2>=1.5.1
 Provides-Extra: pdf
-Requires-Dist: weasyprint>=60.0; extra == "pdf"
+Requires-Dist: weasyprint>=69.0; extra == "pdf"
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/src/mkdocs2confluence.egg-info/SOURCES.txt

@@ -16,7 +16,6 @@ src/mkdocs_to_confluence/compiler/page.py
 src/mkdocs_to_confluence/emitter/__init__.py
 src/mkdocs_to_confluence/emitter/xhtml.py
 src/mkdocs_to_confluence/ir/__init__.py
-src/mkdocs_to_confluence/ir/document.py
 src/mkdocs_to_confluence/ir/nodes.py
 src/mkdocs_to_confluence/ir/treeutil.py
 src/mkdocs_to_confluence/loader/__init__.py
@@ -46,7 +45,6 @@ src/mkdocs_to_confluence/publisher/client.py
 src/mkdocs_to_confluence/publisher/executor.py
 src/mkdocs_to_confluence/publisher/http_retry.py
 src/mkdocs_to_confluence/publisher/models.py
-src/mkdocs_to_confluence/publisher/pipeline.py
 src/mkdocs_to_confluence/publisher/planner.py
 src/mkdocs_to_confluence/skills/mkdocs-changelog/SKILL.md
 src/mkdocs_to_confluence/skills/mkdocs-changelog/scripts/changelog_data.py

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/src/mkdocs2confluence.egg-info/requires.txt

@@ -1,6 +1,6 @@
 PyYAML>=6.0.3
-httpx>=0.27
-idna>=3.15
+httpx>=0.28
+idna>=3.18
 tinycss2>=1.5.1
 
 [dev]
@@ -14,4 +14,4 @@ build
 pre-commit
 
 [pdf]
-weasyprint>=60.0
+weasyprint>=69.0

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/src/mkdocs_to_confluence/cli.py

@@ -9,12 +9,12 @@ import webbrowser
 from pathlib import Path
 
 from mkdocs_to_confluence import __version__
+from mkdocs_to_confluence.compiler.page import compile_page
 from mkdocs_to_confluence.emitter.xhtml import configure_styles
 from mkdocs_to_confluence.loader.config import load_config
 from mkdocs_to_confluence.loader.nav import find_section, find_section_by_folder, flat_pages, resolve_nav
 from mkdocs_to_confluence.loader.page import PageLoadError, find_page
 from mkdocs_to_confluence.preview.render import inject_livereload, render_index, render_page
-from mkdocs_to_confluence.publisher.pipeline import compile_page
 from mkdocs_to_confluence.transforms.internallinks import build_link_map
 
 
@@ -389,7 +389,7 @@ def _cmd_preview(args: argparse.Namespace) -> None:
             for node in pages:
                 html_name = page_link_map.get(node.title, f"{Path(node.docs_path or node.title).stem}.html")
                 try:
-                    xhtml, _a, _l, _s, _vm = compile_page(node, config, link_map, quiet=args.quiet)
+                    xhtml = compile_page(node, config, link_map, quiet=args.quiet).xhtml
                 except PageLoadError as exc:
                     print(f"  warning: skipping '{node.title}': {exc}", file=sys.stderr)
                     continue
@@ -447,7 +447,7 @@ def _cmd_preview(args: argparse.Namespace) -> None:
 
         def _build_page() -> None:
             try:
-                xhtml, _a, _l, _s, _vm = compile_page(page_node, config, link_map, quiet=True)
+                xhtml = compile_page(page_node, config, link_map, quiet=True).xhtml
             except PageLoadError as exc:
                 print(f"  warning: {exc}", file=sys.stderr)
                 return
@@ -471,7 +471,7 @@ def _cmd_preview(args: argparse.Namespace) -> None:
         return
 
     try:
-        xhtml, _attachments, _labels, _status, _vm = compile_page(page_node, config, link_map, quiet=args.quiet)
+        xhtml = compile_page(page_node, config, link_map, quiet=args.quiet).xhtml
     except PageLoadError as exc:
         print(f"error: {exc}", file=sys.stderr)
         sys.exit(1)
@@ -553,7 +553,8 @@ def _cmd_publish(args: argparse.Namespace) -> None:
 
     from mkdocs_to_confluence.publisher.changelog import publish_changelog
     from mkdocs_to_confluence.publisher.client import ConfluenceClient, ConfluenceError
-    from mkdocs_to_confluence.publisher.pipeline import execute_publish, plan_publish
+    from mkdocs_to_confluence.publisher.executor import execute_publish
+    from mkdocs_to_confluence.publisher.planner import plan_publish
 
     try:
         with ConfluenceClient(conf_config) as client:
@@ -726,7 +727,7 @@ def _cmd_pdf(args: argparse.Namespace) -> None:
     chapters: list[tuple[str, str]] = []
     for node in pages:
         try:
-            xhtml, _a, _l, _s, _vm = compile_page(node, config, link_map, quiet=args.quiet)
+            xhtml = compile_page(node, config, link_map, quiet=args.quiet).xhtml
         except PageLoadError as exc:
             print(f"  warning: skipping '{node.title}': {exc}", file=sys.stderr)
             continue

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/src/mkdocs_to_confluence/emitter/xhtml.py

@@ -222,8 +222,12 @@ def _emit_section(node: Section) -> str:
     if _styles:
         style_attr = styles_to_attr(_styles.headings.get(f"h{node.level}", {}))
     anchor = ""
-    if node.explicit_anchor:
-        name = html.escape(node.explicit_anchor)
+    # Emit an anchor macro for every heading so links resolve to the section.
+    # Confluence's auto heading-anchors use a different naming scheme than the
+    # MkDocs slug our links carry, so without an explicit named anchor a
+    # `#slug` link lands at the top of the page instead of the section.
+    name = html.escape(node.explicit_anchor or node.anchor)
+    if name:
         anchor = (
             f'<ac:structured-macro ac:name="anchor">'
             f'<ac:parameter ac:name=""><![CDATA[{name}]]></ac:parameter>'
@@ -336,6 +340,9 @@ def _emit_code_block(node: CodeBlock) -> str:
             parts.append(
                 f'  <ac:parameter ac:name="firstline">{node.linenums_start}</ac:parameter>\n'
             )
+    if node.highlight_lines:
+        hl = ",".join(str(n) for n in node.highlight_lines)
+        parts.append(f'  <ac:parameter ac:name="highlight">{hl}</ac:parameter>\n')
     # Escape ]]> sequences inside CDATA to avoid breaking the block
     safe_code = node.code.replace("]]>", "]]]]><![CDATA[>")
     parts.append(f"  <ac:plain-text-body><![CDATA[{safe_code}]]></ac:plain-text-body>\n")

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/src/mkdocs_to_confluence/ir/__init__.py

@@ -4,12 +4,10 @@ All node types are frozen dataclasses — immutable, hashable, and structurally
 equal.  Import everything you need directly from this package:
 
     from mkdocs_to_confluence.ir import (
-        Document, PageMeta,
         Section, Paragraph, Text, CodeBlock, ...
     )
 """
 
-from mkdocs_to_confluence.ir.document import Document, PageMeta, compute_sha
 from mkdocs_to_confluence.ir.nodes import (
     # Material extension nodes
     Admonition,
@@ -64,10 +62,6 @@ from mkdocs_to_confluence.ir.nodes import (
 )
 
 __all__ = [
-    # Document envelope
-    "Document",
-    "PageMeta",
-    "compute_sha",
     # Base
     "IRNode",
     "walk",

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/src/mkdocs_to_confluence/ir/nodes.py

@@ -216,6 +216,7 @@ class CodeBlock(IRNode):
         linenums:        Whether line numbers are enabled.
         linenums_start:  First line number (default 1); only meaningful when
                          ``linenums`` is ``True``.
+    Attributes:
         highlight_lines: 1-based line numbers that should be highlighted.
     """
 

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/src/mkdocs_to_confluence/publisher/changelog.py

@@ -2,23 +2,22 @@
 
 from __future__ import annotations
 
-import re
+import hashlib
 import sys
 from pathlib import Path
 from typing import TYPE_CHECKING
 
 import yaml
 
+from mkdocs_to_confluence.compiler.page import compile_page
 from mkdocs_to_confluence.loader.nav import NavNode
-from mkdocs_to_confluence.publisher.executor import _upload_assets
-from mkdocs_to_confluence.publisher.planner import _xhtml_hash, compile_page
+from mkdocs_to_confluence.preprocess.frontmatter import _FRONT_MATTER_RE
+from mkdocs_to_confluence.publisher.executor import upload_assets
 
 if TYPE_CHECKING:
     from mkdocs_to_confluence.loader.config import ConfluenceConfig, MkDocsConfig
     from mkdocs_to_confluence.publisher.client import ConfluenceClient
 
-_FRONT_MATTER_RE = re.compile(r"\A---\s*\n(.*?\n?)---\s*\n?", re.DOTALL)
-
 
 def _extract_title(source_path: Path) -> str | None:
     """Return the ``title`` value from YAML front matter, or ``None`` if absent."""
@@ -73,11 +72,9 @@ def publish_changelog(
     if not quiet:
         print(f"  compiling  '{title}'  (changelog)")
 
-    xhtml, attachments, labels, confluence_status, version_message = compile_page(
-        node, config, link_map or {}, quiet=quiet
-    )
+    result = compile_page(node, config, link_map or {}, quiet=quiet)
 
-    xhtml_hash = _xhtml_hash(xhtml)
+    xhtml_hash = hashlib.sha256(result.xhtml.encode()).hexdigest()
     existing = client.find_page(space_id, title)
 
     if existing is not None and client.get_content_hash(str(existing["id"])) == xhtml_hash:
@@ -88,7 +85,7 @@ def publish_changelog(
     parent_id = conf_config.parent_page_id
 
     if existing is None:
-        page = client.create_page(space_id, title, xhtml, parent_id=parent_id)
+        page = client.create_page(space_id, title, result.xhtml, parent_id=parent_id)
         page_id = str(page["id"])
         # Do NOT stamp as managed: _prune_orphans skips unmanaged pages, so
         # this ensures --prune never deletes the changelog page.
@@ -98,15 +95,15 @@ def publish_changelog(
         page_id = str(existing["id"])
         version: int = existing["version"]["number"]
         client.update_page(
-            page_id, title, xhtml, version + 1,
+            page_id, title, result.xhtml, version + 1,
             parent_id=parent_id,
-            version_message=version_message,
+            version_message=result.version_message,
         )
         if not quiet:
             print(f"  updated    '{title}'  (changelog)")
 
-    if attachments:
-        _upload_assets(page_id, attachments, config.docs_dir, client, quiet=quiet)
+    if result.attachments:
+        upload_assets(page_id, result.attachments, config.docs_dir, client, quiet=quiet)
 
     # content hash is an internal optimization; if it fails the next run just
     # re-publishes, so a failure is self-healing and stays silent.
@@ -119,9 +116,9 @@ def publish_changelog(
     # never fail an already-saved page (catch broadly so a transient network
     # error can't abort the publish), but failures are warned so they aren't
     # invisible — mirroring publisher/executor.py.
-    if labels:
+    if result.labels:
         try:
-            client.set_page_labels(page_id, labels)
+            client.set_page_labels(page_id, result.labels)
         except Exception as exc:
             print(f"  [warn] changelog: could not set labels: {exc}", file=sys.stderr)
 
@@ -131,12 +128,12 @@ def publish_changelog(
         except Exception as exc:
             print(f"  [warn] changelog: could not set full-width: {exc}", file=sys.stderr)
 
-    if confluence_status:
+    if result.confluence_status:
         try:
-            client.set_page_status(page_id, confluence_status, space_key=space_key)
+            client.set_page_status(page_id, result.confluence_status, space_key=space_key)
         except Exception as exc:
             print(
                 f"  [warn] changelog: could not set page status "
-                f"{confluence_status!r}: {exc}",
+                f"{result.confluence_status!r}: {exc}",
                 file=sys.stderr,
             )

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/src/mkdocs_to_confluence/publisher/executor.py

@@ -9,13 +9,13 @@ from typing import TYPE_CHECKING
 
 from mkdocs_to_confluence.publisher.client import ConfluenceError
 from mkdocs_to_confluence.publisher.models import PageAction, PublishReport
-from mkdocs_to_confluence.transforms.assets import _make_attachment_name
+from mkdocs_to_confluence.transforms.assets import make_attachment_name
 
 if TYPE_CHECKING:
     from mkdocs_to_confluence.publisher.client import ConfluenceClient
 
 
-def _upload_assets(
+def upload_assets(
     page_id: str,
     attachments: list[Path],
     docs_dir: Path,
@@ -24,7 +24,7 @@ def _upload_assets(
     quiet: bool = False,
 ) -> tuple[int, int, list[tuple[str, str]]]:
     """Upload attachments for one page sequentially."""
-    pairs = [(_make_attachment_name(p, docs_dir), p) for p in attachments]
+    pairs = [(make_attachment_name(p, docs_dir), p) for p in attachments]
     uploaded = 0
     skipped = 0
     errors: list[tuple[str, str]] = []
@@ -271,7 +271,7 @@ def _post_process_action(
 
     # Upload assets — skip files whose mtime is not newer than Confluence.
     if action.page_id and action.attachments:
-        uploaded, asset_skipped, asset_errors = _upload_assets(
+        uploaded, asset_skipped, asset_errors = upload_assets(
             action.page_id, action.attachments, docs_dir, client, quiet=quiet
         )
         report.assets_uploaded += uploaded

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/src/mkdocs_to_confluence/publisher/planner.py

@@ -3,17 +3,17 @@
 from __future__ import annotations
 
 import hashlib
-import re
 import sys
 from pathlib import Path
 from typing import TYPE_CHECKING
 
 import yaml
 
-from mkdocs_to_confluence.compiler.page import compile_page as _compile_page_result
+from mkdocs_to_confluence.compiler.page import compile_page
 from mkdocs_to_confluence.loader.config import ConfluenceConfig, MkDocsConfig
 from mkdocs_to_confluence.loader.nav import NavNode
 from mkdocs_to_confluence.loader.page import PageLoadError
+from mkdocs_to_confluence.preprocess.frontmatter import _FRONT_MATTER_RE
 from mkdocs_to_confluence.preprocess.icons import strip_icon_shortcodes
 from mkdocs_to_confluence.publisher.models import PageAction
 from mkdocs_to_confluence.transforms.internallinks import build_link_map
@@ -21,8 +21,6 @@ from mkdocs_to_confluence.transforms.internallinks import build_link_map
 if TYPE_CHECKING:
     from mkdocs_to_confluence.publisher.client import ConfluenceClient
 
-_FRONT_MATTER_RE = re.compile(r"\A---\s*\n(.*?\n?)---\s*\n?", re.DOTALL)
-
 
 def _extract_ready_flag(raw: str) -> bool | None:
     """Return the ``ready`` value from front matter, or ``None`` if absent."""
@@ -41,36 +39,6 @@ def _extract_ready_flag(raw: str) -> bool | None:
     return bool(val)
 
 
-def compile_page(
-    node: NavNode,
-    config: MkDocsConfig,
-    link_map: dict[str, str] | None = None,
-    *,
-    is_section_index: bool = False,
-    quiet: bool = False,
-) -> tuple[str, list[Path], tuple[str, ...], str | None, str | None]:
-    """Compatibility wrapper around the compiler module's typed page compiler."""
-    result = _compile_page_result(
-        node,
-        config,
-        link_map,
-        is_section_index=is_section_index,
-        quiet=quiet,
-    )
-    return (
-        result.xhtml,
-        result.attachments,
-        result.labels,
-        result.confluence_status,
-        result.version_message,
-    )
-
-
-def _xhtml_hash(xhtml: str) -> str:
-    """Return a stable sha256 hex digest of the emitted XHTML string."""
-    return hashlib.sha256(xhtml.encode()).hexdigest()
-
-
 def _find_section_index(node: NavNode) -> NavNode | None:
     """Return the first direct child whose docs_path ends with 'index.md'."""
     for child in node.children:
@@ -96,7 +64,7 @@ def _plan_compiled_page_action(
 ) -> PageAction:
     """Build the PageAction for a compiled page or section index."""
     existing = client.find_page(space_id, title)
-    xhtml_h = _xhtml_hash(xhtml)
+    xhtml_h = hashlib.sha256(xhtml.encode()).hexdigest()
     if existing is not None and client.get_content_hash(str(existing["id"])) == xhtml_h:
         if not quiet:
             print(f"  unchanged  '{title}'  (content unchanged)")
@@ -190,7 +158,7 @@ def _plan_nodes(
                     if not quiet:
                         print(f"  compiling  '{clean_title}'  (section index)")
                     try:
-                        xhtml, attachments, labels, confluence_status, version_message = compile_page(
+                        result = compile_page(
                             index_child, config, link_map, is_section_index=True, quiet=quiet
                         )
                         page_action = _plan_compiled_page_action(
@@ -200,11 +168,11 @@ def _plan_nodes(
                             title=clean_title,
                             parent_id=parent_id,
                             parent_is_folder=parent_is_folder,
-                            xhtml=xhtml,
-                            attachments=attachments,
-                            labels=labels,
-                            confluence_status=confluence_status,
-                            version_message=version_message,
+                            xhtml=result.xhtml,
+                            attachments=result.attachments,
+                            labels=result.labels,
+                            confluence_status=result.confluence_status,
+                            version_message=result.version_message,
                             quiet=quiet,
                         )
                         actions.append(page_action)
@@ -275,9 +243,7 @@ def _plan_nodes(
             if not quiet:
                 print(f"  compiling  '{clean_title}'")
             try:
-                xhtml, attachments, labels, confluence_status, version_message = compile_page(
-                    node, config, link_map, quiet=quiet
-                )
+                result = compile_page(node, config, link_map, quiet=quiet)
             except (PageLoadError, OSError) as exc:
                 if not quiet:
                     print(f"  skipping   '{clean_title}'  (error: {exc})")
@@ -298,11 +264,11 @@ def _plan_nodes(
                 title=clean_title,
                 parent_id=parent_id,
                 parent_is_folder=False,
-                xhtml=xhtml,
-                attachments=attachments,
-                labels=labels,
-                confluence_status=confluence_status,
-                version_message=version_message,
+                xhtml=result.xhtml,
+                attachments=result.attachments,
+                labels=result.labels,
+                confluence_status=result.confluence_status,
+                version_message=result.version_message,
                 quiet=quiet,
             )
             actions.append(page_action)

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/src/mkdocs_to_confluence/transforms/_kroki.py

@@ -1,7 +1,7 @@
 """Generic Kroki diagram rendering utilities shared by all diagram transforms.
 
 Provides:
-- :func:`kroki_post_png` — low-level HTTP POST to Kroki for any diagram type.
+- :func:`kroki_post` — low-level HTTP POST to Kroki for any diagram type and format.
 - :func:`render_diagrams` — concurrent deduplication/replacement loop used by
   every diagram-type transform.  Each transform supplies its own ``render_fn``
   that handles type-specific caching and retry behaviour.
@@ -46,16 +46,19 @@ class _DiagramNode(Protocol):
 _D = TypeVar("_D", bound="_DiagramNode")
 
 
-def kroki_post_png(source: str, diagram_type: str, kroki_url: str) -> bytes:
-    """POST *source* to Kroki for *diagram_type* and return PNG bytes."""
-    url = f"{kroki_url.rstrip('/')}/{diagram_type}/png"
+_ACCEPT: dict[str, str] = {"png": "image/png", "svg": "image/svg+xml"}
+
+
+def kroki_post(source: str, diagram_type: str, kroki_url: str, fmt: str = "png") -> bytes:
+    """POST *source* to Kroki for *diagram_type* and return rendered bytes."""
+    url = f"{kroki_url.rstrip('/')}/{diagram_type}/{fmt}"
     body = source.encode("utf-8")
     req = urllib.request.Request(
         url,
         data=body,
         headers={
             "Content-Type": "text/plain",
-            "Accept": "image/png",
+            "Accept": _ACCEPT.get(fmt, f"image/{fmt}"),
             "User-Agent": "mk2conf/1.0",
         },
         method="POST",

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/src/mkdocs_to_confluence/transforms/admonition_titles.py

@@ -14,10 +14,10 @@ from __future__ import annotations
 
 import dataclasses
 import re
-import sys
 
 from mkdocs_to_confluence.ir.nodes import Admonition, IRNode, walk
 from mkdocs_to_confluence.ir.treeutil import replace_nodes
+from mkdocs_to_confluence.transforms._kroki import warn as _warn
 
 # Inline Markdown link [text](target), but not an image (no leading '!').
 _LINK_RE = re.compile(r"(?<!!)\[([^\]]+)\]\(([^)]+)\)")
@@ -50,6 +50,3 @@ def strip_links_in_admonition_titles(
         return nodes
     return replace_nodes(nodes, replacements)
 
-
-def _warn(msg: str) -> None:
-    print(f"  warning    {msg}", file=sys.stderr)

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/src/mkdocs_to_confluence/transforms/assets.py

@@ -31,7 +31,7 @@ def is_url(value: str) -> bool:
     return value.startswith(("http://", "https://", "//", "data:"))
 
 
-def _make_attachment_name(abs_path: Path, docs_dir: Path) -> str:
+def make_attachment_name(abs_path: Path, docs_dir: Path) -> str:
     """Compute a collision-safe attachment filename from an absolute path.
 
     Joins the path parts relative to ``docs_dir`` with underscores so that
@@ -83,7 +83,7 @@ def resolve_local_assets(
                 candidate = _resolve_asset_path(node.src, page_dir, docs_dir)
                 if candidate is None:
                     continue
-                attachment_name = _make_attachment_name(candidate, docs_dir)
+                attachment_name = make_attachment_name(candidate, docs_dir)
                 if candidate not in seen:
                     seen[candidate] = None
                     attachments.append(candidate)
@@ -114,7 +114,7 @@ def resolve_local_assets(
                         stacklevel=2,
                     )
                     continue
-                attachment_name = _make_attachment_name(candidate, docs_dir)
+                attachment_name = make_attachment_name(candidate, docs_dir)
                 if candidate not in seen:
                     seen[candidate] = None
                     attachments.append(candidate)

{mkdocs2confluence-0.17.2 → mkdocs2confluence-0.17.4}/src/mkdocs_to_confluence/transforms/mermaid.py

@@ -25,7 +25,6 @@ from __future__ import annotations
 import base64
 import hashlib
 import json
-import sys
 import time
 import urllib.error
 import urllib.request
@@ -42,31 +41,17 @@ from mkdocs_to_confluence.transforms._kroki import (
     _RETRYABLE_HTTP,
     _TIMEOUT,
     DEFAULT_KROKI_URL,
+    kroki_post,
     render_diagrams,
 )
+from mkdocs_to_confluence.transforms._kroki import (
+    warn as _warn,
+)
 
 _CACHE_DIR = Path.home() / ".cache" / "mk2conf" / "mermaid"
 _MERMAID_INK_URL = "https://mermaid.ink"
 
 
-def _kroki_png(source: str, kroki_url: str) -> bytes:
-    """Fetch a PNG rendering of *source* from the Kroki service (POST)."""
-    url = f"{kroki_url.rstrip('/')}/mermaid/png"
-    body = source.encode("utf-8")
-    req = urllib.request.Request(
-        url,
-        data=body,
-        headers={
-            "Content-Type": "text/plain",
-            "Accept": "image/png",
-            "User-Agent": "mk2conf/1.0",
-        },
-        method="POST",
-    )
-    with urllib.request.urlopen(req, timeout=_TIMEOUT) as resp:  # noqa: S310  # nosec B310
-        return cast(bytes, resp.read())
-
-
 def _mermaid_ink_png(source: str) -> bytes:
     """Fetch a PNG rendering of *source* from mermaid.ink (GET, pako-encoded).
 
@@ -87,10 +72,6 @@ def _cache_path(source: str) -> Path:
     return _CACHE_DIR / f"mermaid_{digest}.png"
 
 
-def _warn(msg: str) -> None:
-    print(f"  warning    {msg}", file=sys.stderr)
-
-
 def _render_one(source: str, kroki_url: str, *, quiet: bool = False) -> Path | None:
     """Render a single diagram to cache. Returns cache path on success, None on failure.
 
@@ -120,7 +101,7 @@ def _render_one(source: str, kroki_url: str, *, quiet: bool = False) -> Path | N
         try:
             if not quiet:
                 print(f"        rendering  mermaid diagram via Kroki ({kroki_url})")
-            png = _kroki_png(source, kroki_url)
+            png = kroki_post(source, "mermaid", kroki_url)
             if len(png) < _MIN_PNG_BYTES:
                 raise ValueError(f"Kroki returned {len(png)} bytes (expected a valid PNG)")
             with _CACHE_LOCK: