merge

PissedCapslock · Feb 21, 2020 · 015813e · 015813e
2 parents a9aca95 + 042f26d
commit 015813e
Show file tree

Hide file tree

Showing 16 changed files with 265 additions and 68 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "typedoc-default-themes",
   "description": "Default themes for TypeDoc.",
-  "version": "0.6.3",
+  "version": "0.7.2",
   "homepage": "https://typedoc.org/",
   "main": "bin/plugin.js",
   "files": [

diff --git a/src/default/partials/header.hbs b/src/default/partials/header.hbs
@@ -68,4 +68,4 @@
             {{/compact}}</h1>
         </div>
     </div>
-</header>
+</header>
diff --git a/src/default/partials/hierarchy.hbs b/src/default/partials/hierarchy.hbs
@@ -4,7 +4,7 @@
             {{#if ../isTarget}}
                 <span class="target">{{this}}</span>
             {{else}}
-                {{> type}}
+                {{#compact}}{{> type}}{{/compact}}
             {{/if}}
 
             {{#if @last}}

diff --git a/src/default/partials/member.declaration.hbs b/src/default/partials/member.declaration.hbs
@@ -33,4 +33,4 @@
             {{> parameter}}
         {{/with}}
     </div>
-{{/if}}
+{{/if}}
diff --git a/src/default/partials/member.getterSetter.hbs b/src/default/partials/member.getterSetter.hbs
@@ -34,4 +34,4 @@
             </li>
         {{/with}}
     {{/if}}
-</ul>
+</ul>
diff --git a/src/default/partials/member.hbs b/src/default/partials/member.hbs
@@ -8,9 +8,11 @@
         {{> member.signatures}}
     {{else}}{{#if hasGetterOrSetter}}
         {{> member.getterSetter}}
+    {{else}}{{#if isReference}}
+        {{> member.reference}}
     {{else}}
         {{> member.declaration}}
-    {{/if}}{{/if}}
+    {{/if}}{{/if}}{{/if}}
 
     {{#each groups}}
         {{#each children}}

diff --git a/src/default/partials/member.reference.hbs b/src/default/partials/member.reference.hbs
@@ -0,0 +1,11 @@
+{{#with tryGetTargetReflectionDeep}}
+    {{#ifCond ../name '===' name}}
+        Re-exports <a href="{{relativeURL url}}">{{name}}</a>
+    {{else if flags.isExported}}
+        Renames and re-exports <a href="{{relativeURL url}}">{{name}}</a>
+    {{else}}
+        Renames and exports <a href="{{relativeURL url}}">{{name}}</a>
+    {{/ifCond}}
+{{else}}
+    Re-exports {{name}}
+{{/with}}
diff --git a/src/default/partials/member.signature.body.hbs b/src/default/partials/member.signature.body.hbs
@@ -42,7 +42,7 @@
 {{/if}}
 
 {{#if type}}
-    <h4 class="tsd-returns-title">Returns {{#with type}}{{>type}}{{/with}}</h4>
+    <h4 class="tsd-returns-title">Returns {{#compact}}{{#with type}}{{>type}}{{/with}}{{/compact}}</h4>
 
     {{#if comment.returns}}
         {{#markdown}}{{{comment.returns}}}{{/markdown}}
@@ -53,4 +53,4 @@
             {{> parameter}}
         {{/with}}
     {{/if}}
-{{/if}}
+{{/if}}
diff --git a/src/default/partials/member.signature.title.hbs b/src/default/partials/member.signature.title.hbs
@@ -1,28 +1,32 @@
-{{#compact}}
-    {{#unless hideName}}{{{wbr (formatDisplayName name)}}}{{/unless}}
-    {{#if typeParameters}}
-        &lt;
-        {{#each typeParameters}}
-            {{#if @index}},&nbsp;{{/if}}
-            {{formatDisplayName name}}
-        {{/each}}
-        &gt;
-    {{/if}}
-    <span class="tsd-signature-symbol">(</span>
-    {{#each parameters}}
+{{#unless hideName}}{{{formatDisplayName wbr name}}}{{/unless}}
+{{#if typeParameters}}
+    &lt;
+    {{#each typeParameters}}
         {{#if @index}},&nbsp;{{/if}}
-        {{#if flags.isRest}}<span class="tsd-signature-symbol">...</span>{{/if}}
         {{formatDisplayName name}}
-        <span class="tsd-signature-symbol">
-            {{#if flags.isOptional}}?{{/if}}
-            {{#if defaultValue}}?{{/if}}
-            :&nbsp;
-        </span>
-        {{#with type}}{{>type}}{{/with}}
     {{/each}}
-    <span class="tsd-signature-symbol">)</span>
-    {{#if type}}
-        <span class="tsd-signature-symbol">:&nbsp;</span>
-        {{#with type}}{{>type}}{{/with}}
+    &gt;
+{{/if}}
+<span class="tsd-signature-symbol">(</span>
+{{#each parameters}}
+    {{#if @index}},&nbsp;{{/if}}
+    {{#if flags.isRest}}<span class="tsd-signature-symbol">...</span>{{/if}}
+    {{name}}
+    <span class="tsd-signature-symbol">
+        {{#if flags.isOptional}}?{{/if}}
+        {{#if defaultValue}}?{{/if}}
+        :&nbsp;
+    </span>
+    {{#with type}}{{>type}}{{/with}}
+{{/each}}
+<span class="tsd-signature-symbol">)</span>
+{{#if type}}
+    {{#if arrowStyle}}
+        <span class="tsd-signature-symbol"> =&gt; </span>
+    {{else}}
+        <span class="tsd-signature-symbol">: </span>
     {{/if}}
-{{/compact}}
+    {{#with type}}
+        {{>type}}
+    {{/with}}
+{{/if}}
diff --git a/src/default/partials/member.signatures.hbs b/src/default/partials/member.signatures.hbs
@@ -1,6 +1,6 @@
 <ul class="tsd-signatures {{cssClasses}}">
     {{#each signatures}}
-        <li class="tsd-signature tsd-kind-icon">{{> member.signature.title }}</li>
+        <li class="tsd-signature tsd-kind-icon">{{#compact}}{{> member.signature.title }}{{/compact}}</li>
     {{/each}}
 </ul>
 
@@ -10,4 +10,4 @@
             {{> member.signature.body }}
         </li>
     {{/each}}
-</ul>
+</ul>
diff --git a/src/default/partials/parameter.hbs b/src/default/partials/parameter.hbs
@@ -3,7 +3,9 @@
         <li class="tsd-parameter-siganture">
             <ul class="tsd-signatures {{cssClasses}}">
                 {{#each signatures}}
-                    <li class="tsd-signature tsd-kind-icon">{{> member.signature.title hideName=true }}</li>
+                    <li class="tsd-signature tsd-kind-icon">{{#compact}}
+                        {{> member.signature.title hideName=true }}
+                    {{/compact}}</li>
                 {{/each}}
             </ul>