@t8/docsgen 0.1.37 → 0.1.39

package/dist/bin.js

@@ -368,20 +368,24 @@ async function getNav(ctx, navItems) {
     }
     navContent = navDom.innerHTML;
   }
-  if (navItems.length > 1) {
-    for (let { id, title, items } of navItems) {
-      s += `
-<li data-id="${id}"><a href="${root}${contentDir}/${id}">${title}</a>`;
-      if (items.length !== 0) {
-        s += "\n  <ul>";
-        for (let { title: title2 } of items) s += `
-    <li>${title2}</li>`;
-        s += "\n  </ul>\n";
+  let navItemCount = 0;
+  for (let { id, title, items } of navItems) {
+    let itemLink = `${root}${contentDir}/${encodeURIComponent(id)}`;
+    s += `
+<li data-id="${id}"><a href="${itemLink}">${title}</a>`;
+    if (items.length !== 0) {
+      s += "\n  <ul>";
+      for (let { id: id2, title: title2 } of items) {
+        s += `
+    <li><a href="${itemLink}#${encodeURIComponent(id2)}">${title2}</a></li>`;
+        navItemCount++;
       }
-      s += "</li>";
+      s += "\n  </ul>\n";
     }
+    s += "</li>";
+    navItemCount++;
   }
-  if (!s && !navContent) return "";
+  if ((!s || navItemCount < 2) && !navContent) return "";
   s = s.trim() ? `<section><ul>${s}
 </ul></section>` : "";
   let repoLink = getRepoLink(ctx);
@@ -429,44 +433,48 @@ function buildNav(ctx, dom) {
   let navItem = null;
   let nav = [];
   if (singlePage)
-    nav.push({
+    navItem = {
       id: "Overview",
       title: "Overview",
       items: []
-    });
-  else {
-    let headings = dom.window.document.body.querySelectorAll("h2, h3, h4, h5, h6");
-    for (let element of headings) {
-      let tagName = element.tagName.toLowerCase();
-      let isSectionTitle = tagName === "h2";
-      let isSubsectionTitle = tagName === "h3";
-      let sectionId = isSectionTitle ? getSlug(element.textContent) : navItem?.id ?? "";
-      let elementId = element.id;
-      if (!elementId)
-        elementId = getSlug(element.textContent).toLowerCase().replace(/_/g, "-");
-      if (elementId) {
-        element.id = elementId;
-        let link = `${root}${contentDir}/${sectionId}`;
-        if (!isSectionTitle) link += `#${elementId}`;
-        linkMap[`#${elementId}`] = link;
-      }
-      if (isSectionTitle) {
-        if (navItem) nav.push(navItem);
-        navItem = {
+    };
+  let headings = dom.window.document.body.querySelectorAll("h2, h3, h4, h5, h6");
+  for (let element of headings) {
+    let tagName = element.tagName.toLowerCase();
+    let isSectionTitle = tagName === "h2";
+    let isSubsectionTitle = tagName === "h3";
+    let sectionId = isSectionTitle ? getSlug(element.textContent) : navItem?.id ?? "";
+    let elementId = element.id;
+    if (!elementId)
+      elementId = getSlug(element.textContent).toLowerCase().replace(/_/g, "-");
+    if (elementId) {
+      element.id = elementId;
+      let link = `${root}${contentDir}/${sectionId}`;
+      if (!isSectionTitle) link += `#${elementId}`;
+      linkMap[`#${elementId}`] = link;
+    }
+    if (singlePage && isSectionTitle) {
+      if (navItem)
+        navItem.items.push({
           id: getSlug(element.textContent),
-          title: element.innerHTML.trim(),
-          items: []
-        };
-      } else if (isSubsectionTitle) {
-        if (navItem)
-          navItem.items.push({
-            id: getSlug(element.textContent),
-            title: element.innerHTML.trim()
-          });
-      }
+          title: element.innerHTML.trim()
+        });
+    } else if (isSectionTitle) {
+      if (navItem) nav.push(navItem);
+      navItem = {
+        id: getSlug(element.textContent),
+        title: element.innerHTML.trim(),
+        items: []
+      };
+    } else if (isSubsectionTitle) {
+      if (navItem)
+        navItem.items.push({
+          id: getSlug(element.textContent),
+          title: element.innerHTML.trim()
+        });
     }
-    if (navItem) nav.push(navItem);
   }
+  if (navItem) nav.push(navItem);
   return {
     nav,
     linkMap

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@t8/docsgen",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "description": "",
   "main": "dist/bin.js",
   "bin": {

package/src/bin/getNav.ts

@@ -30,23 +30,29 @@ export async function getNav(ctx: Context, navItems: NavItem[]) {
     navContent = navDom.innerHTML;
   }
 
-  if (navItems.length > 1) {
-    for (let { id, title, items } of navItems) {
-      s += `\n<li data-id="${id}"><a href="${root}${contentDir}/${id}">${title}</a>`;
+  let navItemCount = 0;
 
-      if (items.length !== 0) {
-        s += "\n  <ul>";
+  for (let { id, title, items } of navItems) {
+    let itemLink = `${root}${contentDir}/${encodeURIComponent(id)}`;
 
-        for (let { title } of items) s += `\n    <li>${title}</li>`;
+    s += `\n<li data-id="${id}"><a href="${itemLink}">${title}</a>`;
 
-        s += "\n  </ul>\n";
+    if (items.length !== 0) {
+      s += "\n  <ul>";
+
+      for (let { id, title } of items) {
+        s += `\n    <li><a href="${itemLink}#${encodeURIComponent(id)}">${title}</a></li>`;
+        navItemCount++;
       }
 
-      s += "</li>";
+      s += "\n  </ul>\n";
     }
+
+    s += "</li>";
+    navItemCount++;
   }
 
-  if (!s && !navContent) return "";
+  if ((!s || navItemCount < 2) && !navContent) return "";
 
   s = s.trim() ? `<section><ul>${s}\n</ul></section>` : "";
 

package/src/bin/getParsedContent.ts

@@ -22,61 +22,66 @@ function buildNav(ctx: Context, dom: JSDOM) {
   let nav: NavItem[] = [];
 
   if (singlePage)
-    nav.push({
+    navItem = {
       id: "Overview",
       title: "Overview",
       items: [],
-    });
-  else {
-    let headings =
-      dom.window.document.body.querySelectorAll("h2, h3, h4, h5, h6");
+    };
 
-    for (let element of headings) {
-      let tagName = element.tagName.toLowerCase();
+  let headings =
+    dom.window.document.body.querySelectorAll("h2, h3, h4, h5, h6");
 
-      let isSectionTitle = tagName === "h2";
-      let isSubsectionTitle = tagName === "h3";
+  for (let element of headings) {
+    let tagName = element.tagName.toLowerCase();
 
-      let sectionId = isSectionTitle
-        ? getSlug(element.textContent)
-        : (navItem?.id ?? "");
-      let elementId = element.id;
+    let isSectionTitle = tagName === "h2";
+    let isSubsectionTitle = tagName === "h3";
 
-      if (!elementId)
-        elementId = getSlug(element.textContent)
-          .toLowerCase()
-          .replace(/_/g, "-");
+    let sectionId = isSectionTitle
+      ? getSlug(element.textContent)
+      : (navItem?.id ?? "");
+    let elementId = element.id;
 
-      if (elementId) {
-        element.id = elementId;
+    if (!elementId)
+      elementId = getSlug(element.textContent)
+        .toLowerCase()
+        .replace(/_/g, "-");
 
-        let link = `${root}${contentDir}/${sectionId}`;
+    if (elementId) {
+      element.id = elementId;
 
-        if (!isSectionTitle) link += `#${elementId}`;
+      let link = `${root}${contentDir}/${sectionId}`;
 
-        linkMap[`#${elementId}`] = link;
-      }
+      if (!isSectionTitle) link += `#${elementId}`;
 
-      if (isSectionTitle) {
-        if (navItem) nav.push(navItem);
+      linkMap[`#${elementId}`] = link;
+    }
 
-        navItem = {
+    if (singlePage && isSectionTitle) {
+      if (navItem)
+        navItem.items.push({
           id: getSlug(element.textContent),
           title: element.innerHTML.trim(),
-          items: [],
-        };
-      } else if (isSubsectionTitle) {
-        if (navItem)
-          navItem.items.push({
-            id: getSlug(element.textContent),
-            title: element.innerHTML.trim(),
-          });
-      }
+        });
+    } else if (isSectionTitle) {
+      if (navItem) nav.push(navItem);
+
+      navItem = {
+        id: getSlug(element.textContent),
+        title: element.innerHTML.trim(),
+        items: [],
+      };
+    } else if (isSubsectionTitle) {
+      if (navItem)
+        navItem.items.push({
+          id: getSlug(element.textContent),
+          title: element.innerHTML.trim(),
+        });
     }
-
-    if (navItem) nav.push(navItem);
   }
 
+  if (navItem) nav.push(navItem);
+
   return {
     nav,
     linkMap,