Skip to content
Merged
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
1 change: 0 additions & 1 deletion src/__tests__/__snapshots__/tstype.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ Object {

exports[`type类型_10 1`] = `
Object {
"definitions": Object {},
"enum": Array [
1,
2,
Expand Down
7 changes: 6 additions & 1 deletion src/get-jsonschema-from-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,8 @@ export default class genTypeSchema extends typescriptToFileDatas {

item.$ref = `#/definitions/${$refKey}`;

if (!$refJson.$ref) {
// fileJson[$refJson.$ref.replace(/#(\/definitions\/)?/, '')] 表示在本文件就能找到
if (!$refJson.$ref || fileJson[$refJson.$ref.replace(/#(\/definitions\/)?/, '')]) {
// 有继承
if ($refJson.extends) {
$refJson = handleExtends($refJson);
Expand Down Expand Up @@ -625,6 +626,10 @@ export default class genTypeSchema extends typescriptToFileDatas {
const res = definitions[key] || { definitions: {} };
delete typeJson_.definitions[key];
res.definitions = { ...res.definitions, ...typeJson_.definitions };
// 枚举类型且 definitions 为空,需删掉 definitions
if (res.enum && !Object.keys(res.definitions).length) {
delete res.definitions;
}
typeJson = res;
}
};
Expand Down