rpr-cli 0.1.22__tar.gz → 0.1.23__tar.gz

{rpr_cli-0.1.22 → rpr_cli-0.1.23}/PKG-INFO

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

rpr_cli-0.1.23/src/rpr/__init__.py

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

{rpr_cli-0.1.22 → rpr_cli-0.1.23}/src/rpr/commands/generate/storybook.py

@@ -12,7 +12,7 @@ from rpr.context import RunContext
 from rpr.dependencies import (
     ROOT_STORYBOOK_DEV_DEPENDENCIES,
     STORYBOOK_DEV_DEPENDENCIES,
-    npm_install_names,
+    npm_install_specs,
     npm_package_name,
     storybook_host_package_name,
     storybook_package_dependencies,
@@ -199,10 +199,10 @@ def _write_sb_package_json(ctx: RunContext, sb_root: Path, ui_pkg: str) -> None:
 
 
 def _install_storybook_dependencies(ctx: RunContext, ui_pkg: str) -> None:
-    runtime = npm_install_names(storybook_package_dependencies(ui_pkg))
+    runtime = npm_install_specs(storybook_package_dependencies(ui_pkg))
     dev = [
-        *npm_install_names(ROOT_STORYBOOK_DEV_DEPENDENCIES),
-        *npm_install_names(STORYBOOK_DEV_DEPENDENCIES),
+        *npm_install_specs(ROOT_STORYBOOK_DEV_DEPENDENCIES),
+        *npm_install_specs(STORYBOOK_DEV_DEPENDENCIES),
     ]
     if runtime:
         ctx.run_command(["npm", "i", *sorted(set(runtime))], cwd=ctx.project_dir)
@@ -371,7 +371,7 @@ const config: StorybookConfig = {{
   stories: [
     "../../{ui_pkg}/src/**/*.stories.@(ts|tsx)",
   ],
-  addons: ["@storybook/addon-essentials"],
+    addons: [],
   framework: {{
     name: "@storybook/react-vite",
     options: {{}},

{rpr_cli-0.1.22 → rpr_cli-0.1.23}/src/rpr/commands/generate/ui.py

@@ -14,7 +14,7 @@ from rpr.dependencies import (
     UI_LIBRARY_DEV_DEPENDENCIES,
     WEB_APP_DEV_DEPENDENCIES,
     node_project_name,
-    npm_install_names,
+    npm_install_specs,
     ui_package_name,
     web_app_dependencies,
     web_package_name,
@@ -154,11 +154,11 @@ def _install_ui_dependencies(
     runtime: list[str] = []
     dev: list[str] = []
     if include_library:
-        runtime.extend(npm_install_names(UI_LIBRARY_DEPENDENCIES))
-        dev.extend(npm_install_names(UI_LIBRARY_DEV_DEPENDENCIES))
+        runtime.extend(npm_install_specs(UI_LIBRARY_DEPENDENCIES))
+        dev.extend(npm_install_specs(UI_LIBRARY_DEV_DEPENDENCIES))
     if include_web:
-        runtime.extend(npm_install_names(web_app_dependencies(ui_pkg_name)))
-        dev.extend(npm_install_names(WEB_APP_DEV_DEPENDENCIES))
+        runtime.extend(npm_install_specs(web_app_dependencies(ui_pkg_name)))
+        dev.extend(npm_install_specs(WEB_APP_DEV_DEPENDENCIES))
 
     if runtime:
         ctx.run_command(["npm", "i", *sorted(set(runtime))], cwd=ctx.project_dir)

{rpr_cli-0.1.22 → rpr_cli-0.1.23}/src/rpr/commands/init.py

@@ -16,6 +16,7 @@ from rpr.context import RunContext
 from rpr.dependencies import (
     ROOT_NODE_DEV_DEPENDENCIES,
     node_project_name,
+    npm_install_specs,
     npm_install_names,
     npm_package_name,
     python_package_name,
@@ -846,7 +847,7 @@ def init(
         dev=npm_install_names(ROOT_NODE_DEV_DEPENDENCIES),
     )
     ctx.run_command(
-        ["npm", "i", "-D", *npm_install_names(ROOT_NODE_DEV_DEPENDENCIES)],
+        ["npm", "i", "-D", *npm_install_specs(ROOT_NODE_DEV_DEPENDENCIES)],
         cwd=project_dir,
     )
 

{rpr_cli-0.1.22 → rpr_cli-0.1.23}/src/rpr/dependencies.py

@@ -132,6 +132,22 @@ def npm_install_names(dependencies: Mapping[str, str] | list[str]) -> list[str]:
     return list(dependencies)
 
 
+def npm_install_specs(dependencies: Mapping[str, str] | list[str]) -> list[str]:
+    if not isinstance(dependencies, Mapping):
+        return list(dependencies)
+
+    specs: list[str] = []
+    for name, value in dependencies.items():
+        specifier = str(value)
+        if specifier.startswith(("file:", "workspace:")):
+            continue
+        if specifier:
+            specs.append(f"{name}@{specifier}")
+        else:
+            specs.append(name)
+    return specs
+
+
 def api_runtime_dependencies(name: str) -> list[str]:
     return [python_project_name(name, "domain"), *API_RUNTIME_BASE_DEPENDENCIES]
 

{rpr_cli-0.1.22 → rpr_cli-0.1.23}/src/rpr/dependency_manifest_data.py

@@ -161,20 +161,15 @@ MANIFEST = {
         },
     },
     "storybook_dev_dependencies": {
-        "@storybook/addon-essentials": {
-            "registry": "npm",
-            "specifier": "latest",
-            "strategy": "latest",
-        },
         "@storybook/react": {
             "registry": "npm",
-            "specifier": "latest",
-            "strategy": "latest",
+            "specifier": "^10.3.6",
+            "strategy": "pinned-major",
         },
         "@storybook/react-vite": {
             "registry": "npm",
-            "specifier": "latest",
-            "strategy": "latest",
+            "specifier": "^10.3.6",
+            "strategy": "pinned-major",
         },
         "@vitejs/plugin-react": {
             "registry": "npm",
@@ -193,8 +188,8 @@ MANIFEST = {
         },
         "storybook": {
             "registry": "npm",
-            "specifier": "latest",
-            "strategy": "latest",
+            "specifier": "^10.3.6",
+            "strategy": "pinned-major",
         },
         "typescript": {
             "registry": "npm",

{rpr_cli-0.1.22 → rpr_cli-0.1.23}/src/rpr/manifest_refresh.py

@@ -9,7 +9,9 @@ from urllib.parse import quote
 from urllib.request import Request, urlopen
 
 RegistryName = Literal["npm", "pypi", "cratesio"]
-RefreshStrategy = Literal["caret", "minimum", "exact", "major-range", "latest"]
+RefreshStrategy = Literal[
+    "caret", "minimum", "exact", "major-range", "latest", "pinned-major"
+]
 Manifest = dict[str, dict[str, dict[str, str]]]
 
 _USER_AGENT = "rpr-cli/0.1.1 (+https://github.com/)"
@@ -79,6 +81,8 @@ def refresh_dependency_manifest(
                 continue
 
             package = entry.get("package", dependency)
+            if strategy == "pinned-major":
+                continue
             if strategy == "latest":
                 latest_version = "latest"
                 new_specifier = _format_specifier(
@@ -155,4 +159,4 @@ def _next_major(version: str) -> int:
     match = re.match(r"^(\d+)", version)
     if match is None:
         raise ManifestRefreshError(f"Cannot determine next major version for {version}")
-    return int(match.group(1)) + 1
+    return int(match.group(1)) + 1

{rpr_cli-0.1.22 → rpr_cli-0.1.23}/tests/test_generate_storybook.py

@@ -84,7 +84,8 @@ def test_generate_storybook_scaffolds_host_package_and_starter_story(monkeypatch
             "storybook build -c packages/node/sb/.storybook -o dist/storybook"
         )
         assert "../../my-app-ui/src/**/*.stories.@(ts|tsx)" in sb_main
-        assert "@storybook/addon-essentials" in sb_main
+        assert "@storybook/addon-essentials" not in sb_main
+        assert "addons: []" in sb_main
         assert "ThemeProvider" in sb_preview
         assert 'import { appTheme } from "@my-app/ui";' in sb_preview
         assert "createTheme" not in sb_preview
@@ -98,11 +99,11 @@ def test_generate_storybook_scaffolds_host_package_and_starter_story(monkeypatch
                 "cmd": [
                     "npm",
                     "i",
-                    "@emotion/react",
-                    "@emotion/styled",
-                    "@mui/material",
-                    "react",
-                    "react-dom",
+                    "@emotion/react@latest",
+                    "@emotion/styled@latest",
+                    "@mui/material@latest",
+                    "react-dom@latest",
+                    "react@latest",
                 ],
                 "cwd": Path.cwd(),
                 "supports_dry_run": False,
@@ -112,17 +113,16 @@ def test_generate_storybook_scaffolds_host_package_and_starter_story(monkeypatch
                     "npm",
                     "i",
                     "-D",
-                    "@nx/storybook",
-                    "@storybook/addon-essentials",
-                    "@storybook/react",
-                    "@storybook/react-vite",
-                    "@types/react",
-                    "@types/react-dom",
-                    "@vitejs/plugin-react",
-                    "storybook",
-                    "typescript",
-                    "vite",
-                    "vitest",
+                    "@nx/storybook@latest",
+                    "@storybook/react-vite@^10.3.6",
+                    "@storybook/react@^10.3.6",
+                    "@types/react-dom@latest",
+                    "@types/react@latest",
+                    "@vitejs/plugin-react@latest",
+                    "storybook@^10.3.6",
+                    "typescript@latest",
+                    "vite@latest",
+                    "vitest@latest",
                 ],
                 "cwd": Path.cwd(),
                 "supports_dry_run": False,

{rpr_cli-0.1.22 → rpr_cli-0.1.23}/tests/test_refresh.py

@@ -18,7 +18,9 @@ def test_refresh_manifest_preserves_latest_dependency_policy(
     manifest_path.write_text(original)
     fetch_calls: list[tuple[str, str]] = []
 
-    def fake_fetch_latest_version(registry: str, package: str, *, timeout: float = 10.0) -> str:
+    def fake_fetch_latest_version(
+        registry: str, package: str, *, timeout: float = 10.0
+    ) -> str:
         fetch_calls.append((registry, package))
         return "9.9.9"
 
@@ -35,12 +37,16 @@ def test_refresh_manifest_preserves_latest_dependency_policy(
     assert fetch_calls == []
 
 
-def test_refresh_manifest_dry_run_does_not_write_file(monkeypatch, tmp_path: Path) -> None:
+def test_refresh_manifest_dry_run_does_not_write_file(
+    monkeypatch, tmp_path: Path
+) -> None:
     manifest_path = tmp_path / "dependency_manifest_data.py"
     original = render_dependency_manifest_module(get_dependency_manifest())
     manifest_path.write_text(original)
 
-    def fake_fetch_latest_version(registry: str, package: str, *, timeout: float = 10.0) -> str:
+    def fake_fetch_latest_version(
+        registry: str, package: str, *, timeout: float = 10.0
+    ) -> str:
         return "9.9.9"
 
     monkeypatch.setattr("rpr.commands.refresh.MANIFEST_DATA_PATH", manifest_path)
@@ -51,4 +57,4 @@ def test_refresh_manifest_dry_run_does_not_write_file(monkeypatch, tmp_path: Pat
     result = runner.invoke(app, ["refresh", "manifest", "--dry-run"])
 
     assert result.exit_code == 0, result.stdout
-    assert manifest_path.read_text() == original
+    assert manifest_path.read_text() == original

rpr_cli-0.1.22/src/rpr/__init__.py

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