command: add.

niar/__init__.py

@@ -12,15 +12,13 @@ def cli(np: Project):
     subparsers = parser.add_subparsers(required=True)
 
     build.add_arguments(
-        np,
-        subparsers.add_parser(
-            "build", help="build the design, and optionally program it"
-        ),
-    )
+        np, subparsers.add_parser("build", help="build the design, and optionally program it"))
     if np.cxxrtl_targets:
         cxxrtl.add_arguments(
-            np, subparsers.add_parser("cxxrtl", help="run the C++ simulator tests")
-        )
+            np, subparsers.add_parser("cxxrtl", help="run the C++ simulator tests"))
+
+    for command in np.commands:
+        command.add_arguments(np, subparsers.add_parser(command.name, help=command.help))
 
     args = parser.parse_args()
     args.func(args)

niar/command.py

@@ -0,0 +1,13 @@
+from typing import Callable
+
+__all__ = ["Command"]
+
+class Command:
+    add_arguments: Callable
+    name: str
+    help: str
+
+    def __init__(self, *, add_arguments, help):
+        self.add_arguments = add_arguments
+        self.name = add_arguments.__name__
+        self.help = help

niar/project.py

@@ -6,6 +6,7 @@
 from amaranth import Elaboratable
 from amaranth.build import Platform
 
+from .command import Command
 from .cxxrtl_platform import CxxrtlPlatform
 
 __all__ = ["Project"]
@@ -84,6 +85,7 @@ class Project:
     targets: list[type[Platform]]
     cxxrtl_targets: list[type[CxxrtlPlatform]] = []
     externals: list[str] = []
+    commands: list[Command] = []
 
     origin: Path
 
@@ -118,6 +120,12 @@ class Project:
             required=False,
             isinstance_list=str,
         ),
+        Prop(
+            "commands",
+            description="a list of Command objects which extend the CLI",
+            required=False,
+            isinstance_list=Command,
+        ),
     ]
 
     def __init_subclass__(cls):
@@ -164,6 +172,15 @@ def main(self):
     def path(self):
         return ProjectPath(self)
 
+    @classmethod
+    def command(cls, *, help):
+        def inner(add_arguments):
+            cls.commands.append(Command(
+                add_arguments=add_arguments,
+                help=help,
+            ))
+        return inner
+
 
 class ProjectPath:
     def __init__(self, np: Project):