simple-module-cli 0.0.37__tar.gz → 0.0.39__tar.gz

{simple_module_cli-0.0.37 → simple_module_cli-0.0.39}/.gitignore

@@ -7,8 +7,6 @@ build/
 .venv/
 *.egg
 
-# UV
-uv.lock
 
 # Node
 node_modules/
@@ -65,3 +63,4 @@ host/client_app/.playwright-cli/*
 .qa/
 .verify/
 /openapi.json
+qa-shots/

{simple_module_cli-0.0.37 → simple_module_cli-0.0.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: simple_module_cli
-Version: 0.0.37
+Version: 0.0.39
 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
@@ -19,8 +19,8 @@ Classifier: Topic :: Software Development :: Code Generators
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Typing :: Typed
 Requires-Python: >=3.12
-Requires-Dist: tomlkit>=0.13
-Requires-Dist: typer>=0.12
+Requires-Dist: tomlkit<0.16,>=0.13
+Requires-Dist: typer<0.28,>=0.12
 Description-Content-Type: text/markdown
 
 # simple_module_cli

{simple_module_cli-0.0.37 → simple_module_cli-0.0.39}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simple_module_cli"
-version = "0.0.37"
+version = "0.0.39"
 description = "Standalone scaffolder for the SimpleModule framework — `smpy new`, `smpy create-module`, plugin host."
 readme = "README.md"
 license = "MIT"
@@ -20,8 +20,8 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "typer>=0.12",
-    "tomlkit>=0.13",
+    "typer>=0.12,<0.28",
+    "tomlkit>=0.13,<0.16",
 ]
 
 [project.scripts]

simple_module_cli-0.0.39/simple_module_cli/_add_install.py

@@ -0,0 +1,59 @@
+"""Post-install steps and shared helpers for ``smpy add``."""
+
+from __future__ import annotations
+
+import subprocess
+from collections.abc import Callable
+from pathlib import Path
+
+import typer
+
+ExecRunner = Callable[[list[str], Path], int]
+
+
+_ENTRYPOINT_CHECK = (
+    "import sys\n"
+    "from importlib.metadata import distributions\n"
+    "target = sys.argv[1].replace('-', '_').lower()\n"
+    "for dist in distributions():\n"
+    "    if any(ep.group == 'simple_module' for ep in dist.entry_points):\n"
+    "        name = (dist.metadata['Name'] or '').replace('-', '_').lower()\n"
+    "        if name == target:\n"
+    "            sys.exit(0)\n"
+    "sys.exit(1)\n"
+)
+
+
+def _default_exec_runner(cmd: list[str], cwd: Path) -> int:
+    return subprocess.run(cmd, cwd=cwd, check=False).returncode
+
+
+def _fail(message: str) -> typer.Exit:
+    typer.echo(f"ERROR: {message}", err=True)
+    return typer.Exit(code=1)
+
+
+def post_install(
+    project_dir: Path,
+    dists: list[str],
+    models_dists: list[str],
+    exec_runner: ExecRunner,
+) -> None:
+    """uv sync → gen-pages → sync-js-deps → entry-point check → reminders."""
+    if exec_runner(["uv", "sync"], project_dir) != 0:
+        raise _fail("`uv sync` failed — pyproject was written; fix and re-run `uv sync`.")
+    if (project_dir / "client_app").is_dir():
+        exec_runner(["uv", "run", "smpy", "host", "gen-pages"], project_dir)
+        exec_runner(["uv", "run", "smpy", "host", "sync-js-deps"], project_dir)
+    for dist in dists:
+        code = exec_runner(["uv", "run", "python", "-c", _ENTRYPOINT_CHECK, dist], project_dir)
+        if code != 0:
+            raise _fail(
+                f"{dist} installed but exposes no [project.entry-points.simple_module] "
+                "entry point — it is not a SimpleModule module."
+            )
+    for dist in models_dists:
+        typer.echo(
+            f"{dist} ships database models — generate and apply the migration:\n"
+            f'  make migration msg="add {dist}"\n  make migrate'
+        )

simple_module_cli-0.0.39/simple_module_cli/_add_sources.py

@@ -0,0 +1,83 @@
+"""PyPI and local-path sources for ``smpy add``."""
+
+from __future__ import annotations
+
+import os
+from pathlib import Path
+
+import typer
+
+from simple_module_cli._add_install import ExecRunner, _fail, post_install
+from simple_module_cli.git_source import derive_range, scan_modules
+from simple_module_cli.pyproject_edit import (
+    save_pyproject,
+    write_dependency,
+    write_path_source,
+    write_workspace_source,
+)
+from simple_module_cli.uv_workspace import is_workspace_member
+
+
+def _add_pypi(doc, pyproject: Path, raw: str, no_sync: bool, exec_runner: ExecRunner) -> list[str]:
+    name = raw
+    for i, ch in enumerate(raw):
+        if ch in "<>=!~[; ":
+            name = raw[:i]
+            break
+    constraint = raw[len(name) :]
+    write_dependency(doc, name, constraint)
+    save_pyproject(pyproject, doc)
+    typer.echo(f"Added {name} (PyPI).")
+    if not no_sync:
+        post_install(pyproject.parent, [name], [], exec_runner)
+    return [name]
+
+
+def _resolve_local_path(project_dir: Path, spec_path: Path) -> tuple[Path, str]:
+    """Resolve a local-path spec to ``(directory, text written to pyproject)``.
+
+    A relative path is resolved against the ``--path`` project (the pyproject
+    being edited, which is what ``[tool.uv.sources]`` paths are relative to).
+    If nothing exists there but the path exists relative to the cwd, the cwd
+    one is used and the written path is re-expressed relative to the project.
+    """
+    if spec_path.is_absolute():
+        return spec_path, str(spec_path)
+    root = project_dir / spec_path
+    if not root.exists() and (Path.cwd() / spec_path).exists():
+        root = Path.cwd() / spec_path
+        return root, os.path.relpath(root.resolve(), project_dir.resolve())
+    return root, str(spec_path)
+
+
+def _add_path(
+    doc, pyproject: Path, spec_path: Path, no_sync: bool, exec_runner: ExecRunner
+) -> list[str]:
+    root, written = _resolve_local_path(pyproject.parent, spec_path)
+    found = [m for m in scan_modules(root) if m.subdirectory is None]
+    if not found:
+        raise _fail(
+            f"{root} has no [project.entry-points.simple_module] entry point at its root "
+            f"(relative paths resolve against the --path project, {pyproject.parent}, "
+            "falling back to the current directory)"
+        )
+    mod = found[0]
+    if is_workspace_member(pyproject.parent, root):
+        # uv refuses a path source for a workspace member; the scaffold's own
+        # sample module is wired the same way (unpinned + workspace = true).
+        write_dependency(doc, mod.dist_name, "")
+        write_workspace_source(doc, mod.dist_name)
+        typer.echo(f"Added {mod.dist_name} (uv workspace member {written}).")
+    else:
+        write_dependency(doc, mod.dist_name, derive_range(mod.version))
+        write_path_source(doc, mod.dist_name, path=written)
+        typer.echo(f"Added {mod.dist_name} (editable path {written}).")
+    save_pyproject(pyproject, doc)
+    if not no_sync:
+        post_install(
+            pyproject.parent,
+            [mod.dist_name],
+            [mod.dist_name] if mod.ships_models else [],
+            exec_runner,
+        )
+    return [mod.dist_name]

simple_module_cli-0.0.39/simple_module_cli/_app_project_manifests.py

@@ -0,0 +1,94 @@
+"""Dependency pins, ``.env`` DB URLs and ``pyproject.toml`` rewriting for ``smpy new``."""
+
+from __future__ import annotations
+
+from collections.abc import Sequence
+
+from simple_module_cli.scaffolding import resolve_framework_version
+
+_FRAMEWORK_VERSION = resolve_framework_version()
+
+# Pin ``simple_module_cli`` as a dev dep so ``uv run smpy`` resolves to the
+# project venv. The global ``uv tool`` install runs in its own isolated venv
+# that can't see the project's plugin entry points (issue #134). The lint /
+# test tooling (ruff, ty, pytest-*) backs the generated `make lint`/`make
+# test` targets so a fresh app can run its own quality gates.
+_APP_PY_DEV_DEPS = [
+    f"simple_module_test=={_FRAMEWORK_VERSION}",
+    f"simple_module_cli=={_FRAMEWORK_VERSION}",
+    "pytest>=8.0",
+    "pytest-asyncio>=0.24",
+    "pytest-playwright>=0.7.2",
+    # Floor: unpinned, uv backtracks playwright to 1.18 (GH #445).
+    "playwright>=1.45",
+    "ruff>=0.8",
+    "ty>=0.0.29",
+]
+
+_APP_NPM_DEPS = {
+    "@simple-module-py/ui": _FRAMEWORK_VERSION,
+    "@simple-module-py/i18n": _FRAMEWORK_VERSION,
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@inertiajs/react": "^3.7.0",
+}
+# Flat mode has no npm workspaces, so `client_app/package.json` is never
+# installed — the root package.json seeded from these two dicts is the only
+# manifest npm reads. It must therefore cover everything client_app needs to
+# build, not just the framework pins: `vite.config.ts` imports
+# `@tailwindcss/vite`, and `tsc` needs the @types packages. Keep this in step
+# with templates/host/client_app/package.json.tpl.
+_APP_NPM_DEV_DEPS = {
+    "@simple-module-py/tsconfig": _FRAMEWORK_VERSION,
+    "@tailwindcss/vite": "^4.0.0",
+    "@types/node": "^26.5.0",
+    "@types/react": "^19.0.0",
+    "@types/react-dom": "^19.0.0",
+    "@vitejs/plugin-react": "^6.1.1",
+    "tailwindcss": "^4.0.0",
+    "typescript": "^7.0.2",
+    "vite": "^8.2.2",
+}
+
+
+def _db_url(db: str, db_name: str, *, flat: bool, password: str = "<POSTGRES_PASSWORD>") -> str:
+    if db == "postgres":
+        return f"postgresql+asyncpg://postgres:{password}@localhost:5432/{db_name}"
+    # Workspace mode keeps the SQLite file next to host/'s alembic.ini so
+    # `cd host && uvicorn` and `cd host && alembic` resolve the same path.
+    return "sqlite+aiosqlite:///./app.db" if flat else "sqlite+aiosqlite:///./host/app.db"
+
+
+def _rewrite_pyproject(
+    text: str,
+    deps: list[str],
+    dev_deps: list[str],
+    *,
+    sources: Sequence[str] = (),
+    project_name: str | None = None,
+) -> str:
+    """Replace deps in a host ``pyproject.toml`` and pin workspace sources.
+
+    ``sources`` lists ``simple_module_*`` packages that should resolve from
+    the uv workspace (``modules/*``) instead of PyPI. Emits a
+    ``[tool.uv.sources]`` block per entry. Empty in flat mode.
+
+    ``project_name`` overrides ``[project].name`` — set in workspace mode
+    so the host's package name differs from the workspace root's.
+    """
+    import tomlkit
+
+    doc = tomlkit.parse(text)
+    project = doc.setdefault("project", tomlkit.table())
+    if project_name is not None:
+        project["name"] = project_name
+    project["dependencies"] = list(deps)
+    groups = doc.setdefault("dependency-groups", tomlkit.table())
+    groups["dev"] = list(dev_deps)
+    if sources:
+        tool = doc.setdefault("tool", tomlkit.table())
+        uv_table = tool.setdefault("uv", tomlkit.table())
+        uv_sources = uv_table.setdefault("sources", tomlkit.table())
+        for src in sources:
+            uv_sources[src] = {"workspace": True}
+    return tomlkit.dumps(doc)

{simple_module_cli-0.0.37 → simple_module_cli-0.0.39}/simple_module_cli/add_cmd.py

@@ -11,15 +11,19 @@ sync-js-deps`` → entry-point verification, unless ``--no-sync``.
 
 from __future__ import annotations
 
-import os
-import subprocess
 import tempfile
-from collections.abc import Callable
 from pathlib import Path
 from typing import Annotated
 
 import typer
 
+from simple_module_cli._add_install import (
+    ExecRunner,
+    _default_exec_runner,
+    _fail,
+    post_install,
+)
+from simple_module_cli._add_sources import _add_path, _add_pypi
 from simple_module_cli.git_source import (
     FoundModule,
     SpecError,
@@ -35,41 +39,15 @@ from simple_module_cli.pyproject_edit import (
     save_pyproject,
     write_dependency,
     write_git_source,
-    write_path_source,
-    write_workspace_source,
 )
-from simple_module_cli.uv_workspace import is_workspace_member
 
 __all__ = ["ExecRunner", "add_module", "post_install", "run_add"]
 
-ExecRunner = Callable[[list[str], Path], int]
-
 _SECURITY_NOTICE = (
     "note: this installs and runs code from a URL you chose — review the "
     "repository before booting the host."
 )
 
-_ENTRYPOINT_CHECK = (
-    "import sys\n"
-    "from importlib.metadata import distributions\n"
-    "target = sys.argv[1].replace('-', '_').lower()\n"
-    "for dist in distributions():\n"
-    "    if any(ep.group == 'simple_module' for ep in dist.entry_points):\n"
-    "        name = (dist.metadata['Name'] or '').replace('-', '_').lower()\n"
-    "        if name == target:\n"
-    "            sys.exit(0)\n"
-    "sys.exit(1)\n"
-)
-
-
-def _default_exec_runner(cmd: list[str], cwd: Path) -> int:
-    return subprocess.run(cmd, cwd=cwd, check=False).returncode
-
-
-def _fail(message: str) -> typer.Exit:
-    typer.echo(f"ERROR: {message}", err=True)
-    return typer.Exit(code=1)
-
 
 def _choose(
     found: list[FoundModule],
@@ -99,97 +77,6 @@ def _choose(
     ]
 
 
-def post_install(
-    project_dir: Path,
-    dists: list[str],
-    models_dists: list[str],
-    exec_runner: ExecRunner,
-) -> None:
-    """uv sync → gen-pages → sync-js-deps → entry-point check → reminders."""
-    if exec_runner(["uv", "sync"], project_dir) != 0:
-        raise _fail("`uv sync` failed — pyproject was written; fix and re-run `uv sync`.")
-    if (project_dir / "client_app").is_dir():
-        exec_runner(["uv", "run", "smpy", "host", "gen-pages"], project_dir)
-        exec_runner(["uv", "run", "smpy", "host", "sync-js-deps"], project_dir)
-    for dist in dists:
-        code = exec_runner(["uv", "run", "python", "-c", _ENTRYPOINT_CHECK, dist], project_dir)
-        if code != 0:
-            raise _fail(
-                f"{dist} installed but exposes no [project.entry-points.simple_module] "
-                "entry point — it is not a SimpleModule module."
-            )
-    for dist in models_dists:
-        typer.echo(
-            f"{dist} ships database models — generate and apply the migration:\n"
-            f'  make migration msg="add {dist}"\n  make migrate'
-        )
-
-
-def _add_pypi(doc, pyproject: Path, raw: str, no_sync: bool, exec_runner: ExecRunner) -> list[str]:
-    name = raw
-    for i, ch in enumerate(raw):
-        if ch in "<>=!~[; ":
-            name = raw[:i]
-            break
-    constraint = raw[len(name) :]
-    write_dependency(doc, name, constraint)
-    save_pyproject(pyproject, doc)
-    typer.echo(f"Added {name} (PyPI).")
-    if not no_sync:
-        post_install(pyproject.parent, [name], [], exec_runner)
-    return [name]
-
-
-def _resolve_local_path(project_dir: Path, spec_path: Path) -> tuple[Path, str]:
-    """Resolve a local-path spec to ``(directory, text written to pyproject)``.
-
-    A relative path is resolved against the ``--path`` project (the pyproject
-    being edited, which is what ``[tool.uv.sources]`` paths are relative to).
-    If nothing exists there but the path exists relative to the cwd, the cwd
-    one is used and the written path is re-expressed relative to the project.
-    """
-    if spec_path.is_absolute():
-        return spec_path, str(spec_path)
-    root = project_dir / spec_path
-    if not root.exists() and (Path.cwd() / spec_path).exists():
-        root = Path.cwd() / spec_path
-        return root, os.path.relpath(root.resolve(), project_dir.resolve())
-    return root, str(spec_path)
-
-
-def _add_path(
-    doc, pyproject: Path, spec_path: Path, no_sync: bool, exec_runner: ExecRunner
-) -> list[str]:
-    root, written = _resolve_local_path(pyproject.parent, spec_path)
-    found = [m for m in scan_modules(root) if m.subdirectory is None]
-    if not found:
-        raise _fail(
-            f"{root} has no [project.entry-points.simple_module] entry point at its root "
-            f"(relative paths resolve against the --path project, {pyproject.parent}, "
-            "falling back to the current directory)"
-        )
-    mod = found[0]
-    if is_workspace_member(pyproject.parent, root):
-        # uv refuses a path source for a workspace member; the scaffold's own
-        # sample module is wired the same way (unpinned + workspace = true).
-        write_dependency(doc, mod.dist_name, "")
-        write_workspace_source(doc, mod.dist_name)
-        typer.echo(f"Added {mod.dist_name} (uv workspace member {written}).")
-    else:
-        write_dependency(doc, mod.dist_name, derive_range(mod.version))
-        write_path_source(doc, mod.dist_name, path=written)
-        typer.echo(f"Added {mod.dist_name} (editable path {written}).")
-    save_pyproject(pyproject, doc)
-    if not no_sync:
-        post_install(
-            pyproject.parent,
-            [mod.dist_name],
-            [mod.dist_name] if mod.ships_models else [],
-            exec_runner,
-        )
-    return [mod.dist_name]
-
-
 def run_add(
     spec: str,
     *,

{simple_module_cli-0.0.37 → simple_module_cli-0.0.39}/simple_module_cli/app_project.py

@@ -19,6 +19,14 @@ from collections.abc import Sequence
 from pathlib import Path
 from typing import Any
 
+from simple_module_cli._app_project_manifests import (
+    _APP_NPM_DEPS,
+    _APP_NPM_DEV_DEPS,
+    _APP_PY_DEV_DEPS,
+    _FRAMEWORK_VERSION,
+    _db_url,
+    _rewrite_pyproject,
+)
 from simple_module_cli._env import set_env_key
 from simple_module_cli._local_env import (
     add_postgres_password_placeholder,
@@ -35,7 +43,6 @@ from simple_module_cli.scaffolding import (
     create_host,
     create_module,
     create_workspace,
-    resolve_framework_version,
 )
 
 __all__ = ["create_app_project"]
@@ -43,51 +50,6 @@ __all__ = ["create_app_project"]
 _SAMPLE_MODULE_NAME = "hello"
 _SAMPLE_MODULE_PKG = _module_to_pypi_name(_SAMPLE_MODULE_NAME)
 
-
-_FRAMEWORK_VERSION = resolve_framework_version()
-
-# Pin ``simple_module_cli`` as a dev dep so ``uv run smpy`` resolves to the
-# project venv. The global ``uv tool`` install runs in its own isolated venv
-# that can't see the project's plugin entry points (issue #134). The lint /
-# test tooling (ruff, ty, pytest-*) backs the generated `make lint`/`make
-# test` targets so a fresh app can run its own quality gates.
-_APP_PY_DEV_DEPS = [
-    f"simple_module_test=={_FRAMEWORK_VERSION}",
-    f"simple_module_cli=={_FRAMEWORK_VERSION}",
-    "pytest>=8.0",
-    "pytest-asyncio>=0.24",
-    "pytest-playwright>=0.7.2",
-    # Floor: unpinned, uv backtracks playwright to 1.18 (GH #445).
-    "playwright>=1.45",
-    "ruff>=0.8",
-    "ty>=0.0.29",
-]
-
-_APP_NPM_DEPS = {
-    "@simple-module-py/ui": _FRAMEWORK_VERSION,
-    "@simple-module-py/i18n": _FRAMEWORK_VERSION,
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@inertiajs/react": "^3.7.0",
-}
-# Flat mode has no npm workspaces, so `client_app/package.json` is never
-# installed — the root package.json seeded from these two dicts is the only
-# manifest npm reads. It must therefore cover everything client_app needs to
-# build, not just the framework pins: `vite.config.ts` imports
-# `@tailwindcss/vite`, and `tsc` needs the @types packages. Keep this in step
-# with templates/host/client_app/package.json.tpl.
-_APP_NPM_DEV_DEPS = {
-    "@simple-module-py/tsconfig": _FRAMEWORK_VERSION,
-    "@tailwindcss/vite": "^4.0.0",
-    "@types/node": "^26.5.0",
-    "@types/react": "^19.0.0",
-    "@types/react-dom": "^19.0.0",
-    "@vitejs/plugin-react": "^6.1.1",
-    "tailwindcss": "^4.0.0",
-    "typescript": "^7.0.2",
-    "vite": "^8.2.2",
-}
-
 # Files the host template ships that the workspace template re-emits at
 # the project root. Host copies are stripped in workspace mode.
 _HOST_FILES_OWNED_BY_WORKSPACE = (
@@ -255,46 +217,3 @@ def _seed_static_dist_placeholder(static_dist: Path) -> None:
     # an empty placeholder keeps `uv sync` from failing before vite build runs.
     static_dist.mkdir(parents=True, exist_ok=True)
     (static_dist / ".gitkeep").touch()
-
-
-def _db_url(db: str, db_name: str, *, flat: bool, password: str = "<POSTGRES_PASSWORD>") -> str:
-    if db == "postgres":
-        return f"postgresql+asyncpg://postgres:{password}@localhost:5432/{db_name}"
-    # Workspace mode keeps the SQLite file next to host/'s alembic.ini so
-    # `cd host && uvicorn` and `cd host && alembic` resolve the same path.
-    return "sqlite+aiosqlite:///./app.db" if flat else "sqlite+aiosqlite:///./host/app.db"
-
-
-def _rewrite_pyproject(
-    text: str,
-    deps: list[str],
-    dev_deps: list[str],
-    *,
-    sources: Sequence[str] = (),
-    project_name: str | None = None,
-) -> str:
-    """Replace deps in a host ``pyproject.toml`` and pin workspace sources.
-
-    ``sources`` lists ``simple_module_*`` packages that should resolve from
-    the uv workspace (``modules/*``) instead of PyPI. Emits a
-    ``[tool.uv.sources]`` block per entry. Empty in flat mode.
-
-    ``project_name`` overrides ``[project].name`` — set in workspace mode
-    so the host's package name differs from the workspace root's.
-    """
-    import tomlkit
-
-    doc = tomlkit.parse(text)
-    project = doc.setdefault("project", tomlkit.table())
-    if project_name is not None:
-        project["name"] = project_name
-    project["dependencies"] = list(deps)
-    groups = doc.setdefault("dependency-groups", tomlkit.table())
-    groups["dev"] = list(dev_deps)
-    if sources:
-        tool = doc.setdefault("tool", tomlkit.table())
-        uv_table = tool.setdefault("uv", tomlkit.table())
-        uv_sources = uv_table.setdefault("sources", tomlkit.table())
-        for src in sources:
-            uv_sources[src] = {"workspace": True}
-    return tomlkit.dumps(doc)

{simple_module_cli-0.0.37 → simple_module_cli-0.0.39}/simple_module_cli/case.py

@@ -13,6 +13,7 @@ __all__ = [
     "InvalidScaffoldNameError",
     "to_kebab_case",
     "to_pascal_case",
+    "to_singular",
     "to_snake_case",
     "validate_scaffold_name",
 ]
@@ -60,6 +61,31 @@ def to_pascal_case(name: str) -> str:
     return "".join(part.capitalize() for part in snake.split("_") if part)
 
 
+_UNCOUNTABLE = frozenset({"news", "status", "series", "species", "data"})
+_ES_SUFFIXES = ("uses", "sses", "xes", "ches", "shes")
+
+
+def to_singular(snake: str) -> str:
+    """Conservative singularization of a snake_case name: 'orders' -> 'order'.
+
+    Only the last ``_`` segment is inflected. Handles ``ies`` -> ``y`` and
+    ``uses``/``xes``/``ches``/``shes``/``sses`` -> drop ``es``; leaves ``ss``/``us``/``is``
+    endings and a few uncountables alone; otherwise drops one trailing ``s``.
+    The author renames the sample entity when this guesses wrong.
+    """
+    head, sep, word = snake.rpartition("_")
+    if word in _UNCOUNTABLE or not word.endswith("s") or word.endswith(("ss", "us", "is")):
+        return snake
+    # Irregular -ie plurals ("movies", "cookies") are not handled: "ies" -> "y".
+    if word.endswith("ies") and len(word) > 3:
+        word = word[:-3] + "y"
+    elif word.endswith(_ES_SUFFIXES):
+        word = word[:-2]
+    else:
+        word = word[:-1]
+    return head + sep + word
+
+
 _VALID_NAME_RE = re.compile(r"^[a-z][a-z0-9]*(?:[_-][a-z0-9]+)*$")
 
 

{simple_module_cli-0.0.37 → simple_module_cli-0.0.39}/simple_module_cli/catalog.py

@@ -29,6 +29,7 @@ class ModuleEntry:
 
 CATALOG: dict[str, ModuleEntry] = {
     "auth": ModuleEntry("auth", "simple_module_auth", "Auth"),
+    # ``requires`` covers each module's ``depends_on`` (pinned by a test).
     "users": ModuleEntry("users", "simple_module_users", "Users", requires=("auth",)),
     "permissions": ModuleEntry(
         "permissions",
@@ -36,12 +37,7 @@ CATALOG: dict[str, ModuleEntry] = {
         "Permissions",
         requires=("auth", "users"),
     ),
-    "dashboard": ModuleEntry(
-        "dashboard",
-        "simple_module_dashboard",
-        "Dashboard",
-        requires=("users",),
-    ),
+    "dashboard": ModuleEntry("dashboard", "simple_module_dashboard", "Dashboard"),
     "settings": ModuleEntry("settings", "simple_module_settings", "Settings"),
     "feature_flags": ModuleEntry("feature_flags", "simple_module_feature_flags", "Feature Flags"),
     "file_storage": ModuleEntry(
@@ -54,7 +50,7 @@ CATALOG: dict[str, ModuleEntry] = {
         "background_tasks",
         "simple_module_background_tasks",
         "Background Tasks",
-        requires=("users",),
+        requires=("settings",),
         recipe="background_tasks",
     ),
     "site_lock": ModuleEntry(

{simple_module_cli-0.0.37 → simple_module_cli-0.0.39}/simple_module_cli/cli.py

@@ -22,6 +22,7 @@ import typer
 
 from simple_module_cli.add_cmd import add_module, run_add
 from simple_module_cli.case import to_kebab_case
+from simple_module_cli.docker_cmd import docker_app
 from simple_module_cli.module_cmd import module_app
 from simple_module_cli.new import new_project
 from simple_module_cli.openapi_cmd import openapi_app
@@ -44,6 +45,7 @@ app.command("new")(new_project)
 app.command("add")(add_module)
 app.command("update")(update_modules)
 app.command("package-update")(package_update)
+app.add_typer(docker_app, name="docker")
 app.add_typer(skills_app, name="skills")
 app.add_typer(module_app, name="module")
 app.add_typer(openapi_app, name="openapi")
@@ -182,6 +184,11 @@ def create_module(
     typer.echo("  npm install")
     typer.echo("  npm run typecheck")
     typer.echo("  uv run smpy module verify")
+    typer.echo(
+        "\nThe pages ship sample API types (pages/api.generated.ts). Once the host serves "
+        "the module, refresh them after any endpoint change:\n"
+        f"  uv run smpy openapi gen-types --module {package}"
+    )
 
 
 discover_and_mount(app)