click-extended 1.0.8__tar.gz → 1.0.10__tar.gz

{click_extended-1.0.8/click_extended.egg-info → click_extended-1.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: click_extended
-Version: 1.0.8
+Version: 1.0.10
 Summary: An extension to Click with additional features like automatic async support, aliasing and a modular decorator system.
 Author-email: Marcus Fredriksson <marcus@marcusfredriksson.com>
 License: MIT License

{click_extended-1.0.8 → click_extended-1.0.10}/click_extended/core/decorators/option.py

@@ -4,6 +4,7 @@
 # pylint: disable=too-many-positional-arguments
 # pylint: disable=too-many-locals
 # pylint: disable=too-many-branches
+# pylint: disable=too-many-statements
 # pylint: disable=redefined-builtin
 
 import asyncio
@@ -82,6 +83,21 @@ class Option(OptionNode):
             **kwargs (Any):
                 Additional Click option parameters.
         """
+        if is_short_flag(name):
+            long_flag = next(
+                (flag for flag in flags if is_long_flag(flag)), None
+            )
+            if long_flag is None:
+                raise ValueError(
+                    f"Short flag '{name}' provided without a long flag. "
+                    "Provide a long flag to derive the option name, e.g. "
+                    f"@option('{name}', '--flag'), or pass an explicit "
+                    f"snake_case name like @option('flag', '{name}')."
+                )
+            if name not in flags:
+                flags = (name,) + flags
+            name = long_flag
+
         if name.startswith("--"):
             if is_long_flag(name):
                 derived_name = name[2:]

{click_extended-1.0.8 → click_extended-1.0.10}/click_extended/core/nodes/_root_node.py

@@ -664,7 +664,33 @@ class RootNode(Node):
                                     context,
                                 )
 
-                    for validation_node in root.tree.validations:
+                    catch_nodes = [
+                        v
+                        for v in root.tree.validations
+                        if v.__class__.__name__ == "Catch"
+                    ]
+                    other_nodes = [
+                        v
+                        for v in root.tree.validations
+                        if v.__class__.__name__ != "Catch"
+                    ]
+                    root.tree.validations = catch_nodes + other_nodes
+
+                    for i, validation_node in enumerate(root.tree.validations):
+                        if validation_node.__class__.__name__ == "Catch":
+                            if hasattr(
+                                validation_node, "remaining_validations"
+                            ):
+                                validation_node.remaining_validations = (
+                                    root.tree.validations[i + 1 :]
+                                )
+                            validation_node.on_finalize(
+                                custom_context,
+                                *validation_node.process_args,
+                                **validation_node.process_kwargs,
+                            )
+                            break
+
                         validation_node.on_finalize(
                             custom_context,
                             *validation_node.process_args,

{click_extended-1.0.8 → click_extended-1.0.10}/click_extended/decorators/misc/catch.py

@@ -2,6 +2,10 @@
 Validation node to catch and handle exceptions from command/group functions.
 """
 
+# pylint: disable=wrong-import-position
+# pylint: disable=wrong-import-order
+# pylint: disable=ungrouped-imports
+
 import asyncio
 import inspect
 from functools import wraps
@@ -23,11 +27,16 @@ _catch_handlers: WeakKeyDictionary[
 
 class Catch(ValidationNode):
     """
-    Catch and handle exceptions from command/group functions.
+    Catch and handle exceptions from command/group functions and
+    validators.
+
+    Wraps both the validation phase and function execution in a
+    try-except block. When an exception is caught, an optional handler
+    is invoked. Without a handler, exceptions are silently suppressed.
 
-    Wraps the decorated function in a try-except block. When an exception
-    is caught, an optional handler is invoked. Without a handler, exceptions
-    are silently suppressed.
+    Catches exceptions from:
+    - Validation decorators (e.g., @exclusive, @requires)
+    - The command/group function itself
 
     Handler signatures supported:
     - `handler()` - No arguments, just execute code
@@ -36,15 +45,16 @@ class Catch(ValidationNode):
 
     Examples:
         ```py
-        # Simple error logging
+        # Catch validation errors from @exclusive
         @command()
-        @catch(ValueError, handler=lambda: print("Invalid value!"))
-        def cmd():
-            raise ValueError("Bad input")
+        @exclusive("--stock", "--query")
+        @catch(ValueError, handler=lambda e: print(f"Error: {e}"))
+        def search(stock, query):
+            pass
         ```
 
         ```py
-        # Handle exception with details
+        # Catch errors from command function
         @command()
         @catch(ValueError, handler=lambda e: print(f"Error: {e}"))
         def cmd():
@@ -73,19 +83,52 @@ class Catch(ValidationNode):
         """Initialize Catch validation node with function to wrap."""
         super().__init__(name, process_args, process_kwargs, **kwargs)
         self.wrapped_func: Callable[..., Any] | None = None
+        self.remaining_validations: list[ValidationNode] = []
 
     def on_finalize(self, context: Context, *args: Any, **kwargs: Any) -> None:
         """
-        Store exception handler configuration for later use.
+        Execute remaining validations wrapped in exception handling.
 
-        The actual exception catching happens when the function is invoked,
-        which is done by wrapping the function in the decorator.
+        This catches exceptions from all validators that run after @catch,
+        allowing it to catch validation errors like those from @exclusive.
 
         Args:
             context: The execution context
             *args: Contains exception types tuple at index 0
             **kwargs: Contains handler, reraise parameters
         """
+        exception_types: tuple[type[BaseException], ...] = args[0]
+        handler: Callable[..., Any] | None = kwargs.get("handler")
+        reraise: bool = kwargs.get("reraise", False)
+
+        for validation_node in self.remaining_validations:
+            try:
+                if asyncio.iscoroutinefunction(validation_node.on_finalize):
+                    asyncio.run(
+                        validation_node.on_finalize(
+                            context,
+                            *validation_node.process_args,
+                            **validation_node.process_kwargs,
+                        )
+                    )
+                else:
+                    validation_node.on_finalize(
+                        context,
+                        *validation_node.process_args,
+                        **validation_node.process_kwargs,
+                    )
+            except BaseException as exc:
+                if isinstance(exc, exception_types):
+                    if handler is not None:
+                        if asyncio.iscoroutinefunction(handler):
+                            asyncio.run(_call_handler_async(handler, exc))
+                        else:
+                            _call_handler_sync(handler, exc)
+
+                    if not reraise:
+                        return
+
+                raise
 
 
 def catch(

{click_extended-1.0.8 → click_extended-1.0.10/click_extended.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: click_extended
-Version: 1.0.8
+Version: 1.0.10
 Summary: An extension to Click with additional features like automatic async support, aliasing and a modular decorator system.
 Author-email: Marcus Fredriksson <marcus@marcusfredriksson.com>
 License: MIT License

{click_extended-1.0.8 → click_extended-1.0.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "click_extended"
-version = "1.0.8"
+version = "1.0.10"
 description = "An extension to Click with additional features like automatic async support, aliasing and a modular decorator system."
 authors = [
     { name = "Marcus Fredriksson", email = "marcus@marcusfredriksson.com" },