zod-openapi 0.3.0 → 0.4.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/LICENSE +1 -1
- package/README.md +19 -1
- package/lib-commonjs/create/components.js +11 -5
- package/lib-commonjs/create/components.js.map +1 -1
- package/lib-commonjs/create/document.js +1 -1
- package/lib-commonjs/create/document.js.map +1 -1
- package/lib-commonjs/create/schema/index.js +115 -132
- package/lib-commonjs/create/schema/index.js.map +1 -1
- package/lib-commonjs/create/schema/nativeEnum.js +11 -3
- package/lib-commonjs/create/schema/nativeEnum.js.map +1 -1
- package/lib-commonjs/create/schema/nullable.js +20 -16
- package/lib-commonjs/create/schema/nullable.js.map +1 -1
- package/lib-commonjs/create/schema/number.js +12 -5
- package/lib-commonjs/create/schema/number.js.map +1 -1
- package/lib-commonjs/create/schema/tuple.js +25 -5
- package/lib-commonjs/create/schema/tuple.js.map +1 -1
- package/lib-commonjs/extendZod.js.map +1 -1
- package/lib-commonjs/openapi.js +13 -0
- package/lib-commonjs/openapi.js.map +1 -0
- package/lib-es2015/create/components.js +11 -5
- package/lib-es2015/create/components.js.map +1 -1
- package/lib-es2015/create/document.js +1 -1
- package/lib-es2015/create/document.js.map +1 -1
- package/lib-es2015/create/schema/index.js +3 -3
- package/lib-es2015/create/schema/index.js.map +1 -1
- package/lib-es2015/create/schema/nativeEnum.js +11 -3
- package/lib-es2015/create/schema/nativeEnum.js.map +1 -1
- package/lib-es2015/create/schema/nullable.js +20 -15
- package/lib-es2015/create/schema/nullable.js.map +1 -1
- package/lib-es2015/create/schema/number.js +12 -5
- package/lib-es2015/create/schema/number.js.map +1 -1
- package/lib-es2015/create/schema/tuple.js +25 -5
- package/lib-es2015/create/schema/tuple.js.map +1 -1
- package/lib-es2015/extendZod.js.map +1 -1
- package/lib-es2015/openapi.js +9 -0
- package/lib-es2015/openapi.js.map +1 -0
- package/lib-types/create/components.d.ts +7 -6
- package/lib-types/create/document.d.ts +12 -11
- package/lib-types/create/schema/nativeEnum.d.ts +2 -1
- package/lib-types/create/schema/nullable.d.ts +0 -1
- package/lib-types/create/schema/number.d.ts +2 -1
- package/lib-types/extendZod.d.ts +5 -3
- package/lib-types/openapi.d.ts +3 -0
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extendZod.js","sourceRoot":"","sources":["../src/extendZod.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"extendZod.js","sourceRoot":"","sources":["../src/extendZod.ts"],"names":[],"mappings":";;;AA4DA,SAAgB,oBAAoB,CAAC,GAAa;IAChD,IAAI,OAAO,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,KAAK,WAAW,EAAE;QAC1D,OAAO;KACR;IACD,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,GAAG,UAAU,OAAO;QACjD,kJAAkJ;QAClJ,MAAM,MAAM,GAAG,IAAK,IAAY,CAAC,WAAW,CAAC;YAC3C,GAAG,IAAI,CAAC,IAAI;YACZ,OAAO;SACR,CAAC,CAAC;QAEH,+DAA+D;QAC/D,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,6DAA6D;IAC7D,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC;IAEvD,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,UAC/B,GAAG,IAAiC;QAEpC,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACvD,YAAY,CAAC,IAAI,CAAC,cAAc,GAAG;YACjC,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG;SAC3C,CAAC;QACF,OAAO,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;QACjC,+DAA+D;QAC/D,OAAO,YAAmB,CAAC;IAC7B,CAAC,CAAC;IAEF,6DAA6D;IAC7D,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;IAEnD,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,GAAG,UAC7B,GAAG,IAA+C;QAElD,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACnD,OAAO,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC;QACtC,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC;QAC/B,+DAA+D;QAC/D,OAAO,UAAiB,CAAC;IAC3B,CAAC,CAAC;IAEF,6DAA6D;IAC7D,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;IAEnD,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,GAAG,UAC7B,GAAG,IAA+C;QAElD,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACnD,OAAO,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC;QACtC,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC;QAC/B,+DAA+D;QAC/D,OAAO,UAAiB,CAAC;IAC3B,CAAC,CAAC;AACJ,CAAC;AAxDD,oDAwDC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.satisfiesVersion = exports.openApiVersions = void 0;
|
|
4
|
+
exports.openApiVersions = [
|
|
5
|
+
'3.0.0',
|
|
6
|
+
'3.0.1',
|
|
7
|
+
'3.0.2',
|
|
8
|
+
'3.0.3',
|
|
9
|
+
'3.1.0',
|
|
10
|
+
];
|
|
11
|
+
const satisfiesVersion = (test, against) => exports.openApiVersions.indexOf(test) >= exports.openApiVersions.indexOf(against);
|
|
12
|
+
exports.satisfiesVersion = satisfiesVersion;
|
|
13
|
+
//# sourceMappingURL=openapi.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openapi.js","sourceRoot":"","sources":["../src/openapi.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG;IAC7B,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;CACC,CAAC;AAIJ,MAAM,gBAAgB,GAAG,CAC9B,IAAoB,EACpB,OAAuB,EACvB,EAAE,CAAC,uBAAe,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,uBAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAH1D,QAAA,gBAAgB,oBAG0C"}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
import { ZodType } from 'zod';
|
|
2
2
|
import { createSchemaWithMetadata } from './schema/metadata';
|
|
3
|
-
export const getDefaultComponents = (componentsObject) => {
|
|
4
|
-
const defaultComponents = {
|
|
3
|
+
export const getDefaultComponents = (componentsObject, openapi = '3.1.0') => {
|
|
4
|
+
const defaultComponents = {
|
|
5
|
+
schemas: {},
|
|
6
|
+
parameters: {},
|
|
7
|
+
headers: {},
|
|
8
|
+
openapi,
|
|
9
|
+
};
|
|
5
10
|
if (!componentsObject) {
|
|
6
11
|
return defaultComponents;
|
|
7
12
|
}
|
|
@@ -15,18 +20,19 @@ const createSchemas = (schemas, components) => {
|
|
|
15
20
|
return;
|
|
16
21
|
}
|
|
17
22
|
return Object.entries(schemas).forEach(([key, schema]) => {
|
|
23
|
+
const ref = schema instanceof ZodType ? schema._def.openapi?.ref ?? key : key;
|
|
18
24
|
const component = components.schemas[key];
|
|
19
25
|
if (component) {
|
|
20
|
-
throw new Error(`schemaRef "${
|
|
26
|
+
throw new Error(`schemaRef "${ref}" is already registered`);
|
|
21
27
|
}
|
|
22
28
|
if (schema instanceof ZodType) {
|
|
23
|
-
components.schemas[
|
|
29
|
+
components.schemas[ref] = {
|
|
24
30
|
schemaObject: createSchemaWithMetadata(schema, components),
|
|
25
31
|
zodSchema: schema,
|
|
26
32
|
};
|
|
27
33
|
return;
|
|
28
34
|
}
|
|
29
|
-
components.schemas[
|
|
35
|
+
components.schemas[ref] = {
|
|
30
36
|
schemaObject: schema,
|
|
31
37
|
};
|
|
32
38
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/create/components.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAG9B,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/create/components.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { createComponents, getDefaultComponents } from './components';
|
|
|
3
3
|
import { createPaths } from './paths';
|
|
4
4
|
export const createDocument = (zodOpenApiObject) => {
|
|
5
5
|
const { schemas, parameters, headers, ...rest } = zodOpenApiObject.components ?? {};
|
|
6
|
-
const components = getDefaultComponents({ headers, schemas, parameters });
|
|
6
|
+
const components = getDefaultComponents({ headers, schemas, parameters }, zodOpenApiObject.openapi);
|
|
7
7
|
return {
|
|
8
8
|
...zodOpenApiObject,
|
|
9
9
|
paths: createPaths(zodOpenApiObject.paths, components),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.js","sourceRoot":"","sources":["../../src/create/document.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAGjC,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"document.js","sourceRoot":"","sources":["../../src/create/document.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAGjC,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AA4FtC,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,gBAAkC,EACb,EAAE;IACvB,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAC7C,gBAAgB,CAAC,UAAU,IAAI,EAAE,CAAC;IACpC,MAAM,UAAU,GAAG,oBAAoB,CACrC,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,EAChC,gBAAgB,CAAC,OAAO,CACzB,CAAC;IAEF,OAAO;QACL,GAAG,gBAAgB;QACnB,KAAK,EAAE,WAAW,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAC;QACtD,QAAQ,EAAE,WAAW,CAAC,gBAAgB,CAAC,QAAQ,EAAE,UAAU,CAAC;QAC5D,UAAU,EAAE,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC;KAC/C,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAwB,EACxB,WAGC,EACO,EAAE;IACV,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACxC,OAAO,IAAI,CAAC,SAAS,CACnB,QAAQ,EACR,WAAW,EAAE,QAAQ,EACrB,WAAW,EAAE,OAAO,IAAI,CAAC,CAC1B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAwB,EACxB,cAGI,EAAE,EACE,EAAE;IACV,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACxC,OAAO,SAAS,CAAC,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;AACxE,CAAC,CAAC"}
|
|
@@ -25,7 +25,7 @@ export const createSchema = (zodSchema, components) => {
|
|
|
25
25
|
return createStringSchema(zodSchema);
|
|
26
26
|
}
|
|
27
27
|
if (zodSchema instanceof ZodNumber) {
|
|
28
|
-
return createNumberSchema(zodSchema);
|
|
28
|
+
return createNumberSchema(zodSchema, components);
|
|
29
29
|
}
|
|
30
30
|
if (zodSchema instanceof ZodBoolean) {
|
|
31
31
|
return createBooleanSchema(zodSchema);
|
|
@@ -37,7 +37,7 @@ export const createSchema = (zodSchema, components) => {
|
|
|
37
37
|
return createLiteralSchema(zodSchema);
|
|
38
38
|
}
|
|
39
39
|
if (zodSchema instanceof ZodNativeEnum) {
|
|
40
|
-
return createNativeEnumSchema(zodSchema);
|
|
40
|
+
return createNativeEnumSchema(zodSchema, components);
|
|
41
41
|
}
|
|
42
42
|
if (zodSchema instanceof ZodArray) {
|
|
43
43
|
return createArraySchema(zodSchema, components);
|
|
@@ -78,7 +78,7 @@ export const createSchema = (zodSchema, components) => {
|
|
|
78
78
|
return createEffectsSchema(zodSchema, components);
|
|
79
79
|
}
|
|
80
80
|
if (zodSchema instanceof ZodNativeEnum) {
|
|
81
|
-
return createNativeEnumSchema(zodSchema);
|
|
81
|
+
return createNativeEnumSchema(zodSchema, components);
|
|
82
82
|
}
|
|
83
83
|
if (zodSchema instanceof ZodIntersection) {
|
|
84
84
|
return createIntersectionSchema(zodSchema, components);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/create/schema/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,UAAU,EACV,OAAO,EACP,UAAU,EACV,qBAAqB,EACrB,UAAU,EACV,OAAO,EACP,eAAe,EACf,UAAU,EACV,aAAa,EACb,OAAO,EACP,WAAW,EACX,SAAS,EACT,SAAS,EACT,WAAW,EACX,SAAS,EACT,SAAS,EACT,QAAQ,EAGR,QAAQ,GACT,MAAM,KAAK,CAAC;AAEb,OAAO,EAAoB,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAE3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,MAAM,CAAC,MAAM,YAAY,GAAG,CAK1B,SAAsC,EACtC,UAA4B,EACgB,EAAE;IAC9C,IAAI,SAAS,YAAY,SAAS,EAAE;QAClC,OAAO,kBAAkB,CAAC,SAAS,CAAC,CAAC;KACtC;IAED,IAAI,SAAS,YAAY,SAAS,EAAE;QAClC,OAAO,kBAAkB,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/create/schema/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,18 @@
|
|
|
1
|
-
|
|
1
|
+
import { satisfiesVersion } from '../../openapi';
|
|
2
|
+
export const createNativeEnumSchema = (zodEnum, components) => {
|
|
2
3
|
const enumValues = getValidEnumValues(zodEnum._def.values);
|
|
3
4
|
const { numbers, strings } = sortStringsAndNumbers(enumValues);
|
|
4
5
|
if (strings.length && numbers.length) {
|
|
6
|
+
if (satisfiesVersion(components.openapi, '3.1.0'))
|
|
7
|
+
return {
|
|
8
|
+
type: ['string', 'number'],
|
|
9
|
+
enum: [...strings, ...numbers],
|
|
10
|
+
};
|
|
5
11
|
return {
|
|
6
|
-
|
|
7
|
-
|
|
12
|
+
oneOf: [
|
|
13
|
+
{ type: 'string', enum: strings },
|
|
14
|
+
{ type: 'number', enum: numbers },
|
|
15
|
+
],
|
|
8
16
|
};
|
|
9
17
|
}
|
|
10
18
|
if (strings.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nativeEnum.js","sourceRoot":"","sources":["../../../src/create/schema/nativeEnum.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,OAAyB,
|
|
1
|
+
{"version":3,"file":"nativeEnum.js","sourceRoot":"","sources":["../../../src/create/schema/nativeEnum.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,OAAyB,EACzB,UAA4B,EACgB,EAAE;IAC9C,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3D,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAE/D,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE;QACpC,IAAI,gBAAgB,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC;YAC/C,OAAO;gBACL,IAAI,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;gBAC1B,IAAI,EAAE,CAAC,GAAG,OAAO,EAAE,GAAG,OAAO,CAAC;aAC/B,CAAC;QACJ,OAAO;YACL,KAAK,EAAE;gBACL,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE;gBACjC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE;aAClC;SACF,CAAC;KACH;IAED,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;SACd,CAAC;KACH;IAED,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,OAAO;KACd,CAAC;AACJ,CAAC,CAAC;AAOF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,UAAoB,EAAE,EAAE;IACzD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CACzC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,QAAQ,CACzD,CAAC;IACF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAC5C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,MAA2B,EACR,EAAE,CAAC,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC;IAC7E,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC;CAC9E,CAAC,CAAC"}
|
|
@@ -1,37 +1,40 @@
|
|
|
1
|
+
import { satisfiesVersion } from '../../openapi';
|
|
1
2
|
import { createSchemaOrRef } from '.';
|
|
2
3
|
export const createNullableSchema = (zodNullable, components) => {
|
|
3
4
|
const schemaOrReference = createSchemaOrRef(zodNullable.unwrap(), components);
|
|
4
|
-
if ('$ref' in schemaOrReference) {
|
|
5
|
+
if ('$ref' in schemaOrReference || schemaOrReference.allOf) {
|
|
5
6
|
return {
|
|
6
|
-
oneOf: mapNullOf([schemaOrReference]),
|
|
7
|
+
oneOf: mapNullOf([schemaOrReference], components.openapi),
|
|
7
8
|
};
|
|
8
9
|
}
|
|
9
10
|
if (schemaOrReference.oneOf) {
|
|
10
11
|
const { oneOf, ...schema } = schemaOrReference;
|
|
11
12
|
return {
|
|
12
|
-
oneOf: mapNullOf(oneOf),
|
|
13
|
+
oneOf: mapNullOf(oneOf, components.openapi),
|
|
13
14
|
...schema,
|
|
14
15
|
};
|
|
15
16
|
}
|
|
16
|
-
if (schemaOrReference.allOf) {
|
|
17
|
-
return {
|
|
18
|
-
oneOf: [schemaOrReference, { type: 'null' }],
|
|
19
|
-
};
|
|
20
|
-
}
|
|
21
17
|
if (schemaOrReference.anyOf) {
|
|
22
18
|
const { anyOf, ...schema } = schemaOrReference;
|
|
23
19
|
return {
|
|
24
|
-
anyOf: mapNullOf(anyOf),
|
|
20
|
+
anyOf: mapNullOf(anyOf, components.openapi),
|
|
25
21
|
...schema,
|
|
26
22
|
};
|
|
27
23
|
}
|
|
28
24
|
const { type, ...schema } = schemaOrReference;
|
|
25
|
+
if (satisfiesVersion(components.openapi, '3.1.0')) {
|
|
26
|
+
return {
|
|
27
|
+
type: mapNullType(type),
|
|
28
|
+
...schema,
|
|
29
|
+
};
|
|
30
|
+
}
|
|
29
31
|
return {
|
|
30
|
-
type
|
|
32
|
+
type,
|
|
33
|
+
nullable: true,
|
|
31
34
|
...schema,
|
|
32
35
|
};
|
|
33
36
|
};
|
|
34
|
-
|
|
37
|
+
const mapNullType = (type) => {
|
|
35
38
|
if (!type) {
|
|
36
39
|
return 'null';
|
|
37
40
|
}
|
|
@@ -40,8 +43,10 @@ export const mapNullType = (type) => {
|
|
|
40
43
|
}
|
|
41
44
|
return [type, 'null'];
|
|
42
45
|
};
|
|
43
|
-
const mapNullOf = (ofSchema) =>
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
46
|
+
const mapNullOf = (ofSchema, openapi) => {
|
|
47
|
+
if (satisfiesVersion(openapi, '3.1.0')) {
|
|
48
|
+
return [...ofSchema, { type: 'null' }];
|
|
49
|
+
}
|
|
50
|
+
return [...ofSchema, { nullable: true }];
|
|
51
|
+
};
|
|
47
52
|
//# sourceMappingURL=nullable.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nullable.js","sourceRoot":"","sources":["../../../src/create/schema/nullable.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"nullable.js","sourceRoot":"","sources":["../../../src/create/schema/nullable.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,GAAG,CAAC;AAEtC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,WAA6B,EAC7B,UAA4B,EACR,EAAE;IACtB,MAAM,iBAAiB,GAAG,iBAAiB,CACzC,WAAW,CAAC,MAAM,EAAgB,EAClC,UAAU,CACX,CAAC;IAEF,IAAI,MAAM,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,KAAK,EAAE;QAC1D,OAAO;YACL,KAAK,EAAE,SAAS,CAAC,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC;SAC1D,CAAC;KACH;IAED,IAAI,iBAAiB,CAAC,KAAK,EAAE;QAC3B,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,EAAE,GAAG,iBAAiB,CAAC;QAC/C,OAAO;YACL,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC;YAC3C,GAAG,MAAM;SACV,CAAC;KACH;IAED,IAAI,iBAAiB,CAAC,KAAK,EAAE;QAC3B,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,EAAE,GAAG,iBAAiB,CAAC;QAC/C,OAAO;YACL,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC;YAC3C,GAAG,MAAM;SACV,CAAC;KACH;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,GAAG,iBAAiB,CAAC;IAE9C,IAAI,gBAAgB,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;QACjD,OAAO;YACL,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC;YACvB,GAAG,MAAM;SACV,CAAC;KACH;IAED,OAAO;QACL,IAAI;QACJ,QAAQ,EAAE,IAAI;QACd,GAAG,MAAM;KACV,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAClB,IAAgC,EACJ,EAAE;IAC9B,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,MAAM,CAAC;KACf;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC;KAC1B;IAED,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAChB,QAAwD,EACxD,OAA0B,EACsB,EAAE;IAClD,IAAI,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;QACtC,OAAO,CAAC,GAAG,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;KACxC;IACD,OAAO,CAAC,GAAG,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AAC3C,CAAC,CAAC"}
|
|
@@ -1,18 +1,25 @@
|
|
|
1
|
-
|
|
1
|
+
import { satisfiesVersion } from '../../openapi';
|
|
2
|
+
export const createNumberSchema = (zodNumber, components) => {
|
|
2
3
|
const zodNumberChecks = getZodNumberChecks(zodNumber);
|
|
3
4
|
return {
|
|
4
5
|
type: mapNumberType(zodNumberChecks),
|
|
5
|
-
...mapRanges(zodNumberChecks),
|
|
6
|
+
...mapRanges(zodNumberChecks, components.openapi), // union types are too pesky to drill through
|
|
6
7
|
};
|
|
7
8
|
};
|
|
8
|
-
const mapRanges = (zodNumberChecks) => {
|
|
9
|
+
const mapRanges = (zodNumberChecks, openapi) => {
|
|
9
10
|
const minimum = zodNumberChecks.min?.value;
|
|
10
11
|
const maximum = zodNumberChecks.max?.value;
|
|
12
|
+
const exclusiveMinimum = zodNumberChecks.min?.inclusive;
|
|
13
|
+
const exclusiveMaximum = zodNumberChecks.max?.inclusive;
|
|
11
14
|
return {
|
|
12
15
|
...(minimum !== undefined && { minimum }),
|
|
13
16
|
...(maximum !== undefined && { maximum }),
|
|
14
|
-
...(
|
|
15
|
-
|
|
17
|
+
...(exclusiveMinimum && {
|
|
18
|
+
exclusiveMinimum: satisfiesVersion(openapi, '3.1.0') ? minimum : true,
|
|
19
|
+
}),
|
|
20
|
+
...(exclusiveMaximum && {
|
|
21
|
+
exclusiveMaximum: satisfiesVersion(openapi, '3.1.0') ? maximum : true,
|
|
22
|
+
}),
|
|
16
23
|
};
|
|
17
24
|
};
|
|
18
25
|
const getZodNumberChecks = (zodNumber) => zodNumber._def.checks.reduce((acc, check) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"number.js","sourceRoot":"","sources":["../../../src/create/schema/number.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,SAAoB,
|
|
1
|
+
{"version":3,"file":"number.js","sourceRoot":"","sources":["../../../src/create/schema/number.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIjD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,SAAoB,EACpB,UAA4B,EACR,EAAE;IACtB,MAAM,eAAe,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAEtD,OAAO;QACL,IAAI,EAAE,aAAa,CAAC,eAAe,CAAC;QACpC,GAAI,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC,OAAO,CAAwB,EAAE,6CAA6C;KACzH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAChB,eAAkC,EAClC,OAA0B,EAI1B,EAAE;IACF,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC;IAC3C,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC;IAE3C,MAAM,gBAAgB,GAAG,eAAe,CAAC,GAAG,EAAE,SAAS,CAAC;IACxD,MAAM,gBAAgB,GAAG,eAAe,CAAC,GAAG,EAAE,SAAS,CAAC;IAExD,OAAO;QACL,GAAG,CAAC,OAAO,KAAK,SAAS,IAAI,EAAE,OAAO,EAAE,CAAC;QACzC,GAAG,CAAC,OAAO,KAAK,SAAS,IAAI,EAAE,OAAO,EAAE,CAAC;QACzC,GAAG,CAAC,gBAAgB,IAAI;YACtB,gBAAgB,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;SACtE,CAAC;QACF,GAAG,CAAC,gBAAgB,IAAI;YACtB,gBAAgB,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;SACtE,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAMF,MAAM,kBAAkB,GAAG,CAAC,SAAoB,EAAqB,EAAE,CACrE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;IAC7D,mEAAmE;IACnE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAY,CAAC;IAC/B,OAAO,GAAG,CAAC;AACb,CAAC,EAAE,EAAE,CAAC,CAAC;AAET,MAAM,aAAa,GAAG,CACpB,eAAkC,EACN,EAAE,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC"}
|
|
@@ -1,25 +1,45 @@
|
|
|
1
|
+
import { satisfiesVersion } from '../../openapi';
|
|
1
2
|
import { createSchemaOrRef } from '.';
|
|
2
3
|
export const createTupleSchema = (zodTuple, components) => {
|
|
3
4
|
const items = zodTuple.items;
|
|
4
5
|
const rest = zodTuple._def.rest;
|
|
5
6
|
return {
|
|
6
7
|
type: 'array',
|
|
7
|
-
...mapPrefixItems(items, components),
|
|
8
8
|
...mapItemProperties(items, rest, components),
|
|
9
9
|
};
|
|
10
10
|
};
|
|
11
|
-
const mapPrefixItems = (items, components) =>
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
const mapPrefixItems = (items, components) => {
|
|
12
|
+
if (items.length) {
|
|
13
|
+
return items.map((item) => createSchemaOrRef(item, components));
|
|
14
|
+
}
|
|
15
|
+
return undefined;
|
|
16
|
+
};
|
|
14
17
|
const mapItemProperties = (items, rest, components) => {
|
|
18
|
+
const prefixItems = mapPrefixItems(items, components);
|
|
19
|
+
if (satisfiesVersion(components.openapi, '3.1.0')) {
|
|
20
|
+
if (!rest) {
|
|
21
|
+
return {
|
|
22
|
+
maxItems: items.length,
|
|
23
|
+
minItems: items.length,
|
|
24
|
+
...(prefixItems && { prefixItems }),
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
return {
|
|
28
|
+
items: createSchemaOrRef(rest, components),
|
|
29
|
+
...(prefixItems && { prefixItems }),
|
|
30
|
+
};
|
|
31
|
+
}
|
|
15
32
|
if (!rest) {
|
|
16
33
|
return {
|
|
17
34
|
maxItems: items.length,
|
|
18
35
|
minItems: items.length,
|
|
36
|
+
...(prefixItems && { items: { oneOf: prefixItems } }),
|
|
19
37
|
};
|
|
20
38
|
}
|
|
21
39
|
return {
|
|
22
|
-
|
|
40
|
+
...(prefixItems && {
|
|
41
|
+
items: { oneOf: [...prefixItems, createSchemaOrRef(rest, components)] },
|
|
42
|
+
}),
|
|
23
43
|
};
|
|
24
44
|
};
|
|
25
45
|
//# sourceMappingURL=tuple.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tuple.js","sourceRoot":"","sources":["../../../src/create/schema/tuple.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tuple.js","sourceRoot":"","sources":["../../../src/create/schema/tuple.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,GAAG,CAAC;AAEtC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,QAA4B,EAC5B,UAA4B,EACR,EAAE;IACtB,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAqB,CAAC;IAC7C,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAkB,CAAC;IAC9C,OAAO;QACL,IAAI,EAAE,OAAO;QACb,GAAG,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,UAAU,CAAC;KACxB,CAAC;AAC1B,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CACrB,KAAmB,EACnB,UAA4B,EACmB,EAAE;IACjD,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;KACjE;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CACxB,KAAmB,EACnB,IAAgB,EAChB,UAA4B,EAI5B,EAAE;IACF,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAEtD,IAAI,gBAAgB,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;QACjD,IAAI,CAAC,IAAI,EAAE;YACT,OAAO;gBACL,QAAQ,EAAE,KAAK,CAAC,MAAM;gBACtB,QAAQ,EAAE,KAAK,CAAC,MAAM;gBACtB,GAAG,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,CAAC;aACpC,CAAC;SACH;QAED,OAAO;YACL,KAAK,EAAE,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC;YAC1C,GAAG,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,CAAC;SACpC,CAAC;KACH;IAED,IAAI,CAAC,IAAI,EAAE;QACT,OAAO;YACL,QAAQ,EAAE,KAAK,CAAC,MAAM;YACtB,QAAQ,EAAE,KAAK,CAAC,MAAM;YACtB,GAAG,CAAC,WAAW,IAAI,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,CAAC;SACtD,CAAC;KACH;IAED,OAAO;QACL,GAAG,CAAC,WAAW,IAAI;YACjB,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,WAAW,EAAE,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,EAAE;SACxE,CAAC;KACH,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extendZod.js","sourceRoot":"","sources":["../src/extendZod.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"extendZod.js","sourceRoot":"","sources":["../src/extendZod.ts"],"names":[],"mappings":"AA4DA,MAAM,UAAU,oBAAoB,CAAC,GAAa;IAChD,IAAI,OAAO,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,KAAK,WAAW,EAAE;QAC1D,OAAO;KACR;IACD,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,GAAG,UAAU,OAAO;QACjD,kJAAkJ;QAClJ,MAAM,MAAM,GAAG,IAAK,IAAY,CAAC,WAAW,CAAC;YAC3C,GAAG,IAAI,CAAC,IAAI;YACZ,OAAO;SACR,CAAC,CAAC;QAEH,+DAA+D;QAC/D,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,6DAA6D;IAC7D,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC;IAEvD,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,UAC/B,GAAG,IAAiC;QAEpC,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACvD,YAAY,CAAC,IAAI,CAAC,cAAc,GAAG;YACjC,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG;SAC3C,CAAC;QACF,OAAO,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;QACjC,+DAA+D;QAC/D,OAAO,YAAmB,CAAC;IAC7B,CAAC,CAAC;IAEF,6DAA6D;IAC7D,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;IAEnD,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,GAAG,UAC7B,GAAG,IAA+C;QAElD,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACnD,OAAO,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC;QACtC,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC;QAC/B,+DAA+D;QAC/D,OAAO,UAAiB,CAAC;IAC3B,CAAC,CAAC;IAEF,6DAA6D;IAC7D,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;IAEnD,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,GAAG,UAC7B,GAAG,IAA+C;QAElD,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACnD,OAAO,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC;QACtC,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC;QAC/B,+DAA+D;QAC/D,OAAO,UAAiB,CAAC;IAC3B,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openapi.js","sourceRoot":"","sources":["../src/openapi.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;CACC,CAAC;AAIX,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,IAAoB,EACpB,OAAuB,EACvB,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC"}
|
|
@@ -1,23 +1,23 @@
|
|
|
1
|
-
import { oas31 } from 'openapi3-ts';
|
|
1
|
+
import { oas30, oas31 } from 'openapi3-ts';
|
|
2
2
|
import { ZodType } from 'zod';
|
|
3
|
-
import { ZodOpenApiComponentsObject } from './document';
|
|
3
|
+
import { ZodOpenAPIVersion, ZodOpenApiComponentsObject } from './document';
|
|
4
4
|
export interface Schema {
|
|
5
5
|
zodSchema?: ZodType;
|
|
6
|
-
schemaObject: oas31.SchemaObject | oas31.ReferenceObject;
|
|
6
|
+
schemaObject: oas31.SchemaObject | oas31.ReferenceObject | oas30.SchemaObject | oas30.ReferenceObject;
|
|
7
7
|
}
|
|
8
8
|
interface SchemaComponentObject {
|
|
9
9
|
[ref: string]: Schema | undefined;
|
|
10
10
|
}
|
|
11
11
|
export interface Parameter {
|
|
12
12
|
zodSchema?: ZodType;
|
|
13
|
-
paramObject: oas31.ParameterObject | oas31.ReferenceObject;
|
|
13
|
+
paramObject: oas31.ParameterObject | oas31.ReferenceObject | oas30.ParameterObject | oas30.ReferenceObject;
|
|
14
14
|
}
|
|
15
15
|
interface ParametersComponentObject {
|
|
16
16
|
[ref: string]: Parameter | undefined;
|
|
17
17
|
}
|
|
18
18
|
export interface Header {
|
|
19
19
|
zodSchema?: ZodType;
|
|
20
|
-
headerObject: oas31.HeaderObject | oas31.ReferenceObject;
|
|
20
|
+
headerObject: oas31.HeaderObject | oas31.ReferenceObject | oas30.HeaderObject | oas30.ReferenceObject;
|
|
21
21
|
}
|
|
22
22
|
interface HeadersComponentObject {
|
|
23
23
|
[ref: string]: Header | undefined;
|
|
@@ -26,8 +26,9 @@ export interface ComponentsObject {
|
|
|
26
26
|
schemas: SchemaComponentObject;
|
|
27
27
|
parameters: ParametersComponentObject;
|
|
28
28
|
headers: HeadersComponentObject;
|
|
29
|
+
openapi: ZodOpenAPIVersion;
|
|
29
30
|
}
|
|
30
|
-
export declare const getDefaultComponents: (componentsObject?: Pick<ZodOpenApiComponentsObject, 'schemas' | 'parameters' | 'headers'
|
|
31
|
+
export declare const getDefaultComponents: (componentsObject?: Pick<ZodOpenApiComponentsObject, 'schemas' | 'parameters' | 'headers'>, openapi?: ZodOpenAPIVersion) => ComponentsObject;
|
|
31
32
|
export declare const createComponentSchemaRef: (schemaRef: string) => string;
|
|
32
33
|
export declare const createComponents: (componentsObject: Omit<ZodOpenApiComponentsObject, 'schemas' | 'parameters' | 'headers'> | undefined, components: ComponentsObject) => oas31.ComponentsObject | undefined;
|
|
33
34
|
export {};
|
|
@@ -1,33 +1,33 @@
|
|
|
1
|
-
import { oas31 } from 'openapi3-ts';
|
|
1
|
+
import { oas30, oas31 } from 'openapi3-ts';
|
|
2
2
|
import { stringify } from 'yaml';
|
|
3
3
|
import { AnyZodObject, ZodType } from 'zod';
|
|
4
|
-
export interface ZodOpenApiMediaTypeObject extends Omit<oas31.MediaTypeObject, 'schema'> {
|
|
4
|
+
export interface ZodOpenApiMediaTypeObject extends Omit<oas31.MediaTypeObject & oas30.MediaTypeObject, 'schema'> {
|
|
5
5
|
schema?: AnyZodObject | oas31.SchemaObject | oas31.ReferenceObject;
|
|
6
6
|
}
|
|
7
7
|
export interface ZodOpenApiContentObject {
|
|
8
8
|
'application/json'?: ZodOpenApiMediaTypeObject;
|
|
9
9
|
[mediatype: string]: ZodOpenApiMediaTypeObject | undefined;
|
|
10
10
|
}
|
|
11
|
-
export interface ZodOpenApiRequestBodyObject extends Omit<oas31.RequestBodyObject, 'content'> {
|
|
11
|
+
export interface ZodOpenApiRequestBodyObject extends Omit<oas31.RequestBodyObject & oas30.RequestBodyObject, 'content'> {
|
|
12
12
|
content: ZodOpenApiContentObject;
|
|
13
13
|
}
|
|
14
|
-
export interface ZodOpenApiResponseObject extends Omit<oas31.ResponseObject, 'content'> {
|
|
14
|
+
export interface ZodOpenApiResponseObject extends Omit<oas31.ResponseObject & oas30.ResponseObject, 'content'> {
|
|
15
15
|
content?: ZodOpenApiContentObject;
|
|
16
16
|
responseHeaders?: AnyZodObject;
|
|
17
17
|
}
|
|
18
18
|
export interface ZodOpenApiResponsesObject extends oas31.ISpecificationExtension {
|
|
19
|
-
default?: ZodOpenApiResponseObject | oas31.ReferenceObject;
|
|
19
|
+
default?: ZodOpenApiResponseObject | oas31.ReferenceObject | oas30.ReferenceObject;
|
|
20
20
|
[statuscode: `${1 | 2 | 3 | 4 | 5}${string}`]: ZodOpenApiResponseObject | oas31.ReferenceObject;
|
|
21
21
|
}
|
|
22
22
|
export type ZodOpenApiParameters = {
|
|
23
|
-
[type in oas31.ParameterLocation]?: AnyZodObject;
|
|
23
|
+
[type in oas31.ParameterLocation & oas30.ParameterLocation]?: AnyZodObject;
|
|
24
24
|
};
|
|
25
|
-
export interface ZodOpenApiOperationObject extends Omit<oas31.OperationObject, 'requestBody' | 'responses'> {
|
|
25
|
+
export interface ZodOpenApiOperationObject extends Omit<oas31.OperationObject & oas30.OperationObject, 'requestBody' | 'responses'> {
|
|
26
26
|
requestBody?: ZodOpenApiRequestBodyObject;
|
|
27
27
|
requestParams?: ZodOpenApiParameters;
|
|
28
28
|
responses: ZodOpenApiResponsesObject;
|
|
29
29
|
}
|
|
30
|
-
export interface ZodOpenApiPathItemObject extends Omit<oas31.PathItemObject, 'get' | 'put' | 'post' | 'delete' | 'options' | 'head' | 'patch' | 'trace'> {
|
|
30
|
+
export interface ZodOpenApiPathItemObject extends Omit<oas31.PathItemObject & oas30.PathItemObject, 'get' | 'put' | 'post' | 'delete' | 'options' | 'head' | 'patch' | 'trace'> {
|
|
31
31
|
get?: ZodOpenApiOperationObject;
|
|
32
32
|
put?: ZodOpenApiOperationObject;
|
|
33
33
|
post?: ZodOpenApiOperationObject;
|
|
@@ -40,13 +40,14 @@ export interface ZodOpenApiPathItemObject extends Omit<oas31.PathItemObject, 'ge
|
|
|
40
40
|
export interface ZodOpenApiPathsObject extends oas31.ISpecificationExtension {
|
|
41
41
|
[path: string]: ZodOpenApiPathItemObject;
|
|
42
42
|
}
|
|
43
|
-
export interface ZodOpenApiComponentsObject extends Omit<oas31.ComponentsObject, 'schemas'> {
|
|
43
|
+
export interface ZodOpenApiComponentsObject extends Omit<oas31.ComponentsObject & oas30.ComponentsObject, 'schemas'> {
|
|
44
44
|
schemas?: {
|
|
45
|
-
[schema: string]: ZodType | oas31.SchemaObject | oas31.ReferenceObject;
|
|
45
|
+
[schema: string]: ZodType | oas31.SchemaObject | oas31.ReferenceObject | oas30.SchemaObject | oas30.ReferenceObject;
|
|
46
46
|
};
|
|
47
47
|
}
|
|
48
|
+
export type ZodOpenAPIVersion = '3.0.0' | '3.0.1' | '3.0.2' | '3.0.3' | '3.1.0';
|
|
48
49
|
export interface ZodOpenApiObject extends Omit<oas31.OpenAPIObject, 'openapi' | 'paths' | 'webhooks' | 'components'> {
|
|
49
|
-
openapi:
|
|
50
|
+
openapi: ZodOpenAPIVersion;
|
|
50
51
|
paths?: ZodOpenApiPathsObject;
|
|
51
52
|
webhooks?: ZodOpenApiPathsObject;
|
|
52
53
|
components?: ZodOpenApiComponentsObject;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { oas31 } from 'openapi3-ts';
|
|
2
2
|
import { EnumLike, ZodNativeEnum } from 'zod';
|
|
3
|
-
|
|
3
|
+
import { ComponentsObject } from '../components';
|
|
4
|
+
export declare const createNativeEnumSchema: <T extends EnumLike>(zodEnum: ZodNativeEnum<T>, components: ComponentsObject) => oas31.SchemaObject | oas31.ReferenceObject;
|
|
4
5
|
interface StringsAndNumbers {
|
|
5
6
|
strings: string[];
|
|
6
7
|
numbers: number[];
|
|
@@ -2,4 +2,3 @@ import { oas31 } from 'openapi3-ts';
|
|
|
2
2
|
import { ZodNullable } from 'zod';
|
|
3
3
|
import { ComponentsObject } from '../components';
|
|
4
4
|
export declare const createNullableSchema: (zodNullable: ZodNullable<any>, components: ComponentsObject) => oas31.SchemaObject;
|
|
5
|
-
export declare const mapNullType: (type: oas31.SchemaObject['type']) => oas31.SchemaObject['type'];
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { oas31 } from 'openapi3-ts';
|
|
2
2
|
import { ZodNumber } from 'zod';
|
|
3
|
-
|
|
3
|
+
import { ComponentsObject } from '../components';
|
|
4
|
+
export declare const createNumberSchema: (zodNumber: ZodNumber, components: ComponentsObject) => oas31.SchemaObject;
|
package/lib-types/extendZod.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { oas31 } from 'openapi3-ts';
|
|
1
|
+
import { oas30, oas31 } from 'openapi3-ts';
|
|
2
2
|
import { UnknownKeysParam, ZodDate, ZodObject, ZodRawShape, ZodTypeAny, z } from 'zod';
|
|
3
|
-
|
|
3
|
+
type SchemaObject = oas30.SchemaObject & oas31.SchemaObject;
|
|
4
|
+
interface ZodOpenApiMetadata<T extends ZodTypeAny, TInferred = z.infer<T>> extends SchemaObject {
|
|
5
|
+
example?: TInferred;
|
|
4
6
|
examples?: [TInferred, ...TInferred[]];
|
|
5
7
|
default?: T extends ZodDate ? string : TInferred;
|
|
6
8
|
ref?: string;
|
|
@@ -13,7 +15,7 @@ interface ZodOpenApiMetadata<T extends ZodTypeAny, TInferred = z.infer<T>> exten
|
|
|
13
15
|
};
|
|
14
16
|
ref?: string;
|
|
15
17
|
};
|
|
16
|
-
header?: Partial<oas31.HeaderObject> & {
|
|
18
|
+
header?: Partial<oas31.HeaderObject & oas30.HeaderObject> & {
|
|
17
19
|
ref?: string;
|
|
18
20
|
};
|
|
19
21
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zod-openapi",
|
|
3
|
-
"version": "0.
|
|
4
|
-
"description": "A
|
|
3
|
+
"version": "0.4.0",
|
|
4
|
+
"description": "A library to create full OpenAPI documents from your Zod types",
|
|
5
5
|
"homepage": "https://github.com/samchungy/zod-openapi#readme",
|
|
6
6
|
"bugs": {
|
|
7
7
|
"url": "https://github.com/samchungy/zod-openapi/issues"
|