usecli 0.1.70__tar.gz → 0.1.71__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usecli
-Version: 0.1.70
+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.70 → usecli-0.1.71}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usecli"
-version = "0.1.70"
+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.70 → 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.70 → 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(
@@ -73,6 +75,7 @@ class NestedCommandRegistry:
             )
             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)
@@ -142,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.70 → 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 (
@@ -178,14 +179,14 @@ def list_commands(app: typer.Typer, prefix_filter: str | None = None) -> None:
             for cmd in commands
         )
         if has_colon_commands:
-            # Colon-separated: use make:COMMAND [OPTIONS]
+            # Colon-separated: use make:[COMMAND] [OPTIONS]
             console.print(
-                f"  [not bold {COLOR.PRIMARY}]{command_name} {prefix_filter}:COMMAND [OPTIONS][/]"
+                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} [COMMAND] [OPTIONS][/]"
+                f"  [not bold {COLOR.PRIMARY}]{command_name} {prefix_filter} {escape('[COMMAND]')} {escape('[OPTIONS]')}[/]"
             )
         console.print()
         console.print(f"[bold {COLOR.SECONDARY}]Options:")
@@ -203,7 +204,7 @@ def list_commands(app: typer.Typer, prefix_filter: str | None = None) -> None:
     else:
         console.print(f"[bold {COLOR.SECONDARY}]Usage:[/bold {COLOR.SECONDARY}]")
         console.print(
-            f"  [not bold {COLOR.PRIMARY}]{command_name} [OPTIONS] [ARGUMENTS][/]"
+            f"  [not bold {COLOR.PRIMARY}]{command_name} {escape('[COMMAND]')} {escape('[OPTIONS]')} {escape('[ARGUMENTS]')}[/]"
         )
         console.print()
 
@@ -266,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,
@@ -275,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"  [not bold {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:
@@ -303,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"]
@@ -355,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()