@cerios/openapi-to-zod 1.6.0 → 1.7.0

package/README.md

@@ -542,6 +542,36 @@ When using a custom regex, the generator will produce:
 
 **Note:** This option only affects `date-time` format fields. Other formats (like `date`, `email`, `uuid`) remain unchanged.
 
+### UUID Format
+
+By default, the generator uses `z.uuid()` for `uuid` and `guid` format fields. You can change this with the `uuidFormat` option to use a specific UUID version or GUID validation:
+
+```typescript
+import { defineConfig } from "@cerios/openapi-to-zod";
+
+export default defineConfig({
+	defaults: {
+		uuidFormat: "uuidv4",
+	},
+	specs: [
+		{
+			input: "openapi.yaml",
+			outputTypes: "src/schemas.ts",
+		},
+	],
+});
+```
+
+**Available values:**
+
+| Value                   | Generated Output                 |
+| ----------------------- | -------------------------------- |
+| `"uuid"` (default)      | `z.uuid()`                       |
+| `"guid"`                | `z.guid()`                       |
+| `"uuidv1"` – `"uuidv8"` | `z.uuid({ version: "v1" })` etc. |
+
+**Note:** Both `format: "uuid"` and `format: "guid"` in OpenAPI specs follow the configured `uuidFormat` setting.
+
 ## Advanced Features
 
 ### Operation Filtering

package/dist/cli.js

@@ -5718,7 +5718,6 @@ ${properties.join(",\n")}
 init_cjs_shims();
 var import_openapi_core4 = require("@cerios/openapi-core");
 var DEFAULT_FORMAT_MAP = {
-  uuid: "z.uuid()",
   email: "z.email()",
   uri: "z.url()",
   url: "z.url()",
@@ -5745,6 +5744,16 @@ var DEFAULT_FORMAT_MAP = {
   "json-pointer": 'z.string().refine((val) => val === "" || /^(\\/([^~/]|~0|~1)+)+$/.test(val), { message: "Must be a valid JSON Pointer (RFC 6901)" })',
   "relative-json-pointer": 'z.string().refine((val) => /^(0|[1-9]\\d*)(#|(\\/([^~/]|~0|~1)+)*)$/.test(val), { message: "Must be a valid relative JSON Pointer" })'
 };
+function buildUuidValidation(format) {
+  if (!format || format === "uuid") {
+    return "z.uuid()";
+  }
+  if (format === "guid") {
+    return "z.guid()";
+  }
+  const version = format.replace("uuid", "");
+  return `z.uuid({ version: "${version}" })`;
+}
 function buildDateTimeValidation(pattern) {
   if (!pattern) {
     return "z.iso.datetime()";
@@ -5768,6 +5777,8 @@ function generateStringValidation(schema, useDescribe, context) {
   const format = schema.format || "";
   if (format === "date-time") {
     validation = context.dateTimeValidation;
+  } else if (format === "uuid" || format === "guid") {
+    validation = context.uuidValidation;
   } else {
     validation = DEFAULT_FORMAT_MAP[format] || "z.string()";
   }
@@ -6247,6 +6258,7 @@ var _PropertyGenerator = class _PropertyGenerator {
       case "string":
         validation = generateStringValidation(schema, this.context.useDescribe, {
           dateTimeValidation: this.context.dateTimeValidation,
+          uuidValidation: this.context.uuidValidation,
           patternCache: this.context.patternCache
         });
         break;
@@ -6409,11 +6421,13 @@ var OpenApiGenerator = class {
       cacheSize: (_h = options.cacheSize) != null ? _h : 1e3,
       batchSize: (_i = options.batchSize) != null ? _i : 10,
       customDateTimeFormatRegex: options.customDateTimeFormatRegex,
+      uuidFormat: options.uuidFormat,
       includeHeader: options.includeHeader,
       fileHeader: options.fileHeader
     };
     this.patternCache = new import_openapi_core6.LRUCache((_j = this.options.cacheSize) != null ? _j : 1e3);
     this.dateTimeValidation = buildDateTimeValidation(this.options.customDateTimeFormatRegex);
+    this.uuidValidation = buildUuidValidation(this.options.uuidFormat);
     this.spec = (0, import_openapi_core6.loadOpenAPISpec)(this.options.input);
     this.validateSpec();
     this.requestOptions = this.resolveOptionsForContext("request");
@@ -6434,6 +6448,7 @@ var OpenApiGenerator = class {
       },
       stripSchemaPrefix: this.options.stripSchemaPrefix,
       dateTimeValidation: this.dateTimeValidation,
+      uuidValidation: this.uuidValidation,
       patternCache: this.patternCache,
       separateTypesFile: this.separateSchemasMode,
       warn: (msg) => {
@@ -6975,6 +6990,7 @@ ${typeCode}`;
       },
       stripSchemaPrefix: this.options.stripSchemaPrefix,
       dateTimeValidation: this.dateTimeValidation,
+      uuidValidation: this.uuidValidation,
       patternCache: this.patternCache,
       separateTypesFile: this.separateSchemasMode,
       warn: (msg) => {
@@ -7227,7 +7243,8 @@ ${propsCode}
         email: "z.email()",
         uri: "z.url()",
         url: "z.url()",
-        uuid: "z.uuid()"
+        uuid: this.uuidValidation,
+        guid: this.uuidValidation
       };
       if (schema.format && formatMap[schema.format]) {
         let zodType2 = formatMap[schema.format];
@@ -7475,6 +7492,7 @@ var ZodSpecificOptionsSchema = import_zod.z.strictObject({
   request: import_openapi_core7.RequestResponseOptionsSchema.optional(),
   response: import_openapi_core7.RequestResponseOptionsSchema.optional(),
   customDateTimeFormatRegex: import_openapi_core7.RegexPatternSchema.optional(),
+  uuidFormat: import_zod.z.enum(["uuid", "guid", "uuidv1", "uuidv2", "uuidv3", "uuidv4", "uuidv5", "uuidv6", "uuidv7", "uuidv8"]).optional(),
   outputZodSchemas: import_zod.z.string().optional(),
   enumFormat: import_zod.z.enum(["union", "const-object"]).optional(),
   typeAssertionThreshold: import_zod.z.number().int().gte(0).optional()
@@ -7580,6 +7598,7 @@ function mergeConfigWithDefaults(config) {
       suffix: defaults.suffix,
       showStats: defaults.showStats,
       customDateTimeFormatRegex: defaults.customDateTimeFormatRegex,
+      uuidFormat: defaults.uuidFormat,
       enumFormat: defaults.enumFormat,
       fileHeader: defaults.fileHeader,
       // Override with spec-specific values