@newt-app/templates 0.20.2 → 0.21.0

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 type TemplateData = {
     projectName: string;
     testing: 'jest' | 'vitest';
+    database: 'sqlite' | 'postgres';
 };
 type Template = {
     filename: string;
@@ -36,6 +37,8 @@ declare const templates: {
     web: Module;
     api: Module;
     auth: Module;
+    dbSqlite: Module;
+    dbPostgres: Module;
     ui: Module;
     shadcnUi: Module;
     eslintConfig: Module;

package/dist/index.js

@@ -14,6 +14,7 @@ var package_json_default = {
     "test": "turbo run test",
     "format": "prettier --write \\"**/*.{ts,tsx,js,jsx,json,md,yaml,yml}\\"",
     "format:check": "prettier --check \\"**/*.{ts,tsx,js,jsx,json,md,yaml,yml}\\"",
+    "db:make": "pnpm --filter @<%= projectName %>/db run make",
     "db:migrate": "turbo run migrate",
     "db:generate": "turbo run generate"
   },
@@ -127,6 +128,7 @@ var turbo_json_default = {
       "persistent": true
     },
     "migrate": {
+      "dependsOn": ["^migrate"],
       "cache": false
     },
     "generate": {
@@ -179,9 +181,9 @@ Open [http://localhost:3000](http://localhost:3000).
 // src/root/templates/env-example.ts
 var env_example_default = {
   filename: ".env",
-  template: `# Uses a local SQLite file (dev.db) unless DATABASE_URL is set
-# DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres
-BETTER_AUTH_URL=http://localhost:3000
+  template: `<% if (database === 'postgres') { %>DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres
+<% } else { %># Local SQLite database, written to dev.db at the repo root
+<% } %>BETTER_AUTH_URL=http://localhost:3000
 BETTER_AUTH_SECRET=your-secret-here`
 };
 
@@ -787,6 +789,7 @@ var package_json_default3 = {
     "@nestjs/core": "^11.0.1",
     "@nestjs/platform-express": "^11.0.1",
     "@<%= projectName %>/auth": "workspace:*",
+    "@<%= projectName %>/db": "workspace:*",
     "@thallesp/nestjs-better-auth": "^2.5.1",
     "dotenv": "^17.3.1",
     "reflect-metadata": "^0.2.2",
@@ -1001,15 +1004,12 @@ var package_json_default4 = {
     "generate": "dotenv -e ../../.env -- auth generate --config src/index.ts"
   },
   "dependencies": {
+    "@<%= projectName %>/db": "workspace:*",
     "auth": "^1.5.5",
-    "better-auth": "^1.2.8",
-    "better-sqlite3": "^12.11.1",
-    "pg": "^8.14.1"
+    "better-auth": "^1.2.8"
   },
   "devDependencies": {
     "@<%= projectName %>/typescript-config": "workspace:*",
-    "@types/better-sqlite3": "^7.6.13",
-    "@types/pg": "^8.11.13",
     "dotenv-cli": "^11.0.0",
     "typescript": "6.0.2"
   }
@@ -1020,16 +1020,10 @@ var package_json_default4 = {
 var src_index_default = {
   filename: "packages/auth/src/index.ts",
   template: `import { betterAuth } from "better-auth";
-import { Pool } from "pg";
-import Database from "better-sqlite3";
-import path from "node:path";
-
-const database = process.env.DATABASE_URL
-  ? new Pool({ connectionString: process.env.DATABASE_URL })
-  : new Database(path.resolve(process.cwd(), "../../dev.db"));
+import { driver } from "@<%= projectName %>/db";
 
 export const auth = betterAuth({
-  database,
+  database: driver,
   emailAndPassword: { enabled: true },
   trustedOrigins: [process.env.BETTER_AUTH_URL ?? "http://localhost:3000"],
 });
@@ -1042,14 +1036,11 @@ var tsconfig_default3 = {
   filename: "packages/auth/tsconfig.json",
   template: `{
   "compilerOptions": {
-    "declaration": true,
-    "declarationMap": true,
     "esModuleInterop": true,
     "lib": ["es2022"],
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
-    "outDir": "dist",
-    "rootDir": "src",
+    "noEmit": true,
     "skipLibCheck": true,
     "strict": true,
     "target": "ES2022"
@@ -1065,6 +1056,236 @@ var auth = {
 };
 var auth_default = auth;
 
+// src/db/templates/tsconfig.ts
+var tsconfig_default4 = {
+  filename: "packages/db/tsconfig.json",
+  template: `{
+  "compilerOptions": {
+    "esModuleInterop": true,
+    "lib": ["es2022"],
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "noEmit": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "target": "ES2022"
+  },
+  "include": ["src", "scripts"],
+  "exclude": ["node_modules", "dist"]
+}`
+};
+
+// src/db/templates/src-schema.ts
+var src_schema_default = {
+  filename: "packages/db/src/schema.ts",
+  template: `// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+export interface DB {}`
+};
+
+// src/db/templates/src-migrate.ts
+var src_migrate_default = {
+  filename: "packages/db/src/migrate.ts",
+  template: `import { promises as fs } from "node:fs";
+import path from "node:path";
+import { FileMigrationProvider, Migrator } from "kysely";
+import { db } from "./index.js";
+
+async function main() {
+  const migrator = new Migrator({
+    db,
+    provider: new FileMigrationProvider({
+      fs,
+      path,
+      migrationFolder: path.join(process.cwd(), "src/migrations"),
+    }),
+  });
+
+  const { error, results } = await migrator.migrateToLatest();
+
+  for (const it of results ?? []) {
+    if (it.status === "Success") {
+      console.log("applied " + it.migrationName);
+    } else if (it.status === "Error") {
+      console.error("failed " + it.migrationName);
+    }
+  }
+
+  if (error) {
+    console.error("migration failed");
+    console.error(error);
+    process.exit(1);
+  }
+
+  await db.destroy();
+}
+
+main();`
+};
+
+// src/db/templates/scripts-new-migration.ts
+var scripts_new_migration_default = {
+  filename: "packages/db/scripts/new-migration.ts",
+  template: `import { promises as fs } from "node:fs";
+import path from "node:path";
+
+async function main() {
+  const name = process.argv[2];
+  if (!name) {
+    console.error("Usage: pnpm db:make <name>");
+    process.exit(1);
+  }
+
+  const timestamp = new Date()
+    .toISOString()
+    .replace(/[-:T]/g, "")
+    .slice(0, 14);
+  const slug = name.replace(/[^a-zA-Z0-9]+/g, "_").replace(/^_+|_+$/g, "");
+  const filename = timestamp + "_" + slug + ".ts";
+  const dir = path.join(process.cwd(), "src/migrations");
+  const stub = [
+    'import { Kysely, sql } from "kysely";',
+    "",
+    "export async function up(db: Kysely<any>): Promise<void> {",
+    "  // await db.schema.createTable(...).execute();",
+    "}",
+    "",
+    "export async function down(db: Kysely<any>): Promise<void> {",
+    "  // await db.schema.dropTable(...).execute();",
+    "}",
+    "",
+  ].join("\\n");
+
+  await fs.mkdir(dir, { recursive: true });
+  await fs.writeFile(path.join(dir, filename), stub);
+  console.log("created src/migrations/" + filename);
+}
+
+main();`
+};
+
+// src/db/templates/migrations-readme.ts
+var migrations_readme_default = {
+  filename: "packages/db/src/migrations/README.md",
+  template: `# Migrations
+
+Kysely migrations run in filename order. Each file exports \`up\` and \`down\`.
+
+\`\`\`bash
+pnpm db:make add_widgets   # scaffold a new migration
+pnpm db:migrate            # apply pending migrations
+\`\`\`
+
+Migrations are written with Kysely's schema builder, so one file compiles to
+both SQLite (dev) and Postgres (prod). Prefer dialect-agnostic column types
+(\`text\`, \`integer\`) and app-generated string ids over auto-increment.`
+};
+
+// src/db/templates/package-json-sqlite.ts
+var package_json_sqlite_default = {
+  filename: "packages/db/package.json",
+  template: `{
+  "name": "@<%= projectName %>/db",
+  "version": "0.0.0",
+  "private": true,
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "migrate": "dotenv -e ../../.env -- tsx src/migrate.ts",
+    "make": "tsx scripts/new-migration.ts"
+  },
+  "dependencies": {
+    "better-sqlite3": "^12.11.1",
+    "kysely": "^0.28.2"
+  },
+  "devDependencies": {
+    "@<%= projectName %>/typescript-config": "workspace:*",
+    "@types/better-sqlite3": "^7.6.13",
+    "dotenv-cli": "^11.0.0",
+    "tsx": "^4.19.2",
+    "typescript": "6.0.2"
+  }
+}`
+};
+
+// src/db/templates/package-json-postgres.ts
+var package_json_postgres_default = {
+  filename: "packages/db/package.json",
+  template: `{
+  "name": "@<%= projectName %>/db",
+  "version": "0.0.0",
+  "private": true,
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "migrate": "dotenv -e ../../.env -- tsx src/migrate.ts",
+    "make": "tsx scripts/new-migration.ts"
+  },
+  "dependencies": {
+    "kysely": "^0.28.2",
+    "pg": "^8.14.1"
+  },
+  "devDependencies": {
+    "@<%= projectName %>/typescript-config": "workspace:*",
+    "@types/pg": "^8.11.13",
+    "dotenv-cli": "^11.0.0",
+    "tsx": "^4.19.2",
+    "typescript": "6.0.2"
+  }
+}`
+};
+
+// src/db/templates/src-index-sqlite.ts
+var src_index_sqlite_default = {
+  filename: "packages/db/src/index.ts",
+  template: `import BetterSqlite3 from "better-sqlite3";
+import { Kysely, SqliteDialect } from "kysely";
+import path from "node:path";
+import type { DB } from "./schema.js";
+
+export const driver = new BetterSqlite3(
+  path.resolve(process.cwd(), "../../dev.db"),
+);
+
+export const db = new Kysely<DB>({
+  dialect: new SqliteDialect({ database: driver }),
+});
+
+export type Database = Kysely<DB>;`
+};
+
+// src/db/templates/src-index-postgres.ts
+var src_index_postgres_default = {
+  filename: "packages/db/src/index.ts",
+  template: `import { Kysely, PostgresDialect } from "kysely";
+import { Pool } from "pg";
+import type { DB } from "./schema.js";
+
+export const driver = new Pool({ connectionString: process.env.DATABASE_URL });
+
+export const db = new Kysely<DB>({
+  dialect: new PostgresDialect({ pool: driver }),
+});
+
+export type Database = Kysely<DB>;`
+};
+
+// src/db/index.ts
+var shared = [
+  tsconfig_default4,
+  src_schema_default,
+  src_migrate_default,
+  scripts_new_migration_default,
+  migrations_readme_default
+];
+var dbSqlite = {
+  templates: [...shared, package_json_sqlite_default, src_index_sqlite_default]
+};
+var dbPostgres = {
+  templates: [...shared, package_json_postgres_default, src_index_postgres_default]
+};
+
 // src/ui/templates/package-json.ts
 var package_json_default5 = {
   filename: "packages/ui/package.json",
@@ -1313,7 +1534,7 @@ export default config;`
 };
 
 // src/ui/templates/tsconfig.ts
-var tsconfig_default4 = {
+var tsconfig_default5 = {
   filename: "packages/ui/tsconfig.json",
   template: `{
   "extends": "@<%= projectName %>/typescript-config/react-library.json",
@@ -1337,7 +1558,7 @@ export default config;`
 
 // src/ui/index.ts
 var ui = {
-  templates: [package_json_default5, button_default, card_default, code_default, link_default, logo_default, utils_default, globals_css_default, postcss_config_default2, tsconfig_default4, eslint_config_default3]
+  templates: [package_json_default5, button_default, card_default, code_default, link_default, logo_default, utils_default, globals_css_default, postcss_config_default2, tsconfig_default5, eslint_config_default3]
 };
 var ui_default = ui;
 
@@ -1627,7 +1848,7 @@ export default config;`
 };
 
 // src/shadcn-ui/templates/tsconfig.ts
-var tsconfig_default5 = {
+var tsconfig_default6 = {
   filename: "packages/ui/tsconfig.json",
   template: `{
   "extends": "@<%= projectName %>/typescript-config/react-library.json",
@@ -9003,7 +9224,7 @@ var shadcnUi = {
     use_mobile_default,
     globals_css_default2,
     postcss_config_default3,
-    tsconfig_default5,
+    tsconfig_default6,
     eslint_config_default4,
     link_default2,
     logo_default2,
@@ -10034,6 +10255,7 @@ var api_package_json_default3 = {
     "@nestjs/common": "^11.0.1",
     "@nestjs/core": "^11.0.1",
     "@<%= projectName %>/auth": "workspace:*",
+    "@<%= projectName %>/db": "workspace:*",
     "@thallesp/nestjs-better-auth": "^2.5.1",
     "dotenv": "^17.3.1",
     "reflect-metadata": "^0.2.2",
@@ -10140,6 +10362,7 @@ var web_package_json_default2 = {
   "dependencies": {
     "@<%= projectName %>/api": "workspace:*",
     "@<%= projectName %>/auth": "workspace:*",
+    "@<%= projectName %>/db": "workspace:*",
     "@<%= projectName %>/ui": "workspace:*",
     "@nestjs/common": "^11.0.1",
     "@nestjs/core": "^11.0.1",
@@ -10179,6 +10402,7 @@ dotenv.config({ path: resolve(process.cwd(), '.env') });
 const nextConfig = {
   serverExternalPackages: [
     '@<%= projectName %>/api',
+    '@<%= projectName %>/db',
     '@nestjs/core',
     '@nestjs/common',
     '@nestjs/microservices',
@@ -10372,39 +10596,68 @@ export class TodosModule {}`
 var todos_service_default = {
   filename: "apps/api/src/todos/todos.service.ts",
   template: `import { Injectable, NotFoundException } from '@nestjs/common';
+import { randomUUID } from 'node:crypto';
+import { db } from '@<%= projectName %>/db';
 
 export interface Todo {
-  id: number;
+  id: string;
   title: string;
   done: boolean;
+  createdAt: string;
 }
 
+const columns = ['id', 'title', 'done', 'createdAt'] as const;
+
 @Injectable()
 export class TodosService {
-  private todos: Todo[] = [];
-  private nextId = 1;
-
-  findAll(): Todo[] {
-    return this.todos;
+  async findAll(): Promise<Todo[]> {
+    const rows = await db
+      .selectFrom('todo')
+      .select(columns)
+      .orderBy('createdAt desc')
+      .execute();
+    return rows.map((row) => ({ ...row, done: Boolean(row.done) }));
   }
 
-  create(title: string): Todo {
-    const todo: Todo = { id: this.nextId++, title, done: false };
-    this.todos.push(todo);
-    return todo;
+  async create(title: string): Promise<Todo> {
+    const id = randomUUID();
+    await db.insertInto('todo').values({ id, title }).execute();
+    const row = await db
+      .selectFrom('todo')
+      .select(columns)
+      .where('id', '=', id)
+      .executeTakeFirstOrThrow();
+    return { ...row, done: Boolean(row.done) };
   }
 
-  toggle(id: number): Todo {
-    const todo = this.todos.find((t) => t.id === id);
-    if (!todo) throw new NotFoundException(\`Todo \${id} not found\`);
-    todo.done = !todo.done;
-    return todo;
+  async toggle(id: string): Promise<Todo> {
+    const current = await db
+      .selectFrom('todo')
+      .select('done')
+      .where('id', '=', id)
+      .executeTakeFirst();
+    if (!current) throw new NotFoundException('Todo ' + id + ' not found');
+    await db
+      .updateTable('todo')
+      .set({ done: current.done ? 0 : 1 })
+      .where('id', '=', id)
+      .execute();
+    const row = await db
+      .selectFrom('todo')
+      .select(columns)
+      .where('id', '=', id)
+      .executeTakeFirstOrThrow();
+    return { ...row, done: Boolean(row.done) };
   }
 
-  remove(id: number): void {
-    const index = this.todos.findIndex((t) => t.id === id);
-    if (index === -1) throw new NotFoundException(\`Todo \${id} not found\`);
-    this.todos.splice(index, 1);
+  async remove(id: string): Promise<void> {
+    const result = await db
+      .deleteFrom('todo')
+      .where('id', '=', id)
+      .executeTakeFirst();
+    if (!result.numDeletedRows) {
+      throw new NotFoundException('Todo ' + id + ' not found');
+    }
   }
 }`
 };
@@ -10432,6 +10685,45 @@ describe('TodosService', () => {
 });`
 };
 
+// src/todo-example/templates/db-schema.ts
+var db_schema_default = {
+  filename: "packages/db/src/schema.ts",
+  template: `import type { Generated } from "kysely";
+
+export interface TodoTable {
+  id: string;
+  title: string;
+  done: Generated<number>;
+  createdAt: Generated<string>;
+}
+
+export interface DB {
+  todo: TodoTable;
+}`
+};
+
+// src/todo-example/templates/db-migration-todos.ts
+var db_migration_todos_default = {
+  filename: "packages/db/src/migrations/0001_create_todos.ts",
+  template: `import { Kysely, sql } from "kysely";
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .createTable("todo")
+    .addColumn("id", "text", (c) => c.primaryKey())
+    .addColumn("title", "text", (c) => c.notNull())
+    .addColumn("done", "integer", (c) => c.notNull().defaultTo(0))
+    .addColumn("createdAt", "text", (c) =>
+      c.notNull().defaultTo(sql\`CURRENT_TIMESTAMP\`),
+    )
+    .execute();
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await db.schema.dropTable("todo").execute();
+}`
+};
+
 // src/todo-example/templates/todos-controller.ts
 var todos_controller_default = {
   filename: "apps/api/src/todos/todos.controller.ts",
@@ -10462,12 +10754,12 @@ export class TodosController {
 
   @Patch(':id/toggle')
   toggle(@Param('id') id: string) {
-    return this.todosService.toggle(Number(id));
+    return this.todosService.toggle(id);
   }
 
   @Delete(':id')
   remove(@Param('id') id: string) {
-    return this.todosService.remove(Number(id));
+    return this.todosService.remove(id);
   }
 }`
 };
@@ -10537,13 +10829,13 @@ import { TodosService } from '@<%= projectName %>/api';
 
 export async function GET() {
   const todos = await inject(TodosService);
-  return NextResponse.json(todos.findAll());
+  return NextResponse.json(await todos.findAll());
 }
 
 export async function POST(req: Request) {
   const { title } = await req.json();
   const todos = await inject(TodosService);
-  return NextResponse.json(todos.create(title), { status: 201 });
+  return NextResponse.json(await todos.create(title), { status: 201 });
 }`
 };
 
@@ -10557,7 +10849,7 @@ import { TodosService } from '@<%= projectName %>/api';
 export async function DELETE(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params;
   const todos = await inject(TodosService);
-  todos.remove(Number(id));
+  await todos.remove(id);
   return new NextResponse(null, { status: 204 });
 }`
 };
@@ -10572,7 +10864,7 @@ import { TodosService } from '@<%= projectName %>/api';
 export async function PATCH(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params;
   const todos = await inject(TodosService);
-  return NextResponse.json(todos.toggle(Number(id)));
+  return NextResponse.json(await todos.toggle(id));
 }`
 };
 
@@ -10587,7 +10879,7 @@ import { authClient } from '@/lib/auth-client';
 import { Button } from '@<%= projectName %>/ui/button';
 
 interface Todo {
-  id: number;
+  id: string;
   title: string;
   done: boolean;
 }
@@ -10600,9 +10892,9 @@ const api = {
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ title }),
     }).then((r) => r.json()),
-  toggleTodo: (id: number): Promise<Todo> =>
+  toggleTodo: (id: string): Promise<Todo> =>
     fetch(\`/api/todos/\${id}/toggle\`, { method: 'PATCH' }).then((r) => r.json()),
-  deleteTodo: (id: number): Promise<void> =>
+  deleteTodo: (id: string): Promise<void> =>
     fetch(\`/api/todos/\${id}\`, { method: 'DELETE' }).then(() => undefined),
 };
 
@@ -10813,7 +11105,7 @@ import { Input } from '@<%= projectName %>/ui/input';
 import { Checkbox } from '@<%= projectName %>/ui/checkbox';
 
 interface Todo {
-  id: number;
+  id: string;
   title: string;
   done: boolean;
 }
@@ -10826,9 +11118,9 @@ const api = {
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ title }),
     }).then((r) => r.json()),
-  toggleTodo: (id: number): Promise<Todo> =>
+  toggleTodo: (id: string): Promise<Todo> =>
     fetch(\`/api/todos/\${id}/toggle\`, { method: 'PATCH' }).then((r) => r.json()),
-  deleteTodo: (id: number): Promise<void> =>
+  deleteTodo: (id: string): Promise<void> =>
     fetch(\`/api/todos/\${id}\`, { method: 'DELETE' }).then(() => undefined),
 };
 
@@ -11053,7 +11345,13 @@ export default function Home() {
 
 // src/todo-example/index.ts
 var todoExampleApi = {
-  templates: [todos_module_default, todos_service_default, todos_service_spec_default]
+  templates: [
+    todos_module_default,
+    todos_service_default,
+    todos_service_spec_default,
+    db_schema_default,
+    db_migration_todos_default
+  ]
 };
 var todoExampleControllers = {
   templates: [todos_controller_default, todos_module_controllers_default, app_module_controllers_default]
@@ -11079,6 +11377,8 @@ var templates = {
   web: web_default,
   api: api_default,
   auth: auth_default,
+  dbSqlite,
+  dbPostgres,
   ui: ui_default,
   shadcnUi: shadcn_ui_default,
   eslintConfig: eslint_config_default5,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newt-app/templates",
-  "version": "0.20.2",
+  "version": "0.21.0",
   "private": false,
   "description": "Templates for newt-app",
   "type": "module",