click-extended 1.0.8__py3-none-any.whl → 1.0.10__py3-none-any.whl

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/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/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.dist-info → click_extended-1.0.10.dist-info}/METADATA

@@ -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.dist-info → click_extended-1.0.10.dist-info}/RECORD

@@ -9,12 +9,12 @@ click_extended/core/decorators/command.py,sha256=82rwi8PIMGgOagFoNISOQkdEebKxvS9
 click_extended/core/decorators/context.py,sha256=y_jzARNNdu2JyUhIaUFpCAurztOTsYJTX96HQ2csZs0,1546
 click_extended/core/decorators/env.py,sha256=DgbQsOZ2De-Ur5hxR8hzN3-3T16K3FLsoZHS2EsKK6c,4777
 click_extended/core/decorators/group.py,sha256=_bammCVi_7vsw7YgSUTQuQp6XFUHy7knNcOmyg6DiPc,2859
-click_extended/core/decorators/option.py,sha256=E7NzM7dNtICh9YcAvYPvJkdvuxKDNjCIFl9a8ZyhXWQ,11810
+click_extended/core/decorators/option.py,sha256=iUJ6O60GgGy1resjmC9DHuvLg_2UTmw8fcjptNiAI0Y,12476
 click_extended/core/decorators/prompt.py,sha256=QwySQ6ZK0j0iL_jlwH3AU0U4G1X3MKAJ8_TysEXxFX8,1735
 click_extended/core/decorators/selection.py,sha256=5cjWpAwReu8EY0mkziwpqhi_T5ucIlAPx1p-t3MkGJQ,5589
 click_extended/core/decorators/tag.py,sha256=395e6GN59QBj-L0NSBPynQOX3_2LAOIXkj8XKNXrRPs,3055
 click_extended/core/nodes/__init__.py,sha256=jSsKTiHPUpqXdk54cRXDotT0YMmVGezIIb3nQ0rcWko,737
-click_extended/core/nodes/_root_node.py,sha256=PitK6GT7LPYugxPFdVO6blG0-mZV9S2apUupgWCsYI0,43060
+click_extended/core/nodes/_root_node.py,sha256=cNmTPtREVjNi6WZj3chtYFmn9_2iqJh4l32NEmO0Db4,44233
 click_extended/core/nodes/argument_node.py,sha256=gqG4HTDR40Xru_U_beKsbjVtLtwmPKfwwAUmcf5-1iQ,5284
 click_extended/core/nodes/child_node.py,sha256=yIuXmUzdXN0EToR9ohBRvHFBriSZ-xaLkv7P27PbTrA,17095
 click_extended/core/nodes/child_validation_node.py,sha256=Xcqid9EL3pHVrgv_43zz-ZL4W4yFm0Esj2qkk9qhWMc,3807
@@ -98,7 +98,7 @@ click_extended/decorators/math/sqrt.py,sha256=CWZoQpVw2lbP_LNeg-tWW8fz9VEHTX8eQN
 click_extended/decorators/math/subtract.py,sha256=A7TMByTUH3coSEe7iRN9NkHW2mv47kufb1H1adomG4A,806
 click_extended/decorators/math/to_percent.py,sha256=39vY13u7Z-pyob1vCoPBDy10FqJasJTVzHcrpTH6ERQ,1374
 click_extended/decorators/misc/__init__.py,sha256=Cl2u81f_dkvHoMoSb82L1KuNVM-3b1lzKHUMAuxhmH0,662
-click_extended/decorators/misc/catch.py,sha256=Ft8CbTlX6OgeNA8re_epKfwK4HyWQ1eUuCbhNqzpNbw,9343
+click_extended/decorators/misc/catch.py,sha256=LkBxGHNo7_RrXjUP0LOTYOLvb9q1fTBIULJJIcYXo4Y,11095
 click_extended/decorators/misc/choice.py,sha256=RTVVjl0YUZ2Ti4j6yoHkUpJ0aqNwcnc3rTfmCVr0y0U,4354
 click_extended/decorators/misc/confirm_if.py,sha256=Rf3HcVVTRqz3sGSiPT02yz65_L351Fzkuw2V6pljlmY,4786
 click_extended/decorators/misc/default.py,sha256=TjZJKmHEqNThzyD6hOjQy2_QgHRenKILnAwfV1V5KAw,2473
@@ -144,9 +144,9 @@ click_extended/utils/naming.py,sha256=kNmzOqidgZZ1dE5aMYrxpWt4VwcLuEiFunpumpfHuZ
 click_extended/utils/process.py,sha256=sU3ZCMjBgjKcDnTRLKPdQ_TAjk0AT7Q8SatagD0JyHA,9729
 click_extended/utils/selection.py,sha256=_OQC88pGPUh29boxmS5ugXEi9jZGqAG180S27PeQaj0,9875
 click_extended/utils/time.py,sha256=H5m5caIEau_1GHkiYgKL_LcTtVdw2TkFVbkqJu7A9rQ,1067
-click_extended-1.0.8.dist-info/licenses/AUTHORS.md,sha256=NkShPinjqtnRDQVRyVnfJuOGM56sejauE3WRoYCcbtw,132
-click_extended-1.0.8.dist-info/licenses/LICENSE,sha256=gjO8hzM4mFSBXFikktaXVSgmXGcre91_GPJ-E_yP56E,1075
-click_extended-1.0.8.dist-info/METADATA,sha256=j42ol1yFZRyvuaiM_g7_-LVNJHFuMX6BDdcog4EjTC8,10841
-click_extended-1.0.8.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-click_extended-1.0.8.dist-info/top_level.txt,sha256=2G3bm6tCNv80okRm773jKTk-_z1ElY-seaozZrn_TxA,15
-click_extended-1.0.8.dist-info/RECORD,,
+click_extended-1.0.10.dist-info/licenses/AUTHORS.md,sha256=NkShPinjqtnRDQVRyVnfJuOGM56sejauE3WRoYCcbtw,132
+click_extended-1.0.10.dist-info/licenses/LICENSE,sha256=gjO8hzM4mFSBXFikktaXVSgmXGcre91_GPJ-E_yP56E,1075
+click_extended-1.0.10.dist-info/METADATA,sha256=gPGL5Ui0QKLmj7LywnsrtOL0NLNGa_JywqU2BTWPIxU,10842
+click_extended-1.0.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+click_extended-1.0.10.dist-info/top_level.txt,sha256=2G3bm6tCNv80okRm773jKTk-_z1ElY-seaozZrn_TxA,15
+click_extended-1.0.10.dist-info/RECORD,,

{click_extended-1.0.8.dist-info → click_extended-1.0.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any