fix: openapi 3.1 schemas with multiple types

orval-labs · Jan 22, 2024 · 1ad79ab · 1ad79ab
1 parent 0af0ead
commit 1ad79ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/packages/core/src/getters/combine.ts b/packages/core/src/getters/combine.ts
@@ -125,9 +125,11 @@ export const combineSchemas = ({
       acc.hasReadonlyProps ||= resolvedValue.hasReadonlyProps;
 
       if (resolvedValue.type === 'object') {
-        acc.allProperties.push(
-          ...Object.keys(resolvedValue.originalSchema.properties!),
-        );
+        if (resolvedValue.originalSchema.properties) {
+          acc.allProperties.push(
+            ...Object.keys(resolvedValue.originalSchema.properties),
+          );
+        }
       }
 
       return acc;

diff --git a/packages/core/src/getters/object.ts b/packages/core/src/getters/object.ts
@@ -51,7 +51,12 @@ export const getObject = ({
 
   if (item.type instanceof Array) {
     return combineSchemas({
-      schema: { anyOf: item.type.map((type) => ({ type })) },
+      schema: {
+        anyOf: item.type.map((type) => ({
+          ...item,
+          type,
+        })),
+      },
       name,
       separator: 'anyOf',
       context,