zod-openapi 2.10.0 → 2.11.0

package/lib-commonjs/index.js

@@ -34,9 +34,20 @@ var isAnyZodType = (zodType) => Boolean(
   zodType?._def?.typeName
 );
 
+// src/openapi.ts
+var openApiVersions = [
+  "3.0.0",
+  "3.0.1",
+  "3.0.2",
+  "3.0.3",
+  "3.1.0"
+];
+var satisfiesVersion = (test, against) => openApiVersions.indexOf(test) >= openApiVersions.indexOf(against);
+var isReferenceObject = (schemaOrRef) => Boolean("$ref" in schemaOrRef && schemaOrRef.$ref);
+
 // src/create/schema/metadata.ts
 var enhanceWithMetadata = (schemaObject, metadata) => {
-  if ("$ref" in schemaObject) {
+  if (isReferenceObject(schemaObject)) {
     if (Object.values(metadata).every((val) => val === void 0)) {
       return schemaObject;
     }
@@ -189,16 +200,6 @@ var createManualTypeSchema = (zodSchema, state) => {
   };
 };
 
-// src/openapi.ts
-var openApiVersions = [
-  "3.0.0",
-  "3.0.1",
-  "3.0.2",
-  "3.0.3",
-  "3.1.0"
-];
-var satisfiesVersion = (test, against) => openApiVersions.indexOf(test) >= openApiVersions.indexOf(against);
-
 // src/create/schema/parsers/nativeEnum.ts
 var createNativeEnumSchema = (zodEnum, state) => {
   const enumValues = getValidEnumValues(zodEnum._def.values);
@@ -248,34 +249,41 @@ var createNullableSchema = (zodNullable, state) => {
   const schemaObject = createSchemaObject(zodNullable.unwrap(), state, [
     "nullable"
   ]);
-  if ("$ref" in schemaObject || schemaObject.allOf) {
-    return {
-      oneOf: mapNullOf([schemaObject], state.components.openapi)
-    };
-  }
-  if (schemaObject.oneOf) {
-    const { oneOf, ...schema2 } = schemaObject;
+  if (satisfiesVersion(state.components.openapi, "3.1.0")) {
+    if (isReferenceObject(schemaObject) || schemaObject.allOf) {
+      return {
+        oneOf: mapNullOf([schemaObject], state.components.openapi)
+      };
+    }
+    if (schemaObject.oneOf) {
+      const { oneOf, ...schema3 } = schemaObject;
+      return {
+        oneOf: mapNullOf(oneOf, state.components.openapi),
+        ...schema3
+      };
+    }
+    if (schemaObject.anyOf) {
+      const { anyOf, ...schema3 } = schemaObject;
+      return {
+        anyOf: mapNullOf(anyOf, state.components.openapi),
+        ...schema3
+      };
+    }
+    const { type: type2, ...schema2 } = schemaObject;
     return {
-      oneOf: mapNullOf(oneOf, state.components.openapi),
+      type: mapNullType(type2),
       ...schema2
     };
   }
-  if (schemaObject.anyOf) {
-    const { anyOf, ...schema2 } = schemaObject;
+  if (isReferenceObject(schemaObject)) {
     return {
-      anyOf: mapNullOf(anyOf, state.components.openapi),
-      ...schema2
+      allOf: [schemaObject],
+      nullable: true
     };
   }
   const { type, ...schema } = schemaObject;
-  if (satisfiesVersion(state.components.openapi, "3.1.0")) {
-    return {
-      type: mapNullType(type),
-      ...schema
-    };
-  }
   return {
-    type,
+    ...type && { type },
     nullable: true,
     ...schema,
     // https://github.com/OAI/OpenAPI-Specification/blob/main/proposals/2019-10-31-Clarify-Nullable.md#if-a-schema-specifies-nullable-true-and-enum-1-2-3-does-that-schema-allow-null-values-see-1900

package/lib-esm/index.js

@@ -10,9 +10,20 @@ var isAnyZodType = (zodType) => Boolean(
   zodType?._def?.typeName
 );
 
+// src/openapi.ts
+var openApiVersions = [
+  "3.0.0",
+  "3.0.1",
+  "3.0.2",
+  "3.0.3",
+  "3.1.0"
+];
+var satisfiesVersion = (test, against) => openApiVersions.indexOf(test) >= openApiVersions.indexOf(against);
+var isReferenceObject = (schemaOrRef) => Boolean("$ref" in schemaOrRef && schemaOrRef.$ref);
+
 // src/create/schema/metadata.ts
 var enhanceWithMetadata = (schemaObject, metadata) => {
-  if ("$ref" in schemaObject) {
+  if (isReferenceObject(schemaObject)) {
     if (Object.values(metadata).every((val) => val === void 0)) {
       return schemaObject;
     }
@@ -165,16 +176,6 @@ var createManualTypeSchema = (zodSchema, state) => {
   };
 };
 
-// src/openapi.ts
-var openApiVersions = [
-  "3.0.0",
-  "3.0.1",
-  "3.0.2",
-  "3.0.3",
-  "3.1.0"
-];
-var satisfiesVersion = (test, against) => openApiVersions.indexOf(test) >= openApiVersions.indexOf(against);
-
 // src/create/schema/parsers/nativeEnum.ts
 var createNativeEnumSchema = (zodEnum, state) => {
   const enumValues = getValidEnumValues(zodEnum._def.values);
@@ -224,34 +225,41 @@ var createNullableSchema = (zodNullable, state) => {
   const schemaObject = createSchemaObject(zodNullable.unwrap(), state, [
     "nullable"
   ]);
-  if ("$ref" in schemaObject || schemaObject.allOf) {
-    return {
-      oneOf: mapNullOf([schemaObject], state.components.openapi)
-    };
-  }
-  if (schemaObject.oneOf) {
-    const { oneOf, ...schema2 } = schemaObject;
+  if (satisfiesVersion(state.components.openapi, "3.1.0")) {
+    if (isReferenceObject(schemaObject) || schemaObject.allOf) {
+      return {
+        oneOf: mapNullOf([schemaObject], state.components.openapi)
+      };
+    }
+    if (schemaObject.oneOf) {
+      const { oneOf, ...schema3 } = schemaObject;
+      return {
+        oneOf: mapNullOf(oneOf, state.components.openapi),
+        ...schema3
+      };
+    }
+    if (schemaObject.anyOf) {
+      const { anyOf, ...schema3 } = schemaObject;
+      return {
+        anyOf: mapNullOf(anyOf, state.components.openapi),
+        ...schema3
+      };
+    }
+    const { type: type2, ...schema2 } = schemaObject;
     return {
-      oneOf: mapNullOf(oneOf, state.components.openapi),
+      type: mapNullType(type2),
       ...schema2
     };
   }
-  if (schemaObject.anyOf) {
-    const { anyOf, ...schema2 } = schemaObject;
+  if (isReferenceObject(schemaObject)) {
     return {
-      anyOf: mapNullOf(anyOf, state.components.openapi),
-      ...schema2
+      allOf: [schemaObject],
+      nullable: true
     };
   }
   const { type, ...schema } = schemaObject;
-  if (satisfiesVersion(state.components.openapi, "3.1.0")) {
-    return {
-      type: mapNullType(type),
-      ...schema
-    };
-  }
   return {
-    type,
+    ...type && { type },
     nullable: true,
     ...schema,
     // https://github.com/OAI/OpenAPI-Specification/blob/main/proposals/2019-10-31-Clarify-Nullable.md#if-a-schema-specifies-nullable-true-and-enum-1-2-3-does-that-schema-allow-null-values-see-1900

package/lib-types/create/schema/parsers/nullable.d.ts

@@ -1,4 +1,4 @@
 import type { ZodNullable, ZodTypeAny } from 'zod';
 import type { oas31 } from '../../../openapi3-ts/dist';
 import { type SchemaState } from '../../schema';
-export declare const createNullableSchema: <T extends ZodTypeAny>(zodNullable: ZodNullable<T>, state: SchemaState) => oas31.SchemaObject;
+export declare const createNullableSchema: <T extends ZodTypeAny>(zodNullable: ZodNullable<T>, state: SchemaState) => oas31.SchemaObject | oas31.ReferenceObject;

package/lib-types/openapi.d.ts

@@ -1,3 +1,5 @@
+import type { oas31 } from './openapi3-ts/dist';
 export declare const openApiVersions: readonly ["3.0.0", "3.0.1", "3.0.2", "3.0.3", "3.1.0"];
 export type OpenApiVersion = (typeof openApiVersions)[number];
 export declare const satisfiesVersion: (test: OpenApiVersion, against: OpenApiVersion) => boolean;
+export declare const isReferenceObject: (schemaOrRef: oas31.SchemaObject | oas31.ReferenceObject) => schemaOrRef is oas31.ReferenceObject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod-openapi",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "description": "Convert Zod Schemas to OpenAPI v3.x documentation",
   "keywords": [
     "typescript",