git-stack-cli 1.11.7 → 1.13.0

package/src/core/GitReviseTodo.test.ts

@@ -82,6 +82,8 @@ const SINGLE_COMMIT_EXISTING_GROUP: CommitMetadata.CommitRange = {
       id: "AAWsYx1UU",
       title: "banana",
       pr: {
+        id: "PR_kwDOKjvFM85ghvAH",
+        isDraft: false,
         baseRefName: "master",
         body: "adsf\r\n\r\n#### git stack\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/47\n- 👉 `1` https://github.com/magus/git-multi-diff-playground/pull/43",
         commits: [
@@ -123,6 +125,8 @@ const SINGLE_COMMIT_EXISTING_GROUP: CommitMetadata.CommitRange = {
       id: "E63ytp5dj",
       title: "lemon color",
       pr: {
+        id: "PR_kwDOKjvFM85gwTkx",
+        isDraft: false,
         baseRefName: "AAWsYx1UU",
         body: "\r\n\r\n#### git stack\n- 👉 `3` https://github.com/magus/git-multi-diff-playground/pull/47\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/43\n- ✅ `1`\n  https://github.com/magus/git-multi-diff-playground/pull/42",
         commits: [
@@ -251,6 +255,8 @@ const SINGLE_COMMIT_EXISTING_GROUP: CommitMetadata.CommitRange = {
   ],
   pr_lookup: {
     AAWsYx1UU: {
+      id: "PR_kwDOKjvFM85ghvAH",
+      isDraft: false,
       baseRefName: "master",
       body: "adsf\r\n\r\n#### git stack\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/47\n- 👉 `1` https://github.com/magus/git-multi-diff-playground/pull/43",
       commits: [
@@ -277,6 +283,8 @@ const SINGLE_COMMIT_EXISTING_GROUP: CommitMetadata.CommitRange = {
       url: "https://github.com/magus/git-multi-diff-playground/pull/43",
     },
     E63ytp5dj: {
+      id: "PR_kwDOKjvFM85gwTkx",
+      isDraft: false,
       baseRefName: "AAWsYx1UU",
       body: "\r\n\r\n#### git stack\n- 👉 `3` https://github.com/magus/git-multi-diff-playground/pull/47\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/43\n- ✅ `1`\n  https://github.com/magus/git-multi-diff-playground/pull/42",
       commits: [
@@ -343,6 +351,8 @@ const SINGLE_COMMIT_NEW_GROUP: CommitMetadata.CommitRange = {
       id: "AAWsYx1UU",
       title: "banana",
       pr: {
+        id: "PR_kwDOKjvFM85ghvAH",
+        isDraft: false,
         baseRefName: "master",
         body: "adsf\r\n\r\n#### git stack\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/47\n- 👉 `1` https://github.com/magus/git-multi-diff-playground/pull/43",
         commits: [
@@ -384,6 +394,8 @@ const SINGLE_COMMIT_NEW_GROUP: CommitMetadata.CommitRange = {
       id: "E63ytp5dj",
       title: "lemon color",
       pr: {
+        id: "PR_kwDOKjvFM85gwTkx",
+        isDraft: false,
         baseRefName: "AAWsYx1UU",
         body: "\r\n\r\n#### git stack\n- 👉 `3` https://github.com/magus/git-multi-diff-playground/pull/47\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/43\n- ✅ `1`\n  https://github.com/magus/git-multi-diff-playground/pull/42",
         commits: [
@@ -521,6 +533,8 @@ const SINGLE_COMMIT_NEW_GROUP: CommitMetadata.CommitRange = {
   ],
   pr_lookup: {
     AAWsYx1UU: {
+      id: "PR_kwDOKjvFM85ghvAH",
+      isDraft: false,
       baseRefName: "master",
       body: "adsf\r\n\r\n#### git stack\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/47\n- 👉 `1` https://github.com/magus/git-multi-diff-playground/pull/43",
       commits: [
@@ -547,6 +561,8 @@ const SINGLE_COMMIT_NEW_GROUP: CommitMetadata.CommitRange = {
       url: "https://github.com/magus/git-multi-diff-playground/pull/43",
     },
     E63ytp5dj: {
+      id: "PR_kwDOKjvFM85gwTkx",
+      isDraft: false,
       baseRefName: "AAWsYx1UU",
       body: "\r\n\r\n#### git stack\n- 👉 `3` https://github.com/magus/git-multi-diff-playground/pull/47\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/43\n- ✅ `1`\n  https://github.com/magus/git-multi-diff-playground/pull/42",
       commits: [

package/src/core/GitReviseTodo.ts

@@ -1,4 +1,4 @@
-import fs from "node:fs";
+import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 
@@ -120,10 +120,10 @@ GitReviseTodo.execute = async function grt_execute(args: ExecuteArgs) {
   const GIT_SEQUENCE_EDITOR_SCRIPT = `process.env.GIT_SEQUENCE_EDITOR_SCRIPT`;
 
   // write script to temporary path
-  fs.writeFileSync(tmp_git_sequence_editor_path, GIT_SEQUENCE_EDITOR_SCRIPT);
+  await fs.writeFile(tmp_git_sequence_editor_path, GIT_SEQUENCE_EDITOR_SCRIPT);
 
   // ensure script is executable
-  fs.chmodSync(tmp_git_sequence_editor_path, "755");
+  await fs.chmod(tmp_git_sequence_editor_path, "755");
 
   const git_revise_todo = GitReviseTodo(args);
 

package/src/core/github.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 
-import fs from "node:fs";
+import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 
@@ -12,6 +12,7 @@ import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
 import { invariant } from "~/core/invariant";
 import { safe_quote } from "~/core/safe_quote";
+import { safe_rm } from "~/core/safe_rm";
 
 export async function pr_list(): Promise<Array<PullRequest>> {
   const state = Store.getState();
@@ -148,7 +149,8 @@ export async function pr_edit(args: EditPullRequestArgs) {
   const command_parts = [`gh pr edit ${args.branch} --base ${args.base}`];
 
   if (args.body) {
-    command_parts.push(`--body-file="${body_file(args.body)}"`);
+    const body_file = await write_body_file(args);
+    command_parts.push(`--body-file="${body_file}"`);
   }
 
   const command = command_parts.join(" ");
@@ -160,8 +162,56 @@ export async function pr_edit(args: EditPullRequestArgs) {
   }
 }
 
+type DraftPullRequestArgs = {
+  branch: string;
+  draft: boolean;
+};
+
+export async function pr_draft(args: DraftPullRequestArgs) {
+  // https://cli.github.com/manual/gh_api
+  // https://docs.github.com/en/graphql/reference/mutations#convertpullrequesttodraft
+  // https://docs.github.com/en/graphql/reference/mutations#markpullrequestreadyforreview
+
+  const mutation_name = args.draft
+    ? "convertPullRequestToDraft"
+    : "markPullRequestReadyForReview";
+
+  let query = `
+    mutation($id: ID!) {
+      ${mutation_name}(input: { pullRequestId: $id }) {
+        pullRequest {
+          id
+          number
+          isDraft
+        }
+      }
+    }
+  `;
+
+  query = query.replace(/\n/g, " ");
+  query = query.replace(/\s+/g, " ");
+  query = query.trim();
+
+  // lookup id from pr cache using args.branch
+  const state = Store.getState();
+  const cache_pr = state.pr[args.branch];
+  invariant(cache_pr, "cache_pr must exist");
+
+  const command_parts = [
+    `gh api graphql -F id="${cache_pr.id}" -f query='${query}'`,
+  ];
+
+  const command = command_parts.join(" ");
+
+  const cli_result = await cli(command);
+
+  if (cli_result.code !== 0) {
+    handle_error(cli_result.output);
+  }
+}
+
 // prettier-ignore
-const JSON_FIELDS = "--json number,state,baseRefName,headRefName,commits,title,body,url";
+const JSON_FIELDS = "--json id,number,state,baseRefName,headRefName,commits,title,body,url,isDraft";
 
 // consistent handle gh cli commands returning json
 // redirect to tmp file to avoid scrollback overflow causing scrollback to be cleared
@@ -176,7 +226,7 @@ async function gh_json<T>(command: string): Promise<T | Error> {
   }
 
   // read from file
-  const json_str = fs.readFileSync(tmp_pr_json, "utf-8");
+  const json_str = await fs.readFile(tmp_pr_json, "utf-8");
   const json = JSON.parse(json_str);
   return json;
 }
@@ -193,13 +243,16 @@ function handle_error(output: string): never {
 }
 
 // convert a string to a file for use via github cli `--body-file`
-function body_file(body: string) {
+async function write_body_file(args: EditPullRequestArgs) {
+  invariant(args.body, "args.body must exist");
+
   const temp_dir = os.tmpdir();
-  const temp_path = path.join(temp_dir, "git-stack-body");
-  if (fs.existsSync(temp_path)) {
-    fs.rmSync(temp_path);
-  }
-  fs.writeFileSync(temp_path, body);
+  const temp_path = path.join(temp_dir, `git-stack-body-${args.base}`);
+
+  await safe_rm(temp_path);
+
+  await fs.writeFile(temp_path, args.body);
+
   return temp_path;
 }
 
@@ -220,6 +273,7 @@ type Commit = {
 };
 
 export type PullRequest = {
+  id: string;
   number: number;
   state: "OPEN" | "MERGED" | "CLOSED";
   baseRefName: string;
@@ -228,4 +282,5 @@ export type PullRequest = {
   title: string;
   body: string;
   url: string;
+  isDraft: boolean;
 };

package/src/core/read_json.ts

@@ -1,8 +1,8 @@
-import fs from "node:fs";
+import fs from "node:fs/promises";
 
-export function read_json<T = unknown>(path: string): null | T {
+export async function read_json<T = unknown>(path: string): Promise<null | T> {
   try {
-    const file_buffer = fs.readFileSync(path);
+    const file_buffer = await fs.readFile(path);
     const json_str = String(file_buffer);
     const json = JSON.parse(json_str);
     return json;

package/src/core/safe_exists.ts

@@ -0,0 +1,10 @@
+import fs from "node:fs/promises";
+
+export async function safe_exists(filepath: string) {
+  try {
+    await fs.access(filepath);
+    return true;
+  } catch {
+    return false;
+  }
+}

package/src/core/safe_rm.ts

@@ -0,0 +1,10 @@
+import fs from "node:fs/promises";
+
+export async function safe_rm(filepath: string) {
+  try {
+    await fs.access(filepath);
+    await fs.rm(filepath);
+  } catch {
+    // if access fails there is no file to remove this is safe
+  }
+}