git-stack-cli 2.0.0-beta → 2.1.0-beta

package/dist/js/index.js

@@ -37050,15 +37050,20 @@ var BaseStore = createStore()(immer2((set2, get) => ({
   sync_github: null,
   is_dirty_check_stash: false,
   abort_handler: null,
-  is_exiting: false,
+  exit_mode: null,
   step: "loading",
   output: [],
   pending_output: {},
   pr: {},
   actions: {
-    exit(code, clear = true) {
+    exit(code, args) {
       set2((state) => {
-        state.is_exiting = true;
+        if (args?.quiet ?? code === 0) {
+          state.exit_mode = "quiet";
+        } else {
+          state.exit_mode = "normal";
+        }
+        let clear = args?.clear ?? true;
         const node = /* @__PURE__ */ React16.createElement(Exit, {
           clear,
           code
@@ -37791,7 +37796,7 @@ function Url(props) {
 import fs7 from "node:fs";
 import path4 from "node:path";
 function is_command_available(command) {
-  const PATH = "/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/.bun/bin:/Users/noah/Library/Caches/fnm_multishells/10609_1737115106756/bin:/usr/local/sbin:/usr/local/bin:/usr/local/bin:/usr/local/sbin:/Users/noah/.dotfiles/bin:/usr/local/sbin:/usr/local/bin:/Users/noah/.rvm/gems/ruby-2.6.3/bin:/Users/noah/.rvm/gems/ruby-2.6.3@global/bin:/Users/noah/.rvm/rubies/ruby-2.6.3/bin:/Users/noah/Library/pnpm:/Users/noah/.bun/bin:/Users/noah/Library/Caches/fnm_multishells/7244_1737114463742/bin:/usr/local/sbin:/usr/local/bin:/usr/local/bin:/usr/local/sbin:/Users/noah/.dotfiles/bin:/usr/local/sbin:/usr/local/bin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/Apple/usr/bin:/Applications/Postgres.app/Contents/Versions/latest/bin:/Users/noah/.cargo/bin:/Applications/iTerm.app/Contents/Resources/utilities:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin:/usr/local/opt/fzf/bin:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin:/Users/noah/.rvm/bin:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin";
+  const PATH = "/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/.rvm/gems/ruby-2.6.3/bin:/Users/noah/.rvm/gems/ruby-2.6.3@global/bin:/Users/noah/.rvm/rubies/ruby-2.6.3/bin:/Users/noah/Library/pnpm:/Users/noah/.bun/bin:/Users/noah/Library/Caches/fnm_multishells/45565_1737429645385/bin:/usr/local/sbin:/usr/local/bin:/usr/local/bin:/usr/local/sbin:/Users/noah/.dotfiles/bin:/usr/local/sbin:/usr/local/bin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/Apple/usr/bin:/Applications/Postgres.app/Contents/Versions/latest/bin:/Users/noah/.cargo/bin:/Applications/iTerm.app/Contents/Resources/utilities:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin:/usr/local/opt/fzf/bin:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin:/Users/noah/.rvm/bin";
   invariant(PATH, "PATH env must exist");
   const path_list = PATH.split(path4.delimiter);
   for (const dir of path_list) {
@@ -38049,7 +38054,7 @@ async function pr_status(branch) {
   const cache4 = state.pr[branch];
   if (cache4) {
     if (actions.isDebug()) {
-      actions.output(/* @__PURE__ */ React24.createElement(Text, null, /* @__PURE__ */ React24.createElement(Text, {
+      actions.debug(/* @__PURE__ */ React24.createElement(Text, null, /* @__PURE__ */ React24.createElement(Text, {
         dimColor: true
       }, "Github pr_status cache"), /* @__PURE__ */ React24.createElement(Text, null, " "), /* @__PURE__ */ React24.createElement(Text, {
         bold: true,
@@ -38061,7 +38066,7 @@ async function pr_status(branch) {
     return cache4;
   }
   if (actions.isDebug()) {
-    actions.output(/* @__PURE__ */ React24.createElement(Text, null, /* @__PURE__ */ React24.createElement(Text, {
+    actions.debug(/* @__PURE__ */ React24.createElement(Text, null, /* @__PURE__ */ React24.createElement(Text, {
       dimColor: true
     }, "Github pr_status cache"), /* @__PURE__ */ React24.createElement(Text, null, " "), /* @__PURE__ */ React24.createElement(Text, {
       bold: true,
@@ -38221,13 +38226,25 @@ async function range(commit_group_map) {
   const group_value_list = Array.from(group_map.values());
   const group_list = [];
   let unassigned_group;
+  const pr_status_promise_list = {};
+  for (const group of group_value_list) {
+    if (group.id !== UNASSIGNED) {
+      pr_status_promise_list[group.id] = pr_status(group.id);
+    }
+  }
+  await Promise.all(Array.from(Object.values(pr_status_promise_list)));
+  for (const [group_id, pr_status_promise] of Object.entries(pr_status_promise_list)) {
+    const pr_status2 = await pr_status_promise;
+    if (pr_status2) {
+      pr_lookup[group_id] = pr_status2;
+    }
+  }
   for (let i2 = 0;i2 < group_value_list.length; i2++) {
     const group = group_value_list[i2];
     if (group.id !== UNASSIGNED) {
-      const pr_result = await pr_status(group.id);
+      let pr_result = pr_lookup[group.id];
       if (pr_result && pr_result.state !== "CLOSED") {
         group.pr = pr_result;
-        pr_lookup[group.id] = pr_result;
       }
     }
     if (group.id === UNASSIGNED) {
@@ -40576,6 +40593,7 @@ async function run11() {
       }, "✅ Changes restored from stash"));
     }
   }
+  actions.exit(0);
 }
 
 // src/commands/Log.tsx
@@ -40611,6 +40629,7 @@ async function run12(args) {
   ].join(" | ");
   const result = await cli(command);
   actions.output(result.stdout);
+  actions.exit(0);
 }
 
 // src/components/ErrorBoundary.tsx
@@ -40672,17 +40691,24 @@ class ErrorBoundary extends React52.Component {
 // src/components/ExitingGate.tsx
 var React53 = __toESM(require_react(), 1);
 function ExitingGate(props) {
-  const is_exiting = Store.useState((state) => state.is_exiting);
-  if (!is_exiting) {
+  const exit_mode = Store.useState((state) => state.exit_mode);
+  if (!exit_mode) {
     return props.children;
   }
-  return /* @__PURE__ */ React53.createElement(Box_default, {
-    flexDirection: "column"
-  }, /* @__PURE__ */ React53.createElement(Text, {
-    color: colors.red
-  }, /* @__PURE__ */ React53.createElement(FormatText, {
-    message: "\uD83D\uDEA8 Exiting…"
-  })));
+  switch (exit_mode) {
+    case "quiet":
+      return null;
+    case "normal":
+      return /* @__PURE__ */ React53.createElement(Box_default, {
+        flexDirection: "column"
+      }, /* @__PURE__ */ React53.createElement(Text, {
+        color: colors.red
+      }, /* @__PURE__ */ React53.createElement(FormatText, {
+        message: "\uD83D\uDEA8 Exiting…"
+      })));
+    default:
+      return null;
+  }
 }
 
 // src/app/App.tsx
@@ -45580,7 +45606,7 @@ var yargs_default = Yargs;
 
 // src/command.ts
 async function command2() {
-  return yargs_default(hideBin(process.argv)).usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.0.0-beta").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
+  return yargs_default(hideBin(process.argv)).usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.1.0-beta").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
 }
 var GlobalOptions = {
   verbose: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "2.0.0-beta",
+  "version": "2.1.0-beta",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/scripts/bun-build.ts

@@ -75,6 +75,8 @@ async function run_build() {
 if (!WATCH) {
   await run_build();
 } else {
+  await run_build();
+
   console.debug("👀 Watching for changes…");
 
   const { signal } = new AbortController();

package/scripts/release-brew.ts

@@ -25,7 +25,9 @@ const previous_formula_path = path.join(HOMEBREW_DIR, "Formula", "git-stack.rb")
 //   version = "1.0.4"
 //
 let previous_formula = await file.read_text(previous_formula_path);
-const re_version = /version(?: =)? "(?<version>\d+\.\d+\.\d+)"/m;
+
+// https://regex101.com/r/BnvdqK/1
+const re_version = /version(?: =)? "(?<version>\d+\.\d+\.\d+(?:-.+)?)"/m;
 const previous_version_match = previous_formula.match(re_version);
 
 if (!previous_version_match?.groups) {
@@ -35,7 +37,7 @@ if (!previous_version_match?.groups) {
 
 const previous_version = previous_version_match.groups.version;
 // convert `1.0.4` to `104`
-const not_dot_version = previous_version.replace(/\./g, "");
+const not_dot_version = previous_version.replace(/[^a-z0-9]/gi, "");
 const previous_class = `GitStackAT${not_dot_version}`;
 previous_formula = previous_formula.replace("class GitStack", `class ${previous_class}`);
 

package/src/app/Store.tsx

@@ -33,6 +33,11 @@ type SyncGithubState = {
 // async function that returns exit code
 type AbortHandler = () => Promise<number>;
 
+type ExitArgs = {
+  quiet?: boolean;
+  clear?: boolean;
+};
+
 export type State = {
   // set immediately in `index.tsx` so no `null` scenario
   process_argv: Array<string>;
@@ -53,7 +58,7 @@ export type State = {
   sync_github: null | SyncGithubState;
   is_dirty_check_stash: boolean;
   abort_handler: null | AbortHandler;
-  is_exiting: boolean;
+  exit_mode: null | "normal" | "quiet";
 
   step:
     | "github-api-error"
@@ -74,7 +79,7 @@ export type State = {
   pr: { [branch: string]: PullRequest };
 
   actions: {
-    exit(code: number, clear?: boolean): void;
+    exit(code: number, args?: ExitArgs): void;
     clear(): void;
     unmount(): void;
     newline(): void;
@@ -124,7 +129,7 @@ const BaseStore = createStore<State>()(
     sync_github: null,
     is_dirty_check_stash: false,
     abort_handler: null,
-    is_exiting: false,
+    exit_mode: null,
 
     step: "loading",
 
@@ -134,9 +139,15 @@ const BaseStore = createStore<State>()(
     pr: {},
 
     actions: {
-      exit(code, clear = true) {
+      exit(code, args) {
         set((state) => {
-          state.is_exiting = true;
+          if (args?.quiet ?? code === 0) {
+            state.exit_mode = "quiet";
+          } else {
+            state.exit_mode = "normal";
+          }
+
+          let clear = args?.clear ?? true;
 
           const node = <Exit clear={clear} code={code} />;
           state.mutate.output(state, { node });

package/src/commands/Fixup.tsx

@@ -118,4 +118,6 @@ async function run() {
       actions.output(<Ink.Text color={colors.green}>✅ Changes restored from stash</Ink.Text>);
     }
   }
+
+  actions.exit(0);
 }

package/src/commands/Log.tsx

@@ -65,4 +65,6 @@ async function run(args: Args) {
   const result = await cli(command);
 
   actions.output(result.stdout);
+
+  actions.exit(0);
 }

package/src/components/ExitingGate.tsx

@@ -11,17 +11,27 @@ type Props = {
 };
 
 export function ExitingGate(props: Props) {
-  const is_exiting = Store.useState((state) => state.is_exiting);
+  const exit_mode = Store.useState((state) => state.exit_mode);
 
-  if (!is_exiting) {
+  if (!exit_mode) {
     return props.children;
   }
 
-  return (
-    <Ink.Box flexDirection="column">
-      <Ink.Text color={colors.red}>
-        <FormatText message="🚨 Exiting…" />
-      </Ink.Text>
-    </Ink.Box>
-  );
+  switch (exit_mode) {
+    case "quiet":
+      return null;
+
+    case "normal":
+      return (
+        <Ink.Box flexDirection="column">
+          <Ink.Text color={colors.red}>
+            <FormatText message="🚨 Exiting…" />
+          </Ink.Text>
+        </Ink.Box>
+      );
+
+    default:
+      exit_mode satisfies never;
+      return null;
+  }
 }

package/src/core/CommitMetadata.ts

@@ -6,7 +6,8 @@ import * as github from "~/core/github";
 export type CommitMetadata = Awaited<ReturnType<typeof commit>>;
 export type CommitRange = Awaited<ReturnType<typeof range>>;
 
-type PullRequest = NonNullable<Awaited<ReturnType<typeof github.pr_status>>>;
+type GithubPRStatus = ReturnType<typeof github.pr_status>;
+type PullRequest = NonNullable<Awaited<GithubPRStatus>>;
 
 type CommitGroup = {
   id: string;
@@ -93,15 +94,31 @@ export async function range(commit_group_map?: CommitGroupMap) {
   const group_list = [];
   let unassigned_group;
 
+  // collect github pr status in parallel
+  const pr_status_promise_list: Record<string, GithubPRStatus> = {};
+  for (const group of group_value_list) {
+    if (group.id !== UNASSIGNED) {
+      pr_status_promise_list[group.id] = github.pr_status(group.id);
+    }
+  }
+
+  await Promise.all(Array.from(Object.values(pr_status_promise_list)));
+
+  for (const [group_id, pr_status_promise] of Object.entries(pr_status_promise_list)) {
+    const pr_status = await pr_status_promise;
+    if (pr_status) {
+      pr_lookup[group_id] = pr_status;
+    }
+  }
+
   for (let i = 0; i < group_value_list.length; i++) {
     const group = group_value_list[i];
 
     if (group.id !== UNASSIGNED) {
-      const pr_result = await github.pr_status(group.id);
+      let pr_result = pr_lookup[group.id];
 
       if (pr_result && pr_result.state !== "CLOSED") {
         group.pr = pr_result;
-        pr_lookup[group.id] = pr_result;
       }
     }
 

package/src/core/github.tsx

@@ -68,7 +68,7 @@ export async function pr_status(branch: string): Promise<null | PullRequest> {
 
   if (cache) {
     if (actions.isDebug()) {
-      actions.output(
+      actions.debug(
         <Ink.Text>
           <Ink.Text dimColor>Github pr_status cache</Ink.Text>
           <Ink.Text> </Ink.Text>
@@ -85,7 +85,7 @@ export async function pr_status(branch: string): Promise<null | PullRequest> {
   }
 
   if (actions.isDebug()) {
-    actions.output(
+    actions.debug(
       <Ink.Text>
         <Ink.Text dimColor>Github pr_status cache</Ink.Text>
         <Ink.Text> </Ink.Text>