refactor: Improve support for signatures rendering (wip)

Author: pawamoy

src/mkdocstrings_handlers/typescript/templates/material/_base/accessor.html.jinja

@@ -55,11 +55,20 @@
             {{ accessor.comment.markdown(symbol_map=accessor.symbol_map)|convert_markdown(heading_level, html_id) }}
           {% endif %}
         {% endblock docstring %}
-        {% block children scoped %}
-          {% set root = False %}
-          {% set heading_level = heading_level + 1 %}
-          {% include "children.html.jinja" with context %}
-        {% endblock children %}
+        {% block setsignature %}
+          {% if accessor.setsignature %}
+            {% with setsignature = access.setsignature %}
+              {% include "setsignature.html.jinja" with context %}
+            {% endwith %}
+          {% endif %}
+        {% endblock setsignature %}
+        {% block getsignature %}
+          {% if accessor.getsignature %}
+            {% with getsignature = access.getsignature %}
+              {% include "getsignature.html.jinja" with context %}
+            {% endwith %}
+          {% endif %}
+        {% endblock getsignature %}
       {% endblock contents %}
     </div>
 

src/mkdocstrings_handlers/typescript/templates/material/_base/call_signature.html.jinja

@@ -0,0 +1,14 @@
+{{ log.debug("Rendering " + call_signature.path) }}
+
+<div class="doc doc-object doc-call_signature">
+  {% with obj = call_signature, html_id = call_signature.path %}
+
+    {% filter highlight(language="typescript", inline=False) %}
+      {{ call_signature.source_contents }}
+    {% endfilter %} 
+
+    {% if call_signature.comment %}
+      {{ call_signature.comment.markdown(symbol_map=call_signature.symbol_map)|convert_markdown(heading_level, html_id) }}
+    {% endif %}
+  {% endwith %}
+</div>

src/mkdocstrings_handlers/typescript/templates/material/_base/constructor.html.jinja

@@ -55,11 +55,11 @@
             {{ constructor.comment.markdown(symbol_map=constructor.symbol_map)|convert_markdown(heading_level, html_id) }}
           {% endif %}
         {% endblock docstring %}
-        {% block children scoped %}
-          {% set root = False %}
-          {% set heading_level = heading_level + 1 %}
-          {% include "children.html.jinja" with context %}
-        {% endblock children %}
+        {% block signatures scoped %}
+          {% for obj in obj.signatures %}
+            {% include "dispatch.html.jinja" with context %}
+          {% endfor %}
+        {% endblock signatures %}
       {% endblock contents %}
     </div>
 

src/mkdocstrings_handlers/typescript/templates/material/_base/constructor_signature.html.jinja

@@ -0,0 +1,76 @@
+{{ log.debug("Rendering " + constructor_signature.path) }}
+
+<div class="doc doc-object doc-constructor_signature">
+  {% with obj = constructor_signature, html_id = constructor_signature.path %}
+
+    {% if root %}
+      {% set show_full_path = config.show_root_full_path %}
+      {% set root_members = True %}
+    {% elif root_members %}
+      {% set show_full_path = config.show_root_members_full_path or config.show_object_full_path %}
+      {% set root_members = False %}
+    {% else %}
+      {% set show_full_path = config.show_object_full_path %}
+    {% endif %}
+
+    {% set constructor_signature_name = constructor_signature.path if show_full_path else constructor_signature.name %}
+    {% set symbol_type = "method" if constructor_signature.parent.is_class else "constructor_signature" %}
+
+    {% if not root or config.show_root_heading %}
+      {% filter heading(
+          heading_level,
+          role="constructor_signature",
+          id=html_id,
+          class="doc doc-heading",
+          toc_label=(('<code class="doc-symbol doc-symbol-toc doc-symbol-' + symbol_type + '"></code>&nbsp;')|safe if config.show_symbol_type_toc else '') + constructor_signature.name,
+      ) %}
+
+        {% block heading scoped %}
+          {% if config.show_symbol_type_heading %}<code class="doc-symbol doc-symbol-heading doc-symbol-{{ symbol_type }}"></code>{% endif %}
+          {% if config.separate_signature %}
+            <span class="doc doc-object-name doc-constructor_signature-name">{{ constructor_signature_name }}</span>
+          {% else %}
+            {%+ filter highlight(language="typescript", inline=True) %}
+              {{ constructor_signature_name }}
+            {% endfilter %}
+          {% endif %}
+        {% endblock heading %}
+
+      {% endfilter %}
+
+      {% block signature scoped %}
+        {% if config.separate_signature %}
+          {% for signature in constructor_signature.signatures %}
+            {% filter highlight(language="typescript", inline=False) %}
+              {{ signature.source_contents }}
+            {% endfilter %} 
+          {% endfor %}
+        {% endif %}
+      {% endblock signature %}
+
+    {% else %}
+
+      {% if config.show_root_toc_entry %}
+        {% filter heading(
+            heading_level,
+            role="constructor_signature",
+            id=html_id,
+            toc_label=(('<code class="doc-symbol doc-symbol-toc doc-symbol-' + symbol_type + '"></code>&nbsp;')|safe if config.show_symbol_type_toc else '') + constructor_signature.name,
+            hidden=True,
+        ) %}
+        {% endfilter %}
+      {% endif %}
+      {% set heading_level = heading_level - 1 %}
+    {% endif %}
+
+    <div class="doc doc-contents {% if root %}first{% endif %}">
+      {% block contents scoped %}
+        {% block docstring scoped %}
+          {% if constructor_signature.comment %}
+            {{ constructor_signature.comment.markdown(symbol_map=constructor_signature.symbol_map)|convert_markdown(heading_level, html_id) }}
+          {% endif %}
+        {% endblock docstring %}
+      {% endblock contents %}
+    </div>
+  {% endwith %}
+</div>

src/mkdocstrings_handlers/typescript/templates/material/_base/function.html.jinja

@@ -42,7 +42,7 @@
         {% if config.separate_signature %}
           {% for signature in function.signatures %}
             {% filter highlight(language="typescript", inline=False) %}
-              {{ signature.source_contents(config.base_file_path) }}
+              {{ signature.source_contents }}
             {% endfilter %} 
           {% endfor %}
         {% endif %}

src/mkdocstrings_handlers/typescript/templates/material/_base/method.html.jinja

@@ -55,11 +55,11 @@
             {{ method.comment.markdown(symbol_map=method.symbol_map)|convert_markdown(heading_level, html_id) }}
           {% endif %}
         {% endblock docstring %}
-        {% block children scoped %}
-          {% set root = False %}
-          {% set heading_level = heading_level + 1 %}
-          {% include "children.html.jinja" with context %}
-        {% endblock children %}
+        {% block signatures scoped %}
+          {% for obj in obj.signatures %}
+            {% include "dispatch.html.jinja" with context %}
+          {% endfor %}
+        {% endblock signatures %}
       {% endblock contents %}
     </div>
 

src/mkdocstrings_handlers/typescript/templates/material/call_signature.html.jinja

@@ -0,0 +1 @@
+{% extends "_base/call_signature.html.jinja" %}

src/mkdocstrings_handlers/typescript/templates/material/constructor_signature.html.jinja

@@ -0,0 +1 @@
+{% extends "_base/constructor_signature.html.jinja" %}