@cerios/openapi-to-zod 1.3.0 → 1.3.1

package/dist/index.mjs

@@ -86,12 +86,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;
 }
@@ -520,9 +520,9 @@ function detectConflictingProperties(schemas, context) {
   }
   return conflicts;
 }
-function generateAllOf(schemas, isNullable2, context, currentSchema) {
+function generateAllOf(schemas, isNullable2, context, currentSchema, explicitNullableFalse = false) {
   if (schemas.length === 1) {
-    const singleSchema = context.generatePropertySchema(schemas[0], currentSchema, false);
+    const singleSchema = context.generatePropertySchema(schemas[0], currentSchema, false, explicitNullableFalse);
     return wrapNullable(singleSchema, isNullable2);
   }
   const conflicts = detectConflictingProperties(schemas, context);
@@ -1337,12 +1337,21 @@ var _PropertyGenerator = class _PropertyGenerator {
   }
   /**
    * 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;
@@ -1351,10 +1360,9 @@ var _PropertyGenerator = class _PropertyGenerator {
     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)) {
@@ -1405,6 +1413,7 @@ var _PropertyGenerator = class _PropertyGenerator {
       return wrapNullable(zodUnion, nullable);
     }
     if (schema.allOf) {
+      const explicitNullableFalse = schema.nullable === false;
       let composition = generateAllOf(
         schema.allOf,
         nullable,
@@ -1413,7 +1422,8 @@ var _PropertyGenerator = class _PropertyGenerator {
           generateInlineObjectShape: this.generateInlineObjectShape.bind(this),
           resolveSchemaRef: this.resolveSchemaRef.bind(this)
         },
-        currentSchema
+        currentSchema,
+        explicitNullableFalse
       );
       if (schema.unevaluatedProperties !== void 0) {
         composition = this.applyUnevaluatedProperties(composition, schema);
@@ -1947,12 +1957,6 @@ var OpenApiGenerator = class {
    * 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);