@t8/docsgen 0.1.5 → 0.1.6

package/dist/bin.js

@@ -92,6 +92,17 @@ async function fetchText(location) {
   return (await (0, import_promises.readFile)(location)).toString();
 }
 
+// src/bin/getLocation.ts
+function getLocation(ctx, path, preferredLocation) {
+  let { repo, mainBranch = "main" } = ctx;
+  if (preferredLocation) return preferredLocation;
+  let ghId = repo?.startsWith("https://github.com/") ? repo.replace("https://github.com/", "").split("/").slice(0, 2).join("/") : "";
+  let urlPath = path.replace(/^\.?\//, "");
+  if (ghId)
+    return `https://raw.githubusercontent.com/${ghId}/refs/heads/${mainBranch}/${urlPath}`;
+  return path;
+}
+
 // src/bin/toRepoURL.ts
 function toRepoURL(x) {
   if (!x) return "";
@@ -122,11 +133,6 @@ function toConfig(metadata) {
 var config = null;
 async function getConfig() {
   if (config) return config;
-  let metadata = {};
-  try {
-    metadata = JSON.parse(await fetchText("./package.json"));
-  } catch {
-  }
   let localConfig = {};
   try {
     localConfig = JSON.parse(
@@ -142,10 +148,18 @@ async function getConfig() {
     mainBranch: "main",
     root: "/",
     contentDir: "x",
-    ...toConfig(metadata),
     ...localConfig,
     ...A(args)
   };
+  try {
+    let rawContent = await fetchText(getLocation(config, "package.json"));
+    let metadata = JSON.parse(rawContent);
+    config = {
+      ...toConfig(metadata),
+      ...config
+    };
+  } catch {
+  }
   if (!config.root?.endsWith("/")) config.root = `${config.root ?? ""}/`;
   return config;
 }
@@ -324,16 +338,6 @@ function getSlug(title) {
   return slug;
 }
 
-// src/bin/getSource.ts
-function getSource(ctx) {
-  let { source, repo, mainBranch = "main" } = ctx;
-  if (source) return source;
-  let ghId = repo?.startsWith("https://github.com/") ? repo.replace("https://github.com/", "").split("/").slice(0, 2).join("/") : "";
-  if (ghId)
-    return `https://raw.githubusercontent.com/${ghId}/refs/heads/${mainBranch}/README.md`;
-  return "README.md";
-}
-
 // src/bin/getParsedContent.ts
 var md = new import_markdown_it.default({
   html: true
@@ -405,7 +409,8 @@ function getSectionPostprocess(linkMap) {
 }
 async function getParsedContent(ctx) {
   let { singlePage } = ctx;
-  let content = md.render(await fetchText(getSource(ctx)));
+  let rawContent = await fetchText(getLocation(ctx, "README.md", ctx.source));
+  let content = md.render(rawContent);
   let dom = new import_jsdom2.JSDOM(content);
   let { nav, linkMap } = buildNav(ctx, dom);
   let badges = [];

package/package.json

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

package/src/bin/getConfig.ts

@@ -2,6 +2,7 @@ import { parseArgs } from "args-json";
 import type { BinConfig } from "../types/BinConfig";
 import type { PackageMetadata } from "../types/PackageMetadata";
 import { fetchText } from "./fetchText";
+import { getLocation } from "./getLocation";
 import { toConfig } from "./toConfig";
 
 let config: BinConfig | null = null;
@@ -9,12 +10,6 @@ let config: BinConfig | null = null;
 export async function getConfig(): Promise<BinConfig> {
   if (config) return config;
 
-  let metadata: PackageMetadata = {};
-
-  try {
-    metadata = JSON.parse(await fetchText("./package.json")) as PackageMetadata;
-  } catch {}
-
   let localConfig: BinConfig = {};
 
   try {
@@ -33,11 +28,20 @@ export async function getConfig(): Promise<BinConfig> {
     mainBranch: "main",
     root: "/",
     contentDir: "x",
-    ...toConfig(metadata),
     ...localConfig,
     ...parseArgs<BinConfig>(args),
   };
 
+  try {
+    let rawContent = await fetchText(getLocation(config, "package.json"));
+    let metadata = JSON.parse(rawContent) as PackageMetadata;
+
+    config = {
+      ...toConfig(metadata),
+      ...config,
+    };
+  } catch {}
+
   if (!config.root?.endsWith("/")) config.root = `${config.root ?? ""}/`;
 
   return config;

package/src/bin/getLocation.ts

@@ -0,0 +1,22 @@
+import type { Context } from "../types/Context";
+
+export function getLocation(
+  ctx: Context,
+  path: string,
+  preferredLocation?: string | undefined,
+) {
+  let { repo, mainBranch = "main" } = ctx;
+
+  if (preferredLocation) return preferredLocation;
+
+  let ghId = repo?.startsWith("https://github.com/")
+    ? repo.replace("https://github.com/", "").split("/").slice(0, 2).join("/")
+    : "";
+
+  let urlPath = path.replace(/^\.?\//, "");
+
+  if (ghId)
+    return `https://raw.githubusercontent.com/${ghId}/refs/heads/${mainBranch}/${urlPath}`;
+
+  return path;
+}

package/src/bin/getParsedContent.ts

@@ -3,8 +3,8 @@ import Markdown from "markdown-it";
 import type { Context } from "../types/Context";
 import type { NavItem } from "../types/NavItem";
 import { fetchText } from "./fetchText";
+import { getLocation } from "./getLocation";
 import { getSlug } from "./getSlug";
-import { getSource } from "./getSource";
 
 const md = new Markdown({
   html: true,
@@ -105,7 +105,8 @@ function getSectionPostprocess(linkMap: Record<string, string>) {
 
 export async function getParsedContent(ctx: Context) {
   let { singlePage } = ctx;
-  let content = md.render(await fetchText(getSource(ctx)));
+  let rawContent = await fetchText(getLocation(ctx, "README.md", ctx.source));
+  let content = md.render(rawContent);
   let dom = new JSDOM(content);
 
   let { nav, linkMap } = buildNav(ctx, dom);

package/src/bin/getSource.ts

@@ -1,16 +0,0 @@
-import type { Context } from "../types/Context";
-
-export function getSource(ctx: Context) {
-  let { source, repo, mainBranch = "main" } = ctx;
-
-  if (source) return source;
-
-  let ghId = repo?.startsWith("https://github.com/")
-    ? repo.replace("https://github.com/", "").split("/").slice(0, 2).join("/")
-    : "";
-
-  if (ghId)
-    return `https://raw.githubusercontent.com/${ghId}/refs/heads/${mainBranch}/README.md`;
-
-  return "README.md";
-}