Skip to content

Commit

Permalink
fix: correctly render reference (#254)
Browse files Browse the repository at this point in the history
  • Loading branch information
tgreyuk committed Oct 5, 2021
1 parent 656bd6b commit 32ce13a
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 25 deletions.
4 changes: 4 additions & 0 deletions packages/typedoc-plugin-markdown/src/render-utils.ts
Expand Up @@ -7,6 +7,7 @@ import commentsHelper from './resources/helpers/comments';
import declarationTitleHelper from './resources/helpers/declaration-title';
import escapeHelper from './resources/helpers/escape';
import hierarchyHelper from './resources/helpers/hierarchy';
import ifIsReference from './resources/helpers/if-is-reference';
import ifShowBreadcrumbsHelper from './resources/helpers/if-show-breadcrumbs';
import ifShowNamedAnchorsHelper from './resources/helpers/if-show-named-anchors';
import ifShowPageTitleHelper from './resources/helpers/if-show-page-title';
Expand All @@ -15,6 +16,7 @@ import ifShowTypeHierarchyHelper from './resources/helpers/if-show-type-hierarch
import indexSignatureTitleHelper from './resources/helpers/index-signature-title';
import parameterTableHelper from './resources/helpers/parameter-table';
import propertyTableHelper from './resources/helpers/property-table';
import referenceMember from './resources/helpers/reference-member';
import reflectionPathHelper from './resources/helpers/reflection-path';
import reflectionTitleHelper from './resources/helpers/reflection-title';
import relativeUrlHelper from './resources/helpers/relative-url';
Expand Down Expand Up @@ -58,6 +60,7 @@ export function registerHelpers(theme: MarkdownTheme) {
declarationTitleHelper();
escapeHelper();
hierarchyHelper();
ifIsReference();
ifShowBreadcrumbsHelper(theme);
ifShowNamedAnchorsHelper(theme);
ifShowPageTitleHelper(theme);
Expand All @@ -66,6 +69,7 @@ export function registerHelpers(theme: MarkdownTheme) {
indexSignatureTitleHelper();
parameterTableHelper();
propertyTableHelper();
referenceMember();
reflectionPathHelper();
reflectionTitleHelper(theme);
relativeUrlHelper(theme);
Expand Down
@@ -0,0 +1,16 @@
import * as Handlebars from 'handlebars';
import { DeclarationReflection, ReferenceReflection } from 'typedoc';

export default function () {
Handlebars.registerHelper(
'ifIsReference',
function (
this: DeclarationReflection | ReferenceReflection,
options: Handlebars.HelperOptions,
) {
return this instanceof ReferenceReflection
? options.fn(this)
: options.inverse(this);
},
);
}
@@ -0,0 +1,25 @@
import * as Handlebars from 'handlebars';
import { ReferenceReflection } from 'typedoc';

export default function () {
Handlebars.registerHelper(
'referenceMember',
function (this: ReferenceReflection) {
const referenced = this.tryGetTargetReflectionDeep();

if (!referenced) {
return `Re-exports ${this.name}`;
}

if (this.name === referenced.name) {
return `Re-exports [${
referenced.name
}](${Handlebars.helpers.relativeURL(referenced.url)})`;
}

return `Renames and re-exports [${
referenced.name
}](${Handlebars.helpers.relativeURL(referenced.url)})`;
},
);
}
Expand Up @@ -24,15 +24,15 @@

{{else}}

{{#if isReference}}
{{#ifIsReference}}

{{> member.reference}}
{{referenceMember}}

{{else}}

{{> member.declaration}}

{{/if}}
{{/ifIsReference}}

{{/if}}

Expand All @@ -42,4 +42,4 @@
{{#unless hasOwnDocument}}
___
{{/unless}}
{{/unless}}
{{/unless}}

This file was deleted.

0 comments on commit 32ce13a

Please sign in to comment.