From 0c1781d7e3d6bffd55802868802bcd1ec9e8bbc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Mazzucotelli?= Date: Tue, 27 Feb 2024 13:15:22 +0100 Subject: [PATCH] feat: Preserve HTML data attributes (from spans to anchors) Issue-#41: https://github.com/mkdocstrings/autorefs/issues/41 PR-#42: https://github.com/mkdocstrings/autorefs/pull/42 Co-authored-by: Oleh Prypin --- src/mkdocs_autorefs/references.py | 15 +++++++++------ tests/test_references.py | 8 ++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/mkdocs_autorefs/references.py b/src/mkdocs_autorefs/references.py index a4d2ab6..7d2dbae 100644 --- a/src/mkdocs_autorefs/references.py +++ b/src/mkdocs_autorefs/references.py @@ -16,9 +16,10 @@ if TYPE_CHECKING: from markdown import Markdown +_ATTR_VALUE = r'"[^"<>]+"|[^"<> ]+' # Possibly with double quotes around AUTO_REF_RE = re.compile( - r"autorefs-identifier|autorefs-optional|autorefs-optional-hover)=" - r'("?)(?P[^"<>]*)\2>(?P.*?)</span>', + rf"<span data-(?P<kind>autorefs-(?:identifier|optional|optional-hover))=(?P<identifier>{_ATTR_VALUE})" + rf"(?: class=(?P<class>{_ATTR_VALUE}))?(?P<attrs> [^<>]+)?>(?P<title>.*?)</span>", flags=re.DOTALL, ) """A regular expression to match mkdocs-autorefs' special reference markers @@ -162,9 +163,11 @@ def fix_ref(url_mapper: Callable[[str], str], unmapped: list[str]) -> Callable: """ def inner(match: Match) -> str: - identifier = match["identifier"] + identifier = match["identifier"].strip('"') title = match["title"] kind = match["kind"] + attrs = match["attrs"] or "" + classes = (match["class"] or "").strip('"').split() try: url = url_mapper(unescape(identifier)) @@ -180,11 +183,11 @@ def inner(match: Match) -> str: parsed = urlsplit(url) external = parsed.scheme or parsed.netloc - classes = ["autorefs", "autorefs-external" if external else "autorefs-internal"] + classes = ["autorefs", "autorefs-external" if external else "autorefs-internal", *classes] class_attr = " ".join(classes) if kind == "autorefs-optional-hover": - return f'<a class="{class_attr}" title="{identifier}" href="{escape(url)}">{title}</a>' - return f'<a class="{class_attr}" href="{escape(url)}">{title}</a>' + return f'<a class="{class_attr}" title="{identifier}" href="{escape(url)}"{attrs}>{title}</a>' + return f'<a class="{class_attr}" href="{escape(url)}"{attrs}>{title}</a>' return inner diff --git a/tests/test_references.py b/tests/test_references.py index 02b3f50..5047754 100644 --- a/tests/test_references.py +++ b/tests/test_references.py @@ -247,3 +247,11 @@ def test_external_references() -> None: output, unmapped = fix_refs(source, url_map.__getitem__) assert output == '<a class="autorefs autorefs-external" href="https://example.com">example</a>' assert unmapped == [] + + +def test_keep_data_attributes() -> None: + """Keep HTML data attributes from autorefs spans.""" + url_map = {"example": "https://e.com"} + source = '<span data-autorefs-optional="example" class="hi ho" data-foo data-bar="0">e</span>' + output, _ = fix_refs(source, url_map.__getitem__) + assert output == '<a class="autorefs autorefs-external hi ho" href="https://e.com" data-foo data-bar="0">e</a>'