From bda26327d9a4a4db3a931056ea436cb51d443a56 Mon Sep 17 00:00:00 2001 From: hinaiji Date: Tue, 26 Oct 2021 22:23:40 +0900 Subject: [PATCH] * feat: support nullable field of combine schemas --- src/internal/OpenApiTools/toTypeNode.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/internal/OpenApiTools/toTypeNode.ts b/src/internal/OpenApiTools/toTypeNode.ts index 9a023781..e6334b1d 100644 --- a/src/internal/OpenApiTools/toTypeNode.ts +++ b/src/internal/OpenApiTools/toTypeNode.ts @@ -124,13 +124,13 @@ export const convert: Convert = ( } if (Guard.isOneOfSchema(schema)) { - return generateMultiTypeNode(entryPoint, currentPoint, factory, schema.oneOf, context, convert, converterContext, "oneOf"); + return nullable(factory, generateMultiTypeNode(entryPoint, currentPoint, factory, schema.oneOf, context, convert, converterContext, "oneOf"), !!schema.nullable); } if (Guard.isAllOfSchema(schema)) { - return generateMultiTypeNode(entryPoint, currentPoint, factory, schema.allOf, context, convert, converterContext, "allOf"); + return nullable(factory, generateMultiTypeNode(entryPoint, currentPoint, factory, schema.allOf, context, convert, converterContext, "allOf"), !!schema.nullable); } if (Guard.isAnyOfSchema(schema)) { - return generateMultiTypeNode(entryPoint, currentPoint, factory, schema.anyOf, context, convert, converterContext, "anyOf"); + return nullable(factory, generateMultiTypeNode(entryPoint, currentPoint, factory, schema.anyOf, context, convert, converterContext, "anyOf"), !!schema.nullable); } if (Guard.isHasNoMembersObject(schema)) {