Merge branch 'main' into refactor_bottom_toolbar

Author: tleonhardt

CHANGELOG.md

@@ -48,6 +48,13 @@
       transforming the raw token while keeping the inferred `type=`/`choices`/completer (e.g.
       `preprocess=str.lower` on an `Enum`). The two are mutually exclusive on one parameter and
       neither may be combined with a value-less action.
+    - `@with_annotated` now supports reusable argument blocks: a parameter typed with a `@dataclass`
+      that subclasses the new `cmd2.ArgumentBlock` trait expands each field into a flat command-line
+      argument, and the parsed values are reconstructed into a dataclass instance passed to the
+      command, letting several commands reuse the same fields without duplication. See the
+      [annotated](docs/features/annotated.md) documentation.
+    - A command can share an argument block with its subcommands via `cmd2_base_args` /
+      `cmd2_parent_args` parameters, passing parent-level options down without redeclaring them.
 
 - Breaking Changes
     - Renamed the `bottom_toolbar` argument in `Cmd.__init__()` to `enable_bottom_toolbar`.

cmd2/__init__.py

@@ -11,7 +11,10 @@
     rich_utils,
     string_utils,
 )
-from .annotated import with_annotated
+from .annotated import (
+    ArgumentBlock,
+    with_annotated,
+)
 from .argparse_completer import set_default_argparse_completer
 from .argparse_utils import (
     Cmd2ArgumentParser,
@@ -88,6 +91,8 @@
     "Choices",
     "CompletionItem",
     "Completions",
+    # Annotated commands
+    "ArgumentBlock",
     # Decorators
     "with_annotated",
     "with_argument_list",