usecli 0.1.69__tar.gz → 0.1.71__tar.gz

{usecli-0.1.69 → usecli-0.1.71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usecli
-Version: 0.1.69
+Version: 0.1.71
 Summary: A powerful Python CLI framework for building beautiful, developer-friendly command-line tools.
 Author: Edward Boswell
 Author-email: Edward Boswell <thememium@gmail.com>

{usecli-0.1.69 → usecli-0.1.71}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usecli"
-version = "0.1.69"
+version = "0.1.71"
 description = "A powerful Python CLI framework for building beautiful, developer-friendly command-line tools."
 readme = "README.md"
 authors = [{ name = "Edward Boswell", email = "thememium@gmail.com" }]

{usecli-0.1.69 → usecli-0.1.71}/src/usecli/__init__.py

@@ -331,6 +331,32 @@ class _FilteredListCommand:
     def __init__(self, prefix_filter: str) -> None:
         self.prefix_filter = prefix_filter
         self.name = "filtered-list"
+        self.allow_extra_args = True
+        self.allow_interspersed_args = True
+        self.ignore_unknown_options = True
+        self.hidden = False
+        self.deprecated = False
+        self.params = []
+        self.callback = None
+        self.help = None
+        self.epilog = None
+        self.short_help = None
+        self.no_args_is_help = False
+        self.context_settings = {}
+
+    def get_short_help_str(self, limit=45):
+        return ""
+
+    def make_context(self, info_name: str, args: list[str], **kwargs: object):
+        from click import Context
+
+        ctx = Context(self, info_name=info_name, **kwargs)  # type: ignore[arg-type]
+        return ctx
+
+    def invoke(self, ctx):
+        from usecli.cli.core.ui.list import list_commands
+
+        list_commands(_get_app(), prefix_filter=self.prefix_filter)
 
     def __call__(self, *args, **kwargs):
         from usecli.cli.core.ui.list import list_commands

{usecli-0.1.69 → usecli-0.1.71}/src/usecli/cli/commands/defaults/make/make_command.py

@@ -43,9 +43,18 @@ class MakeCommand(BaseCommand):
             name: The name of the command to create.
         """
         clean_name = name.replace("Command", "").replace("command", "")
-        class_name = pascalcase(clean_name.replace(":", "_")) + "Command"
-        command_name = snakecase(clean_name.replace(":", "_"))
-        file_name = f"{snakecase(clean_name.replace(':', '_'))}_command.py"
+        class_name = (
+            pascalcase(clean_name.replace(":", "_").replace(" ", "_")) + "Command"
+        )
+        if ":" in clean_name:
+            command_name = clean_name
+        elif " " in clean_name:
+            command_name = clean_name
+        else:
+            command_name = snakecase(clean_name)
+        file_name = (
+            f"{snakecase(clean_name.replace(':', '_').replace(' ', '_'))}_command.py"
+        )
 
         config = get_config()
         current_root = find_project_root(Path.cwd()) or Path.cwd().resolve()

{usecli-0.1.69 → usecli-0.1.71}/src/usecli/cli/core/base_command.py

@@ -42,6 +42,7 @@ class NestedCommandRegistry:
     _instance: ClassVar[NestedCommandRegistry | None] = None
     _groups: dict[str, typer.Typer]
     _group_commands: dict[str, list[dict[str, Any]]]
+    _main_app: typer.Typer | None
 
     def __new__(cls) -> NestedCommandRegistry:
         """Ensure singleton pattern for the registry."""
@@ -49,6 +50,7 @@ class NestedCommandRegistry:
             cls._instance = super().__new__(cls)
             cls._instance._groups = {}
             cls._instance._group_commands = {}
+            cls._instance._main_app = None
         return cls._instance
 
     def get_or_create_group(
@@ -69,9 +71,11 @@ class NestedCommandRegistry:
                 help=f"Commands for {group_name}",
                 invoke_without_command=True,
                 no_args_is_help=False,
+                add_completion=False,
             )
             self._groups[group_name] = group_app
             self._group_commands[group_name] = []
+            self._main_app = main_app
 
             # Add the group app to main app
             main_app.add_typer(group_app, name=group_name)
@@ -141,7 +145,7 @@ class NestedCommandRegistry:
 
         group_app = self._groups.get(group_name)
         if group_app:
-            list_group_commands(group_app, group_name)
+            list_group_commands(group_app, group_name, self._main_app)
 
     def register_command(
         self,

{usecli-0.1.69 → usecli-0.1.71}/src/usecli/cli/core/ui/list.py

@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING, TypedDict
 import click
 import typer
 from rich.console import Console
+from rich.markup import escape
 
 from usecli.cli.config.colors import COLOR
 from usecli.cli.core.ui.title import (
@@ -57,7 +58,8 @@ def list_commands(app: typer.Typer, prefix_filter: str | None = None) -> None:
         prefix_filter: Optional prefix to filter commands by name.
     """
     project_name = get_project_name()
-    print_title(title=project_name)
+    if not prefix_filter:
+        print_title(title=project_name)
 
     click_group = typer.main.get_command(app)
 
@@ -122,7 +124,6 @@ def list_commands(app: typer.Typer, prefix_filter: str | None = None) -> None:
             option_flags.append(flags)
 
     help_flags = "--help, -h"
-    all_option_flags = [help_flags] + option_flags
     group_entries: list[CommandEntry] = []
     for group_name, group_help in groups.items():
         aliases = group_alias_registry.get(group_name, list[str]())
@@ -158,31 +159,73 @@ def list_commands(app: typer.Typer, prefix_filter: str | None = None) -> None:
     all_display_names = [cmd["display_name"] for cmd in commands] + [
         entry["display_name"] for entry in group_entries
     ]
-    all_labels = all_display_names + all_option_flags
+    all_labels = all_display_names + [help_flags]
     longest_label_length = max((len(label) for label in all_labels), default=0)
 
-    console.print(f"[bold {COLOR.SECONDARY}]Usage:[/bold {COLOR.SECONDARY}]")
-    console.print(f"  [{COLOR.PRIMARY}]{command_name} [OPTIONS] [ARGUMENTS]")
-    console.print()
+    if prefix_filter:
+        command_name = get_script_command_name(default="usecli")
+        interactive_flags = "--interactive, -i"
+        filtered_labels = (
+            [cmd["display_name"] for cmd in commands]
+            + [entry["display_name"] for entry in group_entries]
+            + [help_flags, interactive_flags]
+        )
+        longest_label_length = max((len(label) for label in filtered_labels), default=0)
+        console.print()
+        console.print(f"[bold {COLOR.SECONDARY}]Usage:[/bold {COLOR.SECONDARY}]")
+        # Detect colon-separated commands (e.g., "make:command" matching prefix "make")
+        has_colon_commands = any(
+            ":" in cmd["name"] and cmd["name"].startswith(prefix_filter + ":")
+            for cmd in commands
+        )
+        if has_colon_commands:
+            # Colon-separated: use make:[COMMAND] [OPTIONS]
+            console.print(
+                f"  [not bold {COLOR.PRIMARY}]{command_name} {prefix_filter}:{escape('[COMMAND]')} {escape('[OPTIONS]')}[/]"
+            )
+        else:
+            # Space-separated nested groups: use make [COMMAND] [OPTIONS]
+            console.print(
+                f"  [not bold {COLOR.PRIMARY}]{command_name} {prefix_filter} {escape('[COMMAND]')} {escape('[OPTIONS]')}[/]"
+            )
+        console.print()
+        console.print(f"[bold {COLOR.SECONDARY}]Options:")
+        help_padding = " " * (longest_label_length - len(help_flags) + SPACER_LENGTH)
+        console.print(
+            f"  [{COLOR.OPTION}]{help_flags}[/{COLOR.OPTION}]{help_padding}Show this message and exit."
+        )
+        interactive_padding = " " * (
+            longest_label_length - len(interactive_flags) + SPACER_LENGTH
+        )
+        console.print(
+            f"  [{COLOR.OPTION}]{interactive_flags}[/{COLOR.OPTION}]{interactive_padding}Run in interactive mode."
+        )
+        console.print()
+    else:
+        console.print(f"[bold {COLOR.SECONDARY}]Usage:[/bold {COLOR.SECONDARY}]")
+        console.print(
+            f"  [not bold {COLOR.PRIMARY}]{command_name} {escape('[COMMAND]')} {escape('[OPTIONS]')} {escape('[ARGUMENTS]')}[/]"
+        )
+        console.print()
 
-    console.print(f"[bold {COLOR.SECONDARY}]Options:")
+        console.print(f"[bold {COLOR.SECONDARY}]Options:")
 
-    help_padding = " " * (longest_label_length - len(help_flags) + SPACER_LENGTH)
-    console.print(
-        f"  [{COLOR.OPTION}]{help_flags}[/{COLOR.OPTION}]{help_padding}Show this message and exit."
-    )
+        help_padding = " " * (longest_label_length - len(help_flags) + SPACER_LENGTH)
+        console.print(
+            f"  [{COLOR.OPTION}]{help_flags}[/{COLOR.OPTION}]{help_padding}Show this message and exit."
+        )
 
-    if display_params:
-        for param in display_params:
-            flags = ", ".join(param.opts)
-            if "--help" in flags:
-                continue
-            description = _get_option_description(param)
-            padding = " " * (longest_label_length - len(flags) + SPACER_LENGTH)
-            console.print(
-                f"  [{COLOR.OPTION}]{flags}[/{COLOR.OPTION}]{padding}{description}"
-            )
-    console.print()
+        if display_params:
+            for param in display_params:
+                flags = ", ".join(param.opts)
+                if "--help" in flags:
+                    continue
+                description = _get_option_description(param)
+                padding = " " * (longest_label_length - len(flags) + SPACER_LENGTH)
+                console.print(
+                    f"  [{COLOR.OPTION}]{flags}[/{COLOR.OPTION}]{padding}{description}"
+                )
+        console.print()
 
     if not prefix_filter:
         console.print(f"[bold {COLOR.SECONDARY}]Available commands:")
@@ -224,7 +267,9 @@ def list_commands(app: typer.Typer, prefix_filter: str | None = None) -> None:
         console.print()
 
 
-def list_group_commands(group_app: typer.Typer, group_name: str) -> None:
+def list_group_commands(
+    group_app: typer.Typer, group_name: str, main_app: typer.Typer | None = None
+) -> None:
     """List all commands within a specific command group.
 
     Displays commands in a formatted list for a nested command group,
@@ -233,16 +278,31 @@ def list_group_commands(group_app: typer.Typer, group_name: str) -> None:
     Args:
         group_app: The Typer sub-app for the command group.
         group_name: The name of the command group.
+        main_app: Optional main app to include colon-separated commands.
     """
     alias_registry = _get_alias_registry(group_app)
     alias_to_primary = _build_alias_to_primary(alias_registry)
 
     command_name = get_script_command_name(default="usecli")
 
-    console.print(f"[bold {COLOR.SECONDARY}]Usage:[/bold {COLOR.SECONDARY}]")
-    console.print(
-        f"  [{COLOR.PRIMARY}]{command_name} {group_name} [COMMAND] [OPTIONS][/]"
+    # Check if group has both colon-separated and space-separated commands
+    has_colon_commands = main_app is not None and any(
+        cmd.name and cmd.name.startswith(f"{group_name}:")
+        for cmd in (main_app.registered_commands or [])
     )
+    has_nested_commands = len(group_app.registered_commands) > 0
+
+    console.print(f"[bold {COLOR.SECONDARY}]Usage:[/bold {COLOR.SECONDARY}]")
+    if has_colon_commands and has_nested_commands:
+        # Both formats exist: usecli [COMMAND] [OPTIONS] [ARGUMENTS]
+        console.print(
+            f"  [not bold {COLOR.PRIMARY}]{command_name} {escape('[COMMAND]')} {escape('[OPTIONS]')} {escape('[ARGUMENTS]')}[/]"
+        )
+    else:
+        # Only space-separated: usecli make [COMMAND] [OPTIONS]
+        console.print(
+            f"  [not bold {COLOR.PRIMARY}]{command_name} {group_name} {escape('[COMMAND]')} {escape('[OPTIONS]')}[/]"
+        )
     console.print()
     commands_by_name: dict[str, CommandMeta] = {}
     for command in group_app.registered_commands:
@@ -261,6 +321,23 @@ def list_group_commands(group_app: typer.Typer, group_name: str) -> None:
                 "aliases": alias_registry.get(name, list[str]()),
             }
 
+    # Include colon-separated commands from main app with matching prefix
+    if main_app is not None:
+        prefix = f"{group_name}:"
+        main_alias_registry = _get_alias_registry(main_app)
+        for command in main_app.registered_commands:
+            cmd_name = command.name or ""
+            if not cmd_name.startswith(prefix):
+                continue
+            if cmd_name in commands_by_name:
+                continue
+            help_text = command.help or ""
+            aliases = main_alias_registry.get(cmd_name, [])
+            commands_by_name[cmd_name] = {
+                "help": help_text,
+                "aliases": aliases,
+            }
+
     commands: list[CommandEntry] = []
     for name in commands_by_name:
         aliases = commands_by_name[name]["aliases"]
@@ -313,7 +390,7 @@ def list_group_commands(group_app: typer.Typer, group_name: str) -> None:
         display_name = cmd["display_name"]
         padding = " " * (longest_label_length - len(display_name) + SPACER_LENGTH)
         console.print(
-            f"  [{COLOR.COMMAND}]{display_name}[/{COLOR.COMMAND}]{padding}{cmd['help']}"
+            f"  [{COLOR.COMMAND} not bold]{display_name}[/{COLOR.COMMAND} not bold]{padding}{cmd['help']}"
         )
 
     console.print()

{usecli-0.1.69 → usecli-0.1.71}/src/usecli/cli/services/command_service.py

@@ -177,6 +177,13 @@ class CommandService:
         if spec and spec.loader:
             module = importlib.util.module_from_spec(spec)
             sys.modules[module_name] = module
+
+            from usecli.shared.config.manager import find_project_root
+
+            project_root = find_project_root(path.parent)
+            if project_root and str(project_root) not in sys.path:
+                sys.path.insert(0, str(project_root))
+
             spec.loader.exec_module(module)
             return module
         return None