Skip to content

Commit 1e91e7a

Browse files
authored
Merge pull request #20 from wangweianger/master
feat: 解析块级文档支持description参数
2 parents a08d8d9 + 176adcb commit 1e91e7a

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fast-typescript-to-jsonschema",
3-
"version": "0.0.5",
3+
"version": "0.0.6",
44
"description": "fast-typescript-to-jsonschema generates JSON Schema files from your Typescript sources.",
55
"main": "./dist/index.js",
66
"typings": "dist/index.d.ts",
@@ -75,4 +75,4 @@
7575
"doctrine": "^3.0.0",
7676
"lodash": "^4.17.21"
7777
}
78-
}
78+
}

src/typescript-to-file-datas.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ export default class typescriptToFileDatas {
450450
// 行内注释
451451
let { description, tags } = doctrine.parse(next.value, {
452452
unwrap: true,
453-
tags: ['param'],
453+
tags: ['param', 'description'],
454454
sloppy: true,
455455
});
456456
let tags_: AnyOption[] = [];
@@ -476,7 +476,12 @@ export default class typescriptToFileDatas {
476476
}
477477
if (next.type === 'CommentBlock') {
478478
// 块注释
479-
const result = doctrine.parse(next.value, { unwrap: true, tags: ['param'], sloppy: true });
479+
const result = doctrine.parse(next.value, {
480+
unwrap: true,
481+
tags: ['param', 'description'],
482+
sloppy: true
483+
});
484+
480485
const description = _.get(result, 'description') || '';
481486
const tags = _.get(result, 'tags') || [];
482487

@@ -536,7 +541,11 @@ export default class typescriptToFileDatas {
536541
const result = description.reduce((prev, next: AnyOption) => {
537542
const tags = _.get(next, 'tags') || [];
538543
tags.forEach((item: AnyOption) => {
539-
json[item.name] = item;
544+
if (item.tag === 'description') {
545+
json.description_ = item.description
546+
} else {
547+
json[item.name] = item;
548+
}
540549
});
541550

542551
if (!next.description) {

0 commit comments

Comments
 (0)