simple-module-hosting 0.0.8__tar.gz → 0.0.10__tar.gz

{simple_module_hosting-0.0.8 → simple_module_hosting-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_module_hosting
-Version: 0.0.8
+Version: 0.0.10
 Summary: FastAPI + Inertia.js host runtime for simple_module — app_builder, middleware stack, CLI (sm / simple-module), scaffolding
 Project-URL: Homepage, https://github.com/antosubash/simple_module_python
 Project-URL: Repository, https://github.com/antosubash/simple_module_python
@@ -26,8 +26,8 @@ Requires-Dist: fastapi-inertia>=1.0
 Requires-Dist: fastapi>=0.115
 Requires-Dist: httpx>=0.27
 Requires-Dist: jinja2>=3.1
-Requires-Dist: simple-module-core==0.0.8
-Requires-Dist: simple-module-db==0.0.8
+Requires-Dist: simple-module-core==0.0.10
+Requires-Dist: simple-module-db==0.0.10
 Requires-Dist: starlette>=0.44
 Requires-Dist: tomlkit>=0.13
 Requires-Dist: uvicorn[standard]>=0.34

{simple_module_hosting-0.0.8 → simple_module_hosting-0.0.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simple_module_hosting"
-version = "0.0.8"
+version = "0.0.10"
 description = "FastAPI + Inertia.js host runtime for simple_module — app_builder, middleware stack, CLI (sm / simple-module), scaffolding"
 readme = "README.md"
 license = "MIT"
@@ -26,8 +26,8 @@ dependencies = [
     "fastapi-inertia>=1.0",
     "httpx>=0.27",
     "jinja2>=3.1",
-    "simple_module_core==0.0.8",
-    "simple_module_db==0.0.8",
+    "simple_module_core==0.0.10",
+    "simple_module_db==0.0.10",
     "starlette>=0.44",
     "tomlkit>=0.13",
     "uvicorn[standard]>=0.34",

{simple_module_hosting-0.0.8 → simple_module_hosting-0.0.10}/simple_module_hosting/manifest.py

@@ -45,13 +45,38 @@ _GENERATED_CSS_HEADER = """\
 
 
 def repo_root_from_client_app(client_app_dir: Path) -> Path:
-    """Repo root is two levels above ``host/client_app/``.
+    """Locate the workspace/repo root that contains ``client_app_dir``.
 
     Both ``write_module_pages_manifest`` and the ``sync-js-deps`` CLI
     derive the workspace root from the host's client_app directory.
     Centralized here so the heuristic lives in exactly one place.
+
+    Walks up looking for the nearest ``package.json`` that declares
+    ``workspaces`` (the workspace root npm uses), falling back to any
+    ``package.json``. This handles both the framework repo's
+    ``host/client_app/`` layout and the flat ``sm new`` scaffold's
+    ``client_app/`` layout (where the parent IS the workspace root).
     """
-    return client_app_dir.resolve().parent.parent
+    here = client_app_dir.resolve()
+    fallback: Path | None = None
+    for parent in (here.parent, *here.parents):
+        pkg = parent / "package.json"
+        if not pkg.is_file():
+            continue
+        if fallback is None:
+            fallback = parent
+        try:
+            data = json.loads(pkg.read_text(encoding="utf-8"))
+        except json.JSONDecodeError:
+            continue
+        if "workspaces" in data:
+            return parent
+    if fallback is not None:
+        return fallback
+    # No package.json found anywhere on the way up — preserve the legacy
+    # two-levels-up shape so framework-internal callers still get a valid
+    # path even before any npm setup has happened.
+    return here.parent.parent
 
 
 def compute_module_pages(modules: Sequence[ModuleBase]) -> dict[str, Path]:

simple_module_hosting-0.0.10/tests/test_manifest.py

@@ -0,0 +1,60 @@
+"""Tests for ``simple_module_hosting.manifest`` helpers."""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+
+from simple_module_hosting.manifest import repo_root_from_client_app
+
+
+def test_repo_root_finds_workspace_root_in_framework_layout(tmp_path: Path) -> None:
+    """``host/client_app/`` shape: walk up to the workspace package.json."""
+    workspace = tmp_path / "ws"
+    (workspace / "host" / "client_app").mkdir(parents=True)
+    (workspace / "package.json").write_text(
+        json.dumps({"name": "ws", "workspaces": ["host/client_app", "modules/*"]})
+    )
+    (workspace / "host" / "package.json").write_text(json.dumps({"name": "ws-host"}))
+
+    assert repo_root_from_client_app(workspace / "host" / "client_app") == workspace.resolve()
+
+
+def test_repo_root_finds_root_in_flat_scaffold_layout(tmp_path: Path) -> None:
+    """Flat scaffold: ``client_app/`` directly under the host root."""
+    host = tmp_path / "my-app"
+    (host / "client_app").mkdir(parents=True)
+    (host / "package.json").write_text(json.dumps({"name": "my-app"}))
+
+    assert repo_root_from_client_app(host / "client_app") == host.resolve()
+
+
+def test_repo_root_prefers_workspace_package_json_over_nearer_one(tmp_path: Path) -> None:
+    """When a non-workspace package.json sits between client_app and the
+    workspace root, the workspace one wins so npm install runs at the right cwd."""
+    workspace = tmp_path / "ws"
+    (workspace / "host" / "client_app").mkdir(parents=True)
+    (workspace / "package.json").write_text(
+        json.dumps({"name": "ws", "workspaces": ["host/client_app"]})
+    )
+    (workspace / "host" / "package.json").write_text(json.dumps({"name": "ws-host"}))
+
+    assert repo_root_from_client_app(workspace / "host" / "client_app") == workspace.resolve()
+
+
+def test_repo_root_falls_back_to_nearest_package_json(tmp_path: Path) -> None:
+    """No workspaces field anywhere — settle on the nearest package.json found."""
+    root = tmp_path / "root"
+    (root / "client_app").mkdir(parents=True)
+    (root / "package.json").write_text(json.dumps({"name": "root"}))
+
+    assert repo_root_from_client_app(root / "client_app") == root.resolve()
+
+
+def test_repo_root_falls_back_to_two_levels_up_if_no_package_json(tmp_path: Path) -> None:
+    """No package.json exists yet — preserve the legacy two-up behaviour so
+    framework-internal callers still get a path before any npm setup."""
+    deep = tmp_path / "outer" / "inner" / "client_app"
+    deep.mkdir(parents=True)
+
+    assert repo_root_from_client_app(deep) == (tmp_path / "outer").resolve()