simple-module-hosting 0.0.11__tar.gz → 0.0.13__tar.gz

{simple_module_hosting-0.0.11 → simple_module_hosting-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_module_hosting
-Version: 0.0.11
+Version: 0.0.13
 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.11
-Requires-Dist: simple-module-db==0.0.11
+Requires-Dist: simple-module-core==0.0.13
+Requires-Dist: simple-module-db==0.0.13
 Requires-Dist: starlette>=0.44
 Requires-Dist: tomlkit>=0.13
 Requires-Dist: uvicorn[standard]>=0.34
@@ -35,7 +35,7 @@ Description-Content-Type: text/markdown
 
 # simple_module_hosting
 
-FastAPI + Inertia.js host runtime for the [simple_module](https://github.com/antosubash/simple_module_python) framework — builds the app, wires the middleware pipeline, and contributes the `sm host` plugin to the standalone `sm` CLI.
+FastAPI + Inertia.js host runtime for the [simple_module](https://github.com/antosubash/simple_module_python) framework — builds the app, wires the middleware pipeline, and contributes the `smpy host` plugin to the standalone `smpy` CLI.
 
 ## Install
 
@@ -46,7 +46,7 @@ pip install simple_module_hosting
 For a new project, most users run the generator instead (shipped by the standalone `simple_module_cli` distribution):
 
 ```bash
-uvx --from simple_module_cli sm new my-app
+uvx --from simple_module_cli smpy new my-app
 ```
 
 ## What it provides
@@ -54,7 +54,7 @@ uvx --from simple_module_cli sm new my-app
 - `create_app(settings)` — returns a fully-wired `FastAPI` instance with all discovered modules registered.
 - Middleware pipeline (execution order): CorrelationId → RequestLogging → SecurityHeaders → Session → `<module middleware>` → Tenant (opt-in) → Locale → InertiaLayoutData → app.
 - Inertia wiring — shared props (`auth`, `menus`, `i18n`), `InertiaDep`, page-route lookup.
-- `sm host` plugin — `sm host gen-pages` regenerates the frontend pages manifest; `sm host sync-js-deps` installs JS deps declared by installed modules. The `sm` binary itself comes from `simple_module_cli`.
+- `smpy host` plugin — `smpy host gen-pages` regenerates the frontend pages manifest; `smpy host sync-js-deps` installs JS deps declared by installed modules. The `smpy` binary itself comes from `simple_module_cli`.
 
 ## Usage
 
@@ -75,8 +75,8 @@ if __name__ == "__main__":
 CLI (after also installing `simple_module_cli`):
 
 ```bash
-sm host gen-pages               # regenerate client_app/modules.generated.ts
-sm host sync-js-deps            # sync module JS deps into client_app/node_modules
+smpy host gen-pages             # regenerate client_app/modules.generated.ts
+smpy host sync-js-deps          # sync module JS deps into client_app/node_modules
 ```
 
 ## Depends on

{simple_module_hosting-0.0.11 → simple_module_hosting-0.0.13}/README.md

@@ -1,6 +1,6 @@
 # simple_module_hosting
 
-FastAPI + Inertia.js host runtime for the [simple_module](https://github.com/antosubash/simple_module_python) framework — builds the app, wires the middleware pipeline, and contributes the `sm host` plugin to the standalone `sm` CLI.
+FastAPI + Inertia.js host runtime for the [simple_module](https://github.com/antosubash/simple_module_python) framework — builds the app, wires the middleware pipeline, and contributes the `smpy host` plugin to the standalone `smpy` CLI.
 
 ## Install
 
@@ -11,7 +11,7 @@ pip install simple_module_hosting
 For a new project, most users run the generator instead (shipped by the standalone `simple_module_cli` distribution):
 
 ```bash
-uvx --from simple_module_cli sm new my-app
+uvx --from simple_module_cli smpy new my-app
 ```
 
 ## What it provides
@@ -19,7 +19,7 @@ uvx --from simple_module_cli sm new my-app
 - `create_app(settings)` — returns a fully-wired `FastAPI` instance with all discovered modules registered.
 - Middleware pipeline (execution order): CorrelationId → RequestLogging → SecurityHeaders → Session → `<module middleware>` → Tenant (opt-in) → Locale → InertiaLayoutData → app.
 - Inertia wiring — shared props (`auth`, `menus`, `i18n`), `InertiaDep`, page-route lookup.
-- `sm host` plugin — `sm host gen-pages` regenerates the frontend pages manifest; `sm host sync-js-deps` installs JS deps declared by installed modules. The `sm` binary itself comes from `simple_module_cli`.
+- `smpy host` plugin — `smpy host gen-pages` regenerates the frontend pages manifest; `smpy host sync-js-deps` installs JS deps declared by installed modules. The `smpy` binary itself comes from `simple_module_cli`.
 
 ## Usage
 
@@ -40,8 +40,8 @@ if __name__ == "__main__":
 CLI (after also installing `simple_module_cli`):
 
 ```bash
-sm host gen-pages               # regenerate client_app/modules.generated.ts
-sm host sync-js-deps            # sync module JS deps into client_app/node_modules
+smpy host gen-pages             # regenerate client_app/modules.generated.ts
+smpy host sync-js-deps          # sync module JS deps into client_app/node_modules
 ```
 
 ## Depends on

{simple_module_hosting-0.0.11 → simple_module_hosting-0.0.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simple_module_hosting"
-version = "0.0.11"
+version = "0.0.13"
 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.11",
-    "simple_module_db==0.0.11",
+    "simple_module_core==0.0.13",
+    "simple_module_db==0.0.13",
     "starlette>=0.44",
     "tomlkit>=0.13",
     "uvicorn[standard]>=0.34",

{simple_module_hosting-0.0.11 → simple_module_hosting-0.0.13}/simple_module_hosting/__main__.py

@@ -3,7 +3,7 @@
 Without this, ``python -m simple_module_hosting.host_cli`` would import the
 module without running the Typer app — silently no-op'ing commands like
 ``gen-pages``. Provides the same Typer ``app`` callable that the
-``simple_module_cli.cli_plugins`` entry point exposes as ``sm host``.
+``simple_module_cli.cli_plugins`` entry point exposes as ``smpy host``.
 """
 
 from __future__ import annotations

{simple_module_hosting-0.0.11 → simple_module_hosting-0.0.13}/simple_module_hosting/_inertia_setup.py

@@ -28,7 +28,7 @@ def setup_inertia(
 
     Two host layouts are supported: ``host/templates`` (the framework's
     own host package) and ``templates`` at the project root (what
-    ``sm new`` produces). The first one found wins so it can override
+    ``smpy new`` produces). The first one found wins so it can override
     module-contributed templates.
     """
     from fastapi.templating import Jinja2Templates

{simple_module_hosting-0.0.11 → simple_module_hosting-0.0.13}/simple_module_hosting/host_cli.py

@@ -1,4 +1,4 @@
-"""``sm host`` plugin — project-time helpers exposed through the simple-module CLI.
+"""``smpy host`` plugin — project-time helpers exposed through the simple-module CLI.
 
 Commands here need module discovery (``simple_module_core.discover_modules``)
 and the manifest helpers; they're not part of the standalone scaffolder.

{simple_module_hosting-0.0.11 → simple_module_hosting-0.0.13}/simple_module_hosting/manifest.py

@@ -8,7 +8,7 @@
 * :func:`read_module_package_json` / :func:`collect_module_js_deps` locate
   the per-module ``package.json`` shipped inside wheels (or alongside the
   source for editable installs) and aggregate its ``dependencies`` block.
-  Used by the ``sm sync-js-deps`` CLI.
+  Used by the ``smpy sync-js-deps`` CLI.
 """
 
 from __future__ import annotations
@@ -26,7 +26,7 @@ logger = logging.getLogger(__name__)
 
 _GENERATED_TS_HEADER = """\
 // AUTO-GENERATED by simple_module_hosting.manifest — do not edit by hand.
-// Regenerate with: sm gen-pages
+// Regenerate with: smpy gen-pages
 //
 // Maps ModuleName -> record of page import paths. Paths below are
 // relative to this file (host/client_app/) so that pages shipped inside
@@ -35,7 +35,7 @@ _GENERATED_TS_HEADER = """\
 
 _GENERATED_CSS_HEADER = """\
 /* AUTO-GENERATED by simple_module_hosting.manifest — do not edit by hand.
- * Regenerate with: sm gen-pages
+ * Regenerate with: smpy gen-pages
  *
  * @source entries for module pages shipped inside pip-installed wheels.
  * In-repo modules are covered by the static @source glob in
@@ -54,7 +54,7 @@ def repo_root_from_client_app(client_app_dir: Path) -> Path:
     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
+    ``host/client_app/`` layout and the flat ``smpy new`` scaffold's
     ``client_app/`` layout (where the parent IS the workspace root).
     """
     here = client_app_dir.resolve()

simple_module_hosting-0.0.13/tests/test_manifest.py

@@ -0,0 +1,165 @@
+"""Tests for ``simple_module_hosting.manifest`` helpers."""
+
+from __future__ import annotations
+
+import importlib.util
+import json
+import sys
+from pathlib import Path
+
+import pytest
+from simple_module_core import ModuleBase, ModuleMeta
+from simple_module_hosting.manifest import (
+    collect_module_js_deps,
+    read_module_package_json,
+    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()
+
+
+@pytest.fixture
+def fake_module_factory(tmp_path: Path, monkeypatch: pytest.MonkeyPatch):
+    """Build a fake installed module with a configurable on-disk layout.
+
+    Returns a callable that takes a ``layout`` ∈ {"wheel", "source"} plus
+    optional ``dependencies`` and ``peer_dependencies`` maps, lays the
+    files down under ``tmp_path``, registers the package in ``sys.modules``,
+    and returns a ``ModuleBase`` subclass pinned to it.
+    """
+    counter = {"n": 0}
+
+    def _build(
+        layout: str,
+        dependencies: dict[str, str] | None = None,
+        peer_dependencies: dict[str, str] | None = None,
+    ) -> type[ModuleBase]:
+        counter["n"] += 1
+        pkg_name = f"fake_module_{counter['n']}"
+        if layout == "wheel":
+            # Wheel: <pkg>/ contains code + package.json (Hatch force-include).
+            pkg_root = tmp_path / pkg_name
+            pkg_root.mkdir()
+            pkg_json_path = pkg_root / "package.json"
+        elif layout == "source":
+            # Source-tree / editable: package.json sits above the Python pkg.
+            module_root = tmp_path / f"{pkg_name}_repo"
+            module_root.mkdir()
+            pkg_root = module_root / pkg_name
+            pkg_root.mkdir()
+            pkg_json_path = module_root / "package.json"
+        else:
+            raise ValueError(f"unknown layout: {layout}")
+        init_py = pkg_root / "__init__.py"
+        init_py.write_text("")
+        pkg_json: dict[str, object] = {
+            "name": f"@fake/{pkg_name}",
+            "dependencies": dependencies or {},
+        }
+        if peer_dependencies is not None:
+            pkg_json["peerDependencies"] = peer_dependencies
+        pkg_json_path.write_text(json.dumps(pkg_json))
+
+        # Register the package with a real importlib spec so that
+        # importlib.resources.files() can locate the on-disk pkg_root.
+        spec = importlib.util.spec_from_file_location(
+            pkg_name, init_py, submodule_search_locations=[str(pkg_root)]
+        )
+        assert spec is not None and spec.loader is not None
+        mod = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(mod)
+        monkeypatch.setitem(sys.modules, pkg_name, mod)
+
+        class FakeMod(ModuleBase):
+            meta = ModuleMeta(name=pkg_name.title().replace("_", ""))
+
+        FakeMod.__module__ = pkg_name
+        return FakeMod
+
+    return _build
+
+
+def test_read_module_package_json_finds_wheel_layout(fake_module_factory) -> None:
+    """Wheel install: package.json sits next to the Python package."""
+    fake_cls = fake_module_factory(
+        "wheel",
+        {"dep-a": "^1.0.0"},
+        peer_dependencies={"@host/peer": "^2.0.0"},
+    )
+    pkg = read_module_package_json(fake_cls())
+    assert pkg is not None
+    assert pkg["dependencies"] == {"dep-a": "^1.0.0"}
+    # The TS-side vite.config.ts also reads peerDependencies for its
+    # optimizeDeps walk — make sure the raw dict surfaces both blocks.
+    assert pkg["peerDependencies"] == {"@host/peer": "^2.0.0"}
+
+
+def test_read_module_package_json_finds_source_layout(fake_module_factory) -> None:
+    """Source-tree / workspace: package.json sits at the module repo root."""
+    fake_cls = fake_module_factory("source", {"dep-b": "^2.0.0"})
+    pkg = read_module_package_json(fake_cls())
+    assert pkg is not None
+    assert pkg["dependencies"] == {"dep-b": "^2.0.0"}
+
+
+def test_collect_module_js_deps_aggregates_across_layouts(fake_module_factory) -> None:
+    """Mixed-layout modules all contribute their declared deps."""
+    wheel_cls = fake_module_factory("wheel", {"cmdk": "^1.0.0"})
+    source_cls = fake_module_factory("source", {"maplibre-gl": "^4.7.0", "pmtiles": "^3.2.0"})
+    empty_cls = fake_module_factory("wheel", {})
+
+    deps = collect_module_js_deps([wheel_cls(), source_cls(), empty_cls()])
+    # Empty deps are dropped; both populated modules appear by their meta.name.
+    assert empty_cls.meta.name not in deps
+    assert deps[wheel_cls.meta.name] == {"cmdk": "^1.0.0"}
+    assert deps[source_cls.meta.name] == {"maplibre-gl": "^4.7.0", "pmtiles": "^3.2.0"}

simple_module_hosting-0.0.11/tests/test_manifest.py

@@ -1,60 +0,0 @@
-"""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()