@nest-arch/tui 0.4.5 → 0.5.0

package/dist/templates/base/test/bootstrap.e2e-spec.ts.hbs

@@ -19,7 +19,7 @@ async function getFreePort(): Promise<number> {
   return address.port;
 }
 
-async function waitForServer(url: string, application: ChildProcess, deadline = Date.now() + 15000): Promise<Response> {
+async function waitForServer(url: string, application: ChildProcess, deadline = Date.now() + 60000): Promise<Response> {
   if (application.exitCode !== null) throw new Error(`Generated application exited during startup with code ${application.exitCode}.`);
   try {
     return await fetch(url, { signal: AbortSignal.timeout(500) });
@@ -81,4 +81,4 @@ it("boots the compiled application through main.ts", async () => {
   const body = await response.json();
   expect(body.data.hello).toBe("Hello GraphQL!");
 {{/if}}
-}, 20_000);
+}, 65_000);

package/dist/templates/extras/docker/Dockerfile.hbs

@@ -1,5 +1,9 @@
 FROM node:22-alpine
 
+{{#if hasSqlite}}
+RUN apk add --no-cache python3 make g++
+{{/if}}
+
 WORKDIR /app
 
 {{#if (eq packageManager "pnpm")}}
@@ -10,7 +14,10 @@ RUN corepack enable
 {{/if}}
 
 COPY . .
-RUN POSTGRES_URL=postgresql://postgres:postgres@postgres:5432/build_db MYSQL_URL=mysql://root:mysql@mysql:3306/build_db MONGODB_URL=mongodb://mongodb:27017/build_db {{#if (eq auth "passport")}}JWT_ACCESS_SECRET=build-only-access-secret-that-is-long-enough JWT_REFRESH_SECRET=build-only-refresh-secret-that-is-long-enough {{/if}}{{#if (or (eq auth "better-auth") (eq auth "better-auth:stateless"))}}BETTER_AUTH_SECRET=build-only-better-auth-secret-that-is-long-enough BETTER_AUTH_URL=http://localhost:{{#if (eq httpProvider "fastify")}}3001{{else}}3000{{/if}} {{/if}}{{#if (eq packageManager "pnpm")}}pnpm install --no-lockfile{{else if (eq packageManager "yarn")}}yarn install{{else if (eq packageManager "bun")}}bun install{{else}}npm install{{/if}}
+RUN POSTGRES_URL=postgresql://postgres:postgres@postgres:5432/build_db MYSQL_URL=mysql://root:mysql@mysql:3306/build_db MONGODB_URL=mongodb://mongodb:27017/build_db {{#if hasSqlserver}}SQLSERVER_HOST=localhost SQLSERVER_PORT=1433 SQLSERVER_DATABASE=build_db SQLSERVER_USER=sa SQLSERVER_PASSWORD=Build_only_Password_2026!X9 SQLSERVER_ENCRYPT=true SQLSERVER_TRUST_SERVER_CERTIFICATE=true {{/if}}{{#if (eq auth "passport")}}JWT_ACCESS_SECRET=build-only-access-secret-that-is-long-enough JWT_REFRESH_SECRET=build-only-refresh-secret-that-is-long-enough {{/if}}{{#if (or (eq auth "better-auth") (eq auth "better-auth:stateless"))}}BETTER_AUTH_SECRET=build-only-better-auth-secret-that-is-long-enough BETTER_AUTH_URL=http://localhost:{{#if (eq httpProvider "fastify")}}3001{{else}}3000{{/if}} {{#if (eq auth "better-auth:stateless")}}OIDC_PROVIDER_ID=build-only OIDC_CLIENT_ID=build-only OIDC_CLIENT_SECRET=build-only OIDC_DISCOVERY_URL=https://example.invalid/.well-known/openid-configuration {{/if}}{{/if}}{{#if (eq packageManager "pnpm")}}pnpm install --no-lockfile{{else if (eq packageManager "yarn")}}yarn install{{else if (eq packageManager "bun")}}bun install{{/if}}
+{{#each dockerBuildSetupCommands}}
+RUN POSTGRES_URL=postgresql://postgres:postgres@postgres:5432/build_db MYSQL_URL=mysql://root:mysql@mysql:3306/build_db MONGODB_URL=mongodb://mongodb:27017/build_db SQLITE_PATH=/tmp/build.db {{#if (eq ../auth "passport")}}JWT_ACCESS_SECRET=build-only-access-secret-that-is-long-enough JWT_REFRESH_SECRET=build-only-refresh-secret-that-is-long-enough {{/if}}{{#if (or (eq ../auth "better-auth") (eq ../auth "better-auth:stateless"))}}BETTER_AUTH_SECRET=build-only-better-auth-secret-that-is-long-enough BETTER_AUTH_URL=http://localhost:{{#if (eq ../httpProvider "fastify")}}3001{{else}}3000{{/if}} {{#if (eq ../auth "better-auth:stateless")}}OIDC_PROVIDER_ID=build-only OIDC_CLIENT_ID=build-only OIDC_CLIENT_SECRET=build-only OIDC_DISCOVERY_URL=https://example.invalid/.well-known/openid-configuration {{/if}}{{/if}}{{this}}
+{{/each}}
 RUN {{#if (eq packageManager "pnpm")}}pnpm run{{else if (eq packageManager "yarn")}}yarn{{else if (eq packageManager "bun")}}bun run{{else}}npm run{{/if}} build
 
 ENV NODE_ENV=production

package/dist/templates/extras/health/src/health/health.controller.ts.hbs

@@ -34,7 +34,13 @@ export class HealthController {
           {{else}}
           await this.db.raw.mongo.command({ ping: 1 });
           {{/if}}
-        {{else if (or usePrisma isPrisma8)}}
+        {{else if isPrisma8}}
+        {{#if hasTodoExample}}
+        await this.db.prisma.orm.public.Todo.all();
+        {{else}}
+        await this.db.prisma.connect();
+        {{/if}}
+        {{else if usePrisma}}
         await this.db.prisma.$queryRaw`SELECT 1`;
         {{else if useDrizzle}}
         {{#if hasSqlite}}

package/dist/templates/extras/swagger/create-docs.ts.hbs

@@ -1,5 +1,6 @@
 
 import type { INestApplication } from "@nestjs/common";
+import { Logger } from "@nestjs/common";
 import { DocumentBuilder, SwaggerModule } from "@nestjs/swagger";
 import type { OpenAPIObject } from "@nestjs/swagger";
 
@@ -168,7 +169,11 @@ async function applyTrpcSpec(options?: NonNullable<DocsIntegrations["trpc"]>) {
     }
 
     return trpcSpec;
-  } catch {
+  } catch (error) {
+    Logger.warn(
+      `Could not generate tRPC documentation from ${options.routerFilePath}: ${error instanceof Error ? error.message : String(error)}`,
+      "SwaggerDocs"
+    );
     return null;
   }
 }

package/dist/templates/feature/graphql/src/graphql/models/todo.model.ts.hbs

@@ -1,4 +1,4 @@
-import { Field, ID, ObjectType } from "@nestjs/graphql";
+import { Field{{#if hasAuth}}, ID{{/if}}, ObjectType } from "@nestjs/graphql";
 
 import { BaseModel } from "./base.model.js";
 {{#if hasAuth}}

package/dist/templates/feature/graphql/src/graphql/resolvers/todo.resolver.ts.hbs

@@ -52,7 +52,7 @@ import { GraphRelationBuilder } from "typeorm-relations-graphql";
 import { Todo as TodoEntity } from "../../database/entities/todo.entity.js";
 {{/if}}
 {{#if (and hasDatabase useDrizzle)}}
-import { and, eq } from "drizzle-orm";
+import { {{#if hasAuth}}and, {{/if}}eq } from "drizzle-orm";
 import * as schema from "../../database/orm/drizzle/schema.js";
 {{/if}}
 {{#if hasDatabase}}

package/dist/templates/feature/rest/todo-example/src/api/todo/todo.controller.ts.hbs

@@ -6,7 +6,10 @@ import {
   Param,
   Post,
   Put,
-{{#if (and isPassportAuth hasDatabase)}}
+{{#if (eq auth "better-auth:stateless")}}
+  UnauthorizedException,
+{{/if}}
+{{#if isPassportAuth}}
   UseGuards,
 {{/if}}
 {{#if (and isBetterAuth hasDatabase hasGraphql)}}
@@ -31,7 +34,11 @@ import {
 import { Session } from "@thallesp/nestjs-better-auth";
 import type { UserSession } from "../../auth/auth.js";
 {{/if}}
-{{#if (and isPassportAuth hasDatabase)}}
+{{#if (and isBetterAuth (not hasDatabase))}}
+import { Session } from "@thallesp/nestjs-better-auth";
+import type { UserSession } from "../../auth/auth.js";
+{{/if}}
+{{#if isPassportAuth}}
 import { RestAuthGuard } from "../../auth/guards/rest-auth.guard.js";
 import { CurrentUser } from "../../auth/decorators/current-user.decorator.js";
 {{/if}}
@@ -41,16 +48,29 @@ import { RestAuthGuard } from "../../auth/guards/rest-auth.guard.js";
 import { TodoService } from "./todo.service.js";
 import { CreateTodoDto } from "./dto/create-todo.dto.js";
 import { UpdateTodoDto } from "./dto/update-todo.dto.js";
+{{#if isPrisma8}}
+import type { Models } from "../../prisma/contract.js";
+
+type Todo = Models.public_Todo;
+{{/if}}
 
 {{#if swagger}}
 @ApiTags("Todos")
 {{/if}}
 @Controller("todos")
-{{#if (or (and isPassportAuth hasDatabase) (and isBetterAuth hasDatabase hasGraphql))}}
+{{#if (or isPassportAuth (and isBetterAuth hasDatabase hasGraphql))}}
 @UseGuards(RestAuthGuard)
 {{/if}}
 export class TodoController {
   constructor(private readonly todoService: TodoService) {}
+{{#if (eq auth "better-auth:stateless")}}
+  private requireUserId(session: UserSession | null | undefined): string {
+    if (!session?.user?.id) {
+      throw new UnauthorizedException("Authentication required");
+    }
+    return session.user.id;
+  }
+{{/if}}
 
   @Get()
 {{#if swagger}}
@@ -63,7 +83,7 @@ export class TodoController {
   @ApiUnauthorizedResponse({ description: "Unauthorized" })
 {{/if}}
 {{/if}}
-{{#if (and isPassportAuth hasDatabase)}}
+{{#if isPassportAuth}}
   findAll(@CurrentUser() user: { id: string }) {
     return this.todoService.findAll(user.id);
   }
@@ -75,10 +95,20 @@ export class TodoController {
 {{/if}}
     return this.todoService.findAll(session.user.id);
   }
+{{else if isBetterAuth}}
+  findAll(@Session() session: UserSession | null) {
+    return this.todoService.findAll(this.requireUserId(session));
+  }
+{{else}}
+{{#if isPrisma8}}
+  async findAll(): Promise<Todo[]> {
+    return await this.todoService.findAll();
+  }
 {{else}}
   findAll() {
     return this.todoService.findAll();
   }
+{{/if}}
 {{/if}}
 
   @Post()
@@ -92,7 +122,7 @@ export class TodoController {
   @ApiUnauthorizedResponse({ description: "Unauthorized" })
 {{/if}}
 {{/if}}
-{{#if (and isPassportAuth hasDatabase)}}
+{{#if isPassportAuth}}
   create(
     @Body{{#if (includes addons "nestjs-zod")}}(){{else}}({ schema: CreateTodoDto.schema }){{/if}} input: CreateTodoDto,
     @CurrentUser() user: { id: string }
@@ -106,10 +136,23 @@ export class TodoController {
   ) {
     return this.todoService.create(input, session.user.id);
   }
+{{else if isBetterAuth}}
+  create(
+    @Body{{#if (includes addons "nestjs-zod")}}(){{else}}({ schema: CreateTodoDto.schema }){{/if}} input: CreateTodoDto,
+    @Session() session: UserSession | null
+  ) {
+    return this.todoService.create(input, this.requireUserId(session));
+  }
+{{else}}
+{{#if isPrisma8}}
+  async create(@Body{{#if (includes addons "nestjs-zod")}}(){{else}}({ schema: CreateTodoDto.schema }){{/if}} input: CreateTodoDto): Promise<Todo> {
+    return await this.todoService.create(input);
+  }
 {{else}}
   create(@Body{{#if (includes addons "nestjs-zod")}}(){{else}}({ schema: CreateTodoDto.schema }){{/if}} input: CreateTodoDto) {
     return this.todoService.create(input);
   }
+{{/if}}
 {{/if}}
 
   @Put(":id")
@@ -123,7 +166,7 @@ export class TodoController {
   @ApiUnauthorizedResponse({ description: "Unauthorized" })
 {{/if}}
 {{/if}}
-{{#if (and isPassportAuth hasDatabase)}}
+{{#if isPassportAuth}}
   update(
     @Param("id") id: string,
     @Body{{#if (includes addons "nestjs-zod")}}(){{else}}({ schema: UpdateTodoDto.schema }){{/if}} input: UpdateTodoDto,
@@ -139,6 +182,22 @@ export class TodoController {
   ) {
     return this.todoService.update(id, input, session.user.id);
   }
+{{else if isBetterAuth}}
+  update(
+    @Param("id") id: string,
+    @Body{{#if (includes addons "nestjs-zod")}}(){{else}}({ schema: UpdateTodoDto.schema }){{/if}} input: UpdateTodoDto,
+    @Session() session: UserSession | null
+  ) {
+    return this.todoService.update(id, input, this.requireUserId(session));
+  }
+{{else}}
+{{#if isPrisma8}}
+  async update(
+    @Param("id") id: string,
+    @Body{{#if (includes addons "nestjs-zod")}}(){{else}}({ schema: UpdateTodoDto.schema }){{/if}} input: UpdateTodoDto
+  ): Promise<Todo> {
+    return await this.todoService.update(id, input);
+  }
 {{else}}
   update(
     @Param("id") id: string,
@@ -146,6 +205,7 @@ export class TodoController {
   ) {
     return this.todoService.update(id, input);
   }
+{{/if}}
 {{/if}}
 
   @Delete(":id")
@@ -159,7 +219,7 @@ export class TodoController {
   @ApiUnauthorizedResponse({ description: "Unauthorized" })
 {{/if}}
 {{/if}}
-{{#if (and isPassportAuth hasDatabase)}}
+{{#if isPassportAuth}}
   delete(
     @Param("id") id: string,
     @CurrentUser() user: { id: string }
@@ -173,9 +233,22 @@ export class TodoController {
   ) {
     return this.todoService.delete(id, session.user.id);
   }
+{{else if isBetterAuth}}
+  delete(
+    @Param("id") id: string,
+    @Session() session: UserSession | null
+  ) {
+    return this.todoService.delete(id, this.requireUserId(session));
+  }
+{{else}}
+{{#if isPrisma8}}
+  async delete(@Param("id") id: string): Promise<{ message: string }> {
+    return await this.todoService.delete(id);
+  }
 {{else}}
   delete(@Param("id") id: string) {
     return this.todoService.delete(id);
   }
 {{/if}}
+{{/if}}
 }

package/dist/templates/feature/rest/todo-example/src/api/todo/todo.service.ts.hbs

@@ -14,13 +14,20 @@ function objectId(id: string): ObjectId {
 export class TodoService {
   constructor(private readonly db: DbService) {}
   private get todos() { return this.db.raw.mongo.collection<TodoDocument>("todos"); }
-  async findAll() { return (await this.todos.find().sort({ _id: 1 }).limit(100).toArray()).map(serialize); }
+  async findAll() {
+    const todos = await this.todos.find().sort({ _id: 1 }).limit(100).toArray();
+    return todos.map(serialize);
+  }
   async create(input: CreateTodoDto) {
     const todo = { title: input.title, completed: input.completed ?? false, ...(input.description === undefined ? {} : { description: input.description }) };
     const result = await this.todos.insertOne(todo);
     return { ...todo, id: result.insertedId.toHexString() };
   }
+{{#if isPrisma8}}
+  update(id: string, input: UpdateTodoDto) {
+{{else}}
   async update(id: string, input: UpdateTodoDto) {
+{{/if}}
     const todo = await this.todos.findOneAndUpdate({ _id: objectId(id) }, { $set: input }, { returnDocument: "after" });
     if (!todo) throw new NotFoundException("Todo not found");
     return serialize(todo);
@@ -32,8 +39,8 @@ export class TodoService {
   }
 }
 {{else}}
-{{#if (and hasDatabase hasAuth)}}
-import { Injectable, NotFoundException } from "@nestjs/common";
+{{#if (or hasTodoExample hasAuth isPrisma8 (and hasDatabase useTypeorm) (and hasDatabase useDrizzle hasMysql))}}
+import { Injectable, NotFoundException{{#if (and hasAuth hasPostgres useRawSql)}}, type OnModuleInit{{/if}} } from "@nestjs/common";
 {{else}}
 import { Injectable } from "@nestjs/common";
 {{/if}}
@@ -54,31 +61,74 @@ import { eq } from "drizzle-orm";
 {{#if useTypeorm}}
 import { Todo } from "../../database/entities/todo.entity.js";
 {{/if}}
+{{#if (and hasAuth hasPostgres useRawSql)}}
+import type { Pool } from "pg";
+{{/if}}
 {{/if}}
 import { CreateTodoDto } from "./dto/create-todo.dto.js";
 import { UpdateTodoDto } from "./dto/update-todo.dto.js";
+{{#if isPrisma8}}
+import type { Models } from "../../prisma/contract.js";
+
+type Todo = Models.public_Todo;
+{{/if}}
 
 @Injectable()
+{{#if (and hasAuth hasPostgres useRawSql)}}
+export class TodoService implements OnModuleInit {
+{{else}}
 export class TodoService {
+{{/if}}
 {{#if hasDatabase}}
   constructor(private readonly db: DbService) {}
 {{else}}
-  private todos: Array<{
+  private todos: {
+{{#if hasAuth}}
+    authorId: string;
+{{/if}}
     completed: boolean;
     description?: string;
     id: string;
     title: string;
-  }> = [];
+  }[] = [];
   private nextId = 1;
 {{/if}}
 
+{{#if (and hasAuth hasPostgres useRawSql)}}
+  async onModuleInit(): Promise<void> {
+    const pool = this.db.raw.sql as Pool;
+    await pool.query(`CREATE TABLE IF NOT EXISTS todos (
+      id SERIAL PRIMARY KEY,
+      title TEXT NOT NULL,
+      completed BOOLEAN NOT NULL DEFAULT FALSE,
+      description TEXT,
+      author_id TEXT NOT NULL,
+      created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+      updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+    )`);
+  }
+
+{{/if}}
 {{#if hasDatabase}}
 {{#if hasAuth}}
+{{#if isPrisma8}}
+  async findAll(authorId: string): Promise<Todo[]> {
+{{else if (and hasPostgres useRawSql)}}
+  async findAll(authorId: string) {
+{{else}}
   findAll(authorId: string) {
+{{/if}}
 {{#if isPrisma8}}
-    return ((this.db.prisma.orm.public as any).Todo).where({ authorId }).all();
+    return await this.db.prisma.orm.public.Todo.where({ authorId }).all();
 {{else if usePrisma}}
     return this.db.prisma.todo.findMany({ where: { authorId } });
+{{else if (and hasPostgres useRawSql)}}
+    const pool = this.db.raw.sql as Pool;
+    const result = await pool.query(
+      'SELECT id, title, completed, description, author_id AS "authorId" FROM todos WHERE author_id = $1 ORDER BY id',
+      [authorId]
+    );
+    return result.rows;
 {{else if useTypeorm}}
     return this.db.typeorm.getRepository(Todo).find({ where: { authorId } });
 {{else if useDrizzle}}
@@ -86,16 +136,32 @@ export class TodoService {
 {{/if}}
   }
 
+{{#if isPrisma8}}
+  async create(input: CreateTodoDto, authorId: string): Promise<Todo> {
+{{else}}
   async create(input: CreateTodoDto, authorId: string) {
+{{/if}}
 {{#if isPrisma8}}
-    return ((this.db.prisma.orm.public as any).Todo).create({ ...input, authorId });
+    return await this.db.prisma.orm.public.Todo.create({ ...input, authorId });
 {{else if usePrisma}}
     const todo = await this.db.prisma.todo.create({ data: { ...input, authorId } });
     return todo;
+{{else if (and hasPostgres useRawSql)}}
+    const pool = this.db.raw.sql as Pool;
+    const result = await pool.query(
+      'INSERT INTO todos (title, completed, description, author_id) VALUES ($1, $2, $3, $4) RETURNING id, title, completed, description, author_id AS "authorId"',
+      [input.title, input.completed ?? false, input.description ?? null, authorId]
+    );
+    const [todo] = result.rows;
+    return todo;
 {{else if useTypeorm}}
     const todo = await this.db.typeorm.getRepository(Todo).save(this.db.typeorm.getRepository(Todo).create({ ...input, authorId }));
     return todo;
 {{else if useDrizzle}}
+{{#if hasSqlserver}}
+    const [todo] = await this.db.drizzle.insert(schema.todos).output().values({ ...input, authorId });
+    return todo;
+{{else}}
 {{#if hasMysql}}
     const [inserted] = await this.db.drizzle.insert(schema.todos).values({ ...input, authorId }).$returningId();
     if (!inserted) {
@@ -107,12 +173,13 @@ export class TodoService {
     const [todo] = await this.db.drizzle.insert(schema.todos).values({ ...input, authorId }).returning();
     return todo;
 {{/if}}
+{{/if}}
 {{/if}}
   }
 
   async update(id: string, input: UpdateTodoDto, authorId: string) {
 {{#if isPrisma8}}
-    const result = await ((this.db.prisma.orm.public as any).Todo).where({ authorId, id }).update(input);
+    const result = await this.db.prisma.orm.public.Todo.where({ authorId, id: Number(id) }).update(input);
     if (!result) {
       throw new NotFoundException("Todo not found");
     }
@@ -123,6 +190,17 @@ export class TodoService {
       throw new NotFoundException("Todo not found");
     }
     return this.db.prisma.todo.update({ data: input, where: { id } });
+{{else if (and hasPostgres useRawSql)}}
+    const pool = this.db.raw.sql as Pool;
+    const result = await pool.query(
+      'UPDATE todos SET title = COALESCE($1, title), completed = COALESCE($2, completed), description = COALESCE($3, description), updated_at = NOW() WHERE id = $4 AND author_id = $5 RETURNING id, title, completed, description, author_id AS "authorId"',
+      [input.title ?? null, input.completed ?? null, input.description ?? null, id, authorId]
+    );
+    const [todo] = result.rows;
+    if (!todo) {
+      throw new NotFoundException("Todo not found");
+    }
+    return todo;
 {{else if useTypeorm}}
     const repository = this.db.typeorm.getRepository(Todo);
     const result = await repository.update({ authorId, id }, input);
@@ -138,6 +216,8 @@ export class TodoService {
 {{#if hasMysql}}
     await this.db.drizzle.update(schema.todos).set(input).where(and(eq(schema.todos.authorId, authorId), eq(schema.todos.id, Number(id))));
     const [todo] = await this.db.drizzle.select().from(schema.todos).where(and(eq(schema.todos.authorId, authorId), eq(schema.todos.id, Number(id))));
+{{else if hasSqlserver}}
+    const [todo] = await this.db.drizzle.update(schema.todos).set(input).output().where(and(eq(schema.todos.authorId, authorId), eq(schema.todos.id, Number(id))));
 {{else}}
     const [todo] = await this.db.drizzle.update(schema.todos).set(input).where(and(eq(schema.todos.authorId, authorId), eq(schema.todos.id, Number(id)))).returning();
 {{/if}}
@@ -150,7 +230,7 @@ export class TodoService {
 
   async delete(id: string, authorId: string) {
 {{#if isPrisma8}}
-    const count = await ((this.db.prisma.orm.public as any).Todo).where({ authorId, id }).delete();
+    const count = await this.db.prisma.orm.public.Todo.where({ authorId, id }).delete();
     if (count === 0) {
       throw new NotFoundException("Todo not found");
     }
@@ -159,6 +239,16 @@ export class TodoService {
     if (result.count === 0) {
       throw new NotFoundException("Todo not found");
     }
+{{else if (and hasPostgres useRawSql)}}
+    const pool = this.db.raw.sql as Pool;
+    const result = await pool.query(
+      'DELETE FROM todos WHERE id = $1 AND author_id = $2 RETURNING id',
+      [id, authorId]
+    );
+    const [todo] = result.rows;
+    if (!todo) {
+      throw new NotFoundException("Todo not found");
+    }
 {{else if useTypeorm}}
     const result = await this.db.typeorm.getRepository(Todo).delete({ authorId, id });
     if (result.affected === 0) {
@@ -171,6 +261,11 @@ export class TodoService {
       throw new NotFoundException("Todo not found");
     }
     await this.db.drizzle.delete(schema.todos).where(and(eq(schema.todos.authorId, authorId), eq(schema.todos.id, Number(id))));
+{{else if hasSqlserver}}
+    const [todo] = await this.db.drizzle.delete(schema.todos).output().where(and(eq(schema.todos.authorId, authorId), eq(schema.todos.id, Number(id))));
+    if (!todo) {
+      throw new NotFoundException("Todo not found");
+    }
 {{else}}
     const [todo] = await this.db.drizzle.delete(schema.todos).where(and(eq(schema.todos.authorId, authorId), eq(schema.todos.id, Number(id)))).returning();
     if (!todo) {
@@ -180,10 +275,14 @@ export class TodoService {
 {{/if}}
     return { message: "Todo deleted successfully" };
   }
+{{else}}
+{{#if isPrisma8}}
+  async findAll(): Promise<Todo[]> {
 {{else}}
   findAll() {
+{{/if}}
 {{#if isPrisma8}}
-    return ((this.db.prisma.orm.public as any).Todo).all();
+    return await this.db.prisma.orm.public.Todo.all();
 {{else if usePrisma}}
     return this.db.prisma.todo.findMany();
 {{else if useTypeorm}}
@@ -193,9 +292,13 @@ export class TodoService {
 {{/if}}
   }
 
+{{#if isPrisma8}}
+  async create(input: CreateTodoDto): Promise<Todo> {
+{{else}}
   async create(input: CreateTodoDto) {
+{{/if}}
 {{#if isPrisma8}}
-    return ((this.db.prisma.orm.public as any).Todo).create(input);
+    return await this.db.prisma.orm.public.Todo.create(input);
 {{else if usePrisma}}
     const todo = await this.db.prisma.todo.create({ data: input });
     return todo;
@@ -203,64 +306,117 @@ export class TodoService {
     const todo = await this.db.typeorm.getRepository(Todo).save(this.db.typeorm.getRepository(Todo).create(input));
     return todo;
 {{else if useDrizzle}}
+{{#if hasSqlserver}}
+    const [todo] = await this.db.drizzle.insert(schema.todos).output().values(input);
+{{else if hasMysql}}
+    const [inserted] = await this.db.drizzle.insert(schema.todos).values(input).$returningId();
+    if (!inserted) {
+      throw new NotFoundException("Todo not found");
+    }
+    const [todo] = await this.db.drizzle.select().from(schema.todos).where(eq(schema.todos.id, inserted.id));
+{{else}}
     const [todo] = await this.db.drizzle.insert(schema.todos).values(input).returning();
+{{/if}}
     return todo;
 {{/if}}
   }
 
+{{#if isPrisma8}}
+  async update(id: string, input: UpdateTodoDto): Promise<Todo> {
+{{else}}
   async update(id: string, input: UpdateTodoDto) {
+{{/if}}
 {{#if isPrisma8}}
-    return ((this.db.prisma.orm.public as any).Todo).where({ id }).update(input);
+    const todo = await this.db.prisma.orm.public.Todo.where({ id: Number(id) }).update(input);
+    if (!todo) {
+      throw new NotFoundException("Todo not found");
+    }
+    return todo;
 {{else if usePrisma}}
     const result = await this.db.prisma.todo.update({ data: input, where: { id } });
     return result;
 {{else if useTypeorm}}
-    const result = await this.db.typeorm.getRepository(Todo).update(id, input);
-    return result;
+    const repository = this.db.typeorm.getRepository(Todo);
+    const result = await repository.update(id, input);
+    if (result.affected === 0) {
+      throw new NotFoundException("Todo not found");
+    }
+    const todo = await repository.findOneBy({ id });
+    if (!todo) {
+      throw new NotFoundException("Todo not found");
+    }
+    return todo;
 {{else if useDrizzle}}
+{{#if hasSqlserver}}
+    const [todo] = await this.db.drizzle.update(schema.todos).set(input).output().where(eq(schema.todos.id, Number(id)));
+    if (!todo) {
+      throw new NotFoundException("Todo not found");
+    }
+{{else if hasMysql}}
+    await this.db.drizzle.update(schema.todos).set(input).where(eq(schema.todos.id, Number(id)));
+    const [todo] = await this.db.drizzle.select().from(schema.todos).where(eq(schema.todos.id, Number(id)));
+    if (!todo) {
+      throw new NotFoundException("Todo not found");
+    }
+{{else}}
     const [todo] = await this.db.drizzle.update(schema.todos).set(input).where(eq(schema.todos.id, Number(id))).returning();
+{{/if}}
     return todo;
 {{/if}}
   }
 
   async delete(id: string) {
 {{#if isPrisma8}}
-    await ((this.db.prisma.orm.public as any).Todo).where({ id }).delete();
+    await this.db.prisma.orm.public.Todo.where({ id: Number(id) }).delete();
 {{else if usePrisma}}
     await this.db.prisma.todo.delete({ where: { id } });
 {{else if useTypeorm}}
     await this.db.typeorm.getRepository(Todo).delete(id);
 {{else if useDrizzle}}
+{{#if hasSqlserver}}
+    const [todo] = await this.db.drizzle.delete(schema.todos).output().where(eq(schema.todos.id, Number(id)));
+    if (!todo) {
+      throw new NotFoundException("Todo not found");
+    }
+{{else}}
     await this.db.drizzle.delete(schema.todos).where(eq(schema.todos.id, Number(id)));
+{{/if}}
 {{/if}}
     return { message: "Todo deleted successfully" };
   }
 {{/if}}
 {{else}}
-  findAll() {
+  findAll({{#if hasAuth}}authorId: string{{/if}}) {
+{{#if hasAuth}}
+    return this.todos.filter((todo) => todo.authorId === authorId);
+{{else}}
     return [...this.todos];
+{{/if}}
   }
 
-  create(input: CreateTodoDto) {
-    const todo = { id: String(this.nextId++), ...input };
+  create(input: CreateTodoDto{{#if hasAuth}}, authorId: string{{/if}}) {
+    const id = String(this.nextId);
+    this.nextId += 1;
+    const todo = { id, ...input{{#if hasAuth}}, authorId{{/if}} };
     this.todos.push(todo);
     return todo;
   }
 
-  update(id: string, input: UpdateTodoDto) {
-    const todo = this.todos.find((t) => t.id === id);
+  update(id: string, input: UpdateTodoDto{{#if hasAuth}}, authorId: string{{/if}}) {
+    const todo = this.todos.find((item) => item.id === id{{#if hasAuth}} && item.authorId === authorId{{/if}});
     if (!todo) {
-      return { message: "Todo not found" };
+      throw new NotFoundException("Todo not found");
     }
     Object.assign(todo, input);
     return todo;
   }
 
-  async delete(id: string) {
-    const index = this.todos.findIndex((t) => t.id === id);
-    if (index >= 0) {
-      this.todos.splice(index, 1);
+  delete(id: string{{#if hasAuth}}, authorId: string{{/if}}) {
+    const index = this.todos.findIndex((item) => item.id === id{{#if hasAuth}} && item.authorId === authorId{{/if}});
+    if (index === -1) {
+      throw new NotFoundException("Todo not found");
     }
+    this.todos.splice(index, 1);
     return { message: "Todo deleted successfully" };
   }
 {{/if}}