next-openapi-gen 0.10.3 → 0.10.5

package/dist/lib/pages-router-strategy.js

@@ -148,9 +148,9 @@ export class PagesRouterStrategy {
         if (respSetMatch) {
             responseSet = respSetMatch[1].trim();
         }
-        const addMatch = cleanedComment.match(/@add\s+(.*)/);
-        if (addMatch) {
-            addResponses = addMatch[1].trim();
+        const addMatches = [...cleanedComment.matchAll(/@add\s+([^\n\r@]*)/g)];
+        if (addMatches.length > 0) {
+            addResponses = addMatches.map((m) => m[1].trim()).join(",");
         }
         const opIdMatch = cleanedComment.match(/@operationId\s+(\S+)/);
         if (opIdMatch) {

package/dist/lib/route-processor.js

@@ -16,7 +16,7 @@ export class RouteProcessor {
     processFileTracker = {};
     constructor(config) {
         this.config = config;
-        this.schemaProcessor = new SchemaProcessor(config.schemaDir, config.schemaType, config.schemaFiles);
+        this.schemaProcessor = new SchemaProcessor(config.schemaDir, config.schemaType, config.schemaFiles, config.apiDir);
         this.strategy = config.routerType === "pages"
             ? new PagesRouterStrategy(config)
             : new AppRouterStrategy(config);
@@ -102,6 +102,8 @@ export class RouteProcessor {
             customResponses.forEach((responseRef) => {
                 const [code, ref] = responseRef.split(":");
                 if (ref) {
+                    // Ensure the referenced schema is resolved (triggers Zod converter)
+                    this.schemaProcessor.getSchemaContent({ responseType: ref });
                     // Custom schema: "409:ConflictResponse"
                     // 204 No Content should not have a content section per HTTP/OpenAPI spec
                     if (code === "204") {

package/dist/lib/schema-processor.js

@@ -36,12 +36,12 @@ export class SchemaProcessor {
     // Track imports per file for resolving ReturnType<typeof func>
     importMap = {}; // { filePath: { importName: importPath } }
     currentFilePath = ""; // Track the file being processed
-    constructor(schemaDir, schemaType = "typescript", schemaFiles) {
+    constructor(schemaDir, schemaType = "typescript", schemaFiles, apiDir) {
         this.schemaDirs = normalizeSchemaDirs(schemaDir).map((d) => path.resolve(d));
         this.schemaTypes = normalizeSchemaTypes(schemaType);
         // Initialize Zod converter if Zod is enabled
         if (this.schemaTypes.includes("zod")) {
-            this.zodSchemaConverter = new ZodSchemaConverter(schemaDir);
+            this.zodSchemaConverter = new ZodSchemaConverter(schemaDir, apiDir);
         }
         // Load custom schema files if provided
         if (schemaFiles && schemaFiles.length > 0) {

package/dist/lib/utils.js

@@ -123,10 +123,9 @@ export function extractJSDocComments(path) {
                 }
             }
             if (commentValue.includes("@add")) {
-                const regex = /@add\s*(.*)/;
-                const match = commentValue.match(regex);
-                if (match && match[1]) {
-                    addResponses = match[1].trim();
+                const matches = [...commentValue.matchAll(/@add\s+([^\n\r@]*)/g)];
+                if (matches.length > 0) {
+                    addResponses = matches.map((m) => m[1].trim()).join(",");
                 }
             }
             if (commentValue.includes("@operationId")) {

package/dist/lib/zod-converter.js

@@ -12,6 +12,7 @@ import { DrizzleZodProcessor } from "./drizzle-zod-processor.js";
  */
 export class ZodSchemaConverter {
     schemaDirs;
+    apiDir;
     zodSchemas = {};
     processingSchemas = new Set();
     processedModules = new Set();
@@ -25,9 +26,10 @@ export class ZodSchemaConverter {
     currentFilePath;
     currentAST;
     currentImports;
-    constructor(schemaDir) {
+    constructor(schemaDir, apiDir) {
         const dirs = Array.isArray(schemaDir) ? schemaDir : [schemaDir];
         this.schemaDirs = dirs.map((d) => path.resolve(d));
+        this.apiDir = apiDir ? path.resolve(apiDir) : undefined;
     }
     /**
      * Find a Zod schema by name and convert it to OpenAPI spec
@@ -88,6 +90,14 @@ export class ZodSchemaConverter {
      */
     findRouteFiles() {
         const routeFiles = [];
+        // When apiDir is configured, scan only that directory to prevent
+        // leaking schemas from routes outside the configured API boundary.
+        if (this.apiDir) {
+            if (fs.existsSync(this.apiDir)) {
+                this.findRouteFilesInDir(this.apiDir, routeFiles);
+            }
+            return routeFiles;
+        }
         // Look for route files in common Next.js API directories
         const possibleApiDirs = [
             path.join(process.cwd(), "src", "app", "api"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-openapi-gen",
-  "version": "0.10.3",
+  "version": "0.10.5",
   "description": "Automatically generate OpenAPI 3.0 documentation from Next.js projects, with support for Zod schemas and TypeScript types.",
   "type": "module",
   "main": "dist/index.js",