termrender 2.0.0__tar.gz → 2.1.0__tar.gz

{termrender-2.0.0 → termrender-2.1.0}/CHANGELOG.md

@@ -1,6 +1,38 @@
 # CHANGELOG
 
 
+## v2.1.0 (2026-05-16)
+
+### Documentation
+
+- **claude-md**: Document mermaid-ascii vendoring and correct stale --maxWidth
+  ([`643e25a`](https://github.com/crouton-labs/termrender/commit/643e25a791de1f32591b245dee064f290221cfc2))
+
+Note _mermaid_bin resolution, the pinned master binary, the no-width-flag reality, and the back-edge
+  panic in renderers/CLAUDE.md.
+
+- **claude-md**: Note QUOTE +1 height only applies to author/by attrs
+  ([`3184d43`](https://github.com/crouton-labs/termrender/commit/3184d43e7293af735b82d559bc3253d7542cbf85))
+
+### Features
+
+- **mermaid**: Vendor engine from upstream master, fix broken -w invocation
+  ([`d801de5`](https://github.com/crouton-labs/termrender/commit/d801de5bb22ba5205fe52ef65e80eda96590be93))
+
+mermaid-ascii has no -w/width flag and never has; layout.py and mermaid.py passed `-w <width>`, so
+  every diagram exited non-zero and degraded to raw source text on the 1.2.0 wheel. Drop -w (call is
+  now `-f - -y 1`).
+
+Resolve the binary via new _mermaid_bin.mermaid_ascii_bin(): prefer vendored
+  _bin/mermaid-ascii-<os>-<arch> (built from pinned upstream master 6fffb8e via
+  scripts/build-mermaid-ascii.sh), else fall back to `mermaid-ascii` on PATH (PyPI wheel, capped at
+  1.2.0). pyproject ships the binary via hatch artifacts and bumps the fallback dep to >=1.2.
+
+Caveats: only darwin-arm64 is vendored (other platforms fall back to the older PyPI engine); a
+  labeled back-edge in graph LR panics the binary on both 1.2.0 and master and degrades to source.
+  mermaid-ascii has no width control, so wide diagrams overflow (renderer pads, never truncates).
+
+
 ## v2.0.0 (2026-05-16)
 
 ### Continuous Integration

{termrender-2.0.0 → termrender-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: termrender
-Version: 2.0.0
+Version: 2.1.0
 Summary: Rich terminal rendering of directive-flavored markdown
 Project-URL: Homepage, https://github.com/CaptainCrouton89/termrender
 Project-URL: Repository, https://github.com/CaptainCrouton89/termrender
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Terminals
 Classifier: Topic :: Text Processing :: Markup :: Markdown
 Requires-Python: >=3.10
-Requires-Dist: mermaid-ascii>=1.0
+Requires-Dist: mermaid-ascii>=1.2
 Requires-Dist: mistune>=3.0
 Requires-Dist: pygments>=2.0
 Description-Content-Type: text/markdown

{termrender-2.0.0 → termrender-2.1.0}/pyproject.toml

@@ -28,7 +28,7 @@ classifiers = [
 ]
 dependencies = [
     "mistune>=3.0",
-    "mermaid-ascii>=1.0",
+    "mermaid-ascii>=1.2",
     "pygments>=2.0",
 ]
 
@@ -45,6 +45,11 @@ source = "vcs"
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/termrender"]
+# Ship the vendored mermaid-ascii binary (built from pinned upstream master;
+# see scripts/build-mermaid-ascii.sh). It lives inside the package dir so the
+# default file selection includes it; artifacts ensures it survives even if
+# VCS-ignored, and hatchling preserves its 0o755 exec bit.
+artifacts = ["src/termrender/_bin/*"]
 
 [tool.semantic_release]
 version_toml = []

termrender-2.1.0/scripts/build-mermaid-ascii.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# Build the vendored mermaid-ascii binary from pinned upstream master.
+#
+# Usage: scripts/build-mermaid-ascii.sh
+#
+# Produces src/termrender/_bin/mermaid-ascii-<os>-<arch> for the *host*
+# platform. Run on each target platform (or with GOOS/GOARCH set) to refresh
+# the vendored binaries. Requires a Go toolchain (>=1.21).
+#
+# Why vendored: the PyPI `mermaid-ascii` wheel only ships up to 1.2.0, which
+# lacks the master-only flowchart fixes (multiline node labels, duplicate /
+# bidirectional edge-label separation, subgraph titles, wide-rune label
+# widths). termrender prefers this binary and falls back to the PyPI wheel's
+# `mermaid-ascii` on PATH for platforms not vendored here.
+set -euo pipefail
+
+# Pinned upstream commit (github.com/AlexanderGrooff/mermaid-ascii master).
+PIN="6fffb8e2714acab2c4cb41c78894fabbc62cee56"
+
+repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+workdir="$(mktemp -d)"
+trap 'rm -rf "$workdir"' EXIT
+
+git clone https://github.com/AlexanderGrooff/mermaid-ascii.git "$workdir/src"
+git -C "$workdir/src" checkout --quiet "$PIN"
+
+os="$(go env GOOS)"
+arch="$(go env GOARCH)"
+out="$repo_root/src/termrender/_bin/mermaid-ascii-${os}-${arch}"
+
+mkdir -p "$(dirname "$out")"
+( cd "$workdir/src" && go build -trimpath -o "$out" . )
+chmod 755 "$out"
+
+echo "Built $out"
+"$out" --help >/dev/null && echo "Smoke test OK (pin ${PIN:0:7})"

termrender-2.1.0/src/termrender/CLAUDE.md

@@ -0,0 +1 @@
+- **QUOTE** height gets `+1` only when `author` or `by` attr is set. Using any other key (`attribution`, `source`) silently omits the extra line — the renderer's attribution line is clipped.

termrender-2.1.0/src/termrender/_mermaid_bin.py

@@ -0,0 +1,41 @@
+"""Resolve the ``mermaid-ascii`` executable.
+
+Prefers the vendored build from pinned upstream master (commit ``6fffb8e``,
+2026-04-27) under ``_bin/mermaid-ascii-<os>-<arch>``; this carries the
+master-only flowchart fixes the PyPI wheel (capped at 1.2.0) lacks. Falls back
+to a ``mermaid-ascii`` on PATH (the PyPI ``mermaid-ascii`` wheel) for platforms
+not vendored here.
+
+Rebuild vendored binaries with ``scripts/build-mermaid-ascii.sh``.
+"""
+
+from __future__ import annotations
+
+import os
+import platform
+from functools import lru_cache
+
+_BIN_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "_bin")
+
+_OS_MAP = {"darwin": "darwin", "linux": "linux", "windows": "windows"}
+_ARCH_MAP = {
+    "arm64": "arm64",
+    "aarch64": "arm64",
+    "x86_64": "amd64",
+    "amd64": "amd64",
+}
+
+
+def _platform_tag() -> str:
+    osname = _OS_MAP.get(platform.system().lower(), platform.system().lower())
+    arch = _ARCH_MAP.get(platform.machine().lower(), platform.machine().lower())
+    return f"{osname}-{arch}"
+
+
+@lru_cache(maxsize=1)
+def mermaid_ascii_bin() -> str:
+    """Path to the vendored mermaid-ascii, or ``"mermaid-ascii"`` for PATH lookup."""
+    vendored = os.path.join(_BIN_DIR, f"mermaid-ascii-{_platform_tag()}")
+    if os.path.isfile(vendored) and os.access(vendored, os.X_OK):
+        return vendored
+    return "mermaid-ascii"

{termrender-2.0.0 → termrender-2.1.0}/src/termrender/layout.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import subprocess
 
+from termrender._mermaid_bin import mermaid_ascii_bin
 from termrender.blocks import Block, BlockType
 from termrender.renderers.mermaid import fix_mermaid_encoding, preprocess_mermaid_for_ascii
 from termrender.style import wrap_text, visual_len
@@ -147,7 +148,7 @@ def resolve_height(block: Block) -> None:
         rendered = source  # fallback
         try:
             result = subprocess.run(
-                ["mermaid-ascii", "-f", "-", "-w", str(block.width or 80), "-y", "1"],
+                [mermaid_ascii_bin(), "-f", "-", "-y", "1"],
                 input=preprocess_mermaid_for_ascii(source),
                 capture_output=True,
                 text=True,

{termrender-2.0.0 → termrender-2.1.0}/src/termrender/renderers/CLAUDE.md

@@ -52,3 +52,5 @@ Attribution line is rendered for `block.attrs["author"]` **or** `block.attrs["by
 **Trailing blank line**: `rendered.split("\n")` on output ending with `\n` (typical subprocess output) produces a trailing empty string, which becomes a `block.width`-wide blank line appended to every mermaid block.
 
 Layout pre-renders into `block.attrs["_rendered"]` (see `src/termrender/CLAUDE.md`); this renderer re-runs the subprocess only when that key is absent.
+
+**Binary resolution & no width flag**: the executable comes from `_mermaid_bin.mermaid_ascii_bin()` — the vendored `_bin/mermaid-ascii-<os>-<arch>` (pinned upstream master `6fffb8e`, built via `scripts/build-mermaid-ascii.sh`) if present for the platform, else `mermaid-ascii` on PATH (the PyPI wheel, capped at 1.2.0). **`mermaid-ascii` has no width-control flag** (never has — `--maxWidth`/`-w` do not exist); the call passes only `-f - -y 1`, so `block.width` does not constrain the diagram and wide output overflows (compounding the no-truncation gotcha above). A labeled back-edge (`X -->|lbl| Y` in `graph LR`) panics the binary on **both** 1.2.0 and master; the non-zero exit is caught and the block degrades to raw source.

{termrender-2.0.0 → termrender-2.1.0}/src/termrender/renderers/borders.py

@@ -31,7 +31,7 @@ def render_box(
     corner_v = visual_len("┌")  # same as ┐, └, ┘
 
     # Grow the box if any content line (or the title) won't fit at the
-    # requested width. mermaid-ascii's --maxWidth is non-strict, so a child
+    # requested width. mermaid-ascii has no width-control flag, so a child
     # mermaid block can return lines wider than its allocated content area.
     # Truncating would corrupt the diagram; growing keeps the box's top,
     # bottom, and side borders aligned at the same column even if it

{termrender-2.0.0 → termrender-2.1.0}/src/termrender/renderers/mermaid.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import re
 import subprocess
 
+from termrender._mermaid_bin import mermaid_ascii_bin
 from termrender.blocks import Block
 from termrender.style import visual_ljust
 
@@ -81,7 +82,7 @@ def render(block: Block, color: bool) -> list[str]:
         source = block.attrs.get("source", "")
         try:
             result = subprocess.run(
-                ["mermaid-ascii", "-f", "-", "-w", str(block.width or 80), "-y", "1"],
+                [mermaid_ascii_bin(), "-f", "-", "-y", "1"],
                 input=preprocess_mermaid_for_ascii(source),
                 capture_output=True,
                 text=True,

termrender-2.0.0/src/termrender/CLAUDE.md

@@ -1,15 +0,0 @@
-- `layout.py` imports `fix_mermaid_encoding` and `preprocess_mermaid_for_ascii` from `renderers/mermaid.py` — the only reverse dependency from layout into renderers. Reorganizing `renderers/` must preserve these imports. The two mermaid subprocess call sites differ: layout uses `check=True` (non-zero exit raises → caught → raw-source fallback); the renderer omits `check` (non-zero exit silently reads `stdout`, which may be empty or partial).
-
-- `--check` calls `parse()` and exits — it never runs `layout.py`. Layout-time failures (mermaid subprocess missing, column percent overflow, `resolve_width`/`resolve_height` exceptions) pass `--check` cleanly but crash at render time.
-
-- Column widths: explicit percent/absolute allocations are subtracted first; remaining space is split among auto-width columns with `max(remaining, 0)`. Two columns each claiming 80% of a 100px terminal leaves auto-width columns with `width = 1` — no error, no proportional scaling.
-
-- **QUOTE** height gets `+1` only when `author` or `by` attr is set. Using any other key (`attribution`, `source`) silently omits the extra line — the renderer's attribution line is clipped.
-
-- **LIST_ITEM** layout wraps at `max(width - 2, 1)`, hardcoding a 2-column indent. If the renderer changes the indent width, layout height and actual render height diverge silently.
-
-- `text.py:32–33`: after each wrapped line, the offset skips one character if the next plain-text character is a space (the space `wrap_text` consumed). If wrapping preserves trailing spaces, this skip shifts subsequent span styling by one character.
-
-- `--tmux` exits `EXIT_OK` after the tmux pane command succeeds — the `--check` branch comes later and is never reached. `--check` is silently dropped when combined with `--tmux`.
-
-- `_EMOJI_WIDE_RANGES` in `style.py`: `_char_width()` exits early when `cp < lo`, assuming ranges are in ascending codepoint order. Adding a range out of order silently misclassifies all codepoints whose `lo` is higher than the inserted range's `lo`.