Fix contents misplacement

Fixes #6

Author: Nixinova

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Next
+- Fix TOC being misplaced when non-wikitext headings are on the page.
+- Fixed spacing issues in output.
+
 ## 1.3.5
 *2024-05-12*
 - Changed output to no longer be prettified.

src/compile.ts

@@ -72,8 +72,14 @@ export function compile(dir: string = '.', config: Config = {}): void {
                 </div>
             `;
             // Set TOC on page
-            if (outText.includes('<toc></toc>')) outText = outText.replace('<toc></toc>', tocElem);
-            else outText = outText.replace(/<h\d[^>]*>/, tocElem + '$&');
+            if (outText.includes('<toc></toc>')) {
+                // put TOC where explicitly declared
+                outText = outText.replace('<toc></toc>', tocElem);
+            }
+            else {
+                // put TOC above first auto heading
+                outText = outText.replace(/<h[1-6] auto/, tocElem + '$&');
+            }
         }
 
         // Create plaintext of HTML for use as description/metadata property.

src/parse.ts

@@ -321,7 +321,7 @@ export function parse(data: string, config: Config = {}): Result {
             // Headings: ==heading==
             .replace(re(r`^ (=+) \s* (.+?) \s* \1 \s* $`), (_, lvl, txt) => {
                 const linkForm = encodeURI(txt.replace(/ /g, '_').replace(/<.+?>/g, ''));
-                return `<h${lvl.length} id="${linkForm}">${txt}</h${lvl.length}>`;
+                return `<h${lvl.length} auto id="${linkForm}">${txt}</h${lvl.length}>`;
             })
 
             // Bulleted list: *item

test/src/example.wiki

@@ -1,11 +1,13 @@
 {{displaytitle: Example Page}}
-'''Wikity''' is a very useful build tool!
+<h1>Example</h1>
+'''Wikity''' is a ''very'' useful build tool!
 
 <div style="border:1px solid">
 = Headings =
 = Root =
 == Heading ==
 === Subheading ===
+=== A [[Link Heading]] ===
 == Broken heading ===
 ====== Small heading ======
 == ''fancy'' '''heading'''! ==