@tatara/cli 0.3.0 → 0.4.0

package/dist/bin.mjs

@@ -286,7 +286,7 @@ export type PermissionKey =
 		const seeds = await find(root, dirs.map((d) => `${d}/db/seed.ts`));
 		await writeIfChanged(join(out, "seeds.ts"), listModule(seeds, {
 			prefix: "seed",
-			typeImport: "import type { SeedDefinition } from \"#core/db/seed\";",
+			typeImport: "import type { SeedDefinition } from \"@tatara/db\";",
 			typeName: "SeedDefinition",
 			exportName: "seeds"
 		}), written);
@@ -1057,8 +1057,8 @@ const i18n = {
 		},
 		{
 			file: "src/core/http/app.ts",
-			slot: "error-message",
-			content: "if (err.translatable) message = t(c.get(\"language\"), `errors.${err.code}`, message);"
+			slot: "error-options",
+			content: ["message: (err, c) =>", "	err.translatable ? t(c.get(\"language\"), `errors.${err.code}`, err.message) : err.message,"].join("\n")
 		},
 		{
 			file: "AGENTS.md",
@@ -1175,8 +1175,12 @@ const betterAuth = {
 		},
 		{
 			file: "src/core/http/app.ts",
-			slot: "openapi",
-			content: "if (name === \"api\") await mergeAuthOpenApi(document, `${API_PREFIX}/auth`);"
+			slot: "openapi-options",
+			content: [
+				"async extend(document) {",
+				"	if (name === \"api\") await mergeAuthOpenApi(document, `${API_PREFIX}/auth`);",
+				"},"
+			].join("\n")
 		},
 		{
 			file: "src/core/http/app.ts",
@@ -1655,6 +1659,7 @@ const base = {
 		"pino"
 	],
 	devDependencies: [
+		"@tatara/testing",
 		"@tatara/cli",
 		"typescript",
 		"@types/node",
@@ -1852,6 +1857,7 @@ const db$1 = {
 	id: "db",
 	kind: "database",
 	label: "Database (shared)",
+	dependencies: ["@tatara/db"],
 	scripts: {
 		"db:generate": "tatara db generate",
 		"db:migrate": "tatara db migrate",
@@ -1874,7 +1880,7 @@ const db$1 = {
 			file: "tests/setup.ts",
 			slot: "setup",
 			content: [
-				"import { workerDatabaseUrl } from \"#tests/helpers/database-url\";",
+				"import { workerDatabaseUrl } from \"@tatara/testing\";",
 				"",
 				"// One database per worker, created by tests/global-setup.ts.",
 				"process.env.DATABASE_URL = workerDatabaseUrl(process.env.DATABASE_URL ?? \"\", process.env.VITEST_POOL_ID ?? \"1\");"
@@ -3218,7 +3224,7 @@ function createBaseline(project, deps) {
 //#region src/upgrade/codemods/core-package.ts
 const CORE = "@tatara/core";
 /** Files @tatara/core replaces, with the import specifier apps used for each. */
-const MOVED$1 = {
+const MOVED$2 = {
 	"src/core/commands/define.ts": "#core/commands/define",
 	"src/core/commands/runner.ts": "#core/commands/runner",
 	"src/core/process/lifecycle.ts": "#core/process/lifecycle",
@@ -3253,8 +3259,8 @@ async function rewriteEnv(ctx) {
 }
 /** Only call sites of functions that now come from @tatara/core take the logger argument. */
 async function passLogger(ctx, gone) {
-	const runnerGone = gone.includes(MOVED$1["src/core/commands/runner.ts"]);
-	const lifecycleGone = gone.includes(MOVED$1["src/core/process/lifecycle.ts"]);
+	const runnerGone = gone.includes(MOVED$2["src/core/commands/runner.ts"]);
+	const lifecycleGone = gone.includes(MOVED$2["src/core/process/lifecycle.ts"]);
 	const cli = await exists(ctx, CLI_ENTRY);
 	if (cli) {
 		let next = cli;
@@ -3307,7 +3313,7 @@ const corePackage = {
 	async run(ctx) {
 		await ctx.addDependency(CORE, versionOf(CORE));
 		const gone = [];
-		for (const [path, specifier] of Object.entries(MOVED$1)) if (await ctx.removeIfUnchanged(path) === "kept") ctx.report.notes.push(`${path} is customised; its imports still point at it. Move the change into the app or eject.`);
+		for (const [path, specifier] of Object.entries(MOVED$2)) if (await ctx.removeIfUnchanged(path) === "kept") ctx.report.notes.push(`${path} is customised; its imports still point at it. Move the change into the app or eject.`);
 		else gone.push(specifier);
 		for (const specifier of gone) await ctx.rewriteImports(specifier, CORE);
 		await rewriteEnv(ctx);
@@ -3317,6 +3323,68 @@ const corePackage = {
 	}
 };
 //#endregion
+//#region src/upgrade/codemods/db-testing.ts
+/** Copies replaced by a package export of the same name. */
+const MOVED$1 = [
+	{
+		path: "src/core/db/id.ts",
+		specifier: "#core/db/id",
+		to: "@tatara/db",
+		needsDb: true
+	},
+	{
+		path: "src/core/db/seed.ts",
+		specifier: "#core/db/seed",
+		to: "@tatara/db",
+		needsDb: true
+	},
+	{
+		path: "tests/helpers/database-url.ts",
+		specifier: "#tests/helpers/database-url",
+		to: "@tatara/testing",
+		needsDb: false
+	}
+];
+/** App files that stay, but become what this CLI generates (driver re-exports, thin helpers). */
+const REGENERATED = [
+	"src/core/db/admin.ts",
+	"src/core/db/migrate.ts",
+	"tests/helpers/api.ts",
+	"tests/global-setup.ts"
+];
+async function read$1(ctx, path) {
+	return ctx.read(path).catch(() => void 0);
+}
+const dbTesting = {
+	version: "0.4.0",
+	id: "db-testing",
+	description: "Use @tatara/db (ids, seeds, driver helpers, migrations) and @tatara/testing",
+	async run(ctx) {
+		const hasDb = ctx.project.config.database !== "none";
+		if (hasDb) await ctx.addDependency("@tatara/db", versionOf("@tatara/db"));
+		await ctx.addDependency("@tatara/testing", versionOf("@tatara/testing"), { dev: true });
+		const regenerate = [];
+		for (const path of REGENERATED) {
+			const text = await read$1(ctx, path);
+			if (text === void 0) continue;
+			if (await ctx.baseline.isUnchanged(path, text)) regenerate.push(path);
+			else ctx.report.notes.push(`${path} is customised and was kept; compare it with a newly generated app.`);
+		}
+		const moved = MOVED$1.filter((m) => hasDb || !m.needsDb);
+		for (const path of regenerate) {
+			const next = await ctx.renderCurrent(path);
+			if (next !== void 0) await ctx.write(path, next);
+		}
+		for (const entry of moved) {
+			if (await ctx.removeIfUnchanged(entry.path) === "kept") {
+				ctx.report.notes.push(`${entry.path} is customised; its imports still point at it.`);
+				continue;
+			}
+			await ctx.rewriteImports(entry.specifier, entry.to);
+		}
+	}
+};
+//#endregion
 //#region src/upgrade/codemods/http-package.ts
 const HTTP = "@tatara/http";
 /** Wiring files the app keeps; replaced by what this CLI generates when the app never changed them. */
@@ -3382,48 +3450,52 @@ async function outsideImporters(ctx) {
 //#endregion
 //#region src/upgrade/codemods.ts
 /** Every codemod tatara ships, oldest first. Each step that moves code into a package adds one. */
-const CODEMODS = [corePackage, {
-	version: "0.3.0",
-	id: "http-package",
-	description: "Use @tatara/http for app setup, errors, the envelope, OpenAPI docs and the server",
-	async run(ctx) {
-		await ctx.addDependency(HTTP, versionOf(HTTP));
-		const blockers = [];
-		const replace = [];
-		for (const path of [
-			APP,
-			ROUTES,
-			...SERVERS
-		]) {
-			const text = await read(ctx, path);
-			if (text === void 0) continue;
-			if (await ctx.baseline.isUnchanged(path, text)) replace.push(path);
-			else blockers.push(`${path} is customised`);
-		}
-		const present = [];
-		for (const entry of MOVED) {
-			const text = await read(ctx, entry.path);
-			if (text === void 0) continue;
-			present.push(entry);
-			if (!await ctx.baseline.isUnchanged(entry.path, text)) blockers.push(`${entry.path} is customised`);
-		}
-		for (const path of await outsideImporters(ctx)) blockers.push(`${path} imports one of the moved files`);
-		if (blockers.length > 0) {
-			ctx.report.notes.push(`Nothing in src/core/http was changed: ${blockers.join("; ")}. Move these onto @tatara/http (createApp, mountRoutes, serveOpenApi, handleErrors, startServer and its error classes) by hand, then delete the old files.`);
-			return;
-		}
-		for (const path of replace) {
-			const next = await ctx.renderCurrent(path);
-			if (next !== void 0) await ctx.write(path, next);
+const CODEMODS = [
+	corePackage,
+	{
+		version: "0.3.0",
+		id: "http-package",
+		description: "Use @tatara/http for app setup, errors, the envelope, OpenAPI docs and the server",
+		async run(ctx) {
+			await ctx.addDependency(HTTP, versionOf(HTTP));
+			const blockers = [];
+			const replace = [];
+			for (const path of [
+				APP,
+				ROUTES,
+				...SERVERS
+			]) {
+				const text = await read(ctx, path);
+				if (text === void 0) continue;
+				if (await ctx.baseline.isUnchanged(path, text)) replace.push(path);
+				else blockers.push(`${path} is customised`);
+			}
+			const present = [];
+			for (const entry of MOVED) {
+				const text = await read(ctx, entry.path);
+				if (text === void 0) continue;
+				present.push(entry);
+				if (!await ctx.baseline.isUnchanged(entry.path, text)) blockers.push(`${entry.path} is customised`);
+			}
+			for (const path of await outsideImporters(ctx)) blockers.push(`${path} imports one of the moved files`);
+			if (blockers.length > 0) {
+				ctx.report.notes.push(`Nothing in src/core/http was changed: ${blockers.join("; ")}. Move these onto @tatara/http (createApp, mountRoutes, serveOpenApi, handleErrors, startServer and its error classes) by hand, then delete the old files.`);
+				return;
+			}
+			for (const path of replace) {
+				const next = await ctx.renderCurrent(path);
+				if (next !== void 0) await ctx.write(path, next);
+			}
+			for (const entry of present) await ctx.removeIfUnchanged(entry.path);
+			for (const specifier of [
+				"#core/http/errors",
+				"#core/http/response",
+				"#core/http/middleware/validation"
+			]) await ctx.rewriteImports(specifier, HTTP);
 		}
-		for (const entry of present) await ctx.removeIfUnchanged(entry.path);
-		for (const specifier of [
-			"#core/http/errors",
-			"#core/http/response",
-			"#core/http/middleware/validation"
-		]) await ctx.rewriteImports(specifier, HTTP);
-	}
-}];
+	},
+	dbTesting
+];
 //#endregion
 //#region src/upgrade/context.ts
 const escapeRegExp = (text) => text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tatara/cli",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Create and grow opinionated Hono backends",
   "type": "module",
   "license": "MIT",

package/templates/features/auth-keycloak/files/src/core/auth/tests/keycloak-tokens.test.ts

@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it } from "vitest";
 import { auth } from "#core/auth/auth";
 import { issuer } from "#core/auth/keycloak";
 import { env } from "#core/config/env";
-import { newId } from "#core/db/id";
+import { newId } from "@tatara/db";
 import { api } from "#tests/helpers/api";
 import { createTestUser, keycloakToken } from "#tests/helpers/auth";
 import { resetDatabase } from "#tests/helpers/db";

package/templates/features/auth-keycloak/files+auth-orgs/src/core/auth/tests/keycloak-organizations.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from "vitest";
 import { auth } from "#core/auth/auth";
-import { newId } from "#core/db/id";
+import { newId } from "@tatara/db";
 import { api } from "#tests/helpers/api";
 import { keycloakToken } from "#tests/helpers/auth";
 import { resetDatabase } from "#tests/helpers/db";

package/templates/features/authz/files/src/core/authz/db/seed.ts

@@ -1,5 +1,5 @@
 import { syncSystemRoles } from "#core/authz/services/sync";
-import { defineSeed } from "#core/db/seed";
+import { defineSeed } from "@tatara/db";
 
 export default defineSeed({
 	name: "authz:system-roles",

package/templates/features/authz/files+drizzle/src/core/authz/db/store.ts

@@ -10,7 +10,7 @@ import {
 } from "#core/authz/db/authz.schema";
 import type { AuthzStore, OverlayRow, PermissionGrant, RoleRow } from "#core/authz/types";
 import { db } from "#core/db/client";
-import { newId } from "#core/db/id";
+import { newId } from "@tatara/db";
 
 const toScope = (scope: string): Scope | null => (scope === "" ? null : (scope as Scope));
 

package/templates/features/authz/files+prisma/src/core/authz/db/store.ts

@@ -2,7 +2,7 @@ import type { OverlayEffect, Scope } from "#core/authz/constants";
 import { SYSTEM_ORG_ID } from "#core/authz/constants";
 import type { AuthzStore, OverlayRow, PermissionGrant, RoleRow } from "#core/authz/types";
 import { db } from "#core/db/client";
-import { newId } from "#core/db/id";
+import { newId } from "@tatara/db";
 
 const toScope = (scope: string): Scope | null => (scope === "" ? null : (scope as Scope));
 

package/templates/features/base/files/src/core/http/app.ts

@@ -29,16 +29,10 @@ export function createHttpApp(name: AppName, options: { title: string }) {
 	mountRoutes(app, routes, { app: name, prefix: API_PREFIX });
 	serveOpenApi(app, {
 		title: options.title,
-		async extend(document) {
-			// tatara:slot openapi
-		},
+		// tatara:slot openapi-options
 	});
 	handleErrors(app, {
-		message(err, c) {
-			let message = err.message;
-			// tatara:slot error-message
-			return message;
-		},
+		// tatara:slot error-options
 	});
 	return app;
 }

package/templates/features/base/files/tests/helpers/api.ts

@@ -1,53 +1,9 @@
+import { client } from "@tatara/testing";
 import { app as apiApp } from "#apps/api/app";
 // tatara:slot imports
 
-type HttpApp = { request: (path: string, init?: RequestInit) => Response | Promise<Response> };
-
-export interface ApiResponse<T = unknown> {
-	status: number;
-	headers: Headers;
-	body: T;
-}
-
-export interface RequestOptions {
-	headers?: Record<string, string>;
-}
-
-async function send<T>(
-	target: HttpApp,
-	method: string,
-	path: string,
-	body: unknown,
-	options: RequestOptions = {},
-): Promise<ApiResponse<T>> {
-	const headers: Record<string, string> = { ...options.headers };
-	if (body !== undefined) headers["content-type"] = "application/json";
-	const res = await target.request(path, {
-		method,
-		headers,
-		body: body === undefined ? undefined : JSON.stringify(body),
-	});
-	const text = await res.text();
-	let parsed: unknown = text;
-	try {
-		parsed = text ? JSON.parse(text) : null;
-	} catch {}
-	return { status: res.status, headers: res.headers, body: parsed as T };
-}
-
-export function client(target: HttpApp) {
-	return {
-		get: <T = unknown>(path: string, o?: RequestOptions) => send<T>(target, "GET", path, undefined, o),
-		post: <T = unknown>(path: string, body?: unknown, o?: RequestOptions) =>
-			send<T>(target, "POST", path, body, o),
-		put: <T = unknown>(path: string, body?: unknown, o?: RequestOptions) =>
-			send<T>(target, "PUT", path, body, o),
-		patch: <T = unknown>(path: string, body?: unknown, o?: RequestOptions) =>
-			send<T>(target, "PATCH", path, body, o),
-		delete: <T = unknown>(path: string, o?: RequestOptions) =>
-			send<T>(target, "DELETE", path, undefined, o),
-	};
-}
+export type { ApiResponse, RequestOptions } from "@tatara/testing";
+export { client };
 
 /** Calls the api app in-process (no network). */
 export const api = client(apiApp);

package/templates/features/better-auth/files/src/core/auth/auth.ts

@@ -2,7 +2,7 @@ import { betterAuth } from "better-auth";
 import { bearer, openAPI } from "better-auth/plugins";
 import { database } from "#core/auth/adapter";
 import { env } from "#core/config/env";
-import { newId } from "#core/db/id";
+import { newId } from "@tatara/db";
 // tatara:slot imports
 
 export const auth = betterAuth({

package/templates/features/better-auth/files/src/core/auth/db/seed.ts

@@ -1,6 +1,6 @@
 import { auth } from "#core/auth/auth";
 import { env } from "#core/config/env";
-import { defineSeed } from "#core/db/seed";
+import { defineSeed } from "@tatara/db";
 
 /** Development admin account (never created in production). */
 export default defineSeed({

package/templates/features/better-auth/files/tests/helpers/auth.ts

@@ -1,5 +1,5 @@
 import { auth } from "#core/auth/auth";
-import { newId } from "#core/db/id";
+import { newId } from "@tatara/db";
 // tatara:slot imports
 
 export interface AsUserOptions {

package/templates/features/db/files/tests/global-setup.ts

@@ -1,27 +1,15 @@
 import { existsSync, readFileSync } from "node:fs";
 import { parseEnv } from "node:util";
+import { prepareTestDatabases } from "@tatara/testing";
 import { ensureDatabase } from "#core/db/admin";
 import { migrateDatabase } from "#core/db/migrate";
-import { TEST_WORKERS, workerDatabaseUrl } from "#tests/helpers/database-url";
 
 /** Creates and migrates one database per test worker, once per run. */
 export default async function setup() {
 	const fileEnv = existsSync(".env.test")
 		? (parseEnv(readFileSync(".env.test", "utf8")) as Record<string, string>)
 		: {};
-	const base = process.env.DATABASE_URL ?? fileEnv.DATABASE_URL;
-	if (!base) throw new Error("DATABASE_URL is not set for tests (.env.test)");
-	try {
-		await Promise.all(
-			Array.from({ length: TEST_WORKERS }, async (_, i) => {
-				const url = workerDatabaseUrl(base, i + 1);
-				await ensureDatabase(url);
-				await migrateDatabase(url);
-			}),
-		);
-	} catch (error) {
-		throw new Error(
-			`Could not prepare the test databases. Is the database running? (\`docker compose up -d --wait\`)\n${String(error)}`,
-		);
-	}
+	const baseUrl = process.env.DATABASE_URL ?? fileEnv.DATABASE_URL;
+	if (!baseUrl) throw new Error("DATABASE_URL is not set for tests (.env.test)");
+	await prepareTestDatabases({ baseUrl, ensureDatabase, migrateDatabase });
 }

package/templates/features/db/files+mysql+drizzle/src/core/db/admin.ts

@@ -1,53 +1,2 @@
-import mysql from "mysql2/promise";
-
-const MIGRATION_TABLES = ["__drizzle_migrations", "_prisma_migrations"];
-
-function databaseName(url: string): string {
-	return decodeURIComponent(new URL(url).pathname.slice(1));
-}
-
-async function withConnection<T>(url: string, fn: (c: mysql.Connection) => Promise<T>): Promise<T> {
-	const connection = await mysql.createConnection({ uri: url, multipleStatements: true });
-	try {
-		return await fn(connection);
-	} finally {
-		await connection.end();
-	}
-}
-
-/** Creates the database named in `url` if it does not exist. */
-export async function ensureDatabase(url: string): Promise<void> {
-	const name = databaseName(url);
-	const server = new URL(url);
-	server.pathname = "/";
-	await withConnection(server.toString(), async (c) => {
-		await c.query(`create database if not exists \`${name.replaceAll("`", "``")}\``);
-	});
-}
-
-async function tables(c: mysql.Connection): Promise<string[]> {
-	const [rows] = await c.query<mysql.RowDataPacket[]>(
-		"select table_name as name from information_schema.tables where table_schema = database() and table_type = 'BASE TABLE'",
-	);
-	return rows.map((r) => String(r.name));
-}
-
-export async function dropAllTables(url: string): Promise<void> {
-	await withConnection(url, async (c) => {
-		const names = await tables(c);
-		if (names.length === 0) return;
-		await c.query(
-			`set foreign_key_checks = 0; drop table ${names.map((t) => `\`${t}\``).join(", ")}; set foreign_key_checks = 1;`,
-		);
-	});
-}
-
-export async function truncateAllTables(url: string): Promise<void> {
-	await withConnection(url, async (c) => {
-		const names = (await tables(c)).filter((t) => !MIGRATION_TABLES.includes(t));
-		if (names.length === 0) return;
-		await c.query(
-			`set foreign_key_checks = 0; ${names.map((t) => `truncate table \`${t}\`;`).join(" ")} set foreign_key_checks = 1;`,
-		);
-	});
-}
+// This app uses MySQL through mysql2.
+export { dropAllTables, ensureDatabase, truncateAllTables } from "@tatara/db/mysql2";

package/templates/features/db/files+mysql+prisma/src/core/db/admin.ts

@@ -1,78 +1,7 @@
-import * as mariadb from "mariadb";
-
-const MIGRATION_TABLES = ["__drizzle_migrations", "_prisma_migrations"];
-
-const LOCAL_HOSTS = new Set(["localhost", "127.0.0.1", "::1", "[::1]"]);
-
-/**
- * mariadb connection options from a mysql:// URL. Public-key retrieval (needed by MySQL's
- * caching_sha2_password without TLS) is only enabled for local hosts or when the URL asks
- * for it; use `?ssl=true` for remote databases.
- */
-export function connectionConfig(url: string): mariadb.ConnectionConfig {
-	const u = new URL(url);
-	const param = (name: string) => u.searchParams.get(name);
-	return {
-		host: u.hostname,
-		port: Number(u.port || 3306),
-		user: decodeURIComponent(u.username),
-		password: decodeURIComponent(u.password),
-		database: decodeURIComponent(u.pathname.slice(1)) || undefined,
-		allowPublicKeyRetrieval:
-			param("allowPublicKeyRetrieval") === "true" || LOCAL_HOSTS.has(u.hostname),
-		...(param("ssl") === "true" ? { ssl: { rejectUnauthorized: true } } : {}),
-	};
-}
-
-const adminConfig = (url: string): mariadb.ConnectionConfig => ({
-	...connectionConfig(url),
-	multipleStatements: true,
-});
-
-async function withConnection<T>(
-	config: mariadb.ConnectionConfig,
-	fn: (c: mariadb.Connection) => Promise<T>,
-): Promise<T> {
-	const connection = await mariadb.createConnection(config);
-	try {
-		return await fn(connection);
-	} finally {
-		await connection.end();
-	}
-}
-
-/** Creates the database named in `url` if it does not exist. */
-export async function ensureDatabase(url: string): Promise<void> {
-	const config = adminConfig(url);
-	const name = String(config.database);
-	await withConnection({ ...config, database: undefined }, async (c) => {
-		await c.query(`create database if not exists \`${name.replaceAll("`", "``")}\``);
-	});
-}
-
-async function tables(c: mariadb.Connection): Promise<string[]> {
-	const rows: { name: string }[] = await c.query(
-		"select table_name as name from information_schema.tables where table_schema = database() and table_type = 'BASE TABLE'",
-	);
-	return rows.map((r) => String(r.name));
-}
-
-export async function dropAllTables(url: string): Promise<void> {
-	await withConnection(adminConfig(url), async (c) => {
-		const names = await tables(c);
-		if (names.length === 0) return;
-		await c.query(
-			`set foreign_key_checks = 0; drop table ${names.map((t) => `\`${t}\``).join(", ")}; set foreign_key_checks = 1;`,
-		);
-	});
-}
-
-export async function truncateAllTables(url: string): Promise<void> {
-	await withConnection(adminConfig(url), async (c) => {
-		const names = (await tables(c)).filter((t) => !MIGRATION_TABLES.includes(t));
-		if (names.length === 0) return;
-		await c.query(
-			`set foreign_key_checks = 0; ${names.map((t) => `truncate table \`${t}\`;`).join(" ")} set foreign_key_checks = 1;`,
-		);
-	});
-}
+// This app uses MySQL through the mariadb driver (Prisma adapter).
+export {
+	connectionConfig,
+	dropAllTables,
+	ensureDatabase,
+	truncateAllTables,
+} from "@tatara/db/mariadb";

package/templates/features/db/files+postgres/src/core/db/admin.ts

@@ -1,50 +1,2 @@
-import pg from "pg";
-
-const MIGRATION_TABLES = ["__drizzle_migrations", "_prisma_migrations"];
-
-function databaseName(url: string): string {
-	return decodeURIComponent(new URL(url).pathname.slice(1));
-}
-
-async function withClient<T>(url: string, fn: (client: pg.Client) => Promise<T>): Promise<T> {
-	const client = new pg.Client({ connectionString: url });
-	await client.connect();
-	try {
-		return await fn(client);
-	} finally {
-		await client.end();
-	}
-}
-
-/** Creates the database named in `url` if it does not exist. */
-export async function ensureDatabase(url: string): Promise<void> {
-	const name = databaseName(url);
-	const admin = new URL(url);
-	admin.pathname = "/postgres";
-	await withClient(admin.toString(), async (client) => {
-		const found = await client.query("select 1 from pg_database where datname = $1", [name]);
-		if (found.rowCount === 0) await client.query(`create database "${name.replaceAll('"', '""')}"`);
-	});
-}
-
-export async function dropAllTables(url: string): Promise<void> {
-	await withClient(url, async (client) => {
-		await client.query("drop schema if exists drizzle cascade");
-		await client.query("drop schema public cascade");
-		await client.query("create schema public");
-	});
-}
-
-export async function truncateAllTables(url: string): Promise<void> {
-	await withClient(url, async (client) => {
-		const { rows } = await client.query<{ tablename: string }>(
-			"select tablename from pg_tables where schemaname = 'public'",
-		);
-		const tables = rows.map((r) => r.tablename).filter((t) => !MIGRATION_TABLES.includes(t));
-		if (tables.length > 0) {
-			await client.query(
-				`truncate table ${tables.map((t) => `"${t}"`).join(", ")} restart identity cascade`,
-			);
-		}
-	});
-}
+// This app uses PostgreSQL through node-postgres.
+export { dropAllTables, ensureDatabase, truncateAllTables } from "@tatara/db/postgres";

package/templates/features/drizzle/files+mysql/src/core/db/migrate.ts

@@ -1,13 +1 @@
-import { drizzle } from "drizzle-orm/mysql2";
-import { migrate } from "drizzle-orm/mysql2/migrator";
-import mysql from "mysql2/promise";
-
-/** Applies ./drizzle migrations to the database at `url`. */
-export async function migrateDatabase(url: string): Promise<void> {
-	const connection = await mysql.createConnection({ uri: url });
-	try {
-		await migrate(drizzle({ client: connection }), { migrationsFolder: "drizzle" });
-	} finally {
-		await connection.end();
-	}
-}
+export { migrateDatabase } from "@tatara/db/drizzle-mysql";

package/templates/features/drizzle/files+postgres/src/core/db/migrate.ts

@@ -1,13 +1 @@
-import { drizzle } from "drizzle-orm/node-postgres";
-import { migrate } from "drizzle-orm/node-postgres/migrator";
-import pg from "pg";
-
-/** Applies ./drizzle migrations to the database at `url`. */
-export async function migrateDatabase(url: string): Promise<void> {
-	const pool = new pg.Pool({ connectionString: url, max: 1 });
-	try {
-		await migrate(drizzle({ client: pool }), { migrationsFolder: "drizzle" });
-	} finally {
-		await pool.end();
-	}
-}
+export { migrateDatabase } from "@tatara/db/drizzle-postgres";

package/templates/features/prisma/files/src/core/db/migrate.ts

@@ -1,13 +1 @@
-import { execFile } from "node:child_process";
-import { resolve } from "node:path";
-import { promisify } from "node:util";
-
-const run = promisify(execFile);
-
-/** Applies prisma/migrations to the database at `url` (`prisma migrate deploy`). */
-export async function migrateDatabase(url: string): Promise<void> {
-	await run(resolve("node_modules/.bin/prisma"), ["migrate", "deploy"], {
-		// tatara-check-ignore env-access: the Prisma CLI needs the full environment
-		env: { ...process.env, DATABASE_URL: url },
-	});
-}
+export { migrateDatabase } from "@tatara/db/prisma";

package/templates/generators/resource/files+drizzle/src/modules/__moduleKebab__/services/__nameKebab__.service.ts

@@ -1,6 +1,6 @@
 import { count, desc, eq } from "drizzle-orm";
 import { db, type Executor } from "#core/db/client";
-import { newId } from "#core/db/id";
+import { newId } from "@tatara/db";
 import { NotFoundError } from "@tatara/http";
 import type { PaginationQuery } from "@tatara/http";
 import { __namePluralCamel__ } from "#modules/__moduleKebab__/db/__nameKebab__.schema";

package/templates/generators/resource/files+prisma/src/modules/__moduleKebab__/services/__nameKebab__.service.ts

@@ -1,5 +1,5 @@
 import { db, type Executor } from "#core/db/client";
-import { newId } from "#core/db/id";
+import { newId } from "@tatara/db";
 import { NotFoundError } from "@tatara/http";
 import type { PaginationQuery } from "@tatara/http";
 import type {

package/templates/versions.json

@@ -32,5 +32,7 @@
   "nodemailer": "10.1.1",
   "@types/nodemailer": "8.0.2",
   "@tatara/core": "0.1.0",
-  "@tatara/http": "0.1.0"
+  "@tatara/http": "0.1.0",
+  "@tatara/db": "0.1.0",
+  "@tatara/testing": "0.1.0"
 }

package/templates/features/db/files/src/core/db/id.ts

@@ -1,13 +0,0 @@
-import { randomFillSync } from "node:crypto";
-
-/** UUIDv7: random but time-ordered, so sorting by id is sorting by creation time. */
-export function newId(): string {
-	const bytes = new Uint8Array(16);
-	randomFillSync(bytes);
-	const ms = BigInt(Date.now());
-	for (let i = 0; i < 6; i++) bytes[i] = Number((ms >> BigInt(8 * (5 - i))) & 0xffn);
-	bytes[6] = ((bytes[6] ?? 0) & 0x0f) | 0x70;
-	bytes[8] = ((bytes[8] ?? 0) & 0x3f) | 0x80;
-	const hex = [...bytes].map((b) => b.toString(16).padStart(2, "0")).join("");
-	return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
-}

package/templates/features/db/files/src/core/db/seed.ts

@@ -1,14 +0,0 @@
-import type { Logger } from "#core/logging/logger";
-
-export interface SeedDefinition {
-	name: string;
-	/** lower runs first */
-	order?: number;
-	/** must be idempotent: seeds run on every `tatara dev` */
-	run(ctx: { logger: Logger }): Promise<void>;
-}
-
-/** Default export of every `db/seed.ts`; discovered by `tatara sync`. */
-export function defineSeed(definition: SeedDefinition): SeedDefinition {
-	return definition;
-}

package/templates/features/db/files/tests/helpers/database-url.ts

@@ -1,9 +0,0 @@
-/** Number of Vitest workers; global setup prepares one database per worker. */
-export const TEST_WORKERS = 4;
-
-/** postgres://…/app_test → postgres://…/app_test_<worker> */
-export function workerDatabaseUrl(baseUrl: string, worker: number | string): string {
-	const url = new URL(baseUrl);
-	url.pathname = `${url.pathname}_${worker}`;
-	return url.toString();
-}