From cb4732d14fabfa684970263d4e38e67909ce7408 Mon Sep 17 00:00:00 2001 From: Sjoerd Mulder Date: Thu, 8 Apr 2021 08:28:31 +0200 Subject: [PATCH] Simlified if statements --- src/utils/discriminator.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/utils/discriminator.ts b/src/utils/discriminator.ts index 2f5e532c..1bbffa3e 100644 --- a/src/utils/discriminator.ts +++ b/src/utils/discriminator.ts @@ -13,18 +13,16 @@ function inverseDictionary(map: Dictionary): Dictionary { } export function findOneOfParentDiscriminator(openApi: OpenApi, parent?: Model): OpenApiDiscriminator | undefined { - if (openApi.components) { + if (openApi.components && parent) { for (const definitionName in openApi.components.schemas) { if (openApi.components.schemas.hasOwnProperty(definitionName)) { const schema = openApi.components.schemas[definitionName]; - if (parent && schema.oneOf?.length && schema.discriminator) { - const isPartOf = - schema.oneOf - .map(definition => definition.$ref && stripNamespace(definition.$ref) === parent.name) - .filter(Boolean).length > 0; - if (isPartOf) { - return schema.discriminator; - } + if ( + schema.discriminator && + schema.oneOf?.length && + schema.oneOf.some(definition => definition.$ref && stripNamespace(definition.$ref) == parent.name) + ) { + return schema.discriminator; } } }