rich-click 1.9.0.dev6__tar.gz → 1.9.2.dev0__tar.gz

{rich_click-1.9.0.dev6/src/rich_click.egg-info → rich_click-1.9.2.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rich-click
-Version: 1.9.0.dev6
+Version: 1.9.2.dev0
 Summary: Format click help output nicely with rich
 Author-email: Phil Ewels <phil@ewels.co.uk>
 Maintainer-email: Phil Ewels <phil@ewels.co.uk>, Daniel Reeves <xdanielreeves@gmail.com>
@@ -44,6 +44,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click>=8
+Requires-Dist: colorama; platform_system == "Windows"
 Requires-Dist: rich>=12
 Requires-Dist: typing-extensions>=4; python_version < "3.11"
 Provides-Extra: dev
@@ -68,6 +69,7 @@ Requires-Dist: mkdocs-glightbox>=0.4; extra == "docs"
 Requires-Dist: mkdocs-include-markdown-plugin>=7.1.7; python_version >= "3.9" and extra == "docs"
 Requires-Dist: mkdocs-material[imaging]~=9.5.18; extra == "docs"
 Requires-Dist: mkdocs-material-extensions>=1.3.1; extra == "docs"
+Requires-Dist: mkdocs-redirects>=1.2.2; extra == "docs"
 Requires-Dist: mkdocs-rss-plugin>=1.15; extra == "docs"
 Requires-Dist: mkdocstrings[python]>=0.26.1; extra == "docs"
 Requires-Dist: rich-codex>=1.2.11; extra == "docs"

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/pyproject.toml

@@ -32,6 +32,7 @@ dynamic = [
 ]
 dependencies = [
     "click>=8",
+    "colorama; platform_system=='Windows'",
     "rich>=12",
     "typing-extensions>=4; python_version<'3.11'",
 ]
@@ -58,6 +59,7 @@ optional-dependencies.docs = [
     "mkdocs-include-markdown-plugin>=7.1.7; python_version>='3.9'",
     "mkdocs-material[imaging]~=9.5.18",
     "mkdocs-material-extensions>=1.3.1",
+    "mkdocs-redirects>=1.2.2",
     "mkdocs-rss-plugin>=1.15",
     "mkdocstrings[python]>=0.26.1",
     "rich-codex>=1.2.11",

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/src/rich_click/__init__.py

@@ -8,7 +8,7 @@ customization required.
 from __future__ import annotations
 
 
-__version__ = "1.9.0.dev6"
+__version__ = "1.9.2.dev0"
 
 # Import the entire click API here.
 # We need to manually import these instead of `from click import *` to force

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/src/rich_click/_internal_types.py

@@ -34,6 +34,7 @@ if TYPE_CHECKING:
     from rich.style import StyleType
     from rich.text import Text, TextType
 
+    from rich_click.rich_click_theme import RichClickTheme
     from rich_click.rich_help_configuration import (
         CommandColumnType,
         CommandHelpSectionType,
@@ -116,7 +117,7 @@ class PanelKwargs(TypedDict):
 class RichHelpConfigurationDict(TypedDict):
     """Typed dict for rich_config() kwargs."""
 
-    theme: NotRequired[Optional[str]]
+    theme: NotRequired[Optional[Union[str, "RichClickTheme"]]]
     enable_theme_env_var: NotRequired[bool]
     style_option: NotRequired["StyleType"]
     style_option_negative: NotRequired[Optional["StyleType"]]
@@ -138,6 +139,7 @@ class RichHelpConfigurationDict(TypedDict):
     style_deprecated: NotRequired["StyleType"]
     style_helptext_first_line: NotRequired["StyleType"]
     style_helptext: NotRequired["StyleType"]
+    style_helptext_aliases: NotRequired[Optional["StyleType"]]
     style_option_help: NotRequired["StyleType"]
     style_command_help: NotRequired["StyleType"]
     style_option_default: NotRequired["StyleType"]
@@ -210,6 +212,7 @@ class RichHelpConfigurationDict(TypedDict):
     range_string: NotRequired[str]
     append_metavars_help_string: NotRequired[str]
     append_range_help_string: NotRequired[str]
+    helptext_aliases_string: NotRequired[str]
     arguments_panel_title: NotRequired[str]
     options_panel_title: NotRequired[str]
     commands_panel_title: NotRequired[str]
@@ -247,5 +250,6 @@ class RichHelpConfigurationDict(TypedDict):
     command_groups: NotRequired[Dict[str, List[CommandGroupDict]]]
     option_groups: NotRequired[Dict[str, List[OptionGroupDict]]]
     use_click_short_help: NotRequired[bool]
+    helptext_show_aliases: NotRequired[bool]
     highlighter_patterns: NotRequired[List[str]]
     legacy_windows: NotRequired[Optional[bool]]

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/src/rich_click/cli.py

@@ -60,7 +60,6 @@ def patch(*args: Any, **kwargs: Any) -> None:  # noqa: D103
 
 
 class _RichHelpConfigurationParamType(click.ParamType):
-
     name = "JSON"
 
     def __repr__(self) -> str:
@@ -72,7 +71,6 @@ class _RichHelpConfigurationParamType(click.ParamType):
         param: Optional[click.Parameter],
         ctx: Optional[click.Context],
     ) -> Optional[Dict[str, Any]]:
-
         if value is None:
             return value
         else:
@@ -276,7 +274,7 @@ def list_themes(ctx: RichContext, param: click.Parameter, value: bool) -> None:
                 Renderables(
                     [
                         Panel(how_to_use, title="How to use", width=100),
-                        Panel(Padding(selected_text, pad=1), title="RICH_CLICK_THEME=", width=100),
+                        Panel(Padding(selected_text, pad=1), title="Local user setting", width=100),
                         Panel(colors, title="Color Palettes"),
                         Panel(formats, title="Formats"),
                     ]
@@ -338,7 +336,7 @@ def list_themes(ctx: RichContext, param: click.Parameter, value: bool) -> None:
     envvar="RICH_CLICK_CLI_SUPPRESS_WARNINGS",
     show_envvar=True,
     panel="Advanced Options",
-    help="Suppress warnings when there are conflicting entry_points." " This situation is extremely rare.",
+    help="Suppress warnings when there are conflicting entry_points. This situation is extremely rare.",
 )
 @_rich_option(
     "--patch-rich-click/--no-patch-rich-click",

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/src/rich_click/rich_click.py

@@ -21,10 +21,12 @@ if TYPE_CHECKING:  # pragma: no cover
     from rich.style import StyleType
     from rich.text import Text
 
+    from rich_click.rich_click_theme import RichClickTheme
+
 #!STARTCONFIG
 
 # Default styles
-THEME: Optional[str] = None
+THEME: Optional[Union[str, RichClickTheme]] = None
 ENABLE_THEME_ENV_VAR: bool = True
 
 STYLE_OPTION: "StyleType" = FROM_THEME
@@ -44,6 +46,7 @@ STYLE_USAGE_SEPARATOR: "StyleType" = FROM_THEME
 STYLE_DEPRECATED: "StyleType" = FROM_THEME
 STYLE_HELPTEXT_FIRST_LINE: "StyleType" = FROM_THEME
 STYLE_HELPTEXT: "StyleType" = FROM_THEME
+STYLE_HELPTEXT_ALIASES: Optional["StyleType"] = None
 STYLE_OPTION_HELP: "StyleType" = FROM_THEME
 STYLE_COMMAND_HELP: "StyleType" = FROM_THEME
 STYLE_OPTION_DEFAULT: "StyleType" = FROM_THEME
@@ -124,6 +127,7 @@ REQUIRED_LONG_STRING: str = FROM_THEME
 RANGE_STRING: str = FROM_THEME
 APPEND_METAVARS_HELP_STRING: str = FROM_THEME
 APPEND_RANGE_HELP_STRING: str = FROM_THEME
+HELPTEXT_ALIASES_STRING: str = "Aliases: {}"
 ARGUMENTS_PANEL_TITLE: str = "Arguments"
 OPTIONS_PANEL_TITLE: str = "Options"
 COMMANDS_PANEL_TITLE: str = "Commands"
@@ -165,6 +169,7 @@ COMMAND_GROUPS: Dict[str, List[CommandGroupDict]] = {}
 # Define sorted groups of panels to display options and arguments
 OPTION_GROUPS: Dict[str, List[OptionGroupDict]] = {}
 USE_CLICK_SHORT_HELP: bool = False  # Use click's default function to truncate help text
+HELPTEXT_SHOW_ALIASES: bool = True
 
 #!ENDCONFIG
 

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/src/rich_click/rich_click_theme.py

@@ -1010,11 +1010,11 @@ FORMATS: Dict[str, RichClickTheme] = {
             "style_options_table_expand": True,
             "style_commands_table_expand": True,
             "panel_title_string": "{}",
-            "style_options_panel_padding": (0, 1),
-            "style_commands_panel_padding": (0, 1),
-            "padding_header_text": (1, 3, 0, 3),
-            "padding_helptext": (0, 3, 1, 3),
-            "padding_usage": (1, 3, 1, 3),
+            "style_options_panel_padding": 0,
+            "style_commands_panel_padding": 0,
+            "padding_header_text": (1, 2, 0, 3),
+            "padding_helptext": (0, 2, 1, 2),
+            "padding_usage": (1, 2, 1, 2),
             "options_table_column_types": ["opt_short", "opt_long", "metavar", "help"],
             "commands_table_column_types": ["name", "aliases", "help"],
             "options_table_help_sections": ["required", "help", "envvar", "default", "deprecated"],
@@ -1027,14 +1027,14 @@ FORMATS: Dict[str, RichClickTheme] = {
             "panel_inline_help_in_title": True,
             "delimiter_comma": ", ",
             "delimiter_slash": " / ",
-            "panel_title_padding": 1,
+            "panel_title_padding": 0,
             "required_short_string": "*",
             "panel_inline_help_delimiter": " - ",
             "required_long_string": "\\[required]",
             "range_string": "[{}]",
             "append_range_help_string": "\\[{}]",
-            "padding_epilog": (0, 3, 1, 3),
-            "padding_footer_text": (0, 3, 1, 3),
+            "padding_epilog": (0, 2, 1, 2),
+            "padding_footer_text": (0, 2, 1, 2),
         },
     ),
     # Spacious with sharp corners

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/src/rich_click/rich_command.py

@@ -134,9 +134,7 @@ class RichCommand(Command):
     def _error_formatter(self) -> RichHelpFormatter:
         from click import get_current_context
 
-        try:
-            ctx: RichContext = get_current_context()  # type: ignore[assignment]
-        except RuntimeError:
+        def _get_formatter() -> RichHelpFormatter:
             config = self._generate_rich_help_config()
             formatter = self.context_class.formatter_class(
                 config=config,
@@ -144,8 +142,17 @@ class RichCommand(Command):
                     self.context_class.export_console_as if self.context_class.errors_in_output_format else None
                 ),
             )
+            return formatter
+
+        try:
+            ctx: RichContext = get_current_context()  # type: ignore[assignment]
+        except RuntimeError:
+            formatter = _get_formatter()
         else:
-            formatter = ctx.make_formatter(error_mode=True)
+            if not isinstance(ctx, RichContext):
+                formatter = _get_formatter()
+            else:
+                formatter = ctx.make_formatter(error_mode=True)
         return formatter
 
     @overload

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/src/rich_click/rich_context.py

@@ -111,7 +111,7 @@ class RichContext(click.Context):
             exc_value: Optional[BaseException],
             tb: Optional[TracebackType],
         ) -> None:
-            return super().__exit__(exc_type, exc_value, tb)
+            super().__exit__(exc_type, exc_value, tb)
 
 
 def get_current_context(silent: bool = False) -> Optional[RichContext]:

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/src/rich_click/rich_help_configuration.py

@@ -104,7 +104,7 @@ class RichHelpConfiguration:
     for a given field, the right-most field is used.
     """
 
-    theme: Optional[str] = field(default=None)
+    theme: Optional[Union[str, RichClickTheme]] = field(default=None)
     enable_theme_env_var: bool = field(default=True)
 
     # Default styles
@@ -128,6 +128,7 @@ class RichHelpConfiguration:
     style_deprecated: "StyleType" = field(default=FROM_THEME)
     style_helptext_first_line: "StyleType" = field(default=FROM_THEME)
     style_helptext: "StyleType" = field(default=FROM_THEME)
+    style_helptext_aliases: Optional["StyleType"] = field(default=None)
     style_option_help: "StyleType" = field(default=FROM_THEME)
     style_command_help: "StyleType" = field(default=FROM_THEME)
     style_option_default: "StyleType" = field(default=FROM_THEME)
@@ -204,6 +205,7 @@ class RichHelpConfiguration:
     range_string: str = field(default=FROM_THEME)
     append_metavars_help_string: str = field(default=FROM_THEME)
     append_range_help_string: str = field(default=FROM_THEME)
+    helptext_aliases_string: str = field(default="Aliases: {}")
     arguments_panel_title: str = field(default="Arguments")
     options_panel_title: str = field(default="Options")
     commands_panel_title: str = field(default="Commands")
@@ -258,6 +260,7 @@ class RichHelpConfiguration:
     """Define sorted groups of panels to display options and arguments"""
     use_click_short_help: bool = field(default=False)
     """Use click's default function to truncate help text"""
+    helptext_show_aliases: bool = field(default=True)
     highlighter: Optional["Highlighter"] = field(default=None, repr=False, compare=False)
     """(Deprecated) Rich regex highlighter for help highlighting"""
 
@@ -386,7 +389,7 @@ class RichHelpConfiguration:
         return inst
 
     def apply_theme(self, force_default: bool = False) -> None:
-        theme = None
+        theme: Optional[Union[str, RichClickTheme]] = None
         raise_key_error = True
 
         import rich_click.rich_click as rc

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/src/rich_click/rich_help_formatter.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import os
+import io
 import sys
 from contextlib import contextmanager
 from functools import cached_property
@@ -78,7 +78,7 @@ def create_console(
     )
     # Defaults for console.color_system change when file is in __init__.
     # Workaround: set file after __init__.
-    console.file = file or open(os.devnull, "w")
+    console.file = file or io.StringIO()
     max_width = max_width if max_width is not None else config.max_width
     if isinstance(max_width, int):
         console.width = min(max_width, console.size.width)
@@ -262,6 +262,12 @@ class RichHelpFormatter(click.HelpFormatter):
             from rich.console import COLOR_SYSTEMS
             from rich.segment import Segment
 
+            if self.console.legacy_windows:
+                # Handle legacy windows
+                import colorama  # type: ignore[import-untyped]
+
+                colorama.init()
+
             if self.console.no_color:
                 res = "".join(
                     (

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/src/rich_click/rich_help_rendering.py

@@ -116,7 +116,7 @@ def _get_help_text(
             )
 
     # Fetch and dedent the help text
-    help_text = inspect.cleandoc(obj.help)
+    help_text = inspect.cleandoc(obj.help or "")
 
     # Trim off anything that comes after \f on its own line
     help_text = help_text.partition("\f")[0]
@@ -187,6 +187,15 @@ def _get_help_text(
             # Join with double linebreaks if markdown
             remaining_lines = lb.join(remaining_paragraphs)
         yield formatter.rich_text(remaining_lines, formatter.config.style_helptext)
+    if getattr(obj, "aliases", None) and formatter.config.helptext_show_aliases:
+        yield Text.from_markup(
+            formatter.config.helptext_aliases_string.format(", ".join(obj.aliases)),  # type: ignore[attr-defined]
+            style=(
+                formatter.config.style_helptext_aliases
+                if formatter.config.style_helptext_aliases is not None
+                else formatter.config.style_helptext
+            ),
+        )
 
 
 def _get_deprecated_text(
@@ -553,6 +562,18 @@ def _get_parameter_default(
     finally:
         ctx.resilient_parsing = resilient
 
+    notset: Tuple[Any, ...]
+    try:
+        # try/except because it's unclear whether later versions of click will change this.
+        if not CLICK_IS_BEFORE_VERSION_82:
+            from click.core import UNSET  # type: ignore[attr-defined,unused-ignore]
+
+            notset = (UNSET, None)
+        else:
+            notset = (None,)
+    except ImportError:
+        notset = (None,)
+
     if (not CLICK_IS_VERSION_80 and param.show_default is not None) or param.show_default:
         if isinstance(param.show_default, str):
             show_default_is_str = show_default = True
@@ -563,7 +584,7 @@ def _get_parameter_default(
 
     default_string: Optional[str] = None
 
-    if show_default_is_str or (show_default and (default_value is not None)):
+    if show_default_is_str or (show_default and (default_value not in notset)):
         if show_default_is_str:
             default_string = f"({param.show_default})"
         elif isinstance(default_value, (list, tuple)):
@@ -959,7 +980,7 @@ def get_rich_usage(formatter: RichHelpFormatter, prog: str, args: str = "", pref
 def get_rich_help_text(self: Command, ctx: RichContext, formatter: RichHelpFormatter) -> None:
     """Write rich help text to the formatter if it exists."""
     # Print command / group help if we have some
-    if self.help:
+    if self.help or self.deprecated or getattr(self, "aliases", None):
         # Print with some padding
         formatter.write(
             Padding(

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/src/rich_click/rich_panel.py

@@ -17,10 +17,9 @@ from typing import (
     Union,
 )
 
-import click
-import click.core
-from click import Group
+from click import Context, Parameter
 
+from rich_click._click_types_cache import Argument, Command, Group
 from rich_click.rich_help_configuration import ColumnType, CommandColumnType, OptionColumnType
 from rich_click.rich_parameter import RichArgument, RichParameter
 from rich_click.utils import CommandGroupDict, OptionGroupDict
@@ -38,7 +37,7 @@ if TYPE_CHECKING:
 
 
 ColT = TypeVar("ColT", bound=ColumnType)
-CT = TypeVar("CT", click.Command, click.Parameter)
+CT = TypeVar("CT", Command, Parameter)
 GroupType = TypeVar("GroupType", OptionGroupDict, CommandGroupDict)
 
 
@@ -90,7 +89,7 @@ class RichPanel(Generic[CT, ColT]):
 
         return get_box(box)
 
-    def to_info_dict(self, ctx: click.Context) -> Dict[str, Any]:
+    def to_info_dict(self, ctx: Context) -> Dict[str, Any]:
         if self._object_attr is NotImplemented:
             raise NotImplementedError()
         return {
@@ -101,11 +100,11 @@ class RichPanel(Generic[CT, ColT]):
         }
 
     @classmethod
-    def list_all_objects(cls, ctx: click.Context) -> List[Tuple[str, CT]]:
+    def list_all_objects(cls, ctx: Context) -> List[Tuple[str, CT]]:
         """List all objects of the command that this panel type works with."""
         raise NotImplementedError()
 
-    def get_objects(self, command: click.Command, ctx: click.Context) -> Generator[CT, None, None]:
+    def get_objects(self, command: Command, ctx: Context) -> Generator[CT, None, None]:
         """List the proper names assigned to the panel."""
         raise NotImplementedError()
 
@@ -163,7 +162,7 @@ class RichPanel(Generic[CT, ColT]):
         return f"<{self.__class__.__name__} {self.name}>"
 
 
-class RichOptionPanel(RichPanel[click.Parameter, OptionColumnType]):
+class RichOptionPanel(RichPanel[Parameter, OptionColumnType]):
     """Panel for parameters."""
 
     _highlight: ClassVar[bool] = True
@@ -180,10 +179,10 @@ class RichOptionPanel(RichPanel[click.Parameter, OptionColumnType]):
         self.options = options or []
 
     @classmethod
-    def list_all_objects(cls, ctx: click.Context) -> List[Tuple[str, click.Parameter]]:
+    def list_all_objects(cls, ctx: Context) -> List[Tuple[str, Parameter]]:
         return [(i.name, i) for i in ctx.command.get_params(ctx)]  # type: ignore[misc]
 
-    def get_objects(self, command: click.Command, ctx: click.Context) -> Generator[click.Parameter, None, None]:
+    def get_objects(self, command: Command, ctx: Context) -> Generator[Parameter, None, None]:
         """List the objects assigned to the panel."""
         for opt in self.options:
             # Get the param
@@ -214,7 +213,6 @@ class RichOptionPanel(RichPanel[click.Parameter, OptionColumnType]):
         table = self._get_base_table(**t_styles)
         rows = []
         for param in self.get_objects(command, ctx):
-
             from rich_click.rich_help_rendering import get_parameter_rich_table_row
 
             cols = (
@@ -225,17 +223,18 @@ class RichOptionPanel(RichPanel[click.Parameter, OptionColumnType]):
 
             rows.append(cols)
 
-        if True:
-            rows = list(
-                map(
-                    list,
-                    zip(*[col for col in zip(*rows) if any(cell for cell in col)]),
-                )
-            )
+        headers = [i.replace("_", " ").title() for i in formatter.config.options_table_column_types]
+
+        filtered = [(h, c) for h, c in zip(headers, zip(*rows)) if any(cell for cell in c)]
+        headers, rows = zip(*filtered) if filtered else ([], [])
+        rows = list(map(list, zip(*rows))) if rows else []
 
         for row in rows:
             table.add_row(*row)
 
+        for col, header in zip(table.columns, headers):
+            col.header = header
+
         return table
 
     def render(
@@ -297,7 +296,7 @@ class RichOptionPanel(RichPanel[click.Parameter, OptionColumnType]):
         return panel
 
 
-class RichCommandPanel(RichPanel[click.Command, CommandColumnType]):
+class RichCommandPanel(RichPanel[Command, CommandColumnType]):
     """Panel for parameters."""
 
     _object_attr: ClassVar[str] = "commands"
@@ -313,13 +312,13 @@ class RichCommandPanel(RichPanel[click.Command, CommandColumnType]):
         self.commands = commands or []
 
     @classmethod
-    def list_all_objects(cls, ctx: click.Context) -> List[Tuple[str, click.Command]]:
+    def list_all_objects(cls, ctx: Context) -> List[Tuple[str, Command]]:
         if not isinstance(ctx.command, Group):
             return []
 
         return list(sorted(list(ctx.command.commands.items())))
 
-    def get_objects(self, command: click.Command, ctx: click.Context) -> Generator[click.Command, None, None]:
+    def get_objects(self, command: Command, ctx: Context) -> Generator[Command, None, None]:
         """List the objects assigned to the panel."""
         if not isinstance(command, Group):
             return
@@ -388,17 +387,18 @@ class RichCommandPanel(RichPanel[click.Command, CommandColumnType]):
 
             rows.append(cols)
 
-        if True:
-            rows = list(
-                map(
-                    list,
-                    zip(*[col for col in zip(*rows) if any(cell for cell in col)]),
-                )
-            )
+        headers = [i.replace("_", " ").title() for i in formatter.config.commands_table_column_types]
+
+        filtered = [(h, c) for h, c in zip(headers, zip(*rows)) if any(cell for cell in c)]
+        headers, rows = zip(*filtered) if filtered else ([], [])
+        rows = list(map(list, zip(*rows))) if rows else []
 
         for row in rows:
             table.add_row(*row)
 
+        for col, header in zip(table.columns, headers):
+            col.header = header
+
         return table
 
     def render(
@@ -494,25 +494,26 @@ def _resolve_panels_from_config(
 
     # Step 2: Match currently executing command to keys
     # Assign wildcards, but make sure we do not overwrite anything already defined.
-    for _path in paths:
-        for mtch in reversed(sorted([_ for _ in groups if fnmatch(_path, _)])):
-            wildcard_option_groups = groups[mtch]
-            for grp in wildcard_option_groups:
-                grp = grp.copy()
-                opts: List[str] = grp.get(panel_cls._object_attr, [])  # type: ignore[assignment]
-                traversed = []
-                for opt in grp.get(panel_cls._object_attr, []):  # type: ignore[attr-defined]
-                    if grp.get("deduplicate", True) and opt in [
-                        _opt
-                        for _grp in final_groups_list
-                        for _opt in [*traversed, *_grp.get(panel_cls._object_attr, [])]  # type: ignore[has-type]
-                    ]:
-                        opts.remove(opt)
-                    traversed.append(opt)
-                grp[panel_cls._object_attr] = opts  # type: ignore[literal-required]
-                final_groups_list.append(grp)
-
-    return [panel_cls(**grp) for grp in final_groups_list]  # type: ignore[misc]
+    for mtch in reversed(sorted([_ for _ in groups if any(fnmatch(_path, _) for _path in paths)])):
+        wildcard_option_groups = groups[mtch]
+        for grp in wildcard_option_groups:
+            grp = grp.copy()
+            opts: List[str] = grp.get(panel_cls._object_attr, [])  # type: ignore[assignment]
+            traversed = []
+            for opt in grp.get(panel_cls._object_attr, []):  # type: ignore[attr-defined]
+
+                if grp.get("deduplicate", True) and opt in [
+                    _opt
+                    for _grp in final_groups_list
+                    for _opt in _grp.get(panel_cls._object_attr, [])  # type: ignore[attr-defined]
+                ]:
+                    opts.remove(opt)
+                traversed.append(opt)
+            grp[panel_cls._object_attr] = opts  # type: ignore[literal-required]
+            grp.pop("deduplicate", None)
+            final_groups_list.append(grp)
+
+    return [panel_cls(**grp) for grp in final_groups_list]  # type: ignore[misc,arg-type]
 
 
 def construct_panels(
@@ -527,6 +528,9 @@ def construct_panels(
     # then we respect intra-type sort order but not inter-type sort order.
     defined_commands = False
     defined_options = False
+    # Handling ordering is tricky with the "groups" feature.
+    # it's safest to flag and treat specially.
+    using_groups_feat = False
 
     # Start with list of panels already defined.
     defined_panels: Dict[Tuple[str, str], RichPanel[Any, Any]] = {}
@@ -544,7 +548,7 @@ def construct_panels(
         )
         if option_groups_from_config:
             defined_panels.update({(p._object_attr, p.name): p for p in option_groups_from_config})
-            defined_options = True
+            using_groups_feat = True
 
     if isinstance(command, Group):
         if formatter.config.command_groups:
@@ -553,7 +557,7 @@ def construct_panels(
             )
             if command_groups_from_config:
                 defined_panels.update({(p._object_attr, p.name): p for p in command_groups_from_config})
-                defined_commands = True
+                using_groups_feat = True
 
     # Separate out default panels because we need to sort them properly later.
     # We will reversed() through this so order is flipped.
@@ -564,7 +568,7 @@ def construct_panels(
     post_default_panels: Dict[Tuple[str, str], List[str]]
     if isinstance(command, Group):
         if formatter.config.commands_before_options:
-            if defined_commands != defined_options:
+            if defined_commands != defined_options or using_groups_feat:
                 pre_default_panels = {
                     ("commands", formatter.config.commands_panel_title): [],
                 }
@@ -579,7 +583,7 @@ def construct_panels(
                     ("options", formatter.config.options_panel_title): [],
                 }
         else:
-            if defined_commands != defined_options:
+            if defined_commands != defined_options or using_groups_feat:
                 pre_default_panels = {
                     ("options", formatter.config.arguments_panel_title): [],
                     ("options", formatter.config.options_panel_title): [],
@@ -622,7 +626,7 @@ def construct_panels(
     if ("options", formatter.config.arguments_panel_title) in defined_panels:
         _show_arguments = True
 
-    objs: List[Tuple[str, str, Union[click.core.Parameter, click.core.Command]]] = [
+    objs: List[Tuple[str, str, Union[Parameter, Command]]] = [
         ("options", name, o) for name, o in formatter.option_panel_class.list_all_objects(ctx)
     ]
     if isinstance(command, Group):
@@ -639,9 +643,9 @@ def construct_panels(
         if getattr(obj, "hidden", False):
             continue
         names = {name, obj.name}
-        if isinstance(obj, click.core.Parameter):
+        if isinstance(obj, Parameter):
             names.update(obj.opts)
-        elif isinstance(obj, click.core.Command) and obj.callback is not None:
+        elif isinstance(obj, Command) and obj.callback is not None:
             names.add(obj.callback.__name__)
         assigned_to = set()
         for n in names:
@@ -666,7 +670,7 @@ def construct_panels(
         if not panel_list:
             inferred = True
             if typ == "options":
-                if not formatter.config.group_arguments_options and isinstance(obj, click.Argument):
+                if not formatter.config.group_arguments_options and isinstance(obj, Argument):
                     if _show_arguments is not False:
                         panel_list = [formatter.config.arguments_panel_title]
                     else:

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/src/rich_click/utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import sys
-from typing import Any, Dict, List, Optional, Type, TypedDict
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Type, TypedDict
 
 
 if sys.version_info < (3, 11):
@@ -9,6 +9,11 @@ if sys.version_info < (3, 11):
 else:
     from typing import NotRequired
 
+if TYPE_CHECKING:
+    from rich.style import StyleType
+
+    from rich_click.rich_help_configuration import CommandColumnType, OptionColumnType
+
 
 notset: Any = object()
 
@@ -46,8 +51,14 @@ class CommandGroupDict(TypedDict):
 
     name: NotRequired[str]
     commands: NotRequired[List[str]]
-    table_styles: NotRequired[Dict[str, Any]]
-    panel_styles: NotRequired[Dict[str, Any]]
+    help: NotRequired[Optional[str]]
+    help_style: NotRequired[Optional["StyleType"]]
+    table_styles: NotRequired[Optional[Dict[str, Any]]]
+    panel_styles: NotRequired[Optional[Dict[str, Any]]]
+    column_types: NotRequired[Optional[List["CommandColumnType"]]]
+    inline_help_in_title: NotRequired[Optional[bool]]
+    title_style: NotRequired[Optional["StyleType"]]
+
     deduplicate: NotRequired[bool]
 
 
@@ -56,6 +67,12 @@ class OptionGroupDict(TypedDict):
 
     name: NotRequired[str]
     options: NotRequired[List[str]]
-    table_styles: NotRequired[Dict[str, Any]]
-    panel_styles: NotRequired[Dict[str, Any]]
+    help: NotRequired[Optional[str]]
+    help_style: NotRequired[Optional["StyleType"]]
+    table_styles: NotRequired[Optional[Dict[str, Any]]]
+    panel_styles: NotRequired[Optional[Dict[str, Any]]]
+    column_types: NotRequired[Optional[List["OptionColumnType"]]]
+    inline_help_in_title: NotRequired[Optional[bool]]
+    title_style: NotRequired[Optional["StyleType"]]
+
     deduplicate: NotRequired[bool]

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0/src/rich_click.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rich-click
-Version: 1.9.0.dev6
+Version: 1.9.2.dev0
 Summary: Format click help output nicely with rich
 Author-email: Phil Ewels <phil@ewels.co.uk>
 Maintainer-email: Phil Ewels <phil@ewels.co.uk>, Daniel Reeves <xdanielreeves@gmail.com>
@@ -44,6 +44,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click>=8
+Requires-Dist: colorama; platform_system == "Windows"
 Requires-Dist: rich>=12
 Requires-Dist: typing-extensions>=4; python_version < "3.11"
 Provides-Extra: dev
@@ -68,6 +69,7 @@ Requires-Dist: mkdocs-glightbox>=0.4; extra == "docs"
 Requires-Dist: mkdocs-include-markdown-plugin>=7.1.7; python_version >= "3.9" and extra == "docs"
 Requires-Dist: mkdocs-material[imaging]~=9.5.18; extra == "docs"
 Requires-Dist: mkdocs-material-extensions>=1.3.1; extra == "docs"
+Requires-Dist: mkdocs-redirects>=1.2.2; extra == "docs"
 Requires-Dist: mkdocs-rss-plugin>=1.15; extra == "docs"
 Requires-Dist: mkdocstrings[python]>=0.26.1; extra == "docs"
 Requires-Dist: rich-codex>=1.2.11; extra == "docs"

{rich_click-1.9.0.dev6 → rich_click-1.9.2.dev0}/src/rich_click.egg-info/requires.txt

@@ -1,6 +1,9 @@
 click>=8
 rich>=12
 
+[:platform_system == "Windows"]
+colorama
+
 [:python_version < "3.11"]
 typing-extensions>=4
 
@@ -26,6 +29,7 @@ mkdocs-github-admonitions-plugin>=0.1.1
 mkdocs-glightbox>=0.4
 mkdocs-material[imaging]~=9.5.18
 mkdocs-material-extensions>=1.3.1
+mkdocs-redirects>=1.2.2
 mkdocs-rss-plugin>=1.15
 mkdocstrings[python]>=0.26.1
 rich-codex>=1.2.11