Merge pull request #13 from rhyek/fix/relative-path-for-setup

fix relative path for setup

Author: rhyek

README.md

@@ -308,7 +308,7 @@ async function bootstrap() {
   const app = await NestFactory.create(AppModule);
   const { document, changed } = await setupOpenAPI(app, {
     configure: (builder) => builder.setTitle('My Api'),
-    outputFile: 'openapi.json',
+    outputFile: process.cwd() + '/openapi.json',
   });
   if (changed) {
     void import('orval').then(({ generate }) => generate());

packages/nestjs-endpoints/src/fns.ts renamed to packages/nestjs-endpoints/src/endpoint-fn.ts

@@ -101,3 +101,15 @@ export const ApiQueries = <T extends z.ZodObject<ZodRawShape>>(
 export function shouldJson(value: unknown) {
   return typeof value !== 'string';
 }
+
+export function getCallsiteFile() {
+  const callsite = callsites()[2];
+  if (!callsite) {
+    throw new Error('Callsite not found');
+  }
+  const result = callsite.getFileName()?.replace(/^file:\/\//, '');
+  if (!result) {
+    throw new Error('Callsite file not found');
+  }
+  return result;
+}

packages/nestjs-endpoints/src/helpers.ts

@@ -1,6 +1,6 @@
 export { z } from 'zod';
 export { EndpointsModule } from './decorators';
-export { endpoint, decorated, schema } from './fns';
+export { endpoint, decorated, schema } from './endpoint-fn';
 export {
   ZodValidationException,
   ZodSerializationException,

packages/nestjs-endpoints/src/index.ts

@@ -6,8 +6,8 @@ import {
   ModuleMetadata,
   Type,
 } from '@nestjs/common';
-import callsites from 'callsites';
 import { endpointFileRegex, settings } from './consts';
+import { getCallsiteFile } from './helpers';
 
 @Module({})
 export class EndpointsRouterModule {
@@ -33,12 +33,7 @@ export class EndpointsRouterModule {
   }): Promise<DynamicModule> {
     let rootDirectory = params.rootDirectory;
     if (!path.isAbsolute(rootDirectory)) {
-      const calledFrom = callsites()[1]
-        ?.getFileName()
-        ?.replace(/^file:/, '');
-      if (!calledFrom) {
-        throw new Error('Cannot determine call site');
-      }
+      const calledFrom = getCallsiteFile();
       rootDirectory = path.join(path.dirname(calledFrom), rootDirectory);
     }
     settings.rootDirectory = rootDirectory;

packages/nestjs-endpoints/src/router-module.ts

@@ -4,6 +4,7 @@ import { Writable } from 'node:stream';
 import { INestApplication } from '@nestjs/common';
 import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
 import { patchNestJsSwagger } from 'nestjs-zod';
+import { getCallsiteFile } from './helpers';
 
 export async function setupOpenAPI(
   app: INestApplication,
@@ -36,7 +37,7 @@ export async function setupOpenAPI(
     } else {
       const documentFile = path.isAbsolute(outputFile)
         ? outputFile
-        : path.resolve(process.cwd(), outputFile);
+        : path.resolve(path.dirname(getCallsiteFile()), outputFile);
       const currentDocument = await readFile(documentFile, 'utf-8').catch(
         () => '',
       );

packages/nestjs-endpoints/src/setup.ts

@@ -6,7 +6,7 @@ import { AppModule } from './app.module';
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
   await setupOpenAPI(app, {
-    outputFile: 'openapi.json',
+    outputFile: process.cwd() + '/openapi.json',
   });
   void generate();
 }

packages/test-endpoints-module/test-app-express-cjs/src/codegen.ts

@@ -5,7 +5,7 @@ import { AppModule } from './app.module';
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
   await setupOpenAPI(app, {
-    outputFile: 'openapi.json',
+    outputFile: process.cwd() + '/openapi.json',
   });
   const port = process.env.PORT || 3000;
   await app.listen(port, () => {

packages/test-endpoints-module/test-app-express-cjs/src/main.ts

@@ -1,11 +1,12 @@
+import path from 'node:path';
 import { NestFactory } from '@nestjs/core';
 import { setupOpenAPI } from 'nestjs-endpoints';
 import { AppModule } from './app.module';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
   await setupOpenAPI(app, {
-    outputFile: 'openapi.json',
+    outputFile: path.resolve(process.cwd(), 'openapi.json'),
   });
   const port = process.env.PORT || 3000;
   await app.listen(port, () => {