omlish 0.0.0.dev42__tar.gz → 0.0.0.dev44__tar.gz

{omlish-0.0.0.dev42/omlish.egg-info → omlish-0.0.0.dev44}/PKG-INFO

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

{omlish-0.0.0.dev42 → omlish-0.0.0.dev44}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev42'
-__revision__ = '244991d9a1d24de7e5b30d0e1ea7cfd341a223ab'
+__version__ = '0.0.0.dev44'
+__revision__ = '4ae588446d9d45931798e750e17556da7cbef79c'
 
 
 #

{omlish-0.0.0.dev42 → omlish-0.0.0.dev44}/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.dev42 → omlish-0.0.0.dev44/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev42 → omlish-0.0.0.dev44}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev42'
+version = '0.0.0.dev44'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',