git-stack-cli 1.8.1 → 1.8.3

package/dist/cjs/index.cjs

@@ -27281,6 +27281,9 @@ async function pr_list() {
     invariant(username, "username must exist");
     invariant(repo_path, "repo_path must exist");
     const result_pr_list = await gh_json(`pr list --repo ${repo_path} --author ${username} --state open ${JSON_FIELDS}`);
+    if (result_pr_list instanceof Error) {
+        handle_error(result_pr_list.message);
+    }
     if (actions.isDebug()) {
         actions.output(reactExports.createElement(Text, { dimColor: true },
             reactExports.createElement(Text, null, "Github cache "),
@@ -27325,6 +27328,9 @@ async function pr_status(branch) {
             reactExports.createElement(Text, { dimColor: true }, branch)));
     }
     const pr = await gh_json(`pr view ${branch} --repo ${repo_path} ${JSON_FIELDS}`);
+    if (pr instanceof Error) {
+        return null;
+    }
     actions.set((state) => {
         state.pr[pr.headRefName] = pr;
     });
@@ -27360,7 +27366,7 @@ async function gh_json(command) {
     const options = { ignoreExitCode: true };
     const cli_result = await cli(`gh ${command} > ${tmp_pr_json}`, options);
     if (cli_result.code !== 0) {
-        handle_error(cli_result.output);
+        return new Error(cli_result.output);
     }
     // read from file
     const json_str = fs.readFileSync(tmp_pr_json, "utf-8");
@@ -34551,7 +34557,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.8.1" )
+        .version("1.8.3" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
         .help("help", "Show usage via `git stack help`").argv);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "",
   "author": "magus",
   "license": "MIT",
@@ -63,7 +63,6 @@
     "@types/yargs": "^17.0.29",
     "@typescript-eslint/eslint-plugin": "^6.9.0",
     "@typescript-eslint/parser": "^6.9.0",
-    "bun": "^1.0.26",
     "bun-types": "^1.0.21",
     "eslint": "^8.52.0",
     "eslint-import-resolver-typescript": "^3.6.1",

package/src/core/github.tsx

@@ -22,10 +22,14 @@ export async function pr_list(): Promise<Array<PullRequest>> {
   invariant(username, "username must exist");
   invariant(repo_path, "repo_path must exist");
 
-  const result_pr_list: Array<PullRequest> = await gh_json(
+  const result_pr_list = await gh_json<Array<PullRequest>>(
     `pr list --repo ${repo_path} --author ${username} --state open ${JSON_FIELDS}`
   );
 
+  if (result_pr_list instanceof Error) {
+    handle_error(result_pr_list.message);
+  }
+
   if (actions.isDebug()) {
     actions.output(
       <Ink.Text dimColor>
@@ -93,10 +97,14 @@ export async function pr_status(branch: string): Promise<null | PullRequest> {
     );
   }
 
-  const pr: PullRequest = await gh_json(
+  const pr = await gh_json<PullRequest>(
     `pr view ${branch} --repo ${repo_path} ${JSON_FIELDS}`
   );
 
+  if (pr instanceof Error) {
+    return null;
+  }
+
   actions.set((state) => {
     state.pr[pr.headRefName] = pr;
   });
@@ -152,14 +160,14 @@ const JSON_FIELDS = "--json number,state,baseRefName,headRefName,commits,title,b
 
 // consistent handle gh cli commands returning json
 // redirect to tmp file to avoid scrollback overflow causing scrollback to be cleared
-async function gh_json(command: string) {
+async function gh_json<T>(command: string): Promise<T | Error> {
   const tmp_pr_json = path.join(os.tmpdir(), "git-stack-gh.json");
 
   const options = { ignoreExitCode: true };
   const cli_result = await cli(`gh ${command} > ${tmp_pr_json}`, options);
 
   if (cli_result.code !== 0) {
-    handle_error(cli_result.output);
+    return new Error(cli_result.output);
   }
 
   // read from file