omlish 0.0.0.dev43__py3-none-any.whl → 0.0.0.dev44__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev43'
-__revision__ = '00082c22c620ab906955cc479d2d861116e82c45'
+__version__ = '0.0.0.dev44'
+__revision__ = '4ae588446d9d45931798e750e17556da7cbef79c'
 
 
 #

omlish/argparse.py

@@ -16,6 +16,9 @@ from . import check
 T = ta.TypeVar('T')
 
 
+##
+
+
 SUPPRESS = argparse.SUPPRESS
 
 OPTIONAL = argparse.OPTIONAL
@@ -45,6 +48,9 @@ Namespace = argparse.Namespace
 ArgumentParser = argparse.ArgumentParser
 
 
+##
+
+
 @dc.dataclass(eq=False)
 class Arg:
     args: ta.Sequence[ta.Any]
@@ -61,6 +67,9 @@ def arg(*args, **kwargs) -> Arg:
     return Arg(args, kwargs)
 
 
+#
+
+
 CommandFn = ta.Callable[[], None]
 
 
@@ -70,6 +79,7 @@ class Command:
     fn: CommandFn
     args: ta.Sequence[Arg] = ()
     parent: ta.Optional['Command'] = None
+    accepts_unknown: bool = False
 
     def __post_init__(self) -> None:
         check.isinstance(self.name, str)
@@ -79,6 +89,7 @@ class Command:
         check.callable(self.fn)
         check.arg(all(isinstance(a, Arg) for a in self.args))
         check.isinstance(self.parent, (Command, None))
+        check.isinstance(self.accepts_unknown, bool)
 
         functools.update_wrapper(self, self.fn)
 
@@ -95,6 +106,7 @@ def command(
         *args: Arg,
         name: str | None = None,
         parent: Command | None = None,
+        accepts_unknown: bool = False,
 ) -> ta.Any:  # ta.Callable[[CommandFn], Command]:  # FIXME
     for arg in args:
         check.isinstance(arg, Arg)
@@ -107,11 +119,15 @@ def command(
             fn,
             args,
             parent=parent,
+            accepts_unknown=accepts_unknown,
         )
 
     return inner
 
 
+##
+
+
 def get_arg_ann_kwargs(ann: ta.Any) -> ta.Mapping[str, ta.Any]:
     if ann is str:
         return {}
@@ -197,7 +213,8 @@ class Cli(metaclass=_CliMeta):
         super().__init__()
 
         self._argv = argv if argv is not None else sys.argv[1:]
-        self._args = self.get_parser().parse_args(self._argv)
+
+        self._args, self._unknown_args = self.get_parser().parse_known_args(self._argv)
 
     _parser: ta.ClassVar[ArgumentParser]
 
@@ -213,12 +230,25 @@ class Cli(metaclass=_CliMeta):
     def args(self) -> Namespace:
         return self._args
 
+    @property
+    def unknown_args(self) -> ta.Sequence[str]:
+        return self._unknown_args
+
     def _run_cmd(self, cmd: Command) -> None:
         cmd.__get__(self, type(self))()
 
     def __call__(self) -> None:
         cmd = getattr(self.args, '_cmd', None)
+
+        if self._unknown_args and not (cmd is not None and cmd.accepts_unknown):
+            msg = f'unrecognized arguments: {" ".join(self._unknown_args)}'
+            if (parser := self.get_parser()).exit_on_error:  # type: ignore
+                parser.error(msg)
+            else:
+                raise ArgumentError(None, msg)
+
         if cmd is None:
             self.get_parser().print_help()
             return
+
         self._run_cmd(cmd)

{omlish-0.0.0.dev43.dist-info → omlish-0.0.0.dev44.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev43
+Version: 0.0.0.dev44
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev43.dist-info → omlish-0.0.0.dev44.dist-info}/RECORD

@@ -1,7 +1,7 @@
 omlish/.manifests.json,sha256=FPSgLg_3QDVzKlNOuqV3dMqhja2KG_TUfKdGmHE8Eg4,803
-omlish/__about__.py,sha256=r89Z8V9DxpOVxM2o7M6f4JV4JEbBfeEO1OjjT6MpsLE,2919
+omlish/__about__.py,sha256=owguWBeUOCE7cGZXQ6xPQm5f1kN_oXAs0aniHbRvjWw,2919
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/argparse.py,sha256=QUUS6sv2ftfcmhDj4qU429mEE_lfWa0UN5yYpPG65B0,6265
+omlish/argparse.py,sha256=Vr70_85EVLJLgEkRtwOr264tMRtqtlN7ncFfXRUk5aM,6914
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
 omlish/cached.py,sha256=UAizxlH4eMWHPzQtmItmyE6FEpFEUFzIkxaO2BHWZ5s,196
 omlish/check.py,sha256=fgWiBoHvqZlE8tjaxK7OMW4J8z3_rEGRENTka3EohbI,10378
@@ -328,9 +328,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev43.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev43.dist-info/METADATA,sha256=uuX1PAEvidaoC9uBAqHDBXL1Td-VZiG_xC1MdX_GKKY,3817
-omlish-0.0.0.dev43.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omlish-0.0.0.dev43.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev43.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev43.dist-info/RECORD,,
+omlish-0.0.0.dev44.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev44.dist-info/METADATA,sha256=99p3BI8OMHbt03pRswyTOiLqt26ie2k4Puv8zbS4zS4,3817
+omlish-0.0.0.dev44.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omlish-0.0.0.dev44.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev44.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev44.dist-info/RECORD,,