@nest-arch/tui 0.2.7 → 0.2.8

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

@@ -1,4 +1,7 @@
 import { Module } from "@nestjs/common";
+{{#if (and hasAuth hasDatabase)}}
+import { PassportModule } from "@nestjs/passport";
+{{/if}}
 {{#if (or hasDatabase hasOrm)}}
 import { env } from "./config/env.js";
 import { DbModule } from "./database/db.module.js";
@@ -6,6 +9,10 @@ import { DbModule } from "./database/db.module.js";
 {{#if shouldImportAuthModule}}
 import { AuthModule } from "./auth/auth.module.js";
 {{/if}}
+{{#if (and hasAuth hasDatabase)}}
+import { GqlAuthGuard } from "./auth/guards/gql-auth.guard.js";
+import { RestAuthGuard } from "./auth/guards/rest-auth.guard.js";
+{{/if}}
 {{#if hasGraphql}}
 import { GraphqlAppModule } from "./graphql/graphql.module.js";
 {{/if}}
@@ -48,6 +55,9 @@ import { AppService } from "./app.service.js";
     {{#if shouldImportAuthModule}}
     AuthModule,
     {{/if}}
+    {{#if (and hasAuth hasDatabase)}}
+    PassportModule.register({ defaultStrategy: "jwt" }),
+    {{/if}}
     {{#if hasGraphql}}
     GraphqlAppModule,
     {{/if}}
@@ -63,6 +73,10 @@ import { AppService } from "./app.service.js";
   ],
   providers: [
     AppService,
+    {{#if (and hasAuth hasDatabase)}}
+    GqlAuthGuard,
+    RestAuthGuard,
+    {{/if}}
     {{#if hasTrpc}}
     {{#if hasTrpcAndAuth}}
     AuthTRPCMiddleware,
@@ -76,4 +90,4 @@ import { AppService } from "./app.service.js";
     {{/if}}
   ],
 })
-export class AppModule {}
+export class AppModule {}

package/dist/templates/base/tsconfig.json.hbs

@@ -24,4 +24,4 @@
     ],
     "strictNullChecks": true
   }
-}
+}

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

@@ -4,15 +4,8 @@
 // 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 +33,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 +75,28 @@ function mergeOpenApiSpecs(baseSpec: OpenAPIObject, ...extraSpecs: OpenAPIObject
   } as OpenAPIObject;
 }
 
+async function applyZodCleanup(
+  baseSpec: OpenAPIObject,
+  options?: NonNullable<DocsIntegrations["zod"]>
+) {
+  try {
+    const { cleanupOpenApiDoc } = await import("nestjs-zod");
+    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 +111,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 +137,26 @@ 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 { generateOpenAPIDocument } = await import("@trpc/openapi");
 
     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,11 +173,12 @@ async function applyTrpcSpec(
     return null;
   }
 }
+
 function createEmptyBaseSpec(options: CreateDocsOptions): OpenAPIObject {
   return {
     info: {
-      title: options.title ?? "NestJS API",
       description: options.description ?? "Generated with Nest Arch",
+      title: options.title ?? "NestJS API",
       version: options.version ?? "1.0.0",
     },
     openapi: "3.1.0",
@@ -225,36 +191,14 @@ 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 +212,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/resolvers/todo.resolver.ts.hbs

@@ -2,27 +2,29 @@
 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,7 +34,7 @@ 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");
@@ -46,14 +48,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);
@@ -65,7 +65,7 @@ export class TodoResolver {
     });
     {{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 +75,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);
@@ -105,10 +101,8 @@ 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);

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

@@ -2,9 +2,13 @@
 import { UseGuards } from "@nestjs/common";
 {{/if}}
 import { Args, Mutation, Query, Resolver } from "@nestjs/graphql";
+{{#if (and hasAuth hasDatabase)}}
+import { UserEntity } from "../../auth/decorators/index.js";
+import { GqlAuthGuard } from "../../auth/guards/gql-auth.guard.js";
+{{/if}}
+import { DbService } from "@repo/db";
 import { CreateTodoInput } from "../dto/create-todo.input.js";
 import { UpdateTodoInput } from "../dto/update-todo.input.js";
-import { DbService } from "@repo/db";
 {{#if useTypeorm}}
 import { GraphRelationBuilder } from "typeorm-relations-graphql";
 import { GraphQLResolveInfo } from "graphql";
@@ -14,11 +18,9 @@ import * as schema from "@repo/db/src/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) {}
 
@@ -28,7 +30,7 @@ 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");
@@ -42,14 +44,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);
@@ -61,7 +61,7 @@ export class TodoResolver {
     });
     {{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();
@@ -71,13 +71,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);
@@ -101,10 +97,8 @@ 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-arch/tui",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "private": false,
   "description": "Interactive terminal UI for generating NestJS projects",
   "keywords": [
@@ -48,9 +48,9 @@
     "pkgroll": "^2.5.2",
     "tsx": "^4.19.2",
     "vitest": "^4.1.7",
-    "@nest-arch/core": "0.2.7",
-    "@nest-arch/shared": "0.0.0",
-    "@nest-arch/env": "0.0.0"
+    "@nest-arch/core": "0.2.8",
+    "@nest-arch/env": "0.0.0",
+    "@nest-arch/shared": "0.0.0"
   },
   "peerDependencies": {
     "typescript": "^5"