@cerios/openapi-to-zod 1.3.1 → 1.3.2

package/dist/index.mjs

@@ -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]})`;
@@ -1413,17 +1413,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 +1430,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 +1453,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),