@nest-arch/tui 0.2.7 → 0.4.0

package/dist/templates/base/vitest.config.ts.hbs

@@ -1,11 +1,12 @@
 import { defineConfig } from "vitest/config";
-import tsconfigPaths from "vite-tsconfig-paths";
 
 export default defineConfig({
-  plugins: [tsconfigPaths()],
+  resolve: {
+    tsconfigPaths: true,
+  },
   test: {
+    include: ["**/*.spec.ts"],
     globals: true,
     root: "./",
-    include: ["**/*.spec.ts"],
   },
 });

package/dist/templates/base/yarn.lock.hbs

@@ -0,0 +1 @@
+# This lockfile marks the generated application as an independent Yarn project.

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

@@ -18,5 +18,8 @@ COPY . .
 RUN {{packageManager}} run build
 
 EXPOSE 3000
+{{#if (includes microservices "grpc")}}
+EXPOSE 5000
+{{/if}}
 
-CMD ["{{packageManager}}", "run", "start:prod"]
+CMD ["{{packageManager}}", "run", "start:prod"]

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

@@ -1,18 +1,7 @@
-// @ts-nocheck
-/* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, import/no-unresolved */
-/* oxlint-disable import/no-unresolved */
-// oxlint-disable no-unused-vars
 
 import type { INestApplication } from "@nestjs/common";
-{{#if hasRest}}
-import {
-  DocumentBuilder,
-  SwaggerModule,
-  type OpenAPIObject,
-} from "@nestjs/swagger";
-{{else}}
+import { DocumentBuilder, SwaggerModule } from "@nestjs/swagger";
 import type { OpenAPIObject } from "@nestjs/swagger";
-{{/if}}
 
 interface DocsIntegrations {
   betterAuth?: {
@@ -40,65 +29,16 @@ export interface CreateDocsOptions {
   integrations?: DocsIntegrations;
 }
 
-function rewriteRefs(value: unknown): unknown {
-  if (Array.isArray(value)) {
-    return value.map((item) => rewriteRefs(item));
-  }
-  if (!value || typeof value !== "object") {
-    return value;
-  }
-  const obj = value as Record<string, unknown>;
-  if (typeof obj.$ref === "string") {
-    const rest = rewriteRefs(
-      Object.fromEntries(Object.entries(obj).filter(([k]) => k !== "$ref"))
-    ) as Record<string, unknown>;
-    return {
-      ...rest,
-      $ref: (obj.$ref as string)
-        .replace("#/$defs/", "#/components/schemas/")
-        .replace("#/definitions/", "#/components/schemas/"),
-    };
-  }
-  return Object.fromEntries(
-    Object.entries(obj).map(([k, v]) => [k, rewriteRefs(v)])
-  );
-}
-
-function normalizeSchema(
-  schema: unknown,
-  components: Record<string, unknown> = {}
-): ReturnType<StandardSchemaConverter> {
-  const raw = (
-    typeof schema === "object" && schema !== null ? schema : {}
-  ) as Record<string, unknown>;
-  const normalizedComponents = Object.fromEntries(
-    Object.entries(raw.$defs ?? {}).map(([name, def]) => [
-      name,
-      rewriteRefs(def),
-    ])
-  );
-  const filtered: Record<string, unknown> = {};
-  for (const key of Object.keys(raw)) {
-    if (key !== "$defs" && key !== "definitions" && key !== "$schema") {
-      filtered[key] = raw[key];
-    }
-  }
-  return {
-    components: {
-      ...components,
-      ...normalizedComponents,
-    },
-    schema: rewriteRefs(filtered),
-  };
-}
-
 function addPrefixToPaths(paths: Record<string, unknown>, prefix: string) {
   return Object.fromEntries(
     Object.entries(paths).map(([path, value]) => [`${prefix}${path}`, value])
   );
 }
 
-function mergeOpenApiSpecs(baseSpec: OpenAPIObject, ...extraSpecs: OpenAPIObject[]) {
+function mergeOpenApiSpecs(
+  baseSpec: OpenAPIObject,
+  ...extraSpecs: OpenAPIObject[]
+) {
   const specs = [baseSpec, ...extraSpecs];
 
   return {
@@ -131,6 +71,29 @@ function mergeOpenApiSpecs(baseSpec: OpenAPIObject, ...extraSpecs: OpenAPIObject
   } as OpenAPIObject;
 }
 
+async function applyZodCleanup(
+  baseSpec: OpenAPIObject,
+  options?: NonNullable<DocsIntegrations["zod"]>
+) {
+  try {
+    const packageName = "nestjs-zod";
+    const { cleanupOpenApiDoc } = await import(packageName);
+    if (typeof cleanupOpenApiDoc !== "function") {
+      return baseSpec;
+    }
+
+    if (options?.withFastify === true) {
+      return cleanupOpenApiDoc(baseSpec, {
+        withFastify: true,
+      }) as OpenAPIObject;
+    }
+
+    return cleanupOpenApiDoc(baseSpec) as OpenAPIObject;
+  } catch {
+    return baseSpec;
+  }
+}
+
 async function applyBetterAuthSpec(
   options?: NonNullable<DocsIntegrations["betterAuth"]>
 ) {
@@ -145,7 +108,9 @@ async function applyBetterAuthSpec(
     generateOpenAPISchema?: () => OpenAPIObject | Promise<OpenAPIObject>;
   };
 
-  const schemaGenerator = authInstance.api?.generateOpenAPISchema ?? authInstance.generateOpenAPISchema;
+  const schemaGenerator =
+    authInstance.api?.generateOpenAPISchema ??
+    authInstance.generateOpenAPISchema;
 
   if (typeof schemaGenerator !== "function") {
     return null;
@@ -169,29 +134,27 @@ async function applyBetterAuthSpec(
   }
 }
 
-async function applyTrpcSpec(
-  options?: NonNullable<DocsIntegrations["trpc"]>
-) {
+async function applyTrpcSpec(options?: NonNullable<DocsIntegrations["trpc"]>) {
   if (!options?.routerFilePath) {
     return null;
   }
 
   try {
-    const specifier = "@trpc/openapi" as string;
-    const mod: Record<string, unknown> = await import(specifier);
-    const generateOpenAPIDocument = mod.generateOpenAPIDocument as
-      | ((opts: unknown, config: unknown) => unknown)
-      | undefined;
+    const packageName = "@trpc/openapi";
+    const { generateOpenAPIDocument } = await import(packageName);
 
     if (typeof generateOpenAPIDocument !== "function") {
       return null;
     }
 
-    const generatedDocument = await generateOpenAPIDocument(options.routerFilePath, {
-      exportName: options.exportName ?? "AppRouter",
-      title: options.title ?? "tRPC API",
-      version: options.version ?? "1.0.0",
-    });
+    const generatedDocument = await generateOpenAPIDocument(
+      options.routerFilePath,
+      {
+        exportName: options.exportName ?? "AppRouter",
+        title: options.title ?? "tRPC API",
+        version: options.version ?? "1.0.0",
+      }
+    );
 
     const trpcSpec = generatedDocument as OpenAPIObject;
     const prefix = options.pathPrefix ?? "/trpc";
@@ -208,53 +171,19 @@ async function applyTrpcSpec(
     return null;
   }
 }
-function createEmptyBaseSpec(options: CreateDocsOptions): OpenAPIObject {
-  return {
-    info: {
-      title: options.title ?? "NestJS API",
-      description: options.description ?? "Generated with Nest Arch",
-      version: options.version ?? "1.0.0",
-    },
-    openapi: "3.1.0",
-    paths: {},
-    tags: [],
-  } as OpenAPIObject;
-}
 
 export async function createDocs(
   app: INestApplication,
   options: CreateDocsOptions = {}
 ): Promise<OpenAPIObject> {
-  {{#if (or hasRest hasAuth)}}
   const config = new DocumentBuilder()
     .setTitle(options.title ?? "NestJS API")
     .setDescription(options.description ?? "Generated with Nest Arch")
     .setVersion(options.version ?? "1.0.0")
     .build();
 
-  const standardSchemaConverter: StandardSchemaConverter = (
-    schema,
-    { schemaType }
-  ) => {
-    const standard = (schema as Record<string, unknown> | undefined)?.[
-      "~standard"
-    ] as Record<string, unknown> | undefined;
-    const convert = standard?.jsonSchema?.[schemaType] as
-      | ((opts: { target: string }) => unknown)
-      | undefined;
-    if (!convert) {
-      return;
-    }
-    const converted = convert({ target: "openapi-3.0" });
-    if (!converted || typeof converted !== "object") {
-      return;
-    }
-    return normalizeSchema(converted);
-  };
-
-  let baseSpec = SwaggerModule.createDocument(app, config, {
-    standardSchemaConverter,
-  }) as OpenAPIObject;
+  let baseSpec = SwaggerModule.createDocument(app, config) as OpenAPIObject;
+  baseSpec = await applyZodCleanup(baseSpec, options.integrations?.zod);
 
   if (!baseSpec.paths || Object.keys(baseSpec.paths).length === 0) {
     baseSpec = {
@@ -268,13 +197,12 @@ export async function createDocs(
       tags: [],
     } as OpenAPIObject;
   }
-  {{else}}
-  const baseSpec = createEmptyBaseSpec(options);
-  {{/if}}
 
   const additionalSpecs: OpenAPIObject[] = [];
 
-  const betterAuthSpec = await applyBetterAuthSpec(options.integrations?.betterAuth);
+  const betterAuthSpec = await applyBetterAuthSpec(
+    options.integrations?.betterAuth
+  );
   if (betterAuthSpec) {
     additionalSpecs.push(betterAuthSpec);
   }

package/dist/templates/feature/graphql/src/graphql/graphql.module.ts.hbs

@@ -1,5 +1,5 @@
 import { Module } from "@nestjs/common";
-import { GraphQLModule } from "@nestjs/graphql";
+import { Query, Resolver, GraphQLModule } from "@nestjs/graphql";
 import { ApolloDriver, ApolloDriverConfig } from "@nestjs/apollo";
 import { join } from "path";
 import { env } from "../config/env.js";
@@ -12,6 +12,12 @@ import { env } from "../config/env.js";
 import { TodoResolver } from "./resolvers/todo.resolver.js";
 {{/if}}
 
+@Resolver()
+class HealthResolver {
+  @Query(() => String)
+  hello(): string { return "Hello GraphQL!"; }
+}
+
 @Module({
   imports: [
     GraphQLModule.forRoot<ApolloDriverConfig>({
@@ -25,6 +31,7 @@ import { TodoResolver } from "./resolvers/todo.resolver.js";
     }),
   ],
   providers: [
+    HealthResolver,
     {{#if hasTodoExample}}
     TodoResolver,
     {{/if}}

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

@@ -1,8 +1,10 @@
 import { Field, ID, ObjectType } from "@nestjs/graphql";
 
 import { BaseModel } from "./base.model.js";
+{{#if hasAuth}}
 // oxlint-disable-next-line import/no-cycle
 import { User } from "./user.model.js";
+{{/if}}
 
 @ObjectType()
 export class Todo extends BaseModel {
@@ -15,9 +17,11 @@ export class Todo extends BaseModel {
   @Field()
   completed: boolean;
 
+{{#if hasAuth}}
   @Field(() => ID, { nullable: true })
   authorId: string | null;
 
   @Field(() => User, { nullable: true })
   author: User | null;
+{{/if}}
 }

package/dist/templates/feature/graphql/src/graphql/orm/drizzle/drizzle-graphql.module.ts.hbs

@@ -3,6 +3,7 @@ import { buildSchema } from "drizzle-graphql";
 {{#if isMonorepo}}
 import { db } from "@repo/db";
 {{else}}
+import { env } from "../../../config/env.js";
   {{#if hasPostgres}}
 import { drizzle } from "drizzle-orm/node-postgres";
 import { Pool } from "pg";
@@ -20,13 +21,13 @@ import * as dbSchema from "../database/orm/drizzle/schema.js";
 
 const schema = buildSchema({{#if isMonorepo}}db{{else}}
   {{#if hasPostgres}}
-  drizzle(new Pool({ connectionString: process.env.DATABASE_URL }), { schema: dbSchema })
+  drizzle(new Pool({ connectionString: env.POSTGRES_URL }), { schema: dbSchema })
   {{/if}}
   {{#if hasMysql}}
-  drizzle(mysql.createPool(process.env.DATABASE_URL), { schema: dbSchema })
+  drizzle(mysql.createPool(env.MYSQL_URL), { schema: dbSchema })
   {{/if}}
   {{#if hasSqlite}}
-  drizzle(new Database(process.env.DATABASE_URL), { schema: dbSchema })
+  drizzle(new Database(env.SQLITE_PATH), { schema: dbSchema })
   {{/if}}
 {{/if}});
 

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

@@ -1,28 +1,70 @@
+{{#if (and usePrisma (eq auth "none"))}}
+import { BadRequestException, NotFoundException } from "@nestjs/common";
+import { Args, Mutation, Query, Resolver } from "@nestjs/graphql";
+import { DbService } from "../../database/db.service.js";
+import { CreateTodoInput } from "../dto/create-todo.input.js";
+import { UpdateTodoInput } from "../dto/update-todo.input.js";
+import { Todo } from "../models/todo.model.js";
+
+@Resolver(() => Todo)
+export class TodoResolver {
+  constructor(private readonly db: DbService) {}
+
+  @Query(() => [Todo])
+  todos() {
+    return this.db.prisma.todo.findMany({ orderBy: { createdAt: "asc" }, take: 100 });
+  }
+
+  @Mutation(() => Todo)
+  createTodo(@Args("input") input: CreateTodoInput) {
+    if (!input.title.trim()) throw new BadRequestException("Title must not be empty");
+    return this.db.prisma.todo.create({ data: input });
+  }
+
+  @Mutation(() => Todo)
+  async updateTodo(@Args("input") input: UpdateTodoInput) {
+    const { id, ...data } = input;
+    if (data.title !== undefined && !data.title.trim()) throw new BadRequestException("Title must not be empty");
+    const result = await this.db.prisma.todo.updateManyAndReturn({ where: { id }, data });
+    if (!result[0]) throw new NotFoundException("Todo not found");
+    return result[0];
+  }
+
+  @Mutation(() => Boolean)
+  async deleteTodo(@Args("id") id: string): Promise<boolean> {
+    const result = await this.db.prisma.todo.deleteMany({ where: { id } });
+    if (result.count === 0) throw new NotFoundException("Todo not found");
+    return true;
+  }
+}
+{{else}}
 {{#if (and hasAuth hasDatabase)}}
 import { UseGuards } from "@nestjs/common";
 {{/if}}
 import { Args, Mutation, Query, Resolver } from "@nestjs/graphql";
-import { CreateTodoInput } from "../dto/create-todo.input.js";
-import { UpdateTodoInput } from "../dto/update-todo.input.js";
+{{#if (and hasAuth hasDatabase)}}
+import { UserEntity } from "../../auth/decorators/index.js";
+import { GqlAuthGuard } from "../../auth/guards/gql-auth.guard.js";
+{{/if}}
 {{#if isMonorepo}}
 import { DbService } from "@repo/db";
 {{else}}
-import { DbService } from "../database/db.service.js";
+import { DbService } from "../../database/db.service.js";
 {{/if}}
+import { CreateTodoInput } from "../dto/create-todo.input.js";
+import { UpdateTodoInput } from "../dto/update-todo.input.js";
 {{#if useTypeorm}}
 import { GraphRelationBuilder } from "typeorm-relations-graphql";
 import { GraphQLResolveInfo } from "graphql";
 {{/if}}
 {{#if useDrizzle}}
-import * as schema from "../database/orm/drizzle/schema.js";
+import * as schema from "../../database/orm/drizzle/schema.js";
 {{/if}}
 {{#if (and hasAuth hasDatabase)}}
 import { Todo } from "../models/todo.model.js";
-import { UserEntity } from "../../auth/decorators/index.js";
-import { GqlAuthGuard } from "../../auth/guards/gql-auth.guard.js";
 {{/if}}
 
-@Resolver({{#if (and hasAuth hasDatabase)}}{{"("}}() => Todo){{/if}})
+@Resolver(() => Todo)
 export class TodoResolver {
   constructor(private readonly db: DbService) {}
 
@@ -32,11 +74,13 @@ export class TodoResolver {
   }{{#if hasDatabase}}
 
   @Query(() => [Todo])
-  todos({{#if useTypeorm}}info: GraphQLResolveInfo{{/if}}): Promise<Todo[]> {
+  todos({{#if useTypeorm}}info: GraphQLResolveInfo{{/if}}) {
     {{#if useTypeorm}}
     const builder = new GraphRelationBuilder(this.db.getDataSource());
     const relations = builder.buildForQuery(Todo, info, "todos");
     return this.db.getRepository(Todo).find({ relations });
+    {{else if isPrisma8}}
+    return ((this.db.prisma.orm.public as any).Todo).all();
     {{else if usePrisma}}
     return this.db.prisma.todo.findMany();
     {{else if useDrizzle}}
@@ -46,14 +90,12 @@ export class TodoResolver {
     {{/if}}
   }
 
-  @Mutation(() => Todo)
-  {{#if (and hasAuth hasDatabase)}}
   @UseGuards(GqlAuthGuard)
-  {{/if}}
+  @Mutation(() => Todo)
   createTodo(
-    @Args("input") input: CreateTodoInput{{#if (and hasAuth hasDatabase)}},
-    @UserEntity() user: { id: string }{{/if}}{{#if useTypeorm}}, info: GraphQLResolveInfo{{/if}}
-  ): Promise<Todo> {
+    @UserEntity() user: { id: string },
+    @Args("input") input: CreateTodoInput{{#if useTypeorm}}, info: GraphQLResolveInfo{{/if}}
+  ) {
     {{#if useTypeorm}}
     const entity = this.db.getRepository(Todo).create(input);
     const saved = await this.db.getRepository(Todo).save(entity);
@@ -63,9 +105,11 @@ export class TodoResolver {
       where: { id: saved.id },
       relations,
     });
+    {{else if isPrisma8}}
+    return ((this.db.prisma.orm.public as any).Todo).create({ ...input, authorId: user.id });
     {{else if usePrisma}}
     return this.db.prisma.todo.create({
-      data: { ...input{{#if (and hasAuth hasDatabase)}}, authorId: user.id{{/if}} },
+      data: { ...input, authorId: user.id },
     });
     {{else if useDrizzle}}
     const [todo] = await this.db.insert(schema.todos).values(input).returning();
@@ -75,13 +119,9 @@ export class TodoResolver {
     {{/if}}
   }
 
-  @Mutation(() => Todo)
-  {{#if (and hasAuth hasDatabase)}}
   @UseGuards(GqlAuthGuard)
-  {{/if}}
-  updateTodo(
-    @Args("input") input: UpdateTodoInput{{#if useTypeorm}}, info: GraphQLResolveInfo{{/if}}
-  ): Promise<Todo> {
+  @Mutation(() => Todo)
+  updateTodo(@Args("input") input: UpdateTodoInput{{#if useTypeorm}}, info: GraphQLResolveInfo{{/if}}) {
     const { id, ...data } = input;
     {{#if useTypeorm}}
     await this.db.getRepository(Todo).update(id, data);
@@ -91,6 +131,8 @@ export class TodoResolver {
       where: { id },
       relations,
     });
+    {{else if isPrisma8}}
+    return ((this.db.prisma.orm.public as any).Todo).where({ id }).update(data);
     {{else if usePrisma}}
     return this.db.prisma.todo.update({ where: { id }, data });
     {{else if useDrizzle}}
@@ -105,14 +147,15 @@ export class TodoResolver {
     {{/if}}
   }
 
-  @Mutation(() => Boolean)
-  {{#if (and hasAuth hasDatabase)}}
   @UseGuards(GqlAuthGuard)
-  {{/if}}
+  @Mutation(() => Boolean)
   async deleteTodo(@Args("id") id: string): Promise<boolean> {
     {{#if useTypeorm}}
     const result = await this.db.getRepository(Todo).delete(id);
     return (result.affected ?? 0) > 0;
+    {{else if isPrisma8}}
+    await ((this.db.prisma.orm.public as any).Todo).where({ id }).delete();
+    return true;
     {{else if usePrisma}}
     await this.db.prisma.todo.delete({ where: { id } });
     return true;
@@ -124,3 +167,5 @@ export class TodoResolver {
     {{/if}}
   }{{/if}}
 }
+
+{{/if}}

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

@@ -16,7 +16,9 @@ import {
   ApiOkResponse,
   ApiOperation,
   ApiTags,
+{{#if (or isPassportAuth isBetterAuth)}}
   ApiUnauthorizedResponse,
+{{/if}}
 } from "@nestjs/swagger";
 {{/if}}
 {{#if isPassportAuth}}
@@ -164,7 +166,7 @@ export class TodoController {
     return this.todoService.delete(id, session.user.id);
   }
 {{else}}
-  async delete(@Param("id") id: string) {
+  delete(@Param("id") id: string) {
     return this.todoService.delete(id);
   }
 {{/if}}

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

@@ -11,14 +11,12 @@ import { TodoRouter } from "./todo.router.js";
   {{#if hasRest}}
   controllers: [TodoController],
   {{/if}}
+  exports: [TodoService],
   providers: [
     TodoService,
     {{#unless hasRest}}
     TodoRouter,
     {{/unless}}
   ],
-  {{#if hasRest}}
-  exports: [TodoService],
-  {{/if}}
 })
 export class TodoModule {}