next-openapi-gen 0.10.0 → 0.10.1

package/dist/lib/drizzle-zod-processor.js

@@ -119,7 +119,6 @@ export class DrizzleZodProcessor {
                 ? node.callee.property.name
                 : null;
             if (methodName === "optional" ||
-                methodName === "nullable" ||
                 methodName === "nullish") {
                 return true;
             }
@@ -291,10 +290,13 @@ export class DrizzleZodProcessor {
                 result.type = "integer";
                 break;
             case "optional":
+                // Handled by isFieldOptional check, no schema modification needed
+                break;
             case "nullable":
+                result.nullable = true;
+                break;
             case "nullish":
-                // These are handled by the isFieldOptional check
-                // Don't modify the schema here
+                result.nullable = true;
                 break;
             case "describe":
                 if (args.length > 0 && t.isStringLiteral(args[0])) {

package/dist/lib/zod-converter.js

@@ -347,12 +347,8 @@ export class ZodSchemaConverter {
                                     }
                                     break;
                                 case "partial":
-                                    // All fields become optional
+                                    // All fields become optional (T | undefined), not nullable
                                     if (schema.properties) {
-                                        Object.keys(schema.properties).forEach((key) => {
-                                            schema.properties[key].nullable = true;
-                                        });
-                                        // Remove all required
                                         delete schema.required;
                                     }
                                     break;
@@ -390,14 +386,9 @@ export class ZodSchemaConverter {
                                     }
                                     break;
                                 case "required":
-                                    // All fields become required
+                                    // All fields become required — preserve genuine nullable flags
                                     if (schema.properties) {
-                                        const requiredFields = Object.keys(schema.properties);
-                                        schema.required = requiredFields;
-                                        // Remove nullable from fields
-                                        Object.keys(schema.properties).forEach((key) => {
-                                            delete schema.properties[key].nullable;
-                                        });
+                                        schema.required = Object.keys(schema.properties);
                                     }
                                     break;
                                 case "extend":
@@ -418,8 +409,9 @@ export class ZodSchemaConverter {
                                                     const propSchema = this.processZodNode(prop.value);
                                                     if (propSchema) {
                                                         extensionProperties[key] = propSchema;
-                                                        // Check if the schema itself has nullable set (which processZodNode sets for optional fields)
-                                                        const isOptional = propSchema.nullable === true;
+                                                        const isOptional = 
+                                                        // @ts-ignore
+                                                        this.isOptional(prop.value) || this.hasOptionalMethod(prop.value);
                                                         if (!isOptional) {
                                                             extensionRequired.push(key);
                                                         }
@@ -1239,20 +1231,17 @@ export class ZodSchemaConverter {
         // Apply the current method
         switch (methodName) {
             case "optional":
-                // Don't add nullable for schema references wrapped in allOf
-                // as it doesn't make sense in that context
-                if (!schema.allOf) {
-                    schema.nullable = true;
-                }
+                // optional means T | undefined — not in required array, no nullable flag
+                // Required array exclusion is handled by hasOptionalMethod() in processZodObject()
                 break;
             case "nullable":
-                // Don't add nullable for schema references wrapped in allOf
+                // nullable means T | null — field stays required but can be null
                 if (!schema.allOf) {
                     schema.nullable = true;
                 }
                 break;
-            case "nullish": // Handles both null and undefined
-                // Don't add nullable for schema references wrapped in allOf
+            case "nullish": // T | null | undefined
+                // Not in required array (handled by hasOptionalMethod) AND can be null
                 if (!schema.allOf) {
                     schema.nullable = true;
                 }
@@ -1540,7 +1529,6 @@ export class ZodSchemaConverter {
         if (t.isMemberExpression(node.callee) &&
             t.isIdentifier(node.callee.property) &&
             (node.callee.property.name === "optional" ||
-                node.callee.property.name === "nullable" ||
                 node.callee.property.name === "nullish")) {
             return true;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-openapi-gen",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Automatically generate OpenAPI 3.0 documentation from Next.js projects, with support for Zod schemas and TypeScript types.",
   "type": "module",
   "main": "dist/index.js",