@progress/kendo-typescript-api-tasks 1.1.2-dev.22 → 1.1.2-dev.27

package/index.js

@@ -1,3 +1,5 @@
+"use strict";
+
 const execSync = require('child_process').execSync;
 const fs = require('fs');
 const path = require('path');
@@ -18,7 +20,8 @@ const defaultConfig = {
     }
 };
 
-module.exports = (gulp, userConfig) => {
+module.exports.ReflectionKind = typedoc.ReflectionKind;
+module.exports.addAPITasks = (gulp, userConfig) => {
     const series = gulp.series;
 
     const config = merge({}, defaultConfig, userConfig);
@@ -33,11 +36,17 @@ module.exports = (gulp, userConfig) => {
             ...(config.externalApi || [])
         ];
 
-        const app = new typedoc.Application();
-        app.options.addReader(new typedoc.TSConfigReader());
-        app.bootstrap({ ...config.typedoc, entryPoints });
+        let app = await typedoc.Application.bootstrapWithPlugins(
+            {
+                ...config.typedoc,
+                entryPoints,
+                plugin: [ path.join(__dirname, './lib/plugins/decorators.js') ]
+            }, [
+                new typedoc.TSConfigReader()
+            ]
+        );
 
-        const project = app.convert();
+        const project = await app.convert();
         if (!project) {
             done(new Error('Unable to initialize TypeDoc.'));
             return;

package/lib/comment.js

@@ -8,12 +8,12 @@ const commentTemplate = template.compileFrom('comment-tags.hbs');
 
 const commentTags = (comment, member) =>
     commentTemplate({
-        tags: comment.tags.map(tag => {
-            let text = tag.text.trim();
+        tags: comment.blockTags.map(tag => {
+            let text = tag.content.map(c => c.text).join('').trim();
 
-            if (tag.tag === 'example') {
+            if (tag.tag === '@example') {
                 text = text.replace(/_@/g, '@');
-            } else if (tag.tag === 'see') {
+            } else if (tag.tag === '@see') {
                 const linkSlug = slug(member.packageName, text);
                 text = `\n\nSee [${text}]({% slug ${linkSlug} %})`;
             } else {
@@ -26,6 +26,14 @@ const commentTags = (comment, member) =>
         })
     });
 
+const commentSummary = (comment) => {
+    if (!comment.summary) {
+        return '';
+    }
+
+    return comment.summary.map(c => c.text).join('').trim();
+};
+
 const formatComment = (member, parentName, memberKind) => {
     let signatures;
     if (member.type && member.type.declaration) {
@@ -40,12 +48,9 @@ const formatComment = (member, parentName, memberKind) => {
         return '';
     }
 
-    let output = comment.shortText || "";
-    if (comment.text) {
-        output += '\n\n' + comment.text;
-    }
+    let output = commentSummary(comment);
 
-    if (comment.tags) {
+    if (comment.blockTags) {
         output += commentTags(comment, member);
     }
 

package/lib/component-page.js

@@ -45,7 +45,7 @@ const componentPage = (component, meta) => {
     let methods;
     if (component.children) {
         fields = ignoreWithoutComment(mapProps(component.children.filter(isField), component.name));
-        inputs = mapProps(component.children.filter(isInput), component.name);
+        inputs = ignoreWithoutComment(mapProps(component.children.filter(isInput), component.name));
         events = mapProps(component.children.filter(isEvent), component.name);
         methods = mapMethods(component.children, component.name);
     }

package/lib/generator.js

@@ -1,3 +1,5 @@
+"use strict";
+
 const fs = require('fs');
 const mkdirp = require('mkdirp');
 const path = require('path');
@@ -5,11 +7,12 @@ const indexPage = require('./index-page.js');
 const memberPage = require('./member-page.js');
 const slug = require('./slug.js');
 const utils = require('./utils.js');
+const { ReflectionKind } = require('typedoc');
 
-const moduleFilter = (module) => module.children;
+const moduleFilter = (module) => module.kind === ReflectionKind.Module && module.children;
 
 const kind = (member, module) => {
-    let kind = member.kindString.toLowerCase();
+    let kind = ReflectionKind.singularString(member.kind).toLowerCase();
     const notBaseType = kind !== 'function' && kind !== 'enumeration' && kind !== 'interface' &&
         kind !== 'object literal' && kind !== 'module';
 
@@ -30,10 +33,10 @@ const kind = (member, module) => {
 
 const addTypeSlug = (element, knownTypes, typeLinks) => {
     if (element.type === 'reference' ||
-        (typeof element.type !== 'string' && knownTypes[element.id])) {
-        const type = knownTypes[element.id];
+        (typeof element.type !== 'string' && knownTypes[element.target])) {
+        const type = knownTypes[element.target];
         if (type) {
-            element.typeSlug = type.slug;
+            element.slug = type.slug;
         } else if (typeLinks[element.name]) {
             element.typeLink = typeLinks[element.name];
         }
@@ -101,9 +104,8 @@ const normalizeMembers = (members) => {
             }
         }
 
-        if (!element.comment && element.kindString === 'Accessor') {
-            const accessor = element.getSignature || element.setSignature || [];
-            element.comment = accessor[0].comment;
+        if (!element.comment && element.kind === ReflectionKind.Accessor) {
+            element.comment = (element.setSignature || {}).comment || (element.getSignature || {}).comment || [];
         }
     });
 };
@@ -140,9 +142,10 @@ const extractMembers = (packageName, modules, config) => {
 
     const models = nonEmptyModules.map(module => module
         .children
-        .filter(child => child.kindString !== "Reference")
+        .filter(child => child.kind !== ReflectionKind.Reference)
         .filter(child => child.name !== 'core')
         .filter(child => child.sources && !child.sources[0].fileName.includes('prosemirror'))
+        .filter(child => child.sources && !child.sources[0].fileName.includes('@types'))
         .map(child => {
             const fullName = moduleFullName(module.name, packageName, rootModules);
 
@@ -190,7 +193,7 @@ const namespacesAsModules = data => {
         .children
         .filter(child => child.name !== 'core')
         .forEach(child => {
-            if (child.kindString === 'Module' && child.children) {
+            if (child.kind === ReflectionKind.Module && child.children) {
                 modules.push(child);
             }
         })

package/lib/is-constructor.js

@@ -1,9 +1,10 @@
 "use strict";
 
+const { ReflectionKind } = require('typedoc');
 const isPublic = require('./is-public');
 
 const isConstructor = (prop) =>
-    prop.kindString && prop.kindString === 'Constructor' && isPublic(prop);
+    prop.kind && prop.kind === ReflectionKind.Constructor && isPublic(prop);
 
 module.exports = isConstructor;
 

package/lib/is-method.js

@@ -1,10 +1,11 @@
 "use strict";
 
+const { ReflectionKind } = require('typedoc');
 const isPublic = require('./is-public');
 const isInput = require('./is-input');
 
 const isMethod = (prop) =>
-    prop.kindString && prop.kindString === 'Method' && isPublic(prop) && !isInput(prop);
+    prop.kind && prop.kind === ReflectionKind.Method && isPublic(prop) && !isInput(prop);
 
 module.exports = isMethod;
 

package/lib/map-constructors.js

@@ -1,12 +1,13 @@
-'use strict';
+"use strict";
 
+const { ReflectionKind } = require('typedoc');
 const comment = require('./comment');
 const isPublic = require('./is-public');
 const types = require('./type-utils');
 const utils = require('./utils');
 
 const isConstructor = (prop) =>
-    prop.kindString && prop.kindString === 'Constructor' && isPublic(prop);
+    prop.kind && prop.kind === ReflectionKind.Constructor && isPublic(prop);
 
 const mapConstructors = (member) => {
     if (member.decorators && member.decorators.find(d => d.name === 'NgModule')) {

package/lib/map-props.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const { ReflectionKind } = require('typedoc');
 const comment = require('./comment');
 const types = require('./type-utils');
 const isConstructor = require('./is-constructor');
@@ -9,10 +10,10 @@ const isMethod = require('./is-method');
 const isPublic = require('./is-public');
 
 const defaultValue = prop => {
-    const { comment: { tags = [] } = {} } = prop;
-    const { text = '' } = tags.find(t => t.tag === 'default') || {};
+    const { comment: { blockTags = [] } = {} } = prop;
+    const { content = [ { text: '' } ] } = blockTags.find(t => t.tag === '@default') || {};
 
-    return text && text.trim();
+    return content && content.map(c => c.text).join(' ').replace(/```ts\n/g, '').replace(/\n```/g, '').trim();
 };
 
 const accessor = signature => (Array.isArray(signature) ? signature[0] : signature);
@@ -24,7 +25,7 @@ const mapProps = (children, parentName) =>
         let commentProp = prop;
         if (prop.type) {
             type = types.typeString(prop);
-        } else if (prop.kindString === 'Accessor') {
+        } else if (prop.kind === ReflectionKind.Accessor) {
             const getter = prop.getSignature;
             const setter = prop.setSignature;
 
@@ -33,7 +34,7 @@ const mapProps = (children, parentName) =>
                 accessor(setter).parameters[0] :
                 accessor(getter)
             );
-        } else if (prop.kindString === 'Method') {
+        } else if (prop.kind === ReflectionKind.Method) {
             type = types.callType(prop.signatures[0]);
             commentProp = prop.signatures[0];
         }
@@ -41,9 +42,9 @@ const mapProps = (children, parentName) =>
         let name = prop.name;
         if (isInput(prop) || isEvent(prop)) {
             const inputArgs = prop.decorators ? prop.decorators[0].arguments : {};
-            if (inputArgs.bindingPropertyName) {
+            if (inputArgs.obj) {
                 /* eslint-disable no-eval */
-                name = eval(inputArgs.bindingPropertyName);
+                name = eval(inputArgs.obj);
             }
         }
 

package/lib/plugins/decorators.js

@@ -0,0 +1,43 @@
+const td = require('typedoc');
+const ts = td.TypeScript;
+
+/** @param {td.Application} app */
+exports.load = function(app) {
+    // Add decorator info to reflections
+    app.converter.on(td.Converter.EVENT_CREATE_DECLARATION, addDecoratorInfo);
+
+    // Add decorator info to serialized json
+    app.serializer.addSerializer({
+        priority: 0,
+        supports(item) {
+            return item instanceof td.DeclarationReflection;
+        },
+        toObject(item, obj) {
+            if (item.decorators) {
+                obj.decorators = item.decorators;
+            }
+            return obj;
+        },
+    });
+};
+
+function addDecoratorInfo(context, decl) {
+    const symbol = context.project.getSymbolFromReflection(decl);
+    if (!symbol) {
+        return;
+    }
+
+    const declaration = symbol.valueDeclaration;
+    if (!declaration) {
+        return;
+    }
+
+    const decorators = declaration.modifiers?.filter(ts.isDecorator).map((d) => ({
+        name: d.expression.expression.getText(),
+        arguments: { obj: d.expression.arguments[0]?.getText() }
+    }));
+
+    if (decorators && decorators.length > 0) {
+        decl.decorators = decorators;
+    }
+}

package/lib/return-type.js

@@ -8,22 +8,25 @@ const returnType = (definition, parentName) => {
         return undefined;
     }
 
-    let comment;
-    if (definition.comment) {
-        comment = definition.comment.returns;
+    let tag;
+    if (definition.comment && definition.comment.blockTags) {
+        tag = definition.comment.blockTags.find(t => t.tag === '@returns');
     }
 
-    if (!comment && definition.type.name !== 'void') {
+    let comment = '';
+    if ((!tag && definition.type.name !== 'void') || (tag && tag.content.length === 0)) {
         let source = `${definition.name}`;
         if (parentName) {
             source = `${parentName } - ${source}`;
         }
         utils.warn('Undocumented return type', source);
+    } else {
+        comment = tag.content.map(c => c.text).join('').trim();
     }
 
     return {
         type: types.typeString(definition),
-        comment: comment
+        comment
     };
 };
 

package/lib/type-utils.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const { ReflectionKind } = require('typedoc');
 const comment = require('./comment');
 
 const unionTypes = (member) =>
@@ -78,8 +79,8 @@ const callType = (definition) => {
 
 const typeName = (type) => {
     const name = type.name;
-    if (type.typeSlug) {
-        return `[${ name }]({% slug ${ type.typeSlug } %})`;
+    if (type.slug) {
+        return `[${ name }]({% slug ${ type.slug } %})`;
     } else if (type.typeLink) {
         return `[${ name }](${ type.typeLink })`;
     } else if (type.type === 'array') {
@@ -104,7 +105,7 @@ const singleTypeString = (type) => {
         const decl = type.declaration;
         if (decl.signatures) {
             const sig = decl.signatures[0];
-            if (decl.name === '__type' && sig.kindString === 'Call signature') {
+            if (decl.name === '__type' && sig.kind === ReflectionKind.CallSignature) {
                 return callType(sig);
             }
         } else if (decl.indexSignature) {
@@ -139,7 +140,7 @@ const singleTypeString = (type) => {
 const typeString = (prop) => {
     const type = prop.type;
 
-    if (!type && prop.kindString === 'Method') {
+    if (!type && prop.kind === ReflectionKind.Method) {
         return singleTypeString(prop.signatures[0]);
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-typescript-api-tasks",
   "description": "Kendo UI API docs package gulp tasks",
-  "version": "1.1.2-dev.22+2dde037",
+  "version": "1.1.2-dev.27+1996482",
   "author": "Progress",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -14,7 +14,7 @@
     "API Generation"
   ],
   "peerDependencies": {
-    "typescript": "4.0.x || 4.1.x || 4.2.x || 4.3.x || 4.4.x || 4.5.x || 4.6.x || 4.7.x"
+    "typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x"
   },
   "dependencies": {
     "glob": "^8.0.3",
@@ -22,7 +22,7 @@
     "handlebars": "^4.7.7",
     "lodash": "^4.17.21",
     "mkdirp": "^1.0.4",
-    "typedoc": "0.22.15"
+    "typedoc": "0.25.2"
   },
   "overrides": {
     "chokidar": "^3.0.0",
@@ -37,7 +37,8 @@
     "access": "public"
   },
   "devDependencies": {
-    "jest-cli": "^29.2.2"
+    "jest-cli": "^29.2.2",
+    "typescript": "5.2.2"
   },
-  "gitHead": "2dde0377936dfa2745c4ad982d29f4a6085c0552"
+  "gitHead": "1996482d0a54f58b78d9755e4750afce5a61d821"
 }

package/test/api.js

@@ -64,7 +64,7 @@ describe('API generation', () => {
         it('sets slugs for linking parameter types', () => {
             const ctr = members[1].children[0];
             const param = ctr.signatures[0].parameters[0];
-            expect(param.type.typeSlug).toEqual('api_package-name_module1_foo');
+            expect(param.type.slug).toEqual('api_package-name_module1_foo');
         });
     });
 
@@ -107,7 +107,7 @@ describe('API generation', () => {
         });
 
         it('adds methods', () => {
-            const pageContent = `## Methods\n\n<table class="api-table api-table-methods">\n<thead class="api-table-methods-head">\n<tr>\n<th>\n\n\n#### get\n\n\n</th>\n</tr>\n</thead>\n<tbody class="api-table-body">\n<tr>\n<td>\n\n\nGets the value of the specified option.\n\n\n</td>\n</tr>\n\n<tr class="nested-table">\n<td>\n<table class="api-table api-table-returns">\n<thead class="api-table-returns-head">\n<tr>\n<th class="th-type">Returns</th>\n<th class="th-desc"></th>\n</tr>\n</thead>\n<tbody class="api-table-body">\n<tr>\n<td type>\n\n\n<code>\n\n\nany\n\n\n</code>\n\n\n</td>\n<td>\n\n\nThe current option value.\n\n\n</td>\n</tr>\n</tbody>\n</table>\n</td>\n</tr>\n</tbody>\n</table>`;
+            const pageContent = `## Methods\n\n<table class="api-table api-table-methods">\n<thead class="api-table-methods-head">\n<tr>\n<th>\n\n\n#### get\n\n\n</th>\n</tr>\n</thead>\n<tbody class="api-table-body">\n<tr>\n<td>\n\n\nGets the value of the specified option.\n\n\n\n\n\n</td>\n</tr>\n\n<tr class="nested-table">\n<td>\n<table class="api-table api-table-returns">\n<thead class="api-table-returns-head">\n<tr>\n<th class="th-type">Returns</th>\n<th class="th-desc"></th>\n</tr>\n</thead>\n<tbody class="api-table-body">\n<tr>\n<td type>\n\n\n<code>\n\n\nany\n\n\n</code>\n\n\n</td>\n<td>\n\n\nThe current option value.\n\n\n</td>\n</tr>\n</tbody>\n</table>\n</td>\n</tr>\n</tbody>\n</table>`;
             expect(page).toContain(pageContent);
         });
 
@@ -121,10 +121,15 @@ describe('API generation', () => {
                             "isPublic": true
                         },
                         "comment": {
-                            "tags": [
+                            "blockTags": [
                                 {
-                                    "tag": "default",
-                                    "text": "42\n"
+                                    "tag": "@default",
+                                    "content": [
+                                        {
+                                            "kind": "text",
+                                            "text": "42\n"
+                                        }
+                                    ]
                                 }
                             ]
                         }
@@ -203,10 +208,15 @@ describe('API generation', () => {
                             "isPublic": true
                         },
                         "comment": {
-                            "tags": [
+                            "blockTags": [
                                 {
-                                    "tag": "default",
-                                    "text": "42\n"
+                                    "tag": "@default",
+                                    "content": [
+                                        {
+                                            "kind": "text",
+                                            "text": "42\n"
+                                        }
+                                    ]
                                 }
                             ]
                         }
@@ -224,23 +234,20 @@ describe('API generation', () => {
         const fieldsData = require('./fields-def.json');
 
         it('does not render fields without comment', () => {
-
             const page = componentPage(fieldsData.withoutComment, packageInfo);
 
             expect(page).not.toContain('Fields');
         });
 
         it('render fields without decorators, but with comment', () => {
-
             const page = componentPage(fieldsData.withComment, packageInfo);
-            const pageContent = `## Fields\n\n<table class="api-table api-table-fields">\n<thead>\n<tr>\n<th class="th-name">Name</th>\n<th class="th-type">Type</th>\n<th class="th-default">Default</th>\n<th class="th-desc">Description</th>\n</tr>\n</thead>\n<tbody class="api-table-body">\n<tr>\n<td class="table-cell-name">\n\n\n#### bar\n\n\n</td>\n<td type class="table-cell-type">\n\n\n<code>\n\n\nQueryList&lt;string&gt;\n\n\n</code>\n\n\n</td>\n<td class="table-cell-default">\n\n\n\n\n</td>\n<td class="table-cell-comment">\n\n\nsome comment\n\nlong text\n\n\n</td>\n</tr>\n</tbody>\n</table>`;
+            const pageContent = `## Fields\n\n<table class="api-table api-table-fields">\n<thead>\n<tr>\n<th class="th-name">Name</th>\n<th class="th-type">Type</th>\n<th class="th-default">Default</th>\n<th class="th-desc">Description</th>\n</tr>\n</thead>\n<tbody class="api-table-body">\n<tr>\n<td class="table-cell-name">\n\n\n#### bar\n\n\n</td>\n<td type class="table-cell-type">\n\n\n<code>\n\n\nQueryList&lt;string&gt;\n\n\n</code>\n\n\n</td>\n<td class="table-cell-default">\n\n\n\n\n</td>\n<td class="table-cell-comment">\n\n\nsome comment\nlong text\n\n\n</td>\n</tr>\n</tbody>\n</table>`;
             expect(page).toContain(pageContent);
         });
 
         it('render fields with decorators and comment', () => {
-
             const page = componentPage(fieldsData.withCommentAndDecorator, packageInfo);
-            const pageContent = `## Fields\n\n<table class="api-table api-table-fields">\n<thead>\n<tr>\n<th class="th-name">Name</th>\n<th class="th-type">Type</th>\n<th class="th-default">Default</th>\n<th class="th-desc">Description</th>\n</tr>\n</thead>\n<tbody class="api-table-body">\n<tr>\n<td class="table-cell-name">\n\n\n#### bar\n\n\n</td>\n<td type class="table-cell-type">\n\n\n<code>\n\n\nQueryList&lt;string&gt;\n\n\n</code>\n\n\n</td>\n<td class="table-cell-default">\n\n\n\n\n</td>\n<td class="table-cell-comment">\n\n\nsome comment\n\nlong text\n\n\n</td>\n</tr>\n</tbody>\n</table>`;
+            const pageContent = `## Fields\n\n<table class="api-table api-table-fields">\n<thead>\n<tr>\n<th class="th-name">Name</th>\n<th class="th-type">Type</th>\n<th class="th-default">Default</th>\n<th class="th-desc">Description</th>\n</tr>\n</thead>\n<tbody class="api-table-body">\n<tr>\n<td class="table-cell-name">\n\n\n#### bar\n\n\n</td>\n<td type class="table-cell-type">\n\n\n<code>\n\n\nQueryList&lt;string&gt;\n\n\n</code>\n\n\n</td>\n<td class="table-cell-default">\n\n\n\n\n</td>\n<td class="table-cell-comment">\n\n\nsome comment\nlong text\n\n\n</td>\n</tr>\n</tbody>\n</table>`;
             expect(page).toContain(pageContent);
         });
     });
@@ -251,14 +258,14 @@ describe('API generation', () => {
         it('render inputs name and type', () => {
 
             const page = componentPage(inputsData.withoutNameMapping, packageInfo);
-            const pageContent = `## Inputs\n\n<table class="api-table api-table-inputs">\n<thead>\n<tr>\n<th class="th-name">Name</th>\n<th class="th-type">Type</th>\n<th class="th-default">Default</th>\n<th class="th-desc">Description</th>\n</tr>\n</thead>\n<tbody class="api-table-body">\n<tr>\n<td class="table-cell-name">\n\n\n#### bar\n\n\n</td>\n<td type class="table-cell-type">\n\n\n<code>\n\n\nboolean\n\n\n</code>\n\n\n</td>\n<td class="table-cell-default">\n\n\n\n\n</td>\n<td class="table-cell-comment">\n\n\n\n\n\n</td>\n</tr>\n</tbody>\n</table>`;
+            const pageContent = `## Inputs\n\n<table class="api-table api-table-inputs">\n<thead>\n<tr>\n<th class="th-name">Name</th>\n<th class="th-type">Type</th>\n<th class="th-default">Default</th>\n<th class="th-desc">Description</th>\n</tr>\n</thead>\n<tbody class="api-table-body">\n<tr>\n<td class="table-cell-name">\n\n\n#### bar\n\n\n</td>\n<td type class="table-cell-type">\n\n\n<code>\n\n\nboolean\n\n\n</code>\n\n\n</td>\n<td class="table-cell-default">\n\n\n<code>\n\n\nfalse\n\n\n</code>\n\n\n</td>\n<td class="table-cell-comment">\n\n\n\n\n\n\n\n\n</td>\n</tr>\n</tbody>\n</table>`;
             expect(page).toContain(pageContent);
         });
 
         it('render fields with mapped name', () => {
 
             const page = componentPage(inputsData.withNameMapping, packageInfo);
-            const pageContent = `## Inputs\n\n<table class="api-table api-table-inputs">\n<thead>\n<tr>\n<th class="th-name">Name</th>\n<th class="th-type">Type</th>\n<th class="th-default">Default</th>\n<th class="th-desc">Description</th>\n</tr>\n</thead>\n<tbody class="api-table-body">\n<tr>\n<td class="table-cell-name">\n\n\n#### foo\n\n\n</td>\n<td type class="table-cell-type">\n\n\n<code>\n\n\nboolean\n\n\n</code>\n\n\n</td>\n<td class="table-cell-default">\n\n\n\n\n</td>\n<td class="table-cell-comment">\n\n\n\n\n\n</td>\n</tr>\n</tbody>\n</table>`;
+            const pageContent = `## Inputs\n\n<table class="api-table api-table-inputs">\n<thead>\n<tr>\n<th class="th-name">Name</th>\n<th class="th-type">Type</th>\n<th class="th-default">Default</th>\n<th class="th-desc">Description</th>\n</tr>\n</thead>\n<tbody class="api-table-body">\n<tr>\n<td class="table-cell-name">\n\n\n#### foo\n\n\n</td>\n<td type class="table-cell-type">\n\n\n<code>\n\n\nboolean\n\n\n</code>\n\n\n</td>\n<td class="table-cell-default">\n\n\n<code>\n\n\nfalse\n\n\n</code>\n\n\n</td>\n<td class="table-cell-comment">\n\n\n\n\n\n\n\n\n</td>\n</tr>\n</tbody>\n</table>`;
             expect(page).toContain(pageContent);
         });
     });

package/test/class.json

@@ -1,19 +1,19 @@
 {
     "name": "Shape",
-    "kindString": "Class",
+    "kind": 128,
     "comment": {
         "shortText": "Represents a drawing element that can be filled and stroked"
     },
     "typeParameter": [
         {
             "name": "T",
-            "kindString": "Type parameter"
+            "kind": 131072
         }
     ],
     "children": [
         {
             "name": "constructor",
-            "kindString": "Constructor",
+            "kind": 512,
             "flags": {
                 "isExported": true
             },
@@ -27,12 +27,17 @@
                     "parameters": [
                         {
                             "name": "options",
-                            "kindString": "Parameter",
+                            "kind": 32768,
                             "flags": {
                                 "isOptional": true
                             },
                             "comment": {
-                                "shortText": "The initial values of all options.\n"
+                                "summary": [
+                                    {
+                                        "kind": "text",
+                                        "text": "The initial values of all options.\n"
+                                    }
+                                ]
                             },
                             "type": {
                                 "type": "instrinct",
@@ -49,18 +54,33 @@
         },
         {
             "name": "get",
-            "kindString": "Method",
+            "kind": 2048,
             "flags": {
                 "isExported": true
             },
             "signatures": [
                 {
                     "name": "get",
-                    "kindString": "Call signature",
+                    "kind": 4096,
                     "flags": {},
                     "comment": {
-                        "shortText": "Gets the value of the specified option.",
-                        "returns": "The current option value."
+                        "summary": [
+                            {
+                                "kind": "text",
+                                "text": "Gets the value of the specified option."
+                            }
+                        ],
+                        "blockTags": [
+                            {
+                                "tag": "@returns",
+                                "content": [
+                                    {
+                                        "kind": "text",
+                                        "text": "The current option value."
+                                    }
+                                ]
+                            }
+                        ]
                     },
                     "type": {
                         "type": "instrinct",