@t8/docsgen 0.1.38 → 0.1.40

package/dist/bin.js

@@ -368,22 +368,24 @@ async function getNav(ctx, navItems) {
     }
     navContent = navDom.innerHTML;
   }
-  if (navItems.length > 1) {
-    for (let { id, title, items } of navItems) {
-      let itemLink = `${root}${contentDir}/${encodeURIComponent(id)}`;
-      s += `
+  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 += `
+    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>`;
-        s += "\n  </ul>\n";
+        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);
@@ -441,35 +443,35 @@ function buildNav(ctx, dom) {
     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;
-    }
+    let slug = getSlug(element.textContent);
+    let sectionId = isSectionTitle ? slug : navItem?.id ?? "";
+    let link = `${root}${contentDir}/${sectionId}`;
+    if (!isSectionTitle) link += `#${slug}`;
+    linkMap[`#${slug}`] = link;
     if (singlePage && isSectionTitle) {
-      if (navItem)
+      if (navItem) {
+        element.id = slug;
         navItem.items.push({
-          id: getSlug(element.textContent),
+          id: slug,
           title: element.innerHTML.trim()
         });
+      }
     } else if (isSectionTitle) {
+      element.id = slug;
       if (navItem) nav.push(navItem);
       navItem = {
-        id: getSlug(element.textContent),
+        id: slug,
         title: element.innerHTML.trim(),
         items: []
       };
     } else if (isSubsectionTitle) {
-      if (navItem)
+      if (navItem) {
+        element.id = slug;
         navItem.items.push({
-          id: getSlug(element.textContent),
+          id: slug,
           title: element.innerHTML.trim()
         });
+      }
     }
   }
   if (navItem) nav.push(navItem);

package/package.json

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

package/src/bin/getNav.ts

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

@@ -36,47 +36,41 @@ function buildNav(ctx: Context, dom: JSDOM) {
 
     let isSectionTitle = tagName === "h2";
     let isSubsectionTitle = tagName === "h3";
+    let slug = getSlug(element.textContent);
 
-    let sectionId = isSectionTitle
-      ? getSlug(element.textContent)
-      : (navItem?.id ?? "");
-    let elementId = element.id;
+    let sectionId = isSectionTitle ? slug : (navItem?.id ?? "");
+    let link = `${root}${contentDir}/${sectionId}`;
 
-    if (!elementId)
-      elementId = getSlug(element.textContent)
-        .toLowerCase()
-        .replace(/_/g, "-");
+    if (!isSectionTitle) link += `#${slug}`;
 
-    if (elementId) {
-      element.id = elementId;
-
-      let link = `${root}${contentDir}/${sectionId}`;
-
-      if (!isSectionTitle) link += `#${elementId}`;
-
-      linkMap[`#${elementId}`] = link;
-    }
+    linkMap[`#${slug}`] = link;
 
     if (singlePage && isSectionTitle) {
-      if (navItem)
+      if (navItem) {
+        element.id = slug;
         navItem.items.push({
-          id: getSlug(element.textContent),
+          id: slug,
           title: element.innerHTML.trim(),
         });
+      }
     } else if (isSectionTitle) {
+      element.id = slug;
+
       if (navItem) nav.push(navItem);
 
       navItem = {
-        id: getSlug(element.textContent),
+        id: slug,
         title: element.innerHTML.trim(),
         items: [],
       };
     } else if (isSubsectionTitle) {
-      if (navItem)
+      if (navItem) {
+        element.id = slug;
         navItem.items.push({
-          id: getSlug(element.textContent),
+          id: slug,
           title: element.innerHTML.trim(),
         });
+      }
     }
   }