next-openapi-gen 1.2.0 → 1.2.1

package/dist/cli.js

@@ -12106,7 +12106,9 @@ var ZodSchemaConverter = class {
   apiDir;
   zodSchemas = {};
   processingSchemas = /* @__PURE__ */ new Set();
-  processedModules = /* @__PURE__ */ new Set();
+  /** Memoization guard for processFileForZodSchema. Keys: `${filePath}|${schemaName}`.
+   * Prevents infinite recursion when re-export files reference schemas via z.infer<typeof X>. */
+  processedFileSchemaPairs = /* @__PURE__ */ new Set();
   typeToSchemaMapping = {};
   drizzleZodImports = /* @__PURE__ */ new Set();
   factoryCache = /* @__PURE__ */ new Map();
@@ -12320,6 +12322,11 @@ var ZodSchemaConverter = class {
    * Process a file to find Zod schema definitions
    */
   processFileForZodSchema(filePath, schemaName) {
+    const visitKey = `${filePath}|${schemaName}|${this.currentContentType}`;
+    if (this.processedFileSchemaPairs.has(visitKey)) {
+      return;
+    }
+    this.processedFileSchemaPairs.add(visitKey);
     try {
       const content = this.fileAccess.readFileSync(filePath, "utf-8");
       if (!content.includes(schemaName)) {
@@ -12633,7 +12640,9 @@ var ZodSchemaConverter = class {
                 const param = path25.node.typeAnnotation.typeParameters.params[0];
                 if (t10.isTSTypeQuery(param) && t10.isIdentifier(param.exprName)) {
                   const referencedSchemaName = param.exprName.name;
-                  this.processFileForZodSchema(filePath, referencedSchemaName);
+                  if (!this.getStoredSchema(referencedSchemaName)) {
+                    this.processFileForZodSchema(filePath, referencedSchemaName);
+                  }
                 }
               }
             }
@@ -14008,15 +14017,39 @@ function extractKeysFromLiteralType(node) {
   }
   return [];
 }
+function parsePropertyComment(commentValue) {
+  const text = commentValue.split("\n").map((line) => line.replace(/^\s*\*\s?/, "").trim()).filter((line) => line.length > 0).join(" ").trim();
+  const result = {};
+  let remaining = text;
+  const formatMatch = remaining.match(/@format\s+(\S+)/);
+  if (formatMatch?.[1]) {
+    result.format = formatMatch[1];
+    remaining = remaining.replace(formatMatch[0], "").trim();
+  }
+  const exampleMatch = remaining.match(/@example\s+(.+?)(?=\s*@\w|$)/);
+  if (exampleMatch?.[1]) {
+    const raw = exampleMatch[1].trim();
+    try {
+      result.example = JSON.parse(raw);
+    } catch {
+      result.example = raw;
+    }
+    remaining = remaining.replace(exampleMatch[0], "").trim();
+  }
+  remaining = remaining.replace(/@\w+(?:\s+\S+)*/g, "").trim();
+  if (remaining) {
+    result.description = remaining;
+  }
+  return result;
+}
 function getPropertyOptions(node, contentType) {
   const isOptional = !!node.optional;
-  let description = null;
-  if (node.trailingComments && node.trailingComments.length) {
-    description = node.trailingComments[0].value.trim();
-  }
   const options = {};
-  if (description) {
-    options.description = description;
+  const leadingComment = node.leadingComments?.[node.leadingComments.length - 1];
+  const trailingComment = node.trailingComments?.[0];
+  const sourceComment = leadingComment ?? trailingComment;
+  if (sourceComment) {
+    Object.assign(options, parsePropertyComment(sourceComment.value));
   }
   if (contentType === "body") {
     options.nullable = isOptional;

package/dist/index.js

@@ -11655,7 +11655,9 @@ var ZodSchemaConverter = class {
   apiDir;
   zodSchemas = {};
   processingSchemas = /* @__PURE__ */ new Set();
-  processedModules = /* @__PURE__ */ new Set();
+  /** Memoization guard for processFileForZodSchema. Keys: `${filePath}|${schemaName}`.
+   * Prevents infinite recursion when re-export files reference schemas via z.infer<typeof X>. */
+  processedFileSchemaPairs = /* @__PURE__ */ new Set();
   typeToSchemaMapping = {};
   drizzleZodImports = /* @__PURE__ */ new Set();
   factoryCache = /* @__PURE__ */ new Map();
@@ -11869,6 +11871,11 @@ var ZodSchemaConverter = class {
    * Process a file to find Zod schema definitions
    */
   processFileForZodSchema(filePath, schemaName) {
+    const visitKey = `${filePath}|${schemaName}|${this.currentContentType}`;
+    if (this.processedFileSchemaPairs.has(visitKey)) {
+      return;
+    }
+    this.processedFileSchemaPairs.add(visitKey);
     try {
       const content = this.fileAccess.readFileSync(filePath, "utf-8");
       if (!content.includes(schemaName)) {
@@ -12182,7 +12189,9 @@ var ZodSchemaConverter = class {
                 const param = path25.node.typeAnnotation.typeParameters.params[0];
                 if (t10.isTSTypeQuery(param) && t10.isIdentifier(param.exprName)) {
                   const referencedSchemaName = param.exprName.name;
-                  this.processFileForZodSchema(filePath, referencedSchemaName);
+                  if (!this.getStoredSchema(referencedSchemaName)) {
+                    this.processFileForZodSchema(filePath, referencedSchemaName);
+                  }
                 }
               }
             }
@@ -13557,15 +13566,39 @@ function extractKeysFromLiteralType(node) {
   }
   return [];
 }
+function parsePropertyComment(commentValue) {
+  const text = commentValue.split("\n").map((line) => line.replace(/^\s*\*\s?/, "").trim()).filter((line) => line.length > 0).join(" ").trim();
+  const result = {};
+  let remaining = text;
+  const formatMatch = remaining.match(/@format\s+(\S+)/);
+  if (formatMatch?.[1]) {
+    result.format = formatMatch[1];
+    remaining = remaining.replace(formatMatch[0], "").trim();
+  }
+  const exampleMatch = remaining.match(/@example\s+(.+?)(?=\s*@\w|$)/);
+  if (exampleMatch?.[1]) {
+    const raw = exampleMatch[1].trim();
+    try {
+      result.example = JSON.parse(raw);
+    } catch {
+      result.example = raw;
+    }
+    remaining = remaining.replace(exampleMatch[0], "").trim();
+  }
+  remaining = remaining.replace(/@\w+(?:\s+\S+)*/g, "").trim();
+  if (remaining) {
+    result.description = remaining;
+  }
+  return result;
+}
 function getPropertyOptions(node, contentType) {
   const isOptional = !!node.optional;
-  let description = null;
-  if (node.trailingComments && node.trailingComments.length) {
-    description = node.trailingComments[0].value.trim();
-  }
   const options = {};
-  if (description) {
-    options.description = description;
+  const leadingComment = node.leadingComments?.[node.leadingComments.length - 1];
+  const trailingComment = node.trailingComments?.[0];
+  const sourceComment = leadingComment ?? trailingComment;
+  if (sourceComment) {
+    Object.assign(options, parsePropertyComment(sourceComment.value));
   }
   if (contentType === "body") {
     options.nullable = isOptional;

package/dist/next/index.js

@@ -12689,7 +12689,9 @@ var ZodSchemaConverter = class {
   apiDir;
   zodSchemas = {};
   processingSchemas = /* @__PURE__ */ new Set();
-  processedModules = /* @__PURE__ */ new Set();
+  /** Memoization guard for processFileForZodSchema. Keys: `${filePath}|${schemaName}`.
+   * Prevents infinite recursion when re-export files reference schemas via z.infer<typeof X>. */
+  processedFileSchemaPairs = /* @__PURE__ */ new Set();
   typeToSchemaMapping = {};
   drizzleZodImports = /* @__PURE__ */ new Set();
   factoryCache = /* @__PURE__ */ new Map();
@@ -12903,6 +12905,11 @@ var ZodSchemaConverter = class {
    * Process a file to find Zod schema definitions
    */
   processFileForZodSchema(filePath, schemaName) {
+    const visitKey = `${filePath}|${schemaName}|${this.currentContentType}`;
+    if (this.processedFileSchemaPairs.has(visitKey)) {
+      return;
+    }
+    this.processedFileSchemaPairs.add(visitKey);
     try {
       const content = this.fileAccess.readFileSync(filePath, "utf-8");
       if (!content.includes(schemaName)) {
@@ -13216,7 +13223,9 @@ var ZodSchemaConverter = class {
                 const param = path19.node.typeAnnotation.typeParameters.params[0];
                 if (t11.isTSTypeQuery(param) && t11.isIdentifier(param.exprName)) {
                   const referencedSchemaName = param.exprName.name;
-                  this.processFileForZodSchema(filePath, referencedSchemaName);
+                  if (!this.getStoredSchema(referencedSchemaName)) {
+                    this.processFileForZodSchema(filePath, referencedSchemaName);
+                  }
                 }
               }
             }
@@ -14591,15 +14600,39 @@ function extractKeysFromLiteralType(node) {
   }
   return [];
 }
+function parsePropertyComment(commentValue) {
+  const text = commentValue.split("\n").map((line) => line.replace(/^\s*\*\s?/, "").trim()).filter((line) => line.length > 0).join(" ").trim();
+  const result = {};
+  let remaining = text;
+  const formatMatch = remaining.match(/@format\s+(\S+)/);
+  if (formatMatch?.[1]) {
+    result.format = formatMatch[1];
+    remaining = remaining.replace(formatMatch[0], "").trim();
+  }
+  const exampleMatch = remaining.match(/@example\s+(.+?)(?=\s*@\w|$)/);
+  if (exampleMatch?.[1]) {
+    const raw = exampleMatch[1].trim();
+    try {
+      result.example = JSON.parse(raw);
+    } catch {
+      result.example = raw;
+    }
+    remaining = remaining.replace(exampleMatch[0], "").trim();
+  }
+  remaining = remaining.replace(/@\w+(?:\s+\S+)*/g, "").trim();
+  if (remaining) {
+    result.description = remaining;
+  }
+  return result;
+}
 function getPropertyOptions(node, contentType) {
   const isOptional = !!node.optional;
-  let description = null;
-  if (node.trailingComments && node.trailingComments.length) {
-    description = node.trailingComments[0].value.trim();
-  }
   const options = {};
-  if (description) {
-    options.description = description;
+  const leadingComment = node.leadingComments?.[node.leadingComments.length - 1];
+  const trailingComment = node.trailingComments?.[0];
+  const sourceComment = leadingComment ?? trailingComment;
+  if (sourceComment) {
+    Object.assign(options, parsePropertyComment(sourceComment.value));
   }
   if (contentType === "body") {
     options.nullable = isOptional;

package/dist/react-router/index.js

@@ -11693,7 +11693,9 @@ var ZodSchemaConverter = class {
   apiDir;
   zodSchemas = {};
   processingSchemas = /* @__PURE__ */ new Set();
-  processedModules = /* @__PURE__ */ new Set();
+  /** Memoization guard for processFileForZodSchema. Keys: `${filePath}|${schemaName}`.
+   * Prevents infinite recursion when re-export files reference schemas via z.infer<typeof X>. */
+  processedFileSchemaPairs = /* @__PURE__ */ new Set();
   typeToSchemaMapping = {};
   drizzleZodImports = /* @__PURE__ */ new Set();
   factoryCache = /* @__PURE__ */ new Map();
@@ -11907,6 +11909,11 @@ var ZodSchemaConverter = class {
    * Process a file to find Zod schema definitions
    */
   processFileForZodSchema(filePath, schemaName) {
+    const visitKey = `${filePath}|${schemaName}|${this.currentContentType}`;
+    if (this.processedFileSchemaPairs.has(visitKey)) {
+      return;
+    }
+    this.processedFileSchemaPairs.add(visitKey);
     try {
       const content = this.fileAccess.readFileSync(filePath, "utf-8");
       if (!content.includes(schemaName)) {
@@ -12220,7 +12227,9 @@ var ZodSchemaConverter = class {
                 const param = path17.node.typeAnnotation.typeParameters.params[0];
                 if (t10.isTSTypeQuery(param) && t10.isIdentifier(param.exprName)) {
                   const referencedSchemaName = param.exprName.name;
-                  this.processFileForZodSchema(filePath, referencedSchemaName);
+                  if (!this.getStoredSchema(referencedSchemaName)) {
+                    this.processFileForZodSchema(filePath, referencedSchemaName);
+                  }
                 }
               }
             }
@@ -13595,15 +13604,39 @@ function extractKeysFromLiteralType(node) {
   }
   return [];
 }
+function parsePropertyComment(commentValue) {
+  const text = commentValue.split("\n").map((line) => line.replace(/^\s*\*\s?/, "").trim()).filter((line) => line.length > 0).join(" ").trim();
+  const result = {};
+  let remaining = text;
+  const formatMatch = remaining.match(/@format\s+(\S+)/);
+  if (formatMatch?.[1]) {
+    result.format = formatMatch[1];
+    remaining = remaining.replace(formatMatch[0], "").trim();
+  }
+  const exampleMatch = remaining.match(/@example\s+(.+?)(?=\s*@\w|$)/);
+  if (exampleMatch?.[1]) {
+    const raw = exampleMatch[1].trim();
+    try {
+      result.example = JSON.parse(raw);
+    } catch {
+      result.example = raw;
+    }
+    remaining = remaining.replace(exampleMatch[0], "").trim();
+  }
+  remaining = remaining.replace(/@\w+(?:\s+\S+)*/g, "").trim();
+  if (remaining) {
+    result.description = remaining;
+  }
+  return result;
+}
 function getPropertyOptions(node, contentType) {
   const isOptional = !!node.optional;
-  let description = null;
-  if (node.trailingComments && node.trailingComments.length) {
-    description = node.trailingComments[0].value.trim();
-  }
   const options = {};
-  if (description) {
-    options.description = description;
+  const leadingComment = node.leadingComments?.[node.leadingComments.length - 1];
+  const trailingComment = node.trailingComments?.[0];
+  const sourceComment = leadingComment ?? trailingComment;
+  if (sourceComment) {
+    Object.assign(options, parsePropertyComment(sourceComment.value));
   }
   if (contentType === "body") {
     options.nullable = isOptional;

package/dist/vite/index.js

@@ -11693,7 +11693,9 @@ var ZodSchemaConverter = class {
   apiDir;
   zodSchemas = {};
   processingSchemas = /* @__PURE__ */ new Set();
-  processedModules = /* @__PURE__ */ new Set();
+  /** Memoization guard for processFileForZodSchema. Keys: `${filePath}|${schemaName}`.
+   * Prevents infinite recursion when re-export files reference schemas via z.infer<typeof X>. */
+  processedFileSchemaPairs = /* @__PURE__ */ new Set();
   typeToSchemaMapping = {};
   drizzleZodImports = /* @__PURE__ */ new Set();
   factoryCache = /* @__PURE__ */ new Map();
@@ -11907,6 +11909,11 @@ var ZodSchemaConverter = class {
    * Process a file to find Zod schema definitions
    */
   processFileForZodSchema(filePath, schemaName) {
+    const visitKey = `${filePath}|${schemaName}|${this.currentContentType}`;
+    if (this.processedFileSchemaPairs.has(visitKey)) {
+      return;
+    }
+    this.processedFileSchemaPairs.add(visitKey);
     try {
       const content = this.fileAccess.readFileSync(filePath, "utf-8");
       if (!content.includes(schemaName)) {
@@ -12220,7 +12227,9 @@ var ZodSchemaConverter = class {
                 const param = path17.node.typeAnnotation.typeParameters.params[0];
                 if (t10.isTSTypeQuery(param) && t10.isIdentifier(param.exprName)) {
                   const referencedSchemaName = param.exprName.name;
-                  this.processFileForZodSchema(filePath, referencedSchemaName);
+                  if (!this.getStoredSchema(referencedSchemaName)) {
+                    this.processFileForZodSchema(filePath, referencedSchemaName);
+                  }
                 }
               }
             }
@@ -13595,15 +13604,39 @@ function extractKeysFromLiteralType(node) {
   }
   return [];
 }
+function parsePropertyComment(commentValue) {
+  const text = commentValue.split("\n").map((line) => line.replace(/^\s*\*\s?/, "").trim()).filter((line) => line.length > 0).join(" ").trim();
+  const result = {};
+  let remaining = text;
+  const formatMatch = remaining.match(/@format\s+(\S+)/);
+  if (formatMatch?.[1]) {
+    result.format = formatMatch[1];
+    remaining = remaining.replace(formatMatch[0], "").trim();
+  }
+  const exampleMatch = remaining.match(/@example\s+(.+?)(?=\s*@\w|$)/);
+  if (exampleMatch?.[1]) {
+    const raw = exampleMatch[1].trim();
+    try {
+      result.example = JSON.parse(raw);
+    } catch {
+      result.example = raw;
+    }
+    remaining = remaining.replace(exampleMatch[0], "").trim();
+  }
+  remaining = remaining.replace(/@\w+(?:\s+\S+)*/g, "").trim();
+  if (remaining) {
+    result.description = remaining;
+  }
+  return result;
+}
 function getPropertyOptions(node, contentType) {
   const isOptional = !!node.optional;
-  let description = null;
-  if (node.trailingComments && node.trailingComments.length) {
-    description = node.trailingComments[0].value.trim();
-  }
   const options = {};
-  if (description) {
-    options.description = description;
+  const leadingComment = node.leadingComments?.[node.leadingComments.length - 1];
+  const trailingComment = node.trailingComments?.[0];
+  const sourceComment = leadingComment ?? trailingComment;
+  if (sourceComment) {
+    Object.assign(options, parsePropertyComment(sourceComment.value));
   }
   if (contentType === "body") {
     options.nullable = isOptional;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-openapi-gen",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Automatically generate OpenAPI 3.0, 3.1, and 3.2 documentation from Next.js projects, with support for Zod schemas, TypeScript types, and reusable OpenAPI fragments.",
   "keywords": [
     "api",