fix: openapi 3.1 schemas with multiple types (#1170)

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

Hide file tree

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

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,