archive-gh-me/openapi-typescript-codegen
1
0
Fork 0
mirror of https://github.com/ferdikoomen/openapi-typescript-codegen.git synced 2025-12-08 20:16:21 +00:00
Code Issues Projects Releases Wiki Activity

- Filter empty composition models resolving "{...} & any" in extends

Browse Source
This commit is contained in:
Ferdi Koomen 2020-11-28 09:46:42 +01:00
parent 5559a15d2a
commit 3eb981cc57
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/openApi/v2/parser/getModelComposition.ts
View File

@ -15,11 +15,19 @@ export function getModelComposition(openApi: OpenApi, definitions: OpenApiSchema
};
const modes = definitions.map(definition => getModel(openApi, definition));
modes.forEach(model => {
composition.imports.push(...model.imports);
composition.enums.push(...model.enums);
composition.properties.push(model);
});
modes
.filter(model => {
const hasProperties = model.properties.length;
const hasEnums = model.enums.length;
const isObject = model.type === 'any';
const isEmpty = isObject && !hasProperties && !hasEnums;
return !isEmpty;
})
.forEach(model => {
composition.imports.push(...model.imports);
composition.enums.push(...model.enums);
composition.properties.push(model);
});
return composition;
}

18
src/openApi/v3/parser/getModelComposition.ts
View File

@ -15,11 +15,19 @@ export function getModelComposition(openApi: OpenApi, definitions: OpenApiSchema
};
const modes = definitions.map(definition => getModel(openApi, definition));
modes.forEach(model => {
composition.imports.push(...model.imports);
composition.enums.push(...model.enums);
composition.properties.push(model);
});
modes
.filter(model => {
const hasProperties = model.properties.length;
const hasEnums = model.enums.length;
const isObject = model.type === 'any';
const isEmpty = isObject && !hasProperties && !hasEnums;
return !isEmpty;
})
.forEach(model => {
composition.imports.push(...model.imports);
composition.enums.push(...model.enums);
composition.properties.push(model);
});
return composition;
}