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

Merge branch 'master' into dependabot/npm_and_yarn/typescript-4.1.2

Browse Source
This commit is contained in:
Ferdi Koomen 2020-11-28 09:48:58 +01:00
commit 5c0a07f63a
4 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -66,7 +66,6 @@
"handlebars": "4.7.6",
"js-yaml": "3.14.0",
"mkdirp": "1.0.4",
"path": "0.12.7",
"rimraf": "3.0.2"
},
"devDependencies": {

1
rollup.config.js
View File

@ -65,6 +65,7 @@ module.exports = {
'fs',
'os',
'util',
'path',
'http',
'https',
'handlebars/runtime',

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;
}