conjira-cli 0.2.4__tar.gz → 0.2.5__tar.gz

{conjira_cli-0.2.4/src/conjira_cli.egg-info → conjira_cli-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conjira-cli
-Version: 0.2.4
+Version: 0.2.5
 Summary: Unofficial agent-friendly CLI for self-hosted Confluence and Jira
 Author: quanttraderkim
 License-Expression: MIT

{conjira_cli-0.2.4 → conjira_cli-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "conjira-cli"
-version = "0.2.4"
+version = "0.2.5"
 description = "Unofficial agent-friendly CLI for self-hosted Confluence and Jira"
 readme = "README.md"
 requires-python = ">=3.9"

{conjira_cli-0.2.4 → conjira_cli-0.2.5}/src/conjira_cli/markdown_import.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import html
 import os
 import re
+import xml.etree.ElementTree as ET
 from typing import Optional
 
 
@@ -371,19 +372,58 @@ def _parse_table(lines: list[str], start: int) -> tuple[str, int]:
     if has_header:
         parts.append(
             "<tr>{0}</tr>".format(
-                "".join("<th>{0}</th>".format(_render_inline(cell)) for cell in rows[0])
+                "".join("<th>{0}</th>".format(_render_table_cell(cell)) for cell in rows[0])
             )
         )
     for row in body_rows:
         parts.append(
             "<tr>{0}</tr>".format(
-                "".join("<td>{0}</td>".format(_render_inline(cell)) for cell in row)
+                "".join("<td>{0}</td>".format(_render_table_cell(cell)) for cell in row)
             )
         )
     parts.append("</tbody></table>")
     return "".join(parts), i
 
 
+_CELL_HTML_BLOCK_PREFIX_RE = re.compile(
+    r"^<(ul|ol|p|div|table|blockquote|h[1-6]|ac:[\w-]+|ri:[\w-]+|atlassian:[\w-]+)\b",
+    re.IGNORECASE,
+)
+_CELL_XML_WRAPPER_PREFIX = (
+    '<root xmlns:ac="urn:ac" xmlns:ri="urn:ri" xmlns:atlassian="urn:atlassian">'
+)
+
+
+def _render_table_cell(cell: str) -> str:
+    """Render a markdown table cell.
+
+    Standard markdown tables only support inline content per cell, but
+    Confluence cells frequently need nested structures (``<ul><li>``,
+    ``<p>``, etc.). When the cell content is a well-formed HTML block,
+    we pass it through unchanged so users can hand-author rich cells
+    without leaving the markdown pipeline.
+
+    Pass-through covers the entire cell: any trailing content after the
+    HTML block is emitted verbatim and not re-rendered as markdown.
+    """
+    stripped = cell.strip()
+    if (
+        stripped.startswith("<")
+        and _CELL_HTML_BLOCK_PREFIX_RE.match(stripped)
+        and _is_well_formed_xhtml(stripped)
+    ):
+        return stripped
+    return _render_inline(cell)
+
+
+def _is_well_formed_xhtml(fragment: str) -> bool:
+    try:
+        ET.fromstring(_CELL_XML_WRAPPER_PREFIX + fragment + "</root>")
+    except ET.ParseError:
+        return False
+    return True
+
+
 def _split_table_row(line: str) -> list[str]:
     stripped = line.strip()
     if stripped.startswith("|"):

{conjira_cli-0.2.4 → conjira_cli-0.2.5/src/conjira_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conjira-cli
-Version: 0.2.4
+Version: 0.2.5
 Summary: Unofficial agent-friendly CLI for self-hosted Confluence and Jira
 Author: quanttraderkim
 License-Expression: MIT

{conjira_cli-0.2.4 → conjira_cli-0.2.5}/tests/test_markdown_import.py

@@ -195,3 +195,106 @@ class MarkdownImportTests(unittest.TestCase):
         wrapped = f'<root xmlns:ac="urn:ac" xmlns:ri="urn:ri">{result}</root>'
         # Should not raise
         ET.fromstring(wrapped)
+
+    def test_table_cell_passes_through_raw_html_list(self) -> None:
+        """Cells containing well-formed HTML blocks (e.g. nested <ul>) survive."""
+        result = markdown_to_storage_html(
+            "\n".join(
+                [
+                    "| 구분 | 내용 |",
+                    "| --- | --- |",
+                    "| 포인트 지급 | <ul><li>휴대폰 포인트 지급<ul><li>MDN 기준</li></ul></li></ul> |",
+                ]
+            )
+        )
+
+        self.assertIn(
+            "<td><ul><li>휴대폰 포인트 지급<ul><li>MDN 기준</li></ul></li></ul></td>",
+            result,
+        )
+        self.assertNotIn("&lt;ul&gt;", result)
+
+    def test_table_cell_passes_through_storage_macro(self) -> None:
+        """Cells containing ac:* / ri:* storage-format macros pass through."""
+        cell_html = (
+            '<ac:structured-macro ac:name="status" ac:schema-version="1">'
+            '<ac:parameter ac:name="colour">Green</ac:parameter>'
+            '<ac:parameter ac:name="title">Done</ac:parameter>'
+            "</ac:structured-macro>"
+        )
+        result = markdown_to_storage_html(
+            "\n".join(
+                [
+                    "| Item | Status |",
+                    "| --- | --- |",
+                    "| API | {0} |".format(cell_html),
+                ]
+            )
+        )
+
+        self.assertIn(cell_html, result)
+        self.assertNotIn("&lt;ac:", result)
+
+    def test_table_cell_with_inline_text_still_escapes(self) -> None:
+        """Cells without HTML block content still get inline escaping."""
+        result = markdown_to_storage_html(
+            "\n".join(
+                [
+                    "| Title | Note |",
+                    "| --- | --- |",
+                    "| 5 < 10 | not html |",
+                ]
+            )
+        )
+
+        self.assertIn("<td>5 &lt; 10</td>", result)
+        self.assertIn("<td>not html</td>", result)
+
+    def test_table_cell_with_malformed_html_falls_back_to_inline(self) -> None:
+        """If a cell looks like HTML but isn't well-formed, escape it instead of breaking the page."""
+        result = markdown_to_storage_html(
+            "\n".join(
+                [
+                    "| Item | Note |",
+                    "| --- | --- |",
+                    "| <ul><li>unclosed | broken |",
+                ]
+            )
+        )
+
+        # Malformed HTML must not pass through; it should be escaped.
+        self.assertNotIn("<td><ul><li>unclosed", result)
+        self.assertIn("&lt;ul&gt;", result)
+
+    def test_table_with_html_cells_is_valid_xhtml(self) -> None:
+        """Tables with HTML pass-through cells must produce valid XHTML."""
+        import xml.etree.ElementTree as ET
+
+        result = markdown_to_storage_html(
+            "\n".join(
+                [
+                    "| 구분 | 내용 |",
+                    "| --- | --- |",
+                    "| A | <ul><li>x<ul><li>y</li></ul></li></ul> |",
+                    "| B | plain text |",
+                ]
+            )
+        )
+        wrapped = f'<root xmlns:ac="urn:ac" xmlns:ri="urn:ri">{result}</root>'
+        ET.fromstring(wrapped)
+
+    def test_table_cell_html_block_emits_trailing_content_verbatim(self) -> None:
+        """Trailing content after an HTML block in a cell is emitted verbatim, not re-rendered."""
+        result = markdown_to_storage_html(
+            "\n".join(
+                [
+                    "| A | B |",
+                    "| --- | --- |",
+                    "| 1 | <ul><li>x</li></ul> trailing [link](http://example.com) |",
+                ]
+            )
+        )
+
+        # Whole cell goes through as raw HTML; trailing markdown is NOT rendered.
+        self.assertIn("<ul><li>x</li></ul> trailing [link](http://example.com)", result)
+        self.assertNotIn('<a href="http://example.com">', result)