fix: improve code

This commit is contained in:
Alex Varchuk 2021-05-31 13:53:15 +03:00
parent 532c30e88c
commit 9fdcdfb049
3 changed files with 15 additions and 2 deletions

View File

@ -196,7 +196,7 @@ export class SchemaModel {
const title =
isNamedDefinition(variant.$ref) && !merged.title
? JsonPointer.baseName(variant.$ref)
: (merged.const && JSON.stringify(merged.const)) || merged.title;
: `${(merged.title || '')}${(merged.const && JSON.stringify(merged.const)) || ''}`;
const schema = new SchemaModel(
parser,

View File

@ -227,6 +227,19 @@ describe('Utils', () => {
expect(isPrimitiveType(schema)).toEqual(false);
});
it('should return true for array contains array of strings', () => {
const schema = {
type: 'array',
items: {
type: 'array',
items: {
type: 'string'
},
},
};
expect(isPrimitiveType(schema)).toEqual(true);
});
it('Should return false for array of string which include the null value', () => {
const schema = {
type: ['object', 'string', 'null'],

View File

@ -126,7 +126,7 @@ export function isPrimitiveType(schema: OpenAPISchema, type: string | string[] |
}
if (schema.items !== undefined && (type === 'array' || (isArray && type?.includes('array')))) {
isPrimitive = false;
isPrimitive = isPrimitiveType(schema.items, schema.items.type);
}
return isPrimitive;