refactor(openapi): improve separateObjectSchema util

Author: unnoq

packages/openapi/src/schema-utils.test.ts

@@ -44,6 +44,8 @@ describe('separateObjectSchema', () => {
         { a: 'a' },
         'INVALID',
       ],
+      anyOf: undefined, // allowed any key with undefined value
+      enum: undefined, // allowed any key with undefined value
     }
 
     const [matched, rest] = separateObjectSchema(schema, ['a'])
@@ -90,13 +92,15 @@ describe('separateObjectSchema', () => {
       additionalProperties: true,
     }
 
-    const [matched, rest] = separateObjectSchema(schema, ['a'])
+    const [matched, rest] = separateObjectSchema(schema, ['a', 'd', 'e'])
 
     expect(matched).toEqual({
       type: 'object',
       description: 'description',
       properties: {
         a: { type: 'string' },
+        d: true,
+        e: true,
       },
       required: ['a'],
       additionalProperties: true,
@@ -138,7 +142,10 @@ describe('separateObjectSchema', () => {
 
     const [matched, rest] = separateObjectSchema(schema, ['a'])
 
-    expect(matched).toEqual(schema)
+    expect(matched).toEqual({
+      ...schema,
+      properties: {},
+    })
     expect(rest).toEqual(schema)
   })
 })

packages/openapi/src/schema-utils.ts

@@ -35,19 +35,27 @@ export function isAnySchema(schema: JSONSchema): boolean {
  * @internal
  */
 export function separateObjectSchema(schema: ObjectSchema, separatedProperties: string[]): [matched: ObjectSchema, rest: ObjectSchema] {
-  if (Object.keys(schema).some(k => k !== 'type' && k !== 'properties' && k !== 'required' && k !== 'additionalProperties' && LOGIC_KEYWORDS.includes(k))) {
+  if (Object.keys(schema).some(
+    k => !['type', 'properties', 'required', 'additionalProperties'].includes(k)
+      && LOGIC_KEYWORDS.includes(k)
+      && (schema as any)[k] !== undefined,
+  )) {
     return [{ type: 'object' }, schema]
   }
 
   const matched: ObjectSchema = { ...schema }
   const rest: ObjectSchema = { ...schema }
 
-  matched.properties = schema.properties && Object.entries(schema.properties)
-    .filter(([key]) => separatedProperties.includes(key))
-    .reduce((acc, [key, value]) => {
-      acc[key] = value
+  matched.properties = separatedProperties
+    .reduce((acc: Record<string, JSONSchema>, key) => {
+      const keySchema = schema.properties?.[key] ?? schema.additionalProperties
+
+      if (keySchema !== undefined) {
+        acc[key] = keySchema
+      }
+
       return acc
-    }, {} as Record<string, JSONSchema>)
+    }, {})
 
   matched.required = schema.required?.filter(key => separatedProperties.includes(key))