markdown-to-confluence 0.4.8__py3-none-any.whl → 0.5.0__py3-none-any.whl

{markdown_to_confluence-0.4.8.dist-info → markdown_to_confluence-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-to-confluence
-Version: 0.4.8
+Version: 0.5.0
 Summary: Publish Markdown files to Confluence wiki
 Author-email: Levente Hunyadi <hunyadi@gmail.com>
 Maintainer-email: Levente Hunyadi <hunyadi@gmail.com>
@@ -13,33 +13,32 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Typing :: Typed
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: certifi>=2025.8.3; python_version < "3.10"
-Requires-Dist: json_strong_typing>=0.4
+Requires-Dist: cattrs>=25.3
 Requires-Dist: lxml>=6.0
-Requires-Dist: markdown>=3.9
-Requires-Dist: pymdown-extensions>=10.16
+Requires-Dist: markdown>=3.10
+Requires-Dist: pymdown-extensions>=10.17
 Requires-Dist: PyYAML>=6.0
 Requires-Dist: requests>=2.32
-Requires-Dist: truststore>=0.10; python_version >= "3.10"
+Requires-Dist: truststore>=0.10
 Requires-Dist: typing-extensions>=4.15; python_version < "3.12"
 Provides-Extra: dev
-Requires-Dist: markdown_doc>=0.1.5; python_version >= "3.10" and extra == "dev"
+Requires-Dist: markdown_doc>=0.1.5; extra == "dev"
 Requires-Dist: types-lxml>=2025.8.25; extra == "dev"
-Requires-Dist: types-markdown>=3.9; extra == "dev"
+Requires-Dist: types-markdown>=3.10; extra == "dev"
 Requires-Dist: types-PyYAML>=6.0; extra == "dev"
 Requires-Dist: types-requests>=2.32; extra == "dev"
 Requires-Dist: mypy>=1.18; extra == "dev"
-Requires-Dist: ruff>=0.13; extra == "dev"
+Requires-Dist: ruff>=0.14; extra == "dev"
 Provides-Extra: formulas
 Requires-Dist: matplotlib>=3.9; extra == "formulas"
 Dynamic: license-file

markdown_to_confluence-0.5.0.dist-info/RECORD

@@ -0,0 +1,35 @@
+markdown_to_confluence-0.5.0.dist-info/licenses/LICENSE,sha256=56L-Y0dyZwyVlINRJRz3PNw-ka-oLVaAq-7d8zo6qlc,1077
+md2conf/__init__.py,sha256=Ec01qZ3V1WkyzOh0MJegHd4kdvDCJhS5KjwuCfk_BRs,402
+md2conf/__main__.py,sha256=ZAwZ2YqKUxKiVx8CQsrnso9z2deP5Xn80kqqf2o3AbY,11472
+md2conf/api.py,sha256=yFDsE_5IpCXG4z24ZrxF8QjF07ep3HiBHqaWKcGKf1k,40731
+md2conf/collection.py,sha256=nghFS5kK4kPbpLE7IHi4rprJK-Mu4KXNxjHYM9Rc5SQ,824
+md2conf/converter.py,sha256=BM94de0CAQGXOTSve7_042y3VF_yu77NITX5FUUeJPQ,69446
+md2conf/csf.py,sha256=rugs3qC2aJQCJSTczeBw9WhqSZZtMq14LjwT0V1b6Hc,6476
+md2conf/domain.py,sha256=EsaAfUaT2qIrK91uRyxaPEY4kSq-nzhccErxVqHdooc,2205
+md2conf/drawio.py,sha256=IqFlAegrKM5SQf5CqHD8STIzskH7Rpm9RtWwn_nXVTc,8581
+md2conf/emoticon.py,sha256=P2L5oQvnRXeVifJQ3sJ2Ck-6ptbxumq2vsT-rM0W0Ms,484
+md2conf/entities.dtd,sha256=M6NzqL5N7dPs_eUA_6sDsiSLzDaAacrx9LdttiufvYU,30215
+md2conf/environment.py,sha256=BhI7YktY7G26HOhGlUvTkH2Vmfa4E_dhu2snzbBgMvE,3902
+md2conf/extra.py,sha256=VuMxuOnnC2Qwy6y52ukIxsaYhrZArRqMmRHRE4QZl8g,687
+md2conf/latex.py,sha256=3eFgsvaq6ROAc2skW1Wq21CX_pJai1Yc9t861Z3s5XA,7600
+md2conf/local.py,sha256=Ou-j7kZWbHxC8Si8Yg7myqtTQ1He6mYQW1NpX3LLIcY,3704
+md2conf/markdown.py,sha256=t-z19Zs_91_jzRvwmOsWqCDt0Tdghmk5bpNUON0YlKc,3148
+md2conf/matcher.py,sha256=hkM49osFM9nrXRXe4pwcGCg0rrLsmKep7AYY_S01kNY,6774
+md2conf/mermaid.py,sha256=9P4VV69dooaFBNUjdTIpzq7BFA8rDMqEif1O7XKWPdM,2617
+md2conf/metadata.py,sha256=_kt_lh4gCzVRRhhrDk-cJCk9WMcX9ZDWB6hL0Lw3xoI,976
+md2conf/processor.py,sha256=8Y-NSxAuqSHMSN9vhw_83HisGAmq87XAY98dis_xZ0Y,9690
+md2conf/publisher.py,sha256=yI7gObPZLrNEXbiPKBJwkBPcGLI17UwzKd8FQe3U8bE,8634
+md2conf/puppeteer-config.json,sha256=-dMTAN_7kNTGbDlfXzApl0KJpAWna9YKZdwMKbpOb60,159
+md2conf/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+md2conf/scanner.py,sha256=o46fTQXuTpbtvpnQPW3CW4ydIb5bM362K2TFpwO51P0,6782
+md2conf/serializer.py,sha256=fRpbGUH_6liMDNeJl0LikgpSytle-7o4o3zE339592U,1343
+md2conf/text.py,sha256=fHOrUaPXAjE4iRhHqFq-CiI-knpo4wvyHCWp0crewqA,1736
+md2conf/toc.py,sha256=ZrfUfTv_Jiv27G4SBNjK3b-1ClYKoqN5yPRsEWp6IXk,2413
+md2conf/uri.py,sha256=KbLBdRFtZTQTZd8b4j0LtE8Pb68Ly0WkemF4iW-EAB4,1158
+md2conf/xml.py,sha256=Fu00Eg8c0VgMHIjRDBJBSNWtui8obEtowkiR7gHTduM,5526
+markdown_to_confluence-0.5.0.dist-info/METADATA,sha256=1Dm2_wAu9FaYnxv5haqzq8XLND4QC3o823C5f6-0a_4,36435
+markdown_to_confluence-0.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+markdown_to_confluence-0.5.0.dist-info/entry_points.txt,sha256=F1zxa1wtEObtbHS-qp46330WVFLHdMnV2wQ-ZorRmX0,50
+markdown_to_confluence-0.5.0.dist-info/top_level.txt,sha256=_FJfl_kHrHNidyjUOuS01ngu_jDsfc-ZjSocNRJnTzU,8
+markdown_to_confluence-0.5.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+markdown_to_confluence-0.5.0.dist-info/RECORD,,

md2conf/__init__.py

@@ -5,7 +5,7 @@ Parses Markdown files, converts Markdown content into the Confluence Storage For
 Confluence API endpoints to upload images and content.
 """
 
-__version__ = "0.4.8"
+__version__ = "0.5.0"
 __author__ = "Levente Hunyadi"
 __copyright__ = "Copyright 2022-2025, Levente Hunyadi"
 __license__ = "MIT"

md2conf/__main__.py

@@ -16,7 +16,7 @@ import sys
 import typing
 from io import StringIO
 from pathlib import Path
-from typing import Any, Iterable, Literal, Optional, Sequence, Union
+from typing import Any, Iterable, Literal, Sequence
 
 from . import __version__
 from .domain import ConfluenceDocumentOptions, ConfluencePageID
@@ -27,18 +27,18 @@ from .metadata import ConfluenceSiteMetadata
 
 class Arguments(argparse.Namespace):
     mdpath: Path
-    domain: Optional[str]
-    path: Optional[str]
-    api_url: Optional[str]
-    username: Optional[str]
-    api_key: Optional[str]
-    space: Optional[str]
+    domain: str | None
+    path: str | None
+    api_url: str | None
+    username: str | None
+    api_key: str | None
+    space: str | None
     loglevel: str
     ignore_invalid_url: bool
     heading_anchors: bool
-    root_page: Optional[str]
+    root_page: str | None
     keep_hierarchy: bool
-    generated_by: Optional[str]
+    generated_by: str | None
     render_drawio: bool
     render_mermaid: bool
     render_latex: bool
@@ -58,8 +58,8 @@ class KwargsAppendAction(argparse.Action):
         self,
         parser: argparse.ArgumentParser,
         namespace: argparse.Namespace,
-        values: Union[None, str, Sequence[Any]],
-        option_string: Optional[str] = None,
+        values: str | Sequence[Any] | None,
+        option_string: str | None = None,
     ) -> None:
         try:
             d = dict(map(lambda x: x.split("="), typing.cast(Sequence[str], values)))
@@ -74,10 +74,10 @@ class KwargsAppendAction(argparse.Action):
 class PositionalOnlyHelpFormatter(argparse.HelpFormatter):
     def _format_usage(
         self,
-        usage: Optional[str],
+        usage: str | None,
         actions: Iterable[argparse.Action],
         groups: Iterable[argparse._MutuallyExclusiveGroup],  # pyright: ignore[reportPrivateUsage]
-        prefix: Optional[str],
+        prefix: str | None,
     ) -> str:
         # filter only positional arguments
         positional_actions = [a for a in actions if not a.option_strings]

md2conf/api.py

@@ -12,27 +12,21 @@ import io
 import logging
 import mimetypes
 import ssl
-import sys
 import typing
 from dataclasses import dataclass
 from pathlib import Path
 from types import TracebackType
-from typing import Any, Optional, TypeVar, overload
+from typing import Any, TypeVar, overload
 from urllib.parse import urlencode, urlparse, urlunparse
 
 import requests
+import truststore
 from requests.adapters import HTTPAdapter
-from strong_typing.core import JsonType
-from strong_typing.serialization import DeserializerOptions, json_dump_string, json_to_object, object_to_json
 
 from .environment import ArgumentError, ConfluenceConnectionProperties, ConfluenceError, PageError
 from .extra import override
 from .metadata import ConfluenceSiteMetadata
-
-if sys.version_info >= (3, 10):
-    import truststore
-else:
-    import certifi
+from .serializer import JsonType, json_to_object, object_to_json_payload
 
 T = TypeVar("T")
 
@@ -45,14 +39,7 @@ mimetypes.add_type("application/vnd.openxmlformats-officedocument.presentationml
 mimetypes.add_type("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", ".xlsx", strict=True)
 
 
-def _json_to_object(
-    typ: type[T],
-    data: JsonType,
-) -> T:
-    return json_to_object(typ, data, options=DeserializerOptions(skip_unassigned=True))
-
-
-def build_url(base_url: str, query: Optional[dict[str, str]] = None) -> str:
+def build_url(base_url: str, query: dict[str, str] | None = None) -> str:
     "Builds a URL with scheme, host, port, path and query string parameters."
 
     scheme, netloc, path, params, query_str, fragment = urlparse(base_url)
@@ -79,7 +66,7 @@ def response_cast(response_type: None, response: requests.Response) -> None: ...
 def response_cast(response_type: type[T], response: requests.Response) -> T: ...
 
 
-def response_cast(response_type: Optional[type[T]], response: requests.Response) -> Optional[T]:
+def response_cast(response_type: type[T] | None, response: requests.Response) -> T | None:
     "Converts a response body into the expected type."
 
     if response.text:
@@ -88,7 +75,7 @@ def response_cast(response_type: Optional[type[T]], response: requests.Response)
     if response_type is None:
         return None
     else:
-        return _json_to_object(response_type, response.json())
+        return json_to_object(response_type, response.json())
 
 
 @enum.unique
@@ -155,9 +142,9 @@ class ConfluenceResultSet:
 class ConfluenceContentVersion:
     number: int
     minorEdit: bool = False
-    createdAt: Optional[datetime.datetime] = None
-    message: Optional[str] = None
-    authorId: Optional[str] = None
+    createdAt: datetime.datetime | None = None
+    message: str | None = None
+    authorId: str | None = None
 
 
 @dataclass(frozen=True)
@@ -182,12 +169,12 @@ class ConfluenceAttachment:
 
     id: str
     status: ConfluenceStatus
-    title: Optional[str]
+    title: str | None
     createdAt: datetime.datetime
     pageId: str
     mediaType: str
-    mediaTypeDescription: Optional[str]
-    comment: Optional[str]
+    mediaTypeDescription: str | None
+    comment: str | None
     fileId: str
     fileSize: int
     webuiLink: str
@@ -218,12 +205,12 @@ class ConfluencePageProperties:
     status: ConfluenceStatus
     title: str
     spaceId: str
-    parentId: Optional[str]
-    parentType: Optional[ConfluencePageParentContentType]
-    position: Optional[int]
+    parentId: str | None
+    parentType: ConfluencePageParentContentType | None
+    position: int | None
     authorId: str
     ownerId: str
-    lastOwnerId: Optional[str]
+    lastOwnerId: str | None
     createdAt: datetime.datetime
     version: ConfluenceContentVersion
 
@@ -329,9 +316,9 @@ class ConfluenceIdentifiedContentProperty(ConfluenceVersionedContentProperty):
 @dataclass(frozen=True)
 class ConfluenceCreatePageRequest:
     spaceId: str
-    status: Optional[ConfluenceStatus]
-    title: Optional[str]
-    parentId: Optional[str]
+    status: ConfluenceStatus | None
+    title: str | None
+    parentId: str | None
     body: ConfluencePageBody
 
 
@@ -368,10 +355,7 @@ class TruststoreAdapter(HTTPAdapter):
         Adapts the pool manager to use the provided SSL context instead of the default.
         """
 
-        if sys.version_info >= (3, 10):
-            ctx = truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-        else:
-            ctx = ssl.create_default_context(ssl.Purpose.SERVER_AUTH, cafile=certifi.where())
+        ctx = truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
         ctx.check_hostname = True
         ctx.verify_mode = ssl.CERT_REQUIRED
         super().init_poolmanager(connections, maxsize, block, ssl_context=ctx, **pool_kwargs)  # type: ignore[no-untyped-call]
@@ -383,9 +367,9 @@ class ConfluenceAPI:
     """
 
     properties: ConfluenceConnectionProperties
-    session: Optional["ConfluenceSession"] = None
+    session: "ConfluenceSession | None" = None
 
-    def __init__(self, properties: Optional[ConfluenceConnectionProperties] = None) -> None:
+    def __init__(self, properties: ConfluenceConnectionProperties | None = None) -> None:
         self.properties = properties or ConfluenceConnectionProperties()
 
     def __enter__(self) -> "ConfluenceSession":
@@ -415,9 +399,9 @@ class ConfluenceAPI:
 
     def __exit__(
         self,
-        exc_type: Optional[type[BaseException]],
-        exc_val: Optional[BaseException],
-        exc_tb: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
     ) -> None:
         """
         Closes an open connection.
@@ -444,10 +428,10 @@ class ConfluenceSession:
         self,
         session: requests.Session,
         *,
-        api_url: Optional[str],
-        domain: Optional[str],
-        base_path: Optional[str],
-        space_key: Optional[str],
+        api_url: str | None,
+        domain: str | None,
+        base_path: str | None,
+        space_key: str | None,
     ) -> None:
         self.session = session
         self._space_id_to_key = {}
@@ -503,7 +487,7 @@ class ConfluenceSession:
         self,
         version: ConfluenceVersion,
         path: str,
-        query: Optional[dict[str, str]] = None,
+        query: dict[str, str] | None = None,
     ) -> str:
         """
         Builds a full URL for invoking the Confluence API.
@@ -523,7 +507,7 @@ class ConfluenceSession:
         path: str,
         response_type: type[T],
         *,
-        query: Optional[dict[str, str]] = None,
+        query: dict[str, str] | None = None,
     ) -> T:
         "Executes an HTTP request via Confluence API."
 
@@ -532,9 +516,9 @@ class ConfluenceSession:
         if response.text:
             LOGGER.debug("Received HTTP payload:\n%s", response.text)
         response.raise_for_status()
-        return _json_to_object(response_type, response.json())
+        return json_to_object(response_type, response.json())
 
-    def _fetch(self, path: str, query: Optional[dict[str, str]] = None) -> list[JsonType]:
+    def _fetch(self, path: str, query: dict[str, str] | None = None) -> list[JsonType]:
         "Retrieves all results of a REST API v2 paginated result-set."
 
         items: list[JsonType] = []
@@ -556,14 +540,14 @@ class ConfluenceSession:
 
         return items
 
-    def _build_request(self, version: ConfluenceVersion, path: str, body: Any, response_type: Optional[type[T]]) -> tuple[str, dict[str, str], bytes]:
+    def _build_request(self, version: ConfluenceVersion, path: str, body: Any, response_type: type[T] | None) -> tuple[str, dict[str, str], bytes]:
         "Generates URL, headers and raw payload for a typed request/response."
 
         url = self._build_url(version, path)
         headers = {"Content-Type": "application/json"}
         if response_type is not None:
             headers["Accept"] = "application/json"
-        data = json_dump_string(object_to_json(body)).encode("utf-8")
+        data = object_to_json_payload(body)
         return url, headers, data
 
     @overload
@@ -572,7 +556,7 @@ class ConfluenceSession:
     @overload
     def _post(self, version: ConfluenceVersion, path: str, body: Any, response_type: type[T]) -> T: ...
 
-    def _post(self, version: ConfluenceVersion, path: str, body: Any, response_type: Optional[type[T]]) -> Optional[T]:
+    def _post(self, version: ConfluenceVersion, path: str, body: Any, response_type: type[T] | None) -> T | None:
         "Creates a new object via Confluence REST API."
 
         url, headers, data = self._build_request(version, path, body, response_type)
@@ -586,7 +570,7 @@ class ConfluenceSession:
     @overload
     def _put(self, version: ConfluenceVersion, path: str, body: Any, response_type: type[T]) -> T: ...
 
-    def _put(self, version: ConfluenceVersion, path: str, body: Any, response_type: Optional[type[T]]) -> Optional[T]:
+    def _put(self, version: ConfluenceVersion, path: str, body: Any, response_type: type[T] | None) -> T | None:
         "Updates an existing object via Confluence REST API."
 
         url, headers, data = self._build_request(version, path, body, response_type)
@@ -638,7 +622,7 @@ class ConfluenceSession:
 
         return id
 
-    def get_space_id(self, *, space_id: Optional[str] = None, space_key: Optional[str] = None) -> Optional[str]:
+    def get_space_id(self, *, space_id: str | None = None, space_key: str | None = None) -> str | None:
         """
         Coalesces a space ID or space key into a space ID, accounting for site default.
 
@@ -671,17 +655,17 @@ class ConfluenceSession:
         if len(results) != 1:
             raise ConfluenceError(f"no such attachment on page {page_id}: {filename}")
         result = typing.cast(dict[str, JsonType], results[0])
-        return _json_to_object(ConfluenceAttachment, result)
+        return json_to_object(ConfluenceAttachment, result)
 
     def upload_attachment(
         self,
         page_id: str,
         attachment_name: str,
         *,
-        attachment_path: Optional[Path] = None,
-        raw_data: Optional[bytes] = None,
-        content_type: Optional[str] = None,
-        comment: Optional[str] = None,
+        attachment_path: Path | None = None,
+        raw_data: bytes | None = None,
+        content_type: str | None = None,
+        comment: str | None = None,
         force: bool = False,
     ) -> None:
         """
@@ -739,7 +723,7 @@ class ConfluenceSession:
 
         if attachment_path is not None:
             with open(attachment_path, "rb") as attachment_file:
-                file_to_upload: dict[str, tuple[Optional[str], Any, str, dict[str, str]]] = {
+                file_to_upload: dict[str, tuple[str | None, Any, str, dict[str, str]]] = {
                     "comment": (
                         None,
                         comment,
@@ -826,8 +810,8 @@ class ConfluenceSession:
         self,
         title: str,
         *,
-        space_id: Optional[str] = None,
-        space_key: Optional[str] = None,
+        space_id: str | None = None,
+        space_key: str | None = None,
     ) -> ConfluencePageProperties:
         """
         Looks up a Confluence wiki page ID by title.
@@ -852,7 +836,7 @@ class ConfluenceSession:
         if len(results) != 1:
             raise ConfluenceError(f"unique page not found with title: {title}")
 
-        page = _json_to_object(ConfluencePageProperties, results[0])
+        page = json_to_object(ConfluencePageProperties, results[0])
         return page
 
     def get_page(self, page_id: str) -> ConfluencePage:
@@ -946,7 +930,7 @@ class ConfluenceSession:
         url = self._build_url(ConfluenceVersion.VERSION_2, path)
         response = self.session.post(
             url,
-            data=json_dump_string(object_to_json(request)).encode("utf-8"),
+            data=object_to_json_payload(request),
             headers={
                 "Content-Type": "application/json",
                 "Accept": "application/json",
@@ -954,7 +938,7 @@ class ConfluenceSession:
             verify=True,
         )
         response.raise_for_status()
-        return _json_to_object(ConfluencePage, response.json())
+        return json_to_object(ConfluencePage, response.json())
 
     def delete_page(self, page_id: str, *, purge: bool = False) -> None:
         """
@@ -984,9 +968,9 @@ class ConfluenceSession:
         self,
         title: str,
         *,
-        space_id: Optional[str] = None,
-        space_key: Optional[str] = None,
-    ) -> Optional[str]:
+        space_id: str | None = None,
+        space_key: str | None = None,
+    ) -> str | None:
         """
         Checks if a Confluence page exists with the given title.
 
@@ -1016,7 +1000,7 @@ class ConfluenceSession:
         )
         response.raise_for_status()
         data = typing.cast(dict[str, JsonType], response.json())
-        results = _json_to_object(list[ConfluencePageProperties], data["results"])
+        results = json_to_object(list[ConfluencePageProperties], data["results"])
 
         if len(results) == 1:
             return results[0].id
@@ -1051,7 +1035,7 @@ class ConfluenceSession:
 
         path = f"/pages/{page_id}/labels"
         results = self._fetch(path)
-        return _json_to_object(list[ConfluenceIdentifiedLabel], results)
+        return json_to_object(list[ConfluenceIdentifiedLabel], results)
 
     def add_labels(self, page_id: str, labels: list[ConfluenceLabel]) -> None:
         """
@@ -1113,7 +1097,7 @@ class ConfluenceSession:
 
         path = f"/pages/{page_id}/properties"
         results = self._fetch(path)
-        return _json_to_object(list[ConfluenceIdentifiedContentProperty], results)
+        return json_to_object(list[ConfluenceIdentifiedContentProperty], results)
 
     def add_content_property_to_page(self, page_id: str, property: ConfluenceContentProperty) -> ConfluenceIdentifiedContentProperty:
         """

md2conf/collection.py

@@ -7,7 +7,7 @@ Copyright 2022-2025, Levente Hunyadi
 """
 
 from pathlib import Path
-from typing import Generic, Iterable, Optional, TypeVar
+from typing import Generic, Iterable, TypeVar
 
 from .metadata import ConfluencePageMetadata
 
@@ -27,7 +27,7 @@ class KeyValueCollection(Generic[K, V]):
     def add(self, key: K, data: V) -> None:
         self._collection[key] = data
 
-    def get(self, key: K) -> Optional[V]:
+    def get(self, key: K) -> V | None:
         return self._collection.get(key)
 
     def items(self) -> Iterable[tuple[K, V]]:

md2conf/converter.py

@@ -16,12 +16,11 @@ import uuid
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from pathlib import Path
-from typing import ClassVar, Literal, Optional, Union
+from typing import ClassVar, Literal
 from urllib.parse import ParseResult, quote_plus, urlparse
 
 import lxml.etree as ET
-from strong_typing.core import JsonType
-from strong_typing.exception import JsonTypeError
+from cattrs import BaseValidationError
 
 from . import drawio, mermaid
 from .collection import ConfluencePageCollection
@@ -35,6 +34,7 @@ from .markdown import markdown_to_html
 from .mermaid import MermaidConfigProperties
 from .metadata import ConfluenceSiteMetadata
 from .scanner import MermaidScanner, ScannedDocument, Scanner
+from .serializer import JsonType
 from .toc import TableOfContentsBuilder
 from .uri import is_absolute_url, to_uuid_urn
 from .xml import element_to_text
@@ -202,7 +202,7 @@ class NodeVisitor(ABC):
                 self.visit(source)
 
     @abstractmethod
-    def transform(self, child: ElementType) -> Optional[ElementType]: ...
+    def transform(self, child: ElementType) -> ElementType | None: ...
 
 
 def title_to_identifier(title: str) -> str:
@@ -273,11 +273,11 @@ class ImageAttributes:
     """
 
     context: FormattingContext
-    width: Optional[int]
-    height: Optional[int]
-    alt: Optional[str]
-    title: Optional[str]
-    caption: Optional[str]
+    width: int | None
+    height: int | None
+    alt: str | None
+    title: str | None
+    caption: str | None
     alignment: ImageAlignment = ImageAlignment.CENTER
 
     def __post_init__(self) -> None:
@@ -374,13 +374,13 @@ class ConfluenceConverterOptions:
 @dataclass
 class ImageData:
     path: Path
-    description: Optional[str] = None
+    description: str | None = None
 
 
 @dataclass
 class EmbeddedFileData:
     data: bytes
-    description: Optional[str] = None
+    description: str | None = None
 
 
 @dataclass
@@ -506,7 +506,7 @@ class ConfluenceStorageFormatConverter(NodeVisitor):
         else:
             raise DocumentError(msg)
 
-    def _transform_link(self, anchor: ElementType) -> Optional[ElementType]:
+    def _transform_link(self, anchor: ElementType) -> ElementType | None:
         """
         Transforms links (HTML anchor `<a>`).
 
@@ -559,7 +559,7 @@ class ConfluenceStorageFormatConverter(NodeVisitor):
         else:
             return self._transform_attachment_link(anchor, absolute_path)
 
-    def _transform_page_link(self, anchor: ElementType, relative_url: ParseResult, absolute_path: Path) -> Optional[ElementType]:
+    def _transform_page_link(self, anchor: ElementType, relative_url: ParseResult, absolute_path: Path) -> ElementType | None:
         """
         Transforms links to other Markdown documents (Confluence pages).
         """
@@ -596,7 +596,7 @@ class ConfluenceStorageFormatConverter(NodeVisitor):
         anchor.set("href", transformed_url.geturl())
         return None
 
-    def _transform_attachment_link(self, anchor: ElementType, absolute_path: Path) -> Optional[ElementType]:
+    def _transform_attachment_link(self, anchor: ElementType, absolute_path: Path) -> ElementType | None:
         """
         Transforms links to document binaries such as PDF, DOCX or XLSX.
         """
@@ -713,7 +713,7 @@ class ConfluenceStorageFormatConverter(NodeVisitor):
         else:
             raise DocumentError(msg)
 
-    def _verify_image_path(self, path: Path) -> Optional[Path]:
+    def _verify_image_path(self, path: Path) -> Path | None:
         "Checks whether an image path is safe to use."
 
         # resolve relative path into absolute path w.r.t. base dir
@@ -905,12 +905,12 @@ class ConfluenceStorageFormatConverter(NodeVisitor):
             AC_ELEM("plain-text-body", ET.CDATA(content)),
         )
 
-    def _extract_mermaid_config(self, content: str) -> Optional[MermaidConfigProperties]:
+    def _extract_mermaid_config(self, content: str) -> MermaidConfigProperties | None:
         """Extract scale from Mermaid YAML front matter configuration."""
         try:
             properties = MermaidScanner().read(content)
             return properties.config
-        except JsonTypeError as ex:
+        except BaseValidationError as ex:
             LOGGER.warning("Failed to extract Mermaid properties: %s", ex)
             return None
 
@@ -1558,7 +1558,7 @@ class ConfluenceStorageFormatConverter(NodeVisitor):
         return AC_ELEM("task-list", {}, *tasks)
 
     @override
-    def transform(self, child: ElementType) -> Optional[ElementType]:
+    def transform(self, child: ElementType) -> ElementType | None:
         """
         Transforms an HTML element tree obtained from a Markdown document into a Confluence Storage Format element tree.
         """
@@ -1742,9 +1742,9 @@ class ConversionError(RuntimeError):
 class ConfluenceDocument:
     "Encapsulates an element tree for a Confluence document created by parsing a Markdown document."
 
-    title: Optional[str]
-    labels: Optional[list[str]]
-    properties: Optional[dict[str, JsonType]]
+    title: str | None
+    labels: list[str] | None
+    properties: dict[str, JsonType] | None
 
     links: list[str]
     images: list[ImageData]
@@ -1852,7 +1852,7 @@ class ConfluenceDocument:
         return elements_to_string(self.root)
 
 
-def attachment_name(ref: Union[Path, str]) -> str:
+def attachment_name(ref: Path | str) -> str:
     """
     Safe name for use with attachment uploads.