next-openapi-gen 1.2.2 → 1.2.3

package/dist/cli.js

@@ -12142,6 +12142,9 @@ var ZodSchemaConverter = class {
   schemaNameToFiles = /* @__PURE__ */ new Map();
   /** Per-file import alias for the `zod` module (`import { z as zod }` sets this to `"zod"`). */
   zodImportAlias = /* @__PURE__ */ new Map();
+  /** Schema variable names whose component name was overridden via .meta({ id }). These must
+   *  NOT be copied back under the original variable name in the OpenAPI components object. */
+  metaIdSchemaNames = /* @__PURE__ */ new Set();
   // Current processing context (set during file processing)
   currentFilePath;
   currentAST;
@@ -12168,7 +12171,14 @@ var ZodSchemaConverter = class {
     }
     logger.debug(`Looking for Zod schema: ${schemaName}`);
     const requestedSchemaName = schemaName;
-    const mappedSchemaName = this.typeToSchemaMapping[schemaName];
+    let mappedSchemaName = this.typeToSchemaMapping[schemaName];
+    if (!mappedSchemaName) {
+      const candidate = this.deriveSchemaNameByConvention(schemaName);
+      if (candidate && this.locateSchemaByConvention(candidate)) {
+        this.typeToSchemaMapping[schemaName] = candidate;
+        mappedSchemaName = candidate;
+      }
+    }
     if (mappedSchemaName) {
       logger.debug(`Type '${schemaName}' is mapped to schema '${mappedSchemaName}'`);
       schemaName = mappedSchemaName;
@@ -12218,7 +12228,7 @@ var ZodSchemaConverter = class {
       this.processingSchemas.delete(schemaName);
       if (mappedSchemaName && requestedSchemaName !== schemaName) {
         const resolvedReference = this.getSchemaReferenceName(schemaName, this.currentContentType);
-        if (this.zodSchemas[resolvedReference] && !this.zodSchemas[requestedSchemaName]) {
+        if (!this.metaIdSchemaNames.has(requestedSchemaName) && this.zodSchemas[resolvedReference] && !this.zodSchemas[requestedSchemaName]) {
           this.zodSchemas[requestedSchemaName] = this.zodSchemas[resolvedReference];
         }
         this.schemaVariantRefs.set(this.getVariantKey(requestedSchemaName, this.currentContentType), this.zodSchemas[requestedSchemaName] ? requestedSchemaName : resolvedReference);
@@ -13875,15 +13885,57 @@ var ZodSchemaConverter = class {
     if (finalName !== schemaName) {
       this.indexSchemaName(finalName, filePath);
     }
-    if (!this.getStoredSchema(finalName)) {
+    if (!this.zodSchemas[finalName]) {
       if (overrideId && overrideId !== schemaName) {
         this.typeToSchemaMapping[schemaName] = overrideId;
+        this.metaIdSchemaNames.add(schemaName);
+        if (this.typeToSchemaMapping[overrideId] === schemaName) {
+          delete this.typeToSchemaMapping[overrideId];
+        }
       }
-      this.storeResolvedSchema(finalName, schema);
+      const variantKey = this.getVariantKey(finalName, this.currentContentType);
+      this.zodSchemas[finalName] = schema;
+      this.schemaVariantRefs.set(variantKey, finalName);
     } else {
       logger.warn(`Schema component name '${overrideId ?? finalName}' conflicts with an existing schema, ignoring .meta({ id }) on '${schemaName}'`);
     }
   }
+  /**
+   * Derives the conventional Zod schema name from a TypeScript type name.
+   * e.g. "Slider" → "sliderSchema", "SliderItem" → "sliderItemSchema".
+   * Returns null when the input is already a schema name or is not PascalCase.
+   */
+  deriveSchemaNameByConvention(typeName) {
+    if (!typeName || !/^[A-Z]/.test(typeName) || typeName.endsWith("Schema")) {
+      return null;
+    }
+    return typeName[0].toLowerCase() + typeName.slice(1) + "Schema";
+  }
+  /**
+   * Checks whether a Zod schema with the given name is present in schemaDirs
+   * WITHOUT populating the processed-schema cache. A file-content substring check
+   * (the same heuristic used by processFileForZodSchema) is sufficient here: we
+   * only want to know whether the candidate *might* live in schemaDirs so that the
+   * convention mapping can be registered; the actual processing happens later in
+   * the normal convertZodSchemaToOpenApi lookup flow.
+   */
+  locateSchemaByConvention(candidate) {
+    if (this.schemaNameToFiles.has(candidate)) {
+      return true;
+    }
+    for (const dir of this.schemaDirs) {
+      for (const filePath of this.getSchemaFiles(dir)) {
+        try {
+          const content = this.fileAccess.readFileSync(filePath, "utf-8");
+          if (content.includes(candidate)) {
+            return true;
+          }
+        } catch {
+        }
+      }
+    }
+    return false;
+  }
   /**
    * Check if node is Zod schema
    */

package/dist/index.js

@@ -11691,6 +11691,9 @@ var ZodSchemaConverter = class {
   schemaNameToFiles = /* @__PURE__ */ new Map();
   /** Per-file import alias for the `zod` module (`import { z as zod }` sets this to `"zod"`). */
   zodImportAlias = /* @__PURE__ */ new Map();
+  /** Schema variable names whose component name was overridden via .meta({ id }). These must
+   *  NOT be copied back under the original variable name in the OpenAPI components object. */
+  metaIdSchemaNames = /* @__PURE__ */ new Set();
   // Current processing context (set during file processing)
   currentFilePath;
   currentAST;
@@ -11717,7 +11720,14 @@ var ZodSchemaConverter = class {
     }
     logger.debug(`Looking for Zod schema: ${schemaName}`);
     const requestedSchemaName = schemaName;
-    const mappedSchemaName = this.typeToSchemaMapping[schemaName];
+    let mappedSchemaName = this.typeToSchemaMapping[schemaName];
+    if (!mappedSchemaName) {
+      const candidate = this.deriveSchemaNameByConvention(schemaName);
+      if (candidate && this.locateSchemaByConvention(candidate)) {
+        this.typeToSchemaMapping[schemaName] = candidate;
+        mappedSchemaName = candidate;
+      }
+    }
     if (mappedSchemaName) {
       logger.debug(`Type '${schemaName}' is mapped to schema '${mappedSchemaName}'`);
       schemaName = mappedSchemaName;
@@ -11767,7 +11777,7 @@ var ZodSchemaConverter = class {
       this.processingSchemas.delete(schemaName);
       if (mappedSchemaName && requestedSchemaName !== schemaName) {
         const resolvedReference = this.getSchemaReferenceName(schemaName, this.currentContentType);
-        if (this.zodSchemas[resolvedReference] && !this.zodSchemas[requestedSchemaName]) {
+        if (!this.metaIdSchemaNames.has(requestedSchemaName) && this.zodSchemas[resolvedReference] && !this.zodSchemas[requestedSchemaName]) {
           this.zodSchemas[requestedSchemaName] = this.zodSchemas[resolvedReference];
         }
         this.schemaVariantRefs.set(this.getVariantKey(requestedSchemaName, this.currentContentType), this.zodSchemas[requestedSchemaName] ? requestedSchemaName : resolvedReference);
@@ -13424,15 +13434,57 @@ var ZodSchemaConverter = class {
     if (finalName !== schemaName) {
       this.indexSchemaName(finalName, filePath);
     }
-    if (!this.getStoredSchema(finalName)) {
+    if (!this.zodSchemas[finalName]) {
       if (overrideId && overrideId !== schemaName) {
         this.typeToSchemaMapping[schemaName] = overrideId;
+        this.metaIdSchemaNames.add(schemaName);
+        if (this.typeToSchemaMapping[overrideId] === schemaName) {
+          delete this.typeToSchemaMapping[overrideId];
+        }
       }
-      this.storeResolvedSchema(finalName, schema);
+      const variantKey = this.getVariantKey(finalName, this.currentContentType);
+      this.zodSchemas[finalName] = schema;
+      this.schemaVariantRefs.set(variantKey, finalName);
     } else {
       logger.warn(`Schema component name '${overrideId ?? finalName}' conflicts with an existing schema, ignoring .meta({ id }) on '${schemaName}'`);
     }
   }
+  /**
+   * Derives the conventional Zod schema name from a TypeScript type name.
+   * e.g. "Slider" → "sliderSchema", "SliderItem" → "sliderItemSchema".
+   * Returns null when the input is already a schema name or is not PascalCase.
+   */
+  deriveSchemaNameByConvention(typeName) {
+    if (!typeName || !/^[A-Z]/.test(typeName) || typeName.endsWith("Schema")) {
+      return null;
+    }
+    return typeName[0].toLowerCase() + typeName.slice(1) + "Schema";
+  }
+  /**
+   * Checks whether a Zod schema with the given name is present in schemaDirs
+   * WITHOUT populating the processed-schema cache. A file-content substring check
+   * (the same heuristic used by processFileForZodSchema) is sufficient here: we
+   * only want to know whether the candidate *might* live in schemaDirs so that the
+   * convention mapping can be registered; the actual processing happens later in
+   * the normal convertZodSchemaToOpenApi lookup flow.
+   */
+  locateSchemaByConvention(candidate) {
+    if (this.schemaNameToFiles.has(candidate)) {
+      return true;
+    }
+    for (const dir of this.schemaDirs) {
+      for (const filePath of this.getSchemaFiles(dir)) {
+        try {
+          const content = this.fileAccess.readFileSync(filePath, "utf-8");
+          if (content.includes(candidate)) {
+            return true;
+          }
+        } catch {
+        }
+      }
+    }
+    return false;
+  }
   /**
    * Check if node is Zod schema
    */

package/dist/next/index.js

@@ -12725,6 +12725,9 @@ var ZodSchemaConverter = class {
   schemaNameToFiles = /* @__PURE__ */ new Map();
   /** Per-file import alias for the `zod` module (`import { z as zod }` sets this to `"zod"`). */
   zodImportAlias = /* @__PURE__ */ new Map();
+  /** Schema variable names whose component name was overridden via .meta({ id }). These must
+   *  NOT be copied back under the original variable name in the OpenAPI components object. */
+  metaIdSchemaNames = /* @__PURE__ */ new Set();
   // Current processing context (set during file processing)
   currentFilePath;
   currentAST;
@@ -12751,7 +12754,14 @@ var ZodSchemaConverter = class {
     }
     logger.debug(`Looking for Zod schema: ${schemaName}`);
     const requestedSchemaName = schemaName;
-    const mappedSchemaName = this.typeToSchemaMapping[schemaName];
+    let mappedSchemaName = this.typeToSchemaMapping[schemaName];
+    if (!mappedSchemaName) {
+      const candidate = this.deriveSchemaNameByConvention(schemaName);
+      if (candidate && this.locateSchemaByConvention(candidate)) {
+        this.typeToSchemaMapping[schemaName] = candidate;
+        mappedSchemaName = candidate;
+      }
+    }
     if (mappedSchemaName) {
       logger.debug(`Type '${schemaName}' is mapped to schema '${mappedSchemaName}'`);
       schemaName = mappedSchemaName;
@@ -12801,7 +12811,7 @@ var ZodSchemaConverter = class {
       this.processingSchemas.delete(schemaName);
       if (mappedSchemaName && requestedSchemaName !== schemaName) {
         const resolvedReference = this.getSchemaReferenceName(schemaName, this.currentContentType);
-        if (this.zodSchemas[resolvedReference] && !this.zodSchemas[requestedSchemaName]) {
+        if (!this.metaIdSchemaNames.has(requestedSchemaName) && this.zodSchemas[resolvedReference] && !this.zodSchemas[requestedSchemaName]) {
           this.zodSchemas[requestedSchemaName] = this.zodSchemas[resolvedReference];
         }
         this.schemaVariantRefs.set(this.getVariantKey(requestedSchemaName, this.currentContentType), this.zodSchemas[requestedSchemaName] ? requestedSchemaName : resolvedReference);
@@ -14458,15 +14468,57 @@ var ZodSchemaConverter = class {
     if (finalName !== schemaName) {
       this.indexSchemaName(finalName, filePath);
     }
-    if (!this.getStoredSchema(finalName)) {
+    if (!this.zodSchemas[finalName]) {
       if (overrideId && overrideId !== schemaName) {
         this.typeToSchemaMapping[schemaName] = overrideId;
+        this.metaIdSchemaNames.add(schemaName);
+        if (this.typeToSchemaMapping[overrideId] === schemaName) {
+          delete this.typeToSchemaMapping[overrideId];
+        }
       }
-      this.storeResolvedSchema(finalName, schema);
+      const variantKey = this.getVariantKey(finalName, this.currentContentType);
+      this.zodSchemas[finalName] = schema;
+      this.schemaVariantRefs.set(variantKey, finalName);
     } else {
       logger.warn(`Schema component name '${overrideId ?? finalName}' conflicts with an existing schema, ignoring .meta({ id }) on '${schemaName}'`);
     }
   }
+  /**
+   * Derives the conventional Zod schema name from a TypeScript type name.
+   * e.g. "Slider" → "sliderSchema", "SliderItem" → "sliderItemSchema".
+   * Returns null when the input is already a schema name or is not PascalCase.
+   */
+  deriveSchemaNameByConvention(typeName) {
+    if (!typeName || !/^[A-Z]/.test(typeName) || typeName.endsWith("Schema")) {
+      return null;
+    }
+    return typeName[0].toLowerCase() + typeName.slice(1) + "Schema";
+  }
+  /**
+   * Checks whether a Zod schema with the given name is present in schemaDirs
+   * WITHOUT populating the processed-schema cache. A file-content substring check
+   * (the same heuristic used by processFileForZodSchema) is sufficient here: we
+   * only want to know whether the candidate *might* live in schemaDirs so that the
+   * convention mapping can be registered; the actual processing happens later in
+   * the normal convertZodSchemaToOpenApi lookup flow.
+   */
+  locateSchemaByConvention(candidate) {
+    if (this.schemaNameToFiles.has(candidate)) {
+      return true;
+    }
+    for (const dir of this.schemaDirs) {
+      for (const filePath of this.getSchemaFiles(dir)) {
+        try {
+          const content = this.fileAccess.readFileSync(filePath, "utf-8");
+          if (content.includes(candidate)) {
+            return true;
+          }
+        } catch {
+        }
+      }
+    }
+    return false;
+  }
   /**
    * Check if node is Zod schema
    */

package/dist/react-router/index.js

@@ -11729,6 +11729,9 @@ var ZodSchemaConverter = class {
   schemaNameToFiles = /* @__PURE__ */ new Map();
   /** Per-file import alias for the `zod` module (`import { z as zod }` sets this to `"zod"`). */
   zodImportAlias = /* @__PURE__ */ new Map();
+  /** Schema variable names whose component name was overridden via .meta({ id }). These must
+   *  NOT be copied back under the original variable name in the OpenAPI components object. */
+  metaIdSchemaNames = /* @__PURE__ */ new Set();
   // Current processing context (set during file processing)
   currentFilePath;
   currentAST;
@@ -11755,7 +11758,14 @@ var ZodSchemaConverter = class {
     }
     logger.debug(`Looking for Zod schema: ${schemaName}`);
     const requestedSchemaName = schemaName;
-    const mappedSchemaName = this.typeToSchemaMapping[schemaName];
+    let mappedSchemaName = this.typeToSchemaMapping[schemaName];
+    if (!mappedSchemaName) {
+      const candidate = this.deriveSchemaNameByConvention(schemaName);
+      if (candidate && this.locateSchemaByConvention(candidate)) {
+        this.typeToSchemaMapping[schemaName] = candidate;
+        mappedSchemaName = candidate;
+      }
+    }
     if (mappedSchemaName) {
       logger.debug(`Type '${schemaName}' is mapped to schema '${mappedSchemaName}'`);
       schemaName = mappedSchemaName;
@@ -11805,7 +11815,7 @@ var ZodSchemaConverter = class {
       this.processingSchemas.delete(schemaName);
       if (mappedSchemaName && requestedSchemaName !== schemaName) {
         const resolvedReference = this.getSchemaReferenceName(schemaName, this.currentContentType);
-        if (this.zodSchemas[resolvedReference] && !this.zodSchemas[requestedSchemaName]) {
+        if (!this.metaIdSchemaNames.has(requestedSchemaName) && this.zodSchemas[resolvedReference] && !this.zodSchemas[requestedSchemaName]) {
           this.zodSchemas[requestedSchemaName] = this.zodSchemas[resolvedReference];
         }
         this.schemaVariantRefs.set(this.getVariantKey(requestedSchemaName, this.currentContentType), this.zodSchemas[requestedSchemaName] ? requestedSchemaName : resolvedReference);
@@ -13462,15 +13472,57 @@ var ZodSchemaConverter = class {
     if (finalName !== schemaName) {
       this.indexSchemaName(finalName, filePath);
     }
-    if (!this.getStoredSchema(finalName)) {
+    if (!this.zodSchemas[finalName]) {
       if (overrideId && overrideId !== schemaName) {
         this.typeToSchemaMapping[schemaName] = overrideId;
+        this.metaIdSchemaNames.add(schemaName);
+        if (this.typeToSchemaMapping[overrideId] === schemaName) {
+          delete this.typeToSchemaMapping[overrideId];
+        }
       }
-      this.storeResolvedSchema(finalName, schema);
+      const variantKey = this.getVariantKey(finalName, this.currentContentType);
+      this.zodSchemas[finalName] = schema;
+      this.schemaVariantRefs.set(variantKey, finalName);
     } else {
       logger.warn(`Schema component name '${overrideId ?? finalName}' conflicts with an existing schema, ignoring .meta({ id }) on '${schemaName}'`);
     }
   }
+  /**
+   * Derives the conventional Zod schema name from a TypeScript type name.
+   * e.g. "Slider" → "sliderSchema", "SliderItem" → "sliderItemSchema".
+   * Returns null when the input is already a schema name or is not PascalCase.
+   */
+  deriveSchemaNameByConvention(typeName) {
+    if (!typeName || !/^[A-Z]/.test(typeName) || typeName.endsWith("Schema")) {
+      return null;
+    }
+    return typeName[0].toLowerCase() + typeName.slice(1) + "Schema";
+  }
+  /**
+   * Checks whether a Zod schema with the given name is present in schemaDirs
+   * WITHOUT populating the processed-schema cache. A file-content substring check
+   * (the same heuristic used by processFileForZodSchema) is sufficient here: we
+   * only want to know whether the candidate *might* live in schemaDirs so that the
+   * convention mapping can be registered; the actual processing happens later in
+   * the normal convertZodSchemaToOpenApi lookup flow.
+   */
+  locateSchemaByConvention(candidate) {
+    if (this.schemaNameToFiles.has(candidate)) {
+      return true;
+    }
+    for (const dir of this.schemaDirs) {
+      for (const filePath of this.getSchemaFiles(dir)) {
+        try {
+          const content = this.fileAccess.readFileSync(filePath, "utf-8");
+          if (content.includes(candidate)) {
+            return true;
+          }
+        } catch {
+        }
+      }
+    }
+    return false;
+  }
   /**
    * Check if node is Zod schema
    */

package/dist/vite/index.js

@@ -11729,6 +11729,9 @@ var ZodSchemaConverter = class {
   schemaNameToFiles = /* @__PURE__ */ new Map();
   /** Per-file import alias for the `zod` module (`import { z as zod }` sets this to `"zod"`). */
   zodImportAlias = /* @__PURE__ */ new Map();
+  /** Schema variable names whose component name was overridden via .meta({ id }). These must
+   *  NOT be copied back under the original variable name in the OpenAPI components object. */
+  metaIdSchemaNames = /* @__PURE__ */ new Set();
   // Current processing context (set during file processing)
   currentFilePath;
   currentAST;
@@ -11755,7 +11758,14 @@ var ZodSchemaConverter = class {
     }
     logger.debug(`Looking for Zod schema: ${schemaName}`);
     const requestedSchemaName = schemaName;
-    const mappedSchemaName = this.typeToSchemaMapping[schemaName];
+    let mappedSchemaName = this.typeToSchemaMapping[schemaName];
+    if (!mappedSchemaName) {
+      const candidate = this.deriveSchemaNameByConvention(schemaName);
+      if (candidate && this.locateSchemaByConvention(candidate)) {
+        this.typeToSchemaMapping[schemaName] = candidate;
+        mappedSchemaName = candidate;
+      }
+    }
     if (mappedSchemaName) {
       logger.debug(`Type '${schemaName}' is mapped to schema '${mappedSchemaName}'`);
       schemaName = mappedSchemaName;
@@ -11805,7 +11815,7 @@ var ZodSchemaConverter = class {
       this.processingSchemas.delete(schemaName);
       if (mappedSchemaName && requestedSchemaName !== schemaName) {
         const resolvedReference = this.getSchemaReferenceName(schemaName, this.currentContentType);
-        if (this.zodSchemas[resolvedReference] && !this.zodSchemas[requestedSchemaName]) {
+        if (!this.metaIdSchemaNames.has(requestedSchemaName) && this.zodSchemas[resolvedReference] && !this.zodSchemas[requestedSchemaName]) {
           this.zodSchemas[requestedSchemaName] = this.zodSchemas[resolvedReference];
         }
         this.schemaVariantRefs.set(this.getVariantKey(requestedSchemaName, this.currentContentType), this.zodSchemas[requestedSchemaName] ? requestedSchemaName : resolvedReference);
@@ -13462,15 +13472,57 @@ var ZodSchemaConverter = class {
     if (finalName !== schemaName) {
       this.indexSchemaName(finalName, filePath);
     }
-    if (!this.getStoredSchema(finalName)) {
+    if (!this.zodSchemas[finalName]) {
       if (overrideId && overrideId !== schemaName) {
         this.typeToSchemaMapping[schemaName] = overrideId;
+        this.metaIdSchemaNames.add(schemaName);
+        if (this.typeToSchemaMapping[overrideId] === schemaName) {
+          delete this.typeToSchemaMapping[overrideId];
+        }
       }
-      this.storeResolvedSchema(finalName, schema);
+      const variantKey = this.getVariantKey(finalName, this.currentContentType);
+      this.zodSchemas[finalName] = schema;
+      this.schemaVariantRefs.set(variantKey, finalName);
     } else {
       logger.warn(`Schema component name '${overrideId ?? finalName}' conflicts with an existing schema, ignoring .meta({ id }) on '${schemaName}'`);
     }
   }
+  /**
+   * Derives the conventional Zod schema name from a TypeScript type name.
+   * e.g. "Slider" → "sliderSchema", "SliderItem" → "sliderItemSchema".
+   * Returns null when the input is already a schema name or is not PascalCase.
+   */
+  deriveSchemaNameByConvention(typeName) {
+    if (!typeName || !/^[A-Z]/.test(typeName) || typeName.endsWith("Schema")) {
+      return null;
+    }
+    return typeName[0].toLowerCase() + typeName.slice(1) + "Schema";
+  }
+  /**
+   * Checks whether a Zod schema with the given name is present in schemaDirs
+   * WITHOUT populating the processed-schema cache. A file-content substring check
+   * (the same heuristic used by processFileForZodSchema) is sufficient here: we
+   * only want to know whether the candidate *might* live in schemaDirs so that the
+   * convention mapping can be registered; the actual processing happens later in
+   * the normal convertZodSchemaToOpenApi lookup flow.
+   */
+  locateSchemaByConvention(candidate) {
+    if (this.schemaNameToFiles.has(candidate)) {
+      return true;
+    }
+    for (const dir of this.schemaDirs) {
+      for (const filePath of this.getSchemaFiles(dir)) {
+        try {
+          const content = this.fileAccess.readFileSync(filePath, "utf-8");
+          if (content.includes(candidate)) {
+            return true;
+          }
+        } catch {
+        }
+      }
+    }
+    return false;
+  }
   /**
    * Check if node is Zod schema
    */

package/package.json

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