fix: copy over signature from generate-demo-project.py to match-generated-precommit.py

Author: 56kyle

scripts/generate-demo-project.py

@@ -5,15 +5,11 @@
 from typing import Annotated
 
 import typer
-from typer.models import OptionInfo
 
+from util import FolderOption
 from util import generate_demo_project
 
 
-FolderOption: partial[OptionInfo] = partial(
-    typer.Option, dir_okay=True, file_okay=False, resolve_path=True, path_type=Path
-)
-
 cli: typer.Typer = typer.Typer()
 
 

scripts/match-generated-precommit.py

@@ -1,11 +1,13 @@
 import sys
 from pathlib import Path
+from typing import Annotated
 from typing import Any
 
 import pre_commit.main
 import typer
 from retrocookie.core import retrocookie
 
+from scripts.util import FolderOption
 from util import in_new_demo
 
 
@@ -14,20 +16,18 @@
 
 @cli.callback(invoke_without_command=True)
 def match_generated_precommit(
-    repo_folder: Path,
-    demos_cache_folder: Path,
-    demo_name: str,
-    no_cache: bool,
-    **kwargs: Any
+    repo_folder: Annotated[Path, FolderOption("--repo-folder", "-r")],
+    demos_cache_folder: Annotated[Path, FolderOption("--demos-cache-folder", "-c")],
+    demo_name: Annotated[str, typer.Option("--demo-name", "-d")],
+    no_cache: Annotated[bool, typer.Option("--no-cache", "-n")] = False,
 ) -> None:
     """Runs precommit in a generated project and matches the template to the results."""
     try:
         with in_new_demo(
             repo_folder=repo_folder,
             demos_cache_folder=demos_cache_folder,
             demo_name=demo_name,
-            no_cache=no_cache,
-            **kwargs
+            no_cache=no_cache
         ) as demo_path:
             pre_commit.main.main(["run", "--all-files", "--hook-stage=manual", "--show-diff-on-failure"])
         retrocookie(instance_path=demo_path, commits=["HEAD"])

scripts/util.py

@@ -15,6 +15,12 @@
 from cookiecutter.main import cookiecutter
 from cookiecutter.utils import work_in
 from pygments.lexers import q
+from typer.models import OptionInfo
+
+
+FolderOption: partial[OptionInfo] = partial(
+    typer.Option, dir_okay=True, file_okay=False, resolve_path=True, path_type=Path
+)
 
 
 def remove_readonly(func: Callable[[str], Any], path: str, _: Any) -> None: