@cerios/openapi-to-zod 1.3.0 → 1.3.2

package/dist/cli.mjs

@@ -5151,12 +5151,12 @@ function toCamelCase(str, options) {
     name = words[0].charAt(0).toLowerCase() + words[0].slice(1) + words.slice(1).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("");
   }
   if (options == null ? void 0 : options.prefix) {
-    const prefix = options.prefix.toLowerCase();
+    const prefix = options.prefix.charAt(0).toLowerCase() + options.prefix.slice(1);
     name = prefix + name.charAt(0).toUpperCase() + name.slice(1);
   }
   if (options == null ? void 0 : options.suffix) {
-    const suffix = options.suffix;
-    name = name + suffix.charAt(0).toUpperCase() + suffix.slice(1).toLowerCase();
+    const suffix = options.suffix.charAt(0).toUpperCase() + options.suffix.slice(1);
+    name = name + suffix;
   }
   return name;
 }
@@ -5540,7 +5540,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())`;
     }
@@ -5556,7 +5556,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())`);
       }
@@ -5564,14 +5564,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())`);
   }
@@ -5633,7 +5633,7 @@ function detectConflictingProperties(schemas, context) {
 }
 function generateAllOf(schemas, isNullable2, context, currentSchema) {
   if (schemas.length === 1) {
-    const singleSchema = context.generatePropertySchema(schemas[0], currentSchema, false);
+    const singleSchema = context.generatePropertySchema(schemas[0], currentSchema, false, true);
     return wrapNullable(singleSchema, isNullable2);
   }
   const conflicts = detectConflictingProperties(schemas, context);
@@ -5647,23 +5647,23 @@ function generateAllOf(schemas, isNullable2, context, currentSchema) {
   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]})`;
@@ -6499,12 +6499,21 @@ var init_property_generator = __esm({
       }
       /**
        * Generate Zod schema for a property
+       * @param schema - The OpenAPI schema to generate
+       * @param currentSchema - The name of the current schema being processed (for circular ref detection)
+       * @param isTopLevel - Whether this is a top-level schema definition
+       * @param suppressDefaultNullable - When true, don't apply defaultNullable (used when outer schema has explicit nullable: false)
        */
-      generatePropertySchema(schema, currentSchema, isTopLevel = false) {
+      generatePropertySchema(schema, currentSchema, isTopLevel = false, suppressDefaultNullable = false) {
         var _a, _b, _c, _d, _e;
         const isCacheable = !schema.$ref && !schema.allOf && !schema.oneOf && !schema.anyOf && !currentSchema;
         if (isCacheable) {
-          const cacheKey = JSON.stringify({ schema, type: this.context.schemaType, mode: this.context.mode });
+          const cacheKey = JSON.stringify({
+            schema,
+            type: this.context.schemaType,
+            mode: this.context.mode,
+            suppressDefaultNullable
+          });
           const cached = this.schemaCache.get(cacheKey);
           if (cached) {
             return cached;
@@ -6513,10 +6522,9 @@ var init_property_generator = __esm({
         if ((this.context.schemaType === "request" || this.context.schemaType === "response") && schema.properties) {
           schema = this.filterNestedProperties(schema);
         }
-        const isSchemaRef = !!schema.$ref;
         const isEnum = !!schema.enum;
         const isConst = schema.const !== void 0;
-        const shouldApplyDefaultNullable = !isTopLevel && !isSchemaRef && !isEnum && !isConst;
+        const shouldApplyDefaultNullable = !isTopLevel && !isEnum && !isConst && !suppressDefaultNullable;
         const effectiveDefaultNullable = shouldApplyDefaultNullable ? this.context.defaultNullable : false;
         const nullable = isNullable(schema, effectiveDefaultNullable);
         if (hasMultipleTypes(schema)) {
@@ -6567,9 +6575,10 @@ var init_property_generator = __esm({
           return wrapNullable(zodUnion, nullable);
         }
         if (schema.allOf) {
+          const compositionNullable = isNullable(schema, false);
           let composition = generateAllOf(
             schema.allOf,
-            nullable,
+            compositionNullable,
             {
               generatePropertySchema: this.generatePropertySchema.bind(this),
               generateInlineObjectShape: this.generateInlineObjectShape.bind(this),
@@ -6583,11 +6592,12 @@ var init_property_generator = __esm({
           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),
@@ -6605,11 +6615,12 @@ var init_property_generator = __esm({
           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),
@@ -7141,12 +7152,6 @@ var init_openapi_generator = __esm({
        * Generate the complete output file
        */
       generate() {
-        if (!this.options.output) {
-          throw new ConfigurationError(
-            "Output path is required when calling generate(). Either provide an 'output' option or use generateString() to get the result as a string.",
-            { hasOutput: false }
-          );
-        }
         const output = this.generateString();
         const normalizedOutput = normalize(this.options.output);
         this.ensureDirectoryExists(normalizedOutput);
@@ -7875,7 +7880,8 @@ var init_config_schemas = __esm({
       mode: z.enum(["strict", "normal", "loose"]).optional(),
       useDescribe: z.boolean().optional(),
       includeDescriptions: z.boolean().optional(),
-      defaultNullable: z.boolean().optional()
+      defaultNullable: z.boolean().optional(),
+      emptyObjectBehavior: z.enum(["strict", "loose", "record"]).optional()
     });
     OperationFiltersSchema = z.strictObject({
       includeTags: z.array(z.string()).optional(),
@@ -8007,6 +8013,7 @@ function mergeConfigWithDefaults(config) {
       includeDescriptions: defaults.includeDescriptions,
       useDescribe: defaults.useDescribe,
       defaultNullable: defaults.defaultNullable,
+      emptyObjectBehavior: defaults.emptyObjectBehavior,
       schemaType: defaults.schemaType,
       prefix: defaults.prefix,
       suffix: defaults.suffix,
@@ -8033,6 +8040,7 @@ var init_config_loader = __esm({
       includeDescriptions: z2.boolean().optional(),
       useDescribe: z2.boolean().optional(),
       defaultNullable: z2.boolean().optional(),
+      emptyObjectBehavior: z2.enum(["strict", "loose", "record"]).optional(),
       schemaType: z2.enum(["all", "request", "response"]).optional(),
       prefix: z2.string().optional(),
       suffix: z2.string().optional(),
@@ -8065,6 +8073,7 @@ var init_config_loader = __esm({
         includeDescriptions: z2.boolean().optional(),
         useDescribe: z2.boolean().optional(),
         defaultNullable: z2.boolean().optional(),
+        emptyObjectBehavior: z2.enum(["strict", "loose", "record"]).optional(),
         schemaType: z2.enum(["all", "request", "response"]).optional(),
         prefix: z2.string().optional(),
         suffix: z2.string().optional(),