fix(renderer): Fallthrough headings like Kit (#152)

* Push * Add changeset * undo my bullshit
sveltejs · Jun 22, 2023 · d997ad9 · d997ad9
1 parent 7e1046e
commit d997ad9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.changeset/forty-seals-check.md b/.changeset/forty-seals-check.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/site-kit': patch
+---
+
+Fallthrough headings like Kit
diff --git a/packages/site-kit/src/lib/docs/DocsOnThisPage.svelte b/packages/site-kit/src/lib/docs/DocsOnThisPage.svelte
@@ -34,11 +34,6 @@
 		await document.fonts.ready;
 		update();
 		highlight();
-
-		const hash = $page.url.hash.replace(/^#/, '');
-
-		const el = document.getElementById(hash);
-		el?.scrollIntoView({ behavior: 'auto', block: 'start' });
 	});
 
 	afterNavigate(() => {
@@ -60,6 +55,11 @@
 			return heading.getBoundingClientRect().top - parseFloat(style.scrollMarginTop) - top;
 		});
 		height = window.innerHeight;
+
+		const hash = $page.url.hash.replace(/^#/, '');
+
+		const el = document.getElementById(hash);
+		el?.scrollIntoView({ behavior: 'auto', block: 'start' });
 	}
 
 	function highlight() {

diff --git a/packages/site-kit/src/lib/markdown/renderer.js b/packages/site-kit/src/lib/markdown/renderer.js
@@ -177,6 +177,7 @@ export async function render_content_markdown(
  * }} opts
  */
 function parse({ body, code, codespan, type_links }) {
+	/** @type {string[]} */
 	const headings = [];
 
 	// this is a bit hacky, but it allows us to prevent type declarations
@@ -196,14 +197,10 @@ function parse({ body, code, codespan, type_links }) {
 
 			const normalized = normalizeSlugify(raw);
 
-			headings[level] = normalized;
+			headings[level - 1] = normalized;
 			headings.length = level;
 
-			const type_heading_match = /^\[TYPE\]:\s+(.+)/.exec(raw);
-
-			const slug = normalizeSlugify(
-				type_heading_match ? type_links?.get(type_heading_match[1])?.slug ?? '' : raw
-			);
+			const slug = headings.filter(Boolean).join('-');
 
 			return `<h${level} id="${slug}">${html
 				.replace(/<\/?code>/g, '')
@@ -557,9 +554,7 @@ export function replace_export_type_placeholders(content, modules) {
 						const markdown =
 							`<div class="ts-block">${fence(t.snippet, 'dts')}` + children + `</div>`;
 
-						return `### [TYPE]: ${t.name}\n\n${deprecated}\n\n${
-							t.comment ?? ''
-						}\n\n${markdown}\n\n`;
+						return `### ${t.name}\n\n${deprecated}\n\n${t.comment ?? ''}\n\n${markdown}\n\n`;
 					})
 					.join('')}`;
 			})