@t8/docsgen 0.1.40 → 0.1.42

package/dist/bin.js

@@ -369,21 +369,31 @@ async function getNav(ctx, navItems) {
     navContent = navDom.innerHTML;
   }
   let navItemCount = 0;
-  for (let { id, title, items } of navItems) {
+  if (navItems.length === 1) {
+    let { id, items } = navItems[0];
     let itemLink = `${root}${contentDir}/${encodeURIComponent(id)}`;
-    s += `
+    for (let { id: id2, title } of items) {
+      s += `
+<li><a href="${itemLink}#${encodeURIComponent(id2)}">${title}</a></li>`;
+      navItemCount++;
+    }
+  } else {
+    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>`;
-        navItemCount++;
+          navItemCount++;
+        }
+        s += "\n  </ul>\n";
       }
-      s += "\n  </ul>\n";
+      s += "</li>";
+      navItemCount++;
     }
-    s += "</li>";
-    navItemCount++;
   }
   if ((!s || navItemCount < 2) && !navContent) return "";
   s = s.trim() ? `<section><ul>${s}
@@ -446,8 +456,9 @@ function buildNav(ctx, dom) {
     let slug = getSlug(element.textContent);
     let sectionId = isSectionTitle ? slug : navItem?.id ?? "";
     let link = `${root}${contentDir}/${sectionId}`;
-    if (!isSectionTitle) link += `#${slug}`;
-    linkMap[`#${slug}`] = link;
+    let elementId = element.id || slug.toLowerCase().replace(/_/g, "-");
+    if (elementId)
+      linkMap[`#${elementId}`] = `${link}${isSectionTitle ? "" : `#${slug}`}`;
     if (singlePage && isSectionTitle) {
       if (navItem) {
         element.id = slug;
@@ -457,7 +468,6 @@ function buildNav(ctx, dom) {
         });
       }
     } else if (isSectionTitle) {
-      element.id = slug;
       if (navItem) nav.push(navItem);
       navItem = {
         id: slug,

package/package.json

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

package/src/bin/getNav.ts

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

package/src/bin/getParsedContent.ts

@@ -41,9 +41,10 @@ function buildNav(ctx: Context, dom: JSDOM) {
     let sectionId = isSectionTitle ? slug : (navItem?.id ?? "");
     let link = `${root}${contentDir}/${sectionId}`;
 
-    if (!isSectionTitle) link += `#${slug}`;
+    let elementId = element.id || slug.toLowerCase().replace(/_/g, "-");
 
-    linkMap[`#${slug}`] = link;
+    if (elementId)
+      linkMap[`#${elementId}`] = `${link}${isSectionTitle ? "" : `#${slug}`}`;
 
     if (singlePage && isSectionTitle) {
       if (navItem) {
@@ -54,8 +55,6 @@ function buildNav(ctx: Context, dom: JSDOM) {
         });
       }
     } else if (isSectionTitle) {
-      element.id = slug;
-
       if (navItem) nav.push(navItem);
 
       navItem = {