zod-openapi 2.14.0 → 2.15.0

package/README.md

@@ -518,6 +518,7 @@ For example in `z.string().nullable()` will be rendered differently
   - `pre-process` support. We assume that the input type is the same as the output type. Otherwise pipe and transform can be used instead.
   - `refine` full support
 - ZodEnum
+- ZodIntersection
 - ZodLazy
   - The recursive schema within the ZodLazy or the ZodLazy _**must**_ be registered as a component. See [Creating Components](#creating-components) for more information.
 - ZodLiteral

package/lib-commonjs/index.js

@@ -356,15 +356,47 @@ var createLazySchema = (zodLazy, state) => {
   return createSchemaObject(innerSchema, state, ["lazy schema"]);
 };
 
-// src/create/schema/parsers/literal.ts
-var createLiteralSchema = (zodLiteral) => ({
+// 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/null.ts
+var createNullSchema = () => ({
   type: "schema",
   schema: {
-    type: typeof zodLiteral.value,
-    enum: [zodLiteral._def.value]
+    type: "null"
   }
 });
 
+// src/create/schema/parsers/literal.ts
+var createLiteralSchema = (zodLiteral, state) => {
+  if (zodLiteral.value === null) {
+    return createNullSchema();
+  }
+  if (satisfiesVersion(state.components.openapi, "3.1.0")) {
+    return {
+      type: "schema",
+      schema: {
+        type: typeof zodLiteral.value,
+        const: zodLiteral.value
+      }
+    };
+  }
+  return {
+    type: "schema",
+    schema: {
+      type: typeof zodLiteral.value,
+      enum: [zodLiteral.value]
+    }
+  };
+};
+
 // src/create/schema/parsers/manual.ts
 var createManualTypeSchema = (zodSchema, state) => {
   if (!zodSchema._def.openapi?.type) {
@@ -383,16 +415,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);
@@ -444,14 +466,6 @@ var sortStringsAndNumbers = (values) => ({
   numbers: values.filter((value) => typeof value === "number")
 });
 
-// src/create/schema/parsers/null.ts
-var createNullSchema = (_zodNull) => ({
-  type: "schema",
-  schema: {
-    type: "null"
-  }
-});
-
 // src/create/schema/parsers/nullable.ts
 var createNullableSchema = (zodNullable, state) => {
   const schemaObject = createSchemaObject(zodNullable.unwrap(), state, [
@@ -589,7 +603,7 @@ var mapNumberType = (zodNumberChecks) => zodNumberChecks.int ? "integer" : "numb
 // src/create/schema/parsers/optional.ts
 var createOptionalSchema = (zodOptional, state) => createSchemaObject(zodOptional.unwrap(), state, ["optional"]);
 var isOptionalSchema = (zodSchema, state) => {
-  if (isZodType(zodSchema, "ZodOptional") || isZodType(zodSchema, "ZodNever") || isZodType(zodSchema, "ZodUndefined")) {
+  if (isZodType(zodSchema, "ZodOptional") || isZodType(zodSchema, "ZodNever") || isZodType(zodSchema, "ZodUndefined") || isZodType(zodSchema, "ZodLiteral") && zodSchema._def.value === void 0) {
     return { optional: true };
   }
   if (isZodType(zodSchema, "ZodDefault")) {
@@ -1189,7 +1203,7 @@ var createSchemaSwitch = (zodSchema, state) => {
     return createEnumSchema(zodSchema);
   }
   if (isZodType(zodSchema, "ZodLiteral")) {
-    return createLiteralSchema(zodSchema);
+    return createLiteralSchema(zodSchema, state);
   }
   if (isZodType(zodSchema, "ZodNativeEnum")) {
     return createNativeEnumSchema(zodSchema, state);
@@ -1207,7 +1221,7 @@ var createSchemaSwitch = (zodSchema, state) => {
     return createDiscriminatedUnionSchema(zodSchema, state);
   }
   if (isZodType(zodSchema, "ZodNull")) {
-    return createNullSchema(zodSchema);
+    return createNullSchema();
   }
   if (isZodType(zodSchema, "ZodNullable")) {
     return createNullableSchema(zodSchema, state);

package/lib-esm/index.mjs

@@ -332,15 +332,47 @@ var createLazySchema = (zodLazy, state) => {
   return createSchemaObject(innerSchema, state, ["lazy schema"]);
 };
 
-// src/create/schema/parsers/literal.ts
-var createLiteralSchema = (zodLiteral) => ({
+// 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/null.ts
+var createNullSchema = () => ({
   type: "schema",
   schema: {
-    type: typeof zodLiteral.value,
-    enum: [zodLiteral._def.value]
+    type: "null"
   }
 });
 
+// src/create/schema/parsers/literal.ts
+var createLiteralSchema = (zodLiteral, state) => {
+  if (zodLiteral.value === null) {
+    return createNullSchema();
+  }
+  if (satisfiesVersion(state.components.openapi, "3.1.0")) {
+    return {
+      type: "schema",
+      schema: {
+        type: typeof zodLiteral.value,
+        const: zodLiteral.value
+      }
+    };
+  }
+  return {
+    type: "schema",
+    schema: {
+      type: typeof zodLiteral.value,
+      enum: [zodLiteral.value]
+    }
+  };
+};
+
 // src/create/schema/parsers/manual.ts
 var createManualTypeSchema = (zodSchema, state) => {
   if (!zodSchema._def.openapi?.type) {
@@ -359,16 +391,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);
@@ -420,14 +442,6 @@ var sortStringsAndNumbers = (values) => ({
   numbers: values.filter((value) => typeof value === "number")
 });
 
-// src/create/schema/parsers/null.ts
-var createNullSchema = (_zodNull) => ({
-  type: "schema",
-  schema: {
-    type: "null"
-  }
-});
-
 // src/create/schema/parsers/nullable.ts
 var createNullableSchema = (zodNullable, state) => {
   const schemaObject = createSchemaObject(zodNullable.unwrap(), state, [
@@ -565,7 +579,7 @@ var mapNumberType = (zodNumberChecks) => zodNumberChecks.int ? "integer" : "numb
 // src/create/schema/parsers/optional.ts
 var createOptionalSchema = (zodOptional, state) => createSchemaObject(zodOptional.unwrap(), state, ["optional"]);
 var isOptionalSchema = (zodSchema, state) => {
-  if (isZodType(zodSchema, "ZodOptional") || isZodType(zodSchema, "ZodNever") || isZodType(zodSchema, "ZodUndefined")) {
+  if (isZodType(zodSchema, "ZodOptional") || isZodType(zodSchema, "ZodNever") || isZodType(zodSchema, "ZodUndefined") || isZodType(zodSchema, "ZodLiteral") && zodSchema._def.value === void 0) {
     return { optional: true };
   }
   if (isZodType(zodSchema, "ZodDefault")) {
@@ -1165,7 +1179,7 @@ var createSchemaSwitch = (zodSchema, state) => {
     return createEnumSchema(zodSchema);
   }
   if (isZodType(zodSchema, "ZodLiteral")) {
-    return createLiteralSchema(zodSchema);
+    return createLiteralSchema(zodSchema, state);
   }
   if (isZodType(zodSchema, "ZodNativeEnum")) {
     return createNativeEnumSchema(zodSchema, state);
@@ -1183,7 +1197,7 @@ var createSchemaSwitch = (zodSchema, state) => {
     return createDiscriminatedUnionSchema(zodSchema, state);
   }
   if (isZodType(zodSchema, "ZodNull")) {
-    return createNullSchema(zodSchema);
+    return createNullSchema();
   }
   if (isZodType(zodSchema, "ZodNullable")) {
     return createNullableSchema(zodSchema, state);

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

@@ -1,3 +1,3 @@
 import type { ZodLiteral } from 'zod';
-import type { Schema } from '..';
-export declare const createLiteralSchema: (zodLiteral: ZodLiteral<unknown>) => Schema;
+import type { Schema, SchemaState } from '..';
+export declare const createLiteralSchema: (zodLiteral: ZodLiteral<unknown>, state: SchemaState) => Schema;

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

@@ -1,3 +1,2 @@
-import type { ZodNull } from 'zod';
 import type { Schema } from '..';
-export declare const createNullSchema: (_zodNull: ZodNull) => Schema;
+export declare const createNullSchema: () => Schema;

package/lib-types/openapi3-ts/dist/model/openapi31.d.ts

@@ -232,6 +232,7 @@ export interface SchemaObject extends ISpecificationExtension {
     title?: string;
     multipleOf?: number;
     maximum?: number;
+    const?: any;
     exclusiveMaximum?: number;
     minimum?: number;
     exclusiveMinimum?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod-openapi",
-  "version": "2.14.0",
+  "version": "2.15.0",
   "description": "Convert Zod Schemas to OpenAPI v3.x documentation",
   "keywords": [
     "typescript",
@@ -47,14 +47,13 @@
     "test:ci": "skuba test --coverage",
     "test:watch": "skuba test --watch"
   },
-  "dependencies": {},
   "devDependencies": {
-    "@redocly/cli": "1.9.1",
+    "@redocly/cli": "1.10.5",
     "@types/node": "^20.3.0",
     "eslint-plugin-zod-openapi": "^0.1.0",
-    "openapi3-ts": "4.2.2",
-    "skuba": "7.5.0",
-    "yaml": "2.4.0",
+    "openapi3-ts": "4.3.1",
+    "skuba": "7.5.1",
+    "yaml": "2.4.1",
     "zod": "3.22.4"
   },
   "peerDependencies": {