zod-openapi 2.5.0 → 2.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +13 -6
- package/lib-commonjs/create/schema/index.js +6 -2
- package/lib-commonjs/create/schema/index.js.map +1 -1
- package/lib-commonjs/create/schema/object.js +15 -11
- package/lib-commonjs/create/schema/object.js.map +1 -1
- package/lib-commonjs/create/schema/unknown.js.map +1 -1
- package/lib-es2015/create/schema/index.js +7 -3
- package/lib-es2015/create/schema/index.js.map +1 -1
- package/lib-es2015/create/schema/object.js +15 -11
- package/lib-es2015/create/schema/object.js.map +1 -1
- package/lib-es2015/create/schema/unknown.js.map +1 -1
- package/lib-types/create/schema/unknown.d.ts +2 -2
- package/package.json +15 -6
package/README.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<h1 align="center">zod-openapi</h1>
|
|
4
4
|
</p>
|
|
5
5
|
<p align="center">
|
|
6
|
-
A Typescript library to
|
|
6
|
+
A Typescript library to use <a href="https://github.com/colinhacks/zod">Zod</a> Schemas to create OpenAPI v3.x documentation
|
|
7
7
|
</p>
|
|
8
8
|
<div align="center">
|
|
9
9
|
<a href="https://www.npmjs.com/package/zod-openapi"><img src="https://img.shields.io/npm/v/zod-openapi"/><a>
|
|
@@ -206,7 +206,7 @@ createDocument({
|
|
|
206
206
|
|
|
207
207
|
### Request Body
|
|
208
208
|
|
|
209
|
-
Where you would normally declare the [media type](https://swagger.io/docs/specification/media-types/),
|
|
209
|
+
Where you would normally declare the [media type](https://swagger.io/docs/specification/media-types/), set the `schema` as your Zod Schema as follows.
|
|
210
210
|
|
|
211
211
|
```typescript
|
|
212
212
|
createDocument({
|
|
@@ -315,13 +315,17 @@ createDocument({
|
|
|
315
315
|
|
|
316
316
|
##### Zod Effects
|
|
317
317
|
|
|
318
|
-
`.transform()`
|
|
318
|
+
`.transform()` and `.pipe()` are complicated because they technically comprise of two types (input & output). This means that we need to understand which type you are creating. This library will automatically select which _type_ to use by checking how the schema is used based on the following rules:
|
|
319
319
|
|
|
320
|
-
|
|
320
|
+
_Input_: Request Bodies, Request Parameters, Headers
|
|
321
|
+
|
|
322
|
+
_Output_: Responses, Response Headers
|
|
323
|
+
|
|
324
|
+
If a registered schema with a transform or pipeline is used in both a request and response schema you will receive an error because the created schema for each will be different. To override the creation type for a specific ZodEffect, add an `.openapi()` field on it and set the `effectType` field to `input` or `output`. This will force this library to always generate the input/output type even if we are creating a response (output) or request (input) type. You typically want to use this when you know your transform has not changed the type.
|
|
321
325
|
|
|
322
326
|
`.preprocess()` will always return the `output` type even if we are creating an input schema. If a different input type is required you can achieve this with a `.transform()` combined with a `.pipe()` or simply declare a manual `type` in `.openapi()`.
|
|
323
327
|
|
|
324
|
-
If you are adding a ZodSchema directly to the `components` section which is not referenced anywhere in the document, additional context may be required to create either an input
|
|
328
|
+
If you are adding a ZodSchema directly to the `components` section which is not referenced anywhere in the document, additional context may be required to create either an input or output schema. You can do this by setting the `refType` field to `input` or `output` in `.openapi()`. This defaults to `output` by default.
|
|
325
329
|
|
|
326
330
|
#### Parameters
|
|
327
331
|
|
|
@@ -483,6 +487,7 @@ For example in `z.string().nullable()` will be rendered differently
|
|
|
483
487
|
|
|
484
488
|
## Supported Zod Schema
|
|
485
489
|
|
|
490
|
+
- ZodAny
|
|
486
491
|
- ZodArray
|
|
487
492
|
- `minItems`/`maxItems` mapping for `.length()`, `.min()`, `.max()`
|
|
488
493
|
- ZodBoolean
|
|
@@ -513,6 +518,7 @@ For example in `z.string().nullable()` will be rendered differently
|
|
|
513
518
|
- `allOf` mapping for `.extend()` when the base object is registered and does not have `catchall()`, `strict()` and extension does not override a field.
|
|
514
519
|
- ZodOptional
|
|
515
520
|
- ZodPipeline
|
|
521
|
+
- See [Zod Effects](#zod-effects) for more information.
|
|
516
522
|
- ZodRecord
|
|
517
523
|
- ZodSet
|
|
518
524
|
- Treated as an array with `uniqueItems` (you may need to add a pre-process)
|
|
@@ -665,7 +671,8 @@ const document = createDocument({
|
|
|
665
671
|
- Yarn 1.x
|
|
666
672
|
|
|
667
673
|
```shell
|
|
668
|
-
yarn
|
|
674
|
+
yarn
|
|
675
|
+
yarn build
|
|
669
676
|
```
|
|
670
677
|
|
|
671
678
|
### Test
|
|
@@ -138,7 +138,7 @@ const createSchemaSwitch = (zodSchema, state) => {
|
|
|
138
138
|
if (zodSchema instanceof zod_1.ZodCatch) {
|
|
139
139
|
return (0, catch_1.createCatchSchema)(zodSchema, state);
|
|
140
140
|
}
|
|
141
|
-
if (zodSchema instanceof zod_1.ZodUnknown) {
|
|
141
|
+
if (zodSchema instanceof zod_1.ZodUnknown || zodSchema instanceof zod_1.ZodAny) {
|
|
142
142
|
return (0, unknown_1.createUnknownSchema)(zodSchema);
|
|
143
143
|
}
|
|
144
144
|
if (zodSchema instanceof zod_1.ZodLazy) {
|
|
@@ -168,13 +168,17 @@ const createSchemaOrRef = (zodSchema, state, subpath) => {
|
|
|
168
168
|
};
|
|
169
169
|
}
|
|
170
170
|
const schemaRef = zodSchema._def.openapi?.ref ?? component?.ref;
|
|
171
|
+
let newState;
|
|
171
172
|
if (zodSchema._def.openapi?.ref || component?.type === 'partial') {
|
|
172
173
|
state.components.schemas.set(zodSchema, {
|
|
173
174
|
type: 'inProgress',
|
|
174
175
|
ref: (zodSchema._def.openapi?.ref ?? component?.ref),
|
|
175
176
|
});
|
|
177
|
+
newState = (0, exports.newSchemaState)({ ...state, path: [], visited: new Set() });
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
newState = (0, exports.newSchemaState)(state);
|
|
176
181
|
}
|
|
177
|
-
const newState = (0, exports.newSchemaState)(state);
|
|
178
182
|
const schemaOrRef = (0, exports.createSchema)(zodSchema, newState, subpath);
|
|
179
183
|
if (newState.effectType) {
|
|
180
184
|
if (state.effectType && newState.effectType !== state.effectType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/create/schema/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/create/schema/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,17 +73,21 @@ const createShapeDiff = (baseObj, extendedObj) => {
|
|
|
73
73
|
}
|
|
74
74
|
return acc;
|
|
75
75
|
};
|
|
76
|
-
const createObjectSchemaFromShape = (shape, { unknownKeys, catchAll }, state) =>
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
76
|
+
const createObjectSchemaFromShape = (shape, { unknownKeys, catchAll }, state) => {
|
|
77
|
+
const properties = (0, exports.mapProperties)(shape, state);
|
|
78
|
+
const required = (0, exports.mapRequired)(shape, state);
|
|
79
|
+
return {
|
|
80
|
+
type: 'object',
|
|
81
|
+
...(properties && { properties }),
|
|
82
|
+
...(required && { required }),
|
|
83
|
+
...(unknownKeys === 'strict' && { additionalProperties: false }),
|
|
84
|
+
...(!(catchAll instanceof zod_1.ZodNever) && {
|
|
85
|
+
additionalProperties: (0, _1.createSchemaOrRef)(catchAll, state, [
|
|
86
|
+
'additional properties',
|
|
87
|
+
]),
|
|
88
|
+
}),
|
|
89
|
+
};
|
|
90
|
+
};
|
|
87
91
|
exports.createObjectSchemaFromShape = createObjectSchemaFromShape;
|
|
88
92
|
const mapRequired = (shape, state) => {
|
|
89
93
|
const required = Object.entries(shape)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../src/create/schema/object.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../src/create/schema/object.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unknown.js","sourceRoot":"","sources":["../../../src/create/schema/unknown.ts"],"names":[],"mappings":";;;AAIO,MAAM,mBAAmB,GAAG,CACjC,
|
|
1
|
+
{"version":3,"file":"unknown.js","sourceRoot":"","sources":["../../../src/create/schema/unknown.ts"],"names":[],"mappings":";;;AAIO,MAAM,mBAAmB,GAAG,CACjC,WAAgC,EACZ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;AAFjB,QAAA,mBAAmB,uBAEF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ZodArray, ZodBoolean, ZodBranded, ZodCatch, ZodDate, ZodDefault, ZodDiscriminatedUnion, ZodEffects, ZodEnum, ZodIntersection, ZodLazy, ZodLiteral, ZodNativeEnum, ZodNull, ZodNullable, ZodNumber, ZodObject, ZodOptional, ZodPipeline, ZodRecord, ZodSet, ZodString, ZodTuple, ZodUnion, ZodUnknown, } from 'zod';
|
|
1
|
+
import { ZodAny, ZodArray, ZodBoolean, ZodBranded, ZodCatch, ZodDate, ZodDefault, ZodDiscriminatedUnion, ZodEffects, ZodEnum, ZodIntersection, ZodLazy, ZodLiteral, ZodNativeEnum, ZodNull, ZodNullable, ZodNumber, ZodObject, ZodOptional, ZodPipeline, ZodRecord, ZodSet, ZodString, ZodTuple, ZodUnion, ZodUnknown, } from 'zod';
|
|
2
2
|
import { createComponentSchemaRef, } from '../components';
|
|
3
3
|
import { createArraySchema } from './array';
|
|
4
4
|
import { createBooleanSchema } from './boolean';
|
|
@@ -132,7 +132,7 @@ const createSchemaSwitch = (zodSchema, state) => {
|
|
|
132
132
|
if (zodSchema instanceof ZodCatch) {
|
|
133
133
|
return createCatchSchema(zodSchema, state);
|
|
134
134
|
}
|
|
135
|
-
if (zodSchema instanceof ZodUnknown) {
|
|
135
|
+
if (zodSchema instanceof ZodUnknown || zodSchema instanceof ZodAny) {
|
|
136
136
|
return createUnknownSchema(zodSchema);
|
|
137
137
|
}
|
|
138
138
|
if (zodSchema instanceof ZodLazy) {
|
|
@@ -162,13 +162,17 @@ export const createSchemaOrRef = (zodSchema, state, subpath) => {
|
|
|
162
162
|
};
|
|
163
163
|
}
|
|
164
164
|
const schemaRef = zodSchema._def.openapi?.ref ?? component?.ref;
|
|
165
|
+
let newState;
|
|
165
166
|
if (zodSchema._def.openapi?.ref || component?.type === 'partial') {
|
|
166
167
|
state.components.schemas.set(zodSchema, {
|
|
167
168
|
type: 'inProgress',
|
|
168
169
|
ref: (zodSchema._def.openapi?.ref ?? component?.ref),
|
|
169
170
|
});
|
|
171
|
+
newState = newSchemaState({ ...state, path: [], visited: new Set() });
|
|
172
|
+
}
|
|
173
|
+
else {
|
|
174
|
+
newState = newSchemaState(state);
|
|
170
175
|
}
|
|
171
|
-
const newState = newSchemaState(state);
|
|
172
176
|
const schemaOrRef = createSchema(zodSchema, newState, subpath);
|
|
173
177
|
if (newState.effectType) {
|
|
174
178
|
if (state.effectType && newState.effectType !== state.effectType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/create/schema/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/create/schema/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,17 +68,21 @@ const createShapeDiff = (baseObj, extendedObj) => {
|
|
|
68
68
|
}
|
|
69
69
|
return acc;
|
|
70
70
|
};
|
|
71
|
-
export const createObjectSchemaFromShape = (shape, { unknownKeys, catchAll }, state) =>
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
71
|
+
export const createObjectSchemaFromShape = (shape, { unknownKeys, catchAll }, state) => {
|
|
72
|
+
const properties = mapProperties(shape, state);
|
|
73
|
+
const required = mapRequired(shape, state);
|
|
74
|
+
return {
|
|
75
|
+
type: 'object',
|
|
76
|
+
...(properties && { properties }),
|
|
77
|
+
...(required && { required }),
|
|
78
|
+
...(unknownKeys === 'strict' && { additionalProperties: false }),
|
|
79
|
+
...(!(catchAll instanceof ZodNever) && {
|
|
80
|
+
additionalProperties: createSchemaOrRef(catchAll, state, [
|
|
81
|
+
'additional properties',
|
|
82
|
+
]),
|
|
83
|
+
}),
|
|
84
|
+
};
|
|
85
|
+
};
|
|
82
86
|
export const mapRequired = (shape, state) => {
|
|
83
87
|
const required = Object.entries(shape)
|
|
84
88
|
.filter(([_key, zodSchema]) => !isOptionalSchema(zodSchema, state))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../src/create/schema/object.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../src/create/schema/object.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unknown.js","sourceRoot":"","sources":["../../../src/create/schema/unknown.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,
|
|
1
|
+
{"version":3,"file":"unknown.js","sourceRoot":"","sources":["../../../src/create/schema/unknown.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,WAAgC,EACZ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { ZodUnknown } from 'zod';
|
|
1
|
+
import type { ZodAny, ZodUnknown } from 'zod';
|
|
2
2
|
import type { oas31 } from '../../openapi3-ts/dist';
|
|
3
|
-
export declare const createUnknownSchema: (_zodUnknown: ZodUnknown) => oas31.SchemaObject;
|
|
3
|
+
export declare const createUnknownSchema: (_zodUnknown: ZodUnknown | ZodAny) => oas31.SchemaObject;
|
package/package.json
CHANGED
|
@@ -1,7 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zod-openapi",
|
|
3
|
-
"version": "2.
|
|
4
|
-
"description": "
|
|
3
|
+
"version": "2.6.0",
|
|
4
|
+
"description": "Convert Zod Schemas to OpenAPI v3.x documentation",
|
|
5
|
+
"keywords": [
|
|
6
|
+
"typescript",
|
|
7
|
+
"json-schema",
|
|
8
|
+
"swagger",
|
|
9
|
+
"openapi",
|
|
10
|
+
"openapi3",
|
|
11
|
+
"zod",
|
|
12
|
+
"zod-openapi"
|
|
13
|
+
],
|
|
5
14
|
"homepage": "https://github.com/samchungy/zod-openapi#readme",
|
|
6
15
|
"bugs": {
|
|
7
16
|
"url": "https://github.com/samchungy/zod-openapi/issues"
|
|
@@ -28,19 +37,19 @@
|
|
|
28
37
|
"format": "skuba format",
|
|
29
38
|
"lint": "skuba lint",
|
|
30
39
|
"prepare": "yarn build",
|
|
31
|
-
"release": "yarn build && npm publish",
|
|
40
|
+
"release": "yarn build && npm publish --provenance",
|
|
32
41
|
"test": "skuba test",
|
|
33
42
|
"test:ci": "skuba test --coverage",
|
|
34
43
|
"test:watch": "skuba test --watch"
|
|
35
44
|
},
|
|
36
45
|
"dependencies": {},
|
|
37
46
|
"devDependencies": {
|
|
38
|
-
"@redocly/cli": "1.0.0-beta.
|
|
39
|
-
"@types/node": "^20.
|
|
47
|
+
"@redocly/cli": "1.0.0-beta.128",
|
|
48
|
+
"@types/node": "^20.3.0",
|
|
40
49
|
"eslint-plugin-zod-openapi": "^0.1.0",
|
|
41
50
|
"openapi3-ts": "4.1.2",
|
|
42
51
|
"skuba": "6.2.0",
|
|
43
|
-
"yaml": "2.
|
|
52
|
+
"yaml": "2.3.1",
|
|
44
53
|
"zod": "3.21.4"
|
|
45
54
|
},
|
|
46
55
|
"peerDependencies": {
|