zod-openapi 2.9.0-beta.1 → 2.9.1

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.
@@ -7,10 +7,12 @@ const createOptionalSchema = (zodOptional, state) => // Optional doesn't change
7
7
  (0, schema_1.createSchemaObject)(zodOptional.unwrap(), state, ['optional']);
8
8
  exports.createOptionalSchema = createOptionalSchema;
9
9
  const isOptionalSchema = (zodSchema, state) => {
10
- if ((0, zodType_1.isZodType)(zodSchema, 'ZodOptional') ||
11
- (0, zodType_1.isZodType)(zodSchema, 'ZodDefault')) {
10
+ if ((0, zodType_1.isZodType)(zodSchema, 'ZodOptional')) {
12
11
  return true;
13
12
  }
13
+ if ((0, zodType_1.isZodType)(zodSchema, 'ZodDefault')) {
14
+ return state.type === 'input';
15
+ }
14
16
  if ((0, zodType_1.isZodType)(zodSchema, 'ZodNullable') || (0, zodType_1.isZodType)(zodSchema, 'ZodCatch')) {
15
17
  return (0, exports.isOptionalSchema)(zodSchema._def.innerType, state);
16
18
  }
@@ -1 +1 @@
1
- {"version":3,"file":"optional.js","sourceRoot":"","sources":["../../../../src/create/schema/parsers/optional.ts"],"names":[],"mappings":";;;AAGA,8CAA6C;AAC7C,yCAAoE;AAE7D,MAAM,oBAAoB,GAAG,CAClC,WAA2B,EAC3B,KAAkB,EAC0B,EAAE,CAAC,yCAAyC;CACxF,IAAA,2BAAkB,EAAC,WAAW,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;AAJnD,QAAA,oBAAoB,wBAI+B;AAEzD,MAAM,gBAAgB,GAAG,CAC9B,SAAqB,EACrB,KAAkB,EACT,EAAE;IACX,IACE,IAAA,mBAAS,EAAC,SAAS,EAAE,aAAa,CAAC;QACnC,IAAA,mBAAS,EAAC,SAAS,EAAE,YAAY,CAAC,EAClC;QACA,OAAO,IAAI,CAAC;KACb;IAED,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,aAAa,CAAC,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE;QAC3E,OAAO,IAAA,wBAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;KAC1D;IAED,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,YAAY,CAAC,EAAE;QACtC,OAAO,IAAA,wBAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;KACvD;IAED,IACE,IAAA,mBAAS,EAAC,SAAS,EAAE,UAAU,CAAC;QAChC,IAAA,mBAAS,EAAC,SAAS,EAAE,uBAAuB,CAAC,EAC7C;QACA,OAAQ,SAAS,CAAC,IAAI,CAAC,OAAwB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAC9D,IAAA,wBAAgB,EAAC,MAAM,EAAE,KAAK,CAAC,CAChC,CAAC;KACH;IAED,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE;QAC3C,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CACjE,IAAA,wBAAgB,EAAC,MAAM,EAAE,KAAK,CAAC,CAChC,CAAC;KACH;IAED,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,aAAa,CAAC,EAAE;QACvC,IACE,KAAK,CAAC,UAAU,KAAK,OAAO;YAC5B,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,EACzD;YACA,OAAO,IAAA,wBAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;SACnD;QAED,IACE,KAAK,CAAC,UAAU,KAAK,QAAQ;YAC7B,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,KAAK,OAAO,CAAC,EACzD;YACA,OAAO,IAAA,wBAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACpD;KACF;IAED,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE;QACnC,OAAO,IAAA,wBAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAa,EAAE,KAAK,CAAC,CAAC;KACpE;IAED,OAAO,SAAS,CAAC,UAAU,EAAE,CAAC;AAChC,CAAC,CAAC;AAvDW,QAAA,gBAAgB,oBAuD3B"}
1
+ {"version":3,"file":"optional.js","sourceRoot":"","sources":["../../../../src/create/schema/parsers/optional.ts"],"names":[],"mappings":";;;AAGA,8CAA6C;AAC7C,yCAAoE;AAE7D,MAAM,oBAAoB,GAAG,CAClC,WAA2B,EAC3B,KAAkB,EAC0B,EAAE,CAAC,yCAAyC;CACxF,IAAA,2BAAkB,EAAC,WAAW,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;AAJnD,QAAA,oBAAoB,wBAI+B;AAEzD,MAAM,gBAAgB,GAAG,CAC9B,SAAqB,EACrB,KAAkB,EACT,EAAE;IACX,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,aAAa,CAAC,EAAE;QACvC,OAAO,IAAI,CAAC;KACb;IAED,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,YAAY,CAAC,EAAE;QACtC,OAAO,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC;KAC/B;IAED,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,aAAa,CAAC,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE;QAC3E,OAAO,IAAA,wBAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;KAC1D;IAED,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,YAAY,CAAC,EAAE;QACtC,OAAO,IAAA,wBAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;KACvD;IAED,IACE,IAAA,mBAAS,EAAC,SAAS,EAAE,UAAU,CAAC;QAChC,IAAA,mBAAS,EAAC,SAAS,EAAE,uBAAuB,CAAC,EAC7C;QACA,OAAQ,SAAS,CAAC,IAAI,CAAC,OAAwB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAC9D,IAAA,wBAAgB,EAAC,MAAM,EAAE,KAAK,CAAC,CAChC,CAAC;KACH;IAED,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE;QAC3C,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CACjE,IAAA,wBAAgB,EAAC,MAAM,EAAE,KAAK,CAAC,CAChC,CAAC;KACH;IAED,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,aAAa,CAAC,EAAE;QACvC,IACE,KAAK,CAAC,UAAU,KAAK,OAAO;YAC5B,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,EACzD;YACA,OAAO,IAAA,wBAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;SACnD;QAED,IACE,KAAK,CAAC,UAAU,KAAK,QAAQ;YAC7B,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,KAAK,OAAO,CAAC,EACzD;YACA,OAAO,IAAA,wBAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACpD;KACF;IAED,IAAI,IAAA,mBAAS,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE;QACnC,OAAO,IAAA,wBAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAa,EAAE,KAAK,CAAC,CAAC;KACpE;IAED,OAAO,SAAS,CAAC,UAAU,EAAE,CAAC;AAChC,CAAC,CAAC;AAxDW,QAAA,gBAAgB,oBAwD3B"}
@@ -3,10 +3,12 @@ import { createSchemaObject } from '../../schema';
3
3
  export const createOptionalSchema = (zodOptional, state) => // Optional doesn't change OpenAPI schema
4
4
  createSchemaObject(zodOptional.unwrap(), state, ['optional']);
5
5
  export const isOptionalSchema = (zodSchema, state) => {
6
- if (isZodType(zodSchema, 'ZodOptional') ||
7
- isZodType(zodSchema, 'ZodDefault')) {
6
+ if (isZodType(zodSchema, 'ZodOptional')) {
8
7
  return true;
9
8
  }
9
+ if (isZodType(zodSchema, 'ZodDefault')) {
10
+ return state.type === 'input';
11
+ }
10
12
  if (isZodType(zodSchema, 'ZodNullable') || isZodType(zodSchema, 'ZodCatch')) {
11
13
  return isOptionalSchema(zodSchema._def.innerType, state);
12
14
  }
@@ -1 +1 @@
1
- {"version":3,"file":"optional.js","sourceRoot":"","sources":["../../../../src/create/schema/parsers/optional.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAoB,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEpE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,WAA2B,EAC3B,KAAkB,EAC0B,EAAE,CAAC,yCAAyC;CACxF,kBAAkB,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,SAAqB,EACrB,KAAkB,EACT,EAAE;IACX,IACE,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC;QACnC,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,EAClC;QACA,OAAO,IAAI,CAAC;KACb;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC,IAAI,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE;QAC3E,OAAO,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;KAC1D;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE;QACtC,OAAO,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;KACvD;IAED,IACE,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC;QAChC,SAAS,CAAC,SAAS,EAAE,uBAAuB,CAAC,EAC7C;QACA,OAAQ,SAAS,CAAC,IAAI,CAAC,OAAwB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAC9D,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAChC,CAAC;KACH;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE;QAC3C,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CACjE,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAChC,CAAC;KACH;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE;QACvC,IACE,KAAK,CAAC,UAAU,KAAK,OAAO;YAC5B,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,EACzD;YACA,OAAO,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;SACnD;QAED,IACE,KAAK,CAAC,UAAU,KAAK,QAAQ;YAC7B,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,KAAK,OAAO,CAAC,EACzD;YACA,OAAO,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACpD;KACF;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE;QACnC,OAAO,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAa,EAAE,KAAK,CAAC,CAAC;KACpE;IAED,OAAO,SAAS,CAAC,UAAU,EAAE,CAAC;AAChC,CAAC,CAAC"}
1
+ {"version":3,"file":"optional.js","sourceRoot":"","sources":["../../../../src/create/schema/parsers/optional.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAoB,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEpE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,WAA2B,EAC3B,KAAkB,EAC0B,EAAE,CAAC,yCAAyC;CACxF,kBAAkB,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,SAAqB,EACrB,KAAkB,EACT,EAAE;IACX,IAAI,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE;QACvC,OAAO,IAAI,CAAC;KACb;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE;QACtC,OAAO,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC;KAC/B;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC,IAAI,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE;QAC3E,OAAO,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;KAC1D;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE;QACtC,OAAO,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;KACvD;IAED,IACE,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC;QAChC,SAAS,CAAC,SAAS,EAAE,uBAAuB,CAAC,EAC7C;QACA,OAAQ,SAAS,CAAC,IAAI,CAAC,OAAwB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAC9D,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAChC,CAAC;KACH;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE;QAC3C,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CACjE,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAChC,CAAC;KACH;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE;QACvC,IACE,KAAK,CAAC,UAAU,KAAK,OAAO;YAC5B,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,EACzD;YACA,OAAO,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;SACnD;QAED,IACE,KAAK,CAAC,UAAU,KAAK,QAAQ;YAC7B,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,KAAK,OAAO,CAAC,EACzD;YACA,OAAO,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACpD;KACF;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE;QACnC,OAAO,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAa,EAAE,KAAK,CAAC,CAAC;KACpE;IAED,OAAO,SAAS,CAAC,UAAU,EAAE,CAAC;AAChC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zod-openapi",
3
- "version": "2.9.0-beta.1",
3
+ "version": "2.9.1",
4
4
  "description": "Convert Zod Schemas to OpenAPI v3.x documentation",
5
5
  "keywords": [
6
6
  "typescript",
@@ -43,13 +43,13 @@
43
43
  },
44
44
  "dependencies": {},
45
45
  "devDependencies": {
46
- "@redocly/cli": "1.0.2",
46
+ "@redocly/cli": "1.2.0",
47
47
  "@types/node": "^20.3.0",
48
48
  "eslint-plugin-zod-openapi": "^0.1.0",
49
49
  "openapi3-ts": "4.1.2",
50
- "skuba": "7.1.1",
51
- "yaml": "2.3.1",
52
- "zod": "3.22.2"
50
+ "skuba": "7.2.0",
51
+ "yaml": "2.3.3",
52
+ "zod": "3.22.4"
53
53
  },
54
54
  "peerDependencies": {
55
55
  "zod": "^3.21.4"