create-caspian-app 1.6.4 → 1.8.0

package/dist/settings/build-static.py

@@ -46,6 +46,8 @@ sys.path.insert(0, str(ROOT))
 # Keep the app in non-production mode: dev generates an ephemeral session secret,
 # so the build does not require production secrets to be present.
 os.environ.setdefault("APP_ENV", "development")
+# Starting the app's lifespan for the export must not start the task scheduler.
+os.environ["CASPIAN_STATIC_EXPORT"] = "1"
 
 import httpx2  # noqa: E402  (the app's HTTP client; drives the ASGI app in-process)
 
@@ -96,8 +98,12 @@ def _fill_rule(fastapi_rule: str, params) -> str:
         params = {names[0]: params} if names else {}
     url = fastapi_rule
     for key, value in params.items():
+        if value is None or value == "":
+            # An optional catch-all (`[[...slug]]`) exports its base URL.
+            url = url.replace(f"/{{{key}:path}}", "")
+            continue
         url = url.replace(f"{{{key}:path}}", str(value)).replace(f"{{{key}}}", str(value))
-    return url
+    return url or "/"
 
 
 def _out_path_for(url_path: str) -> Path:
@@ -242,6 +248,19 @@ def build() -> int:
 
                     await export_one(client, url)
 
+                # sitemap.py / robots.py -> static/sitemap.xml, static/robots.txt
+                for url in getattr(main, "SEO_ROUTES", []):
+                    resp = await client.get(url)
+                    if resp.status_code != 200:
+                        skipped.append((url, f"returned HTTP {resp.status_code}"))
+                        continue
+                    out_file = OUT_DIR / url.lstrip("/")
+                    out_file.write_text(resp.text, encoding="utf-8")
+                    exported.append(url)
+                    if not os.getenv("APP_BASE_URL"):
+                        seo_warnings.append(url)
+
+    seo_warnings: list[str] = []
     asyncio.run(render_all())
 
     _copy_assets()
@@ -249,9 +268,20 @@ def build() -> int:
     # ---- Report ----
     print(f"\n{GREEN}Exported {len(exported)} page(s):{RESET}")
     for url in exported:
-        rel = _out_path_for(url).relative_to(ROOT)
+        target = (
+            OUT_DIR / url.lstrip("/")
+            if url in getattr(main, "SEO_ROUTES", [])
+            else _out_path_for(url)
+        )
+        rel = target.relative_to(ROOT)
         print(f"  {GREEN}OK{RESET}  {url}  ->  {rel}")
 
+    if seo_warnings:
+        print(
+            f"\n{YELLOW}Note: APP_BASE_URL is not set{RESET}{DIM} -- {', '.join(seo_warnings)} "
+            "contain http://testserver URLs. Set APP_BASE_URL to the public origin and rebuild.{RESET}"
+        )
+
     if rpc_warnings:
         print(f"\n{YELLOW}Note: these pages appear to use pp.rpc()/server actions{RESET}")
         print(f"{DIM}  (they render, but those interactions are dead without the backend):{RESET}")

package/dist/settings/check.py

@@ -24,9 +24,9 @@ import argparse
 import itertools
 import json
 import os
-import re
 import subprocess
 import sys
+import tempfile
 import threading
 import time
 from dataclasses import dataclass, field
@@ -277,51 +277,95 @@ def run_node_tests() -> Result:
     once per edit. A silent regression there is invisible from a green gate and
     costs a restart storm on the next feature branch.
 
-    Invoked as `node --import tsx`, not `npx tsx`: `npx` resolves to a `.cmd`
-    shim on Windows that `subprocess` cannot exec from a list argv, while `node`
-    is a real executable on every platform the gate runs on.
+    The tests are authored against Vitest (`vi.useFakeTimers`, `describe`/`it`
+    from `vitest`), so they must run under Vitest -- `node --test` cannot load
+    them and fails every file before a single assertion runs.
+
+    Invoked as `node node_modules/vitest/vitest.mjs`, not `npx vitest`: `npx`
+    resolves to a `.cmd` shim on Windows that `subprocess` cannot exec from a
+    list argv, while `node` is a real executable on every platform the gate
+    runs on. Failure locations come from Vitest's JSON reporter, written beside
+    the live default reporter, rather than from scraping human-readable output.
     """
     tests = sorted(
-        str(p.relative_to(PROJECT_ROOT)) for p in PROJECT_ROOT.glob("settings/*.test.ts")
+        p.relative_to(PROJECT_ROOT).as_posix() for p in PROJECT_ROOT.glob("settings/*.test.ts")
     )
     if not tests:
         return Result("node", ok=True, note="no TypeScript tests found")
 
-    proc = _run_streamed(["node", "--import", "tsx", "--test", *tests])
-    ok = proc.returncode == 0
-
-    issues: list[Issue] = []
-    if not ok:
-        # The spec reporter ends with a `failing tests:` block that pairs a
-        # `test at path:line:col` line with the failing test's name.
-        pending: tuple[str, int, int] | None = None
-        for raw in (proc.stdout + proc.stderr).splitlines():
-            line = raw.strip()
-            location = re.match(r"^test at (.+):(\d+):(\d+)$", line)
-            if location:
-                pending = (location.group(1), int(location.group(2)), int(location.group(3)))
-                continue
-            if pending and line.startswith("✖"):
-                name = re.sub(r"\s*\([\d.]+ms\)$", "", line[1:].strip())
-                path, line_no, column = pending
-                issues.append(
-                    Issue(
-                        path=path.replace("\\", "/"),
-                        line=line_no,
-                        column=column,
-                        tool="node",
-                        code="test",
-                        message=name or "test failed",
-                    )
-                )
-                pending = None
+    vitest = PROJECT_ROOT / "node_modules" / "vitest" / "vitest.mjs"
+    if not vitest.is_file():
+        return Result("node", ok=False, note="vitest is not installed; run `npm install`")
+
+    with tempfile.TemporaryDirectory(prefix="pp-vitest-") as tmp:
+        report_path = Path(tmp) / "report.json"
+        proc = _run_streamed(
+            [
+                "node",
+                str(vitest),
+                "run",
+                "--includeTaskLocation",
+                "--reporter=default",
+                "--reporter=json",
+                f"--outputFile.json={report_path}",
+                *tests,
+            ]
+        )
+        ok = proc.returncode == 0
+        issues = _vitest_issues(report_path) if not ok else []
 
     note = ""
     if not ok and not issues:
-        note = "node --test failed"
+        note = "vitest failed"
     return Result("node", ok=ok, issues=issues, note=note)
 
 
+def _vitest_issues(report_path: Path) -> list[Issue]:
+    """Turn Vitest's JSON report into one issue per failing test or file."""
+    try:
+        report = json.loads(report_path.read_text(encoding="utf-8"))
+    except OSError, ValueError:
+        return []
+
+    issues: list[Issue] = []
+    for file_result in report.get("testResults", []):
+        raw_path = str(file_result.get("name", ""))
+        try:
+            path = Path(raw_path).resolve().relative_to(PROJECT_ROOT).as_posix()
+        except ValueError:
+            path = raw_path.replace("\\", "/")
+
+        failed = [a for a in file_result.get("assertionResults", []) if a.get("status") == "failed"]
+        for assertion in failed:
+            location = assertion.get("location") or {}
+            issues.append(
+                Issue(
+                    path=path,
+                    line=int(location.get("line", 1)),
+                    column=int(location.get("column", 1)),
+                    tool="node",
+                    code="test",
+                    message=assertion.get("fullName") or "test failed",
+                )
+            )
+
+        # A file that fails to load (bad import, syntax error) has no failing
+        # assertions, only a file-level message.
+        if not failed and file_result.get("status") == "failed":
+            message = str(file_result.get("message") or "test file failed").strip()
+            issues.append(
+                Issue(
+                    path=path,
+                    line=1,
+                    column=1,
+                    tool="node",
+                    code="test",
+                    message=message.splitlines()[0] if message else "test file failed",
+                )
+            )
+    return issues
+
+
 def run_pytest() -> Result:
     # `-o addopts=` drops the ini `-q` so `-v` can print one live line per test
     # (the "which test is running" progress); `-rfE` keeps the `FAILED nodeid -

package/dist/src/app/error.py

@@ -1,95 +1,94 @@
-from typing import Optional
-from casp.component_decorator import html
-from casp.layout import Metadata
-
-
-metadata = Metadata(
-    title="Application Error",
-    description="An unexpected error occurred.",
-    extra={"robots": "noindex, nofollow"},
-)
-
-
-def page(error_message: str, error_trace: Optional[str] = None):
-    return html(r"""
-<main class="container py-10">
-  <div class="mx-auto max-w-2xl rounded bg-white p-6 shadow-sm">
-    <div class="flex items-start gap-4">
-      <svg class="h-10 w-10 text-red-600"
-           viewBox="0 0 24 24"
-           fill="none"
-           xmlns="http://www.w3.org/2000/svg"
-           aria-hidden="true">
-        <path d="M11.001 2a1 1 0 0 1 .998 0L21 7v9a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3V7l8.001-5z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
-        <path d="M12 8v4" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
-        <path d="M12 16h.01" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
-      </svg>
-
-      <div class="flex-1">
-        <h1 class="text-2xl font-semibold text-red-600">Something went wrong</h1>
-        <p class="mt-2 text-sm text-gray-600">
-          We're sorry—an unexpected error occurred. Try reloading or return to
-          the homepage.
-        </p>
-        <p class="mt-3 text-sm text-gray-700">{{ error_message }}</p>
-
-        <div class="mt-4 flex flex-wrap gap-2">
-          <a href="/"
-             class="inline-block rounded border border-gray-200 bg-gray-100 px-3 py-1.5 text-sm text-gray-800 hover:bg-gray-200">
-            Home
-          </a>
-          <button class="inline-block rounded bg-blue-600 px-3 py-1.5 text-sm text-white"
-                  onclick="window.location.reload()">Reload</button>
-          {% if error_trace %}
-            <button class="inline-block rounded border border-gray-200 bg-transparent px-3 py-1.5 text-sm text-black"
-                    onclick="setShowTrace(current => !current)">{showTrace ? "Hide details" : "Show details"}</button>
-          {% endif %}
-        </div>
-      </div>
-    </div>
-
-    {% if error_trace %}
-      <section class="mt-4" hidden="{!showTrace}">
-        <div class="mb-2 flex items-center justify-between">
-          <div class="text-xs text-gray-500">Error details (development only)</div>
-          <div class="flex gap-2">
-            <button class="rounded border bg-gray-100 px-2 py-1 text-xs text-black"
-                    onclick="copyTrace()">{traceCopied ? "Copied" : "Copy"}</button>
-            <button class="rounded border bg-gray-100 px-2 py-1 text-xs text-black"
-                    onclick="downloadTrace()">Download</button>
-          </div>
-        </div>
-        <pre pp-ref="{tracePre}"
-             class="overflow-auto rounded bg-gray-100 p-4 text-xs text-black">{{ error_trace }}</pre>
-      </section>
-    {% endif %}
-
-    <script>
-      const [showTrace, setShowTrace] = pp.state(false);
-      const [traceCopied, setTraceCopied] = pp.state(false);
-      const tracePre = pp.ref(null);
-
-      async function copyTrace() {
-        if (!tracePre.current) return;
-        await navigator.clipboard.writeText(tracePre.current.innerText);
-        setTraceCopied(true);
-        setTimeout(() => setTraceCopied(false), 2000);
-      }
-
-      function downloadTrace() {
-        if (!tracePre.current) return;
-        const blob = new Blob([tracePre.current.innerText], { type: "text/plain" });
-        const url = URL.createObjectURL(blob);
-        const link = document.createElement("a");
-        link.href = url;
-        link.download = "error_trace.txt";
-        link.click();
-        URL.revokeObjectURL(url);
-      }
-    </script>
-  </div>
-</main>
-""",
-        error_message=error_message,
-        error_trace=error_trace,
-    )
+from casp.component_decorator import html
+from casp.errors import ErrorInfo
+from casp.layout import Metadata
+
+
+metadata = Metadata(
+    title="Application Error",
+    description="An unexpected error occurred.",
+    extra={"robots": "noindex, nofollow"},
+)
+
+
+def page(error: ErrorInfo):
+    return html(r"""
+<main class="container py-10">
+  <div class="mx-auto max-w-2xl rounded bg-white p-6 shadow-sm">
+    <div class="flex items-start gap-4">
+      <svg class="h-10 w-10 text-red-600"
+           viewBox="0 0 24 24"
+           fill="none"
+           xmlns="http://www.w3.org/2000/svg"
+           aria-hidden="true">
+        <path d="M11.001 2a1 1 0 0 1 .998 0L21 7v9a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3V7l8.001-5z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+        <path d="M12 8v4" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+        <path d="M12 16h.01" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+      </svg>
+
+      <div class="flex-1">
+        <p class="text-xs font-medium uppercase tracking-wide text-gray-500">{{ error.status }} · {{ error.reason }}</p>
+        <h1 class="mt-1 text-2xl font-semibold text-red-600">Something went wrong</h1>
+        <p class="mt-3 text-sm text-gray-700">{{ error.message }}</p>
+        {% if error.request_id %}
+          <p class="mt-2 text-xs text-gray-500">Reference: {{ error.request_id }}</p>
+        {% endif %}
+
+        <div class="mt-4 flex flex-wrap gap-2">
+          <a href="/"
+             class="inline-block rounded border border-gray-200 bg-gray-100 px-3 py-1.5 text-sm text-gray-800 hover:bg-gray-200">
+            Home
+          </a>
+          <button class="inline-block rounded bg-blue-600 px-3 py-1.5 text-sm text-white"
+                  onclick="window.location.reload()">Reload</button>
+          {% if error.trace %}
+            <button class="inline-block rounded border border-gray-200 bg-transparent px-3 py-1.5 text-sm text-black"
+                    onclick="setShowTrace(current => !current)">{showTrace ? "Hide details" : "Show details"}</button>
+          {% endif %}
+        </div>
+      </div>
+    </div>
+
+    {% if error.trace %}
+      <section class="mt-4" hidden="{!showTrace}">
+        <div class="mb-2 flex items-center justify-between">
+          <div class="text-xs text-gray-500">Error details (development only)</div>
+          <div class="flex gap-2">
+            <button class="rounded border bg-gray-100 px-2 py-1 text-xs text-black"
+                    onclick="copyTrace()">{traceCopied ? "Copied" : "Copy"}</button>
+            <button class="rounded border bg-gray-100 px-2 py-1 text-xs text-black"
+                    onclick="downloadTrace()">Download</button>
+          </div>
+        </div>
+        <pre pp-ref="{tracePre}"
+             class="overflow-auto rounded bg-gray-100 p-4 text-xs text-black">{{ error.trace }}</pre>
+      </section>
+    {% endif %}
+
+    <script>
+      const [showTrace, setShowTrace] = pp.state(false);
+      const [traceCopied, setTraceCopied] = pp.state(false);
+      const tracePre = pp.ref(null);
+
+      async function copyTrace() {
+        if (!tracePre.current) return;
+        await navigator.clipboard.writeText(tracePre.current.innerText);
+        setTraceCopied(true);
+        setTimeout(() => setTraceCopied(false), 2000);
+      }
+
+      function downloadTrace() {
+        if (!tracePre.current) return;
+        const blob = new Blob([tracePre.current.innerText], { type: "text/plain" });
+        const url = URL.createObjectURL(blob);
+        const link = document.createElement("a");
+        link.href = url;
+        link.download = "error_trace.txt";
+        link.click();
+        URL.revokeObjectURL(url);
+      }
+    </script>
+  </div>
+</main>
+""",
+        error=error,
+    )

package/dist/src/app/layout.py

@@ -1,37 +1,33 @@
 from casp.component_decorator import html
+from casp.layout import Metadata
+
+# Root defaults, inherited by every page unless overridden. A page title can be
+# formatted for the whole app with `title_template="%s | My App"`.
+metadata = Metadata(description="Powered by Caspian Framework")
 
 
 def layout():
     return html(r"""
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ current_locale() }}">
 
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport"
         content="width=device-width, initial-scale=1.0" />
   <title>{{ metadata.title | default("Caspian App") }}</title>
-  <meta name="description"
-        content="{{ metadata.description | default('Powered by Caspian Framework') }}" />
   {#
-    Everything a page put in `Metadata(extra={...})` -- robots, canonical,
-    Open Graph, Twitter cards. The page pipeline already merges `extra` into
-    this dict; without this loop it collected those values and dropped them,
-    so `extra` silently did nothing. Open Graph is keyed by `property`, every
-    other vocabulary by `name`.
+    Description, canonical, robots, keywords, Open Graph, Twitter, and every
+    `Metadata(extra={...})` entry. Each tag carries `data-pp-meta` so SPA
+    navigation replaces the set for the next page.
   #}
-  {% for meta_name, meta_content in (metadata | default({})).items()
-     if meta_name not in ("title", "description") and meta_content %}
-  {% if meta_name.startswith("og:") %}
-  <meta property="{{ meta_name }}" content="{{ meta_content }}" />
-  {% else %}
-  <meta name="{{ meta_name }}" content="{{ meta_content }}" />
-  {% endif %}
-  {% endfor %}
+  {{ metadata_tags(metadata | default({})) }}
   <link rel="icon"
         href="/favicon.ico"
         type="image/x-icon"
         sizes="16x16" />
+  <link href="/css/styles.css" rel="stylesheet" />
+  <script type="module" src="/js/main.js"></script>
 </head>
 
 <body style="

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-caspian-app",
-  "version": "1.6.4",
+  "version": "1.8.0",
   "description": "Scaffold a new Caspian project (FastAPI-powered reactive Python framework).",
   "main": "dist/index.js",
   "type": "module",