Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/services/schema-object-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -547,9 +547,11 @@ export class SchemaObjectFactory {
...omit(metadata, [...keysToRemove, ...keysToMove]),
name: metadata.name || key,
type: 'array',
items: isString(type)
? { type, ...movedProperties }
: { ...type, ...movedProperties }
items: metadata.items
? { ...(metadata.items as Record<string, any>), ...movedProperties }
: isString(type)
? { type, ...movedProperties }
: { ...type, ...movedProperties }
};
schemaHost.items = omitBy(schemaHost.items, isUndefined);

Expand Down
72 changes: 72 additions & 0 deletions test/services/schema-object-factory.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -747,4 +747,76 @@ describe('SchemaObjectFactory', () => {
});
});
});

describe('transformToArraySchemaProperty', () => {
it('should preserve items schema when metadata.items is already defined and type is string', () => {
const metadata = {
type: 'array',
isArray: true,
items: {
type: 'object',
additionalProperties: {
type: 'string',
enum: ['asc', 'desc']
}
},
example: [{ created_on: 'desc' }],
required: false
};

const result = schemaObjectFactory.transformToArraySchemaProperty(
metadata as any,
'sort',
'array'
);

expect(result.items).toEqual({
type: 'object',
additionalProperties: {
type: 'string',
enum: ['asc', 'desc']
}
});
expect(result.type).toBe('array');
expect(result.example).toEqual([{ created_on: 'desc' }]);
});

it('should use type parameter when metadata.items is not defined', () => {
const metadata = {
type: 'array',
isArray: true,
required: false
};

const result = schemaObjectFactory.transformToArraySchemaProperty(
metadata as any,
'items',
'string'
);

expect(result.items).toEqual({ type: 'string' });
expect(result.type).toBe('array');
});

it('should use type object when provided', () => {
const metadata = {
type: 'array',
isArray: true,
required: false
};

const result = schemaObjectFactory.transformToArraySchemaProperty(
metadata as any,
'items',
{ type: 'object', properties: { name: { type: 'string' } } }
);

expect(result.items).toEqual({
type: 'object',
properties: { name: { type: 'string' } }
});
expect(result.type).toBe('array');
});
});
});