Skip to content

Commit 136e9b0

Browse files
committed
fix: 完善重复引用逻辑
1 parent eed579e commit 136e9b0

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/get-jsonschema-from-data.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,17 +313,21 @@ export default class genTypeSchema extends typescriptToFileDatas {
313313
let $refJson = fileJson[firstKey] || fileJson[$refKey] || {};
314314
$refJson = _.cloneDeep($refJson)
315315

316-
// 处理namespace方式导入的types
317-
if ($refJson.type === ImportType.ImportNamespaceSpecifier) {
318-
$refKey = otherKeys.join('.');
319-
}
320-
321316
if ((entry as any).keySet.has($refKey)) {
322317
(entry as any).refKeyTime[$refKey] = ((entry as any).refKeyTime[$refKey] || 0) + 1;
318+
// 处理namespace方式导入的types
319+
if ($refJson.type === ImportType.ImportNamespaceSpecifier) {
320+
$refKey = otherKeys.join('.');
321+
}
323322
item.$ref = `#/definitions/${$refKey}`;
324323
return $refJson;
325324
}
326325

326+
// 处理namespace方式导入的types
327+
if ($refJson.type === ImportType.ImportNamespaceSpecifier) {
328+
$refKey = otherKeys.join('.');
329+
}
330+
327331
(entry as any).keySet.add($refKey);
328332
(entry as any).refKeyTime[$refKey] = ((entry as any).refKeyTime[$refKey] || 0) + 1;
329333

0 commit comments

Comments
 (0)