@t8/docsgen 0.3.34 → 0.3.35

package/dist/bin.js

@@ -116,18 +116,23 @@ var import_args_json = __toESM(require_dist(), 1);
 
 // src/bin/fetchContent.ts
 import { readFile } from "node:fs/promises";
+var cachedContent = /* @__PURE__ */ new Map();
 async function fetchContent(location) {
   if (!location) return "";
+  let content = cachedContent.get(location);
+  if (content !== void 0) return content;
   if (/^https?:\/\//.test(location)) {
     try {
-      return await (await fetch(location, { cache: "no-cache" })).text();
+      content = await (await fetch(location, { cache: "no-cache" })).text();
     } catch {
       console.warn(`Failed to fetch content from '${location}'`);
-      return "";
     }
+  } else {
+    let locationPath = location.replace(/^\//, "");
+    content = (await readFile(locationPath)).toString();
   }
-  let locationPath = location.replace(/^\//, "");
-  return (await readFile(locationPath)).toString();
+  cachedContent.set(location, content ??= "");
+  return content;
 }
 
 // src/bin/getLocation.ts
@@ -801,33 +806,9 @@ function getNpmLink({ npm }, className) {
 }
 
 // src/bin/content/getNav.ts
-var cachedNavContent = /* @__PURE__ */ new Map();
-async function getNavContent({ name, nav }) {
-  if (!nav) return "";
-  let navContent = cachedNavContent.get(nav);
-  if (navContent !== void 0) return navContent;
-  navContent = await fetchContent(nav);
-  if (navContent) {
-    let navDom = new JSDOM3(navContent).window.document.body;
-    for (let link of navDom.querySelectorAll("a")) {
-      if (link.dataset.name === name) {
-        let parent = link.parentElement;
-        link.remove();
-        while (parent && parent.innerHTML.trim() === "") {
-          let nextParent = parent.parentElement;
-          parent.remove();
-          parent = nextParent;
-        }
-      }
-    }
-    navContent = navDom.innerHTML;
-  }
-  cachedNavContent.set(nav, navContent);
-  return navContent;
-}
 async function getNav(ctx, navItems) {
-  let { name, root, contentDir, backstory } = ctx;
-  let navContent = await getNavContent(ctx);
+  let { name, root, contentDir, backstory, nav } = ctx;
+  let navContent = await fetchContent(nav);
   let s = "";
   if (navContent) {
     let navDom = new JSDOM3(navContent).window.document.body;

package/package.json

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

package/src/bin/content/getNav.ts

@@ -5,46 +5,9 @@ import { fetchContent } from "../fetchContent.ts";
 import { getNpmLink } from "../getNpmLink.ts";
 import { getRepoLink } from "../getRepoLink.ts";
 
-let cachedNavContent = new Map<string, string>();
-
-async function getNavContent({ name, nav }: Context) {
-  if (!nav) return "";
-
-  let navContent = cachedNavContent.get(nav);
-
-  if (navContent !== undefined) return navContent;
-
-  navContent = await fetchContent(nav);
-
-  if (navContent) {
-    let navDom = new JSDOM(navContent).window.document.body;
-
-    for (let link of navDom.querySelectorAll("a")) {
-      if (link.dataset.name === name) {
-        let parent = link.parentElement;
-
-        link.remove();
-
-        while (parent && parent.innerHTML.trim() === "") {
-          let nextParent = parent.parentElement;
-
-          parent.remove();
-          parent = nextParent;
-        }
-      }
-    }
-
-    navContent = navDom.innerHTML;
-  }
-
-  cachedNavContent.set(nav, navContent);
-
-  return navContent;
-}
-
 export async function getNav(ctx: Context, navItems: NavItem[]) {
-  let { name, root, contentDir, backstory } = ctx;
-  let navContent = await getNavContent(ctx);
+  let { name, root, contentDir, backstory, nav } = ctx;
+  let navContent = await fetchContent(nav);
   let s = "";
 
   if (navContent) {

package/src/bin/fetchContent.ts

@@ -1,18 +1,27 @@
 import { readFile } from "node:fs/promises";
 
+let cachedContent = new Map<string, string>();
+
 export async function fetchContent(location: string | undefined) {
   if (!location) return "";
 
+  let content = cachedContent.get(location);
+
+  if (content !== undefined) return content;
+
   if (/^https?:\/\//.test(location)) {
     try {
-      return await (await fetch(location, { cache: "no-cache" })).text();
+      content = await (await fetch(location, { cache: "no-cache" })).text();
     } catch {
       console.warn(`Failed to fetch content from '${location}'`);
-      return "";
     }
+  } else {
+    let locationPath = location.replace(/^\//, "");
+
+    content = (await readFile(locationPath)).toString();
   }
 
-  let locationPath = location.replace(/^\//, "");
+  cachedContent.set(location, (content ??= ""));
 
-  return (await readFile(locationPath)).toString();
+  return content;
 }