Merge pull request TypeStrong#52 from makana/generic-typealias

Added support for generic type aliases
lddubeau · Dec 16, 2017 · 6705af9 · 6705af9
2 parents b79ff37 + a71ca47
commit 6705af9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 2 deletions.
diff --git a/src/default/assets/css/setup/_icons.scss b/src/default/assets/css/setup/_icons.scss
@@ -8,7 +8,8 @@ $type-icons:
  (enum),
  (enum-member),
  (signature),
- (type-alias);
+ (type-alias),
+ ('type-alias.tsd-has-type-parameter');
 
 $member-icons:
  (variable, property),

diff --git a/src/default/assets/images/icons.png b/src/default/assets/images/icons.png
diff --git a/src/default/assets/images/icons.psd b/src/default/assets/images/icons.psd
diff --git a/src/default/assets/images/icons@2x.png b/src/default/assets/images/icons@2x.png
diff --git a/src/default/partials/footer.hbs b/src/default/partials/footer.hbs
@@ -11,6 +11,8 @@
  <li class="tsd-kind-function tsd-has-type-parameter"><span class="tsd-kind-icon">Function with type parameter</span></li>
  <li class="tsd-kind-index-signature"><span class="tsd-kind-icon">Index signature</span></li>
  <li class="tsd-kind-type-alias"><span class="tsd-kind-icon">Type alias</span></li>
+ <li class="tsd-kind-type-alias tsd-has-type-parameter"><span class="tsd-kind-icon">Type alias with type parameter</span></li>
+
  </ul>
  <ul class="tsd-legend">
  <li class="tsd-kind-enum"><span class="tsd-kind-icon">Enumeration</span></li>

diff --git a/src/default/partials/member.declaration.hbs b/src/default/partials/member.declaration.hbs
@@ -1,5 +1,14 @@
 <div class="tsd-signature tsd-kind-icon">{{#compact}}
- {{{wbr name}}}<span class="tsd-signature-symbol">{{#if isOptional}}?{{/if}}:</span>&nbsp;{{#with type}}{{>type}}{{/with}}
+ {{{wbr name}}}
+ {{#if typeParameters}}
+ &lt;
+ {{#each typeParameters}}
+ {{#if @index}},&nbsp;{{/if}}
+ {{name}}
+ {{/each}}
+ &gt;
+ {{/if}}
+ <span class="tsd-signature-symbol">{{#if isOptional}}?{{/if}}:</span>&nbsp;{{#with type}}{{>type}}{{/with}}
  {{#if defaultValue}}
  <span class="tsd-signature-symbol">
  &nbsp;=&nbsp;
@@ -12,6 +21,11 @@
 
 {{> comment}}
 
+{{#if typeParameters}}
+ <h4 class="tsd-type-parameters-title">Type parameters</h4>
+ {{> typeParameters}}
+{{/if}}
+
 {{#if type.declaration}}
  <div class="tsd-type-declaration">
  <h4>Type declaration</h4>