preparse 1.1.9__tar.gz → 1.1.11__tar.gz

{preparse-1.1.9 → preparse-1.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: preparse
-Version: 1.1.9
+Version: 1.1.11
 Summary: This project preparses args for further parsing later on.
 Author-email: Johannes <johannes.programming@gmail.com>
 License-Expression: MIT

{preparse-1.1.9 → preparse-1.1.11}/docs/v1.1.rst

@@ -85,7 +85,7 @@ It works as a decorator that embeds its parser into a given target from the libr
 ``cmd: object``
 """""""""""""""
 
-This ``property`` determines if the ``reflectClickCommand`` method of parser is to be called.
+This dataclass field determines if the ``reflectClickCommand`` method of parser is to be called.
 
 ``copy() -> Self``
 """"""""""""""""""
@@ -95,12 +95,12 @@ This method returns a shallow copy of the current decorator.
 ``ctx: object``
 """""""""""""""
 
-This ``property`` determines if the ``reflectClickContext`` method of parser is to be called.
+This dataclass field determines if the ``reflectClickContext`` method of parser is to be called.
 
 ``parser: preparse.core.PreParser.PreParser``
 """""""""""""""""""""""""""""""""""""""""""""
 
-This ``property`` holds the parser to be embedded.
+This dataclass field holds the parser to be embedded.
 
 ``class preparse.core.Optdict.Optdict(data: preparse.typing.SupportsKeysAndGetitem.SupportsKeysAndGetitem | Iterable[tuple[Hashable, object]] = (), /)``
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -166,8 +166,10 @@ This ``property`` holds a dict-like object.
 Its keys are the options.
 Its values specify ``preparse.Nargs``.
 Options not found within the dictionary
-cause a ``preparse.PreparseInvalidOptionWarning``
-and are then assumed to have no arguments.
+cause a ``preparse.PreparseInvalidOptionWarning``.
+Unknown short options are assumed to take no argument.
+Unknown long options are assumed to take an optional argument.
+This behaviour reflects ``getopt``.
 
 ``parse_args(args: Optional[Iterable[object]] = None) -> list[str]``
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -292,8 +294,8 @@ These classes are subclasses of ``Warning`` that are specifically designed to co
 
 This abstract base ``class`` is the base for all other warning types.
 
-``class preparse.warnings.PreparseAmbiguousOptionWarning.PreparseAmbiguousOptionWarning(*, prog: Any, option: Any, possibilities: Any)``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+``class preparse.warnings.PreparseAmbiguousOptionWarning.PreparseAmbiguousOptionWarning(*, prog: object, option: object, possibilities: Iterable[object])``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This ``class`` warns about ambiguous options. This can only happen for long options.
 

{preparse-1.1.9 → preparse-1.1.11}/pyproject.toml

@@ -36,7 +36,7 @@ license-files = [
 name = "preparse"
 readme = "README.rst"
 requires-python = ">=3.11"
-version = "1.1.9"
+version = "1.1.11"
 
 [project.urls]
 Download = "https://pypi.org/project/preparse/#files"

preparse-1.1.11/src/preparse/_tests/secondary.py

@@ -0,0 +1,16 @@
+from typing import Any
+
+import click
+
+__all__ = ["secondary"]
+
+
+@click.command()
+@click.option("-v", "--verbose", is_flag=True)
+@click.option("--name", required=True)
+@click.option("--color/--no-color", default=True)
+@click.option("--mode", is_flag=False, flag_value="auto", default=None)
+def secondary(**kwargs: Any) -> None:
+    i: tuple[str, Any]
+    for i in sorted(kwargs.items()):
+        print("%s = %r" % i)

{preparse-1.1.9 → preparse-1.1.11}/src/preparse/core/Optdict.py

@@ -52,9 +52,15 @@ class Optdict(
         /,
     ) -> None:
         a: frozendict[Hashable, object]
-        x: map[str]
-        y: map[Nargs]
+        b: list[tuple[str, Nargs]]
+        x: Hashable
+        y: object
         a = frozendict(value)  # type: ignore[arg-type]
-        x = map(str, a.keys())
-        y = map(nargs, a.values())
-        self._data = frozendict(zip(x, y, strict=True))
+        b = list()
+        for x, y in a.items():
+            if isinstance(y, int):
+                b.append((str(x), Nargs(y)))
+            else:
+                b.append((str(x), Nargs.OPTIONAL_ARGUMENT))
+        b.sort()
+        self._data = frozendict(b)

{preparse-1.1.9 → preparse-1.1.11}/src/preparse/core/PreParser.py

@@ -178,14 +178,18 @@ class PreParser(Copyable):
         for param in cmd.params:
             if not isinstance(param, cl.Option):
                 continue
-            if param.is_flag or param.nargs == 0:
+            if param.is_flag:
                 nargs = Nargs.NO_ARGUMENT
-            elif param.nargs == 1:
-                nargs = Nargs.REQUIRED_ARGUMENT
-            else:
+            elif not param.nargs:
+                nargs = Nargs.NO_ARGUMENT
+            elif param.flag_value is not None:
                 nargs = Nargs.OPTIONAL_ARGUMENT
-            for opt in param.opts:
-                optdict[str(opt)] = nargs
+            elif param.prompt and not param.prompt_required:
+                nargs = Nargs.OPTIONAL_ARGUMENT
+            else:
+                nargs = Nargs.REQUIRED_ARGUMENT
+            for opt in param.opts + param.secondary_opts:
+                optdict[opt] = nargs
         self.optdict.clear()
         self.optdict.update(optdict)
 

preparse-1.1.11/src/preparse/tests/secondary.toml

@@ -0,0 +1,7 @@
+[optdict]
+"--color" = 0
+"--mode" = 2
+"--name" = 1
+"--no-color" = 0
+"--verbose" = 0
+"-v" = 0

{preparse-1.1.9 → preparse-1.1.11}/src/preparse/tests/test_data_toml.py

@@ -2,6 +2,7 @@ import enum
 import math
 import tomllib
 import unittest
+from functools import cached_property
 from importlib import resources
 from typing import Any, Self
 
@@ -13,13 +14,11 @@ __all__ = ["TestDataToml"]
 class Utils(enum.Enum):
     utils = None
 
-    @staticmethod
-    def get_data() -> dict[str, Any]:
+    @cached_property
+    def data(self: Self) -> dict[str, Any]:
         text: str
-        data: dict[str, Any]
         text = resources.read_text("preparse.tests", "data.toml")
-        data = tomllib.loads(text)
-        return data
+        return tomllib.loads(text)
 
     @staticmethod
     def istestable(x: Any) -> bool:
@@ -33,11 +32,9 @@ class Utils(enum.Enum):
 class TestDataToml(unittest.TestCase):
 
     def test_0(self: Self) -> None:
-        data: dict[str, Any]
         name: str
         kwargs: dict[str, Any]
-        data = Utils.utils.get_data()
-        for name, kwargs in data.items():
+        for name, kwargs in Utils.utils.data.items():
             with self.subTest(msg=name, **kwargs):
                 self.parse(**kwargs)
 

{preparse-1.1.9 → preparse-1.1.11}/src/preparse/tests/test_expit_toml.py

@@ -2,6 +2,7 @@ import enum
 import math
 import tomllib
 import unittest
+from functools import cached_property
 from importlib import resources
 from typing import Any, Self
 
@@ -15,13 +16,11 @@ __all__ = ["TestMainFunction"]
 class Utils(enum.Enum):
     utils = None
 
-    @staticmethod
-    def get_data() -> dict[Any, Any]:
-        data: dict[Any, Any]
+    @cached_property
+    def data(self: Self) -> dict[str, Any]:
         text: str
         text = resources.read_text("preparse.tests", "expit.toml")
-        data = tomllib.loads(text)
-        return data
+        return tomllib.loads(text)
 
     @staticmethod
     def istestable(x: Any) -> bool:
@@ -64,11 +63,9 @@ class TestMainFunction(unittest.TestCase):
             self.assertEqual(stderr, result.stderr)
 
     def test_0(self: Self) -> None:
-        data: dict[Any, Any]
         kwargs: dict[Any, Any]
         name: str
-        data = Utils.utils.get_data()
-        for name, kwargs in data.items():
+        for name, kwargs in Utils.utils.data.items():
             with self.subTest(msg=name, **kwargs):
                 self.parse(**kwargs)
 

{preparse-1.1.9 → preparse-1.1.11}/src/preparse/tests/test_optdict.py

@@ -1,12 +1,28 @@
+import enum
+import tomllib
 import unittest
-from typing import Self
+from functools import cached_property
+from importlib import resources
+from typing import Any, Self
 
+from preparse._tests.secondary import secondary
 from preparse.core.Optdict import Optdict
+from preparse.core.PreParser import PreParser
 from preparse.enums.Nargs import Nargs
 
 __all__ = ["TestPreparse"]
 
 
+class Utils(enum.Enum):
+    utils = None
+
+    @cached_property
+    def data(sefl: Self) -> dict[str, Any]:
+        text: str
+        text = resources.read_text("preparse.tests", "secondary.toml")
+        return tomllib.loads(text)
+
+
 class TestPreparse(unittest.TestCase):
 
     def test_optdict_copy(self: Self) -> None:
@@ -25,6 +41,15 @@ class TestPreparse(unittest.TestCase):
         self.assertEqual(repr(original), str(original))
         self.assertEqual(repr(original), format(original))
 
+    def test_secondary(self: Self) -> None:
+        parser: PreParser
+        parser = PreParser()
+        parser.reflectClickCommand(secondary)
+        self.assertEqual(
+            tuple(parser.optdict.items()),
+            tuple(Utils.utils.data["optdict"].items()),
+        )
+
 
 if __name__ == "__main__":
     unittest.main()

{preparse-1.1.9 → preparse-1.1.11}/src/preparse/warnings/PreparseDualWarning.py

@@ -1,5 +1,5 @@
 from abc import abstractmethod
-from typing import Any, Self, cast
+from typing import Self, cast
 
 import setdoc
 

{preparse-1.1.9 → preparse-1.1.11}/src/preparse.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: preparse
-Version: 1.1.9
+Version: 1.1.11
 Summary: This project preparses args for further parsing later on.
 Author-email: Johannes <johannes.programming@gmail.com>
 License-Expression: MIT

{preparse-1.1.9 → preparse-1.1.11}/src/preparse.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ src/preparse/_processing/parsing.py
 src/preparse/_processing/pulling.py
 src/preparse/_tests/__init__.py
 src/preparse/_tests/expit.py
+src/preparse/_tests/secondary.py
 src/preparse/core/Click.py
 src/preparse/core/Optdict.py
 src/preparse/core/PreParser.py
@@ -37,6 +38,7 @@ src/preparse/enums/__init__.py
 src/preparse/tests/__init__.py
 src/preparse/tests/data.toml
 src/preparse/tests/expit.toml
+src/preparse/tests/secondary.toml
 src/preparse/tests/test_data_toml.py
 src/preparse/tests/test_enums.py
 src/preparse/tests/test_expit_toml.py