switch to regex/DOM ToC parsing for subheadings

Author: CoderMuffin

README.md

@@ -34,7 +34,7 @@ Submodule path 'themes/srcf-hugo-theme': checked out 'f6c43f8ca31241acb44c4a7493
 
 ### TODO
 
-* add search
+* refine search
 * vendor static assets centrally
 
 ## Credits

layouts/index.json

@@ -1,7 +1,8 @@
 {{- $index := slice -}}
 {{- range .Site.RegularPages -}}
     {{- $cleanContents := .Plain | htmlUnescape -}}
+    {{- $headingTags := findRE "<a.*? href=\"#.*?\".*?>.*?</a>" .TableOfContents -}}
 
-    {{- $index = $index | append (dict "title" .Title "contents" $cleanContents "headings" .Fragments.Headings "permalink" .Permalink) -}}
+    {{- $index = $index | append (dict "title" .Title "contents" $cleanContents "headingTags" $headingTags "permalink" .Permalink) -}}
 {{- end -}}
 {{- $index | jsonify -}}

static/js/search.js

@@ -12,7 +12,7 @@ window.addEventListener("DOMContentLoaded", function() {
             fuseFetcher = fetch("/index.json")
                 .then(response => response.json())
                 .then(searchIndex => {
-                    flattenIndex(searchIndex);
+                    fixupIndex(searchIndex);
 
                     fuse = new Fuse(searchIndex, {
                         keys: [
@@ -95,18 +95,23 @@ window.addEventListener("DOMContentLoaded", function() {
         }
     }
 
-    function flattenIndex(index) {
-        function flattenHeadings(headings, result = []) {
-            for (const heading of headings) {
-                result.push({ id: heading.ID, title: heading.Title });
-                if (heading.Headings) {
-                    flattenHeadings(heading.Headings, result);
-                }
+    function fixupIndex(index) {
+        const parser = new DOMParser();
+
+        index.forEach(item => {
+            if (!item.headingTags) {
+                item.headings = [];
+                return;
             }
-            return result;
-        }
 
-        index.forEach(item => item.headings = flattenHeadings(item.headings));
+            item.headings = item.headingTags.map(tag => {
+                const element = parser.parseFromString(tag, "text/html").body.firstChild
+                return {
+                    id: element.getAttribute("href").slice(1),
+                    title: element.textContent
+                };
+            });
+        });
     }
 
     function executeSearch(searchQuery) {