rpr-cli 0.1.7__tar.gz → 0.1.9__tar.gz

{rpr_cli-0.1.7 → rpr_cli-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rpr-cli
-Version: 0.1.7
+Version: 0.1.9
 Summary: RPR CLI -- React Python Rust monorepo scaffolding orchestrator
 License-Expression: MIT
 License-File: LICENSE

{rpr_cli-0.1.7 → rpr_cli-0.1.9}/Sample-dot-github/instructions/frontend.instructions.md

@@ -11,6 +11,7 @@ Use React for UI composition, TanStack Query for server-state workflows, TanStac
 
 - Use functional components.
 - Extract reusable behavior into hooks instead of duplicating component logic.
+- Import the generated shared UI package through the app-scoped package name `@{name}/ui`, such as `@testapp/ui`, not `@repo/{name}-ui`.
 - Prefer a shared base API service at `src/services/base/api.service.ts` when the UI package needs centralized fetch behavior.
 - Prefer a shared `useStateNavigation` hook at `src/hooks/useStateNavigation.ts` when UI state should persist in the URL.
 - Reuse existing components, hooks, and service patterns before introducing a new abstraction.

{rpr_cli-0.1.7 → rpr_cli-0.1.9}/Sample-dot-github/instructions/setup-guide.instructions.md

@@ -45,6 +45,9 @@ Use this guidance when validating or changing the monorepo setup against the RPR
 - Generate React app and library projects in a way that preserves the expected Nx command surface.
 - The web app should expose at least `serve`, `build`, `lint`, `test`, and `typecheck` when those capabilities exist in the generated project.
 - The UI library should expose at least `build`, `lint`, `test`, and `typecheck`.
+- Use app-scoped Node package names: `packages/node/{name}-ui` publishes as `@{name}/ui`, `apps/{name}-web` publishes as `@{name}/web`, and Storybook publishes as `@{name}/sb`.
+- Import the shared UI package through `@{name}/ui`, for example `import { AppThemeProvider } from "@testapp/ui"` for a `TestApp` workspace.
+- Link local Node workspace packages with relative `file:` dependency specs instead of `workspace:*`, because npm must be able to install the generated workspace without unsupported protocol errors.
 - Keep Storybook as a dedicated host project at `packages/node/sb`; do not silently repurpose the UI library as the Storybook project.
 
 ## Python Expectations
@@ -81,6 +84,7 @@ npx nx run domain:migrate -- downgrade -1
 - Project roots and import package names follow the kebab-case and snake_case rules.
 - Python projects have both `src/` and `tests/`.
 - The domain import package remains `src/{name_underscore}_domain`.
+- Node imports use app-scoped package names such as `@{name}/ui`, not stale `@repo/*` aliases.
 - Storybook remains hosted in `packages/node/sb`.
 - Workspace members and workspace dependency sources are complete.
 - Generated instructions, checks, and scaffolds refer to the current contract rather than stale paths.

rpr_cli-0.1.9/src/rpr/__init__.py

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

{rpr_cli-0.1.7 → rpr_cli-0.1.9}/src/rpr/commands/generate/storybook.py

@@ -12,7 +12,9 @@ from rpr.context import RunContext
 from rpr.dependencies import (
     ROOT_STORYBOOK_DEV_DEPENDENCIES,
     STORYBOOK_DEV_DEPENDENCIES,
+    storybook_host_package_name,
     storybook_package_dependencies,
+    ui_package_name,
 )
 from rpr.workspace import ensure_npm_workspaces, write_package_json
 
@@ -185,7 +187,7 @@ def _write_sb_package_json(ctx: RunContext, sb_root: Path, ui_pkg: str) -> None:
         ctx,
         sb_root / "package.json",
         defaults={
-            "name": "@repo/sb",
+            "name": storybook_host_package_name(ui_pkg),
             "version": "0.1.0",
             "private": True,
             "type": "module",
@@ -306,7 +308,8 @@ ReactDOM.createRoot(document.getElementById("root")!).render(
 
 
 def _write_sb_app(ctx: RunContext, src_root: Path, ui_pkg: str) -> None:
-        content = f"""import {{ uiPackageName }} from "@repo/{ui_pkg}";
+        ui_import_name = ui_package_name(ui_pkg)
+        content = f"""import {{ uiPackageName }} from "{ui_import_name}";
 
 export const storybookHostTitle = "Storybook Host";
 
@@ -368,7 +371,8 @@ export default config;
 
 
 def _write_sb_preview(ctx: RunContext, path: Path, ui_pkg: str) -> None:
-    content = """import { appTheme } from "@repo/__UI_PKG__";
+    ui_import_name = ui_package_name(ui_pkg)
+    content = """import { appTheme } from "__UI_IMPORT__";
 import { CssBaseline, ThemeProvider } from "@mui/material";
 import type { Preview } from "@storybook/react";
 import { Fragment, createElement } from "react";
@@ -398,7 +402,7 @@ const preview: Preview = {
 };
 
 export default preview;
-""".replace("__UI_PKG__", ui_pkg)
+""".replace("__UI_IMPORT__", ui_import_name)
     ctx.write_file(path, content)
 
 

{rpr_cli-0.1.7 → rpr_cli-0.1.9}/src/rpr/commands/generate/ui.py

@@ -13,7 +13,9 @@ from rpr.dependencies import (
     UI_LIBRARY_DEPENDENCIES,
     UI_LIBRARY_DEV_DEPENDENCIES,
     WEB_APP_DEV_DEPENDENCIES,
+    ui_package_name,
     web_app_dependencies,
+    web_package_name,
 )
 from rpr.workspace import ensure_npm_workspaces, write_package_json
 
@@ -140,7 +142,7 @@ def _write_ui_package_json(ctx: RunContext, lib_root: Path, ui_pkg_name: str) ->
         ctx,
         lib_root / "package.json",
         defaults={
-            "name": f"@repo/{ui_pkg_name}",
+            "name": ui_package_name(ui_pkg_name),
             "version": "0.1.0",
             "private": True,
             "main": "src/index.ts",
@@ -259,7 +261,7 @@ def _write_app_package_json(
         ctx,
         app_root / "package.json",
         defaults={
-            "name": f"@repo/{app_name}",
+            "name": web_package_name(app_name),
             "version": "0.1.0",
             "private": True,
             "type": "module",
@@ -370,7 +372,8 @@ ReactDOM.createRoot(document.getElementById("root")!).render(
 
 def _write_app_tsx(ctx: RunContext, src: Path, app_name: str, ui_pkg_name: str) -> None:
     title = app_name.replace("-", " ").title()
-    content = f"""import {{ AppThemeProvider, uiPackageName }} from "@repo/{ui_pkg_name}";
+    ui_import_name = ui_package_name(ui_pkg_name)
+    content = f"""import {{ AppThemeProvider, uiPackageName }} from "{ui_import_name}";
 
 export const appTitle = "{title}";
 

{rpr_cli-0.1.7 → rpr_cli-0.1.9}/src/rpr/commands/init.py

@@ -13,7 +13,7 @@ from rich.console import Console
 
 from rpr.cli import app
 from rpr.context import RunContext
-from rpr.dependencies import ROOT_NODE_DEV_DEPENDENCIES
+from rpr.dependencies import ROOT_NODE_DEV_DEPENDENCIES, npm_package_name
 from rpr.generators.base import SyncConfig, load_rules
 from rpr.generators.claude import generate_claude_rules
 from rpr.generators.copilot import generate_copilot_rules
@@ -438,7 +438,7 @@ def _write_root_package_json(ctx: RunContext, project_name: str) -> None:
     else:
         package = {}
 
-    package.setdefault("name", project_name)
+    package["name"] = npm_package_name(project_name)
     package["private"] = True
 
     workspaces = package.get("workspaces", [])

{rpr_cli-0.1.7 → rpr_cli-0.1.9}/src/rpr/dependencies.py

@@ -67,9 +67,35 @@ PYO3_VERSION = MANIFEST["engine"]["pyo3"]["specifier"]
 MATURIN_SPEC = MANIFEST["engine"]["maturin"]["specifier"]
 
 
+def npm_package_name(package_name: str) -> str:
+    normalized = package_name.replace("_", "-").lower()
+    normalized = re.sub(r"[^a-z0-9._-]+", "-", normalized).strip(".-")
+    return normalized or "package"
+
+
+def scoped_package_name(scope_name: str, package_name: str) -> str:
+    return f"@{npm_package_name(scope_name)}/{npm_package_name(package_name)}"
+
+
+def _strip_suffix(package_name: str, suffix: str) -> str:
+    return package_name[: -len(suffix)] if package_name.endswith(suffix) else package_name
+
+
+def ui_package_name(ui_pkg_name: str) -> str:
+    return scoped_package_name(_strip_suffix(ui_pkg_name, "-ui"), "ui")
+
+
+def web_package_name(app_name: str) -> str:
+    return scoped_package_name(_strip_suffix(app_name, "-web"), "web")
+
+
+def storybook_host_package_name(ui_pkg_name: str) -> str:
+    return scoped_package_name(_strip_suffix(ui_pkg_name, "-ui"), "sb")
+
+
 def web_app_dependencies(ui_pkg_name: str) -> dict[str, str]:
     return {
-        f"@repo/{ui_pkg_name}": "workspace:*",
+        ui_package_name(ui_pkg_name): f"file:../../packages/node/{ui_pkg_name}",
         "react": UI_LIBRARY_DEPENDENCIES["react"],
         "react-dom": UI_LIBRARY_DEPENDENCIES["react-dom"],
     }
@@ -77,7 +103,7 @@ def web_app_dependencies(ui_pkg_name: str) -> dict[str, str]:
 
 def storybook_package_dependencies(ui_pkg_name: str) -> dict[str, str]:
     return {
-        f"@repo/{ui_pkg_name}": "workspace:*",
+        ui_package_name(ui_pkg_name): f"file:../{ui_pkg_name}",
         **STORYBOOK_DEPENDENCIES,
     }
 

{rpr_cli-0.1.7 → rpr_cli-0.1.9}/src/rpr/scaffolds/instructions/frontend.instructions.md

@@ -11,6 +11,7 @@ Use React for UI composition, TanStack Query for server-state workflows, TanStac
 
 - Use functional components.
 - Extract reusable behavior into hooks instead of duplicating component logic.
+- Import the generated shared UI package through the app-scoped package name `@{name}/ui`, such as `@testapp/ui`, not `@repo/{name}-ui`.
 - Prefer a shared base API service at `src/services/base/api.service.ts` when the UI package needs centralized fetch behavior.
 - Prefer a shared `useStateNavigation` hook at `src/hooks/useStateNavigation.ts` when UI state should persist in the URL.
 - Reuse existing components, hooks, and service patterns before introducing a new abstraction.

{rpr_cli-0.1.7 → rpr_cli-0.1.9}/src/rpr/scaffolds/instructions/setup-guide.instructions.md

@@ -45,6 +45,9 @@ Use this guidance when validating or changing the monorepo setup against the RPR
 - Generate React app and library projects in a way that preserves the expected Nx command surface.
 - The web app should expose at least `serve`, `build`, `lint`, `test`, and `typecheck` when those capabilities exist in the generated project.
 - The UI library should expose at least `build`, `lint`, `test`, and `typecheck`.
+- Use app-scoped Node package names: `packages/node/{name}-ui` publishes as `@{name}/ui`, `apps/{name}-web` publishes as `@{name}/web`, and Storybook publishes as `@{name}/sb`.
+- Import the shared UI package through `@{name}/ui`, for example `import { AppThemeProvider } from "@testapp/ui"` for a `TestApp` workspace.
+- Link local Node workspace packages with relative `file:` dependency specs instead of `workspace:*`, because npm must be able to install the generated workspace without unsupported protocol errors.
 - Keep Storybook as a dedicated host project at `packages/node/sb`; do not silently repurpose the UI library as the Storybook project.
 
 ## Python Expectations
@@ -81,6 +84,7 @@ npx nx run domain:migrate -- downgrade -1
 - Project roots and import package names follow the kebab-case and snake_case rules.
 - Python projects have both `src/` and `tests/`.
 - The domain import package remains `src/{name_underscore}_domain`.
+- Node imports use app-scoped package names such as `@{name}/ui`, not stale `@repo/*` aliases.
 - Storybook remains hosted in `packages/node/sb`.
 - Workspace members and workspace dependency sources are complete.
 - Generated instructions, checks, and scaffolds refer to the current contract rather than stale paths.

{rpr_cli-0.1.7 → rpr_cli-0.1.9}/src/rpr/workspace.py

@@ -12,6 +12,12 @@ console = Console()
 DEFAULT_NPM_WORKSPACES = ["apps/*", "packages/node/*"]
 
 
+def _npm_package_name(package_name: str) -> str:
+    normalized = package_name.replace("_", "-").lower()
+    normalized = re.sub(r"[^a-z0-9._-]+", "-", normalized).strip(".-")
+    return normalized or "package"
+
+
 def add_workspace_member(ctx: RunContext, member: str) -> None:
     """Add a UV workspace member to the root pyproject.toml."""
     pyproject_path = ctx.project_dir / "pyproject.toml"
@@ -76,7 +82,10 @@ def write_package_json(
         package = {}
 
     for key, value in (defaults or {}).items():
-        package.setdefault(key, value)
+        if key == "name":
+            package[key] = value
+        else:
+            package.setdefault(key, value)
 
     for field_name, additions in (
         ("dependencies", dependencies or {}),
@@ -87,7 +96,23 @@ def write_package_json(
             field = {}
             package[field_name] = field
         for dep_name, version in additions.items():
-            field.setdefault(dep_name, version)
+            if version.startswith("file:"):
+                for existing_name, existing_value in list(field.items()):
+                    if (
+                        existing_name != dep_name
+                        and isinstance(existing_value, str)
+                        and existing_value.startswith("workspace:")
+                    ):
+                        field.pop(existing_name)
+            existing_version = field.get(dep_name)
+            if existing_version is None:
+                field[dep_name] = version
+            elif (
+                isinstance(existing_version, str)
+                and existing_version.startswith("workspace:")
+                and version.startswith("file:")
+            ):
+                field[dep_name] = version
 
     content = json.dumps(package, indent=2) + "\n"
     if existed:
@@ -111,7 +136,7 @@ def ensure_npm_workspaces(ctx: RunContext, *, package_name: str | None = None) -
         package = {}
 
     if package_name:
-        package.setdefault("name", package_name)
+        package["name"] = _npm_package_name(package_name)
     package["private"] = True
 
     workspaces = package.get("workspaces", [])

{rpr_cli-0.1.7 → rpr_cli-0.1.9}/tests/test_check.py

@@ -205,7 +205,7 @@ def _create_packages(base: Path) -> None:
         json.dumps(
             {
                 "dependencies": {
-                    "@repo/my-app-ui": web_app_dependencies("my-app-ui")["@repo/my-app-ui"],
+                    "@my-app/ui": web_app_dependencies("my-app-ui")["@my-app/ui"],
                     **STORYBOOK_DEPENDENCIES,
                 },
                 "devDependencies": STORYBOOK_DEV_DEPENDENCIES,

{rpr_cli-0.1.7 → rpr_cli-0.1.9}/tests/test_generate_storybook.py

@@ -83,7 +83,8 @@ def test_generate_storybook_scaffolds_host_package_and_starter_story(monkeypatch
             root_package["devDependencies"]["@nx/storybook"]
             == ROOT_STORYBOOK_DEV_DEPENDENCIES["@nx/storybook"]
         )
-        assert sb_package["dependencies"]["@repo/my-app-ui"] == "workspace:*"
+        assert sb_package["name"] == "@my-app/sb"
+        assert sb_package["dependencies"]["@my-app/ui"] == "file:../my-app-ui"
         assert (
             sb_package["dependencies"]["@mui/material"]
             == storybook_package_dependencies("my-app-ui")["@mui/material"]
@@ -97,7 +98,7 @@ def test_generate_storybook_scaffolds_host_package_and_starter_story(monkeypatch
         assert "../../my-app-ui/src/**/*.stories.@(ts|tsx)" in sb_main
         assert "@storybook/addon-essentials" in sb_main
         assert "ThemeProvider" in sb_preview
-        assert 'import { appTheme } from "@repo/my-app-ui";' in sb_preview
+        assert 'import { appTheme } from "@my-app/ui";' in sb_preview
         assert "createTheme" not in sb_preview
         assert 'title: "my-app-ui/Example"' in starter_story
         assert 'import { uiPackageName } from "../index";' in starter_story
@@ -201,7 +202,7 @@ def test_generate_storybook_dry_run_previews_files_and_forwards_nx_dry_run(
         assert "Would install npm dependencies for workspace root" in output
         assert "dev=[@nx/storybook]" in output
         assert "Would install npm dependencies for packages/node/sb" in output
-        assert "runtime=[@repo/my-app-ui, @emotion/react, @emotion/styled, @mui/material, react, react-dom]" in output
+        assert "runtime=[@my-app/ui, @emotion/react, @emotion/styled, @mui/material, react, react-dom]" in output
         assert not Path("package.json").exists()
         assert not Path("packages/node/sb").exists()
         assert not Path(

{rpr_cli-0.1.7 → rpr_cli-0.1.9}/tests/test_generate_ui.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from contextlib import chdir
 import json
 import subprocess
 from pathlib import Path
@@ -12,6 +13,7 @@ from rpr.dependencies import (
     UI_LIBRARY_DEPENDENCIES,
     UI_LIBRARY_DEV_DEPENDENCIES,
     WEB_APP_DEV_DEPENDENCIES,
+    web_app_dependencies,
 )
 
 
@@ -70,8 +72,10 @@ def test_generate_ui_scaffolds_eslint_and_typecheck(monkeypatch):
             lib_project["targets"]["typecheck"]["options"]["command"]
             == "npx tsc --noEmit"
         )
-        assert app_package["dependencies"]["@repo/my-app-ui"] == "workspace:*"
-        assert app_package["name"] == "@repo/my-app-web"
+        assert app_package["dependencies"]["@my-app/ui"] == (
+            "file:../../packages/node/my-app-ui"
+        )
+        assert app_package["name"] == "@my-app/web"
         assert app_package["devDependencies"]["vitest"] == WEB_APP_DEV_DEPENDENCIES["vitest"]
         assert app_project["targets"]["serve"]["options"]["command"] == "npx vite"
         assert app_project["targets"]["build"]["options"]["command"] == "npx vite build"
@@ -95,7 +99,7 @@ def test_generate_ui_scaffolds_eslint_and_typecheck(monkeypatch):
         assert Path("apps/my-app-web/src/App.test.ts").exists()
         app_tsx = Path("apps/my-app-web/src/App.tsx").read_text()
         assert (
-            'import { AppThemeProvider, uiPackageName } from "@repo/my-app-ui";'
+            'import { AppThemeProvider, uiPackageName } from "@my-app/ui";'
             in app_tsx
         )
         assert "<AppThemeProvider>" in app_tsx
@@ -133,7 +137,7 @@ def test_generate_ui_dry_run_previews_files_and_skips_install(monkeypatch, capsy
         assert "Would install npm dependencies for packages/node/my-app-ui" in output
         assert "runtime=[@mui/material, @emotion/react, @emotion/styled, @tanstack/react-query, @tanstack/react-router, react, react-dom]" in output
         assert "Would install npm dependencies for apps/my-app-web" in output
-        assert "runtime=[@repo/my-app-ui, react, react-dom]" in output
+        assert "runtime=[@my-app/ui, react, react-dom]" in output
         assert recorded_calls == []
         assert not Path("package.json").exists()
         assert not Path("packages/node/my-app-ui/package.json").exists()
@@ -157,7 +161,7 @@ def test_generate_ui_preserves_existing_package_versions(monkeypatch):
         (lib_root / "package.json").write_text(
             json.dumps(
                 {
-                    "name": "@repo/my-app-ui",
+                    "name": "@my-app/ui",
                     "dependencies": {
                         "@tanstack/react-query": "^5.99.0",
                         "zod": "^3.0.0",
@@ -168,9 +172,9 @@ def test_generate_ui_preserves_existing_package_versions(monkeypatch):
         (app_root / "package.json").write_text(
             json.dumps(
                 {
-                    "name": "@repo/my-app-web",
+                    "name": "@my-app/web",
                     "dependencies": {
-                        "@repo/my-app-ui": "workspace:*",
+                        "@my-app/ui": "workspace:*",
                         "react": "^19.1.0",
                     },
                 }
@@ -190,6 +194,94 @@ def test_generate_ui_preserves_existing_package_versions(monkeypatch):
             == UI_LIBRARY_DEPENDENCIES["@mui/material"]
         )
         assert app_package["dependencies"]["react"] == "^19.1.0"
-        assert app_package["dependencies"]["@repo/my-app-ui"] == "workspace:*"
+        assert app_package["dependencies"]["@my-app/ui"] == (
+            "file:../../packages/node/my-app-ui"
+        )
         assert app_package["devDependencies"]["vite"] == WEB_APP_DEV_DEPENDENCIES["vite"]
         assert app_package["devDependencies"]["vitest"] == WEB_APP_DEV_DEPENDENCIES["vitest"]
+
+
+def test_generate_ui_normalizes_npm_package_names_for_mixed_case_app(monkeypatch):
+    def fake_run_command(
+        self, cmd, *, cwd=None, env=None, capture=False, supports_dry_run=False
+    ):
+        return _completed(cmd)
+
+    monkeypatch.setattr("rpr.context.RunContext.run_command", fake_run_command)
+
+    with runner.isolated_filesystem():
+        Path("TestApp").mkdir()
+        with chdir("TestApp"):
+            result = runner.invoke(app, ["generate", "ui", "TestApp"])
+            assert result.exit_code == 0, result.stdout
+
+            root_package = json.loads(Path("package.json").read_text())
+            lib_package = json.loads(
+                Path("packages/node/TestApp-ui/package.json").read_text()
+            )
+            app_package = json.loads(Path("apps/TestApp-web/package.json").read_text())
+            app_tsx = Path("apps/TestApp-web/src/App.tsx").read_text()
+
+            assert root_package["name"] == "testapp"
+            assert lib_package["name"] == "@testapp/ui"
+            assert app_package["name"] == "@testapp/web"
+            assert app_package["dependencies"]["@testapp/ui"] == (
+                "file:../../packages/node/TestApp-ui"
+            )
+            assert "workspace:*" not in json.dumps(app_package)
+            assert 'from "@testapp/ui"' in app_tsx
+            assert web_app_dependencies("TestApp-ui")["@testapp/ui"] == (
+                "file:../../packages/node/TestApp-ui"
+            )
+
+
+def test_generate_ui_repairs_existing_workspace_protocol_for_mixed_case_app(
+    monkeypatch,
+):
+    def fake_run_command(
+        self, cmd, *, cwd=None, env=None, capture=False, supports_dry_run=False
+    ):
+        return _completed(cmd)
+
+    monkeypatch.setattr("rpr.context.RunContext.run_command", fake_run_command)
+
+    with runner.isolated_filesystem():
+        Path("TestApp").mkdir()
+        with chdir("TestApp"):
+            lib_root = Path("packages/node/TestApp-ui")
+            app_root = Path("apps/TestApp-web")
+            lib_root.mkdir(parents=True)
+            app_root.mkdir(parents=True)
+            Path("package.json").write_text(
+                json.dumps({"name": "TestApp", "private": True})
+            )
+            (lib_root / "package.json").write_text(
+                json.dumps({"name": "@repo/TestApp-ui", "private": True})
+            )
+            (app_root / "package.json").write_text(
+                json.dumps(
+                    {
+                        "name": "@repo/TestApp-web",
+                        "dependencies": {
+                            "@repo/TestApp-ui": "workspace:*",
+                        },
+                    }
+                )
+            )
+
+            result = runner.invoke(app, ["generate", "ui", "TestApp"])
+            assert result.exit_code == 0, result.stdout
+
+            root_package = json.loads(Path("package.json").read_text())
+            lib_package = json.loads((lib_root / "package.json").read_text())
+            app_package = json.loads((app_root / "package.json").read_text())
+
+            assert root_package["name"] == "testapp"
+            assert lib_package["name"] == "@testapp/ui"
+            assert app_package["name"] == "@testapp/web"
+            assert app_package["dependencies"] == {
+                "@testapp/ui": "file:../../packages/node/TestApp-ui",
+                "react": UI_LIBRARY_DEPENDENCIES["react"],
+                "react-dom": UI_LIBRARY_DEPENDENCIES["react-dom"],
+            }
+            assert "workspace:*" not in json.dumps(app_package)

rpr_cli-0.1.7/src/rpr/__init__.py

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