docvortex 0.5.4__tar.gz → 0.5.5__tar.gz

{docvortex-0.5.4 → docvortex-0.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docvortex
-Version: 0.5.4
+Version: 0.5.5
 Summary: A fast, multi-format document parsing and conversion engine
 License-Expression: MIT
 Project-URL: Repository, https://github.com/myhloli/DocVortex

{docvortex-0.5.4 → docvortex-0.5.5}/src/docvortex/codecs/html/contracts.py

@@ -65,11 +65,11 @@ class RichVisualBodyWireSpec:
 
 @dataclass(frozen=True, slots=True)
 class FlowchartBodyWireSpec:
-    """保存 flowchart 源码与可选 raster fallback。"""
+    """保存 flowchart 源码与可选原图（旧外壳中为 raster 回退图）。"""
 
     element: etree._Element
     source_element: etree._Element
-    fallback_image: etree._Element | None
+    primary_image: etree._Element | None
 
 
 @dataclass(frozen=True, slots=True)

{docvortex-0.5.4 → docvortex-0.5.5}/src/docvortex/codecs/html/materializer.py

@@ -170,8 +170,8 @@ def _materialize_visual_body(
             "type": BlockType.IMAGE,
             "content": _flowchart_content(spec.source_element),
         }
-        if spec.fallback_image is not None:
-            block.update(_resolve_image_payload(spec.fallback_image, resources))
+        if spec.primary_image is not None:
+            block.update(_resolve_image_payload(spec.primary_image, resources))
         return block
     if isinstance(spec, TableBodyWireSpec):
         return _materialize_table(spec, resources, projector)

{docvortex-0.5.4 → docvortex-0.5.5}/src/docvortex/codecs/html/parser.py

@@ -360,15 +360,58 @@ def _parse_table_body(body: etree._Element) -> TableBodyWireSpec:
 
 
 def _looks_like_flowchart_body(body: etree._Element) -> bool:
-    """判断 body 是否使用 renderer 的 flowchart 固定外壳。"""
+    """判断 body 是否使用 renderer 新旧两种 flowchart 固定外壳。"""
     children = _element_children(body)
-    return bool(children and local_name(children[0]) == "div" and "docvortex-flowchart" in _class_tokens(children[0]))
+    if children and local_name(children[0]) == "div" and "docvortex-flowchart" in _class_tokens(children[0]):
+        return True
+    return any(local_name(child) == "details" and "docvortex-flowchart-details" in _class_tokens(child) for child in children)
 
 
 def _parse_flowchart_body(body: etree._Element) -> FlowchartBodyWireSpec:
-    """解析 flowchart canvas、可选 raster 和源码 details。"""
+    """解析当前外壳的原图与源码 details；旧外壳（canvas 宿主在 details 外）只读兼容。"""
     _validate_structural_text(body)
     children = _element_children(body)
+    if children and local_name(children[0]) == "div" and "docvortex-flowchart" in _class_tokens(children[0]):
+        return _parse_legacy_flowchart_body(body, children)
+    return _parse_current_flowchart_body(body, children)
+
+
+def _parse_current_flowchart_body(body: etree._Element, children: list[etree._Element]) -> FlowchartBodyWireSpec:
+    """解析当前外壳：可选原图后跟 details（summary、canvas 宿主、源码）。"""
+    primary_image: etree._Element | None = None
+    if len(children) == 2:
+        primary_image, details = children
+        if local_name(primary_image) != "img" or _class_tokens(primary_image) != {"docvortex-image"}:
+            raise NonCanonicalWire
+    elif len(children) == 1:
+        details = children[0]
+    else:
+        raise NonCanonicalWire
+    if local_name(details) != "details" or _class_tokens(details) != {"docvortex-details", "docvortex-flowchart-details"}:
+        raise NonCanonicalWire
+    _validate_structural_text(details)
+    details_children = _element_children(details)
+    if len(details_children) != 3:
+        raise NonCanonicalWire
+    summary, host, source = details_children
+    _validate_flowchart_summary(summary)
+    if local_name(host) != "div" or _class_tokens(host) != {"docvortex-flowchart"}:
+        raise NonCanonicalWire
+    _validate_structural_text(host)
+    host_children = _element_children(host)
+    if len(host_children) != 1:
+        raise NonCanonicalWire
+    canvas = host_children[0]
+    if local_name(canvas) != "div" or _class_tokens(canvas) != {"docvortex-flowchart-canvas"}:
+        raise NonCanonicalWire
+    _validate_structural_text(canvas)
+    if _element_children(canvas):
+        raise NonCanonicalWire
+    return FlowchartBodyWireSpec(body, _validate_flowchart_source(source), primary_image)
+
+
+def _parse_legacy_flowchart_body(body: etree._Element, children: list[etree._Element]) -> FlowchartBodyWireSpec:
+    """兼容读取旧外壳：canvas 宿主在 details 之前，raster 为宿主内回退图。"""
     if len(children) != 2:
         raise NonCanonicalWire
     display, details = children
@@ -385,10 +428,10 @@ def _parse_flowchart_body(body: etree._Element) -> FlowchartBodyWireSpec:
     _validate_structural_text(canvas)
     if _element_children(canvas):
         raise NonCanonicalWire
-    fallback_image = None
+    primary_image: etree._Element | None = None
     if len(display_children) == 2:
-        fallback_image = display_children[1]
-        if local_name(fallback_image) != "img" or _class_tokens(fallback_image) != {"docvortex-flowchart-fallback"}:
+        primary_image = display_children[1]
+        if local_name(primary_image) != "img" or _class_tokens(primary_image) != {"docvortex-flowchart-fallback"}:
             raise NonCanonicalWire
     if local_name(details) != "details" or _class_tokens(details) != {"docvortex-details", "docvortex-flowchart-details"}:
         raise NonCanonicalWire
@@ -397,19 +440,29 @@ def _parse_flowchart_body(body: etree._Element) -> FlowchartBodyWireSpec:
     if len(details_children) != 2:
         raise NonCanonicalWire
     summary, source = details_children
+    _validate_flowchart_summary(summary)
+    return FlowchartBodyWireSpec(body, _validate_flowchart_source(source), primary_image)
+
+
+def _validate_flowchart_summary(summary: etree._Element) -> None:
+    """校验新标题与历史 source 标题，保持旧 HTML 可回读。"""
     if (
         local_name(summary) != "summary"
         or _element_children(summary)
-        or " ".join(summary.itertext()).strip() != "flowchart source"
+        or " ".join(summary.itertext()).strip() not in {"flowchart", "flowchart source"}
     ):
         raise NonCanonicalWire
+
+
+def _validate_flowchart_source(source: etree._Element) -> etree._Element:
+    """校验源码 pre 结构并返回其唯一 code 载荷。"""
     if local_name(source) != "pre" or _class_tokens(source) != {"docvortex-flowchart-source"}:
         raise NonCanonicalWire
     _validate_structural_text(source)
     code_children = _element_children(source)
     if len(code_children) != 1 or local_name(code_children[0]) != "code" or _element_children(code_children[0]):
         raise NonCanonicalWire
-    return FlowchartBodyWireSpec(body, code_children[0], fallback_image)
+    return code_children[0]
 
 
 def _parse_rich_visual_body(body: etree._Element, parent_type: BlockType, sub_type: str) -> RichVisualBodyWireSpec:

{docvortex-0.5.4 → docvortex-0.5.5}/src/docvortex/render/_internal/html/renderer.py

@@ -455,19 +455,20 @@ class _HtmlRenderer:
         return _wrap_visual_body("".join(parts), block, "image")
 
     def _render_flowchart_body(self, block: ImageBodyBlock, mermaid_source: str) -> str:
-        """输出 Mermaid canvas，并保留 raster 与源码两级失败回退。"""
+        """原图作为主视图，折叠区展示 Mermaid 图；无原图时保留失败源码回退。"""
         source = self._safe_block_image_source(block)
         escaped_source = html.escape(_replace_html_controls(mermaid_source), quote=False)
-        fallback = self._render_image(source, alt="flowchart", class_name="docvortex-flowchart-fallback") if source else ""
-        fallback_class = " docvortex-flowchart--has-raster" if fallback else ""
-        details_open = "" if fallback else " open"
+        image = self._render_image(source, alt="flowchart", class_name="docvortex-image") if source else ""
+        details_open = "" if image else " open"
+        source_hidden = " hidden" if image else ""
         return (
-            f'<div class="docvortex-flowchart{fallback_class}" data-mermaid-state="pending">'
-            '<div class="docvortex-flowchart-canvas" role="img" aria-label="flowchart"></div>'
-            f"{fallback}</div>"
+            f"{image}"
             f'<details class="docvortex-details docvortex-flowchart-details"{details_open}>'
-            "<summary>flowchart source</summary>"
-            f'<pre class="docvortex-flowchart-source"><code>{escaped_source}</code></pre>'
+            "<summary>flowchart</summary>"
+            '<div class="docvortex-flowchart" data-mermaid-state="pending">'
+            '<div class="docvortex-flowchart-canvas" role="img" aria-label="flowchart"></div>'
+            "</div>"
+            f'<pre class="docvortex-flowchart-source"{source_hidden}><code>{escaped_source}</code></pre>'
             "</details>"
         )
 
@@ -984,16 +985,14 @@ document.addEventListener('DOMContentLoaded', function () {{
 
 
 def _mermaid_head() -> str:
-    """返回固定 Mermaid 入口和逐图安全渲染、失败回退脚本。"""
+    """返回固定 Mermaid 入口和折叠展开后按需安全渲染脚本。"""
     return f"""<script defer src="{_MERMAID_URL}"
   integrity="{_MERMAID_INTEGRITY}" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script>
 function markDocVortexMermaidError(host) {{
   host.dataset.mermaidState = 'error';
-  if (!host.classList.contains('docvortex-flowchart--has-raster')) {{
-    var details = host.nextElementSibling;
-    if (details && details.classList.contains('docvortex-flowchart-details')) details.open = true;
-  }}
+  var canvas = host.querySelector('.docvortex-flowchart-canvas');
+  if (canvas) canvas.textContent = 'Flowchart unavailable';
 }}
 document.addEventListener('DOMContentLoaded', function () {{
   var root = document.querySelector('.docvortex-document');
@@ -1017,15 +1016,16 @@ document.addEventListener('DOMContentLoaded', function () {{
     hosts.forEach(markDocVortexMermaidError);
     return;
   }}
-  (async function () {{
-    for (var index = 0; index < hosts.length; index += 1) {{
-      var host = hosts[index];
-      var details = host.nextElementSibling;
-      var source = details && details.querySelector('.docvortex-flowchart-source code');
+  hosts.forEach(function (host, index) {{
+    var details = host.closest('details');
+    // 仅在详情展开后读取隐藏源码并渲染一次。
+    var render = async function () {{
+      if (host.dataset.mermaidState !== 'pending') return;
+      var source = details ? details.querySelector('.docvortex-flowchart-source code') : null;
       var canvas = host.querySelector('.docvortex-flowchart-canvas');
       if (!source || !canvas) {{
         markDocVortexMermaidError(host);
-        continue;
+        return;
       }}
       var renderId = 'docvortex-mermaid-' + index;
       while (document.getElementById(renderId)) renderId += '-x';
@@ -1037,8 +1037,13 @@ document.addEventListener('DOMContentLoaded', function () {{
       }} catch (_error) {{
         markDocVortexMermaidError(host);
       }}
+    }};
+    if (details && !details.open) {{
+      details.addEventListener('toggle', function () {{ if (details.open) render(); }});
+    }} else {{
+      render();
     }}
-  }})();
+  }});
 }});
 </script>"""
 

{docvortex-0.5.4 → docvortex-0.5.5}/src/docvortex/resources/html/docvortex.css

@@ -277,9 +277,9 @@
   margin-inline: 0;
 }
 
-/* Mermaid 成功后替换 raster；无 JS、加载或语法失败时保留图片/源码回退。 */
+/* 原图恒为主视图；折叠 details 只展示按需渲染的 Mermaid 图。 */
 .docvortex-document .docvortex-flowchart {
-  margin: 1rem 0;
+  margin: 1rem 0 0.5rem;
   max-width: 100%;
   overflow-x: auto;
 }
@@ -297,23 +297,23 @@
   max-width: 100%;
 }
 
-.docvortex-document .docvortex-flowchart-fallback {
-  display: block;
-  margin-inline: 0;
-}
-
 .docvortex-document .docvortex-flowchart[data-mermaid-state="rendered"] .docvortex-flowchart-canvas {
   display: block;
 }
 
-.docvortex-document .docvortex-flowchart[data-mermaid-state="rendered"] .docvortex-flowchart-fallback {
-  display: none;
+.docvortex-document .docvortex-flowchart[data-mermaid-state="error"] .docvortex-flowchart-canvas {
+  display: block;
 }
 
 .docvortex-document .docvortex-flowchart-details {
   max-width: 100%;
 }
 
+.docvortex-document .docvortex-flowchart-source[hidden],
+.docvortex-document .docvortex-flowchart[data-mermaid-state="rendered"] + .docvortex-flowchart-source {
+  display: none;
+}
+
 .docvortex-document .docvortex-flowchart-source {
   max-height: 24rem;
   text-align: left;

docvortex-0.5.5/src/docvortex/resources/html/docvortex.min.css

@@ -0,0 +1 @@
+.docvortex-html-body{background:#ffffff;margin:0}.docvortex-html-body>.docvortex-document{margin:0 auto;max-width:60rem;min-height:100vh;padding:2rem}.docvortex-document{--docvortex-accent:#0b6fc2;--docvortex-accent-hover:#075a9c;--docvortex-background:#ffffff;--docvortex-border:#d1d5db;--docvortex-muted:#6b7280;--docvortex-surface:#f8fafc;--docvortex-text:#1f2937;background:var(--docvortex-background);box-sizing:border-box;color:var(--docvortex-text);font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;font-size:16px;line-height:1.65;overflow-wrap:break-word;width:100%}.docvortex-document *,.docvortex-document *::before,.docvortex-document *::after{box-sizing:inherit}.docvortex-document :is(h1,h2,h3,h4,h5,h6){color:var(--docvortex-text);font-weight:600;line-height:1.3;margin:1.5em 0 0.65em}.docvortex-document h1{font-size:2rem}.docvortex-document h2{font-size:1.5rem}.docvortex-document h3{font-size:1.25rem}.docvortex-document h4{font-size:1.125rem}.docvortex-document h5{font-size:1rem}.docvortex-document h6{color:var(--docvortex-muted);font-size:0.875rem}.docvortex-document .docvortex-block:first-child>:first-child,.docvortex-document .docvortex-page>.docvortex-block:first-child>:first-child{margin-top:0}.docvortex-document p{margin:0 0 1rem}.docvortex-document :is(strong,b){font-weight:700}.docvortex-document :is(s,del){color:var(--docvortex-muted)}.docvortex-document a{color:var(--docvortex-accent);text-decoration:none;text-underline-offset:0.15em}.docvortex-document a:hover{color:var(--docvortex-accent-hover);text-decoration:underline}.docvortex-document a:focus-visible{border-radius:0.15rem;outline:2px solid var(--docvortex-accent);outline-offset:2px}.docvortex-document blockquote{background:var(--docvortex-surface);border-left:0.25rem solid var(--docvortex-accent);color:var(--docvortex-muted);margin:1rem 0;padding:0.75rem 1rem}.docvortex-document blockquote>:first-child{margin-top:0}.docvortex-document blockquote>:last-child{margin-bottom:0}.docvortex-document :is(ol,ul){margin:0 0 1rem;padding-left:1.75rem}.docvortex-document ul{list-style:disc}.docvortex-document ul ul{list-style:circle}.docvortex-document ul ul ul{list-style:square}.docvortex-document ol{list-style:decimal}.docvortex-document :is(ol,ul) ol{list-style-type:lower-roman}.docvortex-document :is(ol,ul) :is(ol,ul) ol{list-style-type:lower-alpha}.docvortex-document li + li{margin-top:0.25rem}.docvortex-document li>:is(ol,ul){margin-bottom:0;margin-top:0.25rem}.docvortex-document .docvortex-list--explicit{list-style:none;padding-left:1.5rem}.docvortex-document .docvortex-list--unmarked{list-style:none;padding-left:0}.docvortex-document .docvortex-list-item--explicit{align-items:start;display:grid;gap:0.5em;grid-template-columns:max-content minmax(0,1fr)}.docvortex-document .docvortex-list-item--orphan{display:grid;grid-template-columns:0 minmax(0,1fr);list-style:none}.docvortex-document .docvortex-list-item--markerless{list-style:none}.docvortex-document .docvortex-list-marker{font-variant-numeric:tabular-nums;text-align:right;user-select:none;white-space:pre}.docvortex-document .docvortex-list-content{min-width:0}.docvortex-document .docvortex-list-item--orphan>.docvortex-list-marker{visibility:hidden}.docvortex-document .docvortex-list-item--orphan>:is(ol,ul),.docvortex-document .docvortex-list-item--explicit>:is(ol,ul){grid-column:2;margin-bottom:0}.docvortex-document .docvortex-index,.docvortex-document .docvortex-index ul{list-style:none;padding-left:0}.docvortex-document .docvortex-index ul ul{padding-left:1.5rem}.docvortex-document .docvortex-index a{overflow-wrap:anywhere}.docvortex-document table{border-collapse:collapse;border-spacing:0;display:block;margin:1rem 0;max-width:100%;overflow-x:auto;width:100%}.docvortex-document :is(th,td){border:1px solid var(--docvortex-border);padding:0.5rem 0.75rem;text-align:left;vertical-align:top}.docvortex-document th{background:var(--docvortex-surface);font-weight:600}.docvortex-document caption{color:var(--docvortex-muted);margin-bottom:0.5rem;text-align:left}.docvortex-document :is(th,td).docvortex-align-left{text-align:left}.docvortex-document :is(th,td).docvortex-align-center{text-align:center}.docvortex-document :is(th,td).docvortex-align-right{text-align:right}.docvortex-document img{height:auto;max-width:100%}.docvortex-document .docvortex-figure{margin:1.5rem 0;max-width:100%}.docvortex-document .docvortex-figure>img,.docvortex-document .docvortex-visual-body>img{display:block;margin-inline:0}.docvortex-document .docvortex-flowchart{margin:1rem 0 0.5rem;max-width:100%;overflow-x:auto}.docvortex-document .docvortex-flowchart-canvas{display:none;min-width:0;text-align:left}.docvortex-document .docvortex-flowchart-canvas svg{display:block;height:auto;margin-inline:0;max-width:100%}.docvortex-document .docvortex-flowchart[data-mermaid-state="rendered"] .docvortex-flowchart-canvas{display:block}.docvortex-document .docvortex-flowchart[data-mermaid-state="error"] .docvortex-flowchart-canvas{display:block}.docvortex-document .docvortex-flowchart-details{max-width:100%}.docvortex-document .docvortex-flowchart-source[hidden],.docvortex-document .docvortex-flowchart[data-mermaid-state="rendered"] + .docvortex-flowchart-source{display:none}.docvortex-document .docvortex-flowchart-source{max-height:24rem;text-align:left;white-space:pre}.docvortex-document .docvortex-caption{color:var(--docvortex-muted);font-size:0.9em;margin-top:0.5rem;text-align:left}.docvortex-document .docvortex-footnote,.docvortex-document .docvortex-page-footnote{color:var(--docvortex-muted);font-size:0.875em;margin-top:0.4rem;text-align:left}.docvortex-document .docvortex-details{border:1px solid var(--docvortex-border);border-radius:0.375rem;margin:1rem 0;padding:0.65rem 0.85rem}.docvortex-document .docvortex-details>summary{cursor:pointer;font-weight:600}.docvortex-document .docvortex-page-aux{color:var(--docvortex-muted);font-size:0.875rem}.docvortex-document code,.docvortex-document pre,.docvortex-document .docvortex-algorithm{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}.docvortex-document code{background:var(--docvortex-surface);border-radius:0.25rem;font-size:0.875em;padding:0.15em 0.35em}.docvortex-document pre{background:var(--docvortex-surface);border:1px solid var(--docvortex-border);border-radius:0.375rem;line-height:1.5;margin:1rem 0;max-width:100%;overflow:auto;padding:1rem;tab-size:4;white-space:pre}.docvortex-document pre>code{background:transparent;border-radius:0;display:inline;font-size:inherit;line-height:inherit;padding:0;white-space:inherit}.docvortex-document :is(code,pre)[class*="language-"]{color:#374151;text-align:left;text-shadow:none;word-break:normal;word-spacing:normal}.docvortex-document .token.comment,.docvortex-document .token.prolog,.docvortex-document .token.doctype,.docvortex-document .token.cdata{color:#6b7280}.docvortex-document .token.punctuation{color:#374151}.docvortex-document .token.namespace{opacity:0.75}.docvortex-document .token.keyword,.docvortex-document .token.operator,.docvortex-document .token.important,.docvortex-document .token.atrule{color:#7c3aed}.docvortex-document .token.string,.docvortex-document .token.attr-value,.docvortex-document .token.regex,.docvortex-document .token.url{color:#047857}.docvortex-document .token.number,.docvortex-document .token.boolean,.docvortex-document .token.constant,.docvortex-document .token.property,.docvortex-document .token.symbol{color:#0369a1}.docvortex-document .token.tag,.docvortex-document .token.selector,.docvortex-document .token.builtin{color:#b45309}.docvortex-document .token.function,.docvortex-document .token.class-name,.docvortex-document .token.attr-name{color:#be123c}.docvortex-document .token.important,.docvortex-document .token.bold{font-weight:700}.docvortex-document .token.italic{font-style:italic}.docvortex-document .token.inserted{background:#ecfdf5;color:#047857}.docvortex-document .token.deleted{background:#fff1f2;color:#be123c}.docvortex-document .token.entity{cursor:help}.docvortex-document .docvortex-algorithm{max-width:100%;overflow-x:auto;tab-size:4;white-space:pre-wrap;word-break:normal}.docvortex-document .docvortex-table-text,.docvortex-document .docvortex-raw-fallback{overflow:auto;tab-size:4;white-space:pre-wrap;word-break:break-word}.docvortex-document .docvortex-table-text{white-space:pre}.docvortex-document .docvortex-raw-fallback{border-left:0.2rem solid var(--docvortex-border);color:var(--docvortex-muted)}.docvortex-document .docvortex-math{overflow-wrap:anywhere}.docvortex-document .docvortex-math--block{display:block;margin:1rem 0;max-width:100%;overflow-x:auto;overflow-y:hidden;text-align:center}.docvortex-document mjx-container[display="true"]{max-width:100%;overflow-x:auto;overflow-y:hidden}.docvortex-document .docvortex-preserve-whitespace{white-space:pre-wrap}.docvortex-document .docvortex-text-emphasis{-webkit-text-emphasis:dot;-webkit-text-emphasis-position:under right;text-emphasis:dot;text-emphasis-position:under right}.docvortex-document .docvortex-page{min-width:0;position:relative}.docvortex-document--full .docvortex-page{min-height:1.5rem}.docvortex-document .docvortex-page-break{background:transparent;border:0;border-top:1px dashed var(--docvortex-border);height:0;margin:2rem 0}@media screen and (max-width:40rem){.docvortex-html-body>.docvortex-document{padding:1rem}.docvortex-document h1{font-size:1.75rem}.docvortex-document :is(th,td){padding:0.4rem 0.55rem}}@media print{.docvortex-html-body{background:#ffffff}.docvortex-html-body>.docvortex-document{max-width:none;min-height:0;padding:0}.docvortex-document .docvortex-page-break{display:none}.docvortex-document--full .docvortex-page{break-after:page;page-break-after:always}.docvortex-document--full .docvortex-page:last-child{break-after:auto;page-break-after:auto}.docvortex-document .docvortex-figure{break-inside:avoid;page-break-inside:avoid}.docvortex-document table{display:table;overflow:visible}.docvortex-document pre{overflow:visible;white-space:pre-wrap;word-break:break-word}}

{docvortex-0.5.4 → docvortex-0.5.5}/src/docvortex/version.py

@@ -1,3 +1,3 @@
-__version__ = "0.5.4"
+__version__ = "0.5.5"
 
 __all__ = ["__version__"]

{docvortex-0.5.4 → docvortex-0.5.5}/src/docvortex.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docvortex
-Version: 0.5.4
+Version: 0.5.5
 Summary: A fast, multi-format document parsing and conversion engine
 License-Expression: MIT
 Project-URL: Repository, https://github.com/myhloli/DocVortex

{docvortex-0.5.4 → docvortex-0.5.5}/tests/unittest/test_flash_html.py

@@ -1383,6 +1383,59 @@ def test_html_versioned_wire_roundtrips_canonical_visual_body_variants() -> None
     assert bodies[4].content == "" and bodies[4].image_url is None
 
 
+def test_html_versioned_wire_decodes_legacy_flowchart_shell_exactly() -> None:
+    """验证旧外壳（canvas 宿主在 details 外、raster 为回退图）仍走 exact 解码。"""
+    source = MiddleJson.model_validate(
+        {
+            "pages": [
+                {
+                    "page_idx": 0,
+                    "blocks": [
+                        {
+                            "type": "image",
+                            "index": 0,
+                            "sub_type": "flowchart",
+                            "content": [
+                                {
+                                    "type": "image_body",
+                                    "index": 0,
+                                    "content": "```mermaid\ngraph TD\nA-->B\n```",
+                                    "image_url": "https://example.com/flow.png",
+                                }
+                            ],
+                        }
+                    ],
+                }
+            ],
+            "is_full_document": True,
+            "metadata": {"file_suffix": "html", "producer": {"name": "docvortex", "version": "0.2.0"}},
+            "schema": "docvortex.middle",
+            "schema_version": "2.0",
+        }
+    )
+    soup = BeautifulSoup(render_html(source, standalone=False), "html.parser")
+    # 把当前外壳重排回旧外壳：canvas 宿主移出 details，原图降级为宿主内回退图。
+    details = soup.select_one("details.docvortex-flowchart-details")
+    host = details.select_one(".docvortex-flowchart")
+    image = soup.select_one("img.docvortex-image")
+    host["class"] = ["docvortex-flowchart", "docvortex-flowchart--has-raster"]
+    image["class"] = ["docvortex-flowchart-fallback"]
+    host.append(image)
+    details.insert_before(host.extract())
+    details.summary.string = "flowchart source"
+    details.select_one(".docvortex-flowchart-source").attrs.pop("hidden")
+
+    document = html_document_module.parse_html_document(str(soup).encode())
+    decode_result = decode_docvortex_html_wire(document.body, HtmlResourceContext(document.source_context))
+    middle, _ = analyze_native_test_document(str(soup).encode(), file_suffix="html")
+    block = middle.pages[0].blocks[0]
+
+    assert decode_result.blocks is not None and decode_result.fallback_reason is None
+    assert str(block.type) == "image" and block.sub_type == "flowchart"
+    assert block.content[0].content == "```mermaid\ngraph TD\nA-->B\n```"
+    assert block.content[0].image_url == "https://example.com/flow.png"
+
+
 def test_html_versioned_wire_distinguishes_index_carrier_from_inline_link() -> None:
     """验证未链接目录项中的普通 anchor 不会被误认为 renderer 目录外壳。"""
     source = MiddleJson.model_validate(

{docvortex-0.5.4 → docvortex-0.5.5}/tests/unittest/test_html_css_build.py

@@ -28,8 +28,13 @@ def test_visual_bodies_captions_and_footnotes_align_left() -> None:
         ".docvortex-document .docvortex-figure > img,\n"
         ".docvortex-document .docvortex-visual-body > img {\n  display: block;\n  margin-inline: 0;\n}"
     ) in source
-    assert ".docvortex-document .docvortex-flowchart {\n  margin: 1rem 0;" in source
+    assert ".docvortex-document .docvortex-flowchart {\n  margin: 1rem 0 0.5rem;" in source
     assert ".docvortex-document .docvortex-flowchart-canvas {\n  display: none;\n  min-width: 0;\n  text-align: left;" in source
+    assert (
+        '.docvortex-document .docvortex-flowchart-source[hidden],\n'
+        '.docvortex-document .docvortex-flowchart[data-mermaid-state="rendered"] + .docvortex-flowchart-source {\n'
+        '  display: none;\n}'
+    ) in source
     assert (
         ".docvortex-document .docvortex-caption {\n"
         "  color: var(--docvortex-muted);\n"

{docvortex-0.5.4 → docvortex-0.5.5}/tests/unittest/test_html_render.py

@@ -601,22 +601,27 @@ def test_visual_child_order_image_details_and_asset_precedence() -> None:
     assert len(soup.select(".docvortex-caption")) == 2
 
 
-def test_mermaid_flowchart_uses_live_canvas_raster_fallback_and_safe_config() -> None:
-    """验证受限 Mermaid 源生成 canvas，并保留 raster、源码和固定安全运行时。"""
+def test_mermaid_flowchart_keeps_raster_primary_and_lazy_details_render() -> None:
+    """验证原图为主视图，折叠区只显示图且隐藏源码供按需渲染。"""
     source_text = '%% comment\ngraph LR\n  A["<script>alert(1)</script>"] --> B'
     middle = _middle(_page(0, _flowchart(_mermaid_fence(source_text))))
     fragment = render_html(middle, standalone=False)
     standalone = render_html(middle)
     soup = BeautifulSoup(fragment, "html.parser")
 
-    host = soup.select_one(".docvortex-flowchart")
+    image = soup.select_one("img.docvortex-image")
+    assert image is not None and image["src"].startswith("data:image/png")
+    assert image.find_parent("details") is None
+    details = soup.select_one("details.docvortex-flowchart-details")
+    assert "open" not in details.attrs
+    assert details.summary.get_text(strip=True) == "flowchart"
+    assert [child.name for child in details.find_all(recursive=False)] == ["summary", "div", "pre"]
+    host = details.select_one(".docvortex-flowchart")
     assert host["data-mermaid-state"] == "pending"
-    assert "docvortex-flowchart--has-raster" in host["class"]
     assert host.select_one('.docvortex-flowchart-canvas[role="img"]') is not None
-    assert host.select_one(".docvortex-flowchart-fallback")["src"].startswith("data:image/png")
-    details = host.find_next_sibling("details")
-    assert "open" not in details.attrs
-    assert details.select_one(".docvortex-flowchart-source code").get_text() == source_text
+    hidden_source = details.select_one(".docvortex-flowchart-source")
+    assert hidden_source.has_attr("hidden")
+    assert hidden_source.code.get_text() == source_text
     assert soup.find("script") is None
     assert "mermaid@" not in fragment
     assert "mermaid@11.16.1/dist/mermaid.min.js" in standalone
@@ -626,10 +631,13 @@ def test_mermaid_flowchart_uses_live_canvas_raster_fallback_and_safe_config() ->
     assert "maxTextSize: 50000" in standalone and "maxEdges: 500" in standalone
     assert "flowchart: {htmlLabels: false, useMaxWidth: true}" in standalone
     assert "bindFunctions" not in standalone
+    assert "addEventListener('toggle'" in standalone
+    assert "closest('details')" in standalone
+    assert "Flowchart unavailable" in standalone
 
 
-def test_mermaid_flowchart_without_raster_opens_source_fallback() -> None:
-    """验证无 raster 的有效 flowchart 默认展开源码，等待或替代浏览器渲染。"""
+def test_mermaid_flowchart_without_raster_opens_diagram() -> None:
+    """验证无原图时源码作为渲染失败回退，成功渲染后由 CSS 隐藏。"""
     soup = BeautifulSoup(
         render_html(
             _middle(_page(0, _flowchart(_mermaid_fence("flowchart TD\n  A --> B"), with_raster=False))),
@@ -639,9 +647,12 @@ def test_mermaid_flowchart_without_raster_opens_source_fallback() -> None:
     )
 
     host = soup.select_one(".docvortex-flowchart")
-    assert "docvortex-flowchart--has-raster" not in host.get("class", [])
-    assert host.select_one("img") is None
-    assert "open" in host.find_next_sibling("details").attrs
+    details = host.find_parent("details")
+    assert details is not None and "docvortex-flowchart-details" in details.get("class", [])
+    assert details.summary.get_text(strip=True) == "flowchart"
+    assert not details.select_one(".docvortex-flowchart-source").has_attr("hidden")
+    assert soup.select_one("img") is None
+    assert "open" in details.attrs
 
 
 @pytest.mark.parametrize(

docvortex-0.5.4/src/docvortex/resources/html/docvortex.min.css

@@ -1 +0,0 @@
-.docvortex-html-body{background:#ffffff;margin:0}.docvortex-html-body>.docvortex-document{margin:0 auto;max-width:60rem;min-height:100vh;padding:2rem}.docvortex-document{--docvortex-accent:#0b6fc2;--docvortex-accent-hover:#075a9c;--docvortex-background:#ffffff;--docvortex-border:#d1d5db;--docvortex-muted:#6b7280;--docvortex-surface:#f8fafc;--docvortex-text:#1f2937;background:var(--docvortex-background);box-sizing:border-box;color:var(--docvortex-text);font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;font-size:16px;line-height:1.65;overflow-wrap:break-word;width:100%}.docvortex-document *,.docvortex-document *::before,.docvortex-document *::after{box-sizing:inherit}.docvortex-document :is(h1,h2,h3,h4,h5,h6){color:var(--docvortex-text);font-weight:600;line-height:1.3;margin:1.5em 0 0.65em}.docvortex-document h1{font-size:2rem}.docvortex-document h2{font-size:1.5rem}.docvortex-document h3{font-size:1.25rem}.docvortex-document h4{font-size:1.125rem}.docvortex-document h5{font-size:1rem}.docvortex-document h6{color:var(--docvortex-muted);font-size:0.875rem}.docvortex-document .docvortex-block:first-child>:first-child,.docvortex-document .docvortex-page>.docvortex-block:first-child>:first-child{margin-top:0}.docvortex-document p{margin:0 0 1rem}.docvortex-document :is(strong,b){font-weight:700}.docvortex-document :is(s,del){color:var(--docvortex-muted)}.docvortex-document a{color:var(--docvortex-accent);text-decoration:none;text-underline-offset:0.15em}.docvortex-document a:hover{color:var(--docvortex-accent-hover);text-decoration:underline}.docvortex-document a:focus-visible{border-radius:0.15rem;outline:2px solid var(--docvortex-accent);outline-offset:2px}.docvortex-document blockquote{background:var(--docvortex-surface);border-left:0.25rem solid var(--docvortex-accent);color:var(--docvortex-muted);margin:1rem 0;padding:0.75rem 1rem}.docvortex-document blockquote>:first-child{margin-top:0}.docvortex-document blockquote>:last-child{margin-bottom:0}.docvortex-document :is(ol,ul){margin:0 0 1rem;padding-left:1.75rem}.docvortex-document ul{list-style:disc}.docvortex-document ul ul{list-style:circle}.docvortex-document ul ul ul{list-style:square}.docvortex-document ol{list-style:decimal}.docvortex-document :is(ol,ul) ol{list-style-type:lower-roman}.docvortex-document :is(ol,ul) :is(ol,ul) ol{list-style-type:lower-alpha}.docvortex-document li + li{margin-top:0.25rem}.docvortex-document li>:is(ol,ul){margin-bottom:0;margin-top:0.25rem}.docvortex-document .docvortex-list--explicit{list-style:none;padding-left:1.5rem}.docvortex-document .docvortex-list--unmarked{list-style:none;padding-left:0}.docvortex-document .docvortex-list-item--explicit{align-items:start;display:grid;gap:0.5em;grid-template-columns:max-content minmax(0,1fr)}.docvortex-document .docvortex-list-item--orphan{display:grid;grid-template-columns:0 minmax(0,1fr);list-style:none}.docvortex-document .docvortex-list-item--markerless{list-style:none}.docvortex-document .docvortex-list-marker{font-variant-numeric:tabular-nums;text-align:right;user-select:none;white-space:pre}.docvortex-document .docvortex-list-content{min-width:0}.docvortex-document .docvortex-list-item--orphan>.docvortex-list-marker{visibility:hidden}.docvortex-document .docvortex-list-item--orphan>:is(ol,ul),.docvortex-document .docvortex-list-item--explicit>:is(ol,ul){grid-column:2;margin-bottom:0}.docvortex-document .docvortex-index,.docvortex-document .docvortex-index ul{list-style:none;padding-left:0}.docvortex-document .docvortex-index ul ul{padding-left:1.5rem}.docvortex-document .docvortex-index a{overflow-wrap:anywhere}.docvortex-document table{border-collapse:collapse;border-spacing:0;display:block;margin:1rem 0;max-width:100%;overflow-x:auto;width:100%}.docvortex-document :is(th,td){border:1px solid var(--docvortex-border);padding:0.5rem 0.75rem;text-align:left;vertical-align:top}.docvortex-document th{background:var(--docvortex-surface);font-weight:600}.docvortex-document caption{color:var(--docvortex-muted);margin-bottom:0.5rem;text-align:left}.docvortex-document :is(th,td).docvortex-align-left{text-align:left}.docvortex-document :is(th,td).docvortex-align-center{text-align:center}.docvortex-document :is(th,td).docvortex-align-right{text-align:right}.docvortex-document img{height:auto;max-width:100%}.docvortex-document .docvortex-figure{margin:1.5rem 0;max-width:100%}.docvortex-document .docvortex-figure>img,.docvortex-document .docvortex-visual-body>img{display:block;margin-inline:0}.docvortex-document .docvortex-flowchart{margin:1rem 0;max-width:100%;overflow-x:auto}.docvortex-document .docvortex-flowchart-canvas{display:none;min-width:0;text-align:left}.docvortex-document .docvortex-flowchart-canvas svg{display:block;height:auto;margin-inline:0;max-width:100%}.docvortex-document .docvortex-flowchart-fallback{display:block;margin-inline:0}.docvortex-document .docvortex-flowchart[data-mermaid-state="rendered"] .docvortex-flowchart-canvas{display:block}.docvortex-document .docvortex-flowchart[data-mermaid-state="rendered"] .docvortex-flowchart-fallback{display:none}.docvortex-document .docvortex-flowchart-details{max-width:100%}.docvortex-document .docvortex-flowchart-source{max-height:24rem;text-align:left;white-space:pre}.docvortex-document .docvortex-caption{color:var(--docvortex-muted);font-size:0.9em;margin-top:0.5rem;text-align:left}.docvortex-document .docvortex-footnote,.docvortex-document .docvortex-page-footnote{color:var(--docvortex-muted);font-size:0.875em;margin-top:0.4rem;text-align:left}.docvortex-document .docvortex-details{border:1px solid var(--docvortex-border);border-radius:0.375rem;margin:1rem 0;padding:0.65rem 0.85rem}.docvortex-document .docvortex-details>summary{cursor:pointer;font-weight:600}.docvortex-document .docvortex-page-aux{color:var(--docvortex-muted);font-size:0.875rem}.docvortex-document code,.docvortex-document pre,.docvortex-document .docvortex-algorithm{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}.docvortex-document code{background:var(--docvortex-surface);border-radius:0.25rem;font-size:0.875em;padding:0.15em 0.35em}.docvortex-document pre{background:var(--docvortex-surface);border:1px solid var(--docvortex-border);border-radius:0.375rem;line-height:1.5;margin:1rem 0;max-width:100%;overflow:auto;padding:1rem;tab-size:4;white-space:pre}.docvortex-document pre>code{background:transparent;border-radius:0;display:inline;font-size:inherit;line-height:inherit;padding:0;white-space:inherit}.docvortex-document :is(code,pre)[class*="language-"]{color:#374151;text-align:left;text-shadow:none;word-break:normal;word-spacing:normal}.docvortex-document .token.comment,.docvortex-document .token.prolog,.docvortex-document .token.doctype,.docvortex-document .token.cdata{color:#6b7280}.docvortex-document .token.punctuation{color:#374151}.docvortex-document .token.namespace{opacity:0.75}.docvortex-document .token.keyword,.docvortex-document .token.operator,.docvortex-document .token.important,.docvortex-document .token.atrule{color:#7c3aed}.docvortex-document .token.string,.docvortex-document .token.attr-value,.docvortex-document .token.regex,.docvortex-document .token.url{color:#047857}.docvortex-document .token.number,.docvortex-document .token.boolean,.docvortex-document .token.constant,.docvortex-document .token.property,.docvortex-document .token.symbol{color:#0369a1}.docvortex-document .token.tag,.docvortex-document .token.selector,.docvortex-document .token.builtin{color:#b45309}.docvortex-document .token.function,.docvortex-document .token.class-name,.docvortex-document .token.attr-name{color:#be123c}.docvortex-document .token.important,.docvortex-document .token.bold{font-weight:700}.docvortex-document .token.italic{font-style:italic}.docvortex-document .token.inserted{background:#ecfdf5;color:#047857}.docvortex-document .token.deleted{background:#fff1f2;color:#be123c}.docvortex-document .token.entity{cursor:help}.docvortex-document .docvortex-algorithm{max-width:100%;overflow-x:auto;tab-size:4;white-space:pre-wrap;word-break:normal}.docvortex-document .docvortex-table-text,.docvortex-document .docvortex-raw-fallback{overflow:auto;tab-size:4;white-space:pre-wrap;word-break:break-word}.docvortex-document .docvortex-table-text{white-space:pre}.docvortex-document .docvortex-raw-fallback{border-left:0.2rem solid var(--docvortex-border);color:var(--docvortex-muted)}.docvortex-document .docvortex-math{overflow-wrap:anywhere}.docvortex-document .docvortex-math--block{display:block;margin:1rem 0;max-width:100%;overflow-x:auto;overflow-y:hidden;text-align:center}.docvortex-document mjx-container[display="true"]{max-width:100%;overflow-x:auto;overflow-y:hidden}.docvortex-document .docvortex-preserve-whitespace{white-space:pre-wrap}.docvortex-document .docvortex-text-emphasis{-webkit-text-emphasis:dot;-webkit-text-emphasis-position:under right;text-emphasis:dot;text-emphasis-position:under right}.docvortex-document .docvortex-page{min-width:0;position:relative}.docvortex-document--full .docvortex-page{min-height:1.5rem}.docvortex-document .docvortex-page-break{background:transparent;border:0;border-top:1px dashed var(--docvortex-border);height:0;margin:2rem 0}@media screen and (max-width:40rem){.docvortex-html-body>.docvortex-document{padding:1rem}.docvortex-document h1{font-size:1.75rem}.docvortex-document :is(th,td){padding:0.4rem 0.55rem}}@media print{.docvortex-html-body{background:#ffffff}.docvortex-html-body>.docvortex-document{max-width:none;min-height:0;padding:0}.docvortex-document .docvortex-page-break{display:none}.docvortex-document--full .docvortex-page{break-after:page;page-break-after:always}.docvortex-document--full .docvortex-page:last-child{break-after:auto;page-break-after:auto}.docvortex-document .docvortex-figure{break-inside:avoid;page-break-inside:avoid}.docvortex-document table{display:table;overflow:visible}.docvortex-document pre{overflow:visible;white-space:pre-wrap;word-break:break-word}}