@stratum-hq/create 0.4.0 → 0.4.1

package/dist/index.js

@@ -1,11 +1,8 @@
-#!/usr/bin/env node
-
 // src/index.ts
 import * as fs2 from "fs";
 import * as path2 from "path";
 import crypto2 from "node:crypto";
 import { execSync as execSync2 } from "child_process";
-import { fileURLToPath } from "url";
 
 // src/matrix.ts
 var POSTGRES_STRATEGIES = ["rls", "schema", "database"];
@@ -224,8 +221,11 @@ function generatePostgresInit(projectName, dbName, strategy) {
 --   ALTER TABLE your_table ENABLE ROW LEVEL SECURITY;
 --   ALTER TABLE your_table FORCE ROW LEVEL SECURITY;
 --   CREATE POLICY tenant_isolation ON your_table
---     USING (tenant_id = current_setting('app.current_tenant_id')::uuid);
+--     USING (tenant_id = NULLIF(current_setting('app.current_tenant_id', true), '')::uuid);
 --
+-- A pooled connection reads the setting as '' after a tenant transaction ends,
+-- or as NULL before the first one. NULLIF makes both return no rows; a bare
+-- ::uuid cast of '' raises an error.
 -- FORCE makes the policy apply to the table owner too; without it, a table
 -- created by the application role is not isolated for that role.
 -- The Stratum db-adapters package sets app.current_tenant_id automatically.
@@ -446,59 +446,106 @@ export default config;
     },
     {
       filename: "src/stratum-knex.ts",
-      content: `// Knex with Stratum tenant-scoped queries
+      content: preset.database === "postgres" ? KNEX_POSTGRES_SCOPE : knexColumnScope(preset.database)
+    }
+  ];
+}
+var KNEX_POSTGRES_SCOPE = `// Knex with Stratum tenant-scoped queries
+import createKnex, { type Knex } from "knex";
+import config from "../knexfile.js";
+
+const knex = createKnex(config);
+
+// Run fn in a transaction that sets app.current_tenant_id, the setting that
+// the RLS policies read. The setting ends with the transaction, so run every
+// tenant query through trx, not through knex.
+export async function withTenantScope<T>(
+  tenantId: string,
+  fn: (trx: Knex.Transaction) => Promise<T>,
+): Promise<T> {
+  return knex.transaction(async (trx) => {
+    await trx.raw("SELECT set_config('app.current_tenant_id', ?, true)", [tenantId]);
+    return fn(trx);
+  });
+}
+
+// Usage:
+// const orders = await withTenantScope(currentTenantId, (trx) => trx("orders").select());
+
+export { knex };
+`;
+function knexColumnScope(database) {
+  return `// Knex with Stratum tenant-scoped queries
 import Knex from "knex";
 import config from "../knexfile.js";
 
 const knex = Knex(config);
 
 // Create a tenant-scoped query builder.
-// For RLS strategy, set the session variable before queries.
 export async function withTenantScope(tenantId: string, fn: (db: typeof knex) => Promise<void>) {
-${preset.database === "postgres" ? `  await knex.raw("SET app.current_tenant = ?", [tenantId]);` : `  // For ${preset.database}, scope queries by tenant_id column`}
-  try {
-    await fn(knex);
-  } finally {
-${preset.database === "postgres" ? `    await knex.raw("RESET app.current_tenant");` : `    // Scope cleanup not needed for column-based isolation`}
-  }
+  // For ${database}, scope queries by tenant_id column
+  await fn(knex);
 }
 
 export { knex };
-`
-    }
-  ];
+`;
 }
-function generateMongooseSetup(_preset) {
+function generateMongooseSetup(preset) {
+  const tenantAccess = preset.strategy === "collection" ? `// Return the tenant's model for a base collection. The tenant's documents are
+// in the collection {baseCollection}_{tenantSlug}, the name that
+// MongoCollectionAdapter from @stratum-hq/mongodb uses.
+export function getTenantModel<T>(
+  baseCollection: string,
+  schema: mongoose.Schema<T>,
+  tenantSlug: string,
+) {
+  const name = \`\${baseCollection}_\${assertSlug(tenantSlug)}\`;
+  return mainConnection.models[name] ?? mainConnection.model(name, schema, name);
+}
+
+// Usage:
+// const Order = getTenantModel("orders", OrderSchema, "tenant_abc");
+// const orders = await Order.find();` : `// Return a connection to the tenant's own database. The database name is
+// stratum_tenant_{tenantSlug}, the name that MongoDatabaseAdapter from
+// @stratum-hq/mongodb uses. useCache returns the same connection on each call.
+export function getTenantConnection(tenantSlug: string) {
+  return mainConnection.useDb(\`stratum_tenant_\${assertSlug(tenantSlug)}\`, { useCache: true });
+}
+
+// Usage:
+// const conn = getTenantConnection("tenant_abc");
+// const Order = conn.model("Order", OrderSchema);
+// const orders = await Order.find();`;
   return [
     {
       filename: "src/stratum-mongoose.ts",
       content: `// Mongoose with Stratum multi-tenant support
 import mongoose from "mongoose";
-import { createTenantConnection } from "@stratum-hq/mongodb";
 
 // Main connection (used for tenant metadata)
 const mainConnection = mongoose.createConnection(
   process.env.MONGODB_URI || "mongodb://localhost:27017/main",
 );
 
-// Create a tenant-scoped connection.
-// Each tenant gets its own database (database-per-tenant strategy)
-// or collection prefix (collection strategy).
-export function getTenantConnection(tenantId: string) {
-  return createTenantConnection(mainConnection, tenantId);
+// A tenant slug becomes part of a MongoDB name, so it must match the Stratum
+// slug rule: a lowercase letter, then lowercase letters, digits or underscores.
+const SLUG_PATTERN = /^[a-z][a-z0-9_]{0,62}$/;
+
+function assertSlug(tenantSlug: string): string {
+  if (!SLUG_PATTERN.test(tenantSlug)) {
+    throw new Error(\`Invalid tenant slug: "\${tenantSlug}"\`);
+  }
+  return tenantSlug;
 }
 
+${tenantAccess}
+
 // Define schemas that work across tenant connections
 export const TenantSchema = new mongoose.Schema({
   name: { type: String, required: true },
   createdAt: { type: Date, default: Date.now },
 });
 
-// Usage:
-// const conn = getTenantConnection("tenant-abc");
-// const Order = conn.model("Order", OrderSchema);
-// const orders = await Order.find();
-
 export { mainConnection };
 `
     }
@@ -517,7 +564,11 @@ const pool = mysql.createPool({
 });
 
 // Execute a query scoped to a tenant by filtering on tenant_id
-export async function tenantQuery(tenantId: string, sql: string, params: unknown[] = []) {
+export async function tenantQuery(
+  tenantId: string,
+  sql: string,
+  params: (string | number | bigint | boolean | Date | null)[] = [],
+) {
   const [rows] = await pool.execute(sql, [...params, tenantId]);
   return rows;
 }
@@ -542,9 +593,10 @@ const pool = new Pool({
 });
 
 // Create a tenant-scoped pool.
-// Sets app.current_tenant on each connection for RLS enforcement.
+// Each query runs in a transaction that sets app.current_tenant_id, the
+// setting that the RLS policies read.
 export function getTenantPool(tenantId: string) {
-  return createTenantPool(pool, tenantId);
+  return createTenantPool(pool, () => tenantId);
 }
 
 // Usage:
@@ -822,16 +874,516 @@ console.log("Add tenant resolution logic for your use case");
   ];
 }
 
+// src/generators/tsconfig.ts
+function rootSources(preset) {
+  return preset.orm === "knex" ? ["knexfile.ts"] : [];
+}
+function generateTsconfig(framework, extraSources = []) {
+  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
+  );
+}
+
+// ../hono/package.json
+var package_default = {
+  name: "@stratum-hq/hono",
+  version: "1.1.0",
+  description: "Stratum Hono integration \u2014 tenant extraction middleware with ALS context",
+  keywords: [
+    "multi-tenancy",
+    "multi-tenant",
+    "saas",
+    "tenant",
+    "hono",
+    "middleware",
+    "typescript",
+    "stratum"
+  ],
+  type: "module",
+  main: "./dist/index.js",
+  types: "./dist/index.d.ts",
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      default: "./dist/index.js"
+    }
+  },
+  files: [
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
+  scripts: {
+    build: "tsc",
+    test: "vitest run",
+    typecheck: "tsc --noEmit",
+    lint: "eslint .",
+    clean: "rm -rf dist"
+  },
+  publishConfig: {
+    access: "public",
+    registry: "https://registry.npmjs.org/"
+  },
+  peerDependencies: {
+    "@stratum-hq/core": "^1.0.0",
+    "@stratum-hq/sdk": "^1.2.0",
+    hono: ">=4.0.0"
+  },
+  devDependencies: {
+    "@stratum-hq/core": "*",
+    "@stratum-hq/sdk": "*",
+    hono: "^4.13.9",
+    typescript: "^5.4.0",
+    vitest: "^4.1.11"
+  },
+  license: "MIT",
+  author: "Christian Crank",
+  homepage: "https://github.com/stratum-hq/Stratum/tree/main/packages/hono#readme",
+  bugs: "https://github.com/stratum-hq/Stratum/issues",
+  engines: {
+    node: ">=20.0.0"
+  },
+  repository: {
+    type: "git",
+    url: "https://github.com/stratum-hq/Stratum.git",
+    directory: "packages/hono"
+  }
+};
+
+// ../db-adapters/package.json
+var package_default2 = {
+  name: "@stratum-hq/db-adapters",
+  version: "1.2.0",
+  description: "Stratum PostgreSQL adapters for tenant-scoped query isolation",
+  keywords: [
+    "multi-tenancy",
+    "multi-tenant",
+    "saas",
+    "tenant",
+    "tenant-isolation",
+    "postgresql",
+    "postgres",
+    "row-level-security",
+    "rls",
+    "schema-isolation",
+    "database",
+    "stratum"
+  ],
+  main: "./dist/index.js",
+  types: "./dist/index.d.ts",
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      default: "./dist/index.js"
+    }
+  },
+  files: [
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
+  scripts: {
+    build: "tsc",
+    test: "vitest run",
+    typecheck: "tsc --noEmit",
+    lint: "eslint .",
+    clean: "rm -rf dist"
+  },
+  publishConfig: {
+    access: "public",
+    registry: "https://registry.npmjs.org/"
+  },
+  dependencies: {
+    "@stratum-hq/core": "^1.4.0",
+    pg: "^8.11.0"
+  },
+  peerDependencies: {
+    "drizzle-orm": ">=0.29.0"
+  },
+  peerDependenciesMeta: {
+    "drizzle-orm": {
+      optional: true
+    }
+  },
+  devDependencies: {
+    "@prisma/client": "^5.10.0",
+    "@types/pg": "^8.11.0",
+    "drizzle-orm": "^0.45.3",
+    typescript: "^5.4.0",
+    vitest: "^4.1.11"
+  },
+  license: "MIT",
+  author: "Christian Crank",
+  homepage: "https://github.com/stratum-hq/Stratum/tree/main/packages/db-adapters#readme",
+  bugs: "https://github.com/stratum-hq/Stratum/issues",
+  engines: {
+    node: ">=20.0.0"
+  },
+  repository: {
+    type: "git",
+    url: "https://github.com/stratum-hq/Stratum.git",
+    directory: "packages/db-adapters"
+  }
+};
+
+// ../lib/package.json
+var package_default3 = {
+  name: "@stratum-hq/lib",
+  version: "1.4.0",
+  description: "Stratum tenant management library - framework-agnostic business logic",
+  keywords: [
+    "multi-tenancy",
+    "multi-tenant",
+    "saas",
+    "b2b",
+    "tenant",
+    "tenant-management",
+    "tenant-isolation",
+    "node",
+    "typescript",
+    "postgresql",
+    "row-level-security",
+    "rls",
+    "schema-isolation",
+    "config-inheritance",
+    "gdpr",
+    "stratum"
+  ],
+  main: "./dist/index.js",
+  types: "./dist/index.d.ts",
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      default: "./dist/index.js"
+    }
+  },
+  files: [
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
+  scripts: {
+    build: "tsc && node ../../scripts/copy-dir.mjs src/migrations dist/migrations",
+    test: "vitest run",
+    typecheck: "tsc --noEmit",
+    lint: "eslint .",
+    clean: "rm -rf dist"
+  },
+  publishConfig: {
+    access: "public",
+    registry: "https://registry.npmjs.org/"
+  },
+  dependencies: {
+    "@opentelemetry/api": "^1.9.0",
+    "@stratum-hq/core": "^1.4.0",
+    "@stratum-hq/db-adapters": "^1.2.0",
+    "@stratum-hq/sdk": "^1.2.0",
+    pg: "^8.11.0"
+  },
+  peerDependencies: {
+    "@opentelemetry/api": "^1.0.0"
+  },
+  peerDependenciesMeta: {
+    "@opentelemetry/api": {
+      optional: true
+    }
+  },
+  devDependencies: {
+    "@types/pg": "^8.11.0",
+    typescript: "^5.4.0",
+    vitest: "^4.1.11"
+  },
+  license: "MIT",
+  author: "Christian Crank",
+  homepage: "https://github.com/stratum-hq/Stratum/tree/main/packages/lib#readme",
+  bugs: "https://github.com/stratum-hq/Stratum/issues",
+  engines: {
+    node: ">=20.0.0"
+  },
+  repository: {
+    type: "git",
+    url: "https://github.com/stratum-hq/Stratum.git",
+    directory: "packages/lib"
+  }
+};
+
+// ../mongodb/package.json
+var package_default4 = {
+  name: "@stratum-hq/mongodb",
+  version: "0.4.0",
+  description: "MongoDB tenant isolation for Stratum \u2014 shared collection, collection-per-tenant, and database-per-tenant strategies",
+  keywords: [
+    "multi-tenancy",
+    "multi-tenant",
+    "saas",
+    "tenant",
+    "tenant-isolation",
+    "mongodb",
+    "mongoose",
+    "database",
+    "stratum"
+  ],
+  main: "./dist/index.js",
+  types: "./dist/index.d.ts",
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      default: "./dist/index.js"
+    }
+  },
+  files: [
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
+  scripts: {
+    build: "tsc",
+    test: "vitest run",
+    "test:watch": "vitest",
+    "test:integration": "vitest run --config vitest.integration.config.ts",
+    typecheck: "tsc --noEmit",
+    lint: "eslint .",
+    clean: "rm -rf dist"
+  },
+  dependencies: {
+    "@stratum-hq/core": "^1.4.0",
+    "@stratum-hq/sdk": "^1.2.0"
+  },
+  peerDependencies: {
+    mongodb: "^6.0.0 || ^7.0.0"
+  },
+  peerDependenciesMeta: {
+    mongoose: {
+      optional: true
+    }
+  },
+  devDependencies: {
+    "@stratum-hq/test-utils": "*",
+    mongodb: "^7.6.0",
+    mongoose: "^8.0.0",
+    typescript: "^5.9.0",
+    vitest: "^4.1.11"
+  },
+  publishConfig: {
+    access: "public"
+  },
+  license: "MIT",
+  author: "Christian Crank",
+  homepage: "https://github.com/stratum-hq/Stratum/tree/main/packages/mongodb#readme",
+  bugs: "https://github.com/stratum-hq/Stratum/issues",
+  engines: {
+    node: ">=20.0.0"
+  },
+  repository: {
+    type: "git",
+    url: "https://github.com/stratum-hq/Stratum.git",
+    directory: "packages/mongodb"
+  }
+};
+
+// ../mysql/package.json
+var package_default5 = {
+  name: "@stratum-hq/mysql",
+  version: "0.4.0",
+  description: "MySQL tenant isolation for Stratum \u2014 shared table, table-per-tenant, and database-per-tenant strategies",
+  keywords: [
+    "multi-tenancy",
+    "multi-tenant",
+    "saas",
+    "tenant",
+    "tenant-isolation",
+    "mysql",
+    "database",
+    "typeorm",
+    "knex",
+    "sequelize",
+    "stratum"
+  ],
+  main: "./dist/index.js",
+  types: "./dist/index.d.ts",
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      default: "./dist/index.js"
+    }
+  },
+  files: [
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
+  scripts: {
+    build: "tsc",
+    test: "vitest run",
+    "test:watch": "vitest",
+    "test:integration": "vitest run --config vitest.integration.config.ts",
+    typecheck: "tsc --noEmit",
+    lint: "eslint .",
+    clean: "rm -rf dist"
+  },
+  dependencies: {
+    "@stratum-hq/core": "^1.4.0",
+    "@stratum-hq/sdk": "^1.2.0"
+  },
+  peerDependencies: {
+    mysql2: "^3.0.0",
+    knex: ">=3.0.0",
+    typeorm: "^1.0.0",
+    sequelize: "^6.0.0"
+  },
+  peerDependenciesMeta: {
+    typeorm: {
+      optional: true
+    },
+    knex: {
+      optional: true
+    },
+    sequelize: {
+      optional: true
+    }
+  },
+  devDependencies: {
+    knex: "^3.3.0",
+    mysql2: "^3.24.4",
+    typeorm: "^1.1.1",
+    typescript: "^5.9.0",
+    vitest: "^4.1.11"
+  },
+  publishConfig: {
+    access: "public"
+  },
+  license: "MIT",
+  author: "Christian Crank",
+  homepage: "https://github.com/stratum-hq/Stratum/tree/main/packages/mysql#readme",
+  bugs: "https://github.com/stratum-hq/Stratum/issues",
+  engines: {
+    node: ">=20.0.0"
+  },
+  repository: {
+    type: "git",
+    url: "https://github.com/stratum-hq/Stratum.git",
+    directory: "packages/mysql"
+  }
+};
+
+// ../nestjs/package.json
+var package_default6 = {
+  name: "@stratum-hq/nestjs",
+  version: "1.2.0",
+  description: "Stratum NestJS integration \u2014 StratumGuard, @Tenant() decorator, and StratumModule",
+  keywords: [
+    "multi-tenancy",
+    "multi-tenant",
+    "saas",
+    "tenant",
+    "nestjs",
+    "nest",
+    "guard",
+    "decorator",
+    "middleware",
+    "typescript",
+    "stratum"
+  ],
+  type: "module",
+  main: "./dist/index.js",
+  types: "./dist/index.d.ts",
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      default: "./dist/index.js"
+    }
+  },
+  files: [
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
+  scripts: {
+    build: "tsc",
+    test: "vitest run",
+    typecheck: "tsc --noEmit",
+    lint: "eslint .",
+    clean: "rm -rf dist"
+  },
+  publishConfig: {
+    access: "public",
+    registry: "https://registry.npmjs.org/"
+  },
+  peerDependencies: {
+    "@nestjs/common": ">=10.0.0",
+    "@nestjs/core": ">=10.0.0",
+    "@stratum-hq/core": "^1.0.0",
+    "@stratum-hq/sdk": "^1.2.0",
+    "reflect-metadata": ">=0.1.13"
+  },
+  devDependencies: {
+    "@nestjs/common": "^12.1.2",
+    "@nestjs/core": "^12.1.2",
+    "@nestjs/testing": "^12.1.2",
+    "@stratum-hq/core": "*",
+    "@stratum-hq/sdk": "*",
+    "reflect-metadata": "^0.2.2",
+    typescript: "^5.4.0",
+    vitest: "^4.1.11"
+  },
+  license: "MIT",
+  author: "Christian Crank",
+  homepage: "https://github.com/stratum-hq/Stratum/tree/main/packages/nestjs#readme",
+  bugs: "https://github.com/stratum-hq/Stratum/issues",
+  engines: {
+    node: ">=20.0.0"
+  },
+  repository: {
+    type: "git",
+    url: "https://github.com/stratum-hq/Stratum.git",
+    directory: "packages/nestjs"
+  }
+};
+
+// src/stratum-versions.ts
+var STRATUM_RANGES = {
+  "@stratum-hq/db-adapters": `^${package_default2.version}`,
+  "@stratum-hq/hono": `^${package_default.version}`,
+  "@stratum-hq/lib": `^${package_default3.version}`,
+  "@stratum-hq/mongodb": `^${package_default4.version}`,
+  "@stratum-hq/mysql": `^${package_default5.version}`,
+  "@stratum-hq/nestjs": `^${package_default6.version}`
+};
+
 // src/generators/package-json.ts
 function generatePresetPackageJson(projectName, preset) {
   const deps = {
-    "@stratum-hq/lib": "^0.2.0"
+    "@stratum-hq/lib": STRATUM_RANGES["@stratum-hq/lib"]
   };
   const devDeps = {
     typescript: "^5.3.0",
     "@types/node": "^20.11.0"
   };
-  addDatabaseDeps(deps, preset);
+  if (preset.framework === "nestjs") {
+    devDeps["tsc-watch"] = "^7.2.0";
+  } else if (preset.framework !== "nextjs") {
+    devDeps["tsx"] = "^4.7.0";
+  }
+  addDatabaseDeps(deps, devDeps, preset);
   addOrmDeps(deps, devDeps, preset);
   addFrameworkDeps(deps, devDeps, preset);
   addStratumDeps(deps, preset);
@@ -853,9 +1405,12 @@ function generatePresetPackageJson(projectName, preset) {
     2
   );
 }
-function addDatabaseDeps(deps, preset) {
+function addDatabaseDeps(deps, devDeps, preset) {
   switch (preset.database) {
     case "postgres":
+      if (preset.orm === "pg" || preset.orm === "prisma" || preset.orm === "drizzle") {
+        devDeps["@types/pg"] = "^8.11.0";
+      }
       if (preset.orm !== "prisma" && preset.orm !== "drizzle" && preset.orm !== "sequelize") {
         deps["pg"] = "^8.11.0";
       }
@@ -945,29 +1500,29 @@ function addFrameworkDeps(deps, devDeps, preset) {
 }
 function addStratumDeps(deps, preset) {
   if (preset.database === "postgres" && preset.orm !== "mongoose") {
-    deps["@stratum-hq/db-adapters"] = "^0.2.0";
+    deps["@stratum-hq/db-adapters"] = STRATUM_RANGES["@stratum-hq/db-adapters"];
   }
   if (preset.database === "mongodb") {
-    deps["@stratum-hq/mongodb"] = "^0.2.0";
+    deps["@stratum-hq/mongodb"] = STRATUM_RANGES["@stratum-hq/mongodb"];
   }
   if (preset.database === "mysql") {
-    deps["@stratum-hq/mysql"] = "^0.2.0";
+    deps["@stratum-hq/mysql"] = STRATUM_RANGES["@stratum-hq/mysql"];
   }
   if (preset.framework === "hono") {
-    deps["@stratum-hq/hono"] = "^0.2.0";
+    deps["@stratum-hq/hono"] = STRATUM_RANGES["@stratum-hq/hono"];
   }
   if (preset.framework === "nestjs") {
-    deps["@stratum-hq/nestjs"] = "^0.2.0";
+    deps["@stratum-hq/nestjs"] = STRATUM_RANGES["@stratum-hq/nestjs"];
   }
 }
 function getScripts(preset) {
   if (preset.framework === "nextjs") {
     return { dev: "next dev", build: "next build", start: "next start" };
   }
-  if (preset.framework === "nestjs") {
-    return { dev: "node --watch src/main.ts", build: "tsc", start: "node dist/main.js" };
-  }
-  return { dev: "node --watch src/index.js", build: "tsc", start: "node dist/index.js" };
+  const entry = preset.framework === "nestjs" ? "main" : "index";
+  const emittedDir = rootSources(preset).length > 0 ? "dist/src" : "dist";
+  const dev = preset.framework === "nestjs" ? `tsc-watch --onSuccess "node --env-file=.env ${emittedDir}/${entry}.js"` : `tsx watch --env-file=.env src/${entry}.ts`;
+  return { dev, build: "tsc", start: `node ${emittedDir}/${entry}.js` };
 }
 function sortKeys(obj) {
   const sorted = {};
@@ -979,7 +1534,6 @@ function sortKeys(obj) {
 
 // src/generators/readme.ts
 function generatePresetReadme(projectName, preset) {
-  const devCmd = getDevCommand(preset);
   const dbStartCmd = getDbStartInfo(preset);
   const dbSetupNote = getDbSetupNote(preset);
   return `# ${projectName}
@@ -1014,7 +1568,7 @@ ${dbSetupNote}
 ### 4. Run the app
 
 \`\`\`bash
-${devCmd}
+npm run dev
 \`\`\`
 
 ## Multi-tenancy
@@ -1026,12 +1580,6 @@ ${getStrategyDescription(preset.strategy)}
 See the [Stratum docs](https://github.com/stratum-hq/Stratum) for full reference.
 `;
 }
-function getDevCommand(preset) {
-  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) {
   switch (preset.database) {
     case "postgres":
@@ -1068,7 +1616,7 @@ function getStrategyDescription(strategy) {
   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
@@ -1172,27 +1720,7 @@ Creating ${projectName} with preset ${presetLabel}...
   );
   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))
   );
   if (!skipInstall) {
     console.log("\nInstalling dependencies...\n");
@@ -1295,7 +1823,7 @@ function generatePackageJson(projectName, template) {
     }
   };
   const deps = {
-    "@stratum-hq/lib": "^0.2.0",
+    "@stratum-hq/lib": STRATUM_RANGES["@stratum-hq/lib"],
     pg: "^8.11.0",
     ...frameworkDeps[template]
   };
@@ -1305,11 +1833,15 @@ function generatePackageJson(projectName, template) {
       version: "0.1.0",
       private: true,
       type: "module",
-      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" },
+      scripts: template === "nextjs" ? { dev: "next dev", build: "next build", start: "next start" } : (
+        // 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"
+        "@types/node": "^20.11.0",
+        ...template === "nextjs" ? {} : { tsx: "^4.7.0", "@types/pg": "^8.11.0" }
       },
       engines: {
         node: ">=20.0.0"
@@ -1493,7 +2025,6 @@ export const config = {
 `;
 }
 function generateReadme(projectName, template) {
-  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).
@@ -1522,7 +2053,7 @@ npm install
 ### 4. Run the app
 
 \`\`\`bash
-${devCmd}
+npm run dev
 \`\`\`
 
 ## Project structure
@@ -1533,7 +2064,7 @@ ${projectName}/
 \u251C\u2500\u2500 docker-compose.yml
 \u251C\u2500\u2500 init.sql          # DB extensions (uuid-ossp, ltree)
 \u251C\u2500\u2500 .env.example
-\u2514\u2500\u2500 package.json
+${template === "nextjs" ? "" : "\u251C\u2500\u2500 tsconfig.json\n"}\u2514\u2500\u2500 package.json
 \`\`\`
 
 ## Multi-tenancy
@@ -1560,8 +2091,10 @@ Creating ${projectName} with ${template} template...
   writeFile2(path2.join(targetDir, ".env.example"), generateEnv(projectName));
   if (template === "express") {
     writeFile2(path2.join(targetDir, "src", "index.ts"), generateExpressServer(projectName));
+    writeFile2(path2.join(targetDir, "tsconfig.json"), generateTsconfig(template));
   } else if (template === "fastify") {
     writeFile2(path2.join(targetDir, "src", "index.ts"), generateFastifyServer(projectName));
+    writeFile2(path2.join(targetDir, "tsconfig.json"), generateTsconfig(template));
   } else if (template === "nextjs") {
     writeFile2(path2.join(targetDir, "src", "app", "page.tsx"), generateNextjsPage(projectName));
     writeFile2(path2.join(targetDir, "middleware.ts"), generateNextjsMiddleware2());
@@ -1639,26 +2172,9 @@ Success! Created ${projectName} at ${targetDir}
   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("");
 }
-var __filename = fileURLToPath(import.meta.url);
-if (process.argv[1] === __filename) {
-  main(process.argv.slice(2));
-}
 export {
   createProject,
   main,