rich-struct 0.3.0__tar.gz → 0.3.2__tar.gz

{rich_struct-0.3.0 → rich_struct-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: rich-struct
-Version: 0.3.0
+Version: 0.3.2
 Summary: rich.print with 25 themes (Midnight Slate, Tokyo Night, Dracula, Nord, ...) and print_md/json/yaml/xml/obj/table helpers
 Project-URL: Homepage, https://github.com/wiertmir/rich-struct
 Project-URL: Issues, https://github.com/wiertmir/rich-struct/issues

{rich_struct-0.3.0 → rich_struct-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rich-struct"
-version = "0.3.0"
+version = "0.3.2"
 description = "rich.print with 25 themes (Midnight Slate, Tokyo Night, Dracula, Nord, ...) and print_md/json/yaml/xml/obj/table helpers"
 readme = "README.md"
 requires-python = ">=3.9"

{rich_struct-0.3.0 → rich_struct-0.3.2}/rich_struct/__init__.py

@@ -4,6 +4,7 @@ import xml.etree.ElementTree as ET
 from typing import IO, Any, Optional, Union
 
 from rich.console import Console
+from rich.highlighter import ReprHighlighter
 from rich.json import JSON
 from rich.markdown import Markdown
 from rich.padding import Padding
@@ -34,6 +35,13 @@ __all__ = [
 
 ThemeType = Union[ThemeName, Theme, ThemeLiteral]
 
+
+class _ObjectHighlighter(ReprHighlighter):
+    """rich's repr highlighting, plus dict keys as ``repr.key`` (themes without it show them as strings)."""
+
+    # ponytail: any quoted string followed by ": " counts as a key; a real parser if that misfires
+    highlights = [*ReprHighlighter.highlights, r"""(?P<key>(?<!\w)(?:'[^'\n]*'|"[^"\n]*"))(?=: )"""]
+
 _default_theme: ThemeType = DEFAULT_THEME
 
 
@@ -149,7 +157,7 @@ def print_obj(obj: Any, *, theme: Optional[ThemeType] = None, **kwargs: Any) ->
     """Pretty-print any Python object (dataclasses, dicts, nested structures...)."""
     if obj is None:
         return print(None, theme=theme, **kwargs)
-    print(Pretty(obj, expand_all=True), theme=theme, **kwargs)
+    print(Pretty(obj, expand_all=True, highlighter=_ObjectHighlighter()), theme=theme, **kwargs)
 
 
 def print_table(

{rich_struct-0.3.0 → rich_struct-0.3.2}/rich_struct/themes.py

@@ -133,25 +133,26 @@ _OVERRIDES = {
         "markdown.h4": "bold #a5b4fc",
         "markdown.h5": "#a5b4fc",
         "markdown.h6": "dim #a5b4fc",
-        "markdown.strong": "bold #f8fafc",
+        "markdown.strong": "bold #ffffff",
         "markdown.em": "italic #c4b5fd",
         "markdown.emph": "italic #c4b5fd",
         "markdown.s": "strike #64748b",
         "markdown.code": "#fbbf24 on #111c2e",
         "markdown.block_quote": "italic #86efac",
-        "markdown.item.bullet": "bold #fbbf24",
-        "markdown.item.number": "bold #fbbf24",
+        "markdown.item.bullet": "bold #86efac",
+        "markdown.item.number": "bold #86efac",
         "markdown.link": "underline #38bdf8",
         "markdown.link_url": "underline #38bdf8",  # rich styles link text with link_url
         "markdown.hr": "#475569",
         "json.brace": "#94a3b8",
-        "json.key": "#7dd3fc",
+        "json.key": "#a3c2f2",
         "json.bool_true": "bold #22d3ee",
         "json.bool_false": "bold #22d3ee",
         "json.null": "italic #a78bfa",
         # objects (print_obj)
         "repr.background": "on #0f172a",
-        "repr.attrib_name": "#cbd5e1",
+        "repr.attrib_name": "#a3c2f2",
+        "repr.key": "#a3c2f2",
         "repr.call": "bold #22d3ee",
         "repr.str": "#a3e635",
         "repr.number": "#fbbf24",
@@ -187,13 +188,14 @@ _OVERRIDES = {
         "markdown.link_url": "underline #2563eb",  # rich styles link text with link_url
         "markdown.hr": "#cbd5e1",
         "json.brace": "#64748b",
-        "json.key": "#0369a1",
+        "json.key": "#1e3f7a",
         "json.bool_true": "bold #0e7490",
         "json.bool_false": "bold #0e7490",
         "json.null": "italic #7c3aed",
         # objects (print_obj)
         "repr.background": "on #ffffff",
-        "repr.attrib_name": "#1f2937",
+        "repr.attrib_name": "#1e3f7a",
+        "repr.key": "#1e3f7a",
         "repr.call": "bold #2563eb",
         "repr.str": "#16853a",
         "repr.number": "#b45309",

{rich_struct-0.3.0 → rich_struct-0.3.2}/tests/test_print.py

@@ -28,7 +28,7 @@ def test_theme_colours_reach_the_output(monkeypatch):
     assert keyword in render(rt.print_syntax, "def f(): pass", "python")
     assert keyword in render(rt.print_md, "```python\ndef f(): pass\n```")
     assert keyword not in render(rt.print_syntax, "def f(): pass", "python", theme="Nord")
-    assert "38;2;125;211;252" in render(rt.print_json, {"a": 1})  # key, sky #7dd3fc
+    assert "38;2;163;194;242" in render(rt.print_json, {"a": 1})  # key, #a3c2f2
 
 
 @dataclass
@@ -126,9 +126,14 @@ def test_objects_get_their_own_colours_and_background_in_midnight_slate(monkeypa
     page_bg, object_bg = "48;2;11;19;32", "48;2;15;23;42"  # #0b1320, #0f172a
     out = render(rt.print_obj, Point(1, "y"))
     assert object_bg in out and page_bg not in out
-    assert "38;2;203;213;225" in out and "38;2;34;211;238" in out  # property #cbd5e1, class #22d3ee
+    assert "38;2;163;194;242" in out and "38;2;34;211;238" in out  # property #a3c2f2, class #22d3ee
     assert object_bg not in render(rt.print_md, "text") and object_bg not in render(rt.print_obj, 1, background=False)
     assert "48;2;46;52;64" in render(rt.print_obj, 1, theme="Nord")  # other themes: the page background
+    # dict keys take the property colour here, and stay string-coloured in themes without repr.key
+    prop, slate_str, nord_str = "38;2;163;194;242", "38;2;163;230;53", "38;2;163;190;140"
+    out = render(rt.print_obj, {"key": "value"})
+    assert f"{prop};48;2;15;23;42m'key'" in out and f"{slate_str};48;2;15;23;42m'value'" in out
+    assert f"{nord_str};48;2;46;52;64m'key'" in render(rt.print_obj, {"key": "value"}, theme="Nord")
 
 
 def test_plain_print_matches_builtin_semantics():