graph-easy 0.0.2__tar.gz → 0.0.4__tar.gz

{graph_easy-0.0.2/src/graph_easy.egg-info → graph_easy-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: graph-easy
-Version: 0.0.2
+Version: 0.0.4
 Summary: A Python port of Graph::Easy - lay out and render graphs as ASCII art
 Author: Tels (original Graph::Easy author)
 License: GPL-2.0-or-later
@@ -70,7 +70,12 @@ $ printf '[ Bonn ] --> [ Berlin ] --> [ Hamburg ]\n' | graph-easy
 ┌──────┐         ┌────────┐         ┌─────────┐
 │ Bonn │ ───────>│ Berlin │ ───────>│ Hamburg │
 └──────┘         └────────┘         └─────────┘
+```
+
+Colours from `fill`/`color` attributes are **on by default**; use
+`--no-color` to disable, or `--color auto` to enable only on a TTY.
 
+```console
 # plain-ASCII output
 $ printf '[ A ] ..> [ B ]\n' | graph-easy --ascii
 +---+         +---+

{graph_easy-0.0.2 → graph_easy-0.0.4}/README.md

@@ -51,7 +51,12 @@ $ printf '[ Bonn ] --> [ Berlin ] --> [ Hamburg ]\n' | graph-easy
 ┌──────┐         ┌────────┐         ┌─────────┐
 │ Bonn │ ───────>│ Berlin │ ───────>│ Hamburg │
 └──────┘         └────────┘         └─────────┘
+```
+
+Colours from `fill`/`color` attributes are **on by default**; use
+`--no-color` to disable, or `--color auto` to enable only on a TTY.
 
+```console
 # plain-ASCII output
 $ printf '[ A ] ..> [ B ]\n' | graph-easy --ascii
 +---+         +---+

{graph_easy-0.0.2 → graph_easy-0.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "graph-easy"
-version = "0.0.2"
+version = "0.0.4"
 description = "A Python port of Graph::Easy - lay out and render graphs as ASCII art"
 readme = "README.md"
 license = { text = "GPL-2.0-or-later" }

{graph_easy-0.0.2 → graph_easy-0.0.4}/src/graph_easy/cli.py

@@ -26,16 +26,19 @@ def main(argv: list[str] | None = None) -> int:
     )
     ap.add_argument(
         "--color",
-        action="store_true",
-        help="apply ANSI colours from fill/color attributes",
+        nargs="?",
+        const="on",
+        choices=["on", "off", "auto"],
+        help="apply ANSI colours (default: on; 'auto' = only when output is a TTY)",
     )
     ap.add_argument(
         "--no-color",
         dest="color",
-        action="store_false",
-        help="disable ANSI colours (default when output is piped)",
+        action="store_const",
+        const="off",
+        help="disable ANSI colours",
     )
-    ap.set_defaults(color=None)
+    ap.set_defaults(color="on")
     args = ap.parse_args(argv)
 
     if args.file and args.file != "-":
@@ -44,8 +47,12 @@ def main(argv: list[str] | None = None) -> int:
     else:
         text = sys.stdin.read()
 
-    if args.color is None:
+    if args.color == "auto":
         args.color = sys.stdout.isatty()
+    elif args.color == "on":
+        args.color = True
+    else:
+        args.color = False
     graph = parse_graph(text)
     output = render(graph, ascii_style=args.ascii, color=args.color)
     sys.stdout.write(output + "\n")

{graph_easy-0.0.2 → graph_easy-0.0.4}/src/graph_easy/render.py

@@ -213,7 +213,7 @@ def _draw_edge(
     tx = tx0
     sy = sy0 + sh // 2
     ty = ty0 + th // 2
-    cx = sx + _CHANNEL // 2
+    cx = (sx + tx) // 2 if tx - sx > _CHANNEL else sx + _CHANNEL // 2
 
     hch, vch, cch = styles.get(edge.style or _STYLE_DEFAULT)
 
@@ -272,8 +272,26 @@ def _draw_edge(
             put_cross(cx, y, vch)
         return
 
+    def put_corner(x: int, y: int, ch: str) -> None:
+        if 0 <= y < len(canvas) and 0 <= x < len(canvas[y]):
+            cur = canvas[y][x]
+            if cur in (" ", hch, vch):
+                canvas[y][x] = ch
+            elif cur != ch:
+                canvas[y][x] = cch
+
+    # source arm: horizontal sx..cx at row sy, then corner down at cx
     for x in range(sx + 1, cx):
         put(x, sy, hch)
+    if sy < ty:
+        put_corner(cx, sy, "┌")
+    elif sy > ty:
+        put_corner(cx, sy, "└")
+    # target arm: vertical cx..ty already drawn (vertical_only pass), corner right at cx,ty
+    if ty < sy:
+        put_corner(cx, ty, "┐")
+    elif ty > sy:
+        put_corner(cx, ty, "┘")
     for x in range(cx, tx):
         put(x, ty, hch)
     if edge.directed_to_target:
@@ -286,6 +304,42 @@ def _draw_edge(
             put(cx + i + 1, mid_y, ch)
 
 
+def _barycenter_order(layers: list[list[str]], graph: Graph) -> list[list[str]]:
+    """Reorder nodes within each layer to reduce edge crossings.
+
+    Sugiyama barycenter heuristic: each node's x position is the average of
+    its neighbours' positions in the previous layer; layers are then sorted
+    by that average. Iterates top-down then bottom-up until stable.
+    """
+    order = [list(layer) for layer in layers]
+    n_layers = len(order)
+    for _ in range(n_layers + 1):
+        changed = False
+        for direction in (1, -1):
+            for li in range(n_layers):
+                prev_i = li - direction
+                if prev_i < 0 or prev_i >= n_layers:
+                    continue
+                prev_order = order[prev_i]
+                prev_idx = {n: i for i, n in enumerate(prev_order)}
+                score: list[tuple[float, int, str]] = []
+                for j, n in enumerate(order[li]):
+                    neigh = [e.target for e in graph.edges if e.source == n and e.target in prev_idx]
+                    neigh += [e.source for e in graph.edges if e.target == n and e.source in prev_idx]
+                    if neigh:
+                        avg = sum(prev_idx[x] for x in neigh) / len(neigh)
+                    else:
+                        avg = j
+                    score.append((avg, j, n))
+                new_order = [x[2] for x in sorted(score)]
+                if new_order != order[li]:
+                    order[li] = new_order
+                    changed = True
+        if not changed:
+            break
+    return order
+
+
 def render(graph: Graph, *, ascii_style: bool = False, color: bool = False) -> str:
     """Render the graph to multi-line ASCII/Unicode text (no trailing newline)."""
     if not graph.nodes:
@@ -294,7 +348,7 @@ def render(graph: Graph, *, ascii_style: bool = False, color: bool = False) -> s
     styles = _STYLE_ASCII if ascii_style else _STYLE_UNICODE
     bands: list[str] = []
     for comp in _components(graph):
-        layers = _layers(comp, graph)
+        layers = _barycenter_order(_layers(comp, graph), graph)
         layer_boxes = [[_box(graph.nodes[n], box_chars) for n in layer] for layer in layers]
         col_w = [max(max(len(row) for row in b) for b in boxes) for boxes in layer_boxes]
         col_h = [sum(len(b) for b in boxes) + (len(boxes) - 1) for boxes in layer_boxes]

{graph_easy-0.0.2 → graph_easy-0.0.4/src/graph_easy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: graph-easy
-Version: 0.0.2
+Version: 0.0.4
 Summary: A Python port of Graph::Easy - lay out and render graphs as ASCII art
 Author: Tels (original Graph::Easy author)
 License: GPL-2.0-or-later
@@ -70,7 +70,12 @@ $ printf '[ Bonn ] --> [ Berlin ] --> [ Hamburg ]\n' | graph-easy
 ┌──────┐         ┌────────┐         ┌─────────┐
 │ Bonn │ ───────>│ Berlin │ ───────>│ Hamburg │
 └──────┘         └────────┘         └─────────┘
+```
+
+Colours from `fill`/`color` attributes are **on by default**; use
+`--no-color` to disable, or `--color auto` to enable only on a TTY.
 
+```console
 # plain-ASCII output
 $ printf '[ A ] ..> [ B ]\n' | graph-easy --ascii
 +---+         +---+

{graph_easy-0.0.2 → graph_easy-0.0.4}/tests/test_graph_easy.py

@@ -161,6 +161,41 @@ def test_disjoint_groups_render_separately():
     assert out.count("┌ G2") == 1
 
 
+# ---- layout: fan-out / parallel branches ------------------------------------
+
+def test_fan_out_keeps_all_edges():
+    g = parse_graph("[ S ] --> [ A ]\n[ S ] --> [ B ]\n[ S ] --> [ C ]\n")
+    assert len(g.edges) == 3
+    out = render(g)
+    # all three targets appear
+    assert "A" in out and "B" in out and "C" in out
+
+
+def test_diamond_renders_all_four_edges():
+    g = parse_graph("[ A ] --> [ B ]\n[ A ] --> [ C ]\n[ B ] --> [ D ]\n[ C ] --> [ D ]\n")
+    assert len(g.edges) == 4
+    out = render(g)
+    assert "D" in out and "B" in out and "C" in out
+
+
+def test_parallel_paths_merge_cleanly():
+    g = parse_graph(
+        "[ S ] --> [ P1 ]\n[ S ] --> [ P2 ]\n"
+        "[ P1 ] --> [ T ]\n[ P2 ] --> [ T ]\n"
+    )
+    out = render(g)
+    assert "P1" in out and "P2" in out and "T" in out
+
+
+def test_edge_corners_use_box_chars():
+    # a downward branch must draw a ┌ corner where the arm turns vertical
+    out = render(parse_graph("[ A ] --> [ B ]\n[ A ] --> [ C ]"))
+    assert "┌" in out
+    # an upward merge must draw a └/┐ corner
+    out2 = render(parse_graph("[ A ] --> [ D ]\n[ B ] --> [ D ]"))
+    assert "└" in out2 or "┐" in out2
+
+
 def test_filled_arrowhead():
     g = parse_graph("[ A ] -- { arrowshape: filled; } --> [ B ]")
     assert g.edges[0].attrs.get("arrowshape") == "filled"