rpr-cli 0.1.26__tar.gz → 0.1.28__tar.gz

{rpr_cli-0.1.26 → rpr_cli-0.1.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rpr-cli
-Version: 0.1.26
+Version: 0.1.28
 Summary: RPR CLI -- React Python Rust monorepo scaffolding orchestrator
 License-Expression: MIT
 License-File: LICENSE
@@ -72,14 +72,15 @@ rpr generate storybook       # Add Storybook for UI component development
 By default, `rpr init` scaffolds the root workspace and AI instructions only. To create project components during initialization, repeat `--scaffold` or pass a comma-separated list:
 
 ```bash
+rpr init todo-list --scaffold common
 rpr init todo-list --scaffold domain
 rpr init todo-list --scaffold api --domain-migrations
 rpr init todo-list --scaffold api --scaffold web --domain-migrations
-rpr init todo-list --scaffold instructions, domain, api, ui, web, storybook
 ```
 
 Available scaffolds are:
 
+- `common`: Alias for `instructions`, `domain`, `api`, `ui`, `web`, and `storybook`; excludes `engine`.
 - `instructions`: AI instruction files for Cursor, Copilot, Claude Code, and Gemini.
 - `domain`: Python DDD package at `packages/python/domain`.
 - `api`: FastAPI app at `apps/<name>-api`; also scaffolds `domain`.

{rpr_cli-0.1.26 → rpr_cli-0.1.28}/README.md

@@ -57,14 +57,15 @@ rpr generate storybook       # Add Storybook for UI component development
 By default, `rpr init` scaffolds the root workspace and AI instructions only. To create project components during initialization, repeat `--scaffold` or pass a comma-separated list:
 
 ```bash
+rpr init todo-list --scaffold common
 rpr init todo-list --scaffold domain
 rpr init todo-list --scaffold api --domain-migrations
 rpr init todo-list --scaffold api --scaffold web --domain-migrations
-rpr init todo-list --scaffold instructions, domain, api, ui, web, storybook
 ```
 
 Available scaffolds are:
 
+- `common`: Alias for `instructions`, `domain`, `api`, `ui`, `web`, and `storybook`; excludes `engine`.
 - `instructions`: AI instruction files for Cursor, Copilot, Claude Code, and Gemini.
 - `domain`: Python DDD package at `packages/python/domain`.
 - `api`: FastAPI app at `apps/<name>-api`; also scaffolds `domain`.

rpr_cli-0.1.28/src/rpr/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.28"

{rpr_cli-0.1.26 → rpr_cli-0.1.28}/src/rpr/checks/instructions.py

@@ -82,6 +82,7 @@ def check_instructions(
         ("fetch_service", "has_ui"),
         ("sticky_navigation", "has_ui"),
         ("virtual_list", "has_ui"),
+        ("chat", "has_ui"),
     ]
 
     for tid, prereq in template_ids:

{rpr_cli-0.1.26 → rpr_cli-0.1.28}/src/rpr/commands/add.py

@@ -62,6 +62,13 @@ def template(
             "--include-tests", help="Include unit-test companions when available."
         ),
     ] = False,
+    install: Annotated[
+        bool | None,
+        typer.Option(
+            "--install/--no-install",
+            help="Install npm dependencies after writing files (default depends on template).",
+        ),
+    ] = None,
     output_dir: Annotated[
         str | None,
         typer.Option(
@@ -115,24 +122,43 @@ def template(
         )
         raise typer.Exit(1)
 
-    selected_files = list(entry.files)
-    if include_tests:
-        selected_files.extend(entry.test_files)
-        selected_files.extend(entry.config_files)
-
-    rendered_files = []
-    for template_file in selected_files:
-        source_file = source_dir / template_file.source_subdir / template_file.source_filename
-        code = _render_template_file(source_file, template_file, variables)
-        target_path = _resolve_target_path(ctx, template_file, variables, output_dir)
-        rendered_files.append((template_file, target_path, code))
+    ordered_entries: list[tuple[TemplateEntry, bool]] = []
+    for required_id in entry.requires:
+        required_entry = TEMPLATES.get(required_id)
+        if required_entry is not None:
+            ordered_entries.append((required_entry, True))
+    ordered_entries.append((entry, False))
+
+    seen_targets: set[Path] = set()
+    rendered_files: list[tuple[TemplateFile, Path, str, bool]] = []
+    for current_entry, reuse_mode in ordered_entries:
+        files_for_entry = list(current_entry.files)
+        if include_tests:
+            files_for_entry.extend(current_entry.test_files)
+            files_for_entry.extend(current_entry.config_files)
+        for template_file in files_for_entry:
+            target_path = _resolve_target_path(
+                ctx, template_file, variables, output_dir
+            )
+            if target_path in seen_targets:
+                continue
+            seen_targets.add(target_path)
+            source_file = (
+                source_dir / template_file.source_subdir / template_file.source_filename
+            )
+            code = _render_template_file(source_file, template_file, variables)
+            rendered_files.append((template_file, target_path, code, reuse_mode))
 
     skipped_config_paths: list[Path] = []
+    reused_paths: list[Path] = []
     writable_files = []
-    for template_file, target_path, code in rendered_files:
+    for template_file, target_path, code, reuse_mode in rendered_files:
         if dry_run or not target_path.exists() or force:
             writable_files.append((template_file, target_path, code))
             continue
+        if reuse_mode:
+            reused_paths.append(target_path)
+            continue
         if template_file.role == "config":
             console.print(
                 f"[bold yellow]Warning:[/] Config already exists, leaving it unchanged: {target_path}"
@@ -150,11 +176,24 @@ def template(
     for _, target_path, code in writable_files:
         ctx.write_file(target_path, code)
 
+    _update_root_index(
+        ctx,
+        [target_path for _, target_path, _ in writable_files],
+        variables,
+        output_dir,
+    )
+
     _print_include_test_notes(entry, include_tests, skipped_config_paths)
 
+    _maybe_install_dependencies(ctx, ordered_entries, include_tests, install)
+
     console.print("\n[bold green]Done![/] Template files written:")
     for _, target_path, _ in writable_files:
         console.print(f"  {target_path}")
+    if reused_paths:
+        console.print("\n[bold]Reused existing files:[/]")
+        for target_path in reused_paths:
+            console.print(f"  {target_path}")
     if skipped_config_paths:
         console.print("\n[bold yellow]Skipped existing config files:[/]")
         for target_path in skipped_config_paths:
@@ -167,7 +206,9 @@ def _resolve_template_args(
     if lang_or_template_id in KNOWN_TEMPLATE_LANGS:
         return lang_or_template_id, template_id
     if template_id is not None:
-        console.print(f"[bold red]Error:[/] Unknown template language: {lang_or_template_id}")
+        console.print(
+            f"[bold red]Error:[/] Unknown template language: {lang_or_template_id}"
+        )
         console.print("Supported languages: node, python")
         raise typer.Exit(1)
     return None, lang_or_template_id
@@ -233,6 +274,11 @@ def _render_template_file(
         console.print(f"[bold red]Error:[/] Source file not found: {source_file}")
         raise typer.Exit(1)
 
+    if template_file.raw:
+        code = source_file.read_text()
+        code = _interpolate_code(code, variables)
+        return _apply_raw_transforms(code, template_file, variables)
+
     markdown = source_file.read_text()
     code_blocks = _extract_code_blocks(markdown, template_file.language)
 
@@ -244,6 +290,32 @@ def _render_template_file(
     return _interpolate_code(code, variables)
 
 
+def _apply_raw_transforms(
+    code: str, template_file: TemplateFile, variables: dict[str, str]
+) -> str:
+    """Rewrite project-specific paths/imports in raw chat scaffold files."""
+    subdir = template_file.source_subdir
+    filename = template_file.source_filename
+    name_kebab = variables.get("name_kebab", "")
+
+    # The chat thread reuses the sibling standalone virtual-list component.
+    if subdir.endswith("chat/thread") and filename == "ChatThread.tsx":
+        code = code.replace("from '../virtual-list'", "from '../../virtual-list'")
+
+    # The chat barrel must not re-export the reused virtual-list package.
+    if subdir.endswith("js_special_files/chat") and filename == "index.ts":
+        code = code.replace("export * from './virtual-list';\n", "")
+
+    # Documentation references to the originating project should be templated.
+    if filename.endswith(".md"):
+        code = code.replace("packages/huddle-ui", f"packages/node/{name_kebab}-ui")
+        code = code.replace("packages/sb/", f"packages/node/{name_kebab}-sb/")
+        code = code.replace("@huddle/ui", f"@{name_kebab}/ui")
+        code = code.replace("huddle-ui", f"{name_kebab}-ui")
+
+    return code
+
+
 def _interpolate_code(code: str, variables: dict[str, str]) -> str:
     code = interpolate(code, variables)
     name_val = variables.get("name", "")
@@ -255,6 +327,76 @@ def _interpolate_code(code: str, variables: dict[str, str]) -> str:
     return code
 
 
+def _update_root_index(
+    ctx: RunContext,
+    written_targets: list[Path],
+    variables: dict[str, str],
+    output_dir: str | None,
+) -> None:
+    """Add component barrel exports to the UI package root index when present."""
+    if output_dir:
+        return
+
+    component_names: list[str] = []
+    for target in written_targets:
+        parts = target.parts
+        if "components" in parts:
+            index = parts.index("components")
+            if index + 1 < len(parts):
+                name = parts[index + 1]
+                if name not in component_names:
+                    component_names.append(name)
+    if not component_names:
+        return
+
+    index_rel = interpolate("packages/node/{name_kebab}-ui/src/index.ts", variables)
+    index_path = ctx.project_dir / index_rel
+    if not index_path.exists():
+        return
+
+    existing = index_path.read_text()
+    additions = [
+        f'export * from "./components/{name}";'
+        for name in sorted(component_names)
+        if f'"./components/{name}"' not in existing
+    ]
+    if not additions:
+        return
+
+    updated = existing.rstrip("\n") + "\n" + "\n".join(additions) + "\n"
+    ctx.write_file(index_path, updated)
+
+
+def _maybe_install_dependencies(
+    ctx: RunContext,
+    ordered_entries: list[tuple[TemplateEntry, bool]],
+    include_tests: bool,
+    install: bool | None,
+) -> None:
+    install_by_default = any(entry.install_by_default for entry, _ in ordered_entries)
+    should_install = install_by_default if install is None else install
+    if not should_install:
+        return
+
+    runtime: list[str] = []
+    dev: list[str] = []
+    for entry, _ in ordered_entries:
+        for dep in entry.dependencies:
+            if dep not in runtime:
+                runtime.append(dep)
+        if include_tests:
+            for dep in entry.dev_dependencies:
+                if dep not in dev:
+                    dev.append(dep)
+
+    if runtime:
+        console.print("\n[bold]Installing runtime dependencies...[/]")
+        ctx.run_command(["npm", "i", *runtime], cwd=ctx.project_dir)
+    if dev:
+        console.print("\n[bold]Installing dev dependencies...[/]")
+        ctx.run_command(["npm", "i", "-D", *dev], cwd=ctx.project_dir)
+
+
 def _resolve_target_path(
     ctx: RunContext,
     template_file: TemplateFile,
@@ -295,4 +437,4 @@ def _find_source_dir(config: SyncConfig) -> Path | None:
     if common.exists():
         return common
 
-    return None
+    return None

{rpr_cli-0.1.26 → rpr_cli-0.1.28}/src/rpr/commands/generate/ui.py

@@ -102,9 +102,17 @@ def ui(
     if include_library:
         console.print("  Optional templates: rpr add template node fetch_service")
         console.print("                      rpr add template node sticky_navigation")
-        console.print("                      rpr add template node sticky_navigation --include-tests")
+        console.print(
+            "                      rpr add template node sticky_navigation --include-tests"
+        )
         console.print("                      rpr add template node virtual_list")
-        console.print("                      rpr add template node virtual_list --include-tests")
+        console.print(
+            "                      rpr add template node virtual_list --include-tests"
+        )
+        console.print("                      rpr add template node chat")
+        console.print(
+            "                      rpr add template node chat --include-tests"
+        )
 
 
 def _scaffold_ui_library(ctx: RunContext, ui_pkg_name: str) -> None:

{rpr_cli-0.1.26 → rpr_cli-0.1.28}/src/rpr/commands/init.py

@@ -71,6 +71,10 @@ _SCAFFOLD_DEPENDENCIES: dict[ScaffoldName, tuple[ScaffoldName, ...]] = {
     "storybook": ("ui",),
     "engine": (),
 }
+_SCAFFOLD_ALIASES: dict[str, tuple[ScaffoldName, ...]] = {
+    "common": ("instructions", "domain", "api", "ui", "web", "storybook"),
+}
+_ALLOWED_SCAFFOLD_VALUES = [*_SCAFFOLD_DEPENDENCIES, *_SCAFFOLD_ALIASES]
 
 
 # ---------------------------------------------------------------------------
@@ -118,12 +122,14 @@ def _derive_variables(project_name: str) -> dict[str, str]:
     }
 
 
-def _normalize_scaffold_name(value: str) -> ScaffoldName:
+def _expand_scaffold_value(value: str) -> tuple[ScaffoldName, ...]:
     normalized = value.strip().lower()
+    if normalized in _SCAFFOLD_ALIASES:
+        return _SCAFFOLD_ALIASES[normalized]
     if normalized not in _SCAFFOLD_DEPENDENCIES:
-        allowed = ", ".join(_SCAFFOLD_DEPENDENCIES)
+        allowed = ", ".join(_ALLOWED_SCAFFOLD_VALUES)
         raise typer.BadParameter(f"Unknown scaffold '{value}'. Choose from: {allowed}.")
-    return normalized  # type: ignore[return-value]
+    return (normalized,)  # type: ignore[return-value]
 
 
 def _parse_scaffold_values(
@@ -141,7 +147,7 @@ def _parse_scaffold_values(
         for value in raw_value.split(","):
             value = value.strip()
             if value:
-                scaffolds.append(_normalize_scaffold_name(value))
+                scaffolds.extend(_expand_scaffold_value(value))
     return scaffolds
 
 
@@ -717,7 +723,8 @@ def init(
             help=(
                 "Repeat or pass a comma-separated list to scaffold additional "
                 "components: instructions, domain, api, ui, web, storybook, "
-                "engine. Defaults to instructions only."
+                "engine, or common. common expands to instructions, domain, "
+                "api, ui, web, and storybook. Defaults to instructions only."
             ),
         ),
     ] = None,