git-stack-cli 1.7.0 → 1.8.0

package/dist/cjs/index.cjs

@@ -27347,7 +27347,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;
@@ -28175,6 +28179,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 +28492,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 +28520,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 +34520,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 +34550,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.7.0" )
+        .version("1.8.0" )
         .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.0",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/ManualRebase.tsx

@@ -334,6 +334,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

@@ -131,14 +131,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);