click-extended 0.1.1__tar.gz → 0.2.1__tar.gz

{click_extended-0.1.1/click_extended.egg-info → click_extended-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: click_extended
-Version: 0.1.1
+Version: 0.2.1
 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-0.1.1 → click_extended-0.2.1}/click_extended/errors.py

@@ -10,6 +10,8 @@ from click import ClickException
 from click._compat import get_text_stderr
 from click.utils import echo
 
+from click_extended.utils.format import format_list
+
 
 class ClickExtendedError(Exception):
     """Base exception for exceptions defined in the `click_extended` library."""
@@ -47,7 +49,7 @@ class ParameterError(ClickException):
     and adding parameter context information.
     """
 
-    exit_code = 2  # Match Click's UsageError exit code
+    exit_code = 2
 
     def __init__(
         self,
@@ -59,9 +61,12 @@ class ParameterError(ClickException):
         Initialize a ParameterError.
 
         Args:
-            message: The error message from the validator/transformer.
-            param_hint: The parameter name (e.g., '--config', 'PATH').
-            ctx: The Click context for displaying usage information.
+            message (str):
+                The error message from the validator/transformer.
+            param_hint (str, optional):
+                The parameter name (e.g., '--config', 'PATH').
+            ctx (click.Context, optional):
+                The Click context for displaying usage information.
         """
         super().__init__(message)
         self.param_hint = param_hint
@@ -235,12 +240,19 @@ class TypeMismatchError(ClickExtendedError):
             """Get type name, handling both regular types and UnionType."""
             return getattr(type_obj, "__name__", str(type_obj))
 
-        type_names = ", ".join(get_type_name(t) for t in supported_types)
         parent_type_name = get_type_name(parent_type) if parent_type else "None"
 
+        type_names = [get_type_name(t) for t in supported_types]
+        formatted_types = format_list(
+            type_names,
+            prefix_singular="Supported type is ",
+            prefix_plural="Supported types are ",
+            wrap=("<", ">"),
+        )
+
         message = (
             f"Decorator '{name}' does not support "
             f"parent '{parent_name}' with type '{parent_type_name}'. "
-            f"Supported types: {type_names}"
+            f"{formatted_types}"
         )
         super().__init__(message)

{click_extended-0.1.1 → click_extended-0.2.1/click_extended.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: click_extended
-Version: 0.1.1
+Version: 0.2.1
 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-0.1.1 → click_extended-0.2.1}/click_extended.egg-info/SOURCES.txt

@@ -20,5 +20,4 @@ tests/test_option.py
 tests/test_parent_node.py
 tests/test_root_node.py
 tests/test_tag.py
-tests/test_transform.py
 tests/test_tree.py

{click_extended-0.1.1 → click_extended-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "click_extended"
-version = "0.1.1"
+version = "0.2.1"
 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" },

{click_extended-0.1.1 → click_extended-0.2.1}/tests/test_child_node.py

@@ -523,6 +523,8 @@ class TestChildNodeTypeValidation:
         parent = MagicMock()
         parent.name = "count"
         parent.type = int
+        parent.nargs = 1
+        parent.multiple = False
 
         # Should not raise
         node.validate_type(parent)
@@ -540,6 +542,8 @@ class TestChildNodeTypeValidation:
         parent = MagicMock()
         parent.name = "name"
         parent.type = str
+        parent.nargs = 1
+        parent.multiple = False
 
         with pytest.raises(TypeMismatchError) as exc_info:
             node.validate_type(parent)
@@ -581,10 +585,14 @@ class TestChildNodeTypeValidation:
         parent_int = MagicMock()
         parent_int.name = "count"
         parent_int.type = int
+        parent_int.nargs = 1
+        parent_int.multiple = False
 
         parent_float = MagicMock()
         parent_float.name = "ratio"
         parent_float.type = float
+        parent_float.nargs = 1
+        parent_float.multiple = False
 
         # Both should pass
         node.validate_type(parent_int)
@@ -605,6 +613,8 @@ class TestChildNodeTypeValidation:
         parent = MagicMock()
         parent.name = "username"
         parent.type = str
+        parent.nargs = 1  # Add nargs attribute
+        parent.multiple = False
 
         with pytest.raises(TypeMismatchError) as exc_info:
             node.validate_type(parent)

{click_extended-0.1.1 → click_extended-0.2.1}/tests/test_option.py

@@ -17,7 +17,7 @@ class TestOptionInitialization:
         assert opt.short is None
         assert opt.is_flag is False
         assert opt.type == str  # Inferred as str when no type/default
-        assert opt.multiple is False
+        assert opt.nargs == 1
         assert opt.help is None
         assert opt.required is False
         assert opt.default is None
@@ -29,7 +29,7 @@ class TestOptionInitialization:
             short="-p",
             is_flag=False,
             type=int,
-            multiple=False,
+            nargs=1,
             help="Port number",
             required=True,
             default=8080,
@@ -38,7 +38,7 @@ class TestOptionInitialization:
         assert opt.short == "-p"
         assert opt.is_flag is False
         assert opt.type == int
-        assert opt.multiple is False
+        assert opt.nargs == 1
         assert opt.help == "Port number"
         assert opt.required is True
         assert opt.default == 8080
@@ -65,9 +65,9 @@ class TestOptionInitialization:
         assert opt.type == int
 
     def test_init_with_multiple_true(self) -> None:
-        """Test initializing with multiple=True."""
-        opt = Option(long="--tag", multiple=True)
-        assert opt.multiple is True
+        """Test initializing with nargs=-1 for unlimited values."""
+        opt = Option(long="--tag", nargs=-1)
+        assert opt.nargs == -1
 
     def test_init_with_extra_kwargs(self) -> None:
         """Test initializing with extra kwargs."""
@@ -412,16 +412,16 @@ class TestOptionDecoratorFunction:
     def test_option_decorator_with_multiple(
         self, mock_queue: MagicMock
     ) -> None:
-        """Test option decorator with multiple parameter."""
+        """Test option decorator with nargs=-1 parameter."""
 
-        @option("--tag", multiple=True)
+        @option("--tag", nargs=-1)
         def test_func() -> str:  # type: ignore
             return "test"
 
         mock_queue.assert_called_once()
         args, _ = mock_queue.call_args
         opt_instance = args[0]
-        assert opt_instance.multiple is True
+        assert opt_instance.nargs == -1
 
     @patch("click_extended.core._parent_node.queue_parent")
     def test_option_decorator_with_help(self, mock_queue: MagicMock) -> None:
@@ -473,7 +473,7 @@ class TestOptionDecoratorFunction:
             short="-p",
             is_flag=False,
             type=int,
-            multiple=False,
+            nargs=1,
             help="Port number",
             required=True,
             default=8080,
@@ -666,17 +666,17 @@ class TestOptionMultiple:
     def test_multiple_false_by_default(self) -> None:
         """Test multiple defaults to False."""
         opt = Option(long="--tag")
-        assert opt.multiple is False
+        assert opt.nargs == 1
 
     def test_multiple_true(self) -> None:
         """Test multiple can be set to True."""
-        opt = Option(long="--tag", multiple=True)
-        assert opt.multiple is True
+        opt = Option(long="--tag", nargs=-1)
+        assert opt.nargs == -1
 
     def test_multiple_with_type(self) -> None:
         """Test multiple with type parameter."""
-        opt = Option(long="--tag", multiple=True, type=str)
-        assert opt.multiple is True
+        opt = Option(long="--tag", nargs=-1, type=str)
+        assert opt.nargs == -1
         assert opt.type == str
 
 
@@ -845,7 +845,7 @@ class TestOptionIntegration:
             short="-p",
             is_flag=False,
             type=int,
-            multiple=False,
+            nargs=1,
             help="Port number",
             required=False,
             default=8080,
@@ -855,7 +855,7 @@ class TestOptionIntegration:
         assert opt.short == "-p"
         assert opt.is_flag is False
         assert opt.type == int
-        assert opt.multiple is False
+        assert opt.nargs == 1
         assert opt.help == "Port number"
         assert opt.required is False
         assert opt.default == 8080
@@ -873,10 +873,10 @@ class TestOptionIntegration:
         opt = Option(
             long="--tag",
             short="-t",
-            multiple=True,
+            nargs=-1,
             help="Add tags (can be used multiple times)",
         )
-        assert opt.multiple is True
+        assert opt.nargs == -1
         assert opt.name == "tag"
 
     def test_typed_option_typical_usage(self) -> None:

click_extended-0.1.1/tests/test_transform.py

@@ -1,333 +0,0 @@
-"""Test the Transform class."""
-
-from click_extended.utils.transform import Transform
-
-
-class Case:
-    """A case to test for all transform methods."""
-
-    def __init__(
-        self,
-        value: str,
-        snake_case: str,
-        screaming_snake_case: str,
-        camel_case: str,
-        pascal_case: str,
-        kebab_case: str,
-        train_case: str,
-        flat_case: str,
-        dot_case: str,
-        title_case: str,
-        path_case: str,
-    ):
-        """
-        Initialize a new `Case` instance.
-
-        Args:
-            value (str):
-                The value to test.
-            snake_case (str):
-                The expected result for the to_snake_case method.
-            screaming_snake_case (str):
-                The expected result for the to_screaming_snake_case method.
-            camel_case (str):
-                The expected result for the to_camel_case method.
-            pascal_case (str):
-                The expected result for the to_pascal_case method.
-            kebab_case (str):
-                The expected result for the to_kebab_case method.
-            train_case (str):
-                The expected result for the to_train_case method.
-            flat_case (str):
-                The expected result for the to_flat_case method.
-            dot_case (str):
-                The expected result for the to_dot_case method.
-            title_case (str):
-                The expected result for the to_title_case method.
-            path_case (str):
-                The expected result for the to_path_case method.
-        """
-        self.value = value
-        self.snake_case = snake_case
-        self.screaming_snake_case = screaming_snake_case
-        self.camel_case = camel_case
-        self.pascal_case = pascal_case
-        self.kebab_case = kebab_case
-        self.train_case = train_case
-        self.flat_case = flat_case
-        self.dot_case = dot_case
-        self.title_case = title_case
-        self.path_case = path_case
-
-
-cases: list[Case] = [
-    Case(
-        value="",
-        snake_case="",
-        screaming_snake_case="",
-        camel_case="",
-        pascal_case="",
-        kebab_case="",
-        train_case="",
-        flat_case="",
-        dot_case="",
-        title_case="",
-        path_case="",
-    ),
-    Case(
-        value="MISSING_ENV2",
-        snake_case="missing_env2",
-        screaming_snake_case="MISSING_ENV2",
-        camel_case="missingEnv2",
-        pascal_case="MissingEnv2",
-        kebab_case="missing-env2",
-        train_case="Missing-Env2",
-        flat_case="missingenv2",
-        dot_case="missing.env2",
-        title_case="Missing Env2",
-        path_case="MISSING/ENV2",
-    ),
-    Case(
-        value="hello",
-        snake_case="hello",
-        screaming_snake_case="HELLO",
-        camel_case="hello",
-        pascal_case="Hello",
-        kebab_case="hello",
-        train_case="Hello",
-        flat_case="hello",
-        dot_case="hello",
-        title_case="Hello",
-        path_case="hello",
-    ),
-    Case(
-        value="thisIsCamelCase",
-        snake_case="this_is_camel_case",
-        screaming_snake_case="THIS_IS_CAMEL_CASE",
-        camel_case="thisIsCamelCase",
-        pascal_case="ThisIsCamelCase",
-        kebab_case="this-is-camel-case",
-        train_case="This-Is-Camel-Case",
-        flat_case="thisiscamelcase",
-        dot_case="this.is.camel.case",
-        title_case="This Is Camel Case",
-        path_case="this/Is/Camel/Case",
-    ),
-    Case(
-        value="test123case",
-        snake_case="test123_case",
-        screaming_snake_case="TEST123_CASE",
-        camel_case="test123Case",
-        pascal_case="Test123Case",
-        kebab_case="test123-case",
-        train_case="Test123-Case",
-        flat_case="test123case",
-        dot_case="test123.case",
-        title_case="Test123 Case",
-        path_case="test123/case",
-    ),
-    Case(
-        value="   spaces   around   ",
-        snake_case="spaces_around",
-        screaming_snake_case="SPACES_AROUND",
-        camel_case="spacesAround",
-        pascal_case="SpacesAround",
-        kebab_case="spaces-around",
-        train_case="Spaces-Around",
-        flat_case="spacesaround",
-        dot_case="spaces.around",
-        title_case="Spaces Around",
-        path_case="spaces/around",
-    ),
-    Case(
-        value="Hello, world",
-        snake_case="hello_world",
-        screaming_snake_case="HELLO_WORLD",
-        camel_case="helloWorld",
-        pascal_case="HelloWorld",
-        kebab_case="hello-world",
-        train_case="Hello-World",
-        flat_case="helloworld",
-        dot_case="hello.world",
-        title_case="Hello World",
-        path_case="Hello/world",
-    ),
-    Case(
-        value="_Difficult, string!!!",
-        snake_case="difficult_string",
-        screaming_snake_case="DIFFICULT_STRING",
-        camel_case="difficultString",
-        pascal_case="DifficultString",
-        kebab_case="difficult-string",
-        train_case="Difficult-String",
-        flat_case="difficultstring",
-        dot_case="difficult.string",
-        title_case="Difficult String",
-        path_case="Difficult/string",
-    ),
-    Case(
-        value="HELLO WORLD",
-        snake_case="hello_world",
-        screaming_snake_case="HELLO_WORLD",
-        camel_case="helloWorld",
-        pascal_case="HelloWorld",
-        kebab_case="hello-world",
-        train_case="Hello-World",
-        flat_case="helloworld",
-        dot_case="hello.world",
-        title_case="Hello World",
-        path_case="HELLO/WORLD",
-    ),
-    Case(
-        value="hello___world---test",
-        snake_case="hello_world_test",
-        screaming_snake_case="HELLO_WORLD_TEST",
-        camel_case="helloWorldTest",
-        pascal_case="HelloWorldTest",
-        kebab_case="hello-world-test",
-        train_case="Hello-World-Test",
-        flat_case="helloworldtest",
-        dot_case="hello.world.test",
-        title_case="Hello World Test",
-        path_case="hello/world/test",
-    ),
-    Case(
-        value="v2.0.1",
-        snake_case="v2_0_1",
-        screaming_snake_case="V2_0_1",
-        camel_case="v201",
-        pascal_case="V201",
-        kebab_case="v2-0-1",
-        train_case="V2-0-1",
-        flat_case="v201",
-        dot_case="v2.0.1",
-        title_case="V2 0 1",
-        path_case="v2/0/1",
-    ),
-    Case(
-        value="already_snake_case",
-        snake_case="already_snake_case",
-        screaming_snake_case="ALREADY_SNAKE_CASE",
-        camel_case="alreadySnakeCase",
-        pascal_case="AlreadySnakeCase",
-        kebab_case="already-snake-case",
-        train_case="Already-Snake-Case",
-        flat_case="alreadysnakecase",
-        dot_case="already.snake.case",
-        title_case="Already Snake Case",
-        path_case="already/snake/case",
-    ),
-    Case(
-        value="PascalCaseInput",
-        snake_case="pascal_case_input",
-        screaming_snake_case="PASCAL_CASE_INPUT",
-        camel_case="pascalCaseInput",
-        pascal_case="PascalCaseInput",
-        kebab_case="pascal-case-input",
-        train_case="Pascal-Case-Input",
-        flat_case="pascalcaseinput",
-        dot_case="pascal.case.input",
-        title_case="Pascal Case Input",
-        path_case="Pascal/Case/Input",
-    ),
-]
-
-
-class TestSnakeCase:
-    """Test the snake case methods."""
-
-    def test_cases(self) -> None:
-        """Test cases."""
-        for case in cases:
-            t = Transform(case.value)
-            assert t.to_snake_case() == case.snake_case
-
-
-class TestScreamingSnakeCase:
-    """Test the screaming snake case methods."""
-
-    def test_cases(self) -> None:
-        """Test cases."""
-        for case in cases:
-            t = Transform(case.value)
-            assert t.to_screaming_snake_case() == case.screaming_snake_case
-
-
-class TestCamelCase:
-    """Test the camel case methods."""
-
-    def test_cases(self) -> None:
-        """Test cases."""
-        for case in cases:
-            t = Transform(case.value)
-            assert t.to_camel_case() == case.camel_case
-
-
-class TestPascalCase:
-    """Test the pascal case methods."""
-
-    def test_cases(self) -> None:
-        """Test cases."""
-        for case in cases:
-            t = Transform(case.value)
-            assert t.to_pascal_case() == case.pascal_case
-
-
-class TestKebabCase:
-    """Test the kebab case methods."""
-
-    def test_cases(self) -> None:
-        """Test cases."""
-        for case in cases:
-            t = Transform(case.value)
-            assert t.to_kebab_case() == case.kebab_case
-
-
-class TestTrainCase:
-    """Test the train case methods."""
-
-    def test_cases(self) -> None:
-        """Test cases."""
-        for case in cases:
-            t = Transform(case.value)
-            assert t.to_train_case() == case.train_case
-
-
-class TestFlatCaase:
-    """Test the flat case methods."""
-
-    def test_cases(self) -> None:
-        """Test cases."""
-        for case in cases:
-            t = Transform(case.value)
-            assert t.to_flat_case() == case.flat_case
-
-
-class TestDotCase:
-    """Test the dot case methods."""
-
-    def test_cases(self) -> None:
-        """Test cases."""
-        for case in cases:
-            t = Transform(case.value)
-            assert t.to_dot_case() == case.dot_case
-
-
-class TestTitleCase:
-    """Test the pascal case methods."""
-
-    def test_cases(self) -> None:
-        """Test cases."""
-        for case in cases:
-            t = Transform(case.value)
-            assert t.to_title_case() == case.title_case
-
-
-class TestPathCase:
-    """Test the path case methods."""
-
-    def test_cases(self) -> None:
-        """Test cases."""
-        for case in cases:
-            t = Transform(case.value)
-            assert t.to_path_case() == case.path_case