next-openapi-gen 1.2.0 → 1.2.2

package/dist/next/index.js

@@ -1306,6 +1306,17 @@ function mergeJSDocData(target, source) {
 function cleanComment(commentValue) {
   return commentValue.replace(/\*\s*/g, "").trim();
 }
+function extractSchemaIdFromComments(comments) {
+  if (!comments)
+    return null;
+  for (const comment of comments) {
+    const cleaned = cleanComment(comment.value);
+    const id = extractTokenValue(cleaned, "@id");
+    if (id)
+      return id;
+  }
+  return null;
+}
 function extractLineValue(commentValue, tag) {
   return commentValue.match(new RegExp(`${escapeRegExp(tag)}\\s*(.*)`, "m"))?.[1]?.trim() || "";
 }
@@ -4168,7 +4179,8 @@ var DrizzleZodProcessor = class _DrizzleZodProcessor {
         if (firstArg && !t5.isSpreadElement(firstArg) && !t5.isArgumentPlaceholder(firstArg)) {
           const metadata = _DrizzleZodProcessor.extractStaticObject(firstArg);
           if (metadata) {
-            Object.assign(result, metadata);
+            const { id: _id, ...rest } = metadata;
+            Object.assign(result, rest);
           }
         }
         break;
@@ -12452,8 +12464,11 @@ var ZodRuntimeExporter = class {
       case "deprecated":
         return schema.meta({ deprecated: true });
       case "meta": {
-        const metadata = node.arguments[0] ? this.buildMetadataObject(node.arguments[0]) : null;
-        return metadata ? schema.meta(metadata) : schema;
+        const rawMetadata = node.arguments[0] ? this.buildMetadataObject(node.arguments[0]) : null;
+        if (!rawMetadata)
+          return schema;
+        const { id: _id, ...metadata } = rawMetadata;
+        return Object.keys(metadata).length > 0 ? schema.meta(metadata) : schema;
       }
       case "default":
       case "prefault":
@@ -12689,7 +12704,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 +12920,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 +13238,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);
+                  }
                 }
               }
             }
@@ -13234,6 +13258,8 @@ var ZodSchemaConverter = class {
     try {
       const content = this.fileAccess.readFileSync(filePath, "utf-8");
       const ast = parseTypeScriptFile(content);
+      this.currentFilePath = filePath;
+      this.currentAST = ast;
       resolvedTraverse(ast, {
         ExportNamedDeclaration: (path19) => {
           if (t11.isVariableDeclaration(path19.node.declaration)) {
@@ -13248,6 +13274,17 @@ var ZodSchemaConverter = class {
                   }
                   this.processingSchemas.delete(schemaName);
                 }
+              } else if (t11.isIdentifier(declaration.id) && declaration.init) {
+                const schemaName = declaration.id.name;
+                const overrideId = this.extractMetaIdFromNode(declaration.init);
+                if (overrideId && !this.getStoredSchema(schemaName) && !this.processingSchemas.has(schemaName)) {
+                  this.processingSchemas.add(schemaName);
+                  const schema = this.processZodNode(declaration.init);
+                  this.processingSchemas.delete(schemaName);
+                  if (schema) {
+                    this.applyMetaIdOverride(schemaName, schema, overrideId, filePath);
+                  }
+                }
               }
             });
           }
@@ -13801,6 +13838,24 @@ var ZodSchemaConverter = class {
     }
     return void 0;
   }
+  extractMetaIdFromNode(node) {
+    if (!t11.isCallExpression(node))
+      return null;
+    if (t11.isMemberExpression(node.callee) && t11.isIdentifier(node.callee.property)) {
+      if (node.callee.property.name === "meta" && node.arguments.length > 0) {
+        const metadata = this.extractStaticJsonValue(node.arguments[0]);
+        if (metadata && typeof metadata === "object" && !Array.isArray(metadata)) {
+          const id = metadata.id;
+          if (typeof id === "string" && id.length > 0)
+            return id;
+        }
+      }
+      if (t11.isCallExpression(node.callee.object)) {
+        return this.extractMetaIdFromNode(node.callee.object);
+      }
+    }
+    return null;
+  }
   shouldUseRuntimeExport(node) {
     if (!t11.isCallExpression(node)) {
       return false;
@@ -14041,7 +14096,8 @@ var ZodSchemaConverter = class {
         if (node.arguments.length > 0) {
           const metadata = this.extractStaticJsonValue(node.arguments[0]);
           if (metadata && typeof metadata === "object" && !Array.isArray(metadata)) {
-            Object.assign(schema, metadata);
+            const { id: _id, ...rest } = metadata;
+            Object.assign(schema, rest);
           }
         }
         break;
@@ -14327,6 +14383,7 @@ var ZodSchemaConverter = class {
       this.currentFilePath = filePath;
       this.currentAST = ast;
       this.currentImports = importedModules;
+      this.preprocessedFiles.add(filePath);
       resolvedTraverse(ast, {
         ExportNamedDeclaration: (path19) => {
           if (t11.isVariableDeclaration(path19.node.declaration)) {
@@ -14334,15 +14391,19 @@ var ZodSchemaConverter = class {
               if (t11.isIdentifier(declaration.id) && declaration.init) {
                 const schemaName = declaration.id.name;
                 if (this.isZodSchema(declaration.init)) {
-                  this.indexSchemaName(schemaName, filePath);
                   if (!this.getStoredSchema(schemaName)) {
                     logger.debug(`Pre-processing Zod schema: ${schemaName}`);
                     this.processingSchemas.add(schemaName);
                     const schema = this.processZodNode(declaration.init);
+                    this.processingSchemas.delete(schemaName);
                     if (schema) {
-                      this.storeResolvedSchema(schemaName, schema);
+                      const overrideId = this.extractMetaIdFromNode(declaration.init);
+                      this.applyMetaIdOverride(schemaName, schema, overrideId, filePath);
+                    } else {
+                      this.indexSchemaName(schemaName, filePath);
                     }
-                    this.processingSchemas.delete(schemaName);
+                  } else {
+                    this.indexSchemaName(schemaName, filePath);
                   }
                 }
               }
@@ -14355,22 +14416,25 @@ var ZodSchemaConverter = class {
             if (t11.isIdentifier(declaration.id) && declaration.init) {
               const schemaName = declaration.id.name;
               if (this.isZodSchema(declaration.init)) {
-                this.indexSchemaName(schemaName, filePath);
                 if (!this.getStoredSchema(schemaName) && !this.processingSchemas.has(schemaName)) {
                   logger.debug(`Pre-processing Zod schema: ${schemaName}`);
                   this.processingSchemas.add(schemaName);
                   const schema = this.processZodNode(declaration.init);
+                  this.processingSchemas.delete(schemaName);
                   if (schema) {
-                    this.storeResolvedSchema(schemaName, schema);
+                    const overrideId = this.extractMetaIdFromNode(declaration.init);
+                    this.applyMetaIdOverride(schemaName, schema, overrideId, filePath);
+                  } else {
+                    this.indexSchemaName(schemaName, filePath);
                   }
-                  this.processingSchemas.delete(schemaName);
+                } else {
+                  this.indexSchemaName(schemaName, filePath);
                 }
               }
             }
           });
         }
       });
-      this.preprocessedFiles.add(filePath);
     } catch (error2) {
       logger.error(`Error pre-processing file ${filePath}: ${error2}`);
     }
@@ -14388,6 +14452,21 @@ var ZodSchemaConverter = class {
     }
     bucket.add(filePath);
   }
+  applyMetaIdOverride(schemaName, schema, overrideId, filePath) {
+    const finalName = overrideId && overrideId !== schemaName ? overrideId : schemaName;
+    this.indexSchemaName(schemaName, filePath);
+    if (finalName !== schemaName) {
+      this.indexSchemaName(finalName, filePath);
+    }
+    if (!this.getStoredSchema(finalName)) {
+      if (overrideId && overrideId !== schemaName) {
+        this.typeToSchemaMapping[schemaName] = overrideId;
+      }
+      this.storeResolvedSchema(finalName, schema);
+    } else {
+      logger.warn(`Schema component name '${overrideId ?? finalName}' conflicts with an existing schema, ignoring .meta({ id }) on '${schemaName}'`);
+    }
+  }
   /**
    * Check if node is Zod schema
    */
@@ -14591,15 +14670,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?.findLast((c) => c.type === "CommentBlock" || !node.trailingComments?.length);
+  const trailingComment = node.trailingComments?.[0];
+  const sourceComment = leadingComment ?? trailingComment;
+  if (sourceComment) {
+    Object.assign(options, parsePropertyComment(sourceComment.value));
   }
   if (contentType === "body") {
     options.nullable = isOptional;
@@ -14998,31 +15101,60 @@ function resolveImportPath(importPath, fromFilePath, fileAccess) {
   }
   return null;
 }
-function collectAllExportedDefinitions(ast, typeDefinitions, currentFile) {
+function collectFirstMemberLeadingComments(interfaceDecl) {
+  const body = interfaceDecl?.body;
+  if (!body)
+    return [];
+  const firstMember = body.body?.[0];
+  return firstMember?.leadingComments ?? [];
+}
+function collectAllExportedDefinitions(ast, typeDefinitions, currentFile, schemaIdAliases) {
+  function registerDefinition(name, entry, allComments) {
+    if (!typeDefinitions[name]) {
+      typeDefinitions[name] = entry;
+    }
+    const overrideId = extractSchemaIdFromComments(allComments);
+    if (overrideId && schemaIdAliases) {
+      schemaIdAliases[name] = overrideId;
+      if (!typeDefinitions[overrideId]) {
+        typeDefinitions[overrideId] = entry;
+      }
+    }
+  }
   resolvedTraverse(ast, {
     TSTypeAliasDeclaration: (path19) => {
       if (path19.node.id && t13.isIdentifier(path19.node.id)) {
         const name = path19.node.id.name;
-        if (!typeDefinitions[name]) {
-          const node = path19.node.typeParameters && path19.node.typeParameters.params.length > 0 ? path19.node : path19.node.typeAnnotation;
-          typeDefinitions[name] = { node, filePath: currentFile };
-        }
+        const node = path19.node.typeParameters && path19.node.typeParameters.params.length > 0 ? path19.node : path19.node.typeAnnotation;
+        const allComments = [
+          ...path19.parentPath?.node?.leadingComments ?? [],
+          ...path19.node.leadingComments ?? [],
+          ...path19.node.trailingComments ?? []
+        ];
+        registerDefinition(name, { node, filePath: currentFile }, allComments);
       }
     },
     TSInterfaceDeclaration: (path19) => {
       if (path19.node.id && t13.isIdentifier(path19.node.id)) {
         const name = path19.node.id.name;
-        if (!typeDefinitions[name]) {
-          typeDefinitions[name] = { node: path19.node, filePath: currentFile };
-        }
+        const allComments = [
+          ...path19.parentPath?.node?.leadingComments ?? [],
+          ...path19.node.leadingComments ?? [],
+          ...path19.node.trailingComments ?? [],
+          ...collectFirstMemberLeadingComments(path19.node)
+        ];
+        registerDefinition(name, { node: path19.node, filePath: currentFile }, allComments);
       }
     },
     TSEnumDeclaration: (path19) => {
       if (path19.node.id && t13.isIdentifier(path19.node.id)) {
         const name = path19.node.id.name;
-        if (!typeDefinitions[name]) {
-          typeDefinitions[name] = { node: path19.node, filePath: currentFile };
-        }
+        const allComments = [
+          ...path19.parentPath?.node?.leadingComments ?? [],
+          ...path19.node.leadingComments ?? [],
+          ...path19.node.trailingComments ?? []
+        ];
+        registerDefinition(name, { node: path19.node, filePath: currentFile }, allComments);
       }
     },
     ExportNamedDeclaration: (path19) => {
@@ -15030,19 +15162,26 @@ function collectAllExportedDefinitions(ast, typeDefinitions, currentFile) {
         const interfaceDecl = path19.node.declaration;
         if (interfaceDecl.id && t13.isIdentifier(interfaceDecl.id)) {
           const name = interfaceDecl.id.name;
-          if (!typeDefinitions[name]) {
-            typeDefinitions[name] = { node: interfaceDecl, filePath: currentFile };
-          }
+          const allComments = [
+            ...path19.node.leadingComments ?? [],
+            ...interfaceDecl.leadingComments ?? [],
+            ...interfaceDecl.trailingComments ?? [],
+            ...collectFirstMemberLeadingComments(interfaceDecl)
+          ];
+          registerDefinition(name, { node: interfaceDecl, filePath: currentFile }, allComments);
         }
       }
       if (t13.isTSTypeAliasDeclaration(path19.node.declaration)) {
         const typeDecl = path19.node.declaration;
         if (typeDecl.id && t13.isIdentifier(typeDecl.id)) {
           const name = typeDecl.id.name;
-          if (!typeDefinitions[name]) {
-            const node = typeDecl.typeParameters && typeDecl.typeParameters.params.length > 0 ? typeDecl : typeDecl.typeAnnotation;
-            typeDefinitions[name] = { node, filePath: currentFile };
-          }
+          const node = typeDecl.typeParameters && typeDecl.typeParameters.params.length > 0 ? typeDecl : typeDecl.typeAnnotation;
+          const allComments = [
+            ...path19.node.leadingComments ?? [],
+            ...typeDecl.leadingComments ?? [],
+            ...typeDecl.trailingComments ?? []
+          ];
+          registerDefinition(name, { node, filePath: currentFile }, allComments);
         }
       }
     }
@@ -15459,6 +15598,7 @@ var SchemaProcessor = class {
   zodSchemaProcessor = null;
   schemaTypes;
   isResolvingPickOmitBase = false;
+  schemaIdAliases = {};
   fileAccess;
   symbolResolver;
   // Track imports per file for resolving ReturnType<typeof func>
@@ -15499,7 +15639,7 @@ var SchemaProcessor = class {
   getDefinedSchemas() {
     const filteredSchemas = {};
     Object.entries(this.openapiDefinitions).forEach(([key, value]) => {
-      if (!this.isGenericTypeParameter(key) && !this.isInvalidSchemaName(key) && !this.isBuiltInUtilityType(key) && !this.isFunctionSchema(key)) {
+      if (!this.schemaIdAliases[key] && !this.isGenericTypeParameter(key) && !this.isInvalidSchemaName(key) && !this.isBuiltInUtilityType(key) && !this.isFunctionSchema(key)) {
         filteredSchemas[key] = value;
       }
     });
@@ -15514,6 +15654,10 @@ var SchemaProcessor = class {
     if (schemaName.includes("<") && schemaName.includes(">")) {
       return this.resolveGenericTypeFromString(schemaName);
     }
+    const overrideId = this.schemaIdAliases[schemaName];
+    if (overrideId) {
+      return this.findSchemaDefinition(overrideId, contentType);
+    }
     if (this.openapiDefinitions[schemaName]) {
       return this.openapiDefinitions[schemaName];
     }
@@ -15595,6 +15739,7 @@ var SchemaProcessor = class {
       return;
     }
     this.collectImports(ast, filePath);
+    const aliasesBeforeFile = new Set(Object.keys(this.schemaIdAliases));
     this.collectAllExportedDefinitions(ast, filePath);
     collectTopLevelDefinitionNames(ast).forEach((name) => {
       const indexedFiles = this.schemaDefinitionIndex[name];
@@ -15606,6 +15751,16 @@ var SchemaProcessor = class {
       }
       this.schemaDefinitionIndex[name] = [filePath];
     });
+    Object.entries(this.schemaIdAliases).forEach(([originalName, aliasName]) => {
+      if (aliasesBeforeFile.has(originalName))
+        return;
+      if (!this.schemaDefinitionIndex[aliasName]) {
+        this.schemaDefinitionIndex[aliasName] = [];
+      }
+      if (!this.schemaDefinitionIndex[aliasName].includes(filePath)) {
+        this.schemaDefinitionIndex[aliasName].push(filePath);
+      }
+    });
   }
   getParsedSchemaFile(filePath) {
     const cachedAst = this.fileASTCache.get(filePath);
@@ -15644,7 +15799,7 @@ var SchemaProcessor = class {
    * Used when processing imported files to ensure all referenced types are available
    */
   collectAllExportedDefinitions(ast, filePath) {
-    collectAllExportedDefinitions(ast, this.typeDefinitions, filePath || this.currentFilePath);
+    collectAllExportedDefinitions(ast, this.typeDefinitions, filePath || this.currentFilePath, this.schemaIdAliases);
   }
   collectTypeDefinitions(ast, schemaName, filePath) {
     collectTypeDefinitions(ast, schemaName, this.typeDefinitions, filePath || this.currentFilePath);
@@ -16241,6 +16396,9 @@ var SchemaProcessor = class {
         logger.debug(`Record<...> used with ${node.typeParameters?.params.length ?? 0} type parameters; expected 2`);
         return { type: "object", additionalProperties: true };
       }
+      if ((!node.typeParameters || node.typeParameters.params.length === 0) && this.schemaIdAliases[typeName] && this.openapiDefinitions[this.schemaIdAliases[typeName]]) {
+        return { $ref: `#/components/schemas/${this.schemaIdAliases[typeName]}` };
+      }
       const utilityType = resolveUtilityTypeReference(node, {
         currentFilePath: this.currentFilePath,
         contentType: this.contentType,
@@ -16416,7 +16574,9 @@ var SchemaProcessor = class {
       };
     }
     if (t16.isTSTypeReference(node) && t16.isIdentifier(node.typeName)) {
-      return { $ref: `#/components/schemas/${node.typeName.name}` };
+      const refName = node.typeName.name;
+      const aliasedName = this.schemaIdAliases[refName] ?? refName;
+      return { $ref: `#/components/schemas/${aliasedName}` };
     }
     logger.debug("Unrecognized TypeScript type node:", node);
     return { type: "object" };
@@ -16557,7 +16717,8 @@ var SchemaProcessor = class {
     if (this.schemaTypes.includes("zod") && this.zodSchemaConverter) {
       return this.zodSchemaConverter.getSchemaReferenceName(baseTypeName, contentType);
     }
-    return baseTypeName;
+    const aliasedName = this.schemaIdAliases[baseTypeName] ?? baseTypeName;
+    return aliasedName;
   }
   /**
    * Parse and resolve a generic type from a string like "MyApiSuccessResponseBody<LLMSResponse>"