jsrepo 1.12.2 → 1.12.4

package/dist/index.js

@@ -1210,9 +1210,20 @@ var get2 = () => {
 };
 
 // src/utils/git-providers.ts
-var octokit = new Octokit({});
+var manifestErrorMessage = (info, defaultBranch) => {
+  return Err(
+    `There was an error fetching the \`${color4.bold(OUTPUT_FILE)}\` from ${color4.bold(info.url)}.
+
+${color4.bold("This may be for one of the following reasons:")}
+1. The \`${color4.bold(OUTPUT_FILE)}\` or containing repository doesn't exist
+2. Your repository path is incorrect (wrong branch, wrong tag) default branches other than \`${color4.bold(defaultBranch)}\` must be specified \`${color4.bold("github/<owner>/<name>/tree/<branch>")}\`
+3. You are using an expired access token or a token that doesn't have access to this repository
+`
+  );
+};
 var github = {
   name: () => "github",
+  defaultBranch: () => "main",
   resolveRaw: async (repoPath, resourcePath) => {
     const info = await github.info(repoPath);
     return new URL(
@@ -1221,13 +1232,8 @@ var github = {
     );
   },
   fetchRaw: async (repoPath, resourcePath) => {
-    const url = await github.resolveRaw(repoPath, resourcePath);
-    const errorMessage = (err) => {
-      return Err(
-        `There was an error fetching the \`${OUTPUT_FILE}\` from the repository \`${url.href}\` make sure the target repository has a \`${OUTPUT_FILE}\` in its root.
- Error: ${err}`
-      );
-    };
+    const info = await github.info(repoPath);
+    const url = await github.resolveRaw(info, resourcePath);
     try {
       const token = get2().get(`${github.name()}-token`);
       const headers = new Headers();
@@ -1236,11 +1242,11 @@ var github = {
       }
       const response = await fetch(url, { headers });
       if (!response.ok) {
-        return errorMessage(`${response.status} ${response.text}`);
+        return manifestErrorMessage(info, github.defaultBranch());
       }
       return Ok(await response.text());
-    } catch (err) {
-      return errorMessage(`${err}`);
+    } catch {
+      return manifestErrorMessage(info, github.defaultBranch());
     }
   },
   fetchManifest: async (repoPath) => {
@@ -1253,12 +1259,20 @@ var github = {
     if (typeof repoPath !== "string") return repoPath;
     const repo = repoPath.replaceAll(/(https:\/\/github.com\/)|(github\/)/g, "");
     const [owner, repoName, ...rest] = repo.split("/");
-    let ref = "main";
+    let ref = github.defaultBranch();
+    const token = get2().get(`${github.name()}-token`);
+    const octokit = new Octokit({ auth: token });
     if (rest[0] === "tree") {
       ref = rest[1];
+    } else {
+      try {
+        const { data: repo2 } = await octokit.rest.repos.get({ owner, repo: repoName });
+        ref = repo2.default_branch;
+      } catch {
+      }
     }
     let refs = "heads";
-    if (ref !== "main") {
+    if (ref !== github.defaultBranch()) {
       try {
         const { data: tags } = await octokit.rest.git.listMatchingRefs({
           owner,
@@ -1286,6 +1300,7 @@ var github = {
 };
 var gitlab = {
   name: () => "gitlab",
+  defaultBranch: () => "main",
   resolveRaw: async (repoPath, resourcePath) => {
     const info = await gitlab.info(repoPath);
     return new URL(
@@ -1294,13 +1309,8 @@ var gitlab = {
     );
   },
   fetchRaw: async (repoPath, resourcePath) => {
-    const url = await gitlab.resolveRaw(repoPath, resourcePath);
-    const errorMessage = (err) => {
-      return Err(
-        `There was an error fetching the \`${OUTPUT_FILE}\` from the repository \`${url.href}\` make sure the target repository has a \`${OUTPUT_FILE}\` in its root.
- Error: ${err}`
-      );
-    };
+    const info = await github.info(repoPath);
+    const url = await gitlab.resolveRaw(info, resourcePath);
     try {
       const token = get2().get(`${gitlab.name()}-token`);
       const headers = new Headers();
@@ -1309,11 +1319,11 @@ var gitlab = {
       }
       const response = await fetch(url, { headers });
       if (!response.ok) {
-        return errorMessage(`${response.status} ${response.text}`);
+        return manifestErrorMessage(info, gitlab.defaultBranch());
       }
       return Ok(await response.text());
-    } catch (err) {
-      return errorMessage(`${err}`);
+    } catch {
+      return manifestErrorMessage(info, gitlab.defaultBranch());
     }
   },
   fetchManifest: async (repoPath) => {
@@ -1326,7 +1336,7 @@ var gitlab = {
     if (typeof repoPath !== "string") return repoPath;
     const repo = repoPath.replaceAll(/(https:\/\/gitlab.com\/)|(gitlab\/)/g, "");
     const [owner, repoName, ...rest] = repo.split("/");
-    let ref = "main";
+    let ref = gitlab.defaultBranch();
     let refs = "heads";
     if (rest[0] === "-" && rest[1] === "tree") {
       if (rest[2].includes("?")) {
@@ -1355,6 +1365,7 @@ var gitlab = {
 };
 var bitbucket = {
   name: () => "bitbucket",
+  defaultBranch: () => "master",
   resolveRaw: async (repoPath, resourcePath) => {
     const info = await bitbucket.info(repoPath);
     return new URL(
@@ -1363,13 +1374,8 @@ var bitbucket = {
     );
   },
   fetchRaw: async (repoPath, resourcePath) => {
-    const url = await bitbucket.resolveRaw(repoPath, resourcePath);
-    const errorMessage = (err) => {
-      return Err(
-        `There was an error fetching the \`${OUTPUT_FILE}\` from the repository \`${url.href}\` make sure the target repository has a \`${OUTPUT_FILE}\` in its root.
- Error: ${err}`
-      );
-    };
+    const info = await bitbucket.info(repoPath);
+    const url = await bitbucket.resolveRaw(info, resourcePath);
     try {
       const token = get2().get(`${bitbucket.name()}-token`);
       const headers = new Headers();
@@ -1378,11 +1384,11 @@ var bitbucket = {
       }
       const response = await fetch(url, { headers });
       if (!response.ok) {
-        return errorMessage(`${response.status} ${response.text}`);
+        return manifestErrorMessage(info, bitbucket.defaultBranch());
       }
       return Ok(await response.text());
-    } catch (err) {
-      return errorMessage(`${err}`);
+    } catch {
+      return manifestErrorMessage(info, bitbucket.defaultBranch());
     }
   },
   fetchManifest: async (repoPath) => {
@@ -1396,7 +1402,7 @@ var bitbucket = {
     const repo = repoPath.replaceAll(/(https:\/\/bitbucket.org\/)|(bitbucket\/)/g, "");
     const [owner, repoName, ...rest] = repo.split("/");
     const refs = "heads";
-    let ref = "master";
+    let ref = bitbucket.defaultBranch();
     if (rest[0] === "src") {
       ref = rest[1];
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jsrepo",
   "description": "A CLI to add shared code from remote repositories.",
-  "version": "1.12.2",
+  "version": "1.12.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ieedan/jsrepo"

package/src/utils/git-providers.ts

@@ -7,8 +7,6 @@ import { type Category, categorySchema } from './build';
 import { OUTPUT_FILE } from './context';
 import * as persisted from './persisted';
 
-const octokit = new Octokit({});
-
 export type Info = {
 	refs: 'tags' | 'heads';
 	url: string;
@@ -25,6 +23,11 @@ export interface Provider {
 	 * @returns the name of the provider
 	 */
 	name: () => string;
+	/** Get the name of the default branch
+	 *
+	 * @returns
+	 */
+	defaultBranch: () => string;
 	/** Returns a URL to the raw path of the resource provided in the resourcePath
 	 *
 	 * @param repoPath
@@ -60,6 +63,18 @@ export interface Provider {
 	matches: (repoPath: string) => boolean;
 }
 
+const manifestErrorMessage = (info: Info, defaultBranch: string) => {
+	return Err(
+		`There was an error fetching the \`${color.bold(OUTPUT_FILE)}\` from ${color.bold(info.url)}.
+
+${color.bold('This may be for one of the following reasons:')}
+1. The \`${color.bold(OUTPUT_FILE)}\` or containing repository doesn't exist
+2. Your repository path is incorrect (wrong branch, wrong tag) default branches other than \`${color.bold(defaultBranch)}\` must be specified \`${color.bold('github/<owner>/<name>/tree/<branch>')}\`
+3. You are using an expired access token or a token that doesn't have access to this repository
+`
+	);
+};
+
 /** Valid paths
  *
  *  `https://github.com/<owner>/<repo>/[tree]/[ref]`
@@ -68,6 +83,7 @@ export interface Provider {
  */
 const github: Provider = {
 	name: () => 'github',
+	defaultBranch: () => 'main',
 	resolveRaw: async (repoPath, resourcePath) => {
 		const info = await github.info(repoPath);
 
@@ -77,13 +93,9 @@ const github: Provider = {
 		);
 	},
 	fetchRaw: async (repoPath, resourcePath) => {
-		const url = await github.resolveRaw(repoPath, resourcePath);
+		const info = await github.info(repoPath);
 
-		const errorMessage = (err: string) => {
-			return Err(
-				`There was an error fetching the \`${OUTPUT_FILE}\` from the repository \`${url.href}\` make sure the target repository has a \`${OUTPUT_FILE}\` in its root.\n Error: ${err}`
-			);
-		};
+		const url = await github.resolveRaw(info, resourcePath);
 
 		try {
 			const token = persisted.get().get(`${github.name()}-token`);
@@ -97,12 +109,12 @@ const github: Provider = {
 			const response = await fetch(url, { headers });
 
 			if (!response.ok) {
-				return errorMessage(`${response.status} ${response.text}`);
+				return manifestErrorMessage(info, github.defaultBranch());
 			}
 
 			return Ok(await response.text());
-		} catch (err) {
-			return errorMessage(`${err}`);
+		} catch {
+			return manifestErrorMessage(info, github.defaultBranch());
 		}
 	},
 	fetchManifest: async (repoPath) => {
@@ -121,16 +133,28 @@ const github: Provider = {
 
 		const [owner, repoName, ...rest] = repo.split('/');
 
-		let ref = 'main';
+		let ref = github.defaultBranch();
+
+		const token = persisted.get().get(`${github.name()}-token`);
+
+		const octokit = new Octokit({ auth: token });
 
 		if (rest[0] === 'tree') {
 			ref = rest[1];
+		} else {
+			try {
+				const { data: repo } = await octokit.rest.repos.get({ owner, repo: repoName });
+
+				ref = repo.default_branch;
+			} catch {
+				// we just want to continue on blissfully unaware the user will get an error later
+			}
 		}
 
 		// checks if the type of the ref is tags or heads
 		let refs: 'heads' | 'tags' = 'heads';
 		// no need to check if ref is main
-		if (ref !== 'main') {
+		if (ref !== github.defaultBranch()) {
 			try {
 				const { data: tags } = await octokit.rest.git.listMatchingRefs({
 					owner,
@@ -173,6 +197,7 @@ const github: Provider = {
  */
 const gitlab: Provider = {
 	name: () => 'gitlab',
+	defaultBranch: () => 'main',
 	resolveRaw: async (repoPath, resourcePath) => {
 		const info = await gitlab.info(repoPath);
 
@@ -182,13 +207,9 @@ const gitlab: Provider = {
 		);
 	},
 	fetchRaw: async (repoPath, resourcePath) => {
-		const url = await gitlab.resolveRaw(repoPath, resourcePath);
+		const info = await github.info(repoPath);
 
-		const errorMessage = (err: string) => {
-			return Err(
-				`There was an error fetching the \`${OUTPUT_FILE}\` from the repository \`${url.href}\` make sure the target repository has a \`${OUTPUT_FILE}\` in its root.\n Error: ${err}`
-			);
-		};
+		const url = await gitlab.resolveRaw(info, resourcePath);
 
 		try {
 			const token = persisted.get().get(`${gitlab.name()}-token`);
@@ -202,12 +223,12 @@ const gitlab: Provider = {
 			const response = await fetch(url, { headers });
 
 			if (!response.ok) {
-				return errorMessage(`${response.status} ${response.text}`);
+				return manifestErrorMessage(info, gitlab.defaultBranch());
 			}
 
 			return Ok(await response.text());
-		} catch (err) {
-			return errorMessage(`${err}`);
+		} catch {
+			return manifestErrorMessage(info, gitlab.defaultBranch());
 		}
 	},
 	fetchManifest: async (repoPath) => {
@@ -226,7 +247,7 @@ const gitlab: Provider = {
 
 		const [owner, repoName, ...rest] = repo.split('/');
 
-		let ref = 'main';
+		let ref = gitlab.defaultBranch();
 		let refs: Info['refs'] = 'heads';
 
 		if (rest[0] === '-' && rest[1] === 'tree') {
@@ -271,6 +292,7 @@ const gitlab: Provider = {
  */
 const bitbucket: Provider = {
 	name: () => 'bitbucket',
+	defaultBranch: () => 'master',
 	resolveRaw: async (repoPath, resourcePath) => {
 		const info = await bitbucket.info(repoPath);
 
@@ -280,13 +302,9 @@ const bitbucket: Provider = {
 		);
 	},
 	fetchRaw: async (repoPath, resourcePath) => {
-		const url = await bitbucket.resolveRaw(repoPath, resourcePath);
+		const info = await bitbucket.info(repoPath);
 
-		const errorMessage = (err: string) => {
-			return Err(
-				`There was an error fetching the \`${OUTPUT_FILE}\` from the repository \`${url.href}\` make sure the target repository has a \`${OUTPUT_FILE}\` in its root.\n Error: ${err}`
-			);
-		};
+		const url = await bitbucket.resolveRaw(info, resourcePath);
 
 		try {
 			const token = persisted.get().get(`${bitbucket.name()}-token`);
@@ -300,12 +318,12 @@ const bitbucket: Provider = {
 			const response = await fetch(url, { headers });
 
 			if (!response.ok) {
-				return errorMessage(`${response.status} ${response.text}`);
+				return manifestErrorMessage(info, bitbucket.defaultBranch());
 			}
 
 			return Ok(await response.text());
-		} catch (err) {
-			return errorMessage(`${err}`);
+		} catch {
+			return manifestErrorMessage(info, bitbucket.defaultBranch());
 		}
 	},
 	fetchManifest: async (repoPath) => {
@@ -327,7 +345,7 @@ const bitbucket: Provider = {
 		// pretty sure this just auto detects
 		const refs = 'heads';
 
-		let ref = 'master';
+		let ref = bitbucket.defaultBranch();
 
 		if (rest[0] === 'src') {
 			ref = rest[1];