@nest-arch/tui 0.4.0 → 0.4.4

package/dist/templates/addons/husky/pre-commit.hbs

@@ -1,31 +1,16 @@
-{{#if isPnpm}}pnpm test{{else if isYarn}}yarn test{{else if isBun}}bun run test{{else}}npm test{{/if}}
-
-# ultracite
 #!/bin/sh
-# Exit on any error
 set -e
 
-# Check if there are any staged files
-STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACMR)
-if [ -z "$STAGED_FILES" ]; then
-  echo "No staged files to format"
-  exit 0
-fi
-
-# Run formatter
-{{#if isPnpm}}pnpm dlx ultracite fix{{else if isYarn}}yarn dlx ultracite fix{{else if isBun}}bunx ultracite fix{{else}}npx --yes ultracite fix{{/if}}
-FORMAT_EXIT_CODE=$?
-
-# Re-stage files that were already staged
-echo "$STAGED_FILES" | while IFS= read -r file; do
-  if [ -f "$file" ]; then
-    git add -- "$file"
-  fi
-done
+{{#if isPnpm}}pnpm test{{else if isYarn}}yarn test{{else if isBun}}bun run test{{else}}npm test{{/if}}
 
-if [ $FORMAT_EXIT_CODE -ne 0 ]; then
-  echo "Ultracite found issues that could not be auto-fixed."
-  exit $FORMAT_EXIT_CODE
+{{#if hasFormatter}}
+STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACMR)
+if [ -n "$STAGED_FILES" ]; then
+  {{#if isPnpm}}pnpm run fix{{else if isYarn}}yarn run fix{{else if isBun}}bun run fix{{else}}npm run fix{{/if}}
+  echo "$STAGED_FILES" | while IFS= read -r file; do
+    if [ -f "$file" ]; then
+      git add -- "$file"
+    fi
+  done
 fi
-
-echo "✨ Files formatted by Ultracite"
+{{/if}}

package/dist/templates/base/.env.example.hbs

@@ -2,6 +2,8 @@
 PORT=3000
 NODE_ENV=development
 CORS_ORIGIN=http://localhost:3001
+# Comma-separated trusted reverse proxy IP addresses or CIDRs
+TRUSTED_PROXY_IPS={{#each trustedProxyIps}}{{#unless @first}},{{/unless}}{{this}}{{/each}}
 
 {{#if hasDatabase}}
 # Database
@@ -35,4 +37,11 @@ JWT_REFRESH_SECRET=change-me-to-a-different-random-secret-at-least-32-characters
 # Better Auth
 BETTER_AUTH_SECRET=change-me-to-a-random-secret-at-least-32-characters-long
 BETTER_AUTH_URL=http://localhost:3000
+{{#if (eq auth "better-auth:stateless")}}
+# OIDC provider; register http://localhost:3000/api/auth/callback/$OIDC_PROVIDER_ID as its callback URL
+OIDC_PROVIDER_ID=company-oidc
+OIDC_CLIENT_ID=replace-with-provider-client-id
+OIDC_CLIENT_SECRET=replace-with-provider-client-secret
+OIDC_DISCOVERY_URL=https://identity.example.com/.well-known/openid-configuration
+{{/if}}
 {{/if}}

package/dist/templates/base/.env.hbs

@@ -1,5 +1,6 @@
 CORS_ORIGIN=http://localhost:3001
 PORT=3000
+TRUSTED_PROXY_IPS={{#each trustedProxyIps}}{{#unless @first}},{{/unless}}{{this}}{{/each}}
 {{#if hasGraphql}}
 GRAPHQL_PLAYGROUND=true
 {{/if}}
@@ -25,4 +26,10 @@ JWT_REFRESH_SECRET=change-me-to-a-different-random-secret-at-least-32-characters
 {{#if (or (eq auth "better-auth") (eq auth "better-auth:stateless"))}}
 BETTER_AUTH_SECRET=change-me-to-a-random-secret-at-least-32-characters-long
 BETTER_AUTH_URL=http://localhost:3000
+{{#if (eq auth "better-auth:stateless")}}
+OIDC_PROVIDER_ID=company-oidc
+OIDC_CLIENT_ID=replace-with-provider-client-id
+OIDC_CLIENT_SECRET=replace-with-provider-client-secret
+OIDC_DISCOVERY_URL=https://identity.example.com/.well-known/openid-configuration
+{{/if}}
 {{/if}}

package/dist/templates/base/README.md.hbs

@@ -36,6 +36,12 @@ npm run start{{/if}}
 {{#if isPnpm}}pnpm test:cov{{else if isYarn}}yarn test:cov{{else if isBun}}bun run test:cov{{else}}npm run test:cov{{/if}}
 ```
 
+{{#if hasRateLimiting}}
+## Reverse Proxy
+
+Set `TRUSTED_PROXY_IPS` to the IP addresses or CIDRs of your trusted reverse proxies. Leave it empty when clients connect directly. The application uses this allowlist when reading forwarded client IP headers for rate limiting.
+{{/if}}
+
 {{#if usePrisma}}
 ## Database Setup
 
@@ -79,6 +85,11 @@ This project uses **TypeORM** as the ORM. Available commands:
 {{#if (or (eq auth "better-auth") (eq auth "better-auth:stateless"))}}
 ## Auth Setup
 
+{{#if (eq auth "better-auth:stateless")}}
+This project uses **Better Auth** with encrypted stateless cookie sessions and an external OpenID Connect provider. Set `BETTER_AUTH_SECRET`, `BETTER_AUTH_URL`, `OIDC_PROVIDER_ID`, `OIDC_CLIENT_ID`, `OIDC_CLIENT_SECRET`, and `OIDC_DISCOVERY_URL` in `.env`. Register `${BETTER_AUTH_URL}/api/auth/callback/${OIDC_PROVIDER_ID}` with the provider, then begin the authorization-code flow through Better Auth's social sign-in endpoint. The generated configuration uses discovery, PKCE, and issuer validation.
+
+No local registration, password login, database migration, or immediate server-side revocation is included in this profile.
+{{else}}
 This project uses **Better Auth** with database-backed sessions. Set `BETTER_AUTH_SECRET` and `BETTER_AUTH_URL` in `.env` before running the generated scripts.
 
 Run `auth:generate` with your package manager. The script uses the installed CLI version.
@@ -91,6 +102,7 @@ Then run `auth:migrate` and `build`.
 {{/if}}
 
 The runtime auth module receives the database client owned by Nest. CLI schema discovery uses separate configuration. `GET /api/auth-profile` is a protected example for the Prisma and Drizzle profiles.
+{{/if}}
 
 ### Usage
 
@@ -195,6 +207,7 @@ export class AppModule {}
 {{#if isPassportAuth}}
 ## Passport authentication
 
+{{#if hasDatabase}}
 Set a random `JWT_ACCESS_SECRET` of at least 32 characters. Configure `JWT_ISSUER`, `JWT_AUDIENCE`, and `JWT_KEY_ID` consistently across instances. Apply Prisma migrations before starting.
 
 Register with `POST /api/auth/register` and sign in with `POST /api/auth/login`, using `{ "email": "user@example.com", "password": "a-long-unique-password" }`. Send the returned access token in `Authorization: Bearer <token>` to `GET /api/auth/profile`. Access tokens expire after 15 minutes. Passwords are hashed with bcrypt; token payloads contain no password or role supplied by the client.
@@ -202,6 +215,9 @@ Register with `POST /api/auth/register` and sign in with `POST /api/auth/login`,
 Refresh with `POST /api/auth/refresh` and `{ "refreshToken": "..." }`. Refresh tokens rotate on every use and expire seven days after login. Reusing a consumed token revokes the entire login session, including access tokens. Concurrent refresh requests therefore require client-side serialization. `POST /api/auth/logout` takes the same body and revokes that login session. Tokens are returned in JSON; no cookie transport is generated.
 
 Only hashes of refresh tokens are stored. Schedule deletion of expired refresh-token families according to your retention policy. Secret replacement invalidates existing access tokens; overlapping signing keys are not implemented in this baseline.
+{{else}}
+Configure `OIDC_JWKS_URI`, `OIDC_ISSUER`, and `OIDC_AUDIENCE` for your trusted identity provider. Send its RS256 access token in `Authorization: Bearer <token>` to `GET /api/auth/profile`. The API verifies the signature using the provider's cached, rate-limited JWKS keys and checks the issuer, audience, and expiration. This API does not accept passwords or issue local tokens.
+{{/if}}
 {{/if}}
 {{#if hasGraphql}}
 ## GraphQL

package/dist/templates/base/pnpm-workspace.yaml.hbs

@@ -4,6 +4,9 @@ allowBuilds:
 {{/if}}
   protobufjs: true
   "@nestjs/core": true
+{{#if useTypescript7}}
+  esbuild: true
+{{/if}}
 {{#if swagger}}
   "@scarf/scarf": true
 {{/if}}
@@ -13,6 +16,9 @@ allowBuilds:
 {{#if usePrisma}}
   prisma: true
   "@prisma/engines": true
+  {{#if isPrisma6}}
+  "@prisma/client": true
+  {{/if}}
   {{#if isPrisma8}}
   esbuild: true
   msgpackr-extract: true

package/dist/templates/base/src/app.module.ts.hbs

@@ -1,4 +1,7 @@
-import { Module } from "@nestjs/common";
+import { Module{{#if (and hasGraphql hasRateLimiting)}}, Injectable, type ExecutionContext{{/if}} } from "@nestjs/common";
+{{#if (and hasGraphql hasRateLimiting)}}
+import { GqlExecutionContext } from "@nestjs/graphql";
+{{/if}}
 {{#if (and isPassportAuth hasDatabase)}}
 import { PassportModule } from "@nestjs/passport";
 {{/if}}
@@ -13,8 +16,10 @@ import { AuthModule } from "./auth/auth.module.js";
 {{#if hasGraphql}}
 import { GqlAuthGuard } from "./auth/guards/gql-auth.guard.js";
 {{/if}}
+{{#if hasRest}}
 import { RestAuthGuard } from "./auth/guards/rest-auth.guard.js";
 {{/if}}
+{{/if}}
 {{#if hasGraphql}}
 import { GraphqlAppModule } from "./graphql/graphql.module.js";
 {{/if}}
@@ -26,6 +31,9 @@ import { AppErrorHandler } from "./libs/trpc/error.handler.js";
 {{#if hasTrpcAndAuth}}
 import { AuthTRPCMiddleware } from "./libs/middlewares/auth.trpc.middleware.js";
 {{/if}}
+{{#if (and hasTrpc hasRateLimiting)}}
+import { RateLimitTRPCMiddleware } from "./libs/middlewares/rate-limit.trpc.middleware.js";
+{{/if}}
 {{/if}}
 
 {{#if hasRest}}
@@ -37,8 +45,35 @@ import { TodoModule } from "./api/todo/todo.module.js";
 {{#if (and hasTrpc hasTodoExample hasRest)}}
 import { TodoRouter } from "./api/todo/todo.router.js";
 {{/if}}
+{{#if hasHealthCheck}}
+import { HealthModule } from "./health/health.module.js";
+{{/if}}
+{{#if hasRateLimiting}}
+import { APP_GUARD } from "@nestjs/core";
+import { ThrottlerGuard, ThrottlerModule } from "@nestjs/throttler";
+{{/if}}
+{{#if (and isPassportAuth hasDatabase hasGraphql (not hasRateLimiting))}}
+import { APP_GUARD } from "@nestjs/core";
+{{/if}}
 import { AppService } from "./app.service.js";
 
+{{#if (and hasGraphql hasRateLimiting)}}
+@Injectable()
+class GraphqlThrottlerGuard extends ThrottlerGuard {
+  protected getRequestResponse(context: ExecutionContext) {
+    if (context.getType<string>() !== "graphql") return super.getRequestResponse(context);
+    const gqlContext = GqlExecutionContext.create(context).getContext();
+    return { req: gqlContext.req, res: { header: () => undefined } };
+  }
+
+  protected getTracker(request: Record<string, unknown>): Promise<string> {
+    const socket = request.socket as { remoteAddress?: string } | undefined;
+    const ip = request.ip;
+    return Promise.resolve(typeof ip === "string" ? ip : socket?.remoteAddress ?? "unknown");
+  }
+}
+{{/if}}
+
 @Module({
   {{#if hasRest}}
   controllers: [
@@ -67,11 +102,28 @@ import { AppService } from "./app.service.js";
     TRPCModule.forRoot({
       context: AppContext,
       onError: AppErrorHandler,
+      {{#if hasRateLimiting}}
+      globalMiddlewares: [RateLimitTRPCMiddleware],
+      {{/if}}
     }),
     {{/if}}
     {{#if (and hasTodoExample (or hasRest hasTrpc))}}
     TodoModule,
     {{/if}}
+    {{#if hasHealthCheck}}
+    HealthModule,
+    {{/if}}
+    {{#if hasRateLimiting}}
+    ThrottlerModule.forRoot([
+      {
+        ttl: 60_000,
+        limit: 60,
+        {{#if hasGraphql}}
+        setHeaders: false,
+        {{/if}}
+      },
+    ]),
+    {{/if}}
   ],
   providers: [
     AppService,
@@ -79,12 +131,17 @@ import { AppService } from "./app.service.js";
     {{#if hasGraphql}}
     GqlAuthGuard,
     {{/if}}
+    {{#if hasRest}}
     RestAuthGuard,
     {{/if}}
+    {{/if}}
     {{#if hasTrpc}}
     {{#if hasTrpcAndAuth}}
     AuthTRPCMiddleware,
     {{/if}}
+    {{#if hasRateLimiting}}
+    RateLimitTRPCMiddleware,
+    {{/if}}
     AppContext,
     AppErrorHandler,
     AppRouter,
@@ -92,6 +149,16 @@ import { AppService } from "./app.service.js";
     TodoRouter,
     {{/if}}
     {{/if}}
+    {{#if hasRateLimiting}}
+    {
+      provide: APP_GUARD,
+      {{#if hasGraphql}}
+      useClass: GraphqlThrottlerGuard,
+      {{else}}
+      useClass: ThrottlerGuard,
+      {{/if}}
+    },
+    {{/if}}
   ],
 })
 export class AppModule {}

package/dist/templates/base/src/app.router.ts.hbs

@@ -1,7 +1,6 @@
 import { Router, Query{{#if hasTrpcAndAuth}}, UseMiddlewares, Ctx{{/if}} } from "nestjs-trpc";
 import { z } from "zod";
 {{#if hasTrpcAndAuth}}
-import type { UserSession } from "./auth/auth.js";
 import { AuthTRPCMiddleware } from "./libs/middlewares/auth.trpc.middleware.js";
 import type { InnerContext } from "./libs/trpc/inner.context.js";
 {{/if}}
@@ -14,7 +13,7 @@ export class AppRouterClass {
 {{#if hasTrpcAndAuth}}
   @Query()
   @UseMiddlewares(AuthTRPCMiddleware)
-  testAuth(@Ctx() ctx: InnerContext): UserSession {
+  testAuth(@Ctx() ctx: InnerContext): NonNullable<InnerContext["session"]> {
     return ctx.session!;
   }
 

package/dist/templates/base/src/database/adapters/mongo/prisma-mongo.adapter.ts.hbs

@@ -8,9 +8,17 @@ import { db } from '../../prisma/db.js';
 {{/if}}
 {{else}}
 {{#if isMonorepo}}
-import type { PrismaClient } from '../../../database/orm/prisma/generated/client.js';
+{{#if isPrisma6}}
+import type { Prisma, PrismaClient } from '@prisma/client';
 {{else}}
-import type { PrismaClient } from '../../orm/prisma/generated/client.js';
+import type { Prisma, PrismaClient } from '../../database/orm/prisma/generated/client.js';
+{{/if}}
+{{else}}
+{{#if isPrisma6}}
+import type { Prisma, PrismaClient } from '@prisma/client';
+{{else}}
+import type { Prisma, PrismaClient } from '../../orm/prisma/generated/client.js';
+{{/if}}
 {{/if}}
 {{/if}}
 
@@ -38,7 +46,7 @@ export class PrismaMongoAdapter implements IMongoAdapter<any> {
     return this.prisma[name as keyof PrismaClient] as T;
   }
 
-  async runCommand(command: unknown): Promise<unknown> {
+  async runCommand(command: Prisma.InputJsonObject): Promise<unknown> {
     return this.prisma.$runCommandRaw(command);
   }
 

package/dist/templates/base/src/database/adapters/sql/prisma-sql.adapter.ts.hbs

@@ -1,7 +1,7 @@
 import { Injectable, Inject } from '@nestjs/common';
 import { ISqlAdapter } from '../interfaces/db-adapter.interface.js';
 {{#if isMonorepo}}
-import type { PrismaClient } from '../../../database/orm/prisma/generated/client.js';
+import type { PrismaClient } from '../../database/orm/prisma/generated/client.js';
 {{else}}
 import type { PrismaClient } from '../../orm/prisma/generated/client.js';
 {{/if}}

package/dist/templates/base/src/database/db.module.ts.hbs

@@ -14,11 +14,19 @@ import { DynamicModule, Module, Global, Provider } from '@nestjs/common';
 import { DbService } from './db.service.js';
 
 {{#if usePrisma}}
-  {{#if isMonorepo}}
-import { PrismaClient } from '../database/orm/prisma/generated/client.js';
-  {{else}}
+{{#if isMonorepo}}
+{{#if isPrisma6}}
+import { PrismaClient } from '@prisma/client';
+{{else}}
+import { PrismaClient } from './database/orm/prisma/generated/client.js';
+{{/if}}
+{{else}}
+{{#if isPrisma6}}
+import { PrismaClient } from '@prisma/client';
+{{else}}
 import { PrismaClient } from '../database/orm/prisma/generated/client.js';
-  {{/if}}
+{{/if}}
+{{/if}}
   {{#if (or hasPostgres hasMysql hasSqlite)}}
 import { PrismaSqlAdapter } from './adapters/sql/prisma-sql.adapter.js';
   {{/if}}
@@ -38,7 +46,11 @@ import { PrismaMongoAdapter } from './adapters/mongo/prisma-mongo.adapter.js';
 
 {{#if useDrizzle}}
 import { DrizzleSqlAdapter } from './adapters/sql/drizzle-sql.adapter.js';
+{{#if isMonorepo}}
+import * as schema from './database/orm/drizzle/schema.js';
+{{else}}
 import * as schema from './orm/drizzle/schema.js';
+{{/if}}
   {{#if hasPostgres}}
 import { drizzle } from 'drizzle-orm/node-postgres';
 import { Pool } from "pg"
@@ -98,7 +110,11 @@ export interface DbModuleOptions {
 @Global()
 @Module({})
 export class DbModule {
+  {{#if (or usePrisma useDrizzle useRawSql)}}
   static forRoot(options: DbModuleOptions): DynamicModule {
+  {{else}}
+  static forRoot(_options: DbModuleOptions): DynamicModule {
+  {{/if}}
     const initialProviders: Provider[] = [DbService];
     const providers = initialProviders;
 
@@ -158,12 +174,14 @@ export class DbModule {
       useFactory: () => {
         {{#if hasPostgres}}
         const client = new Pool({ connectionString: options.postgresUrl });
+        return drizzle({ client, schema });
         {{else if hasMysql}}
         const client = mysql.createPool({ uri: options.mysqlUrl });
+        return drizzle(client, { schema, mode: "default" });
         {{else}}
         const client = new Database(options.sqlitePath || ':memory:');
-        {{/if}}
         return drizzle({ client, schema });
+        {{/if}}
       },
     });
     providers.push({ provide: 'SQL_ADAPTER', useClass: DrizzleSqlAdapter });
@@ -172,9 +190,7 @@ export class DbModule {
     {{#if useTypeorm}}
     providers.push({
       provide: 'TYPEORM_DATA_SOURCE',
-      useFactory: async () => {
-        return AppDataSource.initialize();
-      },
+      useFactory: () => AppDataSource.initialize(),
     });
     providers.push({
       provide: 'SQL_ADAPTER',

package/dist/templates/base/src/database/db.service.ts.hbs

@@ -25,8 +25,20 @@ import type { ISqlAdapter } from './adapters/interfaces/db-adapter.interface.js'
 import type { IMongoAdapter } from './adapters/interfaces/db-adapter.interface.js';
 {{/if}}
 {{#if usePrisma}}
+{{#if isMonorepo}}
+{{#if isPrisma6}}
+import type { PrismaClient } from '@prisma/client';
+{{else}}
+import type { PrismaClient } from './database/orm/prisma/generated/client.js';
+{{/if}}
+{{else}}
+{{#if isPrisma6}}
+import type { PrismaClient } from '@prisma/client';
+{{else}}
 import type { PrismaClient } from './orm/prisma/generated/client.js';
 {{/if}}
+{{/if}}
+{{/if}}
 {{#if useDrizzle}}
   {{#if hasPostgres}}
 import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
@@ -37,8 +49,12 @@ import type { MySql2Database } from 'drizzle-orm/mysql2';
   {{#if hasSqlite}}
 import type { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
   {{/if}}
+{{#if isMonorepo}}
+import type * as schema from './database/orm/drizzle/schema.js';
+{{else}}
 import type * as schema from './orm/drizzle/schema.js';
 {{/if}}
+{{/if}}
 {{#if useTypeorm}}
 import type { DataSource } from 'typeorm';
 {{/if}}
@@ -102,6 +118,10 @@ export class DbService {
   get prisma(): PrismaClient {
     return this.sql.getClient();
   }
+  {{else if hasMongodb}}
+  get prisma(): PrismaClient {
+    return this.mongo.getClient();
+  }
   {{/if}}
 {{/if}}
 {{#if useDrizzle}}

package/dist/templates/base/src/database/entities/app.entity.ts.hbs

@@ -0,0 +1,25 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+} from "typeorm";
+
+@Entity("app_data")
+export class AppEntity {
+  @PrimaryGeneratedColumn("uuid")
+  id: string;
+
+  @Column({ type: "varchar", length: 255, unique: true })
+  key: string;
+
+  @Column({ type: "text" })
+  value: string;
+
+  @CreateDateColumn({ name: "created_at" })
+  createdAt: Date;
+
+  @UpdateDateColumn({ name: "updated_at" })
+  updatedAt: Date;
+}

package/dist/templates/base/src/database/index.ts.hbs

@@ -2,10 +2,29 @@
 // biome-ignore-all lint/performance/noBarrelFile: Public entry point shared with the monorepo database package.
 export * from './db.module.js';
 export * from './db.service.js';
+{{#if usePrisma}}
+{{#if isPrisma6}}
+export type { PrismaClient, Todo } from '@prisma/client';
+{{else}}
+{{#if isMonorepo}}
+export type { PrismaClient, Todo } from './database/orm/prisma/generated/client.js';
+{{else}}
+export type { PrismaClient, Todo } from './orm/prisma/generated/client.js';
+{{/if}}
+{{/if}}
+{{/if}}
 export * from './adapters/interfaces/db-adapter.interface.js';
 {{#if useDrizzle}}
+{{#if isMonorepo}}
+export * from './database/orm/drizzle/schema.js';
+{{else}}
 export * from './orm/drizzle/schema.js';
 {{/if}}
+{{/if}}
 {{#if useTypeorm}}
+{{#if isMonorepo}}
+export * from './database/orm/typeorm/data-source.js';
+{{else}}
 export * from './orm/typeorm/data-source.js';
 {{/if}}
+{{/if}}

package/dist/templates/base/src/database/orm/drizzle/schema.ts.hbs

@@ -1,16 +1,27 @@
-{{#if isBetterAuth}}
+// oxlint-disable typescript/no-explicit-any
+{{#if (eq auth "better-auth")}}
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from "./auth-schema.js";
 {{/if}}
-// oxlint-disable typescript/no-explicit-any
 {{#if hasPostgres}}
-import { boolean, pgTable, serial, text, timestamp } from 'drizzle-orm/pg-core';
+import { {{#if hasTodoExample}}boolean, {{/if}}pgTable{{#if (or (not isPassportAuth) hasTodoExample)}}, serial{{/if}}, text, timestamp } from 'drizzle-orm/pg-core';
 
-{{#unless isBetterAuth}}
+{{#unless (eq auth "better-auth")}}
 export const users = pgTable('users', {
   email: text('email').unique(),
+{{#if isPassportAuth}}
+  id: text('id').primaryKey(),
+{{else}}
   id: serial('id').primaryKey(),
+{{/if}}
   name: text('name'),
   createdAt: timestamp('created_at').defaultNow(),
+{{#if isPassportAuth}}
+  password: text('password').notNull(),
+  firstname: text('firstname'),
+  lastname: text('lastname'),
+  role: text('role').default('USER'),
+{{/if}}
 });
 {{/unless}}
 {{#if hasTodoExample}}
@@ -26,14 +37,24 @@ export const todos = pgTable('todos', {
 {{/if}}
 {{/if}}
 {{#if hasMysql}}
-import { boolean, mysqlTable, serial, text, timestamp } from 'drizzle-orm/mysql-core';
+import { {{#if hasTodoExample}}boolean, {{/if}}mysqlTable{{#if (or (not isPassportAuth) hasTodoExample)}}, int{{/if}}, text, timestamp, varchar } from 'drizzle-orm/mysql-core';
 
-{{#unless isBetterAuth}}
+{{#unless (eq auth "better-auth")}}
 export const users = mysqlTable('users', {
-  email: text('email').unique(),
-  id: serial('id').primaryKey(),
+  email: varchar('email', { length: 320 }).unique(),
+{{#if isPassportAuth}}
+  id: varchar('id', { length: 255 }).primaryKey(),
+{{else}}
+  id: int('id').autoincrement().primaryKey(),
+{{/if}}
   name: text('name'),
   createdAt: timestamp('created_at').defaultNow(),
+{{#if isPassportAuth}}
+  password: text('password').notNull(),
+  firstname: text('firstname'),
+  lastname: text('lastname'),
+  role: text('role').default('USER'),
+{{/if}}
 });
 {{/unless}}
 {{#if hasTodoExample}}
@@ -43,19 +64,29 @@ export const todos = mysqlTable('todos', {
   {{/if}}
   completed: boolean('completed').notNull().default(false),
   description: text('description'),
-  id: serial('id').primaryKey(),
+  id: int('id').autoincrement().primaryKey(),
   title: text('title').notNull(),
 });
 {{/if}}
 {{/if}}
 {{#if hasSqlite}}
-import { sqliteTable, integer, text } from 'drizzle-orm/sqlite-core';
+import { sqliteTable{{#if (or (not isPassportAuth) hasTodoExample)}}, integer{{/if}}, text } from 'drizzle-orm/sqlite-core';
 
-{{#unless isBetterAuth}}
+{{#unless (eq auth "better-auth")}}
 export const users = sqliteTable('users', {
   email: text('email').unique(),
+{{#if isPassportAuth}}
+  id: text('id').primaryKey(),
+{{else}}
   id: integer('id').primaryKey({ autoIncrement: true }),
+{{/if}}
   name: text('name'),
+{{#if isPassportAuth}}
+  password: text('password').notNull(),
+  firstname: text('firstname'),
+  lastname: text('lastname'),
+  role: text('role').default('USER'),
+{{/if}}
 });
 {{/unless}}
 {{#if hasTodoExample}}

package/dist/templates/base/src/database/orm/typeorm/data-source.ts.hbs

@@ -9,6 +9,12 @@ import { DataSource } from "typeorm";
 {{#if hasTodoExample}}
 import { Todo } from "../../entities/todo.entity.js";
 {{/if}}
+{{#if (and useTypeorm isPassportAuth)}}
+import { UserEntity } from "../../../modules/users/entities/user.entity.js";
+{{/if}}
+{{#if (eq auth "better-auth:stateless")}}
+import { AppEntity } from "../../entities/app.entity.js";
+{{/if}}
 
 const databaseUrl =
   env.{{#if hasPostgres}}POSTGRES_URL{{/if}}{{#if hasMysql}}MYSQL_URL{{/if}}{{#if hasSqlite}}SQLITE_PATH{{/if}};
@@ -19,12 +25,17 @@ const parsedUrl = new URL(databaseUrl);
 
 
 export const AppDataSource = new DataSource({
+  {{#if hasSqlite}}
+  database: databaseUrl,
+  {{/if}}
   // Register entities explicitly for consistent metadata in Node and test runners.
-  entities: [{{#if hasTodoExample}}Todo{{/if}}],
+  entities: [{{#if hasTodoExample}}Todo{{/if}}{{#if (and hasTodoExample (and useTypeorm isPassportAuth))}}, {{/if}}{{#if (and useTypeorm isPassportAuth)}}UserEntity{{/if}}{{#if (eq auth "better-auth:stateless")}}{{#if (or hasTodoExample (and useTypeorm isPassportAuth))}}, {{/if}}AppEntity{{/if}}],
   migrations: [{{#if isMonorepo}}"migrations/*.{ts,js}"{{else}}"migrations/*.{ts,js}"{{/if}}],
   synchronize: env.NODE_ENV === "development",
   type: "{{#if hasPostgres}}postgres{{/if}}{{#if hasMysql}}mysql{{/if}}{{#if hasSqlite}}better-sqlite3{{/if}}",
+  {{#unless hasSqlite}}
   url: databaseUrl,
+  {{/unless}}
   {{#unless hasSqlite}}
   ...(parsedUrl.username ? { username: decodeURIComponent(parsedUrl.username) } : {}),
   ...(parsedUrl.password ? { password: decodeURIComponent(parsedUrl.password) } : {}),