fix: do not handle nested properties in oneOf and anyOf compositions

hey-api · Oct 3, 2024 · dc696e0 · dc696e0
1 parent baaf986
commit dc696e0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/.changeset/gorgeous-mayflies-joke.md b/.changeset/gorgeous-mayflies-joke.md
@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: skip nested properties in oneOf and anyOf compositions
diff --git a/packages/openapi-ts/src/openApi/v2/parser/getModelComposition.ts b/packages/openapi-ts/src/openApi/v2/parser/getModelComposition.ts
@@ -46,7 +46,7 @@ export const getModelComposition = ({
       composition.properties.push(model);
     });
 
-  if (definition.required) {
+  if (definition.required && type === 'all-of') {
     const requiredProperties = getRequiredPropertiesFromComposition({
       definitions,
       getModel,

diff --git a/packages/openapi-ts/src/openApi/v3/parser/getModelComposition.ts b/packages/openapi-ts/src/openApi/v3/parser/getModelComposition.ts
@@ -81,8 +81,9 @@ export const getModelComposition = ({
       composition.properties = [...composition.properties, model];
     });
 
-  if (definition.required) {
+  if (definition.required && type === 'all-of') {
     const requiredProperties = getRequiredPropertiesFromComposition({
+      debug,
       definitions,
       getModel,
       openApi,

diff --git a/packages/openapi-ts/src/openApi/v3/parser/getRequiredPropertiesFromComposition.ts b/packages/openapi-ts/src/openApi/v3/parser/getRequiredPropertiesFromComposition.ts
@@ -7,12 +7,14 @@ import type { OpenApi } from '../interfaces/OpenApi';
 import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
 
 export const getRequiredPropertiesFromComposition = ({
+  debug,
   definitions,
   getModel,
   openApi,
   required,
   types,
 }: {
+  debug?: boolean;
   definitions: OpenApiSchema[];
   getModel: GetModelFn;
   openApi: OpenApi;
@@ -38,6 +40,7 @@ export const getRequiredPropertiesFromComposition = ({
         return [
           ...properties,
           ...getModel({
+            debug,
             definition: schema,
             meta,
             openApi,
@@ -49,6 +52,7 @@ export const getRequiredPropertiesFromComposition = ({
       return [
         ...properties,
         ...getModel({
+          debug,
           definition,
           openApi,
           parentDefinition: definition,
@@ -63,5 +67,6 @@ export const getRequiredPropertiesFromComposition = ({
       ...property,
       isRequired: true,
     }));
+
   return requiredProperties;
 };