@stratum-hq/create 0.4.0 → 0.5.0

package/src/generators/readme.ts

@@ -1,7 +1,6 @@
 import type { StackPreset } from "../matrix.js";
 
 export function generatePresetReadme(projectName: string, preset: StackPreset): string {
-  const devCmd = getDevCommand(preset);
   const dbStartCmd = getDbStartInfo(preset);
   const dbSetupNote = getDbSetupNote(preset);
 
@@ -37,7 +36,7 @@ ${dbSetupNote}
 ### 4. Run the app
 
 \`\`\`bash
-${devCmd}
+npm run dev
 \`\`\`
 
 ## Multi-tenancy
@@ -50,13 +49,6 @@ See the [Stratum docs](https://github.com/stratum-hq/Stratum) for full reference
 `;
 }
 
-function getDevCommand(preset: StackPreset): string {
-  if (preset.framework === "nextjs") return "npm run dev";
-  if (preset.framework === "nestjs") return "node --env-file=.env src/main.ts";
-  if (preset.framework === "none") return "node --env-file=.env src/index.ts";
-  return "node --env-file=.env src/index.ts";
-}
-
 function getDbStartInfo(preset: StackPreset): string {
   switch (preset.database) {
     case "postgres":
@@ -95,7 +87,7 @@ function getStrategyDescription(strategy: string): string {
   switch (strategy) {
     case "rls":
       return `- **Row-Level Security** -- PostgreSQL RLS policies filter rows by tenant automatically
-- Each query sets \`app.current_tenant\` and RLS enforces isolation
+- Each query sets \`app.current_tenant_id\` and RLS enforces isolation
 - All tenants share one database and schema`;
     case "schema":
       return `- **Schema-per-tenant** -- each tenant gets a dedicated PostgreSQL schema

package/src/generators/tsconfig.ts

@@ -0,0 +1,48 @@
+import type { Framework, StackPreset } from "../matrix.js";
+
+/**
+ * Return the source files that a preset writes at the project root and that code in `src/` imports.
+ *
+ * @param preset - The stack preset of the generated project.
+ */
+export function rootSources(preset: StackPreset): string[] {
+  // The knex CLI reads knexfile.ts from the project root, and src/stratum-knex.ts imports it.
+  return preset.orm === "knex" ? ["knexfile.ts"] : [];
+}
+
+/**
+ * Return the tsconfig.json content for a generated project.
+ *
+ * @param framework - The framework of the project. It adds the compiler options that the framework needs.
+ * @param extraSources - Source files at the project root that code in `src/` imports.
+ *   When there are any, tsc compiles from the project root, so the output of `src/` goes to `dist/src/`.
+ */
+export function generateTsconfig(framework: Framework, extraSources: string[] = []): string {
+  // tsc rejects an imported file outside rootDir with TS6059.
+  const rootDir = extraSources.length > 0 ? "." : "src";
+  return JSON.stringify(
+    {
+      compilerOptions: {
+        target: "ESNext",
+        module: "NodeNext",
+        moduleResolution: "NodeNext",
+        strict: true,
+        outDir: "dist",
+        rootDir,
+        declaration: true,
+        skipLibCheck: true,
+        esModuleInterop: true,
+        ...(framework === "nestjs"
+          ? { experimentalDecorators: true, emitDecoratorMetadata: true }
+          : {}),
+        ...(framework === "nextjs"
+          ? { jsx: "preserve", plugins: [{ name: "next" }] }
+          : {}),
+      },
+      include: ["src", ...extraSources],
+      exclude: ["node_modules", "dist"],
+    },
+    null,
+    2,
+  );
+}

package/src/index.ts

@@ -1,13 +1,13 @@
-#!/usr/bin/env node
-
 import * as fs from "fs";
 import * as path from "path";
 import crypto from "node:crypto";
 import { execSync } from "child_process";
-import { fileURLToPath } from "url";
 import { parsePresetString, isValidPreset } from "./matrix.js";
 import { createPresetProject } from "./preset-project.js";
+import { STRATUM_RANGES } from "./stratum-versions.js";
 import { postgresAppRole, postgresAppRoleSql, POSTGRES_APP_PASSWORD } from "./generators/init-sql.js";
+import { generateTsconfig } from "./generators/tsconfig.js";
+import { nextjsTenantMiddleware } from "./generators/middleware.js";
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
@@ -123,11 +123,13 @@ function generatePackageJson(projectName: string, template: Template): string {
       "react-dom": "^19.0.0",
       "@types/react": "^19.0.0",
       "@types/react-dom": "^19.0.0",
+      // The middleware verifies the tenant JWT with jose.
+      jose: "^6.2.12",
     },
   };
 
   const deps = {
-    "@stratum-hq/lib": "^0.2.0",
+    "@stratum-hq/lib": STRATUM_RANGES["@stratum-hq/lib"],
     pg: "^8.11.0",
     ...frameworkDeps[template],
   };
@@ -141,11 +143,13 @@ function generatePackageJson(projectName: string, template: Template): string {
       scripts:
         template === "nextjs"
           ? { dev: "next dev", build: "next build", start: "next start" }
-          : { dev: "node --watch src/index.js", build: "tsc", start: "node dist/index.js" },
+          : // Node 20 cannot run a .ts file, so dev runs the source through tsx.
+            { dev: "tsx watch --env-file=.env src/index.ts", build: "tsc", start: "node dist/index.js" },
       dependencies: deps,
       devDependencies: {
         typescript: "^5.3.0",
         "@types/node": "^20.11.0",
+        ...(template === "nextjs" ? {} : { tsx: "^4.7.0", "@types/pg": "^8.11.0" }),
       },
       engines: {
         node: ">=20.0.0",
@@ -300,7 +304,7 @@ export default function Home() {
       <p>Multi-tenant app powered by Stratum.</p>
       <ul>
         <li>Configure tenants via the Stratum control plane</li>
-        <li>Tenant is resolved from the subdomain in <code>middleware.ts</code></li>
+        <li>The tenant comes from a verified JWT in <code>middleware.ts</code></li>
         <li>Use <code>@stratum-hq/lib</code> for tenant resolution</li>
       </ul>
     </main>
@@ -309,37 +313,7 @@ export default function Home() {
 `;
 }
 
-function generateNextjsMiddleware(): string {
-  return `// middleware.ts — tenant resolution via subdomain
-import { NextRequest, NextResponse } from "next/server";
-
-export function middleware(request: NextRequest) {
-  // The tenant comes from the subdomain the request was routed to. Any
-  // x-tenant-id the client sent is removed first, so server code that reads
-  // x-tenant-id only ever sees the value set here. Once you add
-  // authentication, check that the signed-in user belongs to this tenant.
-  const hostname = request.headers.get("host") || "";
-  const tenantId = hostname.split(".")[0];
-
-  const requestHeaders = new Headers(request.headers);
-  requestHeaders.delete("x-tenant-id");
-  if (tenantId && tenantId !== "localhost" && tenantId !== "www") {
-    requestHeaders.set("x-tenant-id", tenantId);
-  }
-
-  return NextResponse.next({ request: { headers: requestHeaders } });
-}
-
-export const config = {
-  matcher: ["/((?!_next/static|_next/image|favicon.ico).*)"],
-};
-`;
-}
-
 function generateReadme(projectName: string, template: Template): string {
-  const devCmd =
-    template === "nextjs" ? "npm run dev" : "node --env-file=.env src/index.ts";
-
   return `# ${projectName}
 
 A multi-tenant application built with [Stratum](https://github.com/stratum-hq/Stratum).
@@ -368,7 +342,7 @@ npm install
 ### 4. Run the app
 
 \`\`\`bash
-${devCmd}
+npm run dev
 \`\`\`
 
 ## Project structure
@@ -379,14 +353,14 @@ ${projectName}/
 ├── docker-compose.yml
 ├── init.sql          # DB extensions (uuid-ossp, ltree)
 ├── .env.example
-└── package.json
+${template === "nextjs" ? "" : "├── tsconfig.json\n"}└── package.json
 \`\`\`
 
 ## Multi-tenancy
 
 This project uses Stratum for hierarchical multi-tenancy:
 
-- **Tenant resolution** — via subdomain (see \`middleware.ts\`); bind it to the signed-in user once you add authentication
+- **Tenant resolution** — from the \`tenant_id\` claim of a bearer token verified with \`JWT_SECRET\` (see \`middleware.ts\`); the subdomain is only a display slug
 - **Config inheritance** — settings flow down the tenant tree with override support
 - **Permission ABAC** — role-based permissions with tenant-scoped enforcement
 
@@ -422,11 +396,13 @@ export function createProject(
   // Server starter file
   if (template === "express") {
     writeFile(path.join(targetDir, "src", "index.ts"), generateExpressServer(projectName));
+    writeFile(path.join(targetDir, "tsconfig.json"), generateTsconfig(template));
   } else if (template === "fastify") {
     writeFile(path.join(targetDir, "src", "index.ts"), generateFastifyServer(projectName));
+    writeFile(path.join(targetDir, "tsconfig.json"), generateTsconfig(template));
   } else if (template === "nextjs") {
     writeFile(path.join(targetDir, "src", "app", "page.tsx"), generateNextjsPage(projectName));
-    writeFile(path.join(targetDir, "middleware.ts"), generateNextjsMiddleware());
+    writeFile(path.join(targetDir, "middleware.ts"), nextjsTenantMiddleware());
   }
 
   // README
@@ -520,25 +496,6 @@ export function main(argv: string[]): void {
   if (skipInstall) {
     console.log("  npm install");
   }
-  if (preset) {
-    const parsed = parsePresetString(preset)!;
-    if (parsed.framework === "nextjs") {
-      console.log("  npm run dev");
-    } else if (parsed.framework === "nestjs") {
-      console.log("  node --env-file=.env src/main.ts");
-    } else {
-      console.log("  node --env-file=.env src/index.ts");
-    }
-  } else if (template === "nextjs") {
-    console.log("  npm run dev");
-  } else {
-    console.log("  node --env-file=.env src/index.ts");
-  }
+  console.log("  npm run dev");
   console.log("");
 }
-
-// Run when executed directly (not when imported by tests)
-const __filename = fileURLToPath(import.meta.url);
-if (process.argv[1] === __filename) {
-  main(process.argv.slice(2));
-}

package/src/preset-project.ts

@@ -9,6 +9,7 @@ import { generateDbSetup } from "./generators/db-setup.js";
 import { generateMiddleware } from "./generators/middleware.js";
 import { generatePresetPackageJson } from "./generators/package-json.js";
 import { generatePresetReadme } from "./generators/readme.js";
+import { generateTsconfig, rootSources } from "./generators/tsconfig.js";
 
 function writeFile(filePath: string, content: string): void {
   const dir = path.dirname(filePath);
@@ -114,31 +115,7 @@ export function createPresetProject(
   // tsconfig.json
   writeFile(
     path.join(targetDir, "tsconfig.json"),
-    JSON.stringify(
-      {
-        compilerOptions: {
-          target: "ESNext",
-          module: "NodeNext",
-          moduleResolution: "NodeNext",
-          strict: true,
-          outDir: "dist",
-          rootDir: "src",
-          declaration: true,
-          skipLibCheck: true,
-          esModuleInterop: true,
-          ...(preset.framework === "nestjs"
-            ? { experimentalDecorators: true, emitDecoratorMetadata: true }
-            : {}),
-          ...(preset.framework === "nextjs"
-            ? { jsx: "preserve", plugins: [{ name: "next" }] }
-            : {}),
-        },
-        include: ["src"],
-        exclude: ["node_modules", "dist"],
-      },
-      null,
-      2,
-    ),
+    generateTsconfig(preset.framework, rootSources(preset)),
   );
 
   // npm install

package/src/stratum-versions.ts

@@ -0,0 +1,20 @@
+// esbuild inlines these files when it bundles the CLI, so the published package carries
+// the versions of the workspace it was built from. The ranges are fixed at create's build
+// time. When a pinned package gets a major bump, or a minor bump while at 0.x, release
+// create again, or new projects keep the old range.
+import hono from "../../hono/package.json" with { type: "json" };
+import dbAdapters from "../../db-adapters/package.json" with { type: "json" };
+import lib from "../../lib/package.json" with { type: "json" };
+import mongodb from "../../mongodb/package.json" with { type: "json" };
+import mysql from "../../mysql/package.json" with { type: "json" };
+import nestjs from "../../nestjs/package.json" with { type: "json" };
+
+/** Caret ranges on the current workspace versions of the packages a generated project uses. */
+export const STRATUM_RANGES = {
+  "@stratum-hq/db-adapters": `^${dbAdapters.version}`,
+  "@stratum-hq/hono": `^${hono.version}`,
+  "@stratum-hq/lib": `^${lib.version}`,
+  "@stratum-hq/mongodb": `^${mongodb.version}`,
+  "@stratum-hq/mysql": `^${mysql.version}`,
+  "@stratum-hq/nestjs": `^${nestjs.version}`,
+} as const;

package/turbo.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://turbo.build/schema.json",
+  "extends": ["//"],
+  "tasks": {
+    "build": {
+      "inputs": ["$TURBO_DEFAULT$", "$TURBO_ROOT$/packages/*/package.json"]
+    },
+    "typecheck": {
+      "inputs": ["$TURBO_DEFAULT$", "$TURBO_ROOT$/packages/*/package.json"]
+    },
+    "test": {
+      "inputs": [
+        "$TURBO_DEFAULT$",
+        "$TURBO_ROOT$/packages/*/package.json",
+        "$TURBO_ROOT$/packages/{core,db-adapters,mysql,mongodb}/src/**"
+      ]
+    }
+  }
+}