refactor: ♻️ Use functional style

Author: joelostblom

src/seedcase_flower/cli.py

@@ -4,38 +4,21 @@
 from typing import Any, Optional
 
 from cyclopts import App, Parameter, config
-from cyclopts.annotations import get_hint_name
 from cyclopts.help import ColumnSpec, DefaultFormatter, DescriptionRenderer
 
 # from seedcase_flower.config import Config as FlowerConfig
-from seedcase_flower.internals import BuildStyle, _read_properties, _resolve_uri
-
-
-def names_renderer(entry):
-    """Massage the option flags in the help into a more readable format."""
-    names = []
-    if entry.names:
-        for name in sorted(entry.names):
-            if not name.startswith("-"):
-                # Don't output redundant value placeholder for boolean flags
-                if get_hint_name(entry.type) == "bool":
-                    name = ""
-                else:
-                    # Matching the `dim` used by default in cyclopts for `choices` and
-                    # `defaults` in the description
-                    name = f"[dim]<{name}>[/dim]"
-            else:
-                name = f"[bold cyan]{name}[/bold cyan]"
-            names.append(name)
-
-    return f"{' '.join(names)}".strip()
-
+from seedcase_flower.internals import (
+    BuildStyle,
+    _format_param_help,
+    _read_properties,
+    _resolve_uri,
+)
 
 app = App(
     help="Flower generates human-readable documentation from Data Packages.",
     help_formatter=DefaultFormatter(
         column_specs=(
-            ColumnSpec(renderer=names_renderer),
+            ColumnSpec(renderer=_format_param_help),
             ColumnSpec(renderer=DescriptionRenderer(newline_metadata=True)),
         )
     ),

src/seedcase_flower/internals.py

@@ -2,9 +2,13 @@
 
 import json
 from enum import Enum
+from itertools import repeat
 from pathlib import Path
 from typing import Any
 
+from cyclopts.annotations import get_hint_name
+from cyclopts.help import HelpEntry
+
 
 class BuildStyle(Enum):
     """Built-in styles for outputting to file."""
@@ -26,3 +30,25 @@ def _read_properties(path: Path) -> dict[str, Any]:
     with open(path) as properties_file:
         datapackage: dict[str, Any] = json.load(properties_file)
         return datapackage
+
+
+def _format_param_help(entry: HelpEntry) -> str:
+    """Re-structure the parameter help into a more readable format."""
+    if entry.names:
+        names = map(_add_highlight_syntax, sorted(entry.names), repeat(entry.type))
+    return f"{' '.join(names)}".strip()
+
+
+def _add_highlight_syntax(name: str, entry_type: type | None) -> str:
+    """Add markup character to highlight in colors, etc where desired."""
+    if not name.startswith("-"):
+        # Don't output redundant value placeholder for boolean flags
+        if get_hint_name(entry_type) == "bool":
+            name = ""
+        else:
+            # Matching the `dim` used by default in cyclopts for `choices` and
+            # `defaults` in the description
+            name = f"[dim]<{name}>[/dim]"
+    else:
+        name = f"[bold cyan]{name}[/bold cyan]"
+    return name