@t8/docsgen 0.4.22 → 0.4.24

package/dist/bin.js

@@ -443,6 +443,27 @@ function getPreviewContent(url, title) {
   content += `<iframe ${attrs.join(" ")} sandbox="allow-forms allow-modals allow-popups allow-presentation allow-same-origin allow-scripts" loading="lazy"></iframe>`;
   return content;
 }
+function isEmpty(element) {
+  return element.innerHTML.trim() === "";
+}
+function insertPreview(preview, a) {
+  let p = a.closest("p");
+  if (p?.parentElement) {
+    p.parentElement.insertBefore(preview, p);
+    if (a.nextElementSibling?.matches("br")) a.nextElementSibling.remove();
+    a.remove();
+    if (isEmpty(p)) p.remove();
+    return;
+  }
+  let li = a.closest("li");
+  let list = li?.closest("ul, ol");
+  if (li && list?.parentElement) {
+    list.parentElement.insertBefore(preview, list);
+    a.remove();
+    if (isEmpty(li)) li.remove();
+    if (isEmpty(list)) list.remove();
+  }
+}
 function getSectionPostprocess(linkMap) {
   return (content) => {
     let { document } = new JSDOM2(content).window;
@@ -452,14 +473,7 @@ function getSectionPostprocess(linkMap) {
       if (isPreviewURL(href)) {
         let preview = document.createElement("fieldset");
         preview.innerHTML = getPreviewContent(href, a.innerHTML);
-        let p = a.closest("p");
-        if (p?.parentElement) {
-          p.parentElement.insertBefore(preview, p);
-          if (a.nextElementSibling?.matches("br"))
-            a.nextElementSibling.remove();
-          a.remove();
-          if (p.innerHTML.trim() === "") p.remove();
-        }
+        insertPreview(preview, a);
       } else {
         let nextHref = linkMap[href] ?? href;
         a.setAttribute("href", nextHref);
@@ -875,19 +889,14 @@ async function getNav(ctx, navItems) {
       navItemCount++;
     }
   } else {
-    for (let { id, title, items } of navItems) {
+    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 += "\n  </ul>\n";
-      }
       s += "</li>";
       navItemCount++;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@t8/docsgen",
-  "version": "0.4.22",
+  "version": "0.4.24",
   "description": "",
   "main": "dist/bin.js",
   "type": "module",

package/src/bin/content/getNav.ts

@@ -42,21 +42,21 @@ export async function getNav(ctx: Context, navItems: NavItem[]) {
       navItemCount++;
     }
   } else {
-    for (let { id, title, items } of navItems) {
+    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++;

package/src/bin/parsing/getSectionPostprocess.ts

@@ -28,6 +28,38 @@ function getPreviewContent(url: string, title?: string) {
   return content;
 }
 
+function isEmpty(element: Element) {
+  return element.innerHTML.trim() === "";
+}
+
+function insertPreview(preview: HTMLElement, a: HTMLAnchorElement) {
+  let p: HTMLElement | null = a.closest("p");
+
+  if (p?.parentElement) {
+    p.parentElement.insertBefore(preview, p);
+
+    if (a.nextElementSibling?.matches("br")) a.nextElementSibling.remove();
+
+    a.remove();
+
+    if (isEmpty(p)) p.remove();
+
+    return;
+  }
+
+  let li = a.closest("li");
+  let list = li?.closest("ul, ol");
+
+  if (li && list?.parentElement) {
+    list.parentElement.insertBefore(preview, list);
+
+    a.remove();
+
+    if (isEmpty(li)) li.remove();
+    if (isEmpty(list)) list.remove();
+  }
+}
+
 export function getSectionPostprocess(
   linkMap: Record<string, string | undefined>,
 ) {
@@ -44,18 +76,7 @@ export function getSectionPostprocess(
 
         preview.innerHTML = getPreviewContent(href, a.innerHTML);
 
-        let p = a.closest("p");
-
-        if (p?.parentElement) {
-          p.parentElement.insertBefore(preview, p);
-
-          if (a.nextElementSibling?.matches("br"))
-            a.nextElementSibling.remove();
-
-          a.remove();
-
-          if (p.innerHTML.trim() === "") p.remove();
-        }
+        insertPreview(preview, a);
       } else {
         let nextHref = linkMap[href] ?? href;