git-stack-cli 1.8.0 → 1.8.2

package/dist/cjs/index.cjs

@@ -27273,8 +27273,6 @@ const RE$1 = {
     group_title: new RegExp(TEMPLATE$1.group_title("(?<title>[^\\n^\\r]+)"), "i"),
 };
 
-// prettier-ignore
-const JSON_FIELDS = "--json number,state,baseRefName,headRefName,commits,title,body,url";
 async function pr_list() {
     const state = Store.getState();
     const actions = state.actions;
@@ -27282,13 +27280,10 @@ async function pr_list() {
     const repo_path = state.repo_path;
     invariant(username, "username must exist");
     invariant(repo_path, "repo_path must exist");
-    const cli_result = await cli(`gh pr list --repo ${repo_path} --author ${username} --state open ${JSON_FIELDS}`, {
-        ignoreExitCode: true,
-    });
-    if (cli_result.code !== 0) {
-        handle_error(cli_result.output);
+    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);
     }
-    const result_pr_list = JSON.parse(cli_result.stdout);
     if (actions.isDebug()) {
         actions.output(reactExports.createElement(Text, { dimColor: true },
             reactExports.createElement(Text, null, "Github cache "),
@@ -27332,14 +27327,10 @@ async function pr_status(branch) {
             reactExports.createElement(Text, null, " "),
             reactExports.createElement(Text, { dimColor: true }, branch)));
     }
-    const cli_result = await cli(`gh pr view ${branch} --repo ${repo_path} ${JSON_FIELDS}`, {
-        ignoreExitCode: true,
-    });
-    if (cli_result.code !== 0) {
-        // handle_error(cli_result.output);
+    const pr = await gh_json(`pr view ${branch} --repo ${repo_path} ${JSON_FIELDS}`);
+    if (pr instanceof Error) {
         return null;
     }
-    const pr = JSON.parse(cli_result.stdout);
     actions.set((state) => {
         state.pr[pr.headRefName] = pr;
     });
@@ -27366,6 +27357,22 @@ async function pr_edit(args) {
         handle_error(cli_result.output);
     }
 }
+// prettier-ignore
+const JSON_FIELDS = "--json number,state,baseRefName,headRefName,commits,title,body,url";
+// 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) {
+    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) {
+        return new Error(cli_result.output);
+    }
+    // read from file
+    const json_str = fs.readFileSync(tmp_pr_json, "utf-8");
+    const json = JSON.parse(json_str);
+    return json;
+}
 function handle_error(output) {
     const state = Store.getState();
     const actions = state.actions;
@@ -27658,7 +27665,7 @@ async function run$4() {
     process.once("SIGINT", handle_exit);
     const temp_branch_name = `${branch_name}_${short_id()}`;
     try {
-        actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
+        // actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
         // must perform rebase from repo root for applying git patch
         process.chdir(repo_root);
         await cli(`pwd`);
@@ -27976,7 +27983,7 @@ async function run$3() {
     }
     actions.debug(`rebase_merge_base = ${rebase_merge_base}`);
     actions.debug(`rebase_group_index = ${rebase_group_index}`);
-    actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
+    // actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
     try {
         // must perform rebase from repo root for applying git patch
         process.chdir(repo_root);
@@ -28062,7 +28069,7 @@ echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
             `GIT_REVISE_TODO="${git_revise_todo}"`,
             `git`,
             `revise --edit -i ${rebase_merge_base}`,
-        ]);
+        ], { stdio: ["ignore", "ignore", "ignore"] });
         // early return since we do not need to sync
         if (!argv.sync) {
             return;
@@ -34550,7 +34557,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.8.0" )
+        .version("1.8.2" )
         .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.0",
+  "version": "1.8.2",
   "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/app/LocalMergeRebase.tsx

@@ -43,7 +43,7 @@ async function run() {
   const temp_branch_name = `${branch_name}_${short_id()}`;
 
   try {
-    actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
+    // actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
 
     // must perform rebase from repo root for applying git patch
     process.chdir(repo_root);

package/src/app/ManualRebase.tsx

@@ -83,7 +83,8 @@ async function run() {
 
   actions.debug(`rebase_merge_base = ${rebase_merge_base}`);
   actions.debug(`rebase_group_index = ${rebase_group_index}`);
-  actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
+
+  // actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
 
   try {
     // must perform rebase from repo root for applying git patch
@@ -153,12 +154,15 @@ async function run() {
 
     // execute cli with temporary git sequence editor script
     // revise from merge base to pick correct commits
-    await cli([
-      `GIT_EDITOR="${tmp_git_sequence_editor_path}"`,
-      `GIT_REVISE_TODO="${git_revise_todo}"`,
-      `git`,
-      `revise --edit -i ${rebase_merge_base}`,
-    ]);
+    await cli(
+      [
+        `GIT_EDITOR="${tmp_git_sequence_editor_path}"`,
+        `GIT_REVISE_TODO="${git_revise_todo}"`,
+        `git`,
+        `revise --edit -i ${rebase_merge_base}`,
+      ],
+      { stdio: ["ignore", "ignore", "ignore"] }
+    );
 
     // early return since we do not need to sync
     if (!argv.sync) {

package/src/core/github.tsx

@@ -13,9 +13,6 @@ import { colors } from "~/core/colors";
 import { invariant } from "~/core/invariant";
 import { safe_quote } from "~/core/safe_quote";
 
-// prettier-ignore
-const JSON_FIELDS = "--json number,state,baseRefName,headRefName,commits,title,body,url";
-
 export async function pr_list(): Promise<Array<PullRequest>> {
   const state = Store.getState();
   const actions = state.actions;
@@ -25,19 +22,14 @@ export async function pr_list(): Promise<Array<PullRequest>> {
   invariant(username, "username must exist");
   invariant(repo_path, "repo_path must exist");
 
-  const cli_result = await cli(
-    `gh pr list --repo ${repo_path} --author ${username} --state open ${JSON_FIELDS}`,
-    {
-      ignoreExitCode: true,
-    }
+  const result_pr_list = await gh_json<Array<PullRequest>>(
+    `pr list --repo ${repo_path} --author ${username} --state open ${JSON_FIELDS}`
   );
 
-  if (cli_result.code !== 0) {
-    handle_error(cli_result.output);
+  if (result_pr_list instanceof Error) {
+    handle_error(result_pr_list.message);
   }
 
-  const result_pr_list: Array<PullRequest> = JSON.parse(cli_result.stdout);
-
   if (actions.isDebug()) {
     actions.output(
       <Ink.Text dimColor>
@@ -105,20 +97,14 @@ export async function pr_status(branch: string): Promise<null | PullRequest> {
     );
   }
 
-  const cli_result = await cli(
-    `gh pr view ${branch} --repo ${repo_path} ${JSON_FIELDS}`,
-    {
-      ignoreExitCode: true,
-    }
+  const pr = await gh_json<PullRequest>(
+    `pr view ${branch} --repo ${repo_path} ${JSON_FIELDS}`
   );
 
-  if (cli_result.code !== 0) {
-    // handle_error(cli_result.output);
+  if (pr instanceof Error) {
     return null;
   }
 
-  const pr: PullRequest = JSON.parse(cli_result.stdout);
-
   actions.set((state) => {
     state.pr[pr.headRefName] = pr;
   });
@@ -169,6 +155,27 @@ export async function pr_edit(args: EditPullRequestArgs) {
   }
 }
 
+// prettier-ignore
+const JSON_FIELDS = "--json number,state,baseRefName,headRefName,commits,title,body,url";
+
+// consistent handle gh cli commands returning json
+// redirect to tmp file to avoid scrollback overflow causing scrollback to be cleared
+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) {
+    return new Error(cli_result.output);
+  }
+
+  // read from file
+  const json_str = fs.readFileSync(tmp_pr_json, "utf-8");
+  const json = JSON.parse(json_str);
+  return json;
+}
+
 function handle_error(output: string): never {
   const state = Store.getState();
   const actions = state.actions;