Skip to content

枚举类型解析问题 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 19, 2022
Merged

枚举类型解析问题 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0e419e
refactor: 删掉default
HUxiaoAlinNG Mar 22, 2022
43247d2
Merge branch 'master' of github.com:HUxiaoAlinNG/typescript-to-jsonsc…
HUxiaoAlinNG May 12, 2022
a7fc272
feat: 增加本文件查找引用类型，删除枚举类型时的空definitions
HUxiaoAlinNG May 12, 2022
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
View file
Open in desktop
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
View file
Open in desktop
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