git-stack-cli 1.7.0 → 1.8.1

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,7 @@ 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 = JSON.parse(cli_result.stdout);
+    const result_pr_list = await gh_json(`pr list --repo ${repo_path} --author ${username} --state open ${JSON_FIELDS}`);
     if (actions.isDebug()) {
         actions.output(reactExports.createElement(Text, { dimColor: true },
             reactExports.createElement(Text, null, "Github cache "),
@@ -27332,14 +27324,7 @@ 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);
-        return null;
-    }
-    const pr = JSON.parse(cli_result.stdout);
+    const pr = await gh_json(`pr view ${branch} --repo ${repo_path} ${JSON_FIELDS}`);
     actions.set((state) => {
         state.pr[pr.headRefName] = pr;
     });
@@ -27347,7 +27332,11 @@ async function pr_status(branch) {
 }
 async function pr_create(args) {
     const title = safe_quote(args.title);
-    const cli_result = await cli(`gh pr create --fill --head ${args.branch} --base ${args.base} --title="${title}" --body="${args.body}"`);
+    let command = `gh pr create --fill --head ${args.branch} --base ${args.base} --title="${title}" --body="${args.body}"`;
+    if (args.draft) {
+        command += " --draft";
+    }
+    const cli_result = await cli(command);
     if (cli_result.code !== 0) {
         handle_error(cli_result.output);
         return null;
@@ -27362,6 +27351,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) {
+        handle_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;
@@ -27654,7 +27659,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`);
@@ -27972,7 +27977,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);
@@ -28058,7 +28063,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;
@@ -28175,6 +28180,7 @@ echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
                 base: group.base,
                 title: group.title,
                 body: DEFAULT_PR_BODY,
+                draft: argv.draft,
             });
             if (!pr_url) {
                 throw new Error("unable to create pr");
@@ -28487,25 +28493,26 @@ async function run$1() {
             state.step = "manual-rebase";
         });
     }
-    // ./.github/PULL_REQUEST_TEMPLATE/*.md
-    let pr_templates = [];
-    if (fs.existsSync(template_pr_template(repo_root))) {
-        pr_templates = fs.readdirSync(template_pr_template(repo_root));
-    }
+    let pr_template_body = null;
     // look for pull request template
     // https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/creating-a-pull-request-template-for-your-repository
     // ./.github/pull_request_template.md
     // ./pull_request_template.md
     // ./docs/pull_request_template.md
-    let pr_template_body = null;
-    if (fs.existsSync(github_pr_template(repo_root))) {
-        pr_template_body = fs.readFileSync(github_pr_template(repo_root), "utf-8");
-    }
-    else if (fs.existsSync(root_pr_template(repo_root))) {
-        pr_template_body = fs.readFileSync(root_pr_template(repo_root), "utf-8");
+    for (const key of PR_TEMPLATE_KEY_LIST) {
+        const pr_template_fn = PR_TEMPLATE[key];
+        if (fs.existsSync(pr_template_fn(repo_root))) {
+            pr_template_body = fs.readFileSync(pr_template_fn(repo_root), "utf-8");
+            actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "Using PR template {pr_filepath}", values: {
+                    pr_filepath: reactExports.createElement(Brackets, null, pr_template_fn("")),
+                } }));
+            break;
+        }
     }
-    else if (fs.existsSync(docs_pr_template(repo_root))) {
-        pr_template_body = fs.readFileSync(docs_pr_template(repo_root), "utf-8");
+    // ./.github/PULL_REQUEST_TEMPLATE/*.md
+    let pr_templates = [];
+    if (fs.existsSync(PR_TEMPLATE.TemplateDir(repo_root))) {
+        pr_templates = fs.readdirSync(PR_TEMPLATE.TemplateDir(repo_root));
     }
     // check if repo has multiple pr templates
     actions.set((state) => {
@@ -28514,24 +28521,21 @@ async function run$1() {
         if (pr_templates.length > 0) {
             actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "{count} queryable templates found under {dir}, but not supported.", values: {
                     count: (reactExports.createElement(Text, { color: colors.blue }, pr_templates.length)),
-                    dir: reactExports.createElement(Brackets, null, template_pr_template("")),
+                    dir: reactExports.createElement(Brackets, null, PR_TEMPLATE.TemplateDir("")),
                 } }));
         }
         state.step = "manual-rebase";
     });
 }
-function github_pr_template(repo_root) {
-    return path.join(repo_root, ".github", "pull_request_template.md");
-}
-function root_pr_template(repo_root) {
-    return path.join(repo_root, "pull_request_template.md");
-}
-function docs_pr_template(repo_root) {
-    return path.join(repo_root, "docs", "pull_request_template.md");
-}
-function template_pr_template(repo_root) {
-    return path.join(repo_root, ".github", "PULL_REQUEST_TEMPLATE");
-}
+// prettier-ignore
+const PR_TEMPLATE = Object.freeze({
+    Github: (root) => path.join(root, ".github", "pull_request_template.md"),
+    Root: (root) => path.join(root, "pull_request_template.md"),
+    Docs: (root) => path.join(root, "docs", "pull_request_template.md"),
+    TemplateDir: (root) => path.join(root, ".github", "PULL_REQUEST_TEMPLATE"),
+});
+// prettier-ignore
+const PR_TEMPLATE_KEY_LIST = Object.keys(PR_TEMPLATE);
 
 function PreSelectCommitRanges() {
     const actions = Store.useActions();
@@ -34517,6 +34521,12 @@ async function command() {
         type: "string",
         alias: ["b"],
         description: 'Set the master branch name, defaults to "master" (or "main" if "master" is not found)',
+    })
+        .option("draft", {
+        type: "boolean",
+        alias: ["d"],
+        default: false,
+        description: "Open all PRs as drafts",
     })
         .option("write-state-json", {
         hidden: true,
@@ -34541,7 +34551,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.7.0" )
+        .version("1.8.1" )
         .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.7.0",
+  "version": "1.8.1",
   "description": "",
   "author": "magus",
   "license": "MIT",

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) {
@@ -334,6 +338,7 @@ async function run() {
         base: group.base,
         title: group.title,
         body: DEFAULT_PR_BODY,
+        draft: argv.draft,
       });
 
       if (!pr_url) {

package/src/app/PreManualRebase.tsx

@@ -31,24 +31,37 @@ async function run() {
     });
   }
 
-  // ./.github/PULL_REQUEST_TEMPLATE/*.md
-  let pr_templates: Array<string> = [];
-  if (fs.existsSync(template_pr_template(repo_root))) {
-    pr_templates = fs.readdirSync(template_pr_template(repo_root));
-  }
+  let pr_template_body: null | string = null;
 
   // look for pull request template
   // https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/creating-a-pull-request-template-for-your-repository
   // ./.github/pull_request_template.md
   // ./pull_request_template.md
   // ./docs/pull_request_template.md
-  let pr_template_body: null | string = null;
-  if (fs.existsSync(github_pr_template(repo_root))) {
-    pr_template_body = fs.readFileSync(github_pr_template(repo_root), "utf-8");
-  } else if (fs.existsSync(root_pr_template(repo_root))) {
-    pr_template_body = fs.readFileSync(root_pr_template(repo_root), "utf-8");
-  } else if (fs.existsSync(docs_pr_template(repo_root))) {
-    pr_template_body = fs.readFileSync(docs_pr_template(repo_root), "utf-8");
+  for (const key of PR_TEMPLATE_KEY_LIST) {
+    const pr_template_fn = PR_TEMPLATE[key as keyof typeof PR_TEMPLATE];
+
+    if (fs.existsSync(pr_template_fn(repo_root))) {
+      pr_template_body = fs.readFileSync(pr_template_fn(repo_root), "utf-8");
+
+      actions.output(
+        <FormatText
+          wrapper={<Ink.Text color={colors.yellow} />}
+          message="Using PR template {pr_filepath}"
+          values={{
+            pr_filepath: <Brackets>{pr_template_fn("")}</Brackets>,
+          }}
+        />
+      );
+
+      break;
+    }
+  }
+
+  // ./.github/PULL_REQUEST_TEMPLATE/*.md
+  let pr_templates: Array<string> = [];
+  if (fs.existsSync(PR_TEMPLATE.TemplateDir(repo_root))) {
+    pr_templates = fs.readdirSync(PR_TEMPLATE.TemplateDir(repo_root));
   }
 
   // check if repo has multiple pr templates
@@ -65,7 +78,7 @@ async function run() {
             count: (
               <Ink.Text color={colors.blue}>{pr_templates.length}</Ink.Text>
             ),
-            dir: <Brackets>{template_pr_template("")}</Brackets>,
+            dir: <Brackets>{PR_TEMPLATE.TemplateDir("")}</Brackets>,
           }}
         />
       );
@@ -75,18 +88,13 @@ async function run() {
   });
 }
 
-function github_pr_template(repo_root: string) {
-  return path.join(repo_root, ".github", "pull_request_template.md");
-}
-
-function root_pr_template(repo_root: string) {
-  return path.join(repo_root, "pull_request_template.md");
-}
+// prettier-ignore
+const PR_TEMPLATE = Object.freeze({
+  Github: (root: string) => path.join(root, ".github", "pull_request_template.md"),
+  Root: (root: string) => path.join(root, "pull_request_template.md"),
+  Docs: (root: string) => path.join(root, "docs", "pull_request_template.md"),
+  TemplateDir: (root: string) => path.join(root, ".github", "PULL_REQUEST_TEMPLATE"),
+});
 
-function docs_pr_template(repo_root: string) {
-  return path.join(repo_root, "docs", "pull_request_template.md");
-}
-
-function template_pr_template(repo_root: string) {
-  return path.join(repo_root, ".github", "PULL_REQUEST_TEMPLATE");
-}
+// prettier-ignore
+const PR_TEMPLATE_KEY_LIST = Object.keys(PR_TEMPLATE) as Array<keyof typeof PR_TEMPLATE>;

package/src/command.ts

@@ -71,6 +71,13 @@ export async function command() {
           'Set the master branch name, defaults to "master" (or "main" if "master" is not found)',
       })
 
+      .option("draft", {
+        type: "boolean",
+        alias: ["d"],
+        default: false,
+        description: "Open all PRs as drafts",
+      })
+
       .option("write-state-json", {
         hidden: true,
         type: "boolean",

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,10 @@ 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: Array<PullRequest> = await gh_json(
+    `pr list --repo ${repo_path} --author ${username} --state open ${JSON_FIELDS}`
   );
 
-  if (cli_result.code !== 0) {
-    handle_error(cli_result.output);
-  }
-
-  const result_pr_list: Array<PullRequest> = JSON.parse(cli_result.stdout);
-
   if (actions.isDebug()) {
     actions.output(
       <Ink.Text dimColor>
@@ -105,20 +93,10 @@ 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: PullRequest = await gh_json(
+    `pr view ${branch} --repo ${repo_path} ${JSON_FIELDS}`
   );
 
-  if (cli_result.code !== 0) {
-    // handle_error(cli_result.output);
-    return null;
-  }
-
-  const pr: PullRequest = JSON.parse(cli_result.stdout);
-
   actions.set((state) => {
     state.pr[pr.headRefName] = pr;
   });
@@ -131,14 +109,18 @@ type CreatePullRequestArgs = {
   base: string;
   title: string;
   body: string;
+  draft: boolean;
 };
 
 export async function pr_create(args: CreatePullRequestArgs) {
   const title = safe_quote(args.title);
+  let command = `gh pr create --fill --head ${args.branch} --base ${args.base} --title="${title}" --body="${args.body}"`;
 
-  const cli_result = await cli(
-    `gh pr create --fill --head ${args.branch} --base ${args.base} --title="${title}" --body="${args.body}"`
-  );
+  if (args.draft) {
+    command += " --draft";
+  }
+
+  const cli_result = await cli(command);
 
   if (cli_result.code !== 0) {
     handle_error(cli_result.output);
@@ -165,6 +147,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(command: string) {
+  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);
+  }
+
+  // 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;