improved nav link

Author: mariotaku

package-lock.json

@@ -69,6 +69,7 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.5.2",
     "unist-util-visit": "^5.0.0",
+    "unist-util-visit-parents": "^6.0.1",
     "vfile": "^6.0.1",
     "webpack": "^5.96.0",
     "webpack-cli": "^5.1.4",

package.json

@@ -1,17 +1,17 @@
 # All Guides
 
 * :bi-hash:[Rooting](/guides/rooting/)
-  * [faultmanager](/guides/rooting/faultmanager/)
-  * [dejavuln](/guides/rooting/dejavuln/)
-  * [ASM](/guides/rooting/asm/)
-  * [crashd](/guides/rooting/crashd/)
-  * [WTA](/guides/rooting/wta/)
-  * [RootMyTV](/guides/rooting/rootmytv/)
-  * [GetMeNow](/guides/rooting/getmenow/)
-  * [NVM](/guides/rooting/nvm/)
-
+    * Rooting Methods
+        * [faultmanager](/guides/rooting/faultmanager/)
+        * [dejavuln](/guides/rooting/dejavuln/)
+        * [ASM](/guides/rooting/asm/)
+        * [crashd](/guides/rooting/crashd/)
+        * [WTA](/guides/rooting/wta/)
+        * [RootMyTV](/guides/rooting/rootmytv/)
+        * [GetMeNow](/guides/rooting/getmenow/)
+        * [NVM](/guides/rooting/nvm/)
 * :bi-sliders:System Customization
-  * [Multiview](/guides/customize/multiview/)
-  * Fix Jailer Config
-  * Move Apps to USB
-  * Remove Store Demo
+    * [Multiview](/guides/customize/multiview/)
+    * [Fix Jailer Config](/guides/customize/jail-fix/)
+    * Move Apps to USB
+    * Remove Store Demo

src/views/guides/_sidebar.md

@@ -0,0 +1,5 @@
+# ASM
+
+---
+
+{{> stub }}

src/views/guides/rooting/asm.md

@@ -54,3 +54,4 @@ by [throwaway96](https://github.com/throwaway96).
 ### I'm seeing "This file cannot be played" error
 
 This is not an error. The `.mp3` file is not a real audio file.
+1

src/views/guides/rooting/dejavuln.md

@@ -1,15 +1,12 @@
 import path from "path";
-
 import {remark} from "remark";
-
-import remarkRehype from "remark-rehype";
 import remarkBootstrapIcon from "./remark/bootstrap-icon.js";
-
-import {rehypeLinkActive} from "./rehype/link-active.js";
-import rehypeStringify from "rehype-stringify";
-
+import remarkRehype from "remark-rehype";
+import {rehypeLinkActive, urlMatches} from "./rehype/link-active.js";
 import {visit} from "unist-util-visit";
+import {visitParents} from "unist-util-visit-parents";
 import {toString} from "hast-util-to-string";
+import rehypeStringify from "rehype-stringify";
 
 /**
  * @param relative {string}
@@ -45,25 +42,71 @@ function findSidebar(fs, dir, root) {
 }
 
 /**
- * @param content {string}
- * @param meta {Object}
- * @param loaderContext {import('webpack').LoaderContext<Object> & { data: { [key: string]: any } | string }}
+ *
+ * @param activePath {string}
+ * @return {import('unified').Processor}
  */
-export default function (content, meta, loaderContext) {
-  const {resourcePath, data, context, rootContext, fs} = loaderContext;
-  const sidebarPath = findSidebar(fs, path.dirname(resourcePath), rootContext);
-  const sidebarContent = sidebarPath && fs.readFileSync(sidebarPath, 'utf-8').trim();
-  const processor = remark()
+export function sidebarProcessor(activePath) {
+  return remark()
     .use(remarkBootstrapIcon)
     .use(remarkRehype, {allowDangerousHtml: true})
-    .use(rehypeLinkActive, {active: getPagePath(path.relative(rootContext, resourcePath))})
+    .use(rehypeLinkActive, {active: activePath})
+    .use(() => {
+      /**
+       *
+       * @param li {import('hast').Element}
+       */
+      function removeSubList(li) {
+        const ulIndex = li.children.findIndex(({tagName}) => tagName === 'ul');
+        if (ulIndex < 0) {
+          return;
+        }
+        li.children.splice(ulIndex, 1);
+      }
+
+      return (tree, vfile) => {
+
+        visitParents(tree, node => node.tagName === 'li', (li, ancestors) => {
+          const depth = ancestors.filter(node => node.tagName === 'ul').length;
+          if (depth !== 2) {
+            return;
+          }
+
+          function linkMatchesActive(a) {
+            const href = a.properties?.href;
+            if (!href) {
+              return false;
+            }
+            return urlMatches(href, activePath);
+          }
+
+          let active = false;
+          visit(li, node => node.tagName === 'a' && linkMatchesActive(node), () => active = true);
+          if (!active) {
+            removeSubList(li);
+          }
+        });
+      };
+    })
     .use(() => (tree, vfile) => {
-      visit(tree, e => e.tagName === 'h1', (h1, index, parent) => {
+      visit(tree, node => node.tagName === 'h1', (h1, index, parent) => {
         vfile.data.title = toString(h1);
         parent.children[index] = {type: 'comment', value: vfile.data.title};
       });
     })
-    .use(rehypeStringify, {allowDangerousCharacters: true, allowDangerousHtml: true});
+    .use(rehypeStringify, {allowDangerousCharacters: true, allowDangerousHtml: true})
+}
+
+/**
+ * @param content {string}
+ * @param meta {Object}
+ * @param loaderContext {import('webpack').LoaderContext<Object> & { data: { [key: string]: any } | string }}
+ */
+export default function (content, meta, loaderContext) {
+  const {resourcePath, data, context, rootContext, fs} = loaderContext;
+  const sidebarPath = findSidebar(fs, path.dirname(resourcePath), rootContext);
+  const sidebarContent = sidebarPath && fs.readFileSync(sidebarPath, 'utf-8').trim();
+  const processor = sidebarProcessor(getPagePath(path.relative(rootContext, resourcePath)));
   /** @type {VFile|undefined} */
   const sidebar = sidebarContent && processor.processSync(sidebarContent);
   Object.assign(data, meta, sidebar && {sidebar: sidebar.data.title || 'Pages'});

webpack/markdown-to-page.js

@@ -1,6 +1,16 @@
 import {visit} from "unist-util-visit";
 import {trimEnd} from "lodash-es";
 
+/**
+ *
+ * @param a {string}
+ * @param b {string}
+ * @return {boolean}
+ */
+export function urlMatches(a, b) {
+  return trimEnd(a, '/') === trimEnd(b, '/');
+}
+
 /**
  * @param active{string}
  * @return {Processor}
@@ -12,7 +22,7 @@ export function rehypeLinkActive({active}) {
     if (!href) {
       return false;
     }
-    return trimEnd(href, '/') === active;
+    return urlMatches(href, active);
   }
 
   return (tree) => {