click-extended 1.0.5__py3-none-any.whl → 1.0.7__py3-none-any.whl

click_extended/core/nodes/child_validation_node.py

@@ -3,6 +3,7 @@ Child validation node module for nodes that can
 act as both child and validation nodes.
 """
 
+import asyncio
 from abc import ABC
 from functools import wraps
 from typing import TYPE_CHECKING, Any, Callable, ParamSpec, TypeVar
@@ -88,8 +89,20 @@ class ChildValidationNode(ChildNode, ValidationNode, ABC):
             instance = cls(name=name, process_args=args, process_kwargs=kwargs)
             Tree.queue_child_validation(instance)
 
+            if asyncio.iscoroutinefunction(func):
+
+                @wraps(func)
+                async def async_wrapper(
+                    *call_args: P.args, **call_kwargs: P.kwargs
+                ) -> T:
+                    """Async wrapper that preserves the original function."""
+                    return await func(*call_args, **call_kwargs)  # type: ignore
+
+                return async_wrapper  # type: ignore
+
             @wraps(func)
             def wrapper(*call_args: P.args, **call_kwargs: P.kwargs) -> T:
+                """Wrapper that preserves the original function."""
                 return func(*call_args, **call_kwargs)
 
             return wrapper

click_extended/core/nodes/validation_node.py

@@ -1,5 +1,6 @@
 """ValidationNode class for global validation logic."""
 
+import asyncio
 from abc import ABC
 from functools import wraps
 from typing import TYPE_CHECKING, Any, Callable, ParamSpec, TypeVar
@@ -111,6 +112,18 @@ class ValidationNode(Node, ABC):
             instance = cls(name=name, process_args=args, process_kwargs=kwargs)
             Tree.queue_validation(instance)
 
+            if asyncio.iscoroutinefunction(func):
+
+                @wraps(func)
+                async def async_wrapper(
+                    *call_args: P.args,
+                    **call_kwargs: P.kwargs,
+                ) -> T:
+                    """Async wrapper that preserves the original function."""
+                    return await func(*call_args, **call_kwargs)  # type: ignore
+
+                return async_wrapper  # type: ignore
+
             @wraps(func)
             def wrapper(*call_args: P.args, **call_kwargs: P.kwargs) -> T:
                 """Wrapper that preserves the original function."""

click_extended/decorators/check/regex.py

@@ -1,7 +1,7 @@
 """Check if a value matches a regex pattern."""
 
 import re
-from typing import Any
+from typing import Any, Union
 
 from click_extended.core.nodes.child_node import ChildNode
 from click_extended.core.other.context import Context
@@ -18,17 +18,29 @@ class Regex(ChildNode):
         *args: Any,
         **kwargs: Any,
     ) -> Any:
-        patterns = kwargs["patterns"]
+        patterns: tuple[Union[str, re.Pattern[str]], ...] = kwargs["patterns"]
+        flags: int = kwargs.get("flags", 0)
+
         for pattern in patterns:
-            if re.fullmatch(pattern, value):
+            compiled_pattern: re.Pattern[str]
+            if isinstance(pattern, re.Pattern):
+                compiled_pattern = pattern
+            else:
+                compiled_pattern = re.compile(pattern, flags)
+
+            if compiled_pattern.fullmatch(value):
                 return value
 
+        pattern_strs: list[str] = [
+            p.pattern if isinstance(p, re.Pattern) else p for p in patterns
+        ]
         raise ValueError(
-            f"Value '{value}' does not match any of the patterns: {patterns}"
+            f"Value '{value}' does not match any "
+            + f"of the patterns: {pattern_strs}"
         )
 
 
-def regex(*patterns: str) -> Decorator:
+def regex(*patterns: Union[str, re.Pattern[str]], flags: int = 0) -> Decorator:
     """
     Check if a value matches a regex pattern.
 
@@ -37,11 +49,17 @@ def regex(*patterns: str) -> Decorator:
     Supports: `str`
 
     Args:
-        *patterns (str):
-            The regex patterns to check against.
+        *patterns (Union[str, Pattern[str]]):
+            The regex patterns to check against. Can be strings or compiled
+            Pattern objects. If strings are provided, they will be compiled
+            with the specified flags.
+        flags (int):
+            Regex flags to use when compiling string patterns (e.g.,
+            re.IGNORECASE, re.MULTILINE). Ignored for pre-compiled patterns.
+            Default is 0 (no flags).
 
     Returns:
         Decorator:
             The decorated function.
     """
-    return Regex.as_decorator(patterns=patterns)
+    return Regex.as_decorator(patterns=patterns, flags=flags)

{click_extended-1.0.5.dist-info → click_extended-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: click_extended
-Version: 1.0.5
+Version: 1.0.7
 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.5.dist-info → click_extended-1.0.7.dist-info}/RECORD

@@ -17,11 +17,11 @@ click_extended/core/nodes/__init__.py,sha256=jSsKTiHPUpqXdk54cRXDotT0YMmVGezIIb3
 click_extended/core/nodes/_root_node.py,sha256=PitK6GT7LPYugxPFdVO6blG0-mZV9S2apUupgWCsYI0,43060
 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=p4ODRpW-Q-aQB0zlbNAeLahFAcuAaMLPtZl4r0ywmk0,3301
+click_extended/core/nodes/child_validation_node.py,sha256=Xcqid9EL3pHVrgv_43zz-ZL4W4yFm0Esj2qkk9qhWMc,3807
 click_extended/core/nodes/node.py,sha256=Q5OgaSNhz1dAIcYNDQOaAS2eCdu9XMMyDA5lXfZbY4E,1602
 click_extended/core/nodes/option_node.py,sha256=fCYrnW846mz1aDyf9sTQAnuIYUGd5g6XyUN6aBMIWgE,7055
 click_extended/core/nodes/parent_node.py,sha256=x526r7XjfsUypsB1N-5aXjEbP2d06eLF30G6IszxV3w,7352
-click_extended/core/nodes/validation_node.py,sha256=9X_dBbr1BB-OYRxnGsM8CoKRbKT1MuQ29Injtf_Iu_E,4020
+click_extended/core/nodes/validation_node.py,sha256=TwpbzEeZNd8Ju-EeoTsT5Ghd6opDJRT2YHuOnBkegDg,4479
 click_extended/core/other/__init__.py,sha256=ZYPlENo4widfcRWcg4yojmkNf_E89Y7U_8hRFCTOZoY,236
 click_extended/core/other/_click_command.py,sha256=NR7e-GyKiqyVJC8X5NjRXz5ehsYl9axVIxZCSejzUg4,1738
 click_extended/core/other/_click_group.py,sha256=BoEQoyx13n27Qy1-h_Dkaie68MlyPClIVB8cNtfPGdY,7714
@@ -52,7 +52,7 @@ click_extended/decorators/check/is_url.py,sha256=SLFO4v70CbuxOLr2zPMwH-CU8XqS1fa
 click_extended/decorators/check/is_uuid.py,sha256=QmCpQ6k7Z6zX0cICySqhKFr5wv0jkbGL7e1AA_jeFLw,844
 click_extended/decorators/check/length.py,sha256=guenyyVsoXHQcj0iZqqLcPxhujYTL6XKgBmgBmoG_Ls,1930
 click_extended/decorators/check/not_empty.py,sha256=TdznbvzhYJlWm2SoSxTTcpLT0SGLQMkXx8TTUhIqM5w,1125
-click_extended/decorators/check/regex.py,sha256=Vf6Tgx1gzmjKgWIT0nPtaFNv2taTdvVDXOWqmZg4Pm0,1066
+click_extended/decorators/check/regex.py,sha256=J4lQ0_DllckXdJYhUBY65p8_HVl8SoKNJXn2Pc-revw,1945
 click_extended/decorators/check/requires.py,sha256=t_K4MIuli3oNkeHaNjIIEvwnwDop7bCrtKovL0HHz2c,5644
 click_extended/decorators/check/starts_with.py,sha256=0XDhJC9_2-BgDeb2ASnHWPhkXYFizHy47ns0M6dRjKg,2561
 click_extended/decorators/check/truthy.py,sha256=rfmQvHn-AN-y6knopta5PnYYvzgFVOkM1TqxDUI-nfw,748
@@ -143,9 +143,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.5.dist-info/licenses/AUTHORS.md,sha256=NkShPinjqtnRDQVRyVnfJuOGM56sejauE3WRoYCcbtw,132
-click_extended-1.0.5.dist-info/licenses/LICENSE,sha256=gjO8hzM4mFSBXFikktaXVSgmXGcre91_GPJ-E_yP56E,1075
-click_extended-1.0.5.dist-info/METADATA,sha256=AMqloDv_MsOhytj3tOYCyFyd41WzbVcmZqZoFC5BjxU,10841
-click_extended-1.0.5.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-click_extended-1.0.5.dist-info/top_level.txt,sha256=2G3bm6tCNv80okRm773jKTk-_z1ElY-seaozZrn_TxA,15
-click_extended-1.0.5.dist-info/RECORD,,
+click_extended-1.0.7.dist-info/licenses/AUTHORS.md,sha256=NkShPinjqtnRDQVRyVnfJuOGM56sejauE3WRoYCcbtw,132
+click_extended-1.0.7.dist-info/licenses/LICENSE,sha256=gjO8hzM4mFSBXFikktaXVSgmXGcre91_GPJ-E_yP56E,1075
+click_extended-1.0.7.dist-info/METADATA,sha256=pVmPjkszY_IAx2DP-RM2i2IkhS28n_g6fkFU9itz8y4,10841
+click_extended-1.0.7.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+click_extended-1.0.7.dist-info/top_level.txt,sha256=2G3bm6tCNv80okRm773jKTk-_z1ElY-seaozZrn_TxA,15
+click_extended-1.0.7.dist-info/RECORD,,