repo url handling cleanup

Author: jjallaire

src/core/path.ts

@@ -160,13 +160,21 @@ export function pathWithForwardSlashes(path: string) {
 }
 
 export function ensureTrailingSlash(path: string) {
-  if (!path.endsWith("/")) {
+  if (path && !path.endsWith("/")) {
     return path + "/";
   } else {
     return path;
   }
 }
 
+export function removeTrailingSlash(path: string) {
+  if (path && path.endsWith("/")) {
+    return path.slice(0, path.length - 1);
+  } else {
+    return path;
+  }
+}
+
 export function resolveGlobs(
   root: string,
   globs: string[],

src/project/types/book/book-config.ts

@@ -62,6 +62,7 @@ import {
   repoUrlIcon,
   websiteConfigActions,
   websiteProjectConfig,
+  websiteRepoInfoFromUrl,
 } from "../website/website-config.ts";
 
 import { kSidebarLogo } from "../website/website-navigation.ts";
@@ -236,14 +237,21 @@ export async function bookProjectConfig(
 
 function siteRepoUrl(site: Metadata) {
   const repoUrl = site[kSiteRepoUrl] as string;
+  const branch = site[kSiteRepoBranch] || "main";
   if (site[kSiteRepoSubdir]) {
     const subdir = ensureTrailingSlash(site[kSiteRepoSubdir] as string);
-    const branch = site[kSiteRepoBranch] || "main";
     return pathWithForwardSlashes(
       join(repoUrl, `tree/${branch}/${subdir}`),
     );
   } else {
-    return repoUrl;
+    const repoInfo = websiteRepoInfoFromUrl(repoUrl);
+    if (repoInfo.path) {
+      return pathWithForwardSlashes(
+        join(repoInfo.baseUrl, `tree/${branch}`, repoInfo.path),
+      );
+    } else {
+      return repoInfo.baseUrl;
+    }
   }
 }
 

src/project/types/website/website-config.ts

@@ -37,7 +37,10 @@ import {
   kSiteUrl,
   kWebsite,
 } from "./website-constants.ts";
-import { ensureTrailingSlash } from "../../../core/path.ts";
+import {
+  ensureTrailingSlash,
+  removeTrailingSlash,
+} from "../../../core/path.ts";
 type WebsiteConfigKey =
   | "title"
   | "image"
@@ -194,25 +197,28 @@ export function websiteRepoInfo(
         path: ensureTrailingSlash(repoSubdir),
       };
     } else {
-      // extract into base and path
-      const match = repoUrl.match(/(https?:\/\/(?:[^\/]+\/){3})(.*)/);
-      if (match) {
-        return {
-          baseUrl: match[1],
-          path: ensureTrailingSlash(match[2]) || "",
-        };
-      } else {
-        return {
-          baseUrl: repoUrl,
-          path: "",
-        };
-      }
+      return websiteRepoInfoFromUrl(repoUrl);
     }
   } else {
     return undefined;
   }
 }
 
+export function websiteRepoInfoFromUrl(repoUrl: string) {
+  const match = repoUrl.match(/(https?:\/\/(?:[^\/]+\/){3})(.*)/);
+  if (match) {
+    return {
+      baseUrl: match[1],
+      path: ensureTrailingSlash(match[2]) || "",
+    };
+  } else {
+    return {
+      baseUrl: repoUrl,
+      path: "",
+    };
+  }
+}
+
 export function websiteRepoBranch(project?: ProjectConfig): string {
   return websiteConfigString(kSiteRepoBranch, project) || "main";
 }