next-openapi-gen 1.1.1 → 1.2.1

package/README.md

@@ -162,6 +162,28 @@ For more adoption patterns, see
 
 When you target modern OpenAPI output, the Zod path can also split request and response component refs when a supported Zod 4 schema emits different input and output JSON Schema shapes, while the TypeScript path can use selective checker fallback for mapped, conditional, template-literal, and import-based named types.
 
+### Add OpenAPI metadata directly in Zod schemas
+
+Use `.describe()` for a quick description, or Zod v4's `.meta()` to attach `description`, `examples`, `example`, `deprecated`, `title`, and custom `x-*` extensions without any JSDoc:
+
+```ts
+// .describe() → description field
+z.string().describe("ISO 639-1 language code");
+// → { type: "string", description: "ISO 639-1 language code" }
+
+// .meta() → description + examples (and any other OpenAPI key)
+z.number()
+  .int()
+  .positive()
+  .meta({
+    description: "PIM ID of the slider",
+    examples: [42, 1337],
+  });
+// → { type: "integer", exclusiveMinimum: 0, description: "PIM ID of the slider", examples: [42, 1337] }
+```
+
+Both work inside `z.object({...})` properties, in drizzle-zod override callbacks, and at the top level of named schemas. See [docs/zod4-support-matrix.md](./docs/zod4-support-matrix.md) for the full supported metadata surface.
+
 ### Generate docs from Drizzle schemas
 
 `next-openapi-gen` works well with `drizzle-zod`, so your database schema, validation, and API docs can share the same source of truth.

package/dist/cli.js

@@ -3154,7 +3154,7 @@ var SymbolResolver = class {
 
 // ../openapi-core/dist/schema/zod/drizzle-zod-processor.js
 import * as t4 from "@babel/types";
-var DrizzleZodProcessor = class {
+var DrizzleZodProcessor = class _DrizzleZodProcessor {
   /**
    * Known drizzle-zod helper function names
    */
@@ -3580,6 +3580,16 @@ var DrizzleZodProcessor = class {
           result.description = args[0].value;
         }
         break;
+      case "meta": {
+        const firstArg = args[0];
+        if (firstArg && !t4.isSpreadElement(firstArg) && !t4.isArgumentPlaceholder(firstArg)) {
+          const metadata = _DrizzleZodProcessor.extractStaticObject(firstArg);
+          if (metadata) {
+            Object.assign(result, metadata);
+          }
+        }
+        break;
+      }
       case "default":
         if (args.length > 0) {
           if (t4.isStringLiteral(args[0])) {
@@ -3600,6 +3610,49 @@ var DrizzleZodProcessor = class {
   static isDrizzleZodHelper(name) {
     return this.DRIZZLE_ZOD_HELPERS.includes(name);
   }
+  static extractStaticObject(node) {
+    if (!t4.isObjectExpression(node))
+      return null;
+    const out = {};
+    for (const prop of node.properties) {
+      if (!t4.isObjectProperty(prop))
+        return null;
+      const key = t4.isIdentifier(prop.key) ? prop.key.name : t4.isStringLiteral(prop.key) ? prop.key.value : null;
+      if (!key)
+        return null;
+      const val = _DrizzleZodProcessor.extractStaticValue(prop.value);
+      if (typeof val === "undefined")
+        return null;
+      out[key] = val;
+    }
+    return out;
+  }
+  static extractStaticValue(node) {
+    if (t4.isStringLiteral(node))
+      return node.value;
+    if (t4.isNumericLiteral(node))
+      return node.value;
+    if (t4.isBooleanLiteral(node))
+      return node.value;
+    if (t4.isNullLiteral(node))
+      return null;
+    if (t4.isArrayExpression(node)) {
+      const values = [];
+      for (const el of node.elements) {
+        if (!el || t4.isSpreadElement(el) || t4.isArgumentPlaceholder(el))
+          return void 0;
+        const v = _DrizzleZodProcessor.extractStaticValue(el);
+        if (typeof v === "undefined")
+          return void 0;
+        values.push(v);
+      }
+      return values;
+    }
+    if (t4.isObjectExpression(node)) {
+      return _DrizzleZodProcessor.extractStaticObject(node);
+    }
+    return void 0;
+  }
 };
 
 // ../openapi-core/dist/schema/zod/converter-runtime.js
@@ -4570,8 +4623,12 @@ function processZodPrimitiveNode(node, context) {
       };
       break;
     }
+    case "strictObject":
     case "object":
       schema = node.arguments.length > 0 ? context.processObject(node) : { type: "object" };
+      if (zodType === "strictObject") {
+        schema.additionalProperties = false;
+      }
       break;
     case "templateLiteral":
       schema = { type: "string" };
@@ -11638,6 +11695,10 @@ var ZodRuntimeExporter = class {
         return this.buildEnum(node);
       case "array":
         return node.arguments[0] && isProcessableNode(node.arguments[0]) ? array(this.buildSchema(node.arguments[0]) ?? unknown()) : array(unknown());
+      case "strictObject": {
+        const base = this.buildObject(node);
+        return base && typeof base.strict === "function" ? base.strict() : base;
+      }
       case "object":
         return this.buildObject(node);
       case "record":
@@ -12045,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();
@@ -12259,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)) {
@@ -12572,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);
+                  }
                 }
               }
             }
@@ -12657,8 +12727,12 @@ var ZodSchemaConverter = class {
     }
     if (t10.isCallExpression(node) && t10.isMemberExpression(node.callee) && t10.isIdentifier(node.callee.object) && this.isZodLocalName(node.callee.object.name) && t10.isIdentifier(node.callee.property)) {
       const methodName = node.callee.property.name;
-      if (methodName === "object" && node.arguments.length > 0) {
-        return this.processZodObject(node);
+      if ((methodName === "object" || methodName === "strictObject") && node.arguments.length > 0) {
+        const schema = this.processZodObject(node);
+        if (methodName === "strictObject") {
+          schema.additionalProperties = false;
+        }
+        return schema;
       } else if (methodName === "union" && node.arguments.length > 0) {
         return this.processZodUnion(node);
       } else if (methodName === "intersection" && node.arguments.length > 0) {
@@ -13943,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;
@@ -14816,6 +14914,8 @@ var SchemaProcessor = class {
   // Track imports per file for resolving ReturnType<typeof func>
   importMap = {};
   // { filePath: { importName: importPath } }
+  // Inverted index: typeName → first filePath that imports it (O(1) lookup for findFileImportingType)
+  typeToFileIndex = /* @__PURE__ */ new Map();
   currentFilePath = "";
   // Track the file being processed
   constructor(schemaDir, schemaType = "typescript", schemaFiles, apiDir, fileAccess = defaultFileAccess2, runtime) {
@@ -14969,6 +15069,13 @@ var SchemaProcessor = class {
   }
   collectImports(ast, filePath) {
     collectImports(ast, filePath, this.importMap);
+    const normalizedPath = path14.normalize(filePath);
+    const entries = this.importMap[normalizedPath] ?? {};
+    for (const typeName of Object.keys(entries)) {
+      if (!this.typeToFileIndex.has(typeName)) {
+        this.typeToFileIndex.set(typeName, normalizedPath);
+      }
+    }
   }
   /**
    * Resolve an import path relative to the current file
@@ -15007,6 +15114,15 @@ var SchemaProcessor = class {
       }
       const typeDefEntry = this.typeDefinitions[typeName.toString()];
       if (!typeDefEntry) {
+        const contextFile = this.findFileImportingType(typeName);
+        if (contextFile) {
+          logger.debug(`resolveType: "${typeName}" not in schema dirs; attempting TypeScript checker fallback via ${contextFile}`);
+          const checkerSchema = this.resolveTypeWithTypeScriptChecker(typeName, contextFile);
+          if (checkerSchema && Object.keys(checkerSchema).length > 0) {
+            this.openapiDefinitions[typeName] = checkerSchema;
+            return checkerSchema;
+          }
+        }
         logger.debug(`resolveType: no TypeScript definition found for "${typeName}" in ${this.currentFilePath}; returning empty schema`);
         return {};
       }
@@ -15218,6 +15334,14 @@ var SchemaProcessor = class {
     }
     return null;
   }
+  /**
+   * Return the path of the first scanned file that imports `typeName`, or `null` when none is
+   * found. Used as a fallback context for {@link resolveTypeWithTypeScriptChecker} when the type
+   * is not defined in any schema-dir file (e.g. comes from node_modules or a shared package).
+   */
+  findFileImportingType(typeName) {
+    return this.typeToFileIndex.get(typeName) ?? null;
+  }
   shouldUseTypeScriptChecker(node) {
     return t15.isTSConditionalType(node) || t15.isTSMappedType(node) || t15.isTSTemplateLiteralType(node) || t15.isTSImportType(node) || t15.isTSTypeOperator(node) && node.operator === "keyof";
   }
@@ -15281,7 +15405,9 @@ var SchemaProcessor = class {
     if (seen.has(seenKey)) {
       return { type: "object" };
     }
-    seen.add(seenKey);
+    if (!(type.flags & (primitiveLikeFlags | ts2.TypeFlags.Any | ts2.TypeFlags.Never | ts2.TypeFlags.Unknown | ts2.TypeFlags.Void))) {
+      seen.add(seenKey);
+    }
     if (type.isStringLiteral()) {
       return { type: "string", enum: [type.value] };
     }

package/dist/index.js

@@ -2703,7 +2703,7 @@ var SymbolResolver = class {
 
 // ../openapi-core/dist/schema/zod/drizzle-zod-processor.js
 import * as t4 from "@babel/types";
-var DrizzleZodProcessor = class {
+var DrizzleZodProcessor = class _DrizzleZodProcessor {
   /**
    * Known drizzle-zod helper function names
    */
@@ -3129,6 +3129,16 @@ var DrizzleZodProcessor = class {
           result.description = args[0].value;
         }
         break;
+      case "meta": {
+        const firstArg = args[0];
+        if (firstArg && !t4.isSpreadElement(firstArg) && !t4.isArgumentPlaceholder(firstArg)) {
+          const metadata = _DrizzleZodProcessor.extractStaticObject(firstArg);
+          if (metadata) {
+            Object.assign(result, metadata);
+          }
+        }
+        break;
+      }
       case "default":
         if (args.length > 0) {
           if (t4.isStringLiteral(args[0])) {
@@ -3149,6 +3159,49 @@ var DrizzleZodProcessor = class {
   static isDrizzleZodHelper(name) {
     return this.DRIZZLE_ZOD_HELPERS.includes(name);
   }
+  static extractStaticObject(node) {
+    if (!t4.isObjectExpression(node))
+      return null;
+    const out = {};
+    for (const prop of node.properties) {
+      if (!t4.isObjectProperty(prop))
+        return null;
+      const key = t4.isIdentifier(prop.key) ? prop.key.name : t4.isStringLiteral(prop.key) ? prop.key.value : null;
+      if (!key)
+        return null;
+      const val = _DrizzleZodProcessor.extractStaticValue(prop.value);
+      if (typeof val === "undefined")
+        return null;
+      out[key] = val;
+    }
+    return out;
+  }
+  static extractStaticValue(node) {
+    if (t4.isStringLiteral(node))
+      return node.value;
+    if (t4.isNumericLiteral(node))
+      return node.value;
+    if (t4.isBooleanLiteral(node))
+      return node.value;
+    if (t4.isNullLiteral(node))
+      return null;
+    if (t4.isArrayExpression(node)) {
+      const values = [];
+      for (const el of node.elements) {
+        if (!el || t4.isSpreadElement(el) || t4.isArgumentPlaceholder(el))
+          return void 0;
+        const v = _DrizzleZodProcessor.extractStaticValue(el);
+        if (typeof v === "undefined")
+          return void 0;
+        values.push(v);
+      }
+      return values;
+    }
+    if (t4.isObjectExpression(node)) {
+      return _DrizzleZodProcessor.extractStaticObject(node);
+    }
+    return void 0;
+  }
 };
 
 // ../openapi-core/dist/schema/zod/converter-runtime.js
@@ -4119,8 +4172,12 @@ function processZodPrimitiveNode(node, context) {
       };
       break;
     }
+    case "strictObject":
     case "object":
       schema = node.arguments.length > 0 ? context.processObject(node) : { type: "object" };
+      if (zodType === "strictObject") {
+        schema.additionalProperties = false;
+      }
       break;
     case "templateLiteral":
       schema = { type: "string" };
@@ -11187,6 +11244,10 @@ var ZodRuntimeExporter = class {
         return this.buildEnum(node);
       case "array":
         return node.arguments[0] && isProcessableNode(node.arguments[0]) ? array(this.buildSchema(node.arguments[0]) ?? unknown()) : array(unknown());
+      case "strictObject": {
+        const base = this.buildObject(node);
+        return base && typeof base.strict === "function" ? base.strict() : base;
+      }
       case "object":
         return this.buildObject(node);
       case "record":
@@ -11594,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();
@@ -11808,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)) {
@@ -12121,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);
+                  }
                 }
               }
             }
@@ -12206,8 +12276,12 @@ var ZodSchemaConverter = class {
     }
     if (t10.isCallExpression(node) && t10.isMemberExpression(node.callee) && t10.isIdentifier(node.callee.object) && this.isZodLocalName(node.callee.object.name) && t10.isIdentifier(node.callee.property)) {
       const methodName = node.callee.property.name;
-      if (methodName === "object" && node.arguments.length > 0) {
-        return this.processZodObject(node);
+      if ((methodName === "object" || methodName === "strictObject") && node.arguments.length > 0) {
+        const schema = this.processZodObject(node);
+        if (methodName === "strictObject") {
+          schema.additionalProperties = false;
+        }
+        return schema;
       } else if (methodName === "union" && node.arguments.length > 0) {
         return this.processZodUnion(node);
       } else if (methodName === "intersection" && node.arguments.length > 0) {
@@ -13492,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;
@@ -14365,6 +14463,8 @@ var SchemaProcessor = class {
   // Track imports per file for resolving ReturnType<typeof func>
   importMap = {};
   // { filePath: { importName: importPath } }
+  // Inverted index: typeName → first filePath that imports it (O(1) lookup for findFileImportingType)
+  typeToFileIndex = /* @__PURE__ */ new Map();
   currentFilePath = "";
   // Track the file being processed
   constructor(schemaDir, schemaType = "typescript", schemaFiles, apiDir, fileAccess = defaultFileAccess2, runtime) {
@@ -14518,6 +14618,13 @@ var SchemaProcessor = class {
   }
   collectImports(ast, filePath) {
     collectImports(ast, filePath, this.importMap);
+    const normalizedPath = path9.normalize(filePath);
+    const entries = this.importMap[normalizedPath] ?? {};
+    for (const typeName of Object.keys(entries)) {
+      if (!this.typeToFileIndex.has(typeName)) {
+        this.typeToFileIndex.set(typeName, normalizedPath);
+      }
+    }
   }
   /**
    * Resolve an import path relative to the current file
@@ -14556,6 +14663,15 @@ var SchemaProcessor = class {
       }
       const typeDefEntry = this.typeDefinitions[typeName.toString()];
       if (!typeDefEntry) {
+        const contextFile = this.findFileImportingType(typeName);
+        if (contextFile) {
+          logger.debug(`resolveType: "${typeName}" not in schema dirs; attempting TypeScript checker fallback via ${contextFile}`);
+          const checkerSchema = this.resolveTypeWithTypeScriptChecker(typeName, contextFile);
+          if (checkerSchema && Object.keys(checkerSchema).length > 0) {
+            this.openapiDefinitions[typeName] = checkerSchema;
+            return checkerSchema;
+          }
+        }
         logger.debug(`resolveType: no TypeScript definition found for "${typeName}" in ${this.currentFilePath}; returning empty schema`);
         return {};
       }
@@ -14767,6 +14883,14 @@ var SchemaProcessor = class {
     }
     return null;
   }
+  /**
+   * Return the path of the first scanned file that imports `typeName`, or `null` when none is
+   * found. Used as a fallback context for {@link resolveTypeWithTypeScriptChecker} when the type
+   * is not defined in any schema-dir file (e.g. comes from node_modules or a shared package).
+   */
+  findFileImportingType(typeName) {
+    return this.typeToFileIndex.get(typeName) ?? null;
+  }
   shouldUseTypeScriptChecker(node) {
     return t15.isTSConditionalType(node) || t15.isTSMappedType(node) || t15.isTSTemplateLiteralType(node) || t15.isTSImportType(node) || t15.isTSTypeOperator(node) && node.operator === "keyof";
   }
@@ -14830,7 +14954,9 @@ var SchemaProcessor = class {
     if (seen.has(seenKey)) {
       return { type: "object" };
     }
-    seen.add(seenKey);
+    if (!(type.flags & (primitiveLikeFlags | ts2.TypeFlags.Any | ts2.TypeFlags.Never | ts2.TypeFlags.Unknown | ts2.TypeFlags.Void))) {
+      seen.add(seenKey);
+    }
     if (type.isStringLiteral()) {
       return { type: "string", enum: [type.value] };
     }

package/dist/next/index.js

@@ -3737,7 +3737,7 @@ var SymbolResolver = class {
 
 // ../openapi-core/dist/schema/zod/drizzle-zod-processor.js
 import * as t5 from "@babel/types";
-var DrizzleZodProcessor = class {
+var DrizzleZodProcessor = class _DrizzleZodProcessor {
   /**
    * Known drizzle-zod helper function names
    */
@@ -4163,6 +4163,16 @@ var DrizzleZodProcessor = class {
           result.description = args[0].value;
         }
         break;
+      case "meta": {
+        const firstArg = args[0];
+        if (firstArg && !t5.isSpreadElement(firstArg) && !t5.isArgumentPlaceholder(firstArg)) {
+          const metadata = _DrizzleZodProcessor.extractStaticObject(firstArg);
+          if (metadata) {
+            Object.assign(result, metadata);
+          }
+        }
+        break;
+      }
       case "default":
         if (args.length > 0) {
           if (t5.isStringLiteral(args[0])) {
@@ -4183,6 +4193,49 @@ var DrizzleZodProcessor = class {
   static isDrizzleZodHelper(name) {
     return this.DRIZZLE_ZOD_HELPERS.includes(name);
   }
+  static extractStaticObject(node) {
+    if (!t5.isObjectExpression(node))
+      return null;
+    const out = {};
+    for (const prop of node.properties) {
+      if (!t5.isObjectProperty(prop))
+        return null;
+      const key = t5.isIdentifier(prop.key) ? prop.key.name : t5.isStringLiteral(prop.key) ? prop.key.value : null;
+      if (!key)
+        return null;
+      const val = _DrizzleZodProcessor.extractStaticValue(prop.value);
+      if (typeof val === "undefined")
+        return null;
+      out[key] = val;
+    }
+    return out;
+  }
+  static extractStaticValue(node) {
+    if (t5.isStringLiteral(node))
+      return node.value;
+    if (t5.isNumericLiteral(node))
+      return node.value;
+    if (t5.isBooleanLiteral(node))
+      return node.value;
+    if (t5.isNullLiteral(node))
+      return null;
+    if (t5.isArrayExpression(node)) {
+      const values = [];
+      for (const el of node.elements) {
+        if (!el || t5.isSpreadElement(el) || t5.isArgumentPlaceholder(el))
+          return void 0;
+        const v = _DrizzleZodProcessor.extractStaticValue(el);
+        if (typeof v === "undefined")
+          return void 0;
+        values.push(v);
+      }
+      return values;
+    }
+    if (t5.isObjectExpression(node)) {
+      return _DrizzleZodProcessor.extractStaticObject(node);
+    }
+    return void 0;
+  }
 };
 
 // ../openapi-core/dist/schema/zod/converter-runtime.js
@@ -5153,8 +5206,12 @@ function processZodPrimitiveNode(node, context) {
       };
       break;
     }
+    case "strictObject":
     case "object":
       schema = node.arguments.length > 0 ? context.processObject(node) : { type: "object" };
+      if (zodType === "strictObject") {
+        schema.additionalProperties = false;
+      }
       break;
     case "templateLiteral":
       schema = { type: "string" };
@@ -12221,6 +12278,10 @@ var ZodRuntimeExporter = class {
         return this.buildEnum(node);
       case "array":
         return node.arguments[0] && isProcessableNode(node.arguments[0]) ? array(this.buildSchema(node.arguments[0]) ?? unknown()) : array(unknown());
+      case "strictObject": {
+        const base = this.buildObject(node);
+        return base && typeof base.strict === "function" ? base.strict() : base;
+      }
       case "object":
         return this.buildObject(node);
       case "record":
@@ -12628,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();
@@ -12842,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)) {
@@ -13155,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);
+                  }
                 }
               }
             }
@@ -13240,8 +13310,12 @@ var ZodSchemaConverter = class {
     }
     if (t11.isCallExpression(node) && t11.isMemberExpression(node.callee) && t11.isIdentifier(node.callee.object) && this.isZodLocalName(node.callee.object.name) && t11.isIdentifier(node.callee.property)) {
       const methodName = node.callee.property.name;
-      if (methodName === "object" && node.arguments.length > 0) {
-        return this.processZodObject(node);
+      if ((methodName === "object" || methodName === "strictObject") && node.arguments.length > 0) {
+        const schema = this.processZodObject(node);
+        if (methodName === "strictObject") {
+          schema.additionalProperties = false;
+        }
+        return schema;
       } else if (methodName === "union" && node.arguments.length > 0) {
         return this.processZodUnion(node);
       } else if (methodName === "intersection" && node.arguments.length > 0) {
@@ -14526,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;
@@ -15399,6 +15497,8 @@ var SchemaProcessor = class {
   // Track imports per file for resolving ReturnType<typeof func>
   importMap = {};
   // { filePath: { importName: importPath } }
+  // Inverted index: typeName → first filePath that imports it (O(1) lookup for findFileImportingType)
+  typeToFileIndex = /* @__PURE__ */ new Map();
   currentFilePath = "";
   // Track the file being processed
   constructor(schemaDir, schemaType = "typescript", schemaFiles, apiDir, fileAccess = defaultFileAccess2, runtime) {
@@ -15552,6 +15652,13 @@ var SchemaProcessor = class {
   }
   collectImports(ast, filePath) {
     collectImports(ast, filePath, this.importMap);
+    const normalizedPath = path12.normalize(filePath);
+    const entries = this.importMap[normalizedPath] ?? {};
+    for (const typeName of Object.keys(entries)) {
+      if (!this.typeToFileIndex.has(typeName)) {
+        this.typeToFileIndex.set(typeName, normalizedPath);
+      }
+    }
   }
   /**
    * Resolve an import path relative to the current file
@@ -15590,6 +15697,15 @@ var SchemaProcessor = class {
       }
       const typeDefEntry = this.typeDefinitions[typeName.toString()];
       if (!typeDefEntry) {
+        const contextFile = this.findFileImportingType(typeName);
+        if (contextFile) {
+          logger.debug(`resolveType: "${typeName}" not in schema dirs; attempting TypeScript checker fallback via ${contextFile}`);
+          const checkerSchema = this.resolveTypeWithTypeScriptChecker(typeName, contextFile);
+          if (checkerSchema && Object.keys(checkerSchema).length > 0) {
+            this.openapiDefinitions[typeName] = checkerSchema;
+            return checkerSchema;
+          }
+        }
         logger.debug(`resolveType: no TypeScript definition found for "${typeName}" in ${this.currentFilePath}; returning empty schema`);
         return {};
       }
@@ -15801,6 +15917,14 @@ var SchemaProcessor = class {
     }
     return null;
   }
+  /**
+   * Return the path of the first scanned file that imports `typeName`, or `null` when none is
+   * found. Used as a fallback context for {@link resolveTypeWithTypeScriptChecker} when the type
+   * is not defined in any schema-dir file (e.g. comes from node_modules or a shared package).
+   */
+  findFileImportingType(typeName) {
+    return this.typeToFileIndex.get(typeName) ?? null;
+  }
   shouldUseTypeScriptChecker(node) {
     return t16.isTSConditionalType(node) || t16.isTSMappedType(node) || t16.isTSTemplateLiteralType(node) || t16.isTSImportType(node) || t16.isTSTypeOperator(node) && node.operator === "keyof";
   }
@@ -15864,7 +15988,9 @@ var SchemaProcessor = class {
     if (seen.has(seenKey)) {
       return { type: "object" };
     }
-    seen.add(seenKey);
+    if (!(type.flags & (primitiveLikeFlags | ts3.TypeFlags.Any | ts3.TypeFlags.Never | ts3.TypeFlags.Unknown | ts3.TypeFlags.Void))) {
+      seen.add(seenKey);
+    }
     if (type.isStringLiteral()) {
       return { type: "string", enum: [type.value] };
     }

package/dist/react-router/index.js

@@ -2741,7 +2741,7 @@ var SymbolResolver = class {
 
 // ../openapi-core/dist/schema/zod/drizzle-zod-processor.js
 import * as t4 from "@babel/types";
-var DrizzleZodProcessor = class {
+var DrizzleZodProcessor = class _DrizzleZodProcessor {
   /**
    * Known drizzle-zod helper function names
    */
@@ -3167,6 +3167,16 @@ var DrizzleZodProcessor = class {
           result.description = args[0].value;
         }
         break;
+      case "meta": {
+        const firstArg = args[0];
+        if (firstArg && !t4.isSpreadElement(firstArg) && !t4.isArgumentPlaceholder(firstArg)) {
+          const metadata = _DrizzleZodProcessor.extractStaticObject(firstArg);
+          if (metadata) {
+            Object.assign(result, metadata);
+          }
+        }
+        break;
+      }
       case "default":
         if (args.length > 0) {
           if (t4.isStringLiteral(args[0])) {
@@ -3187,6 +3197,49 @@ var DrizzleZodProcessor = class {
   static isDrizzleZodHelper(name) {
     return this.DRIZZLE_ZOD_HELPERS.includes(name);
   }
+  static extractStaticObject(node) {
+    if (!t4.isObjectExpression(node))
+      return null;
+    const out = {};
+    for (const prop of node.properties) {
+      if (!t4.isObjectProperty(prop))
+        return null;
+      const key = t4.isIdentifier(prop.key) ? prop.key.name : t4.isStringLiteral(prop.key) ? prop.key.value : null;
+      if (!key)
+        return null;
+      const val = _DrizzleZodProcessor.extractStaticValue(prop.value);
+      if (typeof val === "undefined")
+        return null;
+      out[key] = val;
+    }
+    return out;
+  }
+  static extractStaticValue(node) {
+    if (t4.isStringLiteral(node))
+      return node.value;
+    if (t4.isNumericLiteral(node))
+      return node.value;
+    if (t4.isBooleanLiteral(node))
+      return node.value;
+    if (t4.isNullLiteral(node))
+      return null;
+    if (t4.isArrayExpression(node)) {
+      const values = [];
+      for (const el of node.elements) {
+        if (!el || t4.isSpreadElement(el) || t4.isArgumentPlaceholder(el))
+          return void 0;
+        const v = _DrizzleZodProcessor.extractStaticValue(el);
+        if (typeof v === "undefined")
+          return void 0;
+        values.push(v);
+      }
+      return values;
+    }
+    if (t4.isObjectExpression(node)) {
+      return _DrizzleZodProcessor.extractStaticObject(node);
+    }
+    return void 0;
+  }
 };
 
 // ../openapi-core/dist/schema/zod/converter-runtime.js
@@ -4157,8 +4210,12 @@ function processZodPrimitiveNode(node, context) {
       };
       break;
     }
+    case "strictObject":
     case "object":
       schema = node.arguments.length > 0 ? context.processObject(node) : { type: "object" };
+      if (zodType === "strictObject") {
+        schema.additionalProperties = false;
+      }
       break;
     case "templateLiteral":
       schema = { type: "string" };
@@ -11225,6 +11282,10 @@ var ZodRuntimeExporter = class {
         return this.buildEnum(node);
       case "array":
         return node.arguments[0] && isProcessableNode(node.arguments[0]) ? array(this.buildSchema(node.arguments[0]) ?? unknown()) : array(unknown());
+      case "strictObject": {
+        const base = this.buildObject(node);
+        return base && typeof base.strict === "function" ? base.strict() : base;
+      }
       case "object":
         return this.buildObject(node);
       case "record":
@@ -11632,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();
@@ -11846,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)) {
@@ -12159,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);
+                  }
                 }
               }
             }
@@ -12244,8 +12314,12 @@ var ZodSchemaConverter = class {
     }
     if (t10.isCallExpression(node) && t10.isMemberExpression(node.callee) && t10.isIdentifier(node.callee.object) && this.isZodLocalName(node.callee.object.name) && t10.isIdentifier(node.callee.property)) {
       const methodName = node.callee.property.name;
-      if (methodName === "object" && node.arguments.length > 0) {
-        return this.processZodObject(node);
+      if ((methodName === "object" || methodName === "strictObject") && node.arguments.length > 0) {
+        const schema = this.processZodObject(node);
+        if (methodName === "strictObject") {
+          schema.additionalProperties = false;
+        }
+        return schema;
       } else if (methodName === "union" && node.arguments.length > 0) {
         return this.processZodUnion(node);
       } else if (methodName === "intersection" && node.arguments.length > 0) {
@@ -13530,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;
@@ -14403,6 +14501,8 @@ var SchemaProcessor = class {
   // Track imports per file for resolving ReturnType<typeof func>
   importMap = {};
   // { filePath: { importName: importPath } }
+  // Inverted index: typeName → first filePath that imports it (O(1) lookup for findFileImportingType)
+  typeToFileIndex = /* @__PURE__ */ new Map();
   currentFilePath = "";
   // Track the file being processed
   constructor(schemaDir, schemaType = "typescript", schemaFiles, apiDir, fileAccess = defaultFileAccess2, runtime) {
@@ -14556,6 +14656,13 @@ var SchemaProcessor = class {
   }
   collectImports(ast, filePath) {
     collectImports(ast, filePath, this.importMap);
+    const normalizedPath = path9.normalize(filePath);
+    const entries = this.importMap[normalizedPath] ?? {};
+    for (const typeName of Object.keys(entries)) {
+      if (!this.typeToFileIndex.has(typeName)) {
+        this.typeToFileIndex.set(typeName, normalizedPath);
+      }
+    }
   }
   /**
    * Resolve an import path relative to the current file
@@ -14594,6 +14701,15 @@ var SchemaProcessor = class {
       }
       const typeDefEntry = this.typeDefinitions[typeName.toString()];
       if (!typeDefEntry) {
+        const contextFile = this.findFileImportingType(typeName);
+        if (contextFile) {
+          logger.debug(`resolveType: "${typeName}" not in schema dirs; attempting TypeScript checker fallback via ${contextFile}`);
+          const checkerSchema = this.resolveTypeWithTypeScriptChecker(typeName, contextFile);
+          if (checkerSchema && Object.keys(checkerSchema).length > 0) {
+            this.openapiDefinitions[typeName] = checkerSchema;
+            return checkerSchema;
+          }
+        }
         logger.debug(`resolveType: no TypeScript definition found for "${typeName}" in ${this.currentFilePath}; returning empty schema`);
         return {};
       }
@@ -14805,6 +14921,14 @@ var SchemaProcessor = class {
     }
     return null;
   }
+  /**
+   * Return the path of the first scanned file that imports `typeName`, or `null` when none is
+   * found. Used as a fallback context for {@link resolveTypeWithTypeScriptChecker} when the type
+   * is not defined in any schema-dir file (e.g. comes from node_modules or a shared package).
+   */
+  findFileImportingType(typeName) {
+    return this.typeToFileIndex.get(typeName) ?? null;
+  }
   shouldUseTypeScriptChecker(node) {
     return t15.isTSConditionalType(node) || t15.isTSMappedType(node) || t15.isTSTemplateLiteralType(node) || t15.isTSImportType(node) || t15.isTSTypeOperator(node) && node.operator === "keyof";
   }
@@ -14868,7 +14992,9 @@ var SchemaProcessor = class {
     if (seen.has(seenKey)) {
       return { type: "object" };
     }
-    seen.add(seenKey);
+    if (!(type.flags & (primitiveLikeFlags | ts2.TypeFlags.Any | ts2.TypeFlags.Never | ts2.TypeFlags.Unknown | ts2.TypeFlags.Void))) {
+      seen.add(seenKey);
+    }
     if (type.isStringLiteral()) {
       return { type: "string", enum: [type.value] };
     }

package/dist/vite/index.js

@@ -2741,7 +2741,7 @@ var SymbolResolver = class {
 
 // ../openapi-core/dist/schema/zod/drizzle-zod-processor.js
 import * as t4 from "@babel/types";
-var DrizzleZodProcessor = class {
+var DrizzleZodProcessor = class _DrizzleZodProcessor {
   /**
    * Known drizzle-zod helper function names
    */
@@ -3167,6 +3167,16 @@ var DrizzleZodProcessor = class {
           result.description = args[0].value;
         }
         break;
+      case "meta": {
+        const firstArg = args[0];
+        if (firstArg && !t4.isSpreadElement(firstArg) && !t4.isArgumentPlaceholder(firstArg)) {
+          const metadata = _DrizzleZodProcessor.extractStaticObject(firstArg);
+          if (metadata) {
+            Object.assign(result, metadata);
+          }
+        }
+        break;
+      }
       case "default":
         if (args.length > 0) {
           if (t4.isStringLiteral(args[0])) {
@@ -3187,6 +3197,49 @@ var DrizzleZodProcessor = class {
   static isDrizzleZodHelper(name) {
     return this.DRIZZLE_ZOD_HELPERS.includes(name);
   }
+  static extractStaticObject(node) {
+    if (!t4.isObjectExpression(node))
+      return null;
+    const out = {};
+    for (const prop of node.properties) {
+      if (!t4.isObjectProperty(prop))
+        return null;
+      const key = t4.isIdentifier(prop.key) ? prop.key.name : t4.isStringLiteral(prop.key) ? prop.key.value : null;
+      if (!key)
+        return null;
+      const val = _DrizzleZodProcessor.extractStaticValue(prop.value);
+      if (typeof val === "undefined")
+        return null;
+      out[key] = val;
+    }
+    return out;
+  }
+  static extractStaticValue(node) {
+    if (t4.isStringLiteral(node))
+      return node.value;
+    if (t4.isNumericLiteral(node))
+      return node.value;
+    if (t4.isBooleanLiteral(node))
+      return node.value;
+    if (t4.isNullLiteral(node))
+      return null;
+    if (t4.isArrayExpression(node)) {
+      const values = [];
+      for (const el of node.elements) {
+        if (!el || t4.isSpreadElement(el) || t4.isArgumentPlaceholder(el))
+          return void 0;
+        const v = _DrizzleZodProcessor.extractStaticValue(el);
+        if (typeof v === "undefined")
+          return void 0;
+        values.push(v);
+      }
+      return values;
+    }
+    if (t4.isObjectExpression(node)) {
+      return _DrizzleZodProcessor.extractStaticObject(node);
+    }
+    return void 0;
+  }
 };
 
 // ../openapi-core/dist/schema/zod/converter-runtime.js
@@ -4157,8 +4210,12 @@ function processZodPrimitiveNode(node, context) {
       };
       break;
     }
+    case "strictObject":
     case "object":
       schema = node.arguments.length > 0 ? context.processObject(node) : { type: "object" };
+      if (zodType === "strictObject") {
+        schema.additionalProperties = false;
+      }
       break;
     case "templateLiteral":
       schema = { type: "string" };
@@ -11225,6 +11282,10 @@ var ZodRuntimeExporter = class {
         return this.buildEnum(node);
       case "array":
         return node.arguments[0] && isProcessableNode(node.arguments[0]) ? array(this.buildSchema(node.arguments[0]) ?? unknown()) : array(unknown());
+      case "strictObject": {
+        const base = this.buildObject(node);
+        return base && typeof base.strict === "function" ? base.strict() : base;
+      }
       case "object":
         return this.buildObject(node);
       case "record":
@@ -11632,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();
@@ -11846,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)) {
@@ -12159,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);
+                  }
                 }
               }
             }
@@ -12244,8 +12314,12 @@ var ZodSchemaConverter = class {
     }
     if (t10.isCallExpression(node) && t10.isMemberExpression(node.callee) && t10.isIdentifier(node.callee.object) && this.isZodLocalName(node.callee.object.name) && t10.isIdentifier(node.callee.property)) {
       const methodName = node.callee.property.name;
-      if (methodName === "object" && node.arguments.length > 0) {
-        return this.processZodObject(node);
+      if ((methodName === "object" || methodName === "strictObject") && node.arguments.length > 0) {
+        const schema = this.processZodObject(node);
+        if (methodName === "strictObject") {
+          schema.additionalProperties = false;
+        }
+        return schema;
       } else if (methodName === "union" && node.arguments.length > 0) {
         return this.processZodUnion(node);
       } else if (methodName === "intersection" && node.arguments.length > 0) {
@@ -13530,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;
@@ -14403,6 +14501,8 @@ var SchemaProcessor = class {
   // Track imports per file for resolving ReturnType<typeof func>
   importMap = {};
   // { filePath: { importName: importPath } }
+  // Inverted index: typeName → first filePath that imports it (O(1) lookup for findFileImportingType)
+  typeToFileIndex = /* @__PURE__ */ new Map();
   currentFilePath = "";
   // Track the file being processed
   constructor(schemaDir, schemaType = "typescript", schemaFiles, apiDir, fileAccess = defaultFileAccess2, runtime) {
@@ -14556,6 +14656,13 @@ var SchemaProcessor = class {
   }
   collectImports(ast, filePath) {
     collectImports(ast, filePath, this.importMap);
+    const normalizedPath = path9.normalize(filePath);
+    const entries = this.importMap[normalizedPath] ?? {};
+    for (const typeName of Object.keys(entries)) {
+      if (!this.typeToFileIndex.has(typeName)) {
+        this.typeToFileIndex.set(typeName, normalizedPath);
+      }
+    }
   }
   /**
    * Resolve an import path relative to the current file
@@ -14594,6 +14701,15 @@ var SchemaProcessor = class {
       }
       const typeDefEntry = this.typeDefinitions[typeName.toString()];
       if (!typeDefEntry) {
+        const contextFile = this.findFileImportingType(typeName);
+        if (contextFile) {
+          logger.debug(`resolveType: "${typeName}" not in schema dirs; attempting TypeScript checker fallback via ${contextFile}`);
+          const checkerSchema = this.resolveTypeWithTypeScriptChecker(typeName, contextFile);
+          if (checkerSchema && Object.keys(checkerSchema).length > 0) {
+            this.openapiDefinitions[typeName] = checkerSchema;
+            return checkerSchema;
+          }
+        }
         logger.debug(`resolveType: no TypeScript definition found for "${typeName}" in ${this.currentFilePath}; returning empty schema`);
         return {};
       }
@@ -14805,6 +14921,14 @@ var SchemaProcessor = class {
     }
     return null;
   }
+  /**
+   * Return the path of the first scanned file that imports `typeName`, or `null` when none is
+   * found. Used as a fallback context for {@link resolveTypeWithTypeScriptChecker} when the type
+   * is not defined in any schema-dir file (e.g. comes from node_modules or a shared package).
+   */
+  findFileImportingType(typeName) {
+    return this.typeToFileIndex.get(typeName) ?? null;
+  }
   shouldUseTypeScriptChecker(node) {
     return t15.isTSConditionalType(node) || t15.isTSMappedType(node) || t15.isTSTemplateLiteralType(node) || t15.isTSImportType(node) || t15.isTSTypeOperator(node) && node.operator === "keyof";
   }
@@ -14868,7 +14992,9 @@ var SchemaProcessor = class {
     if (seen.has(seenKey)) {
       return { type: "object" };
     }
-    seen.add(seenKey);
+    if (!(type.flags & (primitiveLikeFlags | ts2.TypeFlags.Any | ts2.TypeFlags.Never | ts2.TypeFlags.Unknown | ts2.TypeFlags.Void))) {
+      seen.add(seenKey);
+    }
     if (type.isStringLiteral()) {
       return { type: "string", enum: [type.value] };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-openapi-gen",
-  "version": "1.1.1",
+  "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",