git-stack-cli 1.12.0 → 1.13.0

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(" ");
@@ -166,6 +168,10 @@ type DraftPullRequestArgs = {
 };
 
 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";
@@ -220,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;
 }
@@ -237,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;
 }
 

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
+  }
+}