refactor tests

src/argenta/app/models.py

@@ -323,7 +323,7 @@ class BaseApp:
         for router_entity in self.registered_routers:
             router_triggers = router_entity.triggers
             router_aliases = router_entity.aliases
-            combined = router_triggers + router_aliases
+            combined = router_triggers | router_aliases
 
             for trigger in combined:
                 self._matching_default_triggers_with_routers[trigger] = router_entity
@@ -331,15 +331,6 @@ class BaseApp:
 
         self._autocompleter.initial_setup(list(self._current_matching_triggers_with_routers.keys()))
 
-        seen = {}
-        for item in list(self._current_matching_triggers_with_routers.keys()):
-            if item in seen:
-                Console().print(
-                    f"\n[b red]WARNING:[/b red] Overlapping trigger or alias: [b blue]{item}[/b blue]"
-                )
-            else:
-                seen[item] = True
-
         if not self._override_system_messages:
             self._setup_default_view()
 

src/argenta/command/models.py

@@ -17,7 +17,7 @@ ParseResult = tuple[str, InputFlags]
 MIN_FLAG_PREFIX: str = "-"
 PREFIX_TYPE = Literal["-", "--", "---"]
 DEFAULT_WITHOUT_FLAGS: Flags = Flags()
-DEFAULT_WITHOUT_ALIASES: list[Never] = []
+DEFAULT_WITHOUT_ALIASES: set[Never] = set()
 
 DEFAULT_WITHOUT_INPUT_FLAGS: InputFlags = InputFlags()
 
@@ -29,7 +29,7 @@ class Command:
         *,
         description: str = "Some useful command",
         flags: Flag | Flags = DEFAULT_WITHOUT_FLAGS,
-        aliases: list[str] | list[Never] = DEFAULT_WITHOUT_ALIASES,
+        aliases: set[str] | set[Never] = DEFAULT_WITHOUT_ALIASES,
     ):
         """
         Public. The command that can and should be registered in the Router
@@ -41,7 +41,7 @@ class Command:
         self.registered_flags: Flags = flags if isinstance(flags, Flags) else Flags([flags])
         self.trigger: str = trigger
         self.description: str = description
-        self.aliases: list[str] | list[Never] = aliases
+        self.aliases: set[str] | set[Never] = aliases
 
     def validate_input_flag(self, flag: InputFlag) -> ValidationStatus:
         """

src/argenta/router/entity.py

@@ -41,6 +41,9 @@ class Router:
 
         self.command_handlers: CommandHandlers = CommandHandlers()
         self.command_register_ignore: bool = False
+        
+        self.aliases: set[str] = set()
+        self.triggers: set[str] = set()
 
     def command(self, command: Command | str) -> Callable[[HandlerFunc], HandlerFunc]:
         """
@@ -53,7 +56,13 @@ class Router:
         else:
             redefined_command = command
 
-        _validate_command(redefined_command)
+        self._validate_command(redefined_command)
+    
+        if overlapping := (self.aliases | self.triggers) & command.aliases:
+            Console().print(f"\n[b red]WARNING:[/b red] Overlapping trigger or alias: [b blue]{overlapping}[/b blue]")
+        
+        self.aliases.update(command.aliases)
+        self.triggers.add(command.trigger)
 
         def decorator(func: HandlerFunc) -> HandlerFunc:
             _validate_func_args(func)
@@ -61,6 +70,20 @@ class Router:
             return func
 
         return decorator
+        
+    def _validate_command(self, command: Command) -> None:
+        """
+        Private. Validates the command registered in handler
+        :param command: validated command
+        :return: None if command is valid else raise exception
+        """
+        command_name: str = command.trigger
+        if command_name.find(" ") != -1:
+            raise TriggerContainSpacesException()
+        flags: Flags = command.registered_flags
+        flags_name: list[str] = [flag.string_entity.lower() for flag in flags]
+        if len(set(flags_name)) < len(flags_name):
+            raise RepeatedFlagNameException()
 
     def finds_appropriate_handler(self, input_command: InputCommand) -> None:
         """
@@ -105,29 +128,6 @@ class Router:
                 response = Response(ResponseStatus.ALL_FLAGS_VALID)
                 command_handler.handling(response)
 
-    @property
-    def triggers(self) -> list[str]:
-        """
-        Public. Gets registered triggers
-        :return: registered in router triggers as list[str]
-        """
-        all_triggers: list[str] = []
-        for command_handler in self.command_handlers:
-            all_triggers.append(command_handler.handled_command.trigger)
-        return all_triggers
-
-    @property
-    def aliases(self) -> list[str]:
-        """
-        Public. Gets registered aliases
-        :return: registered in router aliases as list[str]
-        """
-        all_aliases: list[str] = []
-        for command_handler in self.command_handlers:
-            if command_handler.handled_command.aliases:
-                all_aliases.extend(command_handler.handled_command.aliases)
-        return all_aliases
-
 
 class CommandDecorator:
     def __init__(self, router_instance: Router, command: Command):
@@ -188,18 +188,4 @@ def _validate_func_args(func: Callable[..., None]) -> None:
                 + f" [i]but[/i] [bold blue]{response_arg_annotation}[/bold blue] [i]is specified[/i]",
                 highlight=False,
             )
-
-
-def _validate_command(command: Command) -> None:
-    """
-    Private. Validates the command registered in handler
-    :param command: validated command
-    :return: None if command is valid else raise exception
-    """
-    command_name: str = command.trigger
-    if command_name.find(" ") != -1:
-        raise TriggerContainSpacesException()
-    flags: Flags = command.registered_flags
-    flags_name: list[str] = [flag.string_entity.lower() for flag in flags]
-    if len(set(flags_name)) < len(flags_name):
-        raise RepeatedFlagNameException()
+