From da4e857beb1666364ea93feeda9d79a524750ed6 Mon Sep 17 00:00:00 2001
From: kaphula <vaaka@protonmail.com>
Date: Mon, 22 Aug 2022 06:58:45 +0300
Subject: [PATCH 1/3] Remove default reflection headers of Hierarchy and Type
 Parameters from DefaultThemeRenderContext when overridden.

---
 .../themes/default/partials/hierarchy.tsx     | 19 ++++---
 .../default/partials/typeParameters.tsx       | 49 ++++++++++---------
 .../themes/default/templates/reflection.tsx   |  2 -
 3 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/lib/output/themes/default/partials/hierarchy.tsx b/src/lib/output/themes/default/partials/hierarchy.tsx
index 3d35c73e0..f2747852a 100644
--- a/src/lib/output/themes/default/partials/hierarchy.tsx
+++ b/src/lib/output/themes/default/partials/hierarchy.tsx
@@ -3,12 +3,15 @@ import { JSX } from "../../../../utils";
 import type { DeclarationHierarchy } from "../../../../models";
 
 export const hierarchy = (context: DefaultThemeRenderContext, props: DeclarationHierarchy) => (
-    <ul class="tsd-hierarchy">
-        {props.types.map((item, i, l) => (
-            <li>
-                {props.isTarget ? <span class="target">{item.toString()}</span> : context.type(item)}
-                {i === l.length - 1 && !!props.next && context.hierarchy(props.next)}
-            </li>
-        ))}
-    </ul>
+    <>
+        <h4>Hierarchy</h4>
+        <ul class="tsd-hierarchy">
+            {props.types.map((item, i, l) => (
+                <li>
+                    {props.isTarget ? <span class="target">{item.toString()}</span> : context.type(item)}
+                    {i === l.length - 1 && !!props.next && context.hierarchy(props.next)}
+                </li>
+            ))}
+        </ul>
+    </>
 );
diff --git a/src/lib/output/themes/default/partials/typeParameters.tsx b/src/lib/output/themes/default/partials/typeParameters.tsx
index 558b8e9de..fc23efdef 100644
--- a/src/lib/output/themes/default/partials/typeParameters.tsx
+++ b/src/lib/output/themes/default/partials/typeParameters.tsx
@@ -4,28 +4,31 @@ import { JSX } from "../../../../utils";
 
 export function typeParameters(context: DefaultThemeRenderContext, typeParameters: TypeParameterReflection[]) {
     return (
-        <ul class="tsd-type-parameters">
-            {typeParameters?.map((item) => (
-                <li>
-                    <h4>
-                        {item.varianceModifier ? `${item.varianceModifier} ` : ""}
-                        {item.name}
-                        {!!item.type && (
-                            <>
-                                <span class="tsd-signature-symbol"> extends </span>
-                                {context.type(item.type)}
-                            </>
-                        )}
-                        {!!item.default && (
-                            <>
-                                {" = "}
-                                {context.type(item.default)}
-                            </>
-                        )}
-                    </h4>
-                    {context.comment(item)}
-                </li>
-            ))}
-        </ul>
+        <>
+            <h4>Type Parameters</h4>
+            <ul class="tsd-type-parameters">
+                {typeParameters?.map((item) => (
+                    <li>
+                        <h4>
+                            {item.varianceModifier ? `${item.varianceModifier} ` : ""}
+                            {item.name}
+                            {!!item.type && (
+                                <>
+                                    <span class="tsd-signature-symbol"> extends </span>
+                                    {context.type(item.type)}
+                                </>
+                            )}
+                            {!!item.default && (
+                                <>
+                                    {" = "}
+                                    {context.type(item.default)}
+                                </>
+                            )}
+                        </h4>
+                        {context.comment(item)}
+                    </li>
+                ))}
+            </ul>
+        </>
     );
 }
diff --git a/src/lib/output/themes/default/templates/reflection.tsx b/src/lib/output/themes/default/templates/reflection.tsx
index 2899e6ae3..1d2a7ae12 100644
--- a/src/lib/output/themes/default/templates/reflection.tsx
+++ b/src/lib/output/themes/default/templates/reflection.tsx
@@ -18,7 +18,6 @@ export function reflectionTemplate(context: DefaultThemeRenderContext, props: Pa
 
             {hasTypeParameters(props.model) && (
                 <section class="tsd-panel tsd-type-parameters">
-                    <h4>Type Parameters</h4>
                     {context.typeParameters(props.model.typeParameters)}
                 </section>
             )}
@@ -26,7 +25,6 @@ export function reflectionTemplate(context: DefaultThemeRenderContext, props: Pa
                 <>
                     {!!props.model.typeHierarchy && (
                         <section class="tsd-panel tsd-hierarchy">
-                            <h4>Hierarchy</h4>
                             {context.hierarchy(props.model.typeHierarchy)}
                         </section>
                     )}

From d7a2daf7a42877a7e91ec8fc87fbf8dd8004225e Mon Sep 17 00:00:00 2001
From: kaphula <vaaka@protonmail.com>
Date: Fri, 26 Aug 2022 06:00:30 +0300
Subject: [PATCH 2/3] Refactor Hierarchy and TypeParameters sections.

---
 package.json                                  |  2 +-
 .../themes/default/partials/hierarchy.tsx     | 24 +++++----
 .../default/partials/typeParameters.tsx       | 50 ++++++++++---------
 .../themes/default/templates/reflection.tsx   | 13 ++---
 4 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/package.json b/package.json
index c3802074c..db961254f 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "build:prod": "npm run build:prod:tsc && npm run build:themes",
     "build:prod:tsc": "tsc --project . --sourceMap false",
     "lint": "eslint . && npm run prettier -- --check .",
-    "prettier": "prettier --config .config/.prettierrc.json --ignore-path .config/.prettierignore",
+    "prettier": "prettier -w --config .config/.prettierrc.json --ignore-path .config/.prettierignore",
     "prepublishOnly": "node scripts/set_strict.js false && npm run build:prod && npm test",
     "postpublish": "node scripts/set_strict.js true"
   },
diff --git a/src/lib/output/themes/default/partials/hierarchy.tsx b/src/lib/output/themes/default/partials/hierarchy.tsx
index f2747852a..47a3b11c7 100644
--- a/src/lib/output/themes/default/partials/hierarchy.tsx
+++ b/src/lib/output/themes/default/partials/hierarchy.tsx
@@ -2,16 +2,20 @@ import type { DefaultThemeRenderContext } from "../DefaultThemeRenderContext";
 import { JSX } from "../../../../utils";
 import type { DeclarationHierarchy } from "../../../../models";
 
-export const hierarchy = (context: DefaultThemeRenderContext, props: DeclarationHierarchy) => (
+export const hierarchy = (context: DefaultThemeRenderContext, props: DeclarationHierarchy | undefined) => (
     <>
-        <h4>Hierarchy</h4>
-        <ul class="tsd-hierarchy">
-            {props.types.map((item, i, l) => (
-                <li>
-                    {props.isTarget ? <span class="target">{item.toString()}</span> : context.type(item)}
-                    {i === l.length - 1 && !!props.next && context.hierarchy(props.next)}
-                </li>
-            ))}
-        </ul>
+        {!!props && (
+            <section class="tsd-panel tsd-hierarchy">
+                <h4>Hierarchy</h4>
+                <ul class="tsd-hierarchy">
+                    {props.types.map((item, i, l) => (
+                        <li>
+                            {props.isTarget ? <span class="target">{item.toString()}</span> : context.type(item)}
+                            {i === l.length - 1 && !!props.next && context.hierarchy(props.next)}
+                        </li>
+                    ))}
+                </ul>
+            </section>
+        )}
     </>
 );
diff --git a/src/lib/output/themes/default/partials/typeParameters.tsx b/src/lib/output/themes/default/partials/typeParameters.tsx
index fc23efdef..fa4065a41 100644
--- a/src/lib/output/themes/default/partials/typeParameters.tsx
+++ b/src/lib/output/themes/default/partials/typeParameters.tsx
@@ -5,30 +5,32 @@ import { JSX } from "../../../../utils";
 export function typeParameters(context: DefaultThemeRenderContext, typeParameters: TypeParameterReflection[]) {
     return (
         <>
-            <h4>Type Parameters</h4>
-            <ul class="tsd-type-parameters">
-                {typeParameters?.map((item) => (
-                    <li>
-                        <h4>
-                            {item.varianceModifier ? `${item.varianceModifier} ` : ""}
-                            {item.name}
-                            {!!item.type && (
-                                <>
-                                    <span class="tsd-signature-symbol"> extends </span>
-                                    {context.type(item.type)}
-                                </>
-                            )}
-                            {!!item.default && (
-                                <>
-                                    {" = "}
-                                    {context.type(item.default)}
-                                </>
-                            )}
-                        </h4>
-                        {context.comment(item)}
-                    </li>
-                ))}
-            </ul>
+            <section class="tsd-panel tsd-type-parameters">
+                <h4>Type Parameters</h4>
+                <ul class="tsd-type-parameters">
+                    {typeParameters?.map((item) => (
+                        <li>
+                            <h4>
+                                {item.varianceModifier ? `${item.varianceModifier} ` : ""}
+                                {item.name}
+                                {!!item.type && (
+                                    <>
+                                        <span class="tsd-signature-symbol"> extends </span>
+                                        {context.type(item.type)}
+                                    </>
+                                )}
+                                {!!item.default && (
+                                    <>
+                                        {" = "}
+                                        {context.type(item.default)}
+                                    </>
+                                )}
+                            </h4>
+                            {context.comment(item)}
+                        </li>
+                    ))}
+                </ul>
+            </section>
         </>
     );
 }
diff --git a/src/lib/output/themes/default/templates/reflection.tsx b/src/lib/output/themes/default/templates/reflection.tsx
index 1d2a7ae12..183e66df9 100644
--- a/src/lib/output/themes/default/templates/reflection.tsx
+++ b/src/lib/output/themes/default/templates/reflection.tsx
@@ -16,18 +16,11 @@ export function reflectionTemplate(context: DefaultThemeRenderContext, props: Pa
                 <section class="tsd-panel tsd-comment">{context.comment(props.model)}</section>
             )}
 
-            {hasTypeParameters(props.model) && (
-                <section class="tsd-panel tsd-type-parameters">
-                    {context.typeParameters(props.model.typeParameters)}
-                </section>
-            )}
+            {hasTypeParameters(props.model) && <> {context.typeParameters(props.model.typeParameters)} </>}
             {props.model instanceof DeclarationReflection && (
                 <>
-                    {!!props.model.typeHierarchy && (
-                        <section class="tsd-panel tsd-hierarchy">
-                            {context.hierarchy(props.model.typeHierarchy)}
-                        </section>
-                    )}
+                    {context.hierarchy(props.model.typeHierarchy)}
+
                     {!!props.model.implementedTypes && (
                         <section class="tsd-panel">
                             <h4>Implements</h4>

From 113a963a19b9e285507ba05561b2e81d5fd6d6b1 Mon Sep 17 00:00:00 2001
From: kaphula <vaaka@protonmail.com>
Date: Fri, 26 Aug 2022 06:04:01 +0300
Subject: [PATCH 3/3] Remove -w from prettier.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index db961254f..c3802074c 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "build:prod": "npm run build:prod:tsc && npm run build:themes",
     "build:prod:tsc": "tsc --project . --sourceMap false",
     "lint": "eslint . && npm run prettier -- --check .",
-    "prettier": "prettier -w --config .config/.prettierrc.json --ignore-path .config/.prettierignore",
+    "prettier": "prettier --config .config/.prettierrc.json --ignore-path .config/.prettierignore",
     "prepublishOnly": "node scripts/set_strict.js false && npm run build:prod && npm test",
     "postpublish": "node scripts/set_strict.js true"
   },