simple-module-cli 0.0.35__tar.gz → 0.0.36__tar.gz

{simple_module_cli-0.0.35 → simple_module_cli-0.0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: simple_module_cli
-Version: 0.0.35
+Version: 0.0.36
 Summary: Standalone scaffolder for the SimpleModule framework — `smpy new`, `smpy create-module`, plugin host.
 Project-URL: Homepage, https://github.com/antosubash/simple_module_python
 Project-URL: Repository, https://github.com/antosubash/simple_module_python

{simple_module_cli-0.0.35 → simple_module_cli-0.0.36}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simple_module_cli"
-version = "0.0.35"
+version = "0.0.36"
 description = "Standalone scaffolder for the SimpleModule framework — `smpy new`, `smpy create-module`, plugin host."
 readme = "README.md"
 license = "MIT"

{simple_module_cli-0.0.35 → simple_module_cli-0.0.36}/simple_module_cli/skills/simple-module-migrations/SKILL.md

@@ -64,7 +64,7 @@ make migration msg="add orders module"
 make migrate
 ```
 
-`make migrate` runs `alembic -c host/alembic.ini upgrade heads` — note **`heads`** (plural). Branch labels create multiple independent heads, so `upgrade head` (singular) would error or under-apply.
+`make migrate` runs `alembic -c host/alembic.ini upgrade heads` — note **`heads`** (plural). Histories with a branch label can end up with multiple heads, so `upgrade head` (singular) may error or under-apply.
 
 ### Branch labels — set on the FIRST revision per module
 
@@ -78,16 +78,14 @@ branch_labels = ("audit_log",)  # ← add by hand on this first revision
 depends_on = None
 ```
 
-Why: it lets operators roll back **just one module's** schema, which is how a module is uninstalled cleanly:
+Why: the label is a named target for that revision (`upgrade audit_log@head`, the module column in the Doctor). It does **not** isolate the module: autogenerate chains the revision off the current head, so history is one linear chain and `downgrade audit_log@base` walks the **entire chain beneath it, other modules included**. Never use it as a per-module rollback.
 
-```bash
-make downgrade   # back one revision; OR, to a target:
-uv run --project host alembic -c host/alembic.ini downgrade audit_log@base
-```
+To remove one module's schema:
 
-`audit_log@base` drops everything that module owns and leaves the others. Without the label, downgrading to a bare revision id walks linear history and rolls back unrelated modules' migrations sitting between.
+- If the module's revisions are the latest in the chain, downgrade to the `down_revision` of its first revision: `uv run --project host alembic -c host/alembic.ini downgrade <that down_revision id>`.
+- Otherwise write a dedicated migration that drops that module's tables.
 
-Subsequent revisions for the same module **don't** need a `branch_labels` — only the first; they inherit the branch.
+Subsequent revisions for the same module **don't** need a `branch_labels` — only the first; they chain off it as ordinary revisions.
 
 > Exception: the repo's bootstrap `initial_schema` revision bundles several core modules (users, permissions, settings, file_storage, feature_flags, background_tasks) into one unlabeled root migration. The per-module `branch_labels` convention applies to modules added **after** that bootstrap.
 
@@ -112,7 +110,7 @@ SM010/SM011 are **not** emitted at boot or by `make doctor`. They only surface w
 
 ## Pitfalls
 
-- **Skipped the branch label on the first revision.** `alembic downgrade <module>@base` then fails or silently rolls back unrelated revisions. Fix by editing the migration file before applying; if already deployed, write a no-op revision that adds the label retroactively.
+- **Treating `downgrade <module>@base` as a per-module rollback.** It rolls back every revision beneath the labelled one, other modules included. See the recipe under "Branch labels".
 - **Renamed a column.** Autogenerate emits `drop_column` + `add_column`, which loses data. Edit to `op.alter_column(..., new_column_name=...)` and write the matching `downgrade()`.
 - **Hand-edited operations with stubbed `downgrade()`.** Server defaults, CHECK constraints, expression indexes — Alembic can't always infer these. When you fill in `upgrade()`, fill in `downgrade()` too.
 - **Concurrent `make migrate` (`upgrade heads`) from multiple processes.** The `alembic_version` table isn't race-safe across all backends. Run upgrades from one place (a release pipeline step), not from the booting app.

{simple_module_cli-0.0.35 → simple_module_cli-0.0.36}/simple_module_cli/templates/host/client_app/app.tsx

@@ -1,6 +1,8 @@
 import { createInertiaApp, router } from '@inertiajs/react';
 import { configureI18n, updateI18n } from '@simple-module-py/i18n';
+import { formatTitle, setTitleAppName } from '@simple-module-py/ui/lib/app-title';
 import { startSpaLinkInterception } from '@simple-module-py/ui/lib/spa-links';
+import { initTheme } from '@simple-module-py/ui/lib/theme';
 import { createRoot } from 'react-dom/client';
 import { resolvePage } from './pages';
 
@@ -11,11 +13,19 @@ type I18nBlock = {
 };
 
 createInertiaApp({
+  title: (title) => formatTitle(title),
   resolve: async (name) => {
     return await resolvePage(name);
   },
   setup({ el, App, props }) {
-    const initial = (props.initialPage.props as { i18n?: I18nBlock }).i18n;
+    const pageProps = props.initialPage.props as {
+      i18n?: I18nBlock;
+      branding?: { appName?: string | null };
+    };
+    setTitleAppName(pageProps.branding?.appName);
+    // Before the first render, so a dark-theme user never sees a light frame.
+    initTheme();
+    const initial = pageProps.i18n;
     configureI18n({
       locale: initial?.locale ?? 'en',
       messages: initial?.messages ?? {},

{simple_module_cli-0.0.35 → simple_module_cli-0.0.36}/simple_module_cli/templates/host/migrations/env.py

@@ -27,12 +27,15 @@ logger = logging.getLogger("alembic.env")
 config = context.config
 
 if config.config_file_name is not None:
-    fileConfig(config.config_file_name)
+    # Not the default disable_existing_loggers=True: the setup wizard runs this
+    # in-process, and that default would silence every app logger until restart.
+    fileConfig(config.config_file_name, disable_existing_loggers=False)
 
 target_metadata = build_module_metadata()
 include_object = make_include_object(target_metadata)
-# Re-emit expression-based indexes (e.g. ``lower(email)``) that autogenerate
-# silently drops under SQLite. See ``make_process_revision_directives`` docstring.
+# Re-emit expression-based indexes that autogenerate drops under SQLite, rewrite
+# Boolean 0/1 server defaults to sa.false()/sa.true(), and warn that SQLite cannot
+# verify expression indexes (GH #342) — see make_process_revision_directives.
 process_revision_directives = make_process_revision_directives(target_metadata)
 
 

{simple_module_cli-0.0.35 → simple_module_cli-0.0.36}/simple_module_cli/templates/host/migrations/script.py.mako

@@ -8,6 +8,7 @@ Create Date: ${create_date}
 from collections.abc import Sequence
 
 import sqlalchemy as sa
+import sqlmodel  # noqa: F401  (autogenerate may emit sqlmodel types)
 from alembic import op
 ${imports if imports else ""}
 

{simple_module_cli-0.0.35 → simple_module_cli-0.0.36}/simple_module_cli/templates/host/templates/index.html

@@ -9,6 +9,7 @@
     {% set brand = branding_head(request) %}
     <title data-inertia="">{{ brand.app_name }}</title>
     {% if brand.theme_color %}<meta name="theme-color" content="{{ brand.theme_color }}" />{% endif %}
+    {% if brand.favicon_url %}<link rel="icon" href="{{ brand.favicon_url }}" />{% endif %}
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,400;0,9..40,500;0,9..40,600;0,9..40,700;1,9..40,400&family=Outfit:wght@400;500;600;700;800&display=swap" rel="stylesheet" />

{simple_module_cli-0.0.35 → simple_module_cli-0.0.36}/simple_module_cli/templates/module/tests/test___PACKAGE__.py.tpl

@@ -8,6 +8,7 @@ that package is installed). No conftest.py is required.
 from __future__ import annotations
 
 from {{PACKAGE_NAME}}.module import {{MODULE_NAME}}Module
+from simple_module_test import effective_route_paths
 
 
 class TestMeta:
@@ -22,6 +23,8 @@ class TestRoutes:
     async def test_app_boots_with_module(self, build_test_app):
         """Module registers cleanly into a minimal FastAPI host."""
         app = build_test_app({{MODULE_NAME}}Module)
-        paths = {getattr(r, "path", None) for r in app.routes}
+        # effective_route_paths reads the OpenAPI schema: FastAPI >= 0.137
+        # includes routers lazily, so ``app.routes`` no longer lists them.
+        paths = effective_route_paths(app)
         # The placeholder GET / endpoint lives under the route_prefix.
-        assert any(p and p.startswith("/api/{{MODULE_SLUG}}") for p in paths)
+        assert any(p.startswith("/api/{{MODULE_SLUG}}") for p in paths)

{simple_module_cli-0.0.35 → simple_module_cli-0.0.36}/tests/test_cli_new_regressions.py

@@ -230,6 +230,19 @@ def test_scaffold_adopts_every_locale_catalog_the_server_sends(tmp_path: Path) -
     )
 
 
+def test_sm_new_host_app_tsx_wires_theme_and_title(tmp_path: Path) -> None:
+    """Issue #429: the scaffolded app.tsx must init the theme and brand titles."""
+    from simple_module_cli.scaffolding import create_host
+
+    dest = tmp_path / "demo"
+    create_host(dest, name="demo-host", modules=["Dashboard", "Auth"])
+
+    app_tsx = (dest / "client_app" / "app.tsx").read_text()
+    assert "initTheme(" in app_tsx
+    assert "formatTitle" in app_tsx
+    assert "setTitleAppName" in app_tsx
+
+
 def test_sm_new_no_install_next_steps_include_initial_migration(tmp_path: Path) -> None:
     """Issue #135: ``host/migrations/versions/`` ships empty, so a fresh
     ``make migrate`` is a no-op. The printed next-steps must therefore

simple_module_cli-0.0.36/tests/test_module_css_subdir_sources.py

@@ -0,0 +1,47 @@
+"""uv's .venv/.gitignore hides subdirectories from Tailwind, so each gets its own @source (#419)."""
+
+from __future__ import annotations
+
+from simple_module_hosting.assets import ModuleAssets, render_modules_css
+
+
+def _wheel(tmp_path, **overrides):
+    defaults = {
+        "name": "Pagebuilder",
+        "package_name": "pagebuilder",
+        "package_dir": tmp_path / "pagebuilder",
+        "pages_dir": None,
+        "theme_css": None,
+        "styles_css": None,
+    }
+    return ModuleAssets(**{**defaults, **overrides})
+
+
+def test_each_subdirectory_with_sources_gets_its_own_line(tmp_path):
+    components = tmp_path / "pagebuilder" / "components"
+    (components / "widgets" / "quote").mkdir(parents=True)
+    (components / "Root.tsx").write_text("")
+    (components / "widgets" / "Gallery.tsx").write_text("")
+    (components / "widgets" / "quote" / "Quote.tsx").write_text("")
+    (components / "empty").mkdir()
+    (components / "__pycache__").mkdir()
+    (components / "__pycache__" / "x.ts").write_text("")
+
+    css = render_modules_css(
+        [_wheel(tmp_path, components_dir=components)], in_repo=lambda _p: False
+    )
+
+    lines = [line for line in css.splitlines() if line.startswith("@source")]
+    assert lines == [
+        f'@source "{components.as_posix()}/**/*.{{ts,tsx}}";',
+        f'@source "{(components / "widgets").as_posix()}/**/*.{{ts,tsx}}";',
+        f'@source "{(components / "widgets" / "quote").as_posix()}/**/*.{{ts,tsx}}";',
+    ]
+
+
+def test_in_repo_module_subdirectories_get_nothing(tmp_path):
+    components = tmp_path / "local" / "components"
+    (components / "widgets").mkdir(parents=True)
+    (components / "widgets" / "A.tsx").write_text("")
+    css = render_modules_css([_wheel(tmp_path, components_dir=components)], in_repo=lambda _p: True)
+    assert "@source" not in css

simple_module_cli-0.0.36/tests/test_scaffolded_host_setup_wizard.py

@@ -0,0 +1,57 @@
+"""A freshly scaffolded host gets a working /setup with no files of its own.
+
+GH #351: ``SetupMiddleware`` redirected every request to ``/setup`` while the
+route and page lived only in the framework repo's unpublished host, so a host
+made by ``smpy create-host`` answered ``/`` → ``/setup`` → 404. The wizard now
+ships with ``simple_module_hosting``: ``create_app`` mounts the route and
+``gen-pages`` registers the page, so the scaffold must stay free of both.
+"""
+
+from __future__ import annotations
+
+import json
+import re
+
+import pytest
+from simple_module_hosting.manifest import write_module_pages_manifest
+from simple_module_hosting.setup_wizard import PAGES_NAME, pages_dir
+
+pytestmark = pytest.mark.anyio
+
+
+async def test_scaffold_carries_no_setup_code_and_resolves_the_wizard(tmp_path) -> None:
+    from simple_module_cli.scaffolding import create_host
+
+    dest = tmp_path / "demo"
+    create_host(dest, name="demo-host", modules=[])
+    client_app = dest / "client_app"
+
+    # Nothing host-side: no route module, no page.
+    assert not (dest / "routes_setup.py").exists()
+    assert not list((client_app / "pages").rglob("Setup*"))
+    assert "setup" not in (dest / "main.py").read_text(encoding="utf-8").replace(
+        "setup_logging", ""
+    )
+
+    # What `smpy gen-pages` writes for this host, with no modules installed.
+    write_module_pages_manifest([], client_app, repo_root=dest)
+
+    manifest = json.loads((client_app / "modules.manifest.json").read_text(encoding="utf-8"))
+    assert manifest[PAGES_NAME] == pages_dir().as_posix()
+    assert (pages_dir() / "Wizard.tsx").is_file()
+
+    generated = (client_app / "modules.generated.ts").read_text(encoding="utf-8")
+    assert f'"{PAGES_NAME}": import.meta.glob' in generated
+
+    # The scaffold's resolver keys a module glob entry as `<name>/<path under pages/>`,
+    # which is how `inertia.render("Setup/Wizard")` finds the page.
+    pages_ts = (client_app / "pages.ts").read_text(encoding="utf-8")
+    assert "pages[`${moduleName}/${match[1]}`]" in pages_ts
+    match = re.search(r"/pages/(.+)\.tsx$", (pages_dir() / "Wizard.tsx").as_posix())
+    assert match and f"{PAGES_NAME}/{match.group(1)}" == "Setup/Wizard"
+
+    # Tailwind must scan the wheel's wizard, and Vite must be allowed to serve it.
+    css = (client_app / "modules.generated.css").read_text(encoding="utf-8")
+    assert f'@source "{pages_dir().as_posix()}/**/*.{{ts,tsx}}";' in css
+    assets = json.loads((client_app / "modules.assets.json").read_text(encoding="utf-8"))
+    assert assets[PAGES_NAME]["pages"] == pages_dir().as_posix()

{simple_module_cli-0.0.35 → simple_module_cli-0.0.36}/tests/test_scaffolding_module.py

@@ -30,6 +30,16 @@ class TestCreateModule:
         # pytest try to register `tests.conftest` as a plugin twice.
         assert not (dest / "tests" / "__init__.py").exists()
 
+    async def test_generated_test_uses_effective_route_paths(self, tmp_path):
+        """#431: app.routes hides lazily-included routers on FastAPI >= 0.137."""
+        from simple_module_cli.scaffolding import create_module
+
+        dest = tmp_path / "simple-module-my-feature"
+        create_module(dest, name="MyFeature")
+        text = (dest / "tests" / "test_my_feature.py").read_text()
+        assert "effective_route_paths(app)" in text
+        assert "app.routes" not in text.replace("``app.routes``", "")
+
     async def test_test_file_basename_is_unique_per_module(self, tmp_path):
         """Two modules in one workspace must not ship same-named test files.