typedoc 0.24.0-beta.3 → 0.24.0-beta.5

package/README.md

@@ -41,7 +41,7 @@ By default, TypeDoc will search for a file called `index` under the directory.
 If your codebase is comprised of one or more npm packages, you can build documentation for each of them individually
 and merge the results together into a single site by setting `entryPointStrategy` to `packages`. In this mode TypeDoc
 requires configuration to be present in each directory to specify the entry points. For an example setup, see
-`<TODO need to create example>`
+https://github.com/Gerrit0/typedoc-packages-example
 
 ### Arguments
 

package/dist/lib/cli.js

@@ -93,12 +93,15 @@ async function run(app) {
         app.logger.hasWarnings()) {
         return ExitCodes.CompileError;
     }
+    const preValidationWarnCount = app.logger.warningCount;
     app.validate(project);
+    const hadValidationWarnings = app.logger.warningCount !== preValidationWarnCount;
     if (app.logger.hasErrors()) {
         return ExitCodes.ValidationError;
     }
-    if (app.options.getValue("treatWarningsAsErrors") &&
-        app.logger.hasWarnings()) {
+    if (hadValidationWarnings &&
+        (app.options.getValue("treatWarningsAsErrors") ||
+            app.options.getValue("treatValidationWarningsAsErrors"))) {
         return ExitCodes.ValidationError;
     }
     if (app.options.getValue("emit") !== "none") {

package/dist/lib/converter/comments/blockLexer.d.ts

@@ -1,2 +1,3 @@
+import ts from "typescript";
 import { Token } from "./lexer";
-export declare function lexBlockComment(file: string, pos?: number, end?: number): Generator<Token, undefined, undefined>;
+export declare function lexBlockComment(file: string, pos?: number, end?: number, jsDoc?: ts.JSDoc | undefined, checker?: ts.TypeChecker | undefined): Generator<Token, undefined, undefined>;

package/dist/lib/converter/comments/blockLexer.js

@@ -1,11 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lexBlockComment = void 0;
+const typescript_1 = __importDefault(require("typescript"));
 const lexer_1 = require("./lexer");
-function* lexBlockComment(file, pos = 0, end = file.length) {
+const ReflectionSymbolId_1 = require("../../models/reflections/ReflectionSymbolId");
+const symbols_1 = require("../utils/symbols");
+function* lexBlockComment(file, pos = 0, end = file.length, jsDoc = undefined, checker = undefined) {
     // Wrapper around our real lex function to collapse adjacent text tokens.
     let textToken;
-    for (const token of lexBlockComment2(file, pos, end)) {
+    for (const token of lexBlockComment2(file, pos, end, getLinkTags(jsDoc), checker)) {
         if (token.kind === lexer_1.TokenSyntaxKind.Text) {
             if (textToken) {
                 textToken.text += token.text;
@@ -28,7 +34,21 @@ function* lexBlockComment(file, pos = 0, end = file.length) {
     return;
 }
 exports.lexBlockComment = lexBlockComment;
-function* lexBlockComment2(file, pos, end) {
+function getLinkTags(jsDoc) {
+    const result = [];
+    if (!jsDoc || typeof jsDoc.comment !== "object")
+        return result;
+    for (const part of jsDoc.comment) {
+        switch (part.kind) {
+            case typescript_1.default.SyntaxKind.JSDocLink:
+            case typescript_1.default.SyntaxKind.JSDocLinkCode:
+            case typescript_1.default.SyntaxKind.JSDocLinkPlain:
+                result.push(part);
+        }
+    }
+    return result;
+}
+function* lexBlockComment2(file, pos, end, linkTags, checker) {
     pos += 2; // Leading '/*'
     end -= 2; // Trailing '*/'
     if (pos < end && file[pos] === "*") {
@@ -47,6 +67,7 @@ function* lexBlockComment2(file, pos, end) {
     }
     let lineStart = true;
     let braceStartsType = false;
+    let linkTagIndex = 0;
     for (;;) {
         if (pos >= end) {
             return;
@@ -171,7 +192,9 @@ function* lexBlockComment2(file, pos, end) {
                 if (lookahead !== pos + 1 &&
                     (lookahead === end || /\s/.test(file[lookahead]))) {
                     braceStartsType = true;
-                    yield makeToken(lexer_1.TokenSyntaxKind.Tag, lookahead - pos);
+                    const token = makeToken(lexer_1.TokenSyntaxKind.Tag, lookahead - pos);
+                    attachLinkTagResult(token);
+                    yield token;
                     break;
                 }
             }
@@ -213,6 +236,24 @@ function* lexBlockComment2(file, pos, end) {
             }
         }
     }
+    function attachLinkTagResult(token) {
+        // We might need to skip link tags if someone has link tags inside of an example comment
+        // pos-1 for opening brace, TS doesn't allow spaces between opening brace and @ sign as of 5.0.2
+        while (linkTagIndex < linkTags.length &&
+            linkTags[linkTagIndex].pos < token.pos - 1) {
+            linkTagIndex++;
+        }
+        if (linkTagIndex < linkTags.length &&
+            linkTags[linkTagIndex].pos === token.pos - 1) {
+            const link = linkTags[linkTagIndex];
+            if (link.name) {
+                const tsTarget = checker?.getSymbolAtLocation(link.name);
+                if (tsTarget) {
+                    token.linkTarget = new ReflectionSymbolId_1.ReflectionSymbolId((0, symbols_1.resolveAliasedSymbol)(tsTarget, checker));
+                }
+            }
+        }
+    }
     function makeToken(kind, size) {
         const start = pos;
         pos += size;

package/dist/lib/converter/comments/discovery.d.ts

@@ -2,5 +2,10 @@ import ts from "typescript";
 import { ReflectionKind } from "../../models";
 import { Logger } from "../../utils";
 import { CommentStyle } from "../../utils/options/declaration";
-export declare function discoverComment(symbol: ts.Symbol, kind: ReflectionKind, logger: Logger, commentStyle: CommentStyle): [ts.SourceFile, ts.CommentRange[]] | undefined;
-export declare function discoverSignatureComment(declaration: ts.SignatureDeclaration | ts.JSDocSignature, commentStyle: CommentStyle): [ts.SourceFile, ts.CommentRange[]] | undefined;
+export interface DiscoveredComment {
+    file: ts.SourceFile;
+    ranges: ts.CommentRange[];
+    jsDoc: ts.JSDoc | undefined;
+}
+export declare function discoverComment(symbol: ts.Symbol, kind: ReflectionKind, logger: Logger, commentStyle: CommentStyle): DiscoveredComment | undefined;
+export declare function discoverSignatureComment(declaration: ts.SignatureDeclaration | ts.JSDocSignature, commentStyle: CommentStyle): DiscoveredComment | undefined;

package/dist/lib/converter/comments/discovery.js

@@ -9,6 +9,20 @@ const models_1 = require("../../models");
 const utils_1 = require("../../utils");
 const declaration_1 = require("../../utils/options/declaration");
 const paths_1 = require("../../utils/paths");
+const assert_1 = require("assert");
+const variablePropertyKinds = [
+    typescript_1.default.SyntaxKind.PropertyDeclaration,
+    typescript_1.default.SyntaxKind.PropertySignature,
+    typescript_1.default.SyntaxKind.BinaryExpression,
+    typescript_1.default.SyntaxKind.PropertyAssignment,
+    // class X { constructor(/** Comment */ readonly z: string) }
+    typescript_1.default.SyntaxKind.Parameter,
+    // Variable values
+    typescript_1.default.SyntaxKind.VariableDeclaration,
+    typescript_1.default.SyntaxKind.BindingElement,
+    typescript_1.default.SyntaxKind.ExportAssignment,
+    typescript_1.default.SyntaxKind.PropertyAccessExpression,
+];
 // Note: This does NOT include JSDoc syntax kinds. This is important!
 // Comments from @typedef and @callback tags are handled specially by
 // the JSDoc converter because we only want part of the comment when
@@ -22,6 +36,11 @@ const wantedKinds = {
         typescript_1.default.SyntaxKind.BindingElement,
         typescript_1.default.SyntaxKind.ExportSpecifier,
         typescript_1.default.SyntaxKind.NamespaceExport,
+        // @namespace support
+        typescript_1.default.SyntaxKind.VariableDeclaration,
+        typescript_1.default.SyntaxKind.BindingElement,
+        typescript_1.default.SyntaxKind.ExportAssignment,
+        typescript_1.default.SyntaxKind.PropertyAccessExpression,
     ],
     [models_1.ReflectionKind.Enum]: [
         typescript_1.default.SyntaxKind.EnumDeclaration,
@@ -33,12 +52,7 @@ const wantedKinds = {
         typescript_1.default.SyntaxKind.PropertyAssignment,
         typescript_1.default.SyntaxKind.PropertySignature,
     ],
-    [models_1.ReflectionKind.Variable]: [
-        typescript_1.default.SyntaxKind.VariableDeclaration,
-        typescript_1.default.SyntaxKind.BindingElement,
-        typescript_1.default.SyntaxKind.ExportAssignment,
-        typescript_1.default.SyntaxKind.PropertyAccessExpression,
-    ],
+    [models_1.ReflectionKind.Variable]: variablePropertyKinds,
     [models_1.ReflectionKind.Function]: [
         typescript_1.default.SyntaxKind.FunctionDeclaration,
         typescript_1.default.SyntaxKind.BindingElement,
@@ -50,16 +64,12 @@ const wantedKinds = {
         typescript_1.default.SyntaxKind.ClassDeclaration,
         typescript_1.default.SyntaxKind.BindingElement,
     ],
-    [models_1.ReflectionKind.Interface]: [typescript_1.default.SyntaxKind.InterfaceDeclaration],
-    [models_1.ReflectionKind.Constructor]: [typescript_1.default.SyntaxKind.Constructor],
-    [models_1.ReflectionKind.Property]: [
-        typescript_1.default.SyntaxKind.PropertyDeclaration,
-        typescript_1.default.SyntaxKind.PropertySignature,
-        typescript_1.default.SyntaxKind.BinaryExpression,
-        typescript_1.default.SyntaxKind.PropertyAssignment,
-        // class X { constructor(/** Comment */ readonly z: string) }
-        typescript_1.default.SyntaxKind.Parameter,
+    [models_1.ReflectionKind.Interface]: [
+        typescript_1.default.SyntaxKind.InterfaceDeclaration,
+        typescript_1.default.SyntaxKind.TypeAliasDeclaration,
     ],
+    [models_1.ReflectionKind.Constructor]: [typescript_1.default.SyntaxKind.Constructor],
+    [models_1.ReflectionKind.Property]: variablePropertyKinds,
     [models_1.ReflectionKind.Method]: [
         typescript_1.default.SyntaxKind.FunctionDeclaration,
         typescript_1.default.SyntaxKind.MethodDeclaration,
@@ -120,7 +130,11 @@ function discoverComment(symbol, kind, logger, commentStyle) {
             }
             const selectedDocComment = comments.find((ranges) => permittedRange(text, ranges, commentStyle));
             if (selectedDocComment) {
-                discovered.push([decl.getSourceFile(), selectedDocComment]);
+                discovered.push({
+                    file: decl.getSourceFile(),
+                    ranges: selectedDocComment,
+                    jsDoc: findJsDocForComment(node, selectedDocComment),
+                });
             }
         }
     }
@@ -131,9 +145,9 @@ function discoverComment(symbol, kind, logger, commentStyle) {
             return discovered[0];
         default: {
             logger.warn(`${symbol.name} has multiple declarations with a comment. An arbitrary comment will be used.`);
-            const locations = discovered.map(([sf, [{ pos }]]) => {
-                const path = (0, paths_1.nicePath)(sf.fileName);
-                const line = typescript_1.default.getLineAndCharacterOfPosition(sf, pos).line + 1;
+            const locations = discovered.map(({ file, ranges: [{ pos }] }) => {
+                const path = (0, paths_1.nicePath)(file.fileName);
+                const line = typescript_1.default.getLineAndCharacterOfPosition(file, pos).line + 1;
                 return `${path}:${line}`;
             });
             logger.info(`The comments for ${symbol.name} are declared at:\n\t${locations.join("\n\t")}`);
@@ -147,15 +161,42 @@ function discoverSignatureComment(declaration, commentStyle) {
     if (!node) {
         return;
     }
+    if (typescript_1.default.isJSDocSignature(node)) {
+        const comment = node.parent.parent;
+        (0, assert_1.ok)(typescript_1.default.isJSDoc(comment));
+        return {
+            file: node.getSourceFile(),
+            ranges: [
+                {
+                    kind: typescript_1.default.SyntaxKind.MultiLineCommentTrivia,
+                    pos: comment.pos,
+                    end: comment.end,
+                },
+            ],
+            jsDoc: undefined,
+        };
+    }
     const text = node.getSourceFile().text;
     const comments = collectCommentRanges(typescript_1.default.getLeadingCommentRanges(text, node.pos));
     comments.reverse();
     const comment = comments.find((ranges) => permittedRange(text, ranges, commentStyle));
     if (comment) {
-        return [node.getSourceFile(), comment];
+        return {
+            file: node.getSourceFile(),
+            ranges: comment,
+            jsDoc: findJsDocForComment(node, comment),
+        };
     }
 }
 exports.discoverSignatureComment = discoverSignatureComment;
+function findJsDocForComment(node, ranges) {
+    if (ranges[0].kind === typescript_1.default.SyntaxKind.MultiLineCommentTrivia) {
+        const jsDocs = typescript_1.default
+            .getJSDocCommentsAndTags(node)
+            .map((doc) => typescript_1.default.findAncestor(doc, typescript_1.default.isJSDoc));
+        return jsDocs.find((doc) => doc.pos === ranges[0].pos);
+    }
+}
 /**
  * Check whether the given module declaration is the topmost.
  *

package/dist/lib/converter/comments/index.d.ts

@@ -7,6 +7,6 @@ export interface CommentParserConfig {
     inlineTags: Set<string>;
     modifierTags: Set<string>;
 }
-export declare function getComment(symbol: ts.Symbol, kind: ReflectionKind, config: CommentParserConfig, logger: Logger, commentStyle: CommentStyle): Comment | undefined;
-export declare function getSignatureComment(declaration: ts.SignatureDeclaration | ts.JSDocSignature, config: CommentParserConfig, logger: Logger, commentStyle: CommentStyle): Comment | undefined;
-export declare function getJsDocComment(declaration: ts.JSDocPropertyLikeTag | ts.JSDocCallbackTag | ts.JSDocTypedefTag | ts.JSDocTemplateTag | ts.JSDocEnumTag, config: CommentParserConfig, logger: Logger): Comment | undefined;
+export declare function getComment(symbol: ts.Symbol, kind: ReflectionKind, config: CommentParserConfig, logger: Logger, commentStyle: CommentStyle, checker: ts.TypeChecker): Comment | undefined;
+export declare function getSignatureComment(declaration: ts.SignatureDeclaration | ts.JSDocSignature, config: CommentParserConfig, logger: Logger, commentStyle: CommentStyle, checker: ts.TypeChecker): Comment | undefined;
+export declare function getJsDocComment(declaration: ts.JSDocPropertyLikeTag | ts.JSDocCallbackTag | ts.JSDocTypedefTag | ts.JSDocTemplateTag | ts.JSDocEnumTag, config: CommentParserConfig, logger: Logger, checker: ts.TypeChecker): Comment | undefined;

package/dist/lib/converter/comments/index.js

@@ -19,10 +19,10 @@ const jsDocCommentKinds = [
     typescript_1.default.SyntaxKind.JSDocEnumTag,
 ];
 const commentCache = new WeakMap();
-function getCommentWithCache(discovered, config, logger) {
+function getCommentWithCache(discovered, config, logger, checker) {
     if (!discovered)
         return;
-    const [file, ranges] = discovered;
+    const { file, ranges, jsDoc } = discovered;
     const cache = commentCache.get(file) || new Map();
     if (cache?.has(ranges[0].pos)) {
         return cache.get(ranges[0].pos).clone();
@@ -30,7 +30,7 @@ function getCommentWithCache(discovered, config, logger) {
     let comment;
     switch (ranges[0].kind) {
         case typescript_1.default.SyntaxKind.MultiLineCommentTrivia:
-            comment = (0, parser_1.parseComment)((0, blockLexer_1.lexBlockComment)(file.text, ranges[0].pos, ranges[0].end), config, file, logger);
+            comment = (0, parser_1.parseComment)((0, blockLexer_1.lexBlockComment)(file.text, ranges[0].pos, ranges[0].end, jsDoc, checker), config, file, logger);
             break;
         case typescript_1.default.SyntaxKind.SingleLineCommentTrivia:
             comment = (0, parser_1.parseComment)((0, lineLexer_1.lexLineComments)(file.text, ranges), config, file, logger);
@@ -42,8 +42,8 @@ function getCommentWithCache(discovered, config, logger) {
     commentCache.set(file, cache);
     return comment.clone();
 }
-function getCommentImpl(commentSource, config, logger, moduleComment) {
-    const comment = getCommentWithCache(commentSource, config, logger);
+function getCommentImpl(commentSource, config, logger, moduleComment, checker) {
+    const comment = getCommentWithCache(commentSource, config, logger, checker);
     if (moduleComment && comment) {
         // Module comment, make sure it is tagged with @packageDocumentation or @module.
         // If it isn't then the comment applies to the first statement in the file, so throw it away.
@@ -61,35 +61,35 @@ function getCommentImpl(commentSource, config, logger, moduleComment) {
     }
     return comment;
 }
-function getComment(symbol, kind, config, logger, commentStyle) {
+function getComment(symbol, kind, config, logger, commentStyle, checker) {
     const declarations = symbol.declarations || [];
     if (declarations.length &&
         declarations.every((d) => jsDocCommentKinds.includes(d.kind))) {
-        return getJsDocComment(declarations[0], config, logger);
+        return getJsDocComment(declarations[0], config, logger, checker);
     }
-    const comment = getCommentImpl((0, discovery_1.discoverComment)(symbol, kind, logger, commentStyle), config, logger, declarations.some(typescript_1.default.isSourceFile));
+    const comment = getCommentImpl((0, discovery_1.discoverComment)(symbol, kind, logger, commentStyle), config, logger, declarations.some(typescript_1.default.isSourceFile), checker);
     if (!comment && kind === models_1.ReflectionKind.Property) {
-        return getConstructorParamPropertyComment(symbol, config, logger, commentStyle);
+        return getConstructorParamPropertyComment(symbol, config, logger, commentStyle, checker);
     }
     return comment;
 }
 exports.getComment = getComment;
-function getConstructorParamPropertyComment(symbol, config, logger, commentStyle) {
+function getConstructorParamPropertyComment(symbol, config, logger, commentStyle, checker) {
     const decl = symbol.declarations?.find(typescript_1.default.isParameter);
     if (!decl)
         return;
     const ctor = decl.parent;
-    const comment = getSignatureComment(ctor, config, logger, commentStyle);
+    const comment = getSignatureComment(ctor, config, logger, commentStyle, checker);
     const paramTag = comment?.getIdentifiedTag(symbol.name, "@param");
     if (paramTag) {
         return new models_1.Comment(paramTag.content);
     }
 }
-function getSignatureComment(declaration, config, logger, commentStyle) {
-    return getCommentImpl((0, discovery_1.discoverSignatureComment)(declaration, commentStyle), config, logger, false);
+function getSignatureComment(declaration, config, logger, commentStyle, checker) {
+    return getCommentImpl((0, discovery_1.discoverSignatureComment)(declaration, commentStyle), config, logger, false, checker);
 }
 exports.getSignatureComment = getSignatureComment;
-function getJsDocComment(declaration, config, logger) {
+function getJsDocComment(declaration, config, logger, checker) {
     const file = declaration.getSourceFile();
     // First, get the whole comment. We know we'll need all of it.
     let parent = declaration.parent;
@@ -97,16 +97,17 @@ function getJsDocComment(declaration, config, logger) {
         parent = parent.parent;
     }
     // Then parse it.
-    const comment = getCommentWithCache([
+    const comment = getCommentWithCache({
         file,
-        [
+        ranges: [
             {
                 kind: typescript_1.default.SyntaxKind.MultiLineCommentTrivia,
                 pos: parent.pos,
                 end: parent.end,
             },
         ],
-    ], config, logger);
+        jsDoc: parent,
+    }, config, logger, checker);
     // And pull out the tag we actually care about.
     if (typescript_1.default.isJSDocEnumTag(declaration)) {
         return new models_1.Comment(comment.getTag("@enum")?.content);

package/dist/lib/converter/comments/lexer.d.ts

@@ -1,3 +1,4 @@
+import type { ReflectionSymbolId } from "../../models";
 export declare enum TokenSyntaxKind {
     Text = "text",
     NewLine = "new_line",
@@ -11,4 +12,5 @@ export interface Token {
     kind: TokenSyntaxKind;
     text: string;
     pos: number;
+    linkTarget?: ReflectionSymbolId;
 }

package/dist/lib/converter/comments/linkResolver.d.ts

@@ -5,5 +5,5 @@ export type ExternalResolveResult = {
     caption?: string;
 };
 export type ExternalSymbolResolver = (ref: DeclarationReference, refl: Reflection, part: Readonly<CommentDisplayPart> | undefined) => ExternalResolveResult | string | undefined;
-export declare function resolveLinks(comment: Comment, reflection: Reflection, externalResolver: ExternalSymbolResolver): void;
-export declare function resolvePartLinks(reflection: Reflection, parts: readonly CommentDisplayPart[], externalResolver: ExternalSymbolResolver): CommentDisplayPart[];
+export declare function resolveLinks(comment: Comment, reflection: Reflection, externalResolver: ExternalSymbolResolver, useTsResolution: boolean): void;
+export declare function resolvePartLinks(reflection: Reflection, parts: readonly CommentDisplayPart[], externalResolver: ExternalSymbolResolver, useTsResolution: boolean): CommentDisplayPart[];

package/dist/lib/converter/comments/linkResolver.js

@@ -9,40 +9,48 @@ const models_1 = require("../../models");
 const declarationReference_1 = require("./declarationReference");
 const declarationReferenceResolver_1 = require("./declarationReferenceResolver");
 const urlPrefix = /^(http|ftp)s?:\/\//;
-function resolveLinks(comment, reflection, externalResolver) {
-    comment.summary = resolvePartLinks(reflection, comment.summary, externalResolver);
+function resolveLinks(comment, reflection, externalResolver, useTsResolution) {
+    comment.summary = resolvePartLinks(reflection, comment.summary, externalResolver, useTsResolution);
     for (const tag of comment.blockTags) {
-        tag.content = resolvePartLinks(reflection, tag.content, externalResolver);
+        tag.content = resolvePartLinks(reflection, tag.content, externalResolver, useTsResolution);
     }
     if (reflection instanceof models_1.DeclarationReflection && reflection.readme) {
-        reflection.readme = resolvePartLinks(reflection, reflection.readme, externalResolver);
+        reflection.readme = resolvePartLinks(reflection, reflection.readme, externalResolver, useTsResolution);
     }
 }
 exports.resolveLinks = resolveLinks;
-function resolvePartLinks(reflection, parts, externalResolver) {
-    return parts.flatMap((part) => processPart(reflection, part, externalResolver));
+function resolvePartLinks(reflection, parts, externalResolver, useTsResolution) {
+    return parts.flatMap((part) => processPart(reflection, part, externalResolver, useTsResolution));
 }
 exports.resolvePartLinks = resolvePartLinks;
-function processPart(reflection, part, externalResolver) {
+function processPart(reflection, part, externalResolver, useTsResolution) {
     if (part.kind === "inline-tag") {
         if (part.tag === "@link" ||
             part.tag === "@linkcode" ||
             part.tag === "@linkplain") {
-            return resolveLinkTag(reflection, part, externalResolver);
+            return resolveLinkTag(reflection, part, externalResolver, useTsResolution);
         }
     }
     return part;
 }
-function resolveLinkTag(reflection, part, externalResolver) {
+function resolveLinkTag(reflection, part, externalResolver, useTsResolution) {
+    let defaultDisplayText = "";
     let pos = 0;
     const end = part.text.length;
     while (pos < end && typescript_1.default.isWhiteSpaceLike(part.text.charCodeAt(pos))) {
         pos++;
     }
-    // Try to parse one
-    const declRef = (0, declarationReference_1.parseDeclarationReference)(part.text, pos, end);
     let target;
-    let defaultDisplayText = "";
+    if (useTsResolution && part.target instanceof models_1.ReflectionSymbolId) {
+        target = reflection.project.getReflectionFromSymbolId(part.target);
+        if (target) {
+            pos = end;
+            defaultDisplayText =
+                part.text.replace(/^\s*[A-Z_$][\w$]*[ |]*/i, "") || target.name;
+        }
+    }
+    // Try to parse a declaration reference if we didn't use the TS symbol for resolution
+    const declRef = !target && (0, declarationReference_1.parseDeclarationReference)(part.text, pos, end);
     if (declRef) {
         // Got one, great! Try to resolve the link
         target = (0, declarationReferenceResolver_1.resolveDeclarationReference)(reflection, declRef[0]);
@@ -65,14 +73,11 @@ function resolveLinkTag(reflection, part, externalResolver) {
             }
         }
     }
-    if (!target) {
-        if (urlPrefix.test(part.text)) {
-            const wsIndex = part.text.search(/\s/);
-            target =
-                wsIndex === -1 ? part.text : part.text.substring(0, wsIndex);
-            pos = target.length;
-            defaultDisplayText = target;
-        }
+    if (!target && urlPrefix.test(part.text)) {
+        const wsIndex = part.text.search(/\s/);
+        target = wsIndex === -1 ? part.text : part.text.substring(0, wsIndex);
+        pos = target.length;
+        defaultDisplayText = target;
     }
     // Remaining text after an optional pipe is the link text, so advance
     // until that's consumed.

package/dist/lib/converter/comments/parser.js

@@ -299,9 +299,13 @@ function inlineTag(lexer, block, config, warning) {
     else {
         lexer.take(); // Close brace
     }
-    block.push({
+    const inlineTag = {
         kind: "inline-tag",
         tag: tagName.text,
         text: content.join(""),
-    });
+    };
+    if (tagName.linkTarget) {
+        inlineTag.target = tagName.linkTarget;
+    }
+    block.push(inlineTag);
 }

package/dist/lib/converter/context.d.ts

@@ -31,13 +31,9 @@ export declare class Context {
      * The scope or parent reflection that is currently processed.
      */
     readonly scope: Reflection;
-    /** @internal */
-    isConvertingTypeNode(): boolean;
-    /** @internal */
-    setConvertingTypeNode(): void;
-    /** @internal */
+    convertingTypeNode: boolean;
+    convertingClassOrInterface: boolean;
     shouldBeStatic: boolean;
-    private convertingTypeNode;
     /**
      * Create a new Context instance.
      *
@@ -46,11 +42,7 @@ export declare class Context {
      */
     constructor(converter: Converter, programs: readonly ts.Program[], project: ProjectReflection, scope?: Context["scope"]);
     /** @internal */
-    get logger(): import("../utils/loggers").Logger;
-    /**
-     * Return the compiler options.
-     */
-    getCompilerOptions(): ts.CompilerOptions;
+    get logger(): import("../utils").Logger;
     /**
      * Return the type declaration of the given node.
      *

package/dist/lib/converter/context.js

@@ -30,14 +30,6 @@ class Context {
         (0, assert_1.ok)(this._program, "Tried to access Context.program when not converting a source file");
         return this._program;
     }
-    /** @internal */
-    isConvertingTypeNode() {
-        return this.convertingTypeNode;
-    }
-    /** @internal */
-    setConvertingTypeNode() {
-        this.convertingTypeNode = true;
-    }
     /**
      * Create a new Context instance.
      *
@@ -45,9 +37,9 @@ class Context {
      * @internal
      */
     constructor(converter, programs, project, scope = project) {
-        /** @internal */
-        this.shouldBeStatic = false;
-        this.convertingTypeNode = false;
+        this.convertingTypeNode = false; // Inherited by withScope
+        this.convertingClassOrInterface = false; // Not inherited
+        this.shouldBeStatic = false; // Not inherited
         this.converter = converter;
         this.programs = programs;
         this.project = project;
@@ -57,12 +49,6 @@ class Context {
     get logger() {
         return this.converter.application.logger;
     }
-    /**
-     * Return the compiler options.
-     */
-    getCompilerOptions() {
-        return this.converter.application.options.getCompilerOptions();
-    }
     /**
      * Return the type declaration of the given node.
      *
@@ -112,6 +98,14 @@ class Context {
     // We need this because modules don't always have symbols.
     nameOverride) {
         const name = (0, tsutils_1.getHumanName)(nameOverride ?? exportSymbol?.name ?? symbol?.name ?? "unknown");
+        if (this.convertingClassOrInterface) {
+            if (kind === index_1.ReflectionKind.Function) {
+                kind = index_1.ReflectionKind.Method;
+            }
+            if (kind === index_1.ReflectionKind.Variable) {
+                kind = index_1.ReflectionKind.Property;
+            }
+        }
         const reflection = new index_1.DeclarationReflection(name, kind, this.scope);
         this.postReflectionCreation(reflection, symbol, exportSymbol);
         return reflection;
@@ -120,10 +114,10 @@ class Context {
         if (exportSymbol &&
             reflection.kind &
                 (index_1.ReflectionKind.SomeModule | index_1.ReflectionKind.Reference)) {
-            reflection.comment = (0, comments_1.getComment)(exportSymbol, reflection.kind, this.converter.config, this.logger, this.converter.commentStyle);
+            reflection.comment = (0, comments_1.getComment)(exportSymbol, reflection.kind, this.converter.config, this.logger, this.converter.commentStyle, this.checker);
         }
         if (symbol && !reflection.comment) {
-            reflection.comment = (0, comments_1.getComment)(symbol, reflection.kind, this.converter.config, this.logger, this.converter.commentStyle);
+            reflection.comment = (0, comments_1.getComment)(symbol, reflection.kind, this.converter.config, this.logger, this.converter.commentStyle, this.checker);
         }
         if (this.shouldBeStatic) {
             reflection.setFlag(index_1.ReflectionFlag.Static);

package/dist/lib/converter/converter.d.ts

@@ -32,6 +32,8 @@ export declare class Converter extends ChildableComponent<Application, Converter
     validation: ValidationOptions;
     /** @internal */
     externalSymbolLinkMappings: Record<string, Record<string, string>>;
+    /** @internal */
+    useTsLinkResolution: boolean;
     private _config?;
     private _externalSymbolResolvers;
     get config(): CommentParserConfig;

package/dist/lib/converter/converter.js

@@ -123,10 +123,10 @@ let Converter = Converter_1 = class Converter extends component_1.ChildableCompo
     }
     resolveLinks(comment, owner) {
         if (comment instanceof index_1.Comment) {
-            (0, linkResolver_1.resolveLinks)(comment, owner, (ref, part, refl) => this.resolveExternalLink(ref, part, refl));
+            (0, linkResolver_1.resolveLinks)(comment, owner, (ref, part, refl) => this.resolveExternalLink(ref, part, refl), this.useTsLinkResolution);
         }
         else {
-            return (0, linkResolver_1.resolvePartLinks)(owner, comment, (ref, part, refl) => this.resolveExternalLink(ref, part, refl));
+            return (0, linkResolver_1.resolvePartLinks)(owner, comment, (ref, part, refl) => this.resolveExternalLink(ref, part, refl), this.useTsLinkResolution);
         }
     }
     /**
@@ -166,7 +166,7 @@ let Converter = Converter_1 = class Converter extends component_1.ChildableCompo
             context.project.registerReflection(context.project, symbol);
             context.project.comment =
                 symbol &&
-                    (0, comments_1.getComment)(symbol, context.project.kind, this.config, this.application.logger, this.commentStyle);
+                    (0, comments_1.getComment)(symbol, context.project.kind, this.config, this.application.logger, this.commentStyle, context.checker);
             context.trigger(Converter_1.EVENT_CREATE_DECLARATION, context.project);
             moduleContext = context;
         }
@@ -334,6 +334,9 @@ __decorate([
 __decorate([
     (0, utils_1.BindOption)("externalSymbolLinkMappings")
 ], Converter.prototype, "externalSymbolLinkMappings", void 0);
+__decorate([
+    (0, utils_1.BindOption)("useTsLinkResolution")
+], Converter.prototype, "useTsLinkResolution", void 0);
 Converter = Converter_1 = __decorate([
     (0, component_1.Component)({
         name: "converter",