@cerios/openapi-to-zod 1.3.1 → 1.4.0

package/dist/index.mjs

@@ -155,7 +155,7 @@ function escapeDescription(str) {
   return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n");
 }
 function escapePattern(str) {
-  return str.replace(/\//g, "\\/");
+  return str.replace(/(?<!\\)\//g, "\\/");
 }
 function escapeJSDoc(str) {
   return str.replace(/\*\//g, "*\\/");
@@ -429,7 +429,7 @@ function generateUnion(schemas, discriminator, isNullable2, context, options, cu
     );
   }
   if (schemas.length === 1) {
-    let singleSchema = context.generatePropertySchema(schemas[0], currentSchema);
+    let singleSchema = context.generatePropertySchema(schemas[0], currentSchema, false, true);
     if ((options == null ? void 0 : options.passthrough) && !singleSchema.includes(".catchall(")) {
       singleSchema = `${singleSchema}.catchall(z.unknown())`;
     }
@@ -445,7 +445,7 @@ function generateUnion(schemas, discriminator, isNullable2, context, options, cu
       console.warn(
         `[openapi-to-zod] Warning: Discriminator "${discriminator}" is not required in schemas: ${discriminatorCheck.invalidSchemas.join(", ")}. Falling back to z.union() instead of z.discriminatedUnion().`
       );
-      let schemaStrings3 = resolvedSchemas.map((s) => context.generatePropertySchema(s, currentSchema));
+      let schemaStrings3 = resolvedSchemas.map((s) => context.generatePropertySchema(s, currentSchema, false, true));
       if (options == null ? void 0 : options.passthrough) {
         schemaStrings3 = schemaStrings3.map((s) => s.includes(".catchall(") ? s : `${s}.catchall(z.unknown())`);
       }
@@ -453,14 +453,14 @@ function generateUnion(schemas, discriminator, isNullable2, context, options, cu
       const union3 = `z.union([${schemaStrings3.join(", ")}]).describe("${fallbackDescription}")`;
       return wrapNullable(union3, isNullable2);
     }
-    let schemaStrings2 = resolvedSchemas.map((s) => context.generatePropertySchema(s, currentSchema));
+    let schemaStrings2 = resolvedSchemas.map((s) => context.generatePropertySchema(s, currentSchema, false, true));
     if (options == null ? void 0 : options.passthrough) {
       schemaStrings2 = schemaStrings2.map((s) => s.includes(".catchall(") ? s : `${s}.catchall(z.unknown())`);
     }
     const union2 = `z.discriminatedUnion("${discriminator}", [${schemaStrings2.join(", ")}])`;
     return wrapNullable(union2, isNullable2);
   }
-  let schemaStrings = schemas.map((s) => context.generatePropertySchema(s, currentSchema));
+  let schemaStrings = schemas.map((s) => context.generatePropertySchema(s, currentSchema, false, true));
   if (options == null ? void 0 : options.passthrough) {
     schemaStrings = schemaStrings.map((s) => s.includes(".catchall(") ? s : `${s}.catchall(z.unknown())`);
   }
@@ -520,9 +520,9 @@ function detectConflictingProperties(schemas, context) {
   }
   return conflicts;
 }
-function generateAllOf(schemas, isNullable2, context, currentSchema, explicitNullableFalse = false) {
+function generateAllOf(schemas, isNullable2, context, currentSchema) {
   if (schemas.length === 1) {
-    const singleSchema = context.generatePropertySchema(schemas[0], currentSchema, false, explicitNullableFalse);
+    const singleSchema = context.generatePropertySchema(schemas[0], currentSchema, false, true);
     return wrapNullable(singleSchema, isNullable2);
   }
   const conflicts = detectConflictingProperties(schemas, context);
@@ -536,23 +536,23 @@ function generateAllOf(schemas, isNullable2, context, currentSchema, explicitNul
   const allObjects = schemas.every((s) => s.type === "object" || s.properties || s.$ref || s.allOf);
   let result;
   if (allObjects) {
-    let merged = context.generatePropertySchema(schemas[0], currentSchema, false);
+    let merged = context.generatePropertySchema(schemas[0], currentSchema, false, true);
     for (let i = 1; i < schemas.length; i++) {
       const schema = schemas[i];
       if (schema.$ref) {
-        const refSchema = context.generatePropertySchema(schema, currentSchema, false);
+        const refSchema = context.generatePropertySchema(schema, currentSchema, false, true);
         merged = `${merged}.extend(${refSchema}.shape)`;
       } else if (context.generateInlineObjectShape && (schema.properties || schema.type === "object")) {
         const inlineShape = context.generateInlineObjectShape(schema, currentSchema);
         merged = `${merged}.extend(${inlineShape})`;
       } else {
-        const schemaString = context.generatePropertySchema(schema, currentSchema, false);
+        const schemaString = context.generatePropertySchema(schema, currentSchema, false, true);
         merged = `${merged}.extend(${schemaString}.shape)`;
       }
     }
     result = merged;
   } else {
-    const schemaStrings = schemas.map((s) => context.generatePropertySchema(s, currentSchema, false));
+    const schemaStrings = schemas.map((s) => context.generatePropertySchema(s, currentSchema, false, true));
     let merged = schemaStrings[0];
     for (let i = 1; i < schemaStrings.length; i++) {
       merged = `${merged}.and(${schemaStrings[i]})`;
@@ -995,12 +995,6 @@ ${properties.join(",\n")}
 }
 
 // src/validators/string-validator.ts
-var PATTERN_CACHE = new LRUCache(1e3);
-function configurePatternCache(size) {
-  if (size > 0 && size !== PATTERN_CACHE.capacity) {
-    PATTERN_CACHE = new LRUCache(size);
-  }
-}
 var DEFAULT_FORMAT_MAP = {
   uuid: "z.uuid()",
   email: "z.email()",
@@ -1029,19 +1023,13 @@ 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" })'
 };
-var FORMAT_MAP = {
-  ...DEFAULT_FORMAT_MAP,
-  "date-time": "z.iso.datetime()"
-};
-function configureDateTimeFormat(pattern) {
+function buildDateTimeValidation(pattern) {
   if (!pattern) {
-    FORMAT_MAP["date-time"] = "z.iso.datetime()";
-    return;
+    return "z.iso.datetime()";
   }
   const patternStr = pattern instanceof RegExp ? pattern.source : pattern;
   if (patternStr === "") {
-    FORMAT_MAP["date-time"] = "z.iso.datetime()";
-    return;
+    return "z.iso.datetime()";
   }
   try {
     new RegExp(patternStr);
@@ -1051,10 +1039,16 @@ function configureDateTimeFormat(pattern) {
     );
   }
   const escapedPattern = escapePattern(patternStr);
-  FORMAT_MAP["date-time"] = `z.string().regex(/${escapedPattern}/)`;
+  return `z.string().regex(/${escapedPattern}/)`;
 }
-function generateStringValidation(schema, useDescribe) {
-  let validation = FORMAT_MAP[schema.format || ""] || "z.string()";
+function generateStringValidation(schema, useDescribe, context) {
+  let validation;
+  const format = schema.format || "";
+  if (format === "date-time") {
+    validation = context.dateTimeValidation;
+  } else {
+    validation = DEFAULT_FORMAT_MAP[format] || "z.string()";
+  }
   if (schema.minLength !== void 0) {
     validation += `.min(${schema.minLength})`;
   }
@@ -1062,10 +1056,10 @@ function generateStringValidation(schema, useDescribe) {
     validation += `.max(${schema.maxLength})`;
   }
   if (schema.pattern) {
-    let escapedPattern = PATTERN_CACHE.get(schema.pattern);
+    let escapedPattern = context.patternCache.get(schema.pattern);
     if (escapedPattern === void 0) {
       escapedPattern = escapePattern(schema.pattern);
-      PATTERN_CACHE.set(schema.pattern, escapedPattern);
+      context.patternCache.set(schema.pattern, escapedPattern);
     }
     validation += `.regex(/${escapedPattern}/)`;
   }
@@ -1095,10 +1089,10 @@ function generateStringValidation(schema, useDescribe) {
       validation += `.max(${schema.maxLength})`;
     }
     if (schema.pattern) {
-      let escapedPattern = PATTERN_CACHE.get(schema.pattern);
+      let escapedPattern = context.patternCache.get(schema.pattern);
       if (escapedPattern === void 0) {
         escapedPattern = escapePattern(schema.pattern);
-        PATTERN_CACHE.set(schema.pattern, escapedPattern);
+        context.patternCache.set(schema.pattern, escapedPattern);
       }
       validation += `.regex(/${escapedPattern}/)`;
     }
@@ -1413,17 +1407,16 @@ var _PropertyGenerator = class _PropertyGenerator {
       return wrapNullable(zodUnion, nullable);
     }
     if (schema.allOf) {
-      const explicitNullableFalse = schema.nullable === false;
+      const compositionNullable = isNullable(schema, false);
       let composition = generateAllOf(
         schema.allOf,
-        nullable,
+        compositionNullable,
         {
           generatePropertySchema: this.generatePropertySchema.bind(this),
           generateInlineObjectShape: this.generateInlineObjectShape.bind(this),
           resolveSchemaRef: this.resolveSchemaRef.bind(this)
         },
-        currentSchema,
-        explicitNullableFalse
+        currentSchema
       );
       if (schema.unevaluatedProperties !== void 0) {
         composition = this.applyUnevaluatedProperties(composition, schema);
@@ -1431,11 +1424,12 @@ var _PropertyGenerator = class _PropertyGenerator {
       return composition;
     }
     if (schema.oneOf) {
+      const compositionNullable = isNullable(schema, false);
       const needsPassthrough = schema.unevaluatedProperties !== void 0;
       let composition = generateUnion(
         schema.oneOf,
         (_b = schema.discriminator) == null ? void 0 : _b.propertyName,
-        nullable,
+        compositionNullable,
         {
           generatePropertySchema: this.generatePropertySchema.bind(this),
           resolveDiscriminatorMapping: this.resolveDiscriminatorMapping.bind(this),
@@ -1453,11 +1447,12 @@ var _PropertyGenerator = class _PropertyGenerator {
       return composition;
     }
     if (schema.anyOf) {
+      const compositionNullable = isNullable(schema, false);
       const needsPassthrough = schema.unevaluatedProperties !== void 0;
       let composition = generateUnion(
         schema.anyOf,
         (_d = schema.discriminator) == null ? void 0 : _d.propertyName,
-        nullable,
+        compositionNullable,
         {
           generatePropertySchema: this.generatePropertySchema.bind(this),
           resolveDiscriminatorMapping: this.resolveDiscriminatorMapping.bind(this),
@@ -1490,7 +1485,10 @@ var _PropertyGenerator = class _PropertyGenerator {
     const primaryType = getPrimaryType(schema);
     switch (primaryType) {
       case "string":
-        validation = generateStringValidation(schema, this.context.useDescribe);
+        validation = generateStringValidation(schema, this.context.useDescribe, {
+          dateTimeValidation: this.context.dateTimeValidation,
+          patternCache: this.context.patternCache
+        });
         break;
       case "number":
         validation = generateNumberValidation(schema, false, this.context.useDescribe);
@@ -1792,7 +1790,7 @@ var OpenApiGenerator = class {
     this.schemaUsageMap = /* @__PURE__ */ new Map();
     this.needsZodImport = true;
     this.filterStats = createFilterStatistics();
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (!options.input) {
       throw new ConfigurationError("Input path is required", { providedOptions: options });
     }
@@ -1818,12 +1816,8 @@ var OpenApiGenerator = class {
       batchSize: (_g = options.batchSize) != null ? _g : 10,
       customDateTimeFormatRegex: options.customDateTimeFormatRegex
     };
-    if (this.options.cacheSize) {
-      configurePatternCache(this.options.cacheSize);
-    }
-    if (this.options.customDateTimeFormatRegex) {
-      configureDateTimeFormat(this.options.customDateTimeFormatRegex);
-    }
+    this.patternCache = new LRUCache((_h = this.options.cacheSize) != null ? _h : 1e3);
+    this.dateTimeValidation = buildDateTimeValidation(this.options.customDateTimeFormatRegex);
     try {
       const fs = __require("fs");
       if (!fs.existsSync(this.options.input)) {
@@ -1886,13 +1880,15 @@ var OpenApiGenerator = class {
       mode: this.requestOptions.mode,
       includeDescriptions: this.requestOptions.includeDescriptions,
       useDescribe: this.requestOptions.useDescribe,
-      defaultNullable: (_h = this.options.defaultNullable) != null ? _h : false,
-      emptyObjectBehavior: (_i = this.options.emptyObjectBehavior) != null ? _i : "loose",
+      defaultNullable: (_i = this.options.defaultNullable) != null ? _i : false,
+      emptyObjectBehavior: (_j = this.options.emptyObjectBehavior) != null ? _j : "loose",
       namingOptions: {
         prefix: this.options.prefix,
         suffix: this.options.suffix
       },
-      stripSchemaPrefix: this.options.stripSchemaPrefix
+      stripSchemaPrefix: this.options.stripSchemaPrefix,
+      dateTimeValidation: this.dateTimeValidation,
+      patternCache: this.patternCache
     });
   }
   /**
@@ -2273,7 +2269,9 @@ ${typeCode}`;
         prefix: this.options.prefix,
         suffix: this.options.suffix
       },
-      stripSchemaPrefix: this.options.stripSchemaPrefix
+      stripSchemaPrefix: this.options.stripSchemaPrefix,
+      dateTimeValidation: this.dateTimeValidation,
+      patternCache: this.patternCache
     });
     const zodSchema = this.propertyGenerator.generatePropertySchema(schema, name, true);
     const zodSchemaCode = `${jsdoc}export const ${schemaName} = ${zodSchema};`;